taraskevizer 5.3.3 → 6.0.1

package/README.md

@@ -53,7 +53,7 @@ taraskevizer.convertToHtml('энергія планеты');
 // "en<tarF>erg</tarF>ija p<tarF>lan</tarF>ety"
 
 // properties can be rewritten after creating an object
-taraskevizer.abc = ALPHABET.ARABIC;
+taraskevizer.general.abc = ALPHABET.ARABIC;
 taraskevizer.html.g = true;
 
 const latinizerWithJi = new Taraskevizer({
@@ -108,13 +108,13 @@ If set to false, may cause unwanted changes in acronyms.
 
 Is always `true` in `convertAlphabetOnly`.
 
-### OVERRIDE_taraskevize
+### taraskevize
 
 Type: `(text: string) => string`
 
 Default value: internal function `taraskevize`
 
-Can be overridden in order to make additional changes to the text.
+Overriddes internal function in order to change behaviour of taraskevization.
 This function usually uses private api via `__tarask__`
 
 ## html

package/dist/index.cjs

@@ -2174,9 +2174,11 @@ var __tarask__ = {
 };
 var convertAlphabet = (text, abc) => replaceWithDict(replaceWithDict(text, letters[abc]), lettersUpperCase[abc]);
 var Taraskevizer = class {
-  abc = ALPHABET.CYRILLIC;
-  j = REPLACE_J.NEVER;
-  doEscapeCapitalized = true;
+  general = {
+    abc: ALPHABET.CYRILLIC,
+    j: REPLACE_J.NEVER,
+    doEscapeCapitalized: true
+  };
   html = {
     g: false
   };
@@ -2188,24 +2190,13 @@ var Taraskevizer = class {
   constructor(options) {
     if (!options)
       return;
-    const general = options.general;
-    if (general) {
-      for (const prop of [
-        "abc",
-        "j",
-        "doEscapeCapitalized"
-      ])
-        if (prop in general)
-          this[prop] = general[prop];
-    }
-    if (options.OVERRIDE_taraskevize)
-      this.taraskevize = options.OVERRIDE_taraskevize;
+    Object.assign(this.general, options.general);
     Object.assign(this.html, options.html);
     Object.assign(this.nonHtml, options.nonHtml);
   }
   convert(text) {
     const wrapInColorOf = wrappers.ansiColors;
-    const isCyrillic = this.abc === ALPHABET.CYRILLIC;
+    const isCyrillic = this.general.abc === ALPHABET.CYRILLIC;
     const noFixArr = [];
     const { splitted, splittedOrig } = this.process(
       this.prepare(text, noFixArr, "<")
@@ -2230,7 +2221,7 @@ var Taraskevizer = class {
   }
   convertToHtml(text) {
     const wrapInTag = wrappers.html;
-    const isCyrillic = this.abc === ALPHABET.CYRILLIC;
+    const isCyrillic = this.general.abc === ALPHABET.CYRILLIC;
     const noFixArr = [];
     const { splitted, splittedOrig } = this.process(
       this.prepare(text, noFixArr, "&lt;")
@@ -2251,7 +2242,7 @@ var Taraskevizer = class {
       "<br>"
     );
   }
-  prepare(text, noFixArr, LEFT_ANGLE_BRACKET, doEscapeCapitalized = this.doEscapeCapitalized) {
+  prepare(text, noFixArr, LEFT_ANGLE_BRACKET, doEscapeCapitalized = this.general.doEscapeCapitalized) {
     text = ` ${text.trim()} `.replace(//g, "");
     if (doEscapeCapitalized)
       text = text.replace(
@@ -2263,7 +2254,7 @@ var Taraskevizer = class {
         return LEFT_ANGLE_BRACKET + $3 + ">";
       if ($1)
         $3 = restoreCase(
-          [replaceWithDict($3.toLowerCase(), letters[this.abc])],
+          [replaceWithDict($3.toLowerCase(), letters[this.general.abc])],
           [$3]
         );
       noFixArr.push($2 === "." ? $3 : LEFT_ANGLE_BRACKET + $3 + ">");
@@ -2275,13 +2266,16 @@ var Taraskevizer = class {
     return finalize(
       applyNoFix(
         noFixArr,
-        convertAlphabet(this.prepare(text, noFixArr, "<", false), this.abc)
+        convertAlphabet(
+          this.prepare(text, noFixArr, "<", false),
+          this.general.abc
+        )
       ).replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d|&#40) ", "gu"), "$1"),
       "\n"
     );
   }
   process(text) {
-    const { abc, j } = this;
+    const { abc, j } = this.general;
     const splittedOrig = convertAlphabet(text, abc).split(" ");
     text = this.taraskevize(text.toLowerCase());
     if (j && abc !== ALPHABET.LATIN_JI)

package/dist/index.d.ts

@@ -47,9 +47,11 @@ declare const __tarask__: {
     readonly afterTarask: ExtendedDict;
 };
 declare class Taraskevizer {
-    abc: Alphabet;
-    j: OptionJ;
-    doEscapeCapitalized: boolean;
+    general: {
+        abc: Alphabet;
+        j: OptionJ;
+        doEscapeCapitalized: boolean;
+    };
     html: {
         g: boolean;
     };
@@ -62,7 +64,6 @@ declare class Taraskevizer {
         general: TaraskOptions;
         html: HtmlOptions;
         nonHtml: NonHtmlOptions;
-        OVERRIDE_taraskevize(this: Taraskevizer, text: string): string;
     }>);
     convert(text: string): string;
     convertToHtml(text: string): string;

package/dist/index.js

@@ -2143,9 +2143,11 @@ var __tarask__ = {
 };
 var convertAlphabet = (text, abc) => replaceWithDict(replaceWithDict(text, letters[abc]), lettersUpperCase[abc]);
 var Taraskevizer = class {
-  abc = ALPHABET.CYRILLIC;
-  j = REPLACE_J.NEVER;
-  doEscapeCapitalized = true;
+  general = {
+    abc: ALPHABET.CYRILLIC,
+    j: REPLACE_J.NEVER,
+    doEscapeCapitalized: true
+  };
   html = {
     g: false
   };
@@ -2157,24 +2159,13 @@ var Taraskevizer = class {
   constructor(options) {
     if (!options)
       return;
-    const general = options.general;
-    if (general) {
-      for (const prop of [
-        "abc",
-        "j",
-        "doEscapeCapitalized"
-      ])
-        if (prop in general)
-          this[prop] = general[prop];
-    }
-    if (options.OVERRIDE_taraskevize)
-      this.taraskevize = options.OVERRIDE_taraskevize;
+    Object.assign(this.general, options.general);
     Object.assign(this.html, options.html);
     Object.assign(this.nonHtml, options.nonHtml);
   }
   convert(text) {
     const wrapInColorOf = wrappers.ansiColors;
-    const isCyrillic = this.abc === ALPHABET.CYRILLIC;
+    const isCyrillic = this.general.abc === ALPHABET.CYRILLIC;
     const noFixArr = [];
     const { splitted, splittedOrig } = this.process(
       this.prepare(text, noFixArr, "<")
@@ -2199,7 +2190,7 @@ var Taraskevizer = class {
   }
   convertToHtml(text) {
     const wrapInTag = wrappers.html;
-    const isCyrillic = this.abc === ALPHABET.CYRILLIC;
+    const isCyrillic = this.general.abc === ALPHABET.CYRILLIC;
     const noFixArr = [];
     const { splitted, splittedOrig } = this.process(
       this.prepare(text, noFixArr, "&lt;")
@@ -2220,7 +2211,7 @@ var Taraskevizer = class {
       "<br>"
     );
   }
-  prepare(text, noFixArr, LEFT_ANGLE_BRACKET, doEscapeCapitalized = this.doEscapeCapitalized) {
+  prepare(text, noFixArr, LEFT_ANGLE_BRACKET, doEscapeCapitalized = this.general.doEscapeCapitalized) {
     text = ` ${text.trim()} `.replace(//g, "");
     if (doEscapeCapitalized)
       text = text.replace(
@@ -2232,7 +2223,7 @@ var Taraskevizer = class {
         return LEFT_ANGLE_BRACKET + $3 + ">";
       if ($1)
         $3 = restoreCase(
-          [replaceWithDict($3.toLowerCase(), letters[this.abc])],
+          [replaceWithDict($3.toLowerCase(), letters[this.general.abc])],
           [$3]
         );
       noFixArr.push($2 === "." ? $3 : LEFT_ANGLE_BRACKET + $3 + ">");
@@ -2244,13 +2235,16 @@ var Taraskevizer = class {
     return finalize(
       applyNoFix(
         noFixArr,
-        convertAlphabet(this.prepare(text, noFixArr, "<", false), this.abc)
+        convertAlphabet(
+          this.prepare(text, noFixArr, "<", false),
+          this.general.abc
+        )
       ).replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d|&#40) ", "gu"), "$1"),
       "\n"
     );
   }
   process(text) {
-    const { abc, j } = this;
+    const { abc, j } = this.general;
     const splittedOrig = convertAlphabet(text, abc).split(" ");
     text = this.taraskevize(text.toLowerCase());
     if (j && abc !== ALPHABET.LATIN_JI)

package/package.json

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