fix: prevent process $$ | $

zhiyuanzmj · Nov 8, 2023 · 0921bc8 · 0921bc8
1 parent b6a99d9
commit 0921bc8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -100,15 +100,15 @@ function transformReactivityFunction(code: string, id: string) {
         if (node.type !== 'CallExpression') return
 
         if (
-          /^\$(?!(\$|ref|computed|shallowRef|toRef|customRef|defineProp|defineProps|defineModels)?(\(|$))/.test(
+          /^\$(?!(\$|ref|computed|shallowRef|toRef|customRef|defineProp|defineProps|defineModels)?$)/.test(
             s.sliceNode(node.callee, { offset })
           )
         ) {
           s.appendRight(node.callee.start! + offset + 1, '(')
           s.appendRight(node.end! + offset, ')')
         }
 
-        if (s.sliceNode(node.callee, { offset }).endsWith('$')) {
+        if (/(?<!^(\$)?)\$$/.test(s.sliceNode(node.callee, { offset }))) {
           s.remove(node.callee.end! + offset - 1, node.callee.end! + offset)
 
           node.arguments.forEach((argument) => {

diff --git a/src/volar.ts b/src/volar.ts
@@ -97,7 +97,7 @@ function transform({
   ) {
     if (ts.isCallExpression(node)) {
       if (
-        /^\$(?!(\$|ref|computed|shallowRef|toRef|customRef|defineProp|defineProps|defineModels)?(\(|$))/.test(
+        /^\$(?!(\$|ref|computed|shallowRef|toRef|customRef|defineProp|defineProps|defineModels)?$)/.test(
           node.expression.getText(ast)
         )
       ) {
@@ -111,7 +111,7 @@ function transform({
         replaceSourceRange(codes, source, node.getEnd(), node.getEnd(), ')')
       }
 
-      if (node.expression.getText(ast).endsWith('$')) {
+      if (/(?<!^(\$)?)\$$/.test(node.expression.getText(ast))) {
         replaceSourceRange(
           codes,
           source,