@kezh/my-custom-js-converter 0.0.17 → 0.0.19

package/core/encode.js

@@ -99,8 +99,11 @@ function getImportMethods(modPathByName, methodNamesByMod) {
             return [];
         }
         const modMethodNames = modMethods.map((m) => m.key.name);
+        console.log(`mod methods => ${modMethodNames}`);
         const useMethodNames = methodNamesByMod.get(name);
+        console.log(`use methods => ${useMethodNames}`);
         const inlineMethodNames = getInlineThisMethodNames(modMethodNames, useMethodNames, modAst);
+        console.log(`inline methods => ${inlineMethodNames}`);
         let mergeMethodNames = [
             ...new Set([...useMethodNames, ...inlineMethodNames])
         ];
@@ -241,13 +244,27 @@ function getSrcMethodNames(entry, srcAst) {
 function getMethods(entry, ast) {
     const methods = [];
     (0, traverse_1.default)(ast, {
-        Identifier(path) {
-            if (path.node.name === entry) {
-                const declarator = path.findParent((path) => path.isVariableDeclarator());
-                const methodBody = declarator === null || declarator === void 0 ? void 0 : declarator.node.init;
-                const inlineMethods = methodBody === null || methodBody === void 0 ? void 0 : methodBody.properties;
-                (inlineMethods === null || inlineMethods === void 0 ? void 0 : inlineMethods.length) && methods.push(...inlineMethods);
-            }
+        Program(path) {
+            path.node.body.forEach((statement) => {
+                if (core_1.types.isVariableDeclaration(statement)) {
+                    const variableDeclaration = statement;
+                    variableDeclaration.declarations.filter((declaration) => {
+                        if (core_1.types.isIdentifier(declaration.id)) {
+                            const id = declaration.id;
+                            if (id.name === entry) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    }).forEach((declaration) => {
+                        if (core_1.types.isObjectExpression(declaration.init)) {
+                            const init = declaration.init;
+                            const objectMethods = init.properties.filter(property => core_1.types.isObjectMethod(property));
+                            methods.push(...objectMethods);
+                        }
+                    });
+                }
+            });
         }
     });
     return methods;

package/package.json

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