Fixes wildcards with capture groups

src/terms/match/lib/applyCaptureGroup.js

@@ -0,0 +1,10 @@
+'use strict';
+//applies the reg capture group setting to the term
+const applyCaptureGroup = (term, reg) => {
+  if (reg.capture) {
+    term.captureGroup = true;
+  } else {
+    term.captureGroup = undefined;
+  }
+};
+module.exports = applyCaptureGroup;

src/terms/match/lib/isMatch.js

@@ -1,4 +1,5 @@
 'use strict';
+const applyCaptureGroup = require('./applyCaptureGroup');
 
 //compare 1 term to one reg
 const perfectMatch = (term, reg) => {
@@ -56,16 +57,14 @@ const isMatch = (term, reg, verbose) => {
     return false;
   }
   let found = perfectMatch(term, reg, verbose);
-  //flag it as a capture-group
-  if (reg.capture) {
-    term.captureGroup = true;
-  } else {
-    term.captureGroup = undefined;
-  }
   //reverse it for .not()
   if (reg.negative) {
     found = !Boolean(found);
   }
+  if (found) {
+    //only apply capture group settings to matches
+    applyCaptureGroup(term, reg);
+  }
   return found;
 };
 module.exports = isMatch;

src/terms/match/lib/startHere.js

@@ -1,6 +1,7 @@
 'use strict';
 const lumpMatch = require('./lumpMatch');
 const isMatch = require('./isMatch');
+const applyCaptureGroup = require('./applyCaptureGroup');
 
 // match everything until this point - '*'
 const greedyUntil = (ts, i, reg) => {
@@ -56,15 +57,24 @@ const startHere = (ts, startAt, regs, verbose) => {
     }
 
     //support '*'
-    if (regs[reg_i].astrix === true) {
+    if (reg.astrix === true) {
       //just grab until the end..
       if (!next_reg) {
-        return ts.terms.slice(startAt, ts.length);
+        let terms = ts.terms.slice(startAt, ts.length);
+        //apply capture group settings for all wildcard terms
+        for (let wildcardTerm_i = term_i - startAt; wildcardTerm_i < terms.length; wildcardTerm_i++) {
+          applyCaptureGroup(terms[wildcardTerm_i], reg);
+        }
+        return terms;
       }
       let foundAt = greedyUntil(ts, term_i, regs[reg_i + 1]);
       if (!foundAt) {
         return null;
       }
+      //apply capture group settings for all wildcard terms
+      for (let wildcardTerm_i = term_i; wildcardTerm_i < foundAt; wildcardTerm_i++) {
+        applyCaptureGroup(ts.terms[wildcardTerm_i], reg)
+      }
       term_i = foundAt + 1;
       reg_i += 1;
       continue;

test/unit/match/capture.test.js

@@ -17,6 +17,15 @@ test('match-capture-group', function(t) {
   m = nlp('i saw ralf eat the glue Mrs. Hoover').match('ralf [#Verb the glue] mrs');
   t.equal(m.out('normal'), 'eat the glue', 'three-word capture');
 
+  m = nlp('ralf eats the glue').match('* [#Verb]');
+  t.equal(m.out('normal'), 'eats', 'capture after wildcard');
+
+  m = nlp('ralf eats the glue').match('ralf eats [*]');
+  t.equal(m.out('normal'), 'the glue', 'wildcard capture at the end');
+
+  m = nlp('ralf eats the glue').match('ralf eats [*] glue');
+  t.equal(m.out('normal'), 'the', 'wildcard capture in the middle');
+
   m = nlp('saw the Toronto International Documentary Film Festival yesterday').match('saw the? [#Noun+] yesterday');
   t.equal(m.trim().out('text'), 'Toronto International Documentary Film Festival', 'greedy capture');