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

package/core/context/map_context.d.ts

@@ -10,8 +10,11 @@ export declare class MapContext {
     getModNames(): string[];
     getMod(name: string): Mod | null | undefined;
     getMethodNamesByMod(name: string): string[];
+    getDependencyNameByMod(name: string): string[];
+    getSrcPathByMod(name: string): string | undefined;
     static readFromLocal(inDir: string): MapContext;
     private init;
     private writeToLocal;
     private buildMapContext;
+    private shaking;
 }

package/core/context/map_context.js

@@ -35,6 +35,18 @@ class MapContext {
             .forEach((methods) => methodNames.add(methods));
         return [...methodNames];
     }
+    getDependencyNameByMod(name) {
+        const mod = this.getMod(name);
+        const deps = mod === null || mod === void 0 ? void 0 : mod.dependencies;
+        if (deps) {
+            return Object.keys(deps);
+        }
+        return [];
+    }
+    getSrcPathByMod(name) {
+        var _a;
+        return (_a = this.getMod(name)) === null || _a === void 0 ? void 0 : _a.src;
+    }
     static readFromLocal(inDir) {
         const inPath = path_1.default.join(inDir, MapContext.SAVE_FILE);
         console.log(`input map => ${inPath}`);
@@ -46,6 +58,7 @@ class MapContext {
     }
     init() {
         this.buildMapContext(this.srcPath, this.entry, true);
+        this.shaking();
         this.writeToLocal();
     }
     writeToLocal() {
@@ -81,6 +94,26 @@ class MapContext {
             this.buildMapContext(modPath, name, false);
         });
     }
+    shaking() {
+        this.getModNames().forEach((modName) => {
+            const depNames = this.getDependencyNameByMod(modName);
+            if (!depNames.length) {
+                return;
+            }
+            const methodNames = this.getMethodNamesByMod(modName);
+            if (!methodNames.length) {
+                return;
+            }
+            const srcAst = (0, ast_1.parseSrcAst)(this.getSrcPathByMod(modName));
+            const methodNamesByDepName = (0, ast_1.getDependentMethodNames)(srcAst, methodNames, depNames);
+            const mod = this.getMod(modName);
+            depNames.forEach((depName) => {
+                mod.dependencies[depName] = new map_config_1.Dependency(methodNamesByDepName.has(depName)
+                    ? methodNamesByDepName.get(depName)
+                    : []);
+            });
+        });
+    }
 }
 exports.MapContext = MapContext;
 MapContext.SAVE_FILE = "mod.map";

package/core/util/ast.d.ts

@@ -43,6 +43,14 @@ export declare function getObjectMethodsByEntryAndMethodNames(srcAst: AstType, e
  */
 export declare function getObjectMehtodsByMehtodNamesAndInsideOwnMethods(srcAst: AstType, entry: string, methodNames: string[]): ObjectMethod[];
 export declare function modifyObjectMethods(srcAst: AstType, entry: string, mod: Mod, methods: ObjectMethod[], root?: boolean): void;
+export declare function getDependentMethodNames(srcAst: AstType, methodNames: string[], depNames: string[]): Map<string, string[]>;
+/**
+ * 生成导入语句
+ * const mod = require($modPath);
+ * @param outDir
+ * @param srcAst
+ * @param mapContext
+ */
 export declare function importMods(outDir: string, srcAst: AstType, mapContext: MapContext): void;
 /**
  * 去除第三方模块方法

package/core/util/ast.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteModMethods = exports.importMods = exports.modifyObjectMethods = exports.getObjectMehtodsByMehtodNamesAndInsideOwnMethods = exports.getObjectMethodsByEntryAndMethodNames = exports.getObjectMethodNames = exports.getRequireMethodNames = exports.getRequireModPaths = exports.outputObjectMethods = exports.parseSrcAst = void 0;
+exports.deleteModMethods = exports.importMods = exports.getDependentMethodNames = exports.modifyObjectMethods = exports.getObjectMehtodsByMehtodNamesAndInsideOwnMethods = exports.getObjectMethodsByEntryAndMethodNames = exports.getObjectMethodNames = exports.getRequireMethodNames = exports.getRequireModPaths = exports.outputObjectMethods = exports.parseSrcAst = void 0;
 const fs_1 = __importDefault(require("fs"));
 const parser_1 = require("@babel/parser");
 const traverse_1 = __importDefault(require("@babel/traverse"));
@@ -223,7 +223,7 @@ function getInsideOwnMethodNames(srcAst, entry, methodNames, allMethodNameSet =
     return insideMethodNames;
 }
 function modifyObjectMethods(srcAst, entry, mod, methods, root = false) {
-    const deps = [entry, ...Object.keys(mod.dependencies)];
+    const deps = Object.keys(mod.dependencies);
     const methodNames = getObjectMethodNames(methods);
     (0, traverse_1.default)(srcAst, {
         MemberExpression(path) {
@@ -238,11 +238,11 @@ function modifyObjectMethods(srcAst, entry, mod, methods, root = false) {
             }
             if (core_1.types.isIdentifier(path.node.object)) {
                 const depName = path.node.object.name;
-                if (deps.includes(depName)) {
+                if (root && depName === entry) {
+                    path.node.object = core_1.types.thisExpression();
+                }
+                else if (deps.includes(depName)) {
                     path.node.object = core_1.types.thisExpression();
-                    if (root) {
-                        return;
-                    }
                     if (core_1.types.isIdentifier(path.node.property)) {
                         path.node.property.name = `${path.node.property.name}__${depName}`;
                     }
@@ -261,13 +261,46 @@ function modifyObjectMethods(srcAst, entry, mod, methods, root = false) {
     });
 }
 exports.modifyObjectMethods = modifyObjectMethods;
+function getDependentMethodNames(srcAst, methodNames, depNames) {
+    const methodNamesByDepName = new Map();
+    (0, traverse_1.default)(srcAst, {
+        MemberExpression(path) {
+            var _a;
+            const objectMethodNode = path.findParent((path) => core_1.types.isObjectMethod(path));
+            if (!core_1.types.isIdentifier(objectMethodNode === null || objectMethodNode === void 0 ? void 0 : objectMethodNode.node.key)) {
+                return;
+            }
+            if (!methodNames.includes(objectMethodNode.node.key.name)) {
+                return;
+            }
+            if (!(core_1.types.isIdentifier(path.node.object) &&
+                core_1.types.isIdentifier(path.node.property))) {
+                return;
+            }
+            if (depNames.includes(path.node.object.name)) {
+                const depName = path.node.object.name;
+                if (!methodNamesByDepName.has(depName)) {
+                    methodNamesByDepName.set(depName, []);
+                }
+                (_a = methodNamesByDepName.get(depName)) === null || _a === void 0 ? void 0 : _a.push(path.node.property.name);
+            }
+        }
+    });
+    return methodNamesByDepName;
+}
+exports.getDependentMethodNames = getDependentMethodNames;
+/**
+ * 生成导入语句
+ * const mod = require($modPath);
+ * @param outDir
+ * @param srcAst
+ * @param mapContext
+ */
 function importMods(outDir, srcAst, mapContext) {
-    const importMods = mapContext
-        .getModNames()
-        .filter((name) => name !== "self")
-        .map((name) => {
-        const mod = mapContext.getMod(name);
-        const requireFrom = (0, path_1.relative)(outDir, mod.src.replace(/index\.js$/, "")).replace(/[\\]+/g, "/");
+    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 variableDeclarator = core_1.types.variableDeclarator(core_1.types.identifier(name), core_1.types.callExpression(core_1.types.identifier("require"), [
             core_1.types.stringLiteral(requireFrom)
         ]));
@@ -296,24 +329,25 @@ function deleteModMethods(srcAst, mapContext) {
                 return;
             }
             const methodName = path.node.key.name;
-            const isDepMethod = [...deps].filter((name) => methodName.lastIndexOf(`__${name}`) !== -1)
-                .length > 0;
-            isDepMethod && path.remove();
+            const split = methodName.split("__");
+            const depName = split.length ? split[split.length - 1] : "";
+            deps.has(depName) && path.remove();
         }
     });
     (0, traverse_1.default)(srcAst, {
-        Identifier(path) {
-            const id = path.node.name;
-            [...deps]
-                .filter((name) => id.lastIndexOf(`__${name}`) !== -1)
-                .forEach((name) => {
-                path.node.name = id.replace(`__${name}`, "");
-                const expression = path.findParent((path) => path.isMemberExpression());
-                if (!core_1.types.isThisExpression(expression === null || expression === void 0 ? void 0 : expression.object)) {
-                    return;
+        MemberExpression(path) {
+            if (!core_1.types.isIdentifier(path.node.property)) {
+                return;
+            }
+            const methodName = path.node.property.name;
+            const split = methodName.split("__");
+            const depName = split.length ? split[split.length - 1] : "";
+            if (deps.has(depName)) {
+                path.node.property.name = methodName.replace(`__${depName}`, "");
+                if (core_1.types.isThisExpression(path.node.object)) {
+                    path.node.object = core_1.types.identifier(depName);
                 }
-                expression.object = core_1.types.identifier(name);
-            });
+            }
         }
     });
 }

package/package.json

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