textlint · azu · May 17, 2022 · May 17, 2022 · May 17, 2022
diff --git a/README.md b/README.md
@@ -38,15 +38,15 @@ GitHub launched in 2018-04-10.`;
 const inputPatterns = [
     "git", // => /git/g
     "/github/i", // => /github/ig
-    "/\\d{4}-\\d{2}-\\d{2}/" // => /\d{4}-\d{2}-\d{2}/g
+    "/(\\d{4})-(\\d{2})-(\\d{2})/" // => /\d{4}-\d{2}-\d{2}/g
 ];
 
 const results = matchPatterns(inputText, inputPatterns);
 assert.deepStrictEqual(results, [
-    { match: "GitHub", startIndex: 1, endIndex: 7 },
-    { match: "git", startIndex: 65, endIndex: 68 },
-    { match: "GitHub", startIndex: 107, endIndex: 113 },
-    { match: "2018-04-10", startIndex: 126, endIndex: 136 }
+    { match: "GitHub", startIndex: 1, endIndex: 7, captures: [] },
+    { match: "git", startIndex: 65, endIndex: 68, captures: [] },
+    { match: "GitHub", startIndex: 107, endIndex: 113, captures: [] },
+    { match: "2018-04-10", startIndex: 126, endIndex: 136, captures: ["2018", "04", "10"] }
 ]);
 ```
 
@@ -84,14 +84,14 @@ RegExp-like String:
 
 ```json
 [
-    "/a \\w+/"
+    "/a (\\w+)/"
 ]
 ```
 
 Results:
 
 ```
-[ { match: 'a pen', startIndex: 8, endIndex: 13 } ]
+[ { match: 'a pen', startIndex: 8, endIndex: 13, captures: ["pen"] } ]
 ```
 
 ## Examples

diff --git a/package.json b/package.json
@@ -70,7 +70,6 @@
   },
   "dependencies": {
     "escape-string-regexp": "^2.0.0",
-    "execall": "^2.0.0",
     "lodash.sortby": "^4.7.0",
     "lodash.uniq": "^4.5.0",
     "lodash.uniqwith": "^4.5.0",

diff --git a/src/regexp-string-matcher.ts b/src/regexp-string-matcher.ts
@@ -3,8 +3,6 @@ import uniqWith from "lodash.uniqwith";
 import sortBy from "lodash.sortby";
 import escapeStringRegexp from "escape-string-regexp";
 import { isRegExpString, parseRegExpString } from "./regexp-parse";
-
-import execall from "execall";
 import toRegex from "to-regex";
 
 const DEFAULT_FLAGS = "g";
@@ -18,6 +16,9 @@ const defaultFlags = (flagsString: string) => {
 
 export interface matchPatternResult {
     match: string;
+    // captured results
+    // [$1, $2 ...]
+    captures: string[];
     startIndex: number;
     endIndex: number;
 }
@@ -55,12 +56,16 @@ export const matchPatterns = (text: string, regExpLikeStrings: string[]): matchP
             return createRegExp(patternString);
         })
         .forEach((regExp) => {
-            const execallResults = execall(regExp, text);
-            execallResults.forEach((result) => {
-                const match = result.match;
+            const results = text.matchAll(regExp);
+            Array.from(results).forEach((result) => {
+                if (result.index === undefined) {
+                    return;
+                }
+                const match = result[0];
                 const index = result.index;
                 matchPatternResults.push({
                     match: match,
+                    captures: result.slice(1), // without match all text - [$1, $2 ...]
                     startIndex: index,
                     endIndex: index + match.length
                 });

diff --git a/test/example-test.ts b/test/example-test.ts
@@ -10,23 +10,23 @@ GitHub launched in 2018-04-10.`;
     const inputPatterns = [
         "git", // => /git/g
         "/github/i", // => /github/ig
-        "/\\d{4}-\\d{2}-\\d{2}/" // => /\d{4}-\d{2}-\d{2}/g
+        "/(\\d{4})-(\\d{2})-(\\d{2})/" // => /\d{4}-\d{2}-\d{2}/g
     ];
 
     const results = matchPatterns(inputText, inputPatterns);
     assert.deepStrictEqual(results, [
-        { match: "GitHub", startIndex: 1, endIndex: 7 },
-        { match: "git", startIndex: 65, endIndex: 68 },
-        { match: "GitHub", startIndex: 107, endIndex: 113 },
-        { match: "2018-04-10", startIndex: 126, endIndex: 136 }
+        { match: "GitHub", startIndex: 1, endIndex: 7, captures: [] },
+        { match: "git", startIndex: 65, endIndex: 68, captures: [] },
+        { match: "GitHub", startIndex: 107, endIndex: 113, captures: [] },
+        { match: "2018-04-10", startIndex: 126, endIndex: 136, captures: ["2018", "04", "10"] }
     ]);
 });
 
 it("RegExp-like string", () => {
     const inputText = `This is a pen.`;
     // RegExp like strings
-    const inputPatterns = ["/a \\w+/"];
+    const inputPatterns = ["/a (\\w+)/"];
 
     const results = matchPatterns(inputText, inputPatterns);
-    assert.deepStrictEqual(results, [{ match: "a pen", startIndex: 8, endIndex: 13 }]);
+    assert.deepStrictEqual(results, [{ match: "a pen", startIndex: 8, endIndex: 13, captures: ["pen"] }]);
 });
diff --git a/test/snapshot-test.ts b/test/snapshot-test.ts
@@ -28,6 +28,7 @@ describe("Snapshot testing", () => {
                 .map((result) => {
                     return `
 - match text: **${result.match}**
+- captures: **${JSON.stringify(result.captures)}**
 - startIndex: **${result.startIndex}**
 - endIndex: **${result.endIndex}**
 

diff --git a/test/snapshots/capture-multi-regexp/input-patterns.json b/test/snapshots/capture-multi-regexp/input-patterns.json
@@ -0,0 +1,3 @@
+[
+  "/(\\$)(\\d+)/i"
+]
diff --git a/test/snapshots/capture-multi-regexp/input.txt b/test/snapshots/capture-multi-regexp/input.txt
@@ -0,0 +1 @@
+$200 and $400
diff --git a/test/snapshots/capture-multi-regexp/output-for-human.md b/test/snapshots/capture-multi-regexp/output-for-human.md
@@ -0,0 +1,23 @@
+
+- match text: **$200**
+- captures: **["$","200"]**
+- startIndex: **0**
+- endIndex: **4**
+
+```
+**$200** and $400
+
+```
+
+
+
+- match text: **$400**
+- captures: **["$","400"]**
+- startIndex: **9**
+- endIndex: **13**
+
+```
+$200 and **$400**
+
+```
+
diff --git a/test/snapshots/capture-multi-regexp/output-for-machine.json b/test/snapshots/capture-multi-regexp/output-for-machine.json
@@ -0,0 +1,20 @@
+[
+    {
+        "match": "$200",
+        "captures": [
+            "$",
+            "200"
+        ],
+        "startIndex": 0,
+        "endIndex": 4
+    },
+    {
+        "match": "$400",
+        "captures": [
+            "$",
+            "400"
+        ],
+        "startIndex": 9,
+        "endIndex": 13
+    }
+]
diff --git a/test/snapshots/capture-single-regexp/input-patterns.json b/test/snapshots/capture-single-regexp/input-patterns.json
@@ -0,0 +1,3 @@
+[
+  "/(\\d+)/i"
+]
diff --git a/test/snapshots/capture-single-regexp/input.txt b/test/snapshots/capture-single-regexp/input.txt
@@ -0,0 +1 @@
+A123456789C
diff --git a/test/snapshots/capture-single-regexp/output-for-human.md b/test/snapshots/capture-single-regexp/output-for-human.md
@@ -0,0 +1,11 @@
+
+- match text: **123456789**
+- captures: **["123456789"]**
+- startIndex: **1**
+- endIndex: **10**
+
+```
+A**123456789**C
+
+```
+
diff --git a/test/snapshots/capture-single-regexp/output-for-machine.json b/test/snapshots/capture-single-regexp/output-for-machine.json
@@ -0,0 +1,10 @@
+[
+    {
+        "match": "123456789",
+        "captures": [
+            "123456789"
+        ],
+        "startIndex": 1,
+        "endIndex": 10
+    }
+]
diff --git a/test/snapshots/duplicated-match-patterns/output-for-human.md b/test/snapshots/duplicated-match-patterns/output-for-human.md
@@ -1,5 +1,6 @@
 
 - match text: **Git**
+- captures: **[]**
 - startIndex: **0**
 - endIndex: **3**
 
@@ -13,6 +14,7 @@ GitHub launched in 2018-04-10.
 
 
 - match text: **git**
+- captures: **[]**
 - startIndex: **64**
 - endIndex: **67**
 
@@ -26,6 +28,7 @@ GitHub launched in 2018-04-10.
 
 
 - match text: **Git**
+- captures: **[]**
 - startIndex: **106**
 - endIndex: **109**
 

diff --git a/test/snapshots/duplicated-match-patterns/output-for-machine.json b/test/snapshots/duplicated-match-patterns/output-for-machine.json
@@ -1,16 +1,19 @@
 [
     {
         "match": "Git",
+        "captures": [],
         "startIndex": 0,
         "endIndex": 3
     },
     {
         "match": "git",
+        "captures": [],
         "startIndex": 64,
         "endIndex": 67
     },
     {
         "match": "Git",
+        "captures": [],
         "startIndex": 106,
         "endIndex": 109
     }

diff --git a/test/snapshots/global-regexp/output-for-human.md b/test/snapshots/global-regexp/output-for-human.md
@@ -1,5 +1,6 @@
 
 - match text: **GitHub**
+- captures: **[]**
 - startIndex: **0**
 - endIndex: **6**
 
@@ -13,6 +14,7 @@ GitHub launched in 2018-04-10.
 
 
 - match text: **GitHub**
+- captures: **[]**
 - startIndex: **106**
 - endIndex: **112**
 

diff --git a/test/snapshots/global-regexp/output-for-machine.json b/test/snapshots/global-regexp/output-for-machine.json
@@ -1,11 +1,13 @@
 [
     {
         "match": "GitHub",
+        "captures": [],
         "startIndex": 0,
         "endIndex": 6
     },
     {
         "match": "GitHub",
+        "captures": [],
         "startIndex": 106,
         "endIndex": 112
     }

diff --git a/test/snapshots/ignore-case-regexp/output-for-human.md b/test/snapshots/ignore-case-regexp/output-for-human.md
@@ -1,5 +1,6 @@
 
 - match text: **Git**
+- captures: **[]**
 - startIndex: **0**
 - endIndex: **3**
 
@@ -13,6 +14,7 @@ GitHub launched in 2018-04-10.
 
 
 - match text: **git**
+- captures: **[]**
 - startIndex: **64**
 - endIndex: **67**
 
@@ -26,6 +28,7 @@ GitHub launched in 2018-04-10.
 
 
 - match text: **Git**
+- captures: **[]**
 - startIndex: **106**
 - endIndex: **109**
 

diff --git a/test/snapshots/ignore-case-regexp/output-for-machine.json b/test/snapshots/ignore-case-regexp/output-for-machine.json
@@ -1,16 +1,19 @@
 [
     {
         "match": "Git",
+        "captures": [],
         "startIndex": 0,
         "endIndex": 3
     },
     {
         "match": "git",
+        "captures": [],
         "startIndex": 64,
         "endIndex": 67
     },
     {
         "match": "Git",
+        "captures": [],
         "startIndex": 106,
         "endIndex": 109
     }

diff --git a/test/snapshots/mixed-string-regexp-patterns/output-for-human.md b/test/snapshots/mixed-string-regexp-patterns/output-for-human.md
@@ -1,5 +1,6 @@
 
 - match text: **git**
+- captures: **[]**
 - startIndex: **64**
 - endIndex: **67**
 
@@ -13,6 +14,7 @@ GitHub launched in 2018-04-10.
 
 
 - match text: **2018**
+- captures: **[]**
 - startIndex: **125**
 - endIndex: **129**
 
@@ -26,6 +28,7 @@ GitHub launched in **2018**-04-10.
 
 
 - match text: **04**
+- captures: **[]**
 - startIndex: **130**
 - endIndex: **132**
 
@@ -39,6 +42,7 @@ GitHub launched in 2018-**04**-10.
 
 
 - match text: **10**
+- captures: **[]**
 - startIndex: **133**
 - endIndex: **135**
 

diff --git a/test/snapshots/mixed-string-regexp-patterns/output-for-machine.json b/test/snapshots/mixed-string-regexp-patterns/output-for-machine.json
@@ -1,21 +1,25 @@
 [
     {
         "match": "git",
+        "captures": [],
         "startIndex": 64,
         "endIndex": 67
     },
     {
         "match": "2018",
+        "captures": [],
         "startIndex": 125,
         "endIndex": 129
     },
     {
         "match": "04",
+        "captures": [],
         "startIndex": 130,
         "endIndex": 132
     },
     {
         "match": "10",
+        "captures": [],
         "startIndex": 133,
         "endIndex": 135
     }