taraskevizer 6.1.17 → 6.1.19

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.17");
+  printWithPrefix("6.1.19");
   process.exit(0);
 }
 if (checkForOptions(["-h", "--help"])) {

package/dist/index.cjs

@@ -327,7 +327,7 @@ var chemicalElements2 = [
 ];
 chemicalElements2[1] = chemicalElements2[0] + "|айнштайн|мендзялев|сыборг|гас|флеров";
 var chemicalElements3 = " гал|бэрыл|тул|бэркл|набэл";
-var ia = (word, words) => ` ${word} (?=\\(?(?:[бвгджзйклмнпстфцчшў]*[оё]|${words.replace(/\(/g, "(?:")}|i(?:${iwords})))`;
+var ia = (word, words) => ` ${word}(?= \\(?(?:[бвгджзйклмнпстфцчшў]*[оё]|${words.replace(/\(/g, "(?:")}|i(?:${iwords})))`;
 var gwords = [
   " ґб ",
   "ґг",
@@ -1796,7 +1796,7 @@ var wordlist = dictFrom.raw([
 ўвод
 ўс[еёя]
 фарб(а(ў|мі)?|у|ы)? 
-ян `)), " ня "],
+ян `)), " ня"],
   /* без > бяз */
   [ia("без", toOneLine(`(вы)?(клад[ау]
 мела 
@@ -1833,7 +1833,7 @@ var wordlist = dictFrom.raw([
 ўс[еёя]
 фарб(аў|ы)? 
 цукр[ау] 
-ян`)), " бяз "],
+ян`)), " бяз"],
   /* іс */
   [/(\S)([іы]) (аа|ба|генэ|кры|тэ)зіс /, "$1($2|ая) $3(зіс|за) "],
   [/ага (аа|ба|генэ|кры|тэ)зіс[ау] /, "(ага|ай) $1(зісу|зы) "],
@@ -2222,16 +2222,18 @@ var resolveSpecialSyntax = (text, noFixArr, leftAngleBracket, convertAlphavet, d
           char = currentPart[1];
           currentPart = currentPart.slice(2);
         }
-        let toAddToResult = NOFIX_CHAR;
+        let toAddToResult;
         switch (char) {
           case ".":
+            toAddToResult = NOFIX_CHAR;
             noFixArr.push(currentPart);
             break;
           case ",":
             toAddToResult = leftAngleBracket + currentPart + ">";
             break;
           default:
-            noFixArr.push("<" + (abc ? "" : char) + currentPart + ">");
+            toAddToResult = leftAngleBracket + NOFIX_CHAR;
+            noFixArr.push((abc ? "" : char) + currentPart + ">");
         }
         result += toAddToResult + escapeCapsIfNeeded(part.slice(1));
         currentPart = "";
@@ -2244,9 +2246,8 @@ var resolveSpecialSyntax = (text, noFixArr, leftAngleBracket, convertAlphavet, d
 };
 
 // src/tarask.ts
-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 afterJoin = (text) => text.replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d+|&#40) ", "gu"), "$1");
+var finalize = (text, newLine) => text.replace(/\n/g, newLine).trim();
 var restoreParentheses = (text) => text.replace(/&#40/g, "(");
 var wordlistPlusNoSoften = wordlist.concat(noSoften);
 var Taraskevizer = class {
@@ -2263,6 +2264,10 @@ var Taraskevizer = class {
     ansiColors: false,
     variations: VARIATION.ALL
   };
+  spaces = [];
+  restoreSpaces(text) {
+    return text.replace(/ /g, () => this.spaces.shift());
+  }
   constructor(options) {
     if (!options)
       return;
@@ -2281,7 +2286,7 @@ var Taraskevizer = class {
     );
     if (this.nonHtml.ansiColors)
       highlightDiff(splitted, splittedOrig, isCyrillic, wrapInColorOf.fix);
-    text = join(splitted);
+    text = afterJoin(this.restoreSpaces(splitted.join(" ")));
     if (isCyrillic && (this.nonHtml.h || this.nonHtml.ansiColors))
       text = replaceG(
         text,
@@ -2304,7 +2309,7 @@ var Taraskevizer = class {
       this.prepare(text, noFixArr, "&lt;")
     );
     highlightDiff(splitted, splittedOrig, isCyrillic, wrapInTag.fix);
-    text = join(splitted);
+    text = afterJoin(this.restoreSpaces(splitted.join(" ")));
     if (isCyrillic)
       text = replaceG(
         text,
@@ -2319,9 +2324,8 @@ var Taraskevizer = class {
     );
   }
   prepare(text, noFixArr, LEFT_ANGLE_BRACKET, doEscapeCapitalized = this.general.doEscapeCapitalized) {
-    text = ` ${text.trim()} `.replace(//g, "");
-    return resolveSpecialSyntax(
-      text,
+    text = resolveSpecialSyntax(
+      ` ${text.trim()} `.replace(//g, ""),
       noFixArr,
       LEFT_ANGLE_BRACKET,
       (abcOnlyText) => restoreCase(
@@ -2332,7 +2336,12 @@ var Taraskevizer = class {
         abcOnlyText.split(" ")
       ).join(" "),
       doEscapeCapitalized
-    ).replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("([\\n\\t]|\\p{P}|\\p{S}|\\d)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
+    ).replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("(\\p{P}|\\p{S}|\\d+)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
+    text = text.replace(/\s+/g, (match) => {
+      this.spaces.push(match);
+      return " ";
+    });
+    return text;
   }
   convertAlphabetOnly(text) {
     const noFixArr = [];
@@ -2341,9 +2350,11 @@ var Taraskevizer = class {
         restoreParentheses(
           applyNoFix(
             noFixArr,
-            convertAlphabet(
-              this.prepare(text, noFixArr, "<", false),
-              this.general.abc
+            this.restoreSpaces(
+              convertAlphabet(
+                this.prepare(text, noFixArr, "<", false),
+                this.general.abc
+              )
             )
           )
         )

package/dist/index.d.ts

@@ -51,6 +51,8 @@ declare class Taraskevizer {
         ansiColors: boolean;
         variations: Variation;
     };
+    private spaces;
+    restoreSpaces(text: string): string;
     constructor(options?: DeepPartialReadonly<{
         general: TaraskOptions;
         html: HtmlOptions;

package/dist/index.js

@@ -302,7 +302,7 @@ var chemicalElements2 = [
 ];
 chemicalElements2[1] = chemicalElements2[0] + "|айнштайн|мендзялев|сыборг|гас|флеров";
 var chemicalElements3 = " гал|бэрыл|тул|бэркл|набэл";
-var ia = (word, words) => ` ${word} (?=\\(?(?:[бвгджзйклмнпстфцчшў]*[оё]|${words.replace(/\(/g, "(?:")}|i(?:${iwords})))`;
+var ia = (word, words) => ` ${word}(?= \\(?(?:[бвгджзйклмнпстфцчшў]*[оё]|${words.replace(/\(/g, "(?:")}|i(?:${iwords})))`;
 var gwords = [
   " ґб ",
   "ґг",
@@ -1771,7 +1771,7 @@ var wordlist = dictFrom.raw([
 ўвод
 ўс[еёя]
 фарб(а(ў|мі)?|у|ы)? 
-ян `)), " ня "],
+ян `)), " ня"],
   /* без > бяз */
   [ia("без", toOneLine(`(вы)?(клад[ау]
 мела 
@@ -1808,7 +1808,7 @@ var wordlist = dictFrom.raw([
 ўс[еёя]
 фарб(аў|ы)? 
 цукр[ау] 
-ян`)), " бяз "],
+ян`)), " бяз"],
   /* іс */
   [/(\S)([іы]) (аа|ба|генэ|кры|тэ)зіс /, "$1($2|ая) $3(зіс|за) "],
   [/ага (аа|ба|генэ|кры|тэ)зіс[ау] /, "(ага|ай) $1(зісу|зы) "],
@@ -2197,16 +2197,18 @@ var resolveSpecialSyntax = (text, noFixArr, leftAngleBracket, convertAlphavet, d
           char = currentPart[1];
           currentPart = currentPart.slice(2);
         }
-        let toAddToResult = NOFIX_CHAR;
+        let toAddToResult;
         switch (char) {
           case ".":
+            toAddToResult = NOFIX_CHAR;
             noFixArr.push(currentPart);
             break;
           case ",":
             toAddToResult = leftAngleBracket + currentPart + ">";
             break;
           default:
-            noFixArr.push("<" + (abc ? "" : char) + currentPart + ">");
+            toAddToResult = leftAngleBracket + NOFIX_CHAR;
+            noFixArr.push((abc ? "" : char) + currentPart + ">");
         }
         result += toAddToResult + escapeCapsIfNeeded(part.slice(1));
         currentPart = "";
@@ -2219,9 +2221,8 @@ var resolveSpecialSyntax = (text, noFixArr, leftAngleBracket, convertAlphavet, d
 };
 
 // src/tarask.ts
-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 afterJoin = (text) => text.replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d+|&#40) ", "gu"), "$1");
+var finalize = (text, newLine) => text.replace(/\n/g, newLine).trim();
 var restoreParentheses = (text) => text.replace(/&#40/g, "(");
 var wordlistPlusNoSoften = wordlist.concat(noSoften);
 var Taraskevizer = class {
@@ -2238,6 +2239,10 @@ var Taraskevizer = class {
     ansiColors: false,
     variations: VARIATION.ALL
   };
+  spaces = [];
+  restoreSpaces(text) {
+    return text.replace(/ /g, () => this.spaces.shift());
+  }
   constructor(options) {
     if (!options)
       return;
@@ -2256,7 +2261,7 @@ var Taraskevizer = class {
     );
     if (this.nonHtml.ansiColors)
       highlightDiff(splitted, splittedOrig, isCyrillic, wrapInColorOf.fix);
-    text = join(splitted);
+    text = afterJoin(this.restoreSpaces(splitted.join(" ")));
     if (isCyrillic && (this.nonHtml.h || this.nonHtml.ansiColors))
       text = replaceG(
         text,
@@ -2279,7 +2284,7 @@ var Taraskevizer = class {
       this.prepare(text, noFixArr, "&lt;")
     );
     highlightDiff(splitted, splittedOrig, isCyrillic, wrapInTag.fix);
-    text = join(splitted);
+    text = afterJoin(this.restoreSpaces(splitted.join(" ")));
     if (isCyrillic)
       text = replaceG(
         text,
@@ -2294,9 +2299,8 @@ var Taraskevizer = class {
     );
   }
   prepare(text, noFixArr, LEFT_ANGLE_BRACKET, doEscapeCapitalized = this.general.doEscapeCapitalized) {
-    text = ` ${text.trim()} `.replace(//g, "");
-    return resolveSpecialSyntax(
-      text,
+    text = resolveSpecialSyntax(
+      ` ${text.trim()} `.replace(//g, ""),
       noFixArr,
       LEFT_ANGLE_BRACKET,
       (abcOnlyText) => restoreCase(
@@ -2307,7 +2311,12 @@ var Taraskevizer = class {
         abcOnlyText.split(" ")
       ).join(" "),
       doEscapeCapitalized
-    ).replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("([\\n\\t]|\\p{P}|\\p{S}|\\d)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
+    ).replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("(\\p{P}|\\p{S}|\\d+)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
+    text = text.replace(/\s+/g, (match) => {
+      this.spaces.push(match);
+      return " ";
+    });
+    return text;
   }
   convertAlphabetOnly(text) {
     const noFixArr = [];
@@ -2316,9 +2325,11 @@ var Taraskevizer = class {
         restoreParentheses(
           applyNoFix(
             noFixArr,
-            convertAlphabet(
-              this.prepare(text, noFixArr, "<", false),
-              this.general.abc
+            this.restoreSpaces(
+              convertAlphabet(
+                this.prepare(text, noFixArr, "<", false),
+                this.general.abc
+              )
             )
           )
         )

package/package.json

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