fix: 优化var regexp = getRegExp()转换判断逻辑，增加其他变量判断

NervJS · Oct 30, 2023 · aaa513b · aaa513b
1 parent dd79f6f
commit aaa513b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/packages/taro-transformer-wx/src/wxs.ts b/packages/taro-transformer-wx/src/wxs.ts
@@ -21,7 +21,7 @@ export function traverseWxsFile(ast: t.File, defaultResult: TransformResult) {
         if (path.node.arguments.length > 1) {
           const regex = path.node.arguments[0]
           const modifier = path.node.arguments[1]
-          if (t.isStringLiteral(regex)) {
+          if (t.isStringLiteral(regex) && t.isStringLiteral(modifier)) {
             const regexStr = regex.extra?.raw as string
             const regexModifier = modifier.extra?.rawValue as string
             const regexWithoutQuotes = regexStr.replace(/^['"](.*)['"]$/, '$1')
@@ -30,8 +30,12 @@ export function traverseWxsFile(ast: t.File, defaultResult: TransformResult) {
               t.stringLiteral(regexModifier),
             ])
             path.replaceWith(newExpr)
+          } else if (t.isIdentifier(regex) || t.isIdentifier(modifier)) {
+            throw new Error('getRegExp 函数暂不支持传入变量类型的参数')
+          } else {
+            throw new Error('getRegExp 函数暂不支持传入非字符串类型的参数')
           }
-        }else {
+        } else if (path.node.arguments.length === 1) {
           const regex = path.node.arguments[0]
           if (t.isStringLiteral(regex)) {
             const regexStr = regex.extra?.raw as string
@@ -40,10 +44,14 @@ export function traverseWxsFile(ast: t.File, defaultResult: TransformResult) {
               t.stringLiteral(regexWithoutQuotes)
             ])
             path.replaceWith(newExpr)
+          } else if (t.isIdentifier(regex)) {
+            throw new Error('getRegExp 函数暂不支持传入变量类型的参数')
           } else {
-            const newExpr = t.newExpression(t.identifier('RegExp'), [])
-            path.replaceWith(newExpr)
+            throw new Error('getRegExp 函数暂不支持传入非字符串类型的参数')
           }
+        } else {
+          const newExpr = t.newExpression(t.identifier('RegExp'), [])
+          path.replaceWith(newExpr)
         }
       }
     },

diff --git a/packages/taroize/src/wxml.ts b/packages/taroize/src/wxml.ts
@@ -718,7 +718,7 @@ function getWXS (attrs: t.JSXAttribute[], path: NodePath<t.JSXElement>, imports:
           if (path.node.arguments.length > 1) {
             const regex = path.node.arguments[0]
             const modifier = path.node.arguments[1]
-            if (t.isStringLiteral(regex)) {
+            if (t.isStringLiteral(regex) && t.isStringLiteral(modifier)) {
               const regexStr = regex.extra?.raw as string
               const regexModifier = modifier.extra?.rawValue as string
               const regexWithoutQuotes = regexStr.replace(/^['"](.*)['"]$/, '$1')
@@ -727,18 +727,26 @@ function getWXS (attrs: t.JSXAttribute[], path: NodePath<t.JSXElement>, imports:
                 t.stringLiteral(regexModifier),
               ])
               path.replaceWith(newExpr)
+            } else if (t.isIdentifier(regex) || t.isIdentifier(modifier)) {
+              throw new Error('getRegExp 函数暂不支持传入变量类型的参数')
+            } else {
+              throw new Error('getRegExp 函数暂不支持传入非字符串类型的参数')
             }
-          } else {
+          } else if (path.node.arguments.length === 1) {
             const regex = path.node.arguments[0]
             if (t.isStringLiteral(regex)) {
               const regexStr = regex.extra?.raw as string
               const regexWithoutQuotes = regexStr.replace(/^['"](.*)['"]$/, '$1')
               const newExpr = t.newExpression(t.identifier('RegExp'), [t.stringLiteral(regexWithoutQuotes)])
               path.replaceWith(newExpr)
+            } else if (t.isIdentifier(regex)) {
+              throw new Error('getRegExp 函数暂不支持传入变量类型的参数')
             } else {
-              const newExpr = t.newExpression(t.identifier('RegExp'), [])
-              path.replaceWith(newExpr)
+              throw new Error('getRegExp 函数暂不支持传入非字符串类型的参数')
             }
+          } else {
+            const newExpr = t.newExpression(t.identifier('RegExp'), [])
+            path.replaceWith(newExpr)
           }
         }
       },