hotfix: Fix empty string matching being too eager

0no-co · Jun 6, 2023 · 29cbe5c · 29cbe5c
1 parent 80ef05b
commit 29cbe5c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/.changeset/strange-crabs-love.md b/.changeset/strange-crabs-love.md
@@ -0,0 +1,5 @@
+---
+'@0no-co/graphql.web': patch
+---
+
+Fix empty string matches being too eager, e.g. `"", ""`
diff --git a/src/__tests__/parser.test.ts b/src/__tests__/parser.test.ts
@@ -490,6 +490,18 @@ describe('parseValue', () => {
       value: 'x',
       block: false,
     });
+
+    expect(parseValue('"" ""')).toEqual({
+      kind: Kind.STRING,
+      value: '',
+      block: false,
+    });
+
+    expect(parseValue('" \\" " ""')).toEqual({
+      kind: Kind.STRING,
+      value: ' " ',
+      block: false,
+    });
   });
 
   it('parses objects', () => {
@@ -572,6 +584,18 @@ describe('parseValue', () => {
       value: 'x',
       block: true,
     });
+
+    expect(parseValue('"""""" """"""')).toEqual({
+      kind: Kind.STRING,
+      value: '',
+      block: true,
+    });
+
+    expect(parseValue('""" \\""" """ """"""')).toEqual({
+      kind: Kind.STRING,
+      value: ' """ ',
+      block: true,
+    });
   });
 
   it('allows variables', () => {

diff --git a/src/parser.ts b/src/parser.ts
@@ -86,8 +86,8 @@ const intRe = /-?\d+/y;
 const floatPartRe = /(?:\.\d+)?[eE][+-]?\d+|\.\d+/y;
 
 const complexStringRe = /\\/g;
-const blockStringRe = /"""(?:[\s\S]*?[^\\])?"""/y;
-const stringRe = /"(?:[^\r\n]*?[^\\])?"/y;
+const blockStringRe = /"""(?:"""|(?:[\s\S]*?[^\\])""")/y;
+const stringRe = /"(?:"|[^\r\n]*?[^\\]")/y;
 
 function value(constant: true): ast.ConstValueNode;
 function value(constant: boolean): ast.ValueNode;