taraskevizer 5.1.3 → 5.1.5

package/dist/index.cjs

@@ -25,16 +25,17 @@ __export(src_exports, {
   Taraskevizer: () => Taraskevizer,
   VARIATION: () => VARIATION,
   __tarask__: () => __tarask__,
+  convertAlphabet: () => convertAlphabet,
   gobj: () => gobj
 });
 module.exports = __toCommonJS(src_exports);
 
 // src/dict/latin.ts
 var latinLetters = [
-  [/(?<=[аеёіоуўыэюяьʼ| ]\(?)е/, "je"],
-  [/(?<=[аеёіоуўыэюяьʼ| ]\(?)ё/, "jo"],
-  [/(?<=[аеёіоуўыэюяьʼ| ]\(?)ю/, "ju"],
-  [/(?<=[аеёіоуўыэюяьʼ| ]\(?)я/, "ja"],
+  [/(?<=[аеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)е/, "je"],
+  [/(?<=[eаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)ё/, "jo"],
+  [/(?<=[eoаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)ю/, "ju"],
+  [/(?<=[eouаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)я/, "ja"],
   [/ʼі/, "ji"],
   [/ʼ/, ""],
   [/ць/, "ć"],
@@ -890,6 +891,7 @@ var rawWordlist = [
   [/палесцін/, "палестын"],
   [/палінез/, "палінэз"],
   [/ палані(?=[клў])/, " палані"],
+  [/ апалоні/, " апалоні"],
   [/палоні/, "палёні"],
   [/палані/, "паляні"],
   [/паланэз/, "палянэз"],
@@ -1735,15 +1737,15 @@ var rawWordlist = [
   [/ступлення/, "сту(пленьня|па)"],
   [/ у а/, " у (а|ва)"],
   // [/зс(\S\S)/, 'с$1'],
-  [/ экск/, " экск"],
   [/нкск/, "нск"],
+  [/ экск/, " экск"],
   [/[ктцч]ск/, "цк"],
-  [/падскарб/, "падскарб"],
   [/ (звыш|райх)ск/, " $1ск"],
   [/ г[еэ]рцагс/, " гэрцагс"],
   [/ (дву|тро|чатыро)хс/, " $1хс"],
   [/[гґзжхш]с(?=(?:к|тв)\S)/, "с"],
   [/ адск/, " адск"],
+  [/ падск/, " падск"],
   [/дс(?=к|тв)/, "дз"],
   // [/([аеёіоуыэюя])вс/, '$1ўс'],
   [/ (б|кнд|нот)р /, " $1р "],
@@ -2118,13 +2120,19 @@ var __tarask__ = {
   replaceWithDict,
   afterTarask
 };
+var convertAlphabet = (text, abc, jiInLatin) => replaceWithDict(replaceWithDict(text, letters[abc]), lettersUpperCase[abc]);
+var moveFromTo = (prop, from, to) => {
+  if (prop in from)
+    to[prop] = from[prop];
+};
 var Taraskevizer = class {
   abc = ALPHABET.CYRILLIC;
   j = REPLACE_J.NEVER;
+  ji = true;
+  doEscapeCapitalized = true;
   html = {
     g: false
   };
-  doEscapeCapitalized = true;
   nonHtml = {
     h: false,
     ansiColors: false,
@@ -2135,12 +2143,13 @@ var Taraskevizer = class {
       return;
     const general = options.general;
     if (general) {
-      if (general.abc)
-        this.abc = general.abc;
-      if (general.j)
-        this.j = general.j;
-      if ("doEscapeCapitalized" in general)
-        this.doEscapeCapitalized = general.doEscapeCapitalized;
+      for (const prop of [
+        "abc",
+        "j",
+        "ji",
+        "doEscapeCapitalized"
+      ])
+        moveFromTo(prop, general, this);
     }
     if (options.OVERRIDE_taraskevize)
       this.taraskevize = options.OVERRIDE_taraskevize;
@@ -2190,7 +2199,7 @@ var Taraskevizer = class {
     );
   }
   process(text, LEFT_ANGLE_BRACKET) {
-    const { abc, j } = this;
+    const { abc, j, ji } = this;
     const noFixArr = [];
     text = ` ${text.trim()} `.replace(//g, "");
     if (this.doEscapeCapitalized)
@@ -2207,10 +2216,7 @@ var Taraskevizer = class {
       return NOFIX_CHAR;
     }).replace(/г'(?![еёіюя])/g, "ґ").replace(/([\n\t])/g, " $1 ").replace(/ - /g, " — ").replace(new RegExp("(\\p{P}|\\p{S}|\\d)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
     let splittedOrig, splitted;
-    splittedOrig = replaceWithDict(
-      replaceWithDict(text, letters[abc]),
-      lettersUpperCase[abc]
-    ).split(" ");
+    splittedOrig = convertAlphabet(text, abc, ji).split(" ");
     text = this.taraskevize(text.toLowerCase());
     if (j)
       text = replaceIbyJ(text, j === REPLACE_J.ALWAYS);
@@ -2240,5 +2246,6 @@ var Taraskevizer = class {
   Taraskevizer,
   VARIATION,
   __tarask__,
+  convertAlphabet,
   gobj
 });

package/dist/index.d.ts

@@ -9,6 +9,7 @@ type TaraskOptions = {
     doEscapeCapitalized: boolean;
     abc: Alphabet;
     j: OptionJ;
+    ji: boolean;
 };
 type NonHtmlOptions = {
     ansiColors: boolean;
@@ -45,13 +46,15 @@ declare const __tarask__: {
     readonly replaceWithDict: (text: string, dict?: ExtendedDict) => string;
     readonly afterTarask: ExtendedDict;
 };
+declare const convertAlphabet: (text: string, abc: Alphabet, jiInLatin: boolean) => string;
 declare class Taraskevizer {
     abc: Alphabet;
     j: OptionJ;
+    ji: boolean;
+    doEscapeCapitalized: boolean;
     html: {
         g: boolean;
     };
-    doEscapeCapitalized: boolean;
     nonHtml: {
         h: boolean;
         ansiColors: boolean;
@@ -76,4 +79,4 @@ declare const gobj: {
     readonly Ґ: "Г";
 };
 
-export { ALPHABET, type HtmlOptions, type NonHtmlOptions, REPLACE_J, type TaraskOptions, Taraskevizer, VARIATION, __tarask__, gobj };
+export { ALPHABET, type HtmlOptions, type NonHtmlOptions, REPLACE_J, type TaraskOptions, Taraskevizer, VARIATION, __tarask__, convertAlphabet, gobj };

package/dist/index.js

@@ -1,9 +1,9 @@
 // src/dict/latin.ts
 var latinLetters = [
-  [/(?<=[аеёіоуўыэюяьʼ| ]\(?)е/, "je"],
-  [/(?<=[аеёіоуўыэюяьʼ| ]\(?)ё/, "jo"],
-  [/(?<=[аеёіоуўыэюяьʼ| ]\(?)ю/, "ju"],
-  [/(?<=[аеёіоуўыэюяьʼ| ]\(?)я/, "ja"],
+  [/(?<=[аеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)е/, "je"],
+  [/(?<=[eаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)ё/, "jo"],
+  [/(?<=[eoаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)ю/, "ju"],
+  [/(?<=[eouаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)я/, "ja"],
   [/ʼі/, "ji"],
   [/ʼ/, ""],
   [/ць/, "ć"],
@@ -859,6 +859,7 @@ var rawWordlist = [
   [/палесцін/, "палестын"],
   [/палінез/, "палінэз"],
   [/ палані(?=[клў])/, " палані"],
+  [/ апалоні/, " апалоні"],
   [/палоні/, "палёні"],
   [/палані/, "паляні"],
   [/паланэз/, "палянэз"],
@@ -1704,15 +1705,15 @@ var rawWordlist = [
   [/ступлення/, "сту(пленьня|па)"],
   [/ у а/, " у (а|ва)"],
   // [/зс(\S\S)/, 'с$1'],
-  [/ экск/, " экск"],
   [/нкск/, "нск"],
+  [/ экск/, " экск"],
   [/[ктцч]ск/, "цк"],
-  [/падскарб/, "падскарб"],
   [/ (звыш|райх)ск/, " $1ск"],
   [/ г[еэ]рцагс/, " гэрцагс"],
   [/ (дву|тро|чатыро)хс/, " $1хс"],
   [/[гґзжхш]с(?=(?:к|тв)\S)/, "с"],
   [/ адск/, " адск"],
+  [/ падск/, " падск"],
   [/дс(?=к|тв)/, "дз"],
   // [/([аеёіоуыэюя])вс/, '$1ўс'],
   [/ (б|кнд|нот)р /, " $1р "],
@@ -2087,13 +2088,19 @@ var __tarask__ = {
   replaceWithDict,
   afterTarask
 };
+var convertAlphabet = (text, abc, jiInLatin) => replaceWithDict(replaceWithDict(text, letters[abc]), lettersUpperCase[abc]);
+var moveFromTo = (prop, from, to) => {
+  if (prop in from)
+    to[prop] = from[prop];
+};
 var Taraskevizer = class {
   abc = ALPHABET.CYRILLIC;
   j = REPLACE_J.NEVER;
+  ji = true;
+  doEscapeCapitalized = true;
   html = {
     g: false
   };
-  doEscapeCapitalized = true;
   nonHtml = {
     h: false,
     ansiColors: false,
@@ -2104,12 +2111,13 @@ var Taraskevizer = class {
       return;
     const general = options.general;
     if (general) {
-      if (general.abc)
-        this.abc = general.abc;
-      if (general.j)
-        this.j = general.j;
-      if ("doEscapeCapitalized" in general)
-        this.doEscapeCapitalized = general.doEscapeCapitalized;
+      for (const prop of [
+        "abc",
+        "j",
+        "ji",
+        "doEscapeCapitalized"
+      ])
+        moveFromTo(prop, general, this);
     }
     if (options.OVERRIDE_taraskevize)
       this.taraskevize = options.OVERRIDE_taraskevize;
@@ -2159,7 +2167,7 @@ var Taraskevizer = class {
     );
   }
   process(text, LEFT_ANGLE_BRACKET) {
-    const { abc, j } = this;
+    const { abc, j, ji } = this;
     const noFixArr = [];
     text = ` ${text.trim()} `.replace(//g, "");
     if (this.doEscapeCapitalized)
@@ -2176,10 +2184,7 @@ var Taraskevizer = class {
       return NOFIX_CHAR;
     }).replace(/г'(?![еёіюя])/g, "ґ").replace(/([\n\t])/g, " $1 ").replace(/ - /g, " — ").replace(new RegExp("(\\p{P}|\\p{S}|\\d)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
     let splittedOrig, splitted;
-    splittedOrig = replaceWithDict(
-      replaceWithDict(text, letters[abc]),
-      lettersUpperCase[abc]
-    ).split(" ");
+    splittedOrig = convertAlphabet(text, abc, ji).split(" ");
     text = this.taraskevize(text.toLowerCase());
     if (j)
       text = replaceIbyJ(text, j === REPLACE_J.ALWAYS);
@@ -2208,5 +2213,6 @@ export {
   Taraskevizer,
   VARIATION,
   __tarask__,
+  convertAlphabet,
   gobj
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "taraskevizer",
-	"version": "5.1.3",
+	"version": "5.1.5",
 	"author": "GooseOb",
 	"repository": {
 		"type": "git",