taraskevizer 6.0.1 → 6.0.3

package/dist/index.cjs

@@ -2173,6 +2173,7 @@ var __tarask__ = {
   afterTarask
 };
 var convertAlphabet = (text, abc) => replaceWithDict(replaceWithDict(text, letters[abc]), lettersUpperCase[abc]);
+var restoreBraces = (text) => text.replace(/&#40/g, "(");
 var Taraskevizer = class {
   general = {
     abc: ALPHABET.CYRILLIC,
@@ -2193,6 +2194,8 @@ var Taraskevizer = class {
     Object.assign(this.general, options.general);
     Object.assign(this.html, options.html);
     Object.assign(this.nonHtml, options.nonHtml);
+    if (options.taraskevize)
+      this.taraskevize = options.taraskevize;
   }
   convert(text) {
     const wrapInColorOf = wrappers.ansiColors;
@@ -2217,7 +2220,7 @@ var Taraskevizer = class {
         this.nonHtml.ansiColors ? ($0) => wrapInColorOf.variable(replacer($0)) : replacer
       );
     }
-    return finalize(applyNoFix(noFixArr, text).replace(/&#40/g, "("), "\n");
+    return finalize(restoreBraces(applyNoFix(noFixArr, text)), "\n");
   }
   convertToHtml(text) {
     const wrapInTag = wrappers.html;
@@ -2259,18 +2262,22 @@ var Taraskevizer = class {
         );
       noFixArr.push($2 === "." ? $3 : LEFT_ANGLE_BRACKET + $3 + ">");
       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");
+    }).replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("([\\n\\t]|\\p{P}|\\p{S}|\\d)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
   }
   convertAlphabetOnly(text) {
     const noFixArr = [];
     return finalize(
-      applyNoFix(
-        noFixArr,
-        convertAlphabet(
-          this.prepare(text, noFixArr, "<", false),
-          this.general.abc
+      afterJoin(
+        restoreBraces(
+          applyNoFix(
+            noFixArr,
+            convertAlphabet(
+              this.prepare(text, noFixArr, "<", false),
+              this.general.abc
+            )
+          )
         )
-      ).replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d|&#40) ", "gu"), "$1"),
+      ),
       "\n"
     );
   }

package/dist/index.d.ts

@@ -64,6 +64,7 @@ declare class Taraskevizer {
         general: TaraskOptions;
         html: HtmlOptions;
         nonHtml: NonHtmlOptions;
+        taraskevize(this: Taraskevizer, text: string): string;
     }>);
     convert(text: string): string;
     convertToHtml(text: string): string;

package/dist/index.js

@@ -2142,6 +2142,7 @@ var __tarask__ = {
   afterTarask
 };
 var convertAlphabet = (text, abc) => replaceWithDict(replaceWithDict(text, letters[abc]), lettersUpperCase[abc]);
+var restoreBraces = (text) => text.replace(/&#40/g, "(");
 var Taraskevizer = class {
   general = {
     abc: ALPHABET.CYRILLIC,
@@ -2162,6 +2163,8 @@ var Taraskevizer = class {
     Object.assign(this.general, options.general);
     Object.assign(this.html, options.html);
     Object.assign(this.nonHtml, options.nonHtml);
+    if (options.taraskevize)
+      this.taraskevize = options.taraskevize;
   }
   convert(text) {
     const wrapInColorOf = wrappers.ansiColors;
@@ -2186,7 +2189,7 @@ var Taraskevizer = class {
         this.nonHtml.ansiColors ? ($0) => wrapInColorOf.variable(replacer($0)) : replacer
       );
     }
-    return finalize(applyNoFix(noFixArr, text).replace(/&#40/g, "("), "\n");
+    return finalize(restoreBraces(applyNoFix(noFixArr, text)), "\n");
   }
   convertToHtml(text) {
     const wrapInTag = wrappers.html;
@@ -2228,18 +2231,22 @@ var Taraskevizer = class {
         );
       noFixArr.push($2 === "." ? $3 : LEFT_ANGLE_BRACKET + $3 + ">");
       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");
+    }).replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("([\\n\\t]|\\p{P}|\\p{S}|\\d)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
   }
   convertAlphabetOnly(text) {
     const noFixArr = [];
     return finalize(
-      applyNoFix(
-        noFixArr,
-        convertAlphabet(
-          this.prepare(text, noFixArr, "<", false),
-          this.general.abc
+      afterJoin(
+        restoreBraces(
+          applyNoFix(
+            noFixArr,
+            convertAlphabet(
+              this.prepare(text, noFixArr, "<", false),
+              this.general.abc
+            )
+          )
         )
-      ).replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d|&#40) ", "gu"), "$1"),
+      ),
       "\n"
     );
   }

package/package.json

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