@kezh/my-custom-js-converter 0.1.52 → 0.1.57

package/core/decode/index.js

@@ -36,14 +36,14 @@ function decoding$0(inPath, outPath, config) {
     let src = fs_1.default.readFileSync(inPath, {
         encoding: "utf-8"
     });
-    src = `const ${config.decode.mount} = {${src}};\r\nmodule.exports = customEvent;`;
+    src = `const ${config.decode.mount} = {${src}};\r\nmodule.exports = ${config.decode.mount};`;
     const srcAst = (0, parser_1.parse)(src);
     if (!core_1.types.isNode(srcAst)) {
         return;
     }
     (0, ast_1.importMods)(path_1.default.dirname(outPath), srcAst, mapContext);
     (0, ast_1.deleteModMethods)(srcAst, mapContext);
-    let { code: dist } = (0, generator_1.default)(srcAst);
+    let { code: dist } = (0, generator_1.default)(srcAst, { compact: true });
     dist = dist.replace(/},\n\n/g, "},\n");
     dist = prettier_1.default.format(dist, {
         parser: "babel",

package/core/scanf/index.js

@@ -11,7 +11,7 @@ function scanfCodeFiles(dirPaths, filterName = "") {
         return scanfCodeFiles$0(dirPaths, filterName);
     }
     if (dirPaths instanceof (Array)) {
-        return dirPaths.flatMap(p => scanfCodeFiles$0(p, filterName));
+        return dirPaths.flatMap((p) => scanfCodeFiles$0(p, filterName));
     }
     return [];
 }
@@ -24,7 +24,7 @@ function scanfCodeFiles$0(dirPath, filterName = "") {
     }
     const files = fs_1.default.readdirSync(dirPath, {
         encoding: "utf-8",
-        withFileTypes: true,
+        withFileTypes: true
     });
     files
         .filter((file) => file.isFile())
@@ -56,17 +56,22 @@ exports.scanfCodeDirs = scanfCodeDirs;
 function scanfRequieMod(baseDir, modPath) {
     let absolutePath = path_1.default.join(baseDir, modPath);
     try {
-        fs_1.default.accessSync(absolutePath, fs_1.default.constants.O_DIRECTORY);
-        absolutePath = path_1.default.join(absolutePath, 'index.js');
-        fs_1.default.accessSync(absolutePath, fs_1.default.constants.F_OK);
+        fs_1.default.accessSync(absolutePath, fs_1.default.constants.R_OK);
     }
     catch (err) {
         try {
-            absolutePath = `${absolutePath}.js`;
+            fs_1.default.accessSync(absolutePath, fs_1.default.constants.O_DIRECTORY);
+            absolutePath = path_1.default.join(absolutePath, "index.js");
             fs_1.default.accessSync(absolutePath, fs_1.default.constants.F_OK);
         }
         catch (err) {
-            throw new Error(`${absolutePath} is not exists!`);
+            try {
+                absolutePath = `${absolutePath}.js`;
+                fs_1.default.accessSync(absolutePath, fs_1.default.constants.F_OK);
+            }
+            catch (err) {
+                throw new Error(`${absolutePath} is not exists!`);
+            }
         }
     }
     return absolutePath;

package/core/util/ast.d.ts

@@ -6,7 +6,7 @@ declare type AstType = Node | Node[] | null | undefined;
 export declare function parseSrcAst(srcPath?: string): AstType;
 export declare function outputObjectMethods(outPath: string, methods: ObjectMethod[]): void;
 /**
- * 获取所有依赖第三方模块路径
+ * 获取所有依赖第三方模块路径(仅导入program下一级的require)
  * val xx = require('path') => [xx, absolute path]
  * @param baseDir - 源码所在文件夹目录
  * @param srcAst - 源码AST

package/core/util/ast.js

@@ -37,7 +37,7 @@ function outputObjectMethods(outPath, methods) {
 }
 exports.outputObjectMethods = outputObjectMethods;
 /**
- * 获取所有依赖第三方模块路径
+ * 获取所有依赖第三方模块路径(仅导入program下一级的require)
  * val xx = require('path') => [xx, absolute path]
  * @param baseDir - 源码所在文件夹目录
  * @param srcAst - 源码AST
@@ -47,28 +47,30 @@ exports.outputObjectMethods = outputObjectMethods;
 function getRequireModPaths(baseDir, srcAst, ignoreMod) {
     const modPathByName = new Map();
     (0, traverse_1.default)(srcAst, {
-        Identifier(nodePath) {
-            if (nodePath.node.name === "require") {
-                const callExpression = nodePath.findParent((path) => path.isCallExpression());
-                const args = callExpression === null || callExpression === void 0 ? void 0 : callExpression.node.arguments;
-                if ((args === null || args === void 0 ? void 0 : args.length) != 1) {
-                    return;
-                }
-                let modPath = args[0].value;
-                modPath = (0, scanf_1.scanfRequieMod)(baseDir, modPath);
-                const variableDeclarator = nodePath.findParent((path) => path.isVariableDeclarator());
-                if (!variableDeclarator) {
-                    return;
-                }
-                const id = variableDeclarator.node.id;
-                const ignore = ignoreMod === null || ignoreMod === void 0 ? void 0 : ignoreMod.includes(id.name);
-                if (ignore) {
-                    console.log(`ignore => ${id.name}`);
+        Program(path) {
+            path.node.body.filter(item => core_1.types.isVariableDeclaration(item)).flatMap(item => item.declarations)
+                .filter(item => {
+                if (core_1.types.isCallExpression(item.init) && core_1.types.isIdentifier(item.init.callee)) {
+                    if (item.init.callee.name === "require") {
+                        if (core_1.types.isIdentifier(item.id)) {
+                            if (ignoreMod === null || ignoreMod === void 0 ? void 0 : ignoreMod.includes(item.id.name)) {
+                                console.log(`ignore module => ${item.id.name}`);
+                            }
+                            else {
+                                return true;
+                            }
+                        }
+                    }
                 }
-                else {
-                    modPathByName.set(id.name, modPath);
+                return false;
+            }).forEach(item => {
+                const args = (item.init.arguments);
+                if (args.length) {
+                    const modName = item.id.name;
+                    const modPath = args[0].value;
+                    modPathByName.set(modName, (0, scanf_1.scanfRequieMod)(baseDir, modPath));
                 }
-            }
+            });
         }
     });
     return modPathByName;
@@ -300,7 +302,7 @@ function importMods(outDir, srcAst, mapContext) {
     const depNames = mapContext.getDependencyNameByMod("self");
     const importMods = depNames.map(name => {
         const srcPath = mapContext.getSrcPathByMod(name);
-        const requireFrom = (0, path_1.relative)(outDir, srcPath.replace(/index\.js$/, "")).replace(/[\\]+/g, "/");
+        const requireFrom = (0, path_1.relative)(outDir, srcPath.replace(/(index)?\.js$/, "")).replace(/[\\]+/g, "/");
         const variableDeclarator = core_1.types.variableDeclarator(core_1.types.identifier(name), core_1.types.callExpression(core_1.types.identifier("require"), [
             core_1.types.stringLiteral(requireFrom)
         ]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kezh/my-custom-js-converter",
-  "version": "0.1.52",
+  "version": "0.1.57",
   "description": "自定义代码转换器",
   "main": "index.js",
   "bin": {