Merge pull request #357 from caoyang818/release-3.6.8-app

fix: 修复var regexp = getRegExp()没有转换成var regexp = new RegExp()的问题以及补充单元测试
NervJS · Oct 30, 2023 · 6468e36 · 6468e36
2 parents fcf9e28 + aaa513b
commit 6468e36
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 4 deletions.
diff --git a/packages/taro-transformer-wx/__tests__/wxs.test.ts b/packages/taro-transformer-wx/__tests__/wxs.test.ts
@@ -0,0 +1,14 @@
+import transform from '../src'
+import { baseOptions } from './utils'
+
+describe('wxs.ts测试', () => {
+  test('wxs文件中的var regexp = getRegExp()转换为var regexp = new RegExp()', () => {
+    const wxsCode = `var regexp = getRegExp();`
+    baseOptions.sourcePath = '.wxs'
+    const { code } = transform({
+      ...baseOptions,
+      code: wxsCode,
+    })
+    expect(code).toEqual('var regexp = new RegExp();')
+  })
+})
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,7 +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 {
+            throw new Error('getRegExp 函数暂不支持传入非字符串类型的参数')
           }
+        } else {
+          const newExpr = t.newExpression(t.identifier('RegExp'), [])
+          path.replaceWith(newExpr)
         }
       }
     },

diff --git a/packages/taroize/__tests__/wxml.test.ts b/packages/taroize/__tests__/wxml.test.ts
@@ -75,6 +75,16 @@ describe('wxml.ts测试', () => {
     const { wxml }: any = parseWXML(option.path, option.wxml)
     expect(wxml).toMatchSnapshot()
   })
+
+  test('wxs模块中的var regexp = getRegExp()转换为var regexp = new RegExp()', () => {
+    option.wxml = `<wxs module="wxs_regexp">
+                    var regexp = getRegExp()
+                  </wxs>`
+    option.path = 'wxml_wxs_regexp'
+    const { wxses, imports }: any = parseWXML(option.path, option.wxml)
+    expect(wxses).toMatchSnapshot()
+    expect(imports).toMatchSnapshot()
+  })
 })
 
 describe('parseContent', () => {

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,15 +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 {
+              throw new Error('getRegExp 函数暂不支持传入非字符串类型的参数')
             }
+          } else {
+            const newExpr = t.newExpression(t.identifier('RegExp'), [])
+            path.replaceWith(newExpr)
           }
         }
       },