taraskevizer 1.4.2 → 1.4.4

package/README.md

@@ -63,13 +63,13 @@ When to replace `і`(`i`) by `й`(`j`) after vowels:
 
 ### html
 
-Type: `false|object`
+Type: `boolean|object`
 
 Default value: `false`
 
-If `object`, some parts of a text are wrapped in HTML tags.
+If `true|object`, some parts of a text are wrapped in HTML tags.
 
-#### g
+#### html.g
 
 Type: `boolean`
 
@@ -85,19 +85,19 @@ true: <tarH>ґ</tarH> <tarH>Ґ</tarH>
 
 ### nonHtml
 
-Type: `false|object`
+Type: `boolean|object`
 
 Default value: `false`
 
 If `html` is defined, will be ignored
 
-#### nodeColors
+#### nonHtml.nodeColors
 
 Type: `boolean`
 
 Default value: `false`
 
-#### h
+#### nonHtml.h
 
 Type: `boolean`
 
@@ -111,7 +111,7 @@ false: Ґ ґ
 true: Г г
 ```
 
-#### variations
+#### nonHtml.variations
 
 Type: `number`
 

package/dist/index.cjs

@@ -143,6 +143,7 @@ var greekLetters = [
   ["υ", /й/],
   ["κ", /к/],
   ["λ", /л/],
+  ["μ‘π", /мп/],
   ["μ", /м/],
   ["ν", /н/],
   ["ο", /о/],
@@ -189,6 +190,8 @@ var greekLettersUpperCase = [
   ["Υ", /Й/],
   ["Κ", /К/],
   ["Λ", /Л/],
+  ["Μ‘Π", /МП/],
+  ["Μ‘π", /Мп/],
   ["Μ", /М/],
   ["Ν", /Н/],
   ["Ο", /О/],
@@ -210,25 +213,38 @@ var greekLettersUpperCase = [
 ];
 var thWords = [
   ["θει", /тэі(?=зм|ст)/],
+  [" αγαθ", / агат/],
   [" αναθεμ", / анатэм/],
+  ["ανθραπα", /антрапа/],
+  [" απαθε", / апатэ(?=оз|аты|м)/],
   [" αρθα", / арта(?=графі|д[ао]кс|эпі)/],
   [" αρίθμετ", / арытмэт/],
   [" αθεν", / атэн/],
   [" καλιθε", / калітэ/],
   [" καθεδ", / катэд(?=\(?а?р)/],
+  ["λυαμπιρίνθ", /лябірынт/],
+  ["λυαγαρίθμ", /лягарытм/],
+  [" μαρθί ", / мар[фт]ы /],
+  [" μαρθη ", / марфе /],
   [" μαθεματί", / матэматы/],
   [" μιθ", / міт(?=[ауы]|оляг| )/],
   [" μεθ", / мэт(?=[ао]д)/],
+  ["παθ", /пат(?=ал[ёя]гі|оляг|ычн|ыя|ы[ійю] |[ауы] |а[ўм] |амі | )/],
   [" πιθαγορ", / пітагор/],
   [" ρίθμ", / ры[тф]м/],
+  ["σίνθετ", /сынтэ[зт]/],
+  [" θομασ", / томас/],
+  [" θρομμπ", / тромб/],
+  [" θρον", / трон/],
+  ["θραμμποζ", /трамбоз/],
   [" θεαδοσ", / тэадос/],
   [" θεαρεμ", / тэарэм/],
   [" θεατ", / тэат(?=ар |р)/],
   [" θεμ", / тэм(?=[аеуы])/],
-  [" Θε", / тэ(?=[ао]р|салёнік|сал)/],
-  ["θεσ", /тэс(?=\S*алёнік)/],
-  ["Θερμα", /тэрма/],
-  [" εΘερ", / этэр/]
+  [" θε", / тэ(?=[ао]р|салёнік|сал)/],
+  ["θε", /тэ(?=с\S*алёнік|\S*зіс)/],
+  ["θερμα", /тэрма/],
+  [" εθ", / эт(?=ы[кч]|эр)/]
 ];
 
 // src/dict/arabic.ts
@@ -434,6 +450,7 @@ var rawWordlist = [
   ["анэ", /ане(?=стэ[зт])/],
   ["апазыцы", /апазіцы/],
   ["апаляґет", /апалагет/],
+  [" апатэ", / апафе(?=оз|аты|м)/],
   ["апсыд", /апсід/],
   // Апсыда
   ["апэльсін", /апельсін/],
@@ -837,9 +854,11 @@ var rawWordlist = [
   [" люўр", / луўр/],
   // [' $1ляг$2', / ((?:пра|не)?)лаг(аван|і|уе)/],
   ["лябара", /лабара(?=[нт])/],
+  ["лябірын", /лабірын(?=[тц])/],
   ["лябатам", /лабатам/],
   ["ляванд", /лаванд/],
-  ["лягарыт", /лага(?=рыф|тып)/],
+  ["лягарыт", /лагарыф/],
+  ["лягатып", /лагатып/],
   ["лягуна", /лагуна/],
   ["ляйпцыг", /лейпцыг/],
   ["ляйтматы", /лейтматы/],
@@ -2084,6 +2103,7 @@ for (const word of gwords)
   wordlist.push([word, RegExp(word.replace(/ґ/g, "г"), "g")]);
 
 // src/tarask.ts
+var isObject = (arg) => typeof arg === "object";
 var isUpperCase = (str) => str === str.toUpperCase();
 var getLastLetter = (word) => {
   for (let i = word.length - 1; i > 0; i--)
@@ -2131,7 +2151,9 @@ var tagApplications = {
 };
 var taraskSync = (text, options) => {
   const { abc = 0, j = 0, html = false, nonHtml = false } = options || {};
-  if (typeof nonHtml === "object") {
+  const isHtmlObject = isObject(html);
+  const isNonHtmlObject = isObject(nonHtml);
+  if (isNonHtmlObject) {
     nonHtml.variations || (nonHtml.variations = 0);
   }
   const apply = html ? tagApplications.html : tagApplications.nonHtml;
@@ -2157,17 +2179,22 @@ var taraskSync = (text, options) => {
   splitted = text.split(" ");
   if (abc !== ALPHABET.ARABIC)
     splitted = restoreCase(splitted, splittedOrig);
-  const nodeColors = nonHtml && nonHtml.nodeColors;
+  const nodeColors = isNonHtmlObject && nonHtml.nodeColors;
   if (html || nodeColors)
-    splitted = toTags(splitted, splittedOrig, abc, apply.F);
+    splitted = toTags(
+      splitted,
+      splittedOrig,
+      abc === ALPHABET.CYRILLIC,
+      apply.F
+    );
   text = splitted.join(" ").replace(/ /g, " ").replace(/ (\p{P}|\p{S}|\d|&#40) /gu, "$1");
   let gReplacer;
   if (html) {
     text = replaceWithDict(text, additionalReplacements[abc]);
-    if (abc === ALPHABET.CYRILLIC) {
+    if (isHtmlObject && abc === ALPHABET.CYRILLIC) {
       gReplacer = html.g ? apply.H("$&") : ($0) => apply.H(gobj[$0]);
     }
-  } else if (nonHtml && abc === ALPHABET.CYRILLIC) {
+  } else if (isNonHtmlObject && abc === ALPHABET.CYRILLIC) {
     if (nonHtml.nodeColors) {
       gReplacer = nonHtml.h ? ($0) => apply.H(gobj[$0]) : apply.H("$&");
     } else if (nonHtml.h) {
@@ -2206,13 +2233,13 @@ function restoreCase(text, orig) {
   }
   return text;
 }
-function toTags(text, orig, abc, applyF) {
+function toTags(text, orig, isCyrillic, applyF) {
   for (let i = 0; i < text.length; i++) {
     const word = text[i];
     const oWord = orig[i];
     if (oWord === word)
       continue;
-    const wordH = word.replace(G_REGEX, ($0) => gobj[$0]);
+    const wordH = isCyrillic ? word.replace(G_REGEX, ($0) => gobj[$0]) : word;
     if (oWord === wordH)
       continue;
     if (!/\(/.test(word)) {
@@ -2225,7 +2252,7 @@ function toTags(text, orig, abc, applyF) {
         text[i] = wordLetters.join("");
         continue;
       }
-      if (abc === ALPHABET.CYRILLIC) {
+      if (isCyrillic) {
         const word1 = word.replace(/ь/g, "");
         switch (oWord) {
           case word1:
@@ -2297,7 +2324,7 @@ var finalizer = {
     return `<tarL data-l='${options}'>${main}</tarL>`;
   }).replace(/ \n /g, "<br>"),
   nonHtml(text, options) {
-    if (options && options.variations !== VARIATION.ALL) {
+    if (isObject(options) && options.variations !== VARIATION.ALL) {
       const WORD_INDEX = options.variations;
       const replacer = ($0) => $0.slice(1, -1).split("|")[WORD_INDEX];
       text = text.replace(

package/dist/index.d.ts

@@ -16,13 +16,9 @@ type HtmlOptions = {
 type TaraskOptionsStrict = {
     abc: Alphabet;
     j: J$1;
-} & ({
-    html: HtmlOptions;
-    nonHtml: false;
-} | {
-    html: false;
-    nonHtml: NonHtmlOptions;
-});
+    html: boolean | HtmlOptions;
+    nonHtml: boolean | NonHtmlOptions;
+};
 type TaraskOptions = DeepPartial<TaraskOptionsStrict>;
 type Tarask = (text: string, options?: TaraskOptions) => string;
 type TaraskAsync = Promisify<Tarask>;

package/dist/index.js

@@ -113,6 +113,7 @@ var greekLetters = [
   ["υ", /й/],
   ["κ", /к/],
   ["λ", /л/],
+  ["μ‘π", /мп/],
   ["μ", /м/],
   ["ν", /н/],
   ["ο", /о/],
@@ -159,6 +160,8 @@ var greekLettersUpperCase = [
   ["Υ", /Й/],
   ["Κ", /К/],
   ["Λ", /Л/],
+  ["Μ‘Π", /МП/],
+  ["Μ‘π", /Мп/],
   ["Μ", /М/],
   ["Ν", /Н/],
   ["Ο", /О/],
@@ -180,25 +183,38 @@ var greekLettersUpperCase = [
 ];
 var thWords = [
   ["θει", /тэі(?=зм|ст)/],
+  [" αγαθ", / агат/],
   [" αναθεμ", / анатэм/],
+  ["ανθραπα", /антрапа/],
+  [" απαθε", / апатэ(?=оз|аты|м)/],
   [" αρθα", / арта(?=графі|д[ао]кс|эпі)/],
   [" αρίθμετ", / арытмэт/],
   [" αθεν", / атэн/],
   [" καλιθε", / калітэ/],
   [" καθεδ", / катэд(?=\(?а?р)/],
+  ["λυαμπιρίνθ", /лябірынт/],
+  ["λυαγαρίθμ", /лягарытм/],
+  [" μαρθί ", / мар[фт]ы /],
+  [" μαρθη ", / марфе /],
   [" μαθεματί", / матэматы/],
   [" μιθ", / міт(?=[ауы]|оляг| )/],
   [" μεθ", / мэт(?=[ао]д)/],
+  ["παθ", /пат(?=ал[ёя]гі|оляг|ычн|ыя|ы[ійю] |[ауы] |а[ўм] |амі | )/],
   [" πιθαγορ", / пітагор/],
   [" ρίθμ", / ры[тф]м/],
+  ["σίνθετ", /сынтэ[зт]/],
+  [" θομασ", / томас/],
+  [" θρομμπ", / тромб/],
+  [" θρον", / трон/],
+  ["θραμμποζ", /трамбоз/],
   [" θεαδοσ", / тэадос/],
   [" θεαρεμ", / тэарэм/],
   [" θεατ", / тэат(?=ар |р)/],
   [" θεμ", / тэм(?=[аеуы])/],
-  [" Θε", / тэ(?=[ао]р|салёнік|сал)/],
-  ["θεσ", /тэс(?=\S*алёнік)/],
-  ["Θερμα", /тэрма/],
-  [" εΘερ", / этэр/]
+  [" θε", / тэ(?=[ао]р|салёнік|сал)/],
+  ["θε", /тэ(?=с\S*алёнік|\S*зіс)/],
+  ["θερμα", /тэрма/],
+  [" εθ", / эт(?=ы[кч]|эр)/]
 ];
 
 // src/dict/arabic.ts
@@ -404,6 +420,7 @@ var rawWordlist = [
   ["анэ", /ане(?=стэ[зт])/],
   ["апазыцы", /апазіцы/],
   ["апаляґет", /апалагет/],
+  [" апатэ", / апафе(?=оз|аты|м)/],
   ["апсыд", /апсід/],
   // Апсыда
   ["апэльсін", /апельсін/],
@@ -807,9 +824,11 @@ var rawWordlist = [
   [" люўр", / луўр/],
   // [' $1ляг$2', / ((?:пра|не)?)лаг(аван|і|уе)/],
   ["лябара", /лабара(?=[нт])/],
+  ["лябірын", /лабірын(?=[тц])/],
   ["лябатам", /лабатам/],
   ["ляванд", /лаванд/],
-  ["лягарыт", /лага(?=рыф|тып)/],
+  ["лягарыт", /лагарыф/],
+  ["лягатып", /лагатып/],
   ["лягуна", /лагуна/],
   ["ляйпцыг", /лейпцыг/],
   ["ляйтматы", /лейтматы/],
@@ -2054,6 +2073,7 @@ for (const word of gwords)
   wordlist.push([word, RegExp(word.replace(/ґ/g, "г"), "g")]);
 
 // src/tarask.ts
+var isObject = (arg) => typeof arg === "object";
 var isUpperCase = (str) => str === str.toUpperCase();
 var getLastLetter = (word) => {
   for (let i = word.length - 1; i > 0; i--)
@@ -2101,7 +2121,9 @@ var tagApplications = {
 };
 var taraskSync = (text, options) => {
   const { abc = 0, j = 0, html = false, nonHtml = false } = options || {};
-  if (typeof nonHtml === "object") {
+  const isHtmlObject = isObject(html);
+  const isNonHtmlObject = isObject(nonHtml);
+  if (isNonHtmlObject) {
     nonHtml.variations || (nonHtml.variations = 0);
   }
   const apply = html ? tagApplications.html : tagApplications.nonHtml;
@@ -2127,17 +2149,22 @@ var taraskSync = (text, options) => {
   splitted = text.split(" ");
   if (abc !== ALPHABET.ARABIC)
     splitted = restoreCase(splitted, splittedOrig);
-  const nodeColors = nonHtml && nonHtml.nodeColors;
+  const nodeColors = isNonHtmlObject && nonHtml.nodeColors;
   if (html || nodeColors)
-    splitted = toTags(splitted, splittedOrig, abc, apply.F);
+    splitted = toTags(
+      splitted,
+      splittedOrig,
+      abc === ALPHABET.CYRILLIC,
+      apply.F
+    );
   text = splitted.join(" ").replace(/ /g, " ").replace(/ (\p{P}|\p{S}|\d|&#40) /gu, "$1");
   let gReplacer;
   if (html) {
     text = replaceWithDict(text, additionalReplacements[abc]);
-    if (abc === ALPHABET.CYRILLIC) {
+    if (isHtmlObject && abc === ALPHABET.CYRILLIC) {
       gReplacer = html.g ? apply.H("$&") : ($0) => apply.H(gobj[$0]);
     }
-  } else if (nonHtml && abc === ALPHABET.CYRILLIC) {
+  } else if (isNonHtmlObject && abc === ALPHABET.CYRILLIC) {
     if (nonHtml.nodeColors) {
       gReplacer = nonHtml.h ? ($0) => apply.H(gobj[$0]) : apply.H("$&");
     } else if (nonHtml.h) {
@@ -2176,13 +2203,13 @@ function restoreCase(text, orig) {
   }
   return text;
 }
-function toTags(text, orig, abc, applyF) {
+function toTags(text, orig, isCyrillic, applyF) {
   for (let i = 0; i < text.length; i++) {
     const word = text[i];
     const oWord = orig[i];
     if (oWord === word)
       continue;
-    const wordH = word.replace(G_REGEX, ($0) => gobj[$0]);
+    const wordH = isCyrillic ? word.replace(G_REGEX, ($0) => gobj[$0]) : word;
     if (oWord === wordH)
       continue;
     if (!/\(/.test(word)) {
@@ -2195,7 +2222,7 @@ function toTags(text, orig, abc, applyF) {
         text[i] = wordLetters.join("");
         continue;
       }
-      if (abc === ALPHABET.CYRILLIC) {
+      if (isCyrillic) {
         const word1 = word.replace(/ь/g, "");
         switch (oWord) {
           case word1:
@@ -2267,7 +2294,7 @@ var finalizer = {
     return `<tarL data-l='${options}'>${main}</tarL>`;
   }).replace(/ \n /g, "<br>"),
   nonHtml(text, options) {
-    if (options && options.variations !== VARIATION.ALL) {
+    if (isObject(options) && options.variations !== VARIATION.ALL) {
       const WORD_INDEX = options.variations;
       const replacer = ($0) => $0.slice(1, -1).split("|")[WORD_INDEX];
       text = text.replace(

package/package.json

@@ -2,7 +2,7 @@
 	"name": "taraskevizer",
 	"author": "GooseOb",
 	"license": "MIT",
-	"version": "1.4.2",
+	"version": "1.4.4",
 	"private": false,
 	"homepage": "https://gooseob.github.io/taraskevizatar/",
 	"main": "dist/index.js",