twl-generator 1.4.6 → 1.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twl-generator",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "description": "Generate term-to-article lists from unfoldingWord en_tw archive for Bible books. Works in both Node.js (CLI) and React.js (browser) environments.",
   "main": "src/index.js",
   "bin": {
@@ -49,6 +49,7 @@
     "compromise": "^14.14.2",
     "csv-parse": "^5.5.6",
     "csv-stringify": "^6.5.0",
+    "en-inflectors": "^1.0.12",
     "jszip": "^3.10.1",
     "tsv-quote-converters": "^1.1.14"
   },

package/src/index.js

@@ -1,5 +1,6 @@
 import { BibleBookData } from './common/books.js';
 import { addGLQuoteCols, convertGLQuotes2OLQuotes } from 'tsv-quote-converters';
+import { Inflectors } from 'en-inflectors';
 
 const isBrowser = typeof window !== 'undefined';
 
@@ -880,7 +881,7 @@ export async function generateTwlByBook(bookCode, options = {}) {
     if (/[^aeiou]y$/i.test(w)) return w.replace(/y$/i, 'ied');
     // Do not double the final consonant for words ending in "er" (e.g., gather -> gathered)
     const lastCh = w[w.length - 1];
-    if (endsWithCVC(w) && !/(?:er|en|or|on|al|el)$/i.test(w)) return w + lastCh + 'ed';
+    if (endsWithCVC(w) && !/(?:er|en|or|on|al)$/i.test(w)) return w + lastCh + 'ed';
     return w + 'ed';
   };
   const ingForm = (w) => {
@@ -888,7 +889,7 @@ export async function generateTwlByBook(bookCode, options = {}) {
     if (/ee$/i.test(w)) return w + 'ing';
     if (/e$/i.test(w)) return w.replace(/e$/i, 'ing');
     const lastCh = w[w.length - 1];
-    if (endsWithCVC(w) && !/(?:er|en|or|on|al|el)$/i.test(w)) return w + lastCh + 'ing';
+    if (endsWithCVC(w) && !/(?:er|en|or|on|al)$/i.test(w)) return w + lastCh + 'ing';
     return w + 'ing';
   };
 
@@ -902,8 +903,12 @@ export async function generateTwlByBook(bookCode, options = {}) {
     const last = parts[parts.length - 1];
     const allowed = new Set([
       head + pluralizeWord(last),
+      head + new Inflectors(last).toPlural(),
+      head + new Inflectors(last).toSingular(),
       head + edForm(last),
+      head + new Inflectors(last).toPast(),
       head + ingForm(last),
+      head + new Inflectors(last).toGerund(),
     ].map(x => x.toLowerCase()));
     return allowed.has(m.toLowerCase());
   };