Merge pull request #26 from pmb0/fix/empty-string-bug

Fix empty string gobbling too much of the file
anatine · May 20, 2023 · e1a7094 · e1a7094
2 parents 8d1d4e1 + 1326202
commit e1a7094
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/packages/esbuild-decorators/src/__tests__/mock-project/app/src/strip-it.ts.test b/packages/esbuild-decorators/src/__tests__/mock-project/app/src/strip-it.ts.test
@@ -4,6 +4,8 @@ THIS_
 
 SHOULD_['This is a string used as a key']
 
+REALLY_ = ''
+
 /*
  * None of this should catch a @element in a comment.
  */

diff --git a/packages/esbuild-decorators/src/__tests__/strip-it.spec.ts b/packages/esbuild-decorators/src/__tests__/strip-it.spec.ts
@@ -9,9 +9,11 @@ describe(`Strip It`, () => {
     );
 
     const result = strip(testFile)
-      .replace(/[:[\]\n]|\s*/g, '')
+      .replace(/[:=[\]\n]|\s*/g, '')
       .replace(/_/g, ' ');
 
-    expect(result).toEqual(`THIS SHOULD ALL BE WHAT'S LEFT OF THE ENTIRE FILE`);
+    expect(result).toEqual(
+      `THIS SHOULD REALLY ALL BE WHAT'S LEFT OF THE ENTIRE FILE`
+    );
   });
 });
diff --git a/packages/esbuild-decorators/src/lib/strip-it.ts b/packages/esbuild-decorators/src/lib/strip-it.ts
@@ -53,7 +53,7 @@ class TextBlock extends TextNode {
 
 const constants = {
   ESCAPED_CHAR_REGEX: /^\\./,
-  QUOTED_STRING_REGEX: /^(['"`])((?:\\.|[^\1])+?)(\1)/,
+  QUOTED_STRING_REGEX: /^(['"`])((?:\\.|[^\1])*?)(\1)/,
   NEWLINE_REGEX: /^\r*\n/,
   BLOCK_OPEN_REGEX: /^\/\*\*?(!?)/,
   BLOCK_CLOSE_REGEX: /^\*\/(\n?)/,