fix(replace): prevent variable before colons from being replaced when…

… preventAssigment is true (#1609) * fix: prevent variable before colons from being replaced when preventAssignment is true. * feat: add typescript-declare test. --------- Co-authored-by: huanghao36 <[email protected]>
rollup · Oct 29, 2023 · 047d21c · 047d21c
1 parent 4f9fc5a
commit 047d21c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 3 deletions.
diff --git a/packages/replace/src/index.js b/packages/replace/src/index.js
@@ -74,7 +74,7 @@ export default function replace(options = {}) {
   if (objectGuards) expandTypeofReplacements(replacements);
   const functionValues = mapToFunctions(replacements);
   const keys = Object.keys(functionValues).sort(longest).map(escape);
-  const lookahead = preventAssignment ? '(?!\\s*=[^=])' : '';
+  const lookahead = preventAssignment ? '(?!\\s*(=[^=]|:[^:]))' : '';
   const pattern = new RegExp(
     `${delimiters[0]}(${keys.join('|')})${delimiters[1]}${lookahead}`,
     'g'

diff --git a/packages/replace/test/fixtures/form/typescript-declare/_config.js b/packages/replace/test/fixtures/form/typescript-declare/_config.js
@@ -0,0 +1,8 @@
+module.exports = {
+  description: "doesn't replace lvalue in typescript declare",
+  isTypescript: true,
+  options: {
+    'NAME': 'replaced',
+    preventAssignment: true
+  }
+};
diff --git a/packages/replace/test/fixtures/form/typescript-declare/input.ts b/packages/replace/test/fixtures/form/typescript-declare/input.ts
@@ -0,0 +1,2 @@
+declare const NAME: string
+console.log(NAME)
diff --git a/packages/replace/test/fixtures/form/typescript-declare/output.ts b/packages/replace/test/fixtures/form/typescript-declare/output.ts
@@ -0,0 +1,3 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+declare const NAME: string
+console.log('replaced')
diff --git a/packages/replace/test/form.js b/packages/replace/test/form.js
@@ -21,10 +21,11 @@ readdirSync('./fixtures/form').forEach((dir) => {
 
   test(`${dir}: ${config.description}`, (t) => {
     const { transform } = replace(config.options);
-    const input = readFileSync(`fixtures/form/${dir}/input.js`, 'utf-8');
+    const extname = config.isTypescript ? 'ts' : 'js';
+    const input = readFileSync(`fixtures/form/${dir}/input.${extname}`, 'utf-8');
 
     return Promise.resolve(
-      transform.call(transformContext, input, `${__dirname}/fixtures/form/${dir}/input.js`)
+      transform.call(transformContext, input, `${__dirname}/fixtures/form/${dir}/input.${extname}`)
     ).then((transformed) => {
       const actual = (transformed ? transformed.code : input).trim();
       t.snapshot(actual);

diff --git a/packages/replace/test/snapshots/form.js.md b/packages/replace/test/snapshots/form.js.md
@@ -86,3 +86,10 @@ Generated by [AVA](https://avajs.dev).
       especial␊
       replaced.doSomething()␊
     \`);`
+
+## typescript-declare: doesn't replace lvalue in typescript declare
+
+> Snapshot 1
+
+    `declare const NAME: string␊
+    console.log(replaced)`
diff --git a/packages/replace/test/snapshots/form.js.snap b/packages/replace/test/snapshots/form.js.snap