prh 6.0.1 → 6.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prh",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "proofreading helper",
   "main": "index.js",
   "bin": {

package/prh-rules/media/WEB+DB_PRESS.yml

@@ -831,48 +831,148 @@ rules:
     expected: すべて
   - pattern: 全く
     expected: まったく
-  - pattern: /([にも])関わらず|([にも])関らず|([にも])拘わらず|([にも])拘らず/
+  - pattern: /([にも])(?:関わらず|関らず|拘わらず|拘らず)/
     expected: $1かかわらず
-  - pattern: /埋めこ([まむめもん])|うめこ([まむめもん])/
+    specs:
+      - from: に関わらず
+        to:   にかかわらず
+      - from: に拘らず
+        to:   にかかわらず
+  - pattern: /(?:埋めこ|うめこ)([まむめもん])/
     expected: 埋め込$1
-  - pattern: /置き変([わえ])|置き代([わえ])|置き替([わえ])|置きか([わえ])/
+    specs:
+      - from: 埋めこむ
+        to:   埋め込む
+      - from: うめこむ
+        to:   埋め込む
+  - pattern: /置き(?:変|代|替|か)([わえ])/
     expected: 置き換$1
-  - pattern: /書きこ([まみむめもん])|かきこ([まみむめもん])/
+    specs:
+      - from: 置き変え
+        to:   置き換え
+      - from: 置きかえ
+        to:   置き換え
+  - pattern: /(?:書きこ|かきこ)([まみむめもん])/
     expected: 書き込$1
-  - pattern: /書き替([えわ])|書きか([えわ])|かきか([えわ])|書換([えわ])|書き変([えわ])/
+    specs:
+      - from: 書きこむ
+        to:   書き込む
+      - from: かきこむ
+        to:   書き込む
+  - pattern: /(?:書き替|書きか|かきか|書換|書き変)([えわ])/
     expected: 書き換$1
-  - pattern: /読みこ([まみむめもん])|よみこ([まみむめもん])|読込([まみむめもん])/
+    specs:
+      - from: 書き替え
+        to:   書き換え
+      - from: かきかえ
+        to:   書き換え
+  - pattern: /(?:読みこ|よみこ|読込)([まみむめもん])/
     expected: 読み込$1
-  - pattern: /読みか([えわ])|よみか([えわ])|読替([えわ])|読換([えわ])|読み換([えわ])/
+    specs:
+      - from: 読みこむ
+        to:   読み込む
+      - from: よみこむ
+        to:   読み込む
+  - pattern: /(?:読みか|よみか|読替|読換|読み換)([えわ])/
     expected: 読み替$1
-  - pattern: /きりか([えわ])|切り換([えわ])|切換([えわ])|切替([えわ])/
+    specs:
+      - from: 読みかえ
+        to:   読み替え
+      - from: よみかえ
+        to:   読み替え
+  - pattern: /(?:きりか|切り換|切換|切替)([えわ])/
     expected: 切り替$1
-  - pattern: /くみこ([まむめもん])|組込([まむめもん])|組みこ([まむめもん])/
+    specs:
+      - from: きりかえ
+        to:   切り替え
+      - from: 切替え
+        to:   切り替え
+  - pattern: /(?:くみこ|組込|組みこ)([まむめもん])/
     expected: 組み込$1
-  - pattern: /くみこみ([^ま])|組み込み([^ま])|組みこみ([^ま])/
+    specs:
+      - from: くみこむ
+        to:   組み込む
+      - from: 組込む
+        to:   組み込む
+  - pattern: /(?:くみこみ|組み込み|組みこみ)([^ま])/
     expected: 組込み$1
-  - pattern: /組合([わいうえおっ])|くみあ([わいうえおっ])/
+    specs:
+      - from: くみこみの
+        to:   組込みの
+      - from: 組みこみの
+        to:   組込みの
+  - pattern: /(?:組合|くみあ)([わいうえおっ])/
     expected: 組み合$1
-  - pattern: /組合([さしすせそっ])|くみあわ([さしすせそっ])/
+    specs:
+      - from: 組合う
+        to:   組み合う
+      - from: くみあう
+        to:   組み合う
+  - pattern: /(?:組合|くみあわ)([さしすせそっ])/
     expected: 組み合わ$1
-  - pattern: /くみか([わいうえおっ])|組替([わいうえおっ])/
+    specs:
+      - from: 組合せ
+        to:   組み合わせ
+      - from: くみあわせ
+        to:   組み合わせ
+  - pattern: /(?:くみか|組替)([わいうえおっ])/
     expected: 組み替$1
+    specs:
+      - from: くみかえ
+        to:   組み替え
+      - from: 組替え
+        to:   組み替え
   - pattern: /ことな([りるれっ])/
     expected: 異な$1
-  - pattern: /立ち合([わいうえおっ])|立ち遭([わいうえおっ])|立ち逢([わいうえおっ])/
+  - pattern: /立ち(?:合|遭|逢)([わいうえおっ])/
     expected: 立ち会$1
-  - pattern: /取りく([まみむめもん])|とりく([まみむめもん])|とり組([まみむめもん])/
+    specs:
+      - from: 立ち合い
+        to:   立ち会い
+      - from: 立ち逢い
+        to:   立ち会い
+  - pattern: /(?:取りく|とりく|とり組)([まみむめもん])/
     expected: 取り組$1
-  - pattern: /取り変([わえ])|取り代([わえ])|取り換([わえ])|取りか([わえ])/
+    specs:
+      - from: 取りくむ
+        to:   取り組む
+      - from: とりくむ
+        to:   取り組む
+  - pattern: /(?:取り変|取り代|取り換|取りか)([わえ])/
     expected: 取り替$1
-  - pattern: /話し会([わいうえおっ])|話し遭([わいうえおっ])|話し逢([わいうえおっ])|話しあ([わいうえおっ])/
+    specs:
+      - from: 取り変え
+        to:   取り替え
+      - from: 取りかえ
+        to:   取り替え
+  - pattern: /話し(?:会|遭|逢|あ)([わいうえおっ])/
     expected: 話し合$1
-  - pattern: /ひきつ([がぎぐげご])|引きつ([がぎぐげご])/
+    specs:
+      - from: 話し会う
+        to:   話し合う
+      - from: 話しあう
+        to:   話し合う
+  - pattern: /(?:ひきつ|引きつ)([がぎぐげご])/
     expected: 引き継$1
-  - pattern: /引き替([えわ])|引きか([えわ])|ひきか([えわ])|引換([えわ])|引き変([えわ])/
+    specs:
+      - from: ひきつぐ
+        to:   引き継ぐ
+      - from: 引きつぐ
+        to:   引き継ぐ
+  - pattern: /(?:引き替|引きか|ひきか|引換|引き変)([えわ])/
     expected: 引き換$1
-  - pattern: /目が会([わいうえおっ])|目が遭([わいうえおっ])|目が逢([わいうえおっ])|目があ([わいうえおっ])/
+    specs:
+      - from: 引き替え
+        to:   引き換え
+      - from: ひきかえ
+        to:   引き換え
+  - pattern: /目が(?:会|遭|逢|あ)([わいうえおっ])/
     expected: 目が合$1
+    specs:
+      - from: 目が会う
+        to:   目が合う
+      - from: 目があう
+        to:   目が合う
   - pattern:
       - よびだ
       - 呼びだ
@@ -1221,8 +1321,19 @@ rules:
     expected: 語ら$1
   - pattern: /交([らりるれろっ])/
     expected: 交わ$1
-  - pattern: /行な([わいうえおっ])|おこな([わいうえおっ])/
+  - pattern: /(?:行|おこ)な([わいうえおっ])/
     expected: 行$1
+    specs:
+      - from: 行なう
+        to:   行う
+      - from: 行なった
+        to:   行った
+      - from: おこなう
+        to:   行う
+      - from: おこなった
+        to:   行った
+      - from: おこない
+        to:   行い
   - pattern: あわて
     expected: 慌
   - pattern: あわ
@@ -3033,3 +3144,12 @@ rules:
     pattern:  /はは/
   - expected: "WEB+DB PRESS"
     pattern:  /WEB\+DB PRESS/i
+# WEB+DB PRESS：2016年度フロントエンド連載 で追加
+  - expected: Angular 2
+    pattern:  Angular2
+  - expected: わか
+    pattern:  分か
+  - expected: ほか$1
+    pattern:  /他([にの])/
+  - expected: ごと$1
+    pattern:  /毎([にの])/

package/prh-rules/media/techbooster.yml

@@ -108,7 +108,7 @@ rules:
       - from: 当事
         to:   当事
   - expected: $1とき
-    pattern:  /(の)時(?!点|代|々|間)/
+    pattern:  /(の)時(?!点|代|々|間|期)/
     specs:
       - from: その時
         to:   そのとき
@@ -134,6 +134,8 @@ rules:
         to:   時代
       - from: 時間
         to:   時間
+      - from: 時期
+        to:   時期
     prh: 漢字で書かず、ひらがなで書くと読みやすくなります
   - expected: でき$1
     pattern:  /出来(る|て|た|ま|上が)/

package/prh-rules/package-lock.json

@@ -1,145 +1,69 @@
 {
   "name": "prh-rules",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "balanced-match": {
+  "packages": {
+    "": {
+      "name": "prh-rules",
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "license": "MIT",
+      "dependencies": {
+        "prh": "^6.0.1"
       }
     },
-    "commandpost": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
-      "integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-    },
-    "glob": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-      "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
-      "dev": true,
-      "requires": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^2.0.1",
-        "once": "^1.3.0"
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "license": "Python-2.0"
+    },
+    "node_modules/commander": {
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.3.tgz",
+      "integrity": "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
       }
     },
-    "glob-expand": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/glob-expand/-/glob-expand-0.2.1.tgz",
-      "integrity": "sha1-GwiKwnK1cViHC3aBYRHaRhimag8=",
-      "dev": true,
-      "requires": {
-        "glob": "~4.5.x",
-        "lodash": "~4.13.x"
+    "node_modules/diff": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.3.tgz",
+      "integrity": "sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
       }
     },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+    "node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+    "node_modules/prh": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/prh/-/prh-6.0.1.tgz",
+      "integrity": "sha512-lO9OStsj3IF+7c6ig+mcP6vCeUgOrLEkRg+DJukcrALnBNCitBO/7r/toJBFY8DF3x1cELKEy8HRCGvduSTQDA==",
+      "license": "MIT",
+      "dependencies": {
+        "commander": "^14.0.3",
+        "diff": "^8.0.3",
+        "js-yaml": "^4.1.0"
+      },
+      "bin": {
+        "prh": "bin/prh"
+      },
+      "engines": {
+        "node": ">=22"
       }
-    },
-    "lodash": {
-      "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz",
-      "integrity": "sha1-g+SxCRP0hJbU0W/sSlYK8u50S2g=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.0.0"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "prh": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/prh/-/prh-5.4.3.tgz",
-      "integrity": "sha512-W5+gzqOrVLKayPh+2QCur7KYZPsLRfDJd4Tyz5lIXAWwqaX/LQ40FX/P3/Hbfgf7w+EQPdR1yOx6BVf+frG40w==",
-      "requires": {
-        "commandpost": "^1.2.1",
-        "diff": "^3.3.0",
-        "js-yaml": "^3.9.1"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
     }
   }
 }

package/prh-rules/package.json

@@ -16,10 +16,10 @@
     "url": "https://github.com/prh/rules/issues"
   },
   "homepage": "https://github.com/prh/rules#readme",
-  "dependencies": {
-    "prh": "^5.4.3"
+  "engines": {
+    "node": ">=22"
   },
-  "devDependencies": {
-    "glob-expand": "^0.2.1"
+  "dependencies": {
+    "prh": "^6.0.1"
   }
 }

package/prh-rules/test.js

@@ -1,22 +1,22 @@
 "use strict";
 
-const expand = require("glob-expand");
+const fs = require("fs");
 const prh = require("prh");
 const assert = require("assert");
 
-const ymlList = expand({ filter: "isFile", cwd: __dirname }, [
-    "**/*.yml",
-    "!node_modules/**",
-]);
+const ymlList = fs.globSync("**/*.yml", {
+  cwd: __dirname,
+  exclude: (p) => p === "node_modules",
+});
 
-ymlList.forEach(yml => {
-    try {
-        const engine = prh.fromYAMLFilePath(yml);
-        const changeSet = engine.makeChangeSet("./README.ja.md");
-    } catch (e) {
-        console.log(`processing... ${yml}\n`);
-        throw e;
-    }
+ymlList.forEach((yml) => {
+  try {
+    const engine = prh.fromYAMLFilePath(yml);
+    const changeSet = engine.makeChangeSet("./README.ja.md");
+  } catch (e) {
+    console.log(`processing... ${yml}\n`);
+    throw e;
+  }
 });
 
 console.log("😸 done");