@kezh/my-custom-js-converter 0.1.58 → 0.1.62

package/core/context/map_context.d.ts

@@ -16,5 +16,12 @@ export declare class MapContext {
     private init;
     private writeToLocal;
     private buildMapContext;
+    /**
+     * 过滤self的dependencies中无效方法
+     */
+    private filtering;
+    /**
+     * 去除dependencies中未使用方法
+     */
     private shaking;
 }

package/core/context/map_context.js

@@ -58,6 +58,7 @@ class MapContext {
     }
     init() {
         this.buildMapContext(this.srcPath, this.entry, true);
+        this.filtering();
         this.shaking();
         this.writeToLocal();
     }
@@ -94,6 +95,24 @@ class MapContext {
             this.buildMapContext(modPath, name, false);
         });
     }
+    /**
+     * 过滤self的dependencies中无效方法
+     */
+    filtering() {
+        const self = "self";
+        const selfMod = this.getMod(self);
+        if (selfMod) {
+            const dependencies = selfMod.dependencies;
+            Object.keys(dependencies).forEach((depName) => {
+                const srcAst = (0, ast_1.parseSrcAst)(this.getSrcPathByMod(depName));
+                const methodNames = (0, ast_1.getObjectMethodNames)((0, ast_1.getObjectMethodsByEntryAndMethodNames)(srcAst, depName, dependencies[depName].methods));
+                dependencies[depName].methods = methodNames;
+            });
+        }
+    }
+    /**
+     * 去除dependencies中未使用方法
+     */
     shaking() {
         this.getModNames().forEach((modName) => {
             const depNames = this.getDependencyNameByMod(modName);

package/core/util/ast.d.ts

@@ -42,6 +42,14 @@ export declare function getObjectMethodsByEntryAndMethodNames(srcAst: AstType, e
  * @param methods
  */
 export declare function getObjectMehtodsByMehtodNamesAndInsideOwnMethods(srcAst: AstType, entry: string, methodNames: string[]): ObjectMethod[];
+/**
+ * 修改依赖方法调用者
+ * @param srcAst
+ * @param entry
+ * @param mod
+ * @param methods
+ * @param root
+ */
 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[]>;
 /**

package/core/util/ast.js

@@ -48,9 +48,12 @@ function getRequireModPaths(baseDir, srcAst, ignoreMod) {
     const modPathByName = new Map();
     (0, traverse_1.default)(srcAst, {
         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)) {
+            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)) {
@@ -63,8 +66,9 @@ function getRequireModPaths(baseDir, srcAst, ignoreMod) {
                     }
                 }
                 return false;
-            }).forEach(item => {
-                const args = (item.init.arguments);
+            })
+                .forEach((item) => {
+                const args = item.init.arguments;
                 if (args.length) {
                     const modName = item.id.name;
                     const modPath = args[0].value;
@@ -224,6 +228,14 @@ function getInsideOwnMethodNames(srcAst, entry, methodNames, allMethodNameSet =
     insideMethodNames.push(...getInsideOwnMethodNames(srcAst, entry, insideMethodNames, allMethodNameSet));
     return insideMethodNames;
 }
+/**
+ * 修改依赖方法调用者
+ * @param srcAst
+ * @param entry
+ * @param mod
+ * @param methods
+ * @param root
+ */
 function modifyObjectMethods(srcAst, entry, mod, methods, root = false) {
     const deps = Object.keys(mod.dependencies);
     const methodNames = getObjectMethodNames(methods);
@@ -244,8 +256,9 @@ function modifyObjectMethods(srcAst, entry, mod, methods, root = false) {
                     path.node.object = core_1.types.thisExpression();
                 }
                 else if (deps.includes(depName)) {
-                    path.node.object = core_1.types.thisExpression();
-                    if (core_1.types.isIdentifier(path.node.property)) {
+                    if (core_1.types.isIdentifier(path.node.property) &&
+                        mod.dependencies[depName].methods.includes(path.node.property.name)) {
+                        path.node.object = core_1.types.thisExpression();
                         path.node.property.name = `${path.node.property.name}__${depName}`;
                     }
                 }
@@ -300,7 +313,7 @@ exports.getDependentMethodNames = getDependentMethodNames;
  */
 function importMods(outDir, srcAst, mapContext) {
     const depNames = mapContext.getDependencyNameByMod("self");
-    const importMods = depNames.map(name => {
+    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"), [
@@ -332,6 +345,9 @@ function deleteModMethods(srcAst, mapContext) {
             }
             const methodName = path.node.key.name;
             const split = methodName.split("__");
+            if (split.length < 2) {
+                return;
+            }
             const depName = split.length ? split[split.length - 1] : "";
             deps.has(depName) && path.remove();
         }
@@ -343,7 +359,7 @@ function deleteModMethods(srcAst, mapContext) {
             }
             const methodName = path.node.property.name;
             const split = methodName.split("__");
-            if (split.length > 1) {
+            if (split.length < 2) {
                 return;
             }
             const depName = split[split.length - 1];

package/package.json

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