refactor(deps): use morpheme-match-textlint (#8)

* refactor(deps): use textlint-scripts and morpheme-match-textlint

* chore: unused module

Author: azu

.babelrc

@@ -23,28 +23,22 @@
     "test": "test"
   },
   "scripts": {
-    "test": "mocha test/",
-    "build": "NODE_ENV=production babel src --out-dir lib --source-maps",
-    "watch": "babel src --out-dir lib --watch --source-maps",
+    "test": "textlint-scripts test",
+    "build": "textlint-scripts build",
+    "watch": "textlint-scripts build --watch",
     "prepublish": "npm run --if-present build"
   },
   "keywords": [
     "textlint",
     "textlintrule"
   ],
   "devDependencies": {
-    "babel-cli": "^6.10.1",
-    "babel-preset-es2015": "^6.9.0",
-    "babel-preset-jsdoc-to-assert": "^2.0.1",
-    "babel-preset-power-assert": "^1.0.0",
-    "babel-register": "^6.9.0",
-    "mocha": "^2.5.3",
     "power-assert": "^1.4.1",
-    "textlint-tester": "^1.2.0"
+    "textlint-scripts": "^2.1.0"
   },
   "dependencies": {
     "kuromojin": "^1.3.1",
-    "morpheme-match": "^1.0.1",
+    "morpheme-match-textlint": "^2.0.0",
     "textlint-rule-prh": "^3.1.1"
   }
 }

package.json

@@ -1,19 +1,18 @@
 // LICENSE : MIT
 "use strict";
+import {createTextlintMatcher} from "morpheme-match-textlint"
+
 const tokenize = require("kuromojin").tokenize;
 const fs = require("fs");
 const path = require("path");
 const prh = require("textlint-rule-prh");
 const dictionaryList = require("./dictionary");
-const createTokenMatcher = require("morpheme-match");
+
 const reporter = (context) => {
     const {Syntax, RuleError, report, fixer, getSource} = context;
-    const matcherList = dictionaryList.map(dict => {
-        return {
-            matcher: createTokenMatcher(dict["tokens"]),
-            message: dict["message"],
-            expected: dict["expected"]
-        };
+    const matcherList = createTextlintMatcher({
+        tokenize: tokenize,
+        dictionaries: dictionaryList
     });
     const prhLinter = prh.linter;
     const prhStr = prhLinter(context, {
@@ -22,29 +21,22 @@ const reporter = (context) => {
         ]
     });
     return {
-        [Syntax.Str](node){
+        [Syntax.Str](node) {
             const text = getSource(node);
             prhStr[Syntax.Str](node);
-            return tokenize(text).then(currentTokens => {
-                currentTokens.forEach(token => {
-                    matcherList.forEach(({matcher, message, expected}) => {
-                        const {match, tokens} = matcher(token);
-                        if (!match) {
-                            return;
-                        }
-                        const firstToken = tokens[0];
-                        const index = Math.max(firstToken.word_position - 1, 0);
-                        if (expected) {
-                            report(node, new RuleError(message, {
-                                index: index,
-                                fix: fixer.replaceTextRange([index, index + expected.length], expected)
-                            }));
-                        } else {
-                            report(node, new RuleError(message, {
-                                index: index
-                            }));
-                        }
-                    });
+            return matcherList(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(result.message, {
+                            index: result.index
+                        }));
+                    }
+
                 });
             });
         }
@@ -53,4 +45,4 @@ const reporter = (context) => {
 module.exports = {
     linter: reporter,
     fixer: reporter
-};
+};

src/textlint-rule-ja-no-abusage.js

@@ -1 +1 @@
---compilers js:babel-register
+--require textlint-scripts/register

test/mocha.opts

@@ -32,7 +32,8 @@ tester.run("textlint-rule-no-confusing-adjust-and-apply", rule, {
             output: "`logger`と`crashReporter`のmiddlewareを適用した`createStore`関数を作る",
             errors: [
                 {
-                    message: `"適用"の誤用である可能性があります。適応 => 適用`
+                    message: `"適用"の誤用である可能性があります。適応 => 適用`,
+                    index: 35
                 }
             ]
         }, {
@@ -77,4 +78,4 @@ tester.run("textlint-rule-no-confusing-adjust-and-apply", rule, {
             ]
         }
     ]
-});
+});

test/no-confusing-adjust-and-apply-test.js

@@ -15,9 +15,9 @@ tester.run("可変", rule, {
             errors: [
                 {
                     message: `「可変する」という使い方は適切ではありません。「可逆」と同じ使い方になります。\nhttp://qiita.com/scivola/items/f02589968a4ca27bc52b`,
-                    index: 8
+                    index: 7
                 }
             ]
         }
     ]
-});
+});