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

package/core/context/map_context.js

@@ -83,7 +83,8 @@ class MapContext {
         }
         const requireModPathByName = (0, ast_1.getRequireModPaths)(path_1.default.dirname(inPath), srcAst);
         const requireModNames = [...requireModPathByName.keys()].map((name) => name);
-        const requireMethodNamesByMod = (0, ast_1.getRequireMethodNames)(srcAst, requireModNames);
+        !root && requireModNames.unshift(entry);
+        const requireMethodNamesByMod = (0, ast_1.getRequireMethodNames)(srcAst, entry, requireModNames);
         const dependencies = new map_config_1.Dependencies();
         requireModNames.forEach((name) => {
             const dep = new map_config_1.Dependency(requireMethodNamesByMod.get(name));
@@ -99,37 +100,50 @@ class MapContext {
      * 过滤self的dependencies中无效方法
      */
     filtering() {
-        const self = "self";
-        const selfMod = this.getMod(self);
-        if (selfMod) {
-            const dependencies = selfMod.dependencies;
+        this.getModNames().forEach((modName) => {
+            const mod = this.getMod(modName);
+            const dependencies = mod.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);
-            if (!depNames.length) {
-                return;
-            }
-            const methodNames = this.getMethodNamesByMod(modName);
-            if (!methodNames.length) {
-                return;
+        const astMap = new Map();
+        this.getModNames().forEach((mod) => {
+            astMap.set(mod, (0, ast_1.parseSrcAst)(this.getMod(mod).src));
+        });
+        const useMethodNameMap = new Map();
+        this.getModNames().forEach((mod) => {
+            useMethodNameMap.set(mod, this.getMethodNamesByMod(mod));
+        });
+        const dependencies = this.getMod("self").dependencies;
+        const filterMethodMap = new Map();
+        const readyStack = Object.keys(dependencies).flatMap((name) => dependencies[name].methods.map((method) => [name, method]));
+        while (readyStack.length) {
+            const method = readyStack.shift();
+            let filterMethods = new Set();
+            if (filterMethodMap.has(method[0])) {
+                filterMethods = filterMethodMap.get(method[0]);
             }
-            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)
-                    : []);
+            filterMethods.add(method[1]);
+            filterMethodMap.set(method[0], filterMethods);
+            const inlineMethods = (0, ast_1.getInlineMethodsByMethodName)(astMap.get(method[0]), method[0], method[1], useMethodNameMap);
+            readyStack.push(...inlineMethods.map((m) => m.split("#")));
+        }
+        [...filterMethodMap.keys()].forEach((fMod) => {
+            const filterMethods = filterMethodMap.get(fMod);
+            this.getModNames().forEach((modName) => {
+                var _a;
+                const dep = (_a = this.getMod(modName)) === null || _a === void 0 ? void 0 : _a.dependencies[fMod];
+                if (dep) {
+                    dep.methods = dep.methods.filter((m) => filterMethods.has(m));
+                }
             });
         });
     }

package/core/util/ast.d.ts

@@ -2,7 +2,7 @@ import { Node } from "@babel/core";
 import { ObjectMethod } from "@babel/types";
 import { Mod } from "../config/map_config";
 import { MapContext } from "../context/map_context";
-declare type AstType = Node | Node[] | null | undefined;
+export declare type AstType = Node | Node[] | null | undefined;
 export declare function parseSrcAst(srcPath?: string): AstType;
 export declare function outputObjectMethods(outPath: string, methods: ObjectMethod[]): void;
 /**
@@ -15,12 +15,13 @@ export declare function outputObjectMethods(outPath: string, methods: ObjectMeth
  */
 export declare function getRequireModPaths(baseDir: string, srcAst: AstType, ignoreMod?: string[]): Map<string, string>;
 /**
- * 获取源码中引用的第三方模块方法名
+ * 获取源码方法中引用的第三方模块方法名和自身模块方法名
  * @param mod - 依赖模块
+ * @param entry - 入口对象
  * @param srcAst - 源码AST
  * @returns
  */
-export declare function getRequireMethodNames(srcAst: AstType, mod: string[]): Map<string, string[]>;
+export declare function getRequireMethodNames(srcAst: AstType, entry: string, mod: string[]): Map<string, string[]>;
 /**
  * 获取方法名
  * @param methods
@@ -51,6 +52,13 @@ export declare function getObjectMehtodsByMehtodNamesAndInsideOwnMethods(srcAst:
  * @param root
  */
 export declare function modifyObjectMethods(srcAst: AstType, entry: string, mod: Mod, methods: ObjectMethod[], root?: boolean): void;
+/**
+ * 获取调用方法中所依赖第三方模块方法名
+ * @param srcAst
+ * @param methodNames - 调用方法名
+ * @param depNames - 依赖模块名
+ * @returns
+ */
 export declare function getDependentMethodNames(srcAst: AstType, methodNames: string[], depNames: string[]): Map<string, string[]>;
 /**
  * 生成导入语句
@@ -65,4 +73,11 @@ export declare function importMods(outDir: string, srcAst: AstType, mapContext:
  * @param srcAst - 源码AST
  */
 export declare function deleteModMethods(srcAst: AstType, mapContext: MapContext): void;
-export {};
+/**
+ * 获取方法内部调用的方法名
+ * @param srcAst - 源码AST
+ * @param entry - 入口
+ * @param methodName - 方法名
+ * @param mapContext
+ */
+export declare function getInlineMethodsByMethodName(srcAst: AstType, entry: string, methodName: string, useMethodNameMap: Map<string, string[]>): string[];

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.getDependentMethodNames = exports.modifyObjectMethods = exports.getObjectMehtodsByMehtodNamesAndInsideOwnMethods = exports.getObjectMethodsByEntryAndMethodNames = exports.getObjectMethodNames = exports.getRequireMethodNames = exports.getRequireModPaths = exports.outputObjectMethods = exports.parseSrcAst = void 0;
+exports.getInlineMethodsByMethodName = 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"));
@@ -81,25 +81,32 @@ function getRequireModPaths(baseDir, srcAst, ignoreMod) {
 }
 exports.getRequireModPaths = getRequireModPaths;
 /**
- * 获取源码中引用的第三方模块方法名
+ * 获取源码方法中引用的第三方模块方法名和自身模块方法名
  * @param mod - 依赖模块
+ * @param entry - 入口对象
  * @param srcAst - 源码AST
  * @returns
  */
-function getRequireMethodNames(srcAst, mod) {
+function getRequireMethodNames(srcAst, entry, mod) {
     const methodsByMod = new Map();
     (0, traverse_1.default)(srcAst, {
         MemberExpression(path) {
-            const invokeObj = path.node.object;
-            if (!core_1.types.isIdentifier(invokeObj)) {
-                return;
-            }
             const invokeMethod = path.node.property;
             if (!core_1.types.isIdentifier(invokeMethod)) {
                 return;
             }
-            const key = invokeObj.name;
-            if (!mod.includes(key)) {
+            const invokeObj = path.node.object;
+            let key = null;
+            if (core_1.types.isIdentifier(invokeObj)) {
+                key = invokeObj.name;
+                if (!mod.includes(key)) {
+                    return;
+                }
+            }
+            else if (core_1.types.isThisExpression(invokeObj)) {
+                key = entry;
+            }
+            if (!key) {
                 return;
             }
             let methods = [];
@@ -276,6 +283,13 @@ function modifyObjectMethods(srcAst, entry, mod, methods, root = false) {
     });
 }
 exports.modifyObjectMethods = modifyObjectMethods;
+/**
+ * 获取调用方法中所依赖第三方模块方法名
+ * @param srcAst
+ * @param methodNames - 调用方法名
+ * @param depNames - 依赖模块名
+ * @returns
+ */
 function getDependentMethodNames(srcAst, methodNames, depNames) {
     const methodNamesByDepName = new Map();
     (0, traverse_1.default)(srcAst, {
@@ -373,3 +387,46 @@ function deleteModMethods(srcAst, mapContext) {
     });
 }
 exports.deleteModMethods = deleteModMethods;
+/**
+ * 获取方法内部调用的方法名
+ * @param srcAst - 源码AST
+ * @param entry - 入口
+ * @param methodName - 方法名
+ * @param mapContext
+ */
+function getInlineMethodsByMethodName(srcAst, entry, methodName, useMethodNameMap) {
+    const inlineMethods = new Set();
+    const selfMethods = useMethodNameMap.get(entry);
+    const mods = [...useMethodNameMap.keys()];
+    (0, traverse_1.default)(srcAst, {
+        MemberExpression(path) {
+            const objectMethodPath = path.findParent((path) => core_1.types.isObjectMethod(path));
+            if (!objectMethodPath) {
+                return;
+            }
+            if (!core_1.types.isIdentifier(objectMethodPath.node.key)) {
+                return;
+            }
+            if (objectMethodPath.node.key.name !== methodName) {
+                return;
+            }
+            if (core_1.types.isThisExpression(path.node.object) &&
+                core_1.types.isIdentifier(path.node.property)) {
+                if (selfMethods.includes(path.node.property.name)) {
+                    inlineMethods.add(`${entry}#${path.node.property.name}`);
+                }
+            }
+            if (core_1.types.isIdentifier(path.node.object) &&
+                core_1.types.isIdentifier(path.node.property)) {
+                const modName = path.node.object.name;
+                const methodName = path.node.property.name;
+                if (mods.includes(modName) &&
+                    useMethodNameMap.get(modName).includes(methodName)) {
+                    inlineMethods.add(`${modName}#${methodName}`);
+                }
+            }
+        }
+    });
+    return [...inlineMethods];
+}
+exports.getInlineMethodsByMethodName = getInlineMethodsByMethodName;

package/package.json

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