taraskevizer 6.1.15 → 6.1.17

package/dist/bin.js

@@ -7,7 +7,7 @@ const printWithPrefix = (msg) => {
 process.argv.splice(0, 2);
 const checkForOptions = (options) => process.argv[0] && options.includes(process.argv[0].toLowerCase());
 if (checkForOptions(["-v", "--version"])) {
-  printWithPrefix("6.1.15");
+  printWithPrefix("6.1.17");
   process.exit(0);
 }
 if (checkForOptions(["-h", "--help"])) {

package/dist/index.cjs

@@ -156,7 +156,7 @@ var common = {
       [/э/, "e"],
       [/ю/, "iu"],
       [/я/, "ia"],
-      [/[łl]i([eoua])/, "l$1"],
+      [/łi(?=[eoua])/, "l"],
       [/łi/, "li"]
     ]
   ].map(dictFrom.nonGlobal),
@@ -212,9 +212,8 @@ var common = {
       [/Ш/, "Š"],
       [/Ы/, "Y"],
       [/Э/, "E"],
-      [/[ŁL][Ii]([AEOUaeou])/, "L$1"],
-      [/Łi/, "Li"],
-      [/ŁI/, "LI"]
+      [/Ł[Ii](?=[AEOUaeou])/, "L"],
+      [/Ł(?=[Ii])/, "L"]
     ]
   ].map(dictFrom.nonGlobal)
 };
@@ -2191,6 +2190,7 @@ var convertAlphabet = (text, abc) => replaceWithDict(replaceWithDict(text, lette
 var NOFIX_CHAR = "  ";
 var NOFIX_REGEX = new RegExp(NOFIX_CHAR, "g");
 var applyNoFix = (arr, text) => arr.length ? text.replace(NOFIX_REGEX, () => arr.shift()) : text;
+var applyVariableParts = (text, callback) => text.replace(/\([^)]*?\)/g, ($0) => callback($0.slice(1, -1).split("|")));
 var resolveSpecialSyntax = (text, noFixArr, leftAngleBracket, convertAlphavet, doEscapeCaps) => {
   const escapeCapsIfNeeded = (text2) => doEscapeCaps ? text2.replace(new RegExp("(?!<=\\p{Lu} )\\p{Lu}{2}[\\p{Lu} ]*(?!= \\p{Lu})", "gu"), ($0) => {
     noFixArr.push(convertAlphavet($0));
@@ -2244,11 +2244,11 @@ var resolveSpecialSyntax = (text, noFixArr, leftAngleBracket, convertAlphavet, d
 };
 
 // src/tarask.ts
-var OPTIONAL_WORDS_REGEX = /\([^)]*?\)/g;
 var afterJoin = (text) => text.replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d|&#40) ", "gu"), "$1");
 var join = (textArr) => afterJoin(textArr.join(" "));
 var finalize = (text, newLine) => text.replace(/ \t /g, "	").replace(/ \n /g, newLine).trim();
-var restoreBraces = (text) => text.replace(/&#40/g, "(");
+var restoreParentheses = (text) => text.replace(/&#40/g, "(");
+var wordlistPlusNoSoften = wordlist.concat(noSoften);
 var Taraskevizer = class {
   general = {
     abc: ALPHABET.CYRILLIC,
@@ -2287,15 +2287,14 @@ var Taraskevizer = class {
         text,
         this.nonHtml.ansiColors ? this.nonHtml.h ? ($0) => wrapInColorOf.variable(gobj[$0]) : wrapInColorOf.variable("$&") : ($0) => gobj[$0]
       );
-    if ("variations" in this.nonHtml && this.nonHtml.variations !== VARIATION.ALL) {
-      const wordIndex = this.nonHtml.variations ?? 0;
-      const replacer = ($0) => $0.slice(1, -1).split("|")[wordIndex];
-      text = text.replace(
-        OPTIONAL_WORDS_REGEX,
-        this.nonHtml.ansiColors ? ($0) => wrapInColorOf.variable(replacer($0)) : replacer
+    if (this.nonHtml.variations !== VARIATION.ALL) {
+      const partIndex = this.nonHtml.variations;
+      text = applyVariableParts(
+        text,
+        this.nonHtml.ansiColors ? (parts) => wrapInColorOf.variable(parts[partIndex]) : (parts) => parts[partIndex]
       );
     }
-    return finalize(restoreBraces(applyNoFix(noFixArr, text)), "\n");
+    return finalize(restoreParentheses(applyNoFix(noFixArr, text)), "\n");
   }
   convertToHtml(text) {
     const wrapInTag = wrappers.html;
@@ -2312,10 +2311,9 @@ var Taraskevizer = class {
         this.html.g ? wrapInTag.letterH("$&") : ($0) => wrapInTag.letterH(gobj[$0])
       );
     return finalize(
-      applyNoFix(noFixArr, text).replace(OPTIONAL_WORDS_REGEX, ($0) => {
-        const options = $0.slice(1, -1).split("|");
-        const main = options.shift();
-        return `<tarL data-l='${options}'>${main}</tarL>`;
+      applyVariableParts(applyNoFix(noFixArr, text), (parts) => {
+        const main = parts.shift();
+        return `<tarL data-l='${parts}'>${main}</tarL>`;
       }),
       "<br>"
     );
@@ -2340,7 +2338,7 @@ var Taraskevizer = class {
     const noFixArr = [];
     return finalize(
       afterJoin(
-        restoreBraces(
+        restoreParentheses(
           applyNoFix(
             noFixArr,
             convertAlphabet(
@@ -2366,7 +2364,7 @@ var Taraskevizer = class {
     return { splittedOrig, splitted };
   }
   taraskevize(text) {
-    text = replaceWithDict(replaceWithDict(text, wordlist), noSoften);
+    text = replaceWithDict(text, wordlistPlusNoSoften);
     softening:
       do {
         text = replaceWithDict(text, softeners);

package/dist/index.js

@@ -131,7 +131,7 @@ var common = {
       [/э/, "e"],
       [/ю/, "iu"],
       [/я/, "ia"],
-      [/[łl]i([eoua])/, "l$1"],
+      [/łi(?=[eoua])/, "l"],
       [/łi/, "li"]
     ]
   ].map(dictFrom.nonGlobal),
@@ -187,9 +187,8 @@ var common = {
       [/Ш/, "Š"],
       [/Ы/, "Y"],
       [/Э/, "E"],
-      [/[ŁL][Ii]([AEOUaeou])/, "L$1"],
-      [/Łi/, "Li"],
-      [/ŁI/, "LI"]
+      [/Ł[Ii](?=[AEOUaeou])/, "L"],
+      [/Ł(?=[Ii])/, "L"]
     ]
   ].map(dictFrom.nonGlobal)
 };
@@ -2166,6 +2165,7 @@ var convertAlphabet = (text, abc) => replaceWithDict(replaceWithDict(text, lette
 var NOFIX_CHAR = "  ";
 var NOFIX_REGEX = new RegExp(NOFIX_CHAR, "g");
 var applyNoFix = (arr, text) => arr.length ? text.replace(NOFIX_REGEX, () => arr.shift()) : text;
+var applyVariableParts = (text, callback) => text.replace(/\([^)]*?\)/g, ($0) => callback($0.slice(1, -1).split("|")));
 var resolveSpecialSyntax = (text, noFixArr, leftAngleBracket, convertAlphavet, doEscapeCaps) => {
   const escapeCapsIfNeeded = (text2) => doEscapeCaps ? text2.replace(new RegExp("(?!<=\\p{Lu} )\\p{Lu}{2}[\\p{Lu} ]*(?!= \\p{Lu})", "gu"), ($0) => {
     noFixArr.push(convertAlphavet($0));
@@ -2219,11 +2219,11 @@ var resolveSpecialSyntax = (text, noFixArr, leftAngleBracket, convertAlphavet, d
 };
 
 // src/tarask.ts
-var OPTIONAL_WORDS_REGEX = /\([^)]*?\)/g;
 var afterJoin = (text) => text.replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d|&#40) ", "gu"), "$1");
 var join = (textArr) => afterJoin(textArr.join(" "));
 var finalize = (text, newLine) => text.replace(/ \t /g, "	").replace(/ \n /g, newLine).trim();
-var restoreBraces = (text) => text.replace(/&#40/g, "(");
+var restoreParentheses = (text) => text.replace(/&#40/g, "(");
+var wordlistPlusNoSoften = wordlist.concat(noSoften);
 var Taraskevizer = class {
   general = {
     abc: ALPHABET.CYRILLIC,
@@ -2262,15 +2262,14 @@ var Taraskevizer = class {
         text,
         this.nonHtml.ansiColors ? this.nonHtml.h ? ($0) => wrapInColorOf.variable(gobj[$0]) : wrapInColorOf.variable("$&") : ($0) => gobj[$0]
       );
-    if ("variations" in this.nonHtml && this.nonHtml.variations !== VARIATION.ALL) {
-      const wordIndex = this.nonHtml.variations ?? 0;
-      const replacer = ($0) => $0.slice(1, -1).split("|")[wordIndex];
-      text = text.replace(
-        OPTIONAL_WORDS_REGEX,
-        this.nonHtml.ansiColors ? ($0) => wrapInColorOf.variable(replacer($0)) : replacer
+    if (this.nonHtml.variations !== VARIATION.ALL) {
+      const partIndex = this.nonHtml.variations;
+      text = applyVariableParts(
+        text,
+        this.nonHtml.ansiColors ? (parts) => wrapInColorOf.variable(parts[partIndex]) : (parts) => parts[partIndex]
       );
     }
-    return finalize(restoreBraces(applyNoFix(noFixArr, text)), "\n");
+    return finalize(restoreParentheses(applyNoFix(noFixArr, text)), "\n");
   }
   convertToHtml(text) {
     const wrapInTag = wrappers.html;
@@ -2287,10 +2286,9 @@ var Taraskevizer = class {
         this.html.g ? wrapInTag.letterH("$&") : ($0) => wrapInTag.letterH(gobj[$0])
       );
     return finalize(
-      applyNoFix(noFixArr, text).replace(OPTIONAL_WORDS_REGEX, ($0) => {
-        const options = $0.slice(1, -1).split("|");
-        const main = options.shift();
-        return `<tarL data-l='${options}'>${main}</tarL>`;
+      applyVariableParts(applyNoFix(noFixArr, text), (parts) => {
+        const main = parts.shift();
+        return `<tarL data-l='${parts}'>${main}</tarL>`;
       }),
       "<br>"
     );
@@ -2315,7 +2313,7 @@ var Taraskevizer = class {
     const noFixArr = [];
     return finalize(
       afterJoin(
-        restoreBraces(
+        restoreParentheses(
           applyNoFix(
             noFixArr,
             convertAlphabet(
@@ -2341,7 +2339,7 @@ var Taraskevizer = class {
     return { splittedOrig, splitted };
   }
   taraskevize(text) {
-    text = replaceWithDict(replaceWithDict(text, wordlist), noSoften);
+    text = replaceWithDict(text, wordlistPlusNoSoften);
     softening:
       do {
         text = replaceWithDict(text, softeners);

package/package.json

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