babel-plugin-transform-taroapi 4.1.12-beta.11 → 4.1.12-beta.12

package/dist/index.js

@@ -25,6 +25,54 @@ const plugin = function (babel) {
         }
         return node;
     }
+    function getTaroNamespaceCall(t, callee, taroName, file) {
+        var _a;
+        let target = callee;
+        // 如果是可选调用（例如 Taro.JDMTA.isTrafficMapEnable?.()），先取里面的 callee
+        if (t.isOptionalCallExpression(target)) {
+            target = target.callee;
+        }
+        // 去掉 TS 断言 / 非空等包裹
+        target = stripTSCast(target);
+        if (!t.isMemberExpression(target) && !t.isOptionalMemberExpression(target)) {
+            return null;
+        }
+        // target.object 通常是 Taro.xx 这一层，
+        // 也可能是形如 (_tmp = Taro.xx) 这样的赋值表达式，需要再解一层。
+        let inner = stripTSCast(target.object);
+        // 兼容 222 这类形态：(_tmp = Taro.JDMTA).isTrafficMapEnable?.()
+        if (t.isAssignmentExpression(inner)) {
+            inner = stripTSCast(inner.right);
+        }
+        if (!t.isMemberExpression(inner) && !t.isOptionalMemberExpression(inner)) {
+            return null;
+        }
+        if (!t.isIdentifier(inner.object, { name: taroName })) {
+            return null;
+        }
+        let namespaceName = null;
+        if (t.isIdentifier(inner.property)) {
+            namespaceName = inner.property.name;
+        }
+        else if (t.isStringLiteral(inner.property)) {
+            namespaceName = inner.property.value;
+        }
+        let methodName = null;
+        if (t.isIdentifier(target.property)) {
+            methodName = target.property.name;
+        }
+        else if (t.isStringLiteral(target.property)) {
+            methodName = target.property.value;
+        }
+        if (!namespaceName || !methodName)
+            return null;
+        if (process.env.JDAPI_DEBUG_TAROAPI === 'true') {
+            const filename = ((_a = file === null || file === void 0 ? void 0 : file.opts) === null || _a === void 0 ? void 0 : _a.filename) || '';
+            // eslint-disable-next-line no-console
+            console.log('[jdapi-core-taroapi] getTaroNamespaceCall hit:', `${namespaceName}_${methodName}`, 'file =', filename);
+        }
+        return { namespaceName, methodName };
+    }
     // 这些变量需要在每个 program 里重置
     const invokedApis = new Map();
     let taroName;
@@ -164,31 +212,29 @@ const plugin = function (babel) {
                 const callee = ast.node.callee;
                 // 对存在命名空间的 API 支持 tree-shaking：Taro.xx.yy -> xx_yy
                 // 同时兼容：可选链调用（Taro?.JDMTA.pv() / Taro.JDMTA?.pv()）、TS 类型断言（as any / ! / satisfies）
-                if (t.isMemberExpression(callee) || t.isOptionalMemberExpression(callee)) {
-                    const rawObject = stripTSCast(callee.object);
-                    if (t.isMemberExpression(rawObject) || t.isOptionalMemberExpression(rawObject)) {
-                        const inner = rawObject;
-                        const isTaroNamespace = t.isIdentifier(inner.object, { name: taroName });
-                        if (isTaroNamespace) {
-                            const namespaceName = t.isIdentifier(inner.property) ? inner.property.name : (t.isStringLiteral(inner.property) ? inner.property.value : null);
-                            const methodName = t.isIdentifier(callee.property) ? callee.property.name : (t.isStringLiteral(callee.property) ? callee.property.value : null);
-                            if (namespaceName && methodName) {
-                                const flatName = `${namespaceName}_${methodName}`;
-                                if (this.apis.has(flatName)) {
-                                    let identifier;
-                                    if (invokedApis.has(flatName)) {
-                                        identifier = t.identifier(invokedApis.get(flatName));
-                                    }
-                                    else {
-                                        const newName = ast.scope.generateUid(flatName);
-                                        invokedApis.set(flatName, newName);
-                                        identifier = t.identifier(newName);
-                                    }
-                                    ast.node.callee = identifier;
-                                    return;
-                                }
-                            }
+                const nsInfo = getTaroNamespaceCall(t, callee, taroName, this.file);
+                if (nsInfo) {
+                    const { namespaceName, methodName } = nsInfo;
+                    const flatName = `${namespaceName}_${methodName}`;
+                    if (this.apis.has(flatName)) {
+                        let identifier;
+                        if (invokedApis.has(flatName)) {
+                            identifier = t.identifier(invokedApis.get(flatName));
+                        }
+                        else {
+                            const newName = ast.scope.generateUid(flatName);
+                            invokedApis.set(flatName, newName);
+                            identifier = t.identifier(newName);
+                        }
+                        // 如果当前是可选调用（OptionalCallExpression），直接将整条调用改写为普通函数调用，
+                        // 避免后续 preset-env 再对可选链做降级，导致重新依赖 Taro.JDMTA。
+                        if (t.isOptionalCallExpression(ast.node)) {
+                            ast.replaceWith(t.callExpression(identifier, ast.node.arguments));
+                        }
+                        else {
+                            ast.node.callee = identifier;
                         }
+                        return;
                     }
                 }
                 if (!ast.scope.hasReference(this.canIUse))
@@ -234,6 +280,45 @@ const plugin = function (babel) {
                     taroName = ast.scope.getBinding(this.bindingName)
                         ? ast.scope.generateUid(this.bindingName)
                         : this.bindingName;
+                    // 预扫描：在正式 visitor 遍历之前，先找到 import 确定 taroName，
+                    // 然后把所有 namespace API 的 OptionalCallExpression 降级为普通 CallExpression。
+                    // 这样可以抢在 @babel/plugin-transform-optional-chaining 展开可选链之前完成替换。
+                    const pkgName = this.packageName;
+                    let preScanTaroName = '';
+                    ast.traverse({
+                        ImportDeclaration(importPath) {
+                            if (importPath.node.source.value !== pkgName)
+                                return;
+                            for (const spec of importPath.node.specifiers) {
+                                if (t.isImportDefaultSpecifier(spec)) {
+                                    preScanTaroName = spec.local.name;
+                                    break;
+                                }
+                            }
+                            importPath.stop();
+                        }
+                    });
+                    if (preScanTaroName) {
+                        const apis = this.apis;
+                        const file = this.file;
+                        ast.traverse({
+                            OptionalCallExpression(optPath) {
+                                var _a;
+                                const nsInfo = getTaroNamespaceCall(t, optPath.node.callee, preScanTaroName, file);
+                                if (nsInfo) {
+                                    const flatName = `${nsInfo.namespaceName}_${nsInfo.methodName}`;
+                                    if (apis.has(flatName)) {
+                                        if (process.env.JDAPI_DEBUG_TAROAPI === 'true') {
+                                            const filename = ((_a = file === null || file === void 0 ? void 0 : file.opts) === null || _a === void 0 ? void 0 : _a.filename) || '';
+                                            // eslint-disable-next-line no-console
+                                            console.log('[jdapi-core-taroapi] pre-transform: strip optional call for', flatName, 'in file:', filename, 'code =', optPath.toString());
+                                        }
+                                        optPath.replaceWith(t.callExpression(optPath.node.callee, optPath.node.arguments));
+                                    }
+                                }
+                            }
+                        });
+                    }
                 },
                 exit(ast) {
                     const that = this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-taroapi",
-  "version": "4.1.12-beta.11",
+  "version": "4.1.12-beta.12",
   "author": "O2Team",
   "license": "MIT",
   "main": "dist/index.js",

package/src/index.ts

@@ -39,6 +39,72 @@ const plugin = function (babel: typeof BabelCore): BabelCore.PluginObj<IState> {
     return node
   }
 
+  function getTaroNamespaceCall (
+    t: typeof BabelCore.types,
+    callee: BabelCore.types.Expression,
+    taroName: string,
+    file?: BabelCore.BabelFile | null
+  ): { namespaceName: string, methodName: string } | null {
+    let target: any = callee
+
+    // 如果是可选调用（例如 Taro.JDMTA.isTrafficMapEnable?.()），先取里面的 callee
+    if (t.isOptionalCallExpression(target)) {
+      target = target.callee
+    }
+
+    // 去掉 TS 断言 / 非空等包裹
+    target = stripTSCast(target)
+
+    if (!t.isMemberExpression(target) && !t.isOptionalMemberExpression(target)) {
+      return null
+    }
+
+    // target.object 通常是 Taro.xx 这一层，
+    // 也可能是形如 (_tmp = Taro.xx) 这样的赋值表达式，需要再解一层。
+    let inner: any = stripTSCast(target.object)
+    // 兼容 222 这类形态：(_tmp = Taro.JDMTA).isTrafficMapEnable?.()
+    if (t.isAssignmentExpression(inner)) {
+      inner = stripTSCast(inner.right)
+    }
+
+    if (!t.isMemberExpression(inner) && !t.isOptionalMemberExpression(inner)) {
+      return null
+    }
+
+    if (!t.isIdentifier(inner.object, { name: taroName })) {
+      return null
+    }
+
+    let namespaceName: string | null = null
+    if (t.isIdentifier(inner.property)) {
+      namespaceName = inner.property.name
+    } else if (t.isStringLiteral(inner.property)) {
+      namespaceName = inner.property.value
+    }
+
+    let methodName: string | null = null
+    if (t.isIdentifier(target.property)) {
+      methodName = target.property.name
+    } else if (t.isStringLiteral(target.property)) {
+      methodName = target.property.value
+    }
+
+    if (!namespaceName || !methodName) return null
+
+    if (process.env.JDAPI_DEBUG_TAROAPI === 'true') {
+      const filename = file?.opts?.filename || ''
+      // eslint-disable-next-line no-console
+      console.log(
+        '[jdapi-core-taroapi] getTaroNamespaceCall hit:',
+        `${namespaceName}_${methodName}`,
+        'file =',
+        filename
+      )
+    }
+
+    return { namespaceName, methodName }
+  }
+
   // 这些变量需要在每个 program 里重置
   const invokedApis: Map<string, string> = new Map()
   let taroName: string
@@ -188,33 +254,34 @@ const plugin = function (babel: typeof BabelCore): BabelCore.PluginObj<IState> {
       },
       'CallExpression|OptionalCallExpression' (ast: BabelCore.NodePath<any>) {
         const callee = ast.node.callee
-
         // 对存在命名空间的 API 支持 tree-shaking：Taro.xx.yy -> xx_yy
         // 同时兼容：可选链调用（Taro?.JDMTA.pv() / Taro.JDMTA?.pv()）、TS 类型断言（as any / ! / satisfies）
-        if (t.isMemberExpression(callee) || t.isOptionalMemberExpression(callee)) {
-          const rawObject = stripTSCast(callee.object)
-          if (t.isMemberExpression(rawObject) || t.isOptionalMemberExpression(rawObject)) {
-            const inner = rawObject
-            const isTaroNamespace = t.isIdentifier(inner.object, { name: taroName })
-            if (isTaroNamespace) {
-              const namespaceName = t.isIdentifier(inner.property) ? inner.property.name : (t.isStringLiteral(inner.property) ? inner.property.value : null)
-              const methodName = t.isIdentifier(callee.property) ? callee.property.name : (t.isStringLiteral(callee.property) ? callee.property.value : null)
-              if (namespaceName && methodName) {
-                const flatName = `${namespaceName}_${methodName}`
-                if (this.apis.has(flatName)) {
-                  let identifier: BabelCore.types.Identifier
-                  if (invokedApis.has(flatName)) {
-                    identifier = t.identifier(invokedApis.get(flatName)!)
-                  } else {
-                    const newName = ast.scope.generateUid(flatName)
-                    invokedApis.set(flatName, newName)
-                    identifier = t.identifier(newName)
-                  }
-                  ast.node.callee = identifier as any
-                  return
-                }
-              }
+        const nsInfo = getTaroNamespaceCall(t, callee as any, taroName, this.file as any)
+        if (nsInfo) {
+          const { namespaceName, methodName } = nsInfo
+          const flatName = `${namespaceName}_${methodName}`
+          if (this.apis.has(flatName)) {
+            let identifier: BabelCore.types.Identifier
+            if (invokedApis.has(flatName)) {
+              identifier = t.identifier(invokedApis.get(flatName)!)
+            } else {
+              const newName = ast.scope.generateUid(flatName)
+              invokedApis.set(flatName, newName)
+              identifier = t.identifier(newName)
+            }
+            // 如果当前是可选调用（OptionalCallExpression），直接将整条调用改写为普通函数调用，
+            // 避免后续 preset-env 再对可选链做降级，导致重新依赖 Taro.JDMTA。
+            if (t.isOptionalCallExpression(ast.node)) {
+              ast.replaceWith(
+                t.callExpression(
+                  identifier,
+                  ast.node.arguments as any
+                )
+              )
+            } else {
+              ast.node.callee = identifier as any
             }
+            return
           }
         }
 
@@ -260,6 +327,57 @@ const plugin = function (babel: typeof BabelCore): BabelCore.PluginObj<IState> {
           taroName = ast.scope.getBinding(this.bindingName)
             ? ast.scope.generateUid(this.bindingName)
             : this.bindingName
+
+          // 预扫描：在正式 visitor 遍历之前，先找到 import 确定 taroName，
+          // 然后把所有 namespace API 的 OptionalCallExpression 降级为普通 CallExpression。
+          // 这样可以抢在 @babel/plugin-transform-optional-chaining 展开可选链之前完成替换。
+          const pkgName = this.packageName
+          let preScanTaroName = ''
+          ast.traverse({
+            ImportDeclaration (importPath: BabelCore.NodePath<BabelCore.types.ImportDeclaration>) {
+              if (importPath.node.source.value !== pkgName) return
+              for (const spec of importPath.node.specifiers) {
+                if (t.isImportDefaultSpecifier(spec)) {
+                  preScanTaroName = spec.local.name
+                  break
+                }
+              }
+              importPath.stop()
+            }
+          })
+
+          if (preScanTaroName) {
+            const apis = this.apis
+            const file = this.file as any
+            ast.traverse({
+              OptionalCallExpression (optPath: BabelCore.NodePath<BabelCore.types.OptionalCallExpression>) {
+                const nsInfo = getTaroNamespaceCall(t, optPath.node.callee as any, preScanTaroName, file)
+                if (nsInfo) {
+                  const flatName = `${nsInfo.namespaceName}_${nsInfo.methodName}`
+                  if (apis.has(flatName)) {
+                    if (process.env.JDAPI_DEBUG_TAROAPI === 'true') {
+                      const filename = file?.opts?.filename || ''
+                      // eslint-disable-next-line no-console
+                      console.log(
+                        '[jdapi-core-taroapi] pre-transform: strip optional call for',
+                        flatName,
+                        'in file:',
+                        filename,
+                        'code =',
+                        optPath.toString()
+                      )
+                    }
+                    optPath.replaceWith(
+                      t.callExpression(
+                        optPath.node.callee as any,
+                        optPath.node.arguments as any
+                      )
+                    )
+                  }
+                }
+              }
+            })
+          }
         },
         exit (ast) {
           const that = this