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

package/core/util/ast.js

@@ -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}`;
                     }
@@ -302,18 +302,21 @@ function deleteModMethods(srcAst, mapContext) {
         }
     });
     (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 depNames = [...deps]
+                .filter((name) => methodName.lastIndexOf(`__${name}`) !== -1)
+                .map((name) => name);
+            if (depNames.length) {
+                const depName = depNames[0];
+                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.44",
   "description": "自定义代码转换器",
   "main": "index.js",
   "bin": {