improve regex to support escaping

Author: jonschlinkert

.verb.md

@@ -1,45 +1,19 @@
-# {%= name %} {%= badge("fury") %} {%= badge("travis") %}
-
-> {%= description %}
-
-Originally [posted here](https://github.com/less/less.js/issues/2339#issuecomment-67211009).
-
-## Install
-{%= include("install-npm", {save: true}) %}
-
 ## Usage
 
 ```js
 var regex = require('{%= name %}');
-('var foo = \'bar\';').match(regex());
+console.log(regex().exec('var foo = \'bar\';')[2]);
 //=> ['bar']
 
-('var foo = "bar";').match(regex());
-//=> ['"bar"'']
-
-('var foo = "bar";\nvar bar = \'baz\'').match(regex());
-//=> ['"bar"', '\'baz\'']
-
-('foo bar ". // \' \\ . // \' \\ ." baz').match(regex());
-//=> ['". // \' \\ . // \' \\ ."']
-```
-
-## Related projects
-{%= related(verb.related.list) %}  
-
-## Running tests
-{%= include("tests") %}
-
-## Contributing
-{%= include("contributing") %}
-
-## Author
-{%= include("author") %}
+console.log(regex().exec('var foo = "bar";')[2]);
+//=> ['bar']
 
-## License
-{%= copyright() %}
-{%= license() %}
+console.log(regex().exec('var foo = "bar";\nvar bar = \'baz\'')[2]);
+//=> ['bar']
 
-***
+console.log('var foo = "one";\nvar bar = \'two\';\nvar baz = `three`'.match(regex()));
+//=> [ '"one"', '\'two\'', '`three`' ]
 
-{%= include("footer") %}
+console.log(regex().exec('foo bar ". // \' \\ . // \' \\ ." baz')[2]);
+//=> ['. // \' \\ . // \' \\ .']
+```

examples.js

@@ -0,0 +1,16 @@
+var regex = require('./');
+
+console.log(regex().exec('var foo = \'bar\';')[2]);
+//=> ['bar']
+
+console.log(regex().exec('var foo = "bar";')[2]);
+//=> ['bar']
+
+console.log(regex().exec('var foo = "bar";\nvar bar = \'baz\'')[2]);
+//=> ['bar']
+
+console.log('var foo = "one";\nvar bar = \'two\';\nvar baz = `three`'.match(regex()));
+//=> [ '"one"', '\'two\'', '`three`' ]
+
+console.log(regex().exec('foo bar ". // \' \\ . // \' \\ ." baz')[2]);
+//=> ['. // \' \\ . // \' \\ .']

index.js

@@ -1,12 +1,12 @@
 /*!
  * quoted-string-regex <https://github.com/regexps/quoted-string-regex>
  *
- * Copyright (c) 2015-2017, Jon Schlinkert.
+ * Copyright (c) 2015-2018, Jon Schlinkert.
  * Released under the MIT License.
  */
 
 'use strict';
 
 module.exports = function() {
-  return /'([^'\\]*\\.)*[^']*'|"([^"\\]*\\.)*[^"]*"/g;
+  return /(?:\\['"`].)*?(['"`])((?:\\\1|.)*?)(\1)/g;
 };

test.js

@@ -1,40 +1,81 @@
+/*eslint quotes: [0]*/
 'use strict';
 
 require('mocha');
 var assert = require('assert');
 var regex = require('./');
 
 describe('regex', function() {
-  it('should return a function:', function() {
-    assert(typeof regex === 'function');
+  describe('single quotes', function() {
+    it('should match single-quoted strings', function() {
+      var match = `var foo = 'bar';`.match(regex());
+      assert.equal(match[0], `'bar'`);
+    });
+
+    it('should match empty single-quoted strings', function() {
+      var match = `var foo = '';`.match(regex());
+      assert.equal(match[0], `''`);
+    });
   });
 
-  it('should match single-quoted strings:', function() {
-    var re = regex();
-    var str = 'var foo = \'bar\';';
-    var m = str.match(re);
-    assert(m[0] === '\'bar\'');
+  describe('double quotes', function() {
+    it('should match double-quoted strings', function() {
+      var match = 'var foo = "bar";'.match(regex());
+      assert.equal(match[0], '"bar"');
+    });
+
+    it('should match empty double-quoted strings', function() {
+      assert.equal('var foo = "";'.match(regex())[0], '""');
+      assert.equal('var foo = "\'\'";'.match(regex())[0], '"\'\'"');
+      assert.equal(regex().exec('var foo = "\'\'";')[2], '\'\'');
+    });
   });
 
-  it('should match double-quoted strings:', function() {
-    var re = regex();
-    var str = 'var foo = "bar";';
-    var m = str.match(re);
-    assert(m[0] === '"bar"');
+  describe('backticks', function() {
+    it('should match strings in backticks', function() {
+      var match = 'var foo = `${bar}`;'.match(regex());
+      assert.equal(match[0], '`${bar}`');
+    });
+
+    it('should match empty strings in backticks', function() {
+      assert.equal('var foo = ``;'.match(regex())[0], '``');
+      assert.equal('var foo = `""`;'.match(regex())[0], '`""`');
+      assert.equal(regex().exec('var foo = `\'\'`;')[2], '\'\'');
+    });
   });
 
-  it('should match multiple quoted strings:', function() {
-    var re = regex();
-    var str = 'var foo = "bar";\nvar bar = \'baz\'';
-    var m = str.match(re);
-    assert(m[0] === '"bar"');
-    assert(m[1] === '\'baz\'');
+  describe('multiple', function() {
+    it('should match multiple quoted strings', function() {
+      var match = `var foo = "one";\nvar bar = 'two'\nvar baz = \`three\``.match(regex());
+      assert.equal(match[0], '"one"');
+      assert.equal(match[1], `'two'`);
+      assert.equal(match[2], `\`three\``);
+    });
   });
 
-  it('should match complex nested quotes:', function() {
-    var re = regex();
-    var str = 'foo bar ". // \' \\ . // \' \\ ." baz';
-    var m = str.match(re);
-    assert(m[0] === '". // \' \\ . // \' \\ ."');
+  describe('escaping', function() {
+    it('should work with escaped quotes', function() {
+      var double = `var foo = "bar\\"baz";`.match(regex());
+      assert.equal(double[0], '"bar\\"baz"');
+
+      var single = `var foo = 'bar\\'baz';`.match(regex());
+      assert.equal(single[0], `'bar\\'baz'`);
+
+      var both = `var foo = '"bar\\'\\"\\'baz"';`.match(regex());
+      assert.equal(both[0], `'"bar\\'\\"\\'baz"'`);
+    });
+
+    it('should match complex nested quotes', function() {
+      var double = `foo bar ". // ' \\" \\ . // ' \\ ." baz`.match(regex());
+      assert.equal(double[0], `". // ' \\" \\ . // ' \\ ."`);
+
+      var single = `foo bar '. // \\' \\" \\ . // \\' \\ .' baz`.match(regex());
+      assert.equal(single[0], `'. // \\' \\" \\ . // \\' \\ .'`);
+    });
+
+    it('should create a match for the inner string', function() {
+      var inner = regex().exec(`foo bar \\" \\' '. // \\' \\" \\ . // \\' \\ .' \\'\\' baz`);
+      assert.equal(inner[2], '. // \\\' \\" \\ . // \\\' \\ .');
+    });
   });
 });