atreyabain/safeImport
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] enhance wpCompress logging, add rootModule parameter to sliceAndWriteCalls, and improve dependency checks

Browse Source
This commit is contained in:
Atreya Bain
2025-08-14 21:29:36 +01:00
parent 9dc2e300dc
commit 7f2f0b9240
8 changed files with 86 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bundle/index.mjs
View File

@@ -15,7 +15,7 @@ export function wpCompress(l, moduleLocation,outputPath = path.resolve('./output
const libraryLocation = extractFunctionForModule(l, moduleLocation);
console.log(libraryLocation);
const outputFile = l + '.bundle.cjs';
console.log(`[WebPack] Compressing ${l} in ${moduleLocation} to ${outputFile}`);
console.log(`[WebPack] Compressing ${l} in ${moduleLocation} to ${path.join(outputPath, outputFile)}`);
const moduleFallbackMap = builtinModules.reduce((prev, current) => {
prev[current] = false;
return prev;
@@ -48,8 +48,8 @@ export function wpCompress(l, moduleLocation,outputPath = path.resolve('./output
},
}, (err, stats) => {
if (err || stats.hasErrors()) {
console.error(`[WebPack] Error Stack`,err?.stack);
console.log(`[WebPack]`,stats?.toJson().errors);
console.error(`[WebPack] Error encountered`);
// console.log(`[WebPack]`,stats?.toJson().errors);
reject(err || stats);
}else{
resolve(path.resolve(outputPath, outputFile));

38
src/index.mjs
View File

@@ -12,13 +12,14 @@ import { LibraryTypesRecorder } from './libcalls.mjs';
*
* @param {ReturnType<LibraryTypesRecorder['generateAllArgumentsForRecordedCalls']>} calls
* @param {string} folderPath
* @param {string} rootModule
*/
export async function sliceAndWriteCalls(calls, folderPath) {
export async function sliceAndWriteCalls(calls, folderPath, rootModule) {
const writePromises = [];
for (const [moduleName, callBox] of calls) {
if (isRelativeModule(moduleName) || isNodeModule(moduleName)) { // not relative module
console.warn(`Skipping module ${moduleName} - relative or inbuilt Node.js module`);
// console.warn(`Skipping module ${moduleName} - relative or inbuilt Node.js module`);
continue;
}
console.log(`Slicing module ${moduleName} - ${callBox.size} calls`);
@@ -51,14 +52,18 @@ export async function sliceAndWriteCalls(calls, folderPath) {
// console.log(`Sliced code ${moduleName}\n`,slicedCode);
// continue;
const writePath = path.resolve('./dist', moduleName, 'index.cjs');
const writePath = path.resolve('./dist',rootModule, moduleName, 'index.cjs');
if (writePath === moduleName) {
throw Error("Unexpected Directory rewrite. Not allowed.");
}
const { packageJsonFilePath, packageJsonFileContentsString } = createPackageJsonForModule(moduleName, writePath);
mkdirSync(path.dirname(writePath), { recursive: true });
console.log(`Writing module '${moduleName}' to '${writePath}'`);
writePromises.push(writeFile(writePath, slicedCode));
writePromises.push(writeFile(packageJsonFilePath, packageJsonFileContentsString),
writeFile(writePath, slicedCode));
// writePromises.push(writeFile(writePath, slicedCode));
}
@@ -67,6 +72,23 @@ export async function sliceAndWriteCalls(calls, folderPath) {
}).catch(console.log);
}
function createPackageJsonForModule(moduleName, writePath) {
const packageJsonFileContents = {
"name": moduleName,
"version": "1.0.0",
"main": "index.cjs",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"description": ""
};
const packageJsonFileContentsString = JSON.stringify(packageJsonFileContents, null, 2);
const packageJsonFilePath = path.resolve(path.dirname(writePath), 'package.json');
return { packageJsonFilePath, packageJsonFileContentsString };
}
// is-glob WORKED
/**
*
@@ -97,9 +119,9 @@ function driver(folderPath = './candidates/braces') {
const callMap = libraryTypesRecorder.generateAllArgumentsForRecordedCalls();
const moduleBaseName = path.basename(folderPath);
// logCallList(callMap, folderPath);
sliceAndWriteCalls(callMap, folderPath).then(() => {
sliceAndWriteCalls(callMap, folderPath,moduleBaseName).then(() => {
console.log("Slicing and writing calls done");
});
}
@@ -135,6 +157,8 @@ function constructJavascriptGlobInFolder(folderPath) {
["**/tests/**", false],
["**/__tests__/**", false],
["**/__mocks__/**", false],
["**/test.js", false],
["**/tests.js", false],
].map(glob => {
const prefix = glob[1] ? '' : '!';
return prefix+path.resolve(folderPath, glob[0])});

6
src/libcalls.mjs
View File

@@ -95,7 +95,13 @@ export class LibraryTypesRecorder {
return type.getTupleElements().map(t => this.instantiateFakerOnType(t,level+1));
} else if (type.isArray()) {
return []// TODO - handle arrays;
//also, check if its a buffer from NodeJS
} else if (type.isObject()) {
// TODO check if its a buffer
if (type.getText() === 'Buffer') {
return Buffer.from(simpleFaker.string.alphanumeric(10));
}
const f = type.getCallSignatures();
if(f.length > 0) {
return simpleFaker.helpers.arrayElement(f.map(fn => ()=>this.instantiateFakerOnType(fn.getReturnType(),level+1)));

36
src/tsCalls.mjs
View File

@@ -53,6 +53,38 @@ export function getImportCallsAndArgumentTypes(importDecls, checker, mainFilePat
const parent = importDecl.getParent();
if(!parent?.isKind(SyntaxKind.VariableDeclaration)) {
console.log("Parent of import call", parent?.getKindName(), parent?.getText());
// Check to see if there is a declaration of type:
// const x = require('something').x;
// or else, drop it.
if(parent?.isKind(SyntaxKind.PropertyAccessExpression)){
// this is a property access expression
const propAccessExpr = parent;
const propAccessName = propAccessExpr.getName();
const propAccessNameNode = propAccessExpr.getNameNode();
if (propAccessNameNode.isKind(SyntaxKind.Identifier)) {
// assert that the parent of the property access is a variable declaration
const parentVarDecl = propAccessExpr.getFirstAncestorByKind(SyntaxKind.VariableDeclaration);
if (parentVarDecl !== undefined) {
// this is a variable declaration
const varName = parentVarDecl.getName();
if (varName === propAccessName) {
const varNameNode = parentVarDecl.getNameNode();
if(varNameNode.isKind(SyntaxKind.Identifier)) {
recordImportedIdentifierUsage(checker, varNameNode, mainFilePath, libraryTypesRecorder, importStringDecl);
}
}else{
console.warn("Variable name does not match property access name", varName, propAccessName);
}
}
// console.error("Property access expression is not a variable declaration", propAccessExpr.getText());
// this is a property access expression with identifier
}else{
console.log("Property access name", propAccessName);
}
}
}
if (parent?.isKind(SyntaxKind.VariableDeclaration)) {
// this is a variable declaration
@@ -196,7 +228,7 @@ function recordNamespaceImportIdentifierUsage(checker, importNode, mainFilePath,
continue;
}
const callExpressionArguments = callExpression?.getArguments();
if (callExpressionArguments === undefined || callExpressionArguments.length === 0) {
if (callExpressionArguments === undefined || !Array.isArray( callExpressionArguments)) {
console.warn("No call expressions found for import reference", ref.getNode().getText());
continue;
}
@@ -211,7 +243,7 @@ function recordNamespaceImportIdentifierUsage(checker, importNode, mainFilePath,
const paramArgType = checker.getTypeOfSymbolAtLocation(paramType,funcCall);
if(!paramArgType.isAny()){
console.log("[analyzer] Using scoped argument", paramArgType.getText(), "for argument", i, "of call", funcCall.getText());
// console.log("[analyzer] Using scoped argument", paramArgType.getText(), "for argument", i, "of call", funcCall.getText());
return paramArgType;
}
}