refactor(deps): use morpheme-match-textlint

Author: azu

README.md

@@ -145,8 +145,7 @@ module.exports = [
 
 ## 参考
 
-- [azu/morpheme-match: match function that match token(形態素解析) with sentence.](https://github.com/azu/morpheme-match)
-- [azu/morpheme-match-all: A wrapper of morpheme-match API. Match all kuromoji's tokens.](https://github.com/azu/morpheme-match-all)
+- [morpheme-match](https://github.com/azu/morpheme-match)
 
 ## Changelog
 

package.json

@@ -59,7 +59,7 @@
   },
   "dependencies": {
     "kuromojin": "^1.4.0",
-    "morpheme-match-all": "^1.1.0",
+    "morpheme-match-textlint": "^2.0.0",
     "untildify": "^3.0.3"
   }
 }

src/textlint-rule-morpheme-match.js

@@ -1,6 +1,7 @@
 "use strict";
+import { createTextlintMatcher } from "morpheme-match-textlint";
+
 const tokenize = require("kuromojin").tokenize;
-const createMatchAll = require("morpheme-match-all");
 const path = require("path");
 const untildify = require("untildify");
 
@@ -64,54 +65,43 @@ const reporter = (context, options) => {
 { 
     dictionaryPathList: ["./path/to/dictionary.js", "./path/to/dictionary.json"]
 }        
-`)
+`);
     }
 
     if (!Array.isArray(options.dictionaryPathList)) {
         throw new Error(`"dictionaryPathList" option should be array.
 { 
     dictionaryPathList: ["./path/to/dictionary.js", "./path/to/dictionary.json"]
 }        
-`)
+`);
     }
 
     const textlintRcDir = context.getConfigBaseDir() || process.cwd();
     const dictionaryList = loadDictionaries(textlintRcDir, options.dictionaryPathList);
-    const matchAll = createMatchAll(dictionaryList);
+    const matchAll = createTextlintMatcher({
+        tokenize: tokenize,
+        dictionaries: dictionaryList
+    });
     return {
         [Syntax.Str](node) {
             const text = getSource(node);
-            return tokenize(text).then(currentTokens => {
-                /**
-                 * @type {MatchResult[]}
-                 */
-                const matchResults = matchAll(currentTokens);
-                matchResults.forEach(matchResult => {
-                    const firstToken = matchResult.tokens[0];
-                    const lastToken = matchResult.tokens[matchResult.tokens.length - 1];
-                    const firstWordIndex = Math.max(firstToken.word_position - 1, 0);
-                    const lastWorkIndex = Math.max(lastToken.word_position - 1, 0);
-                    // replace $1
-                    const message = replaceWithCaptureTokens(matchResult.dict.message, matchResult.dict.tokens, matchResult.tokens);
-                    const expected = matchResult.dict.expected
-                                     ? replaceWithCaptureTokens(matchResult.dict.expected, matchResult.dict.tokens, matchResult.tokens)
-                                     : undefined;
-                    if (expected) {
-                        report(node, new RuleError(message, {
-                            index: firstWordIndex,
-                            fix: fixer.replaceTextRange([
-                                firstWordIndex, lastWorkIndex + lastToken.surface_form.length
-                            ], expected)
+            return matchAll(text).then(results => {
+                results.forEach(result => {
+                    if (result.expected) {
+                        report(node, new RuleError(result.message, {
+                            index: result.index,
+                            fix: fixer.replaceTextRange(result.range, result.expected)
                         }));
                     } else {
-                        report(node, new RuleError(message, {
-                            index: firstWordIndex
+                        report(node, new RuleError(result.message, {
+                            index: result.index
                         }));
                     }
+
                 });
             });
         }
-    }
+    };
 };
 module.exports = {
     linter: reporter,

yarn.lock

@@ -2315,15 +2315,24 @@ moment@^2.13.0:
   version "2.23.0"
   resolved "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz#759ea491ac97d54bac5ad776996e2a58cc1bc225"
 
-morpheme-match-all@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/morpheme-match-all/-/morpheme-match-all-1.1.0.tgz#97f05382eb89e3755d50839d77f959c111eae43e"
+morpheme-match-all@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/morpheme-match-all/-/morpheme-match-all-2.0.0.tgz#fcf518ea2a1462bc99e7cfacee1ca47942b0fcd5"
+  integrity sha512-eiONyhZLP0bZuXFTaoqfxigXdg5XKd+vZLwaSKFRLAhvSHY5Zrbu8iJl74HqQj+gCm1OV18OocWCAfr3FXiFXg==
   dependencies:
-    morpheme-match "^1.1.0"
+    morpheme-match "^2.0.0"
 
-morpheme-match@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/morpheme-match/-/morpheme-match-1.1.0.tgz#d8f3330b95e5f27d1cb610f763285c724c25874a"
+morpheme-match-textlint@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/morpheme-match-textlint/-/morpheme-match-textlint-2.0.0.tgz#034f05dcfe7838286c675b4446f086698adb3188"
+  integrity sha512-6bMD5nDKPcxJ/Qd4Y1R9MwI8GQWnpFVFif8nwdRtzfibEo6FNkBRj98PzjEwXOefLMlnbjJ+DOpnPBE9yTWLqw==
+  dependencies:
+    morpheme-match-all "^2.0.0"
+
+morpheme-match@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/morpheme-match/-/morpheme-match-2.0.0.tgz#d95916683e119d916335ffe54e79dfb0b2ceee6a"
+  integrity sha512-6k8vkOliZVX4p3Ufknnlv+QshCRdkxc72b7MVq3Zo8l5dBVLuvM7L7VPnaQJwsWntI3xLLDzDLy84YMHrl35Qw==
 
 [email protected]:
   version "2.0.0"