babel-plugin-transform-taroapi 4.2.1-beta.1 → 4.2.1-beta.3

package/dist/index.js

@@ -16,63 +16,6 @@ const plugin = function (babel) {
         ariaValuenow: 'aria-valuenow',
         ariaValuetext: 'aria-valuetext',
     };
-    function stripTSCast(node) {
-        while (t.isTSAsExpression(node) ||
-            t.isTSTypeAssertion(node) ||
-            t.isTSNonNullExpression(node) ||
-            (t.isTSSatisfiesExpression && t.isTSSatisfiesExpression(node))) {
-            node = node.expression;
-        }
-        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;
@@ -141,40 +84,10 @@ const plugin = function (babel) {
                     }
                 });
             },
-            'MemberExpression|OptionalMemberExpression'(ast) {
-                const node = ast.node;
-                // 处理两层命名空间属性访问：Taro.xx.yy / Taro?.xx?.yy（非调用场景）
-                // 调用场景由 CallExpression|OptionalCallExpression 负责
-                const isCalleeOfCall = (t.isCallExpression(ast.parent) || t.isOptionalCallExpression(ast.parent)) && ast.parent.callee === node;
-                if (!isCalleeOfCall) {
-                    const innerObj = stripTSCast(node.object);
-                    if (t.isMemberExpression(innerObj) || t.isOptionalMemberExpression(innerObj)) {
-                        const isTaroNamespace = t.isIdentifier(innerObj.object, { name: taroName });
-                        if (isTaroNamespace) {
-                            const namespaceName = t.isIdentifier(innerObj.property) ? innerObj.property.name : (t.isStringLiteral(innerObj.property) ? innerObj.property.value : null);
-                            const methodName = t.isIdentifier(node.property) ? node.property.name : (t.isStringLiteral(node.property) ? node.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.replaceWith(identifier);
-                                    return;
-                                }
-                            }
-                        }
-                    }
-                }
+            MemberExpression(ast) {
                 /* 处理 Taro.xxx */
-                const isTaro = t.isIdentifier(node.object, { name: taroName });
-                const property = node.property;
+                const isTaro = t.isIdentifier(ast.node.object, { name: taroName });
+                const property = ast.node.property;
                 let propertyName = null;
                 let propName = 'name';
                 if (!isTaro)
@@ -189,7 +102,7 @@ const plugin = function (babel) {
                 // 同一 api 使用多次，读取变量名
                 if (this.apis.has(propertyName)) {
                     const parentNode = ast.parent;
-                    const isAssignment = t.isAssignmentExpression(parentNode) && parentNode.left === node;
+                    const isAssignment = t.isAssignmentExpression(parentNode) && parentNode.left === ast.node;
                     if (!isAssignment) {
                         let identifier;
                         if (invokedApis.has(propertyName)) {
@@ -208,37 +121,10 @@ const plugin = function (babel) {
                     needDefault = true;
                 }
             },
-            'CallExpression|OptionalCallExpression'(ast) {
-                const callee = ast.node.callee;
-                // 对存在命名空间的 API 支持 tree-shaking：Taro.xx.yy -> xx_yy
-                // 同时兼容：可选链调用（Taro?.JDMTA.pv() / Taro.JDMTA?.pv()）、TS 类型断言（as any / ! / satisfies）
-                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;
-                    }
-                }
+            CallExpression(ast) {
                 if (!ast.scope.hasReference(this.canIUse))
                     return;
+                const callee = ast.node.callee;
                 if (t.isMemberExpression(callee) && t.isIdentifier(callee.object, { name: taroName })) {
                     let propertyName = null;
                     let propName = 'name';
@@ -280,45 +166,6 @@ 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.2.1-beta.1",
+  "version": "4.2.1-beta.3",
   "author": "O2Team",
   "license": "MIT",
   "main": "dist/index.js",

package/src/index.ts

@@ -27,84 +27,6 @@ const plugin = function (babel: typeof BabelCore): BabelCore.PluginObj<IState> {
     ariaValuetext: 'aria-valuetext',
   }
 
-  function stripTSCast (node: any): any {
-    while (
-      t.isTSAsExpression(node) ||
-      t.isTSTypeAssertion(node) ||
-      t.isTSNonNullExpression(node) ||
-      (t.isTSSatisfiesExpression && t.isTSSatisfiesExpression(node))
-    ) {
-      node = node.expression
-    }
-    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
@@ -183,41 +105,10 @@ const plugin = function (babel: typeof BabelCore): BabelCore.PluginObj<IState> {
           }
         })
       },
-      'MemberExpression|OptionalMemberExpression' (ast: BabelCore.NodePath<any>) {
-        const node = ast.node
-
-        // 处理两层命名空间属性访问：Taro.xx.yy / Taro?.xx?.yy（非调用场景）
-        // 调用场景由 CallExpression|OptionalCallExpression 负责
-        const isCalleeOfCall = (t.isCallExpression(ast.parent) || t.isOptionalCallExpression(ast.parent)) && (ast.parent as any).callee === node
-        if (!isCalleeOfCall) {
-          const innerObj = stripTSCast(node.object)
-          if (t.isMemberExpression(innerObj) || t.isOptionalMemberExpression(innerObj)) {
-            const isTaroNamespace = t.isIdentifier(innerObj.object, { name: taroName })
-            if (isTaroNamespace) {
-              const namespaceName = t.isIdentifier(innerObj.property) ? innerObj.property.name : (t.isStringLiteral(innerObj.property) ? innerObj.property.value : null)
-              const methodName = t.isIdentifier(node.property) ? node.property.name : (t.isStringLiteral(node.property) ? node.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.replaceWith(identifier as any)
-                  return
-                }
-              }
-            }
-          }
-        }
-
+      MemberExpression (ast: BabelCore.NodePath<any>) {
         /* 处理 Taro.xxx */
-        const isTaro = t.isIdentifier(node.object, { name: taroName })
-        const property = node.property
+        const isTaro = t.isIdentifier(ast.node.object, { name: taroName })
+        const property = ast.node.property
         let propertyName: string | null = null
         let propName = 'name'
 
@@ -234,7 +125,7 @@ const plugin = function (babel: typeof BabelCore): BabelCore.PluginObj<IState> {
         // 同一 api 使用多次，读取变量名
         if (this.apis.has(propertyName)) {
           const parentNode = ast.parent as BabelCore.types.AssignmentExpression
-          const isAssignment = t.isAssignmentExpression(parentNode) && parentNode.left === node
+          const isAssignment = t.isAssignmentExpression(parentNode) && parentNode.left === ast.node
 
           if (!isAssignment) {
             let identifier: BabelCore.types.Identifier
@@ -252,40 +143,9 @@ const plugin = function (babel: typeof BabelCore): BabelCore.PluginObj<IState> {
           needDefault = true
         }
       },
-      '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）
-        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
-          }
-        }
-
+      CallExpression (ast: BabelCore.NodePath<any>) {
         if (!ast.scope.hasReference(this.canIUse)) return
+        const callee = ast.node.callee
         if (t.isMemberExpression(callee) && t.isIdentifier(callee.object, { name: taroName })) {
           let propertyName: string | null = null
           let propName = 'name'
@@ -327,57 +187,6 @@ 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

package/tests/__mocks__/h5-definition.json

@@ -1122,7 +1122,11 @@
       "success": "void",
       "return": "Promise<Partial<CallbackResult> & Record<string, unknown> & CallbackResult>"
     },
-    "createMapContext": "*",
+    "createMapContext": {
+      "object": "*",
+      "success": "void",
+      "return": "Promise<Partial<CallbackResult> & Record<string, unknown> & CallbackResult>"
+    },
     "createMediaRecorder": {
       "object": "*",
       "success": "void",
@@ -2185,7 +2189,7 @@
       "type": "Type"
     },
     "image": {
-      "disableDefaultSize": "boolean",
+      "lang": "string",
       "lazyLoad": "boolean",
       "mode": "Mode",
       "nativeProps": "*",