chore(deps): update deps and format style

azu · azu · commit 8f51e2a64f86 · 2020-04-29T16:18:44.000+09:00
diff --git a/package.json b/package.json
@@ -25,17 +25,37 @@
     "build": "textlint-scripts build",
     "watch": "textlint-scripts build --watch",
     "prepublish": "npm run --if-present build",
-    "test": "textlint-scripts test"
+    "test": "textlint-scripts test",
+    "prettier": "prettier --write \"**/*.{js,jsx,ts,tsx,css}\""
   },
   "keywords": [
     "textlint",
     "textlintrule"
   ],
   "devDependencies": {
-    "textlint-scripts": "^2.1.0"
+    "husky": "^4.2.5",
+    "lint-staged": "^10.2.0",
+    "prettier": "^2.0.5",
+    "textlint-scripts": "^3.0.0"
   },
   "dependencies": {
     "array-includes": "^3.0.3",
     "is-capitalized": "^1.0.0"
+  },
+  "prettier": {
+    "singleQuote": false,
+    "printWidth": 120,
+    "tabWidth": 4
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.{js,jsx,ts,tsx,css}": [
+      "prettier --write",
+      "git add"
+    ]
   }
-}
+}
diff --git a/src/textlint-rule-unexpanded-acronym.js b/src/textlint-rule-unexpanded-acronym.js
@@ -1,22 +1,14 @@
 // LICENSE : MIT
 "use strict";
-const isCapitalized = require('is-capitalized');
-const includes = require('array-includes');
+const isCapitalized = require("is-capitalized");
+const includes = require("array-includes");
 import AcronymCreator from "./AcronymCreator";
-import {isAllCapitals, expandWordsToAcronym} from "./word-utils";
+import { isAllCapitals, expandWordsToAcronym } from "./word-utils";
 const defaultOptions = {
     min_acronym_len: 3,
     max_acronym_len: 5,
     ignore_acronyms: [],
-    acronymJoiningWords: [
-        "of",
-        "the",
-        "for",
-        "in",
-        "and",
-        "or",
-        "&"
-    ]
+    acronymJoiningWords: ["of", "the", "for", "in", "and", "or", "&"],
 };
 
 /*
@@ -32,7 +24,7 @@ module.exports = function (context, options = {}) {
     const maxAcronymLength = options.max_acronym_len || defaultOptions.max_acronym_len;
     const ignoreAcronymList = options.ignore_acronyms || defaultOptions.ignore_acronyms;
     const acronymJoiningWords = options.acronymJoiningWords || defaultOptions.acronymJoiningWords;
-    const {Syntax, RuleError, report, getSource} = context;
+    const { Syntax, RuleError, report, getSource } = context;
     // pickup acronyms
     const acronymList = [];
     // original words in document
@@ -46,13 +38,13 @@ module.exports = function (context, options = {}) {
         return true;
     };
     return {
-        [Syntax.Str](node){
+        [Syntax.Str](node) {
             const text = getSource(node);
             const words = text.split(/\b/);
             const acronymCreator = new AcronymCreator();
-            words.forEach(word => {
+            words.forEach((word) => {
                 if (word.trim().length === 0) {
-                    return
+                    return;
                 }
                 if (isAllCapitals(word)) {
                     // collect Acronym
@@ -64,11 +56,13 @@ module.exports = function (context, options = {}) {
                     // Add temporarySequence
                     // => add temp [Aword, Bword, Cword] = ABC
                     acronymCreator.addWord(word);
-                } else if (!includes(acronymJoiningWords, word) // ignore of and...
-                    && acronymCreator.canExtractAcronym()) {
+                } else if (
+                    !includes(acronymJoiningWords, word) && // ignore of and...
+                    acronymCreator.canExtractAcronym()
+                ) {
                     // Create Acronym
                     var acronyms = acronymCreator.extractAcronym();
-                    acronyms.forEach(acronym => {
+                    acronyms.forEach((acronym) => {
                         if (isWordSatisfy(acronym)) {
                             expandedAcronymList.push(acronym);
                         }
@@ -78,20 +72,23 @@ module.exports = function (context, options = {}) {
             if (acronymCreator.canExtractAcronym()) {
                 // Create Acronym
                 var acronyms = acronymCreator.extractAcronym();
-                acronyms.forEach(acronym => {
+                acronyms.forEach((acronym) => {
                     if (isWordSatisfy(acronym)) {
                         expandedAcronymList.push(acronym);
                     }
                 });
             }
         },
-        [Syntax.Document + ":exit"](node){
-            acronymList.forEach(acronym => {
+        [Syntax.Document + ":exit"](node) {
+            acronymList.forEach((acronym) => {
                 // not found acronym in document
                 if (!includes(expandedAcronymList, acronym)) {
-                    report(node, new RuleError(`"${acronym}" is unexpanded acronym. What does "${acronym}" stand for?`));
+                    report(
+                        node,
+                        new RuleError(`"${acronym}" is unexpanded acronym. What does "${acronym}" stand for?`)
+                    );
                 }
             });
-        }
-    }
-}
+        },
+    };
+};
diff --git a/src/word-utils.js b/src/word-utils.js
@@ -26,28 +26,27 @@ export function expandOneWordToAcronym(CapitalWord) {
 /*
  * create Acronym from words.
  * @param {string[]} words
- * @returns (1)string if only one word (2) array if multiple words 
+ * @returns (1)string if only one word (2) array if multiple words
  */
 export function expandWordsToAcronym(words) {
     //XMLHttpRequest -> XHR
     if (words.length === 1) {
         return [expandOneWordToAcronym(words[0])];
-    }
-    else{
+    } else {
         const result = [];
         //In American Broadcast Company -> ["C", "BC", "ABC", "IABC"]
         words.reverse().reduce((acronym, word, i) => {
-            acronym.unshift(word.charAt(0))
-            result.push(acronym.join(""))
+            acronym.unshift(word.charAt(0));
+            result.push(acronym.join(""));
             return acronym;
         }, []);
 
         //In American Broadcast Company -> ["I", "IA", "IAB", "IABC"]
         words.reverse().reduce((acronym, word, i) => {
             acronym.push(word.charAt(0));
-            result.push(acronym.join(""))
+            result.push(acronym.join(""));
             return acronym;
         }, []);
         return result;
     }
-}
+}
diff --git a/test/textlint-rule-unexpanded-acronym-test.js b/test/textlint-rule-unexpanded-acronym-test.js
@@ -25,46 +25,41 @@ NAACP: (N double A C P) National Association for the Advancement of Colored Peop
 NCAA: (N C double A or N C two A or N C A A) National Collegiate Athletic Association
 In the Amazon Web Service, it can be short as AWS.
 Enter the Amazon Resource Names(ARN) for the Lambda you created in the setting
-`
+`,
         },
         // options
         {
             text: "OSS",
             options: {
-                ignore_acronyms: ["OSS"]
-            }
+                ignore_acronyms: ["OSS"],
+            },
         },
         {
             text: "GREEEEEEN",
             options: {
-                max_acronym_len: 5
-            }
-        }
+                max_acronym_len: 5,
+            },
+        },
     ],
     invalid: [
         {
             text: "WHO",
-            errors: [
-                {message: `"WHO" is unexpanded acronym. What does "WHO" stand for?`}
-            ]
-        }, {
+            errors: [{ message: `"WHO" is unexpanded acronym. What does "WHO" stand for?` }],
+        },
+        {
             text: `When it comes to the Subject Of Cake (the sweet and delicious baked delicacy), one should
 always remember (or at least consider).this foodstuff's effect on one's ever-expanding waistline.
 
 Now we know what SOC stands for but there is no mention of TTP.`,
-            errors: [
-                {message: `"TTP" is unexpanded acronym. What does "TTP" stand for?`}
-            ]
-        }, {
+            errors: [{ message: `"TTP" is unexpanded acronym. What does "TTP" stand for?` }],
+        },
+        {
             text: "use XHR, but we don't know what XHR.",
-            errors: [
-                {message: `"XHR" is unexpanded acronym. What does "XHR" stand for?`}
-            ]
-        }, {
+            errors: [{ message: `"XHR" is unexpanded acronym. What does "XHR" stand for?` }],
+        },
+        {
             text: "HELLO is just a capitalized word.",
-            errors: [
-                {message: `"HELLO" is unexpanded acronym. What does "HELLO" stand for?`}
-            ]
-        }
-    ]
+            errors: [{ message: `"HELLO" is unexpanded acronym. What does "HELLO" stand for?` }],
+        },
+    ],
 });
diff --git a/yarn.lock b/yarn.lock
