taraskevizer 7.0.3 → 7.1.1

package/dist/index.js

@@ -7,24 +7,28 @@ var __export = (target, all) => {
 // src/dict/index.ts
 var dict_exports = {};
 __export(dict_exports, {
-  arabLetters: () => arabLetters,
+  alphabets: () => alphabets_exports,
   gobj: () => gobj,
-  latinLettersLowerCase: () => latinLettersLowerCase,
-  latinLettersLowerCaseJi: () => latinLettersLowerCaseJi,
-  latinLettersUpperCase: () => latinLettersUpperCase,
-  latinLettersUpperCaseJi: () => latinLettersUpperCaseJi,
   noSoften: () => noSoften,
   softeners: () => softeners,
   wordlist: () => wordlist
 });
 
+// src/dict/gobj.ts
+var gobj = {
+  г: "ґ",
+  Г: "Ґ",
+  ґ: "г",
+  Ґ: "Г"
+};
+
 // src/dict/lib.ts
 var dictFrom = {
-  raw: (dict) => {
+  raw: (dict, additionalFlags = "g") => {
     for (const item of dict)
       item[0] = RegExp(
         item[0],
-        item[0] instanceof RegExp ? item[0].flags + "g" : "g"
+        item[0] instanceof RegExp ? item[0].flags + additionalFlags : additionalFlags
       );
     return dict;
   },
@@ -97,213 +101,6 @@ var iwords = toOneLine(`біс
 ць?він
 шыяс`);
 
-// src/dict/latin.ts
-var common = {
-  lower: [
-    [
-      [/(?<=[аеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)е/, "je"],
-      [/(?<=[eаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)ё/, "jo"],
-      [/(?<=[eoаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)ю/, "ju"],
-      [/(?<=[eouаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)я/, "ja"]
-    ],
-    [
-      [/ʼ/, ""],
-      [/ць/, "ć"],
-      [/зь/, "ź"],
-      [/сь/, "ś"],
-      [/нь/, "ń"],
-      [/ль/, "l"],
-      [/а/, "a"],
-      [/б/, "b"],
-      [/в/, "v"],
-      [/г/, "h"],
-      [/ґ/, "g"],
-      [/д/, "d"],
-      [/е/, "ie"],
-      [/ё/, "io"],
-      [/ж/, "ž"],
-      [/з/, "z"],
-      [/і/, "i"],
-      [/й/, "j"],
-      [/к/, "k"],
-      [/л/, "ł"],
-      [/м/, "m"],
-      [/н/, "n"],
-      [/о/, "o"],
-      [/п/, "p"],
-      [/р/, "r"],
-      [/с/, "s"],
-      [/т/, "t"],
-      [/у/, "u"],
-      [/ў/, "ŭ"],
-      [/ф/, "f"],
-      [/х/, "ch"],
-      [/ц/, "c"],
-      [/ч/, "č"],
-      [/ш/, "š"],
-      [/ы/, "y"],
-      [/э/, "e"],
-      [/ю/, "iu"],
-      [/я/, "ia"],
-      [/łi(?=[eoua])/, "l"],
-      [/łi/, "li"]
-    ]
-  ].map(dictFrom.nonGlobal),
-  upper: [
-    [
-      [new RegExp(" Е(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), " Je"],
-      [new RegExp(" Ё(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), " Jo"],
-      [new RegExp(" Ю(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), " Ju"],
-      [new RegExp(" Я(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), " Ja"]
-    ],
-    [
-      [/([АЕЁІОУЎЫЭЮЯЬ| ]\(?)Е/, "$1JE"],
-      [/([EАЕЁІОУЎЫЭЮЯЬ| ]\(?)Ё/, "$1JO"],
-      [/([EOАЕЁІОУЎЫЭЮЯЬ| ]\(?)Ю/, "$1JU"],
-      [/([EOUАЕЁІОУЎЫЭЮЯЬ| ]\(?)Я/, "$1JA"]
-    ],
-    [
-      [/Е/, "IE"],
-      [/Ё/, "IO"],
-      [/Ю/, "IU"],
-      [/Я/, "IA"],
-      [/Ц[Ьь]/, "Ć"],
-      [/З[Ьь]/, "Ź"],
-      [/С[Ьь]/, "Ś"],
-      [/Н[Ьь]/, "Ń"],
-      [/Л[Ьь]/, "L"],
-      [/А/, "A"],
-      [/Б/, "B"],
-      [/В/, "V"],
-      [/Г/, "H"],
-      [/Ґ/, "G"],
-      [/Д/, "D"],
-      [/Ж/, "Ž"],
-      [/З/, "Z"],
-      [/І/, "I"],
-      [/Й/, "J"],
-      [/К/, "K"],
-      [/Л/, "Ł"],
-      [/М/, "M"],
-      [/Н/, "N"],
-      [/О/, "O"],
-      [/П/, "P"],
-      [/Р/, "R"],
-      [/С/, "S"],
-      [/Т/, "T"],
-      [/У/, "U"],
-      [/Ў/, "Ŭ"],
-      [/Ф/, "F"],
-      [/ Х(?=[\p{Ll} ])/u, " Ch"],
-      [/Х/, "CH"],
-      [/Ц/, "C"],
-      [/Ч/, "Č"],
-      [/Ш/, "Š"],
-      [/Ы/, "Y"],
-      [/Э/, "E"],
-      [/Ł[Ii](?=[AEOUaeou])/, "L"],
-      [/Ł(?=[Ii])/, "L"]
-    ]
-  ].map(dictFrom.nonGlobal)
-};
-var latinLettersLowerCase = [
-  ...common.lower[0],
-  [/ʼі/g, "ji"],
-  ...common.lower[1]
-];
-var latinLettersUpperCase = common.upper.flat();
-var latinLettersLowerCaseJi = dictFrom.raw([
-  [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )і Ў/, "$1j U"],
-  [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )і ў/, "$1j u"],
-  [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )і /, "$1j "],
-  [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )І Ў/, "$1J U"],
-  [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )І ў/, "$1J u"],
-  [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )І /, "$1J "],
-  [` і(?=${iwords})`, " ji"],
-  [` І(?=${iwords})`, " Ji"],
-  [` І(?=${iwords.toUpperCase()})`, " JI"]
-]).concat([
-  ...common.lower[0],
-  [/([eouaаеёіоуыэюяʼАЕЁІОУЫЭЮЯЬ] *)і/g, "$1ji"],
-  ...common.lower[1]
-]);
-var latinLettersUpperCaseJi = [
-  ...common.upper[0],
-  [new RegExp("([eoua] *)І(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "gu"), "$1Ji"],
-  ...common.upper[1],
-  [/([AOEUАЕЁІОУЎЫЭЮЯ][( ]*)І/g, "$1JI"],
-  ...common.upper[2],
-  [/ JIŁ -/g, " IŁ -"]
-];
-
-// src/dict/arabic.ts
-var soft = "ْ(?=[еёіюяь])";
-var presoft = "([تزكثࢮбвгджзйклмнпрстфхцчшў])ْ?(ّ?)";
-var arabLetters = dictFrom.raw([
-  [/ л[ая]/, " لا"],
-  [/л[ая]/, "ـلا"],
-  // падваеньне зычнага, шадда
-  [/([бвгджзйклмнпрстфхцчшў]|д[зж])\1/, "$1ّ"],
-  // няма галоснага, сукун
-  [/([бвгджзйклмнпрстфхцчшў])/, "$1ْ"],
-  // а, аліф
-  [/а/, "اа"],
-  // першая галосная, аліф
-  [/ (?=[еэыуо])/, " ا"],
-  ["дْз" + soft, "ࢮ"],
-  ["з" + soft, "ز"],
-  ["к" + soft, "ك"],
-  ["с" + soft, "ث"],
-  ["т" + soft, "ت"],
-  [/([تزكث])і/, "ы"],
-  // $2 - шадда
-  [presoft + "[аяэе]", "$1$2َ"],
-  [presoft + "[іы]", "$1$2ِ"],
-  [/ і /, " اِ "],
-  [presoft + "[оёую]", "$1$2ُ"],
-  [/ʼ/, "ع"],
-  [/ь/, ""],
-  // [/[ьʼ]/, ''],
-  [/[яе]/, "يَ"],
-  [/і/, "يِ"],
-  [/[ёю]/, "يُ"],
-  [/[аэ]/, "َ"],
-  [/[ыі]/, "ِ"],
-  [/[оу]/, "ُ"],
-  [/б/, "ب"],
-  [/[вў]/, "و"],
-  [/г/, "ه"],
-  [/ґ/, "غ"],
-  [/дْж/, "ج"],
-  [/д/, "د"],
-  [/ж/, "ژ"],
-  [/з/, "ض"],
-  [/й/, "ي"],
-  [/к/, "ق"],
-  [/л/, "ل"],
-  [/м/, "م"],
-  [/н/, "ن"],
-  [/п/, "پ"],
-  [/р/, "ر"],
-  [/с/, "ص"],
-  [/т/, "ط"],
-  [/ф/, "ف"],
-  [/х/, "ح"],
-  [/ц/, "ࢯ"],
-  [/ч/, "چ"],
-  [/ш/, "ش"],
-  [/,/, "،"],
-  [/\?/, "؟"]
-]);
-
-// src/dict/gobj.ts
-var gobj = {
-  г: "ґ",
-  Г: "Ґ",
-  ґ: "г",
-  Ґ: "Г"
-};
-
 // src/dict/wordlist.ts
 var chemicalElements1 = [
   "сканд|ванад|рубід|род|ірыд|рэзэрфорд",
@@ -2002,23 +1799,223 @@ var softeners = dictFrom.raw([
   [/([сз])ʼ(?=[яюеё])/, "$1ь"]
 ]);
 
-// src/alphabet.ts
-var ALPHABET = {
-  LATIN: {
-    lower: latinLettersLowerCase,
-    upper: latinLettersUpperCase
-  },
-  LATIN_JI: {
-    lower: latinLettersLowerCaseJi,
-    upper: latinLettersUpperCaseJi
-  },
-  ARABIC: {
-    lower: arabLetters
-  },
-  CYRILLIC: {
-    lower: [],
-    upper: []
-  }
+// src/dict/alphabets/index.ts
+var alphabets_exports = {};
+__export(alphabets_exports, {
+  arabic: () => arabic,
+  cyrillic: () => cyrillic,
+  latin: () => latin,
+  latinJi: () => latinJi
+});
+
+// src/dict/alphabets/cyrillic.ts
+var cyrillic = {
+  lower: [],
+  upper: []
+};
+
+// src/dict/alphabets/latin.ts
+var common = {
+  lower: [
+    [
+      [/(?<=[аеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)е/, "je"],
+      [/(?<=[eаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)ё/, "jo"],
+      [/(?<=[eoаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)ю/, "ju"],
+      [/(?<=[eouаеёіоуўыэюяьʼ| >АЕЁІОУЎЫЭЮЯЬ]|^)я/, "ja"]
+    ],
+    [
+      [/ʼ/, ""],
+      [/ць/, "ć"],
+      [/зь/, "ź"],
+      [/сь/, "ś"],
+      [/нь/, "ń"],
+      [/ль/, "l"],
+      [/а/, "a"],
+      [/б/, "b"],
+      [/в/, "v"],
+      [/г/, "h"],
+      [/ґ/, "g"],
+      [/д/, "d"],
+      [/е/, "ie"],
+      [/ё/, "io"],
+      [/ж/, "ž"],
+      [/з/, "z"],
+      [/і/, "i"],
+      [/й/, "j"],
+      [/к/, "k"],
+      [/л/, "ł"],
+      [/м/, "m"],
+      [/н/, "n"],
+      [/о/, "o"],
+      [/п/, "p"],
+      [/р/, "r"],
+      [/с/, "s"],
+      [/т/, "t"],
+      [/у/, "u"],
+      [/ў/, "ŭ"],
+      [/ф/, "f"],
+      [/х/, "ch"],
+      [/ц/, "c"],
+      [/ч/, "č"],
+      [/ш/, "š"],
+      [/ы/, "y"],
+      [/э/, "e"],
+      [/ю/, "iu"],
+      [/я/, "ia"],
+      [/łi(?=[eoua])/, "l"],
+      [/łi/, "li"]
+    ]
+  ].map(dictFrom.nonGlobal),
+  upper: [
+    [
+      [new RegExp(" Е(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), " Je"],
+      [new RegExp(" Ё(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), " Jo"],
+      [new RegExp(" Ю(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), " Ju"],
+      [new RegExp(" Я(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), " Ja"]
+    ],
+    [
+      [/([АЕЁІОУЎЫЭЮЯЬ| ]\(?)Е/, "$1JE"],
+      [/([EАЕЁІОУЎЫЭЮЯЬ| ]\(?)Ё/, "$1JO"],
+      [/([EOАЕЁІОУЎЫЭЮЯЬ| ]\(?)Ю/, "$1JU"],
+      [/([EOUАЕЁІОУЎЫЭЮЯЬ| ]\(?)Я/, "$1JA"]
+    ],
+    [
+      [/Е/, "IE"],
+      [/Ё/, "IO"],
+      [/Ю/, "IU"],
+      [/Я/, "IA"],
+      [/Ц[Ьь]/, "Ć"],
+      [/З[Ьь]/, "Ź"],
+      [/С[Ьь]/, "Ś"],
+      [/Н[Ьь]/, "Ń"],
+      [/Л[Ьь]/, "L"],
+      [/А/, "A"],
+      [/Б/, "B"],
+      [/В/, "V"],
+      [/Г/, "H"],
+      [/Ґ/, "G"],
+      [/Д/, "D"],
+      [/Ж/, "Ž"],
+      [/З/, "Z"],
+      [/І/, "I"],
+      [/Й/, "J"],
+      [/К/, "K"],
+      [/Л/, "Ł"],
+      [/М/, "M"],
+      [/Н/, "N"],
+      [/О/, "O"],
+      [/П/, "P"],
+      [/Р/, "R"],
+      [/С/, "S"],
+      [/Т/, "T"],
+      [/У/, "U"],
+      [/Ў/, "Ŭ"],
+      [/Ф/, "F"],
+      [/ Х(?=[\p{Ll} ])/u, " Ch"],
+      [/Х/, "CH"],
+      [/Ц/, "C"],
+      [/Ч/, "Č"],
+      [/Ш/, "Š"],
+      [/Ы/, "Y"],
+      [/Э/, "E"],
+      [/Ł[Ii](?=[AEOUaeou])/, "L"],
+      [/Ł(?=[Ii])/, "L"]
+    ]
+  ].map(dictFrom.nonGlobal)
+};
+var latin = {
+  lower: [...common.lower[0], [/ʼі/g, "ji"], ...common.lower[1]],
+  upper: common.upper.flat()
+};
+var latinJi = {
+  lower: dictFrom.raw([
+    [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )і Ў/, "$1j U"],
+    [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )і ў/, "$1j u"],
+    [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )і /, "$1j "],
+    [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )І Ў/, "$1J U"],
+    [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )І ў/, "$1J u"],
+    [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )І /, "$1J "],
+    [` і(?=${iwords})`, " ji"],
+    [` І(?=${iwords})`, " Ji"],
+    [` І(?=${iwords.toUpperCase()})`, " JI"]
+  ]).concat([
+    ...common.lower[0],
+    [/([eouaаеёіоуыэюяʼАЕЁІОУЫЭЮЯЬ] *)і/g, "$1ji"],
+    ...common.lower[1]
+  ]),
+  upper: [
+    ...common.upper[0],
+    [new RegExp("([eoua] *)І(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "gu"), "$1Ji"],
+    ...common.upper[1],
+    [/([AOEUАЕЁІОУЎЫЭЮЯ][( ]*)І/g, "$1JI"],
+    ...common.upper[2],
+    [/ JIŁ -/g, " IŁ -"]
+  ]
+};
+
+// src/dict/alphabets/arabic.ts
+var soft = "ْ(?=[еёіюяь])";
+var presoft = "([تزكثࢮбвгджзйклмнпрстфхцчшў])ْ?(ّ?)";
+var arabic = {
+  lower: dictFrom.raw(
+    [
+      [/ л[ая]/, " لا"],
+      [/л[ая]/, "ـلا"],
+      // падваеньне зычнага, шадда
+      [/([бвгджзйклмнпрстфхцчшў]|д[зж])\1/, "$1ّ"],
+      // няма галоснага, сукун
+      [/([бвгджзйклмнпрстфхцчшў])/, "$1ْ"],
+      // а, аліф
+      [/а/, "اа"],
+      // першая галосная, аліф
+      [/ (?=[еэыуо])/, " ا"],
+      ["дْз" + soft, "ࢮ"],
+      ["з" + soft, "ز"],
+      ["к" + soft, "ك"],
+      ["с" + soft, "ث"],
+      ["т" + soft, "ت"],
+      [/([تزكث])і/, "ы"],
+      // $2 - шадда
+      [presoft + "[аяэе]", "$1$2َ"],
+      [presoft + "[іы]", "$1$2ِ"],
+      [/ і /, " اِ "],
+      [presoft + "[оёую]", "$1$2ُ"],
+      [/ʼ/, "ع"],
+      [/ь/, ""],
+      // [/[ьʼ]/, ''],
+      [/[яе]/, "يَ"],
+      [/і/, "يِ"],
+      [/[ёю]/, "يُ"],
+      [/[аэ]/, "َ"],
+      [/[ыі]/, "ِ"],
+      [/[оу]/, "ُ"],
+      [/б/, "ب"],
+      [/[вў]/, "و"],
+      [/г/, "ه"],
+      [/ґ/, "غ"],
+      [/дْж/, "ج"],
+      [/д/, "د"],
+      [/ж/, "ژ"],
+      [/з/, "ض"],
+      [/й/, "ي"],
+      [/к/, "ق"],
+      [/л/, "ل"],
+      [/м/, "م"],
+      [/н/, "ن"],
+      [/п/, "پ"],
+      [/р/, "ر"],
+      [/с/, "ص"],
+      [/т/, "ط"],
+      [/ф/, "ف"],
+      [/х/, "ح"],
+      [/ц/, "ࢯ"],
+      [/ч/, "چ"],
+      [/ш/, "ش"],
+      [/,/, "،"],
+      [/\?/, "؟"]
+    ],
+    "gi"
+  )
 };
 
 // src/config.ts
@@ -2039,7 +2036,7 @@ var TaraskConfig = class {
     }
   }
   general = {
-    abc: ALPHABET.CYRILLIC,
+    abc: alphabets_exports.cyrillic,
     j: REPLACE_J.NEVER,
     doEscapeCapitalized: true
   };
@@ -2264,7 +2261,7 @@ var highlightDiffStep = (highlight) => (_, {
   },
   storage: { text, orig }
 }) => {
-  highlightDiff(text, orig, abc === ALPHABET.CYRILLIC, highlight);
+  highlightDiff(text, orig, abc === alphabets_exports.cyrillic, highlight);
   return _;
 };
 var highlightDiffNonHtmlStep = (_, {
@@ -2275,7 +2272,12 @@ var highlightDiffNonHtmlStep = (_, {
   storage: { text, orig }
 }) => {
   if (ansiColors)
-    highlightDiff(text, orig, abc === ALPHABET.CYRILLIC, ansiColorWrappers.fix);
+    highlightDiff(
+      text,
+      orig,
+      abc === alphabets_exports.cyrillic,
+      ansiColorWrappers.fix
+    );
   return _;
 };
 
@@ -2364,7 +2366,7 @@ var applyHtmlG = (text, {
   }
 }) => {
   const colorize = htmlWrappers.letterH;
-  return abc === ALPHABET.CYRILLIC ? replaceG(g ? colorize("$&") : ($0) => colorize(gobj[$0]))(text) : text;
+  return abc === alphabets_exports.cyrillic ? replaceG(g ? colorize("$&") : ($0) => colorize(gobj[$0]))(text) : text;
 };
 
 // src/steps/i-to-j.ts
@@ -2373,7 +2375,7 @@ var replaceIbyJ = (text, {
   cfg: {
     general: { j, abc }
   }
-}) => j && abc !== ALPHABET.LATIN_JI ? text.replace(
+}) => j && abc !== alphabets_exports.latinJi ? text.replace(
   /(?<=[аеёіоуыэюя] )і (ў?)/g,
   j === REPLACE_J.ALWAYS ? ($0, $1) => toJ($1) : ($0, $1) => Math.random() >= 0.5 ? toJ($1) : $0
 ) : text;
@@ -2396,7 +2398,7 @@ var applyNonHtmlG = (text, {
   }
 }) => {
   const colorize = ansiColorWrappers.variable;
-  return abc === ALPHABET.CYRILLIC && (h || ansiColors) ? replaceG(
+  return abc === alphabets_exports.cyrillic && (h || ansiColors) ? replaceG(
     ansiColors ? h ? ($0) => colorize(gobj[$0]) : colorize("$&") : ($0) => gobj[$0]
   )(text) : text;
 };
@@ -2409,10 +2411,15 @@ var restoreCaseStep = (_, {
   cfg: {
     general: { abc }
   },
-  storage
+  storage: { text, orig }
 }) => {
-  if (abc !== ALPHABET.ARABIC) {
-    storage.text = restoreCase(storage.text, storage.orig);
+  if (abc.upper) {
+    restoreCase(text, orig);
+  } else {
+    for (let i = 0; i < text.length; i++) {
+      if (orig[i] !== orig[i].toLowerCase())
+        text[i] = orig[i];
+    }
   }
   return _;
 };
@@ -2525,7 +2532,6 @@ var htmlPipeline = createPipeline(
   highlightDiffStep(htmlWrappers.fix)
 );
 export {
-  ALPHABET,
   REPLACE_J,
   TaraskConfig,
   VARIATION,

package/package.json

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