fix: nested quotes (#40)

* fix: regex when json values includes quotes

* fix: escape quotes regex

Author: erikn69

index.test.js

@@ -30,6 +30,16 @@ describe('unicode', () => {
       .toBe('[string]"Hello, world!"[clear]')
   })
 
+  it('strings (mixing quotes)', () => {
+    expect(hlUni('\'"`\' "\'`" `"\'`'))
+      .toBe('[string]\'"`\'[clear] [string]"\'`"[clear] [string]`"\'`[clear]')
+  })
+
+  it('strings (scaping quotes)', () => {
+    expect(hlUni('\'\\\'\' "\\"" `\\``'))
+      .toBe('[string]\'\\\'\'[clear] [string]"\\""[clear] [string]`\\``[clear]')
+  })
+
   it('integers', () => {
     expect(hlUni('42'))
       .toBe('[number]42[clear]')
@@ -102,6 +112,16 @@ describe('html', () => {
       .toBe('<span class="sql-hl-string">"Hello, world!"</span>')
   })
 
+  it('strings (mixing quotes)', () => {
+    expect(hlHtml('\'"`\' "\'`" `"\'`'))
+      .toBe('<span class="sql-hl-string">\'"`\'</span> <span class="sql-hl-string">"\'`"</span> <span class="sql-hl-string">`"\'`</span>')
+  })
+
+  it('strings (scaping quotes)', () => {
+    expect(hlHtml('\'\\\'\' "\\"" `\\``'))
+      .toBe('<span class="sql-hl-string">\'\\\'\'</span> <span class="sql-hl-string">"\\""</span> <span class="sql-hl-string">`\\``</span>')
+  })
+
   it('integers', () => {
     expect(hlHtml('42'))
       .toBe('<span class="sql-hl-number">42</span>')

lib/index.js

@@ -39,7 +39,7 @@ const highlighters = [
   },
   {
     name: 'string',
-    regex: /(["'`].*?["'`])/g
+    regex: /(['](?:\\'|.)*?[']|["](?:\\"|.)*?["]|[`](?:\\`|.)*?[`])/g
   },
   {
     name: 'bracket',

test/index.js

@@ -18,3 +18,6 @@ console.log(highlight('SELECT f1, f20b, f3a, -1, 1, "1", 1.00 FROM t1;'))
 
 console.log(highlight('SELECT id FROM listings WHERE status = \'not available\''))
 console.log(highlight('SELECT id FROM listings WHERE status = "not available"'))
+
+console.log(highlight('SELECT \'{"json_index":"json_value"}\' AS test;'))
+console.log(highlight('SELECT "This is a \\"text\\" test" AS text;'))