refactor: use isPlainStrNode helper (#29)

azu · web-flow · commit 70267ccaa572 · 2021-05-16T15:40:32.000+09:00
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "packages/*"
   ],
   "devDependencies": {
-    "lerna": "3.22.1"
+    "lerna": "4.0.0"
   },
   "scripts": {
     "build": "lerna run build",
diff --git a/packages/textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana/package.json b/packages/textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana/package.json
@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "match-index": "^1.0.3",
-    "textlint-rule-helper": "^2.1.1"
+    "textlint-rule-helper": "^2.2.0"
   }
 }
diff --git a/packages/textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana/src/index.js b/packages/textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana/src/index.js
@@ -11,7 +11,7 @@ module.exports = function(context) {
     const helper = new RuleHelper();
     return {
         [Syntax.Str](node){
-            if (helper.isChildNode(node, [Syntax.Link, Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {
+            if (!helper.isPlainStrNode(node)) {
                 return;
             }
             const text = getSource(node);
diff --git a/packages/textlint-rule-ja-no-space-around-parentheses/package.json b/packages/textlint-rule-ja-no-space-around-parentheses/package.json
@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "match-index": "^1.0.3",
-    "textlint-rule-helper": "^2.1.1"
+    "textlint-rule-helper": "^2.2.0"
   }
 }
diff --git a/packages/textlint-rule-ja-no-space-around-parentheses/src/index.js b/packages/textlint-rule-ja-no-space-around-parentheses/src/index.js
@@ -22,7 +22,7 @@ function reporter(context) {
     const helper = new RuleHelper();
     return {
         [Syntax.Str](node){
-            if (helper.isChildNode(node, [Syntax.Link, "LinkReference", Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {
+            if (!helper.isPlainStrNode(node)) {
                 return;
             }
             const text = getSource(node);
diff --git a/packages/textlint-rule-ja-no-space-between-full-width/package.json b/packages/textlint-rule-ja-no-space-between-full-width/package.json
@@ -34,6 +34,6 @@
   "dependencies": {
     "match-index": "^1.0.3",
     "regx": "^1.0.4",
-    "textlint-rule-helper": "^2.1.1"
+    "textlint-rule-helper": "^2.2.0"
   }
 }
diff --git a/packages/textlint-rule-ja-no-space-between-full-width/src/index.js b/packages/textlint-rule-ja-no-space-between-full-width/src/index.js
@@ -16,7 +16,7 @@ function reporter(context) {
     const helper = new RuleHelper();
     return {
         [Syntax.Str](node){
-            if (helper.isChildNode(node, [Syntax.Link, "LinkReference", Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {
+            if (!helper.isPlainStrNode(node)) {
                 return;
             }
             const text = getSource(node);
diff --git a/packages/textlint-rule-ja-space-after-exclamation/package.json b/packages/textlint-rule-ja-space-after-exclamation/package.json
@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "match-index": "^1.0.3",
-    "textlint-rule-helper": "^2.1.1"
+    "textlint-rule-helper": "^2.2.0"
   }
 }
diff --git a/packages/textlint-rule-ja-space-after-exclamation/src/index.js b/packages/textlint-rule-ja-space-after-exclamation/src/index.js
@@ -12,7 +12,7 @@ function reporter(context) {
     const helper = new RuleHelper();
     return {
         [Syntax.Str](node){
-            if (helper.isChildNode(node, [Syntax.Link, "LinkReference", Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {
+            if (!helper.isPlainStrNode(node)) {
                 return;
             }
             let text = getSource(node);
diff --git a/packages/textlint-rule-ja-space-after-question/package.json b/packages/textlint-rule-ja-space-after-question/package.json
@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "match-index": "^1.0.1",
-    "textlint-rule-helper": "^2.0.0"
+    "textlint-rule-helper": "^2.2.0"
   }
 }
diff --git a/packages/textlint-rule-ja-space-after-question/src/index.js b/packages/textlint-rule-ja-space-after-question/src/index.js
@@ -12,7 +12,7 @@ function reporter(context) {
     const helper = new RuleHelper();
     return {
         [Syntax.Str](node){
-            if (helper.isChildNode(node, [Syntax.Link, "LinkReference", Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {
+            if (!helper.isPlainStrNode(node)) {
                 return;
             }
             let text = getSource(node);
diff --git a/packages/textlint-rule-ja-space-after-question/test/index-test.js b/packages/textlint-rule-ja-space-after-question/test/index-test.js
@@ -2,14 +2,22 @@
 "use strict";
 import TextLintTester from "textlint-tester";
 import rule from "../src/index";
+
 var tester = new TextLintTester();
 tester.run("疑問符(?)", rule, {
     valid: [
         "【原文】Does the reader understand the document?",
         "【訳文】読者は文書の内容を理解しているでしょうか。",
         "オプションを変更しますか？",
         "A 社の成功の秘密とは？　この本ではそれをご紹介します。",
-        "どう操作したらよいのか？というユーザーの疑問に答えます。"
+        "どう操作したらよいのか？というユーザーの疑問に答えます。",
+        "# どう操作したらよいのか？という",
+        "![どう操作したらよいのか？という](https://example.com)",
+        "[どう操作したらよいのか？という](https://example.com)",
+        "> どう操作したらよいのか？という",
+        "**どう操作したらよいのか？という**",
+        "[どう操作したらよいのか？という][]",
+        "[^どう操作したらよいのか？という]",
     ],
     invalid: [
         {
diff --git a/packages/textlint-rule-ja-space-around-code/package.json b/packages/textlint-rule-ja-space-around-code/package.json
@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "match-index": "^1.0.1",
-    "textlint-rule-helper": "^2.0.0"
+    "textlint-rule-helper": "^2.2.0"
   }
 }
diff --git a/packages/textlint-rule-ja-space-around-link/package.json b/packages/textlint-rule-ja-space-around-link/package.json
@@ -32,6 +32,6 @@
   },
   "dependencies": {
     "match-index": "^1.0.1",
-    "textlint-rule-helper": "^2.0.0"
+    "textlint-rule-helper": "^2.2.0"
   }
 }
diff --git a/packages/textlint-rule-ja-space-between-half-and-full-width/package.json b/packages/textlint-rule-ja-space-between-half-and-full-width/package.json
@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "match-index": "^1.0.1",
-    "textlint-rule-helper": "^2.0.0"
+    "textlint-rule-helper": "^2.2.0"
   }
 }
diff --git a/packages/textlint-rule-ja-space-between-half-and-full-width/src/index.js b/packages/textlint-rule-ja-space-between-half-and-full-width/src/index.js
@@ -76,10 +76,7 @@ function reporter(context, options = {}) {
     };
     return {
         [Syntax.Str](node){
-            const isIgnoredParentNode = helper.isChildNode(node, [
-                Syntax.Header, Syntax.Link, "LinkReference", Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis
-            ]);
-            if (isIgnoredParentNode) {
+            if (!helper.isPlainStrNode(node)) {
                 return;
             }
             const text = getSource(node);
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@`
`33`	`33`	`},`
`34`	`34`	`"dependencies": {`
`35`	`35`	`"match-index": "^1.0.3",`
`36`		`- "textlint-rule-helper": "^2.1.1"`
	`36`	`+ "textlint-rule-helper": "^2.2.0"`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ module.exports = function(context) {`
`11`	`11`	`const helper = new RuleHelper();`
`12`	`12`	`return {`
`13`	`13`	`[Syntax.Str](node){`
`14`		`- if (helper.isChildNode(node, [Syntax.Link, Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {`
	`14`	`+ if (!helper.isPlainStrNode(node)) {`
`15`	`15`	`return;`
`16`	`16`	`}`
`17`	`17`	`const text = getSource(node);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ function reporter(context) {`
`22`	`22`	`const helper = new RuleHelper();`
`23`	`23`	`return {`
`24`	`24`	`[Syntax.Str](node){`
`25`		`- if (helper.isChildNode(node, [Syntax.Link, "LinkReference", Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {`
	`25`	`+ if (!helper.isPlainStrNode(node)) {`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`	`28`	`const text = getSource(node);`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@`
`34`	`34`	`"dependencies": {`
`35`	`35`	`"match-index": "^1.0.3",`
`36`	`36`	`"regx": "^1.0.4",`
`37`		`- "textlint-rule-helper": "^2.1.1"`
	`37`	`+ "textlint-rule-helper": "^2.2.0"`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ function reporter(context) {`
`16`	`16`	`const helper = new RuleHelper();`
`17`	`17`	`return {`
`18`	`18`	`[Syntax.Str](node){`
`19`		`- if (helper.isChildNode(node, [Syntax.Link, "LinkReference", Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {`
	`19`	`+ if (!helper.isPlainStrNode(node)) {`
`20`	`20`	`return;`
`21`	`21`	`}`
`22`	`22`	`const text = getSource(node);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ function reporter(context) {`
`12`	`12`	`const helper = new RuleHelper();`
`13`	`13`	`return {`
`14`	`14`	`[Syntax.Str](node){`
`15`		`- if (helper.isChildNode(node, [Syntax.Link, "LinkReference", Syntax.Image, Syntax.BlockQuote, Syntax.Emphasis])) {`
	`15`	`+ if (!helper.isPlainStrNode(node)) {`
`16`	`16`	`return;`
`17`	`17`	`}`
`18`	`18`	`let text = getSource(node);`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@`
`32`	`32`	`},`
`33`	`33`	`"dependencies": {`
`34`	`34`	`"match-index": "^1.0.1",`
`35`		`- "textlint-rule-helper": "^2.0.0"`
	`35`	`+ "textlint-rule-helper": "^2.2.0"`
`36`	`36`	`}`
`37`	`37`	`}`