taraskevizer 1.2.2 → 1.3.0

package/dist/index.cjs

@@ -19,6 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  ALPHABET: () => ALPHABET,
+  J: () => J,
+  VARIATION: () => VARIATION,
   gobj: () => gobj,
   tarask: () => tarask,
   taraskSync: () => taraskSync
@@ -842,9 +845,10 @@ var rawWordlist = [
   ["сэйшэл", /сейшэл/],
   ["сэкстын", /сексцін/],
   // Сэкстына, места
-  ["сэк", /сек(?=[ст])/],
+  ["сэк", /сек(?=[ст]|цы)/],
   // сэкстант
   ["сэкунд", /секунд/],
+  [" сэлек", / селек(?=[тц])/],
   ["сэмант", /семант/],
   ["сэмі", /семі(?=т|ц|нар)/],
   ["сэмэстр", /семестр/],
@@ -1973,27 +1977,26 @@ var NOFIX_CHAR = "
 var NOFIX_REGEX = new RegExp(NOFIX_CHAR, "g");
 var OPTIONAL_WORDS_REGEX = /\(.*?\)/g;
 var G_REGEX = /[Ґґ]/g;
-var CYRILLIC = 0;
-var LATIN = 1;
-var ARABIC = 2;
-var J_ALWAYS = 2;
+var ALPHABET = { CYRILLIC: 0, LATIN: 1, ARABIC: 2 };
+var J = { NEVER: 0, RANDOM: 1, ALWAYS: 2 };
+var VARIATION = { NO: 0, FIRST: 1, ALL: 2 };
 var letters = {
-  [LATIN]: latinLetters,
-  [ARABIC]: arabLetters
+  [ALPHABET.LATIN]: latinLetters,
+  [ALPHABET.ARABIC]: arabLetters
 };
 var lettersUpperCase = {
-  [LATIN]: latinLettersUpperCase
+  [ALPHABET.LATIN]: latinLettersUpperCase
 };
 var additionalReplacements = {
-  [CYRILLIC]: [
+  [ALPHABET.CYRILLIC]: [
     ["$1У", /([АЕЁІОУЫЭЮЯ])<tarF>Ў<\/tarF>/g],
     [" У", / <tarF>Ў<\/tarF>(?=\p{Lu})/gu]
   ],
-  [LATIN]: [
+  [ALPHABET.LATIN]: [
     ["$1U", /([AEIOUY])<tarF>Ŭ<\/tarF>/g],
     [" U", / <tarF>Ŭ<\/tarF>(?=\p{Lu})/gu]
   ],
-  [ARABIC]: []
+  [ALPHABET.ARABIC]: []
 };
 var tagApplications = {
   html: {
@@ -2027,10 +2030,10 @@ var taraskSync = (text, options) => {
   ).split(" ");
   text = toTarask(text.toLowerCase());
   if (j)
-    text = replaceIbyJ(text, j === J_ALWAYS);
+    text = replaceIbyJ(text, j === J.ALWAYS);
   text = replaceWithDict(text, letters[abc]);
   splitted = text.split(" ");
-  if (abc !== ARABIC)
+  if (abc !== ALPHABET.ARABIC)
     splitted = restoreCase(splitted, splittedOrig);
   const nodeColors = nonHtml && nonHtml.nodeColors;
   if (html || nodeColors)
@@ -2039,10 +2042,10 @@ var taraskSync = (text, options) => {
   let gReplacer;
   if (html) {
     text = replaceWithDict(text, additionalReplacements[abc]);
-    if (abc === CYRILLIC) {
+    if (abc === ALPHABET.CYRILLIC) {
       gReplacer = html.g ? apply.H("$&") : ($0) => apply.H(gobj[$0]);
     }
-  } else if (nonHtml && abc === CYRILLIC) {
+  } else if (nonHtml && abc === ALPHABET.CYRILLIC) {
     if (nonHtml.nodeColors) {
       gReplacer = nonHtml.h ? ($0) => apply.H(gobj[$0]) : apply.H("$&");
     } else if (nonHtml.h) {
@@ -2053,7 +2056,7 @@ var taraskSync = (text, options) => {
     text = text.replace(G_REGEX, gReplacer);
   if (noFix.length)
     text = text.replace(NOFIX_REGEX, () => noFix.shift());
-  return (html ? finalizer.html(text) : finalizer.nonHtml(text, nonHtml, apply)).trim();
+  return (html ? finalizer.html(text) : finalizer.nonHtml(text, nonHtml)).trim();
 };
 var tarask = (...args) => new Promise((res) => res(taraskSync(...args)));
 function restoreCase(text, orig) {
@@ -2092,15 +2095,15 @@ function toTags(text, orig, abc, applyF) {
       continue;
     if (!/\(/.test(word)) {
       if (word.length === oWord.length) {
-        const LettersText = word.split("");
-        for (let x = 0; x < LettersText.length; x++) {
-          if (LettersText[x] !== oWord[x])
-            LettersText[x] = applyF(LettersText[x]);
+        const wordLetters = word.split("");
+        for (let j = 0; j < wordLetters.length; j++) {
+          if (wordH[j] !== oWord[j])
+            wordLetters[j] = applyF(wordLetters[j]);
         }
-        text[i] = LettersText.join("");
+        text[i] = wordLetters.join("");
         continue;
       }
-      if (abc === CYRILLIC) {
+      if (abc === ALPHABET.CYRILLIC) {
         const word1 = word.replace(/ь/g, "");
         switch (oWord) {
           case word1:
@@ -2171,13 +2174,13 @@ var finalizer = {
     const main = options.shift();
     return `<tarL data-l='${options}'>${main}</tarL>`;
   }).replace(/ \n /g, "<br>"),
-  nonHtml(text, options, apply) {
-    if (options && options.variations !== 2) {
+  nonHtml(text, options) {
+    if (options && options.variations !== VARIATION.ALL) {
       const WORD_INDEX = options.variations;
       const replacer = ($0) => $0.slice(1, -1).split("|")[WORD_INDEX];
       text = text.replace(
         OPTIONAL_WORDS_REGEX,
-        options.nodeColors ? ($0) => apply.L(replacer($0)) : replacer
+        options.nodeColors ? ($0) => tagApplications.nonHtml.L(replacer($0)) : replacer
       );
     }
     return text.replace(/&#40/g, "(");
@@ -2185,6 +2188,9 @@ var finalizer = {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ALPHABET,
+  J,
+  VARIATION,
   gobj,
   tarask,
   taraskSync

package/dist/index.d.ts

@@ -1,39 +1,54 @@
-type Promisify<T> = T extends (...args: infer TArgs) => infer TReturn ? (...args: TArgs) => Promise<TReturn> : never;
-type DeepPartial<T> = T extends object ? {
-    [P in keyof T]?: DeepPartial<T[P]>;
-} : T;
-type Alphabet = 0 | 1 | 2;
-type J = 0 | 1 | 2;
-type Variation = 0 | 1 | 2;
-type NonHtmlOptions = {
-    nodeColors: boolean;
-    h: boolean;
-    variations: Variation;
-};
-type HtmlOptions = {
-    g: boolean;
-};
-type TaraskOptions = DeepPartial<{
-    abc: Alphabet;
-    j: J;
-    html: false | HtmlOptions;
-    nonHtml: false | NonHtmlOptions;
-}>;
-type Tarask = (text: string, options?: TaraskOptions) => string;
-type TaraskAsync = Promisify<Tarask>;
-type Dict<T = RegExp> = [string, T][];
-type AlphabetDependentDict = {
-    [key in Alphabet]?: Dict;
+type Promisify<T> = T extends (...args: infer TArgs) => infer TReturn ? (...args: TArgs) => Promise<TReturn> : never;
+type DeepPartial<T> = T extends object ? {
+    [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
+type Alphabet = 0 | 1 | 2;
+type J$1 = 0 | 1 | 2;
+type Variation = 0 | 1 | 2;
+type NonHtmlOptions = {
+    nodeColors: boolean;
+    h: boolean;
+    variations: Variation;
+};
+type HtmlOptions = {
+    g: boolean;
+};
+type TaraskOptions = DeepPartial<{
+    abc: Alphabet;
+    j: J$1;
+    html: false | HtmlOptions;
+    nonHtml: false | NonHtmlOptions;
+}>;
+type Tarask = (text: string, options?: TaraskOptions) => string;
+type TaraskAsync = Promisify<Tarask>;
+type Dict<T = RegExp> = [string, T][];
+type AlphabetDependentDict = {
+    [key in Alphabet]?: Dict;
 };
 
-declare const taraskSync: Tarask;
+declare const ALPHABET: {
+    CYRILLIC: number;
+    LATIN: number;
+    ARABIC: number;
+};
+declare const J: {
+    NEVER: number;
+    RANDOM: number;
+    ALWAYS: number;
+};
+declare const VARIATION: {
+    NO: number;
+    FIRST: number;
+    ALL: number;
+};
+declare const taraskSync: Tarask;
 declare const tarask: TaraskAsync;
 
-declare const gobj: {
-    readonly г: "ґ";
-    readonly Г: "Ґ";
-    readonly ґ: "г";
-    readonly Ґ: "Г";
+declare const gobj: {
+    readonly г: "ґ";
+    readonly Г: "Ґ";
+    readonly ґ: "г";
+    readonly Ґ: "Г";
 };
 
-export { AlphabetDependentDict, Dict, HtmlOptions, NonHtmlOptions, Tarask, TaraskAsync, TaraskOptions, gobj, tarask, taraskSync };
+export { ALPHABET, AlphabetDependentDict, Dict, HtmlOptions, J, NonHtmlOptions, Tarask, TaraskAsync, TaraskOptions, VARIATION, gobj, tarask, taraskSync };

package/dist/index.js

@@ -815,9 +815,10 @@ var rawWordlist = [
   ["сэйшэл", /сейшэл/],
   ["сэкстын", /сексцін/],
   // Сэкстына, места
-  ["сэк", /сек(?=[ст])/],
+  ["сэк", /сек(?=[ст]|цы)/],
   // сэкстант
   ["сэкунд", /секунд/],
+  [" сэлек", / селек(?=[тц])/],
   ["сэмант", /семант/],
   ["сэмі", /семі(?=т|ц|нар)/],
   ["сэмэстр", /семестр/],
@@ -1946,27 +1947,26 @@ var NOFIX_CHAR = "
 var NOFIX_REGEX = new RegExp(NOFIX_CHAR, "g");
 var OPTIONAL_WORDS_REGEX = /\(.*?\)/g;
 var G_REGEX = /[Ґґ]/g;
-var CYRILLIC = 0;
-var LATIN = 1;
-var ARABIC = 2;
-var J_ALWAYS = 2;
+var ALPHABET = { CYRILLIC: 0, LATIN: 1, ARABIC: 2 };
+var J = { NEVER: 0, RANDOM: 1, ALWAYS: 2 };
+var VARIATION = { NO: 0, FIRST: 1, ALL: 2 };
 var letters = {
-  [LATIN]: latinLetters,
-  [ARABIC]: arabLetters
+  [ALPHABET.LATIN]: latinLetters,
+  [ALPHABET.ARABIC]: arabLetters
 };
 var lettersUpperCase = {
-  [LATIN]: latinLettersUpperCase
+  [ALPHABET.LATIN]: latinLettersUpperCase
 };
 var additionalReplacements = {
-  [CYRILLIC]: [
+  [ALPHABET.CYRILLIC]: [
     ["$1У", /([АЕЁІОУЫЭЮЯ])<tarF>Ў<\/tarF>/g],
     [" У", / <tarF>Ў<\/tarF>(?=\p{Lu})/gu]
   ],
-  [LATIN]: [
+  [ALPHABET.LATIN]: [
     ["$1U", /([AEIOUY])<tarF>Ŭ<\/tarF>/g],
     [" U", / <tarF>Ŭ<\/tarF>(?=\p{Lu})/gu]
   ],
-  [ARABIC]: []
+  [ALPHABET.ARABIC]: []
 };
 var tagApplications = {
   html: {
@@ -2000,10 +2000,10 @@ var taraskSync = (text, options) => {
   ).split(" ");
   text = toTarask(text.toLowerCase());
   if (j)
-    text = replaceIbyJ(text, j === J_ALWAYS);
+    text = replaceIbyJ(text, j === J.ALWAYS);
   text = replaceWithDict(text, letters[abc]);
   splitted = text.split(" ");
-  if (abc !== ARABIC)
+  if (abc !== ALPHABET.ARABIC)
     splitted = restoreCase(splitted, splittedOrig);
   const nodeColors = nonHtml && nonHtml.nodeColors;
   if (html || nodeColors)
@@ -2012,10 +2012,10 @@ var taraskSync = (text, options) => {
   let gReplacer;
   if (html) {
     text = replaceWithDict(text, additionalReplacements[abc]);
-    if (abc === CYRILLIC) {
+    if (abc === ALPHABET.CYRILLIC) {
       gReplacer = html.g ? apply.H("$&") : ($0) => apply.H(gobj[$0]);
     }
-  } else if (nonHtml && abc === CYRILLIC) {
+  } else if (nonHtml && abc === ALPHABET.CYRILLIC) {
     if (nonHtml.nodeColors) {
       gReplacer = nonHtml.h ? ($0) => apply.H(gobj[$0]) : apply.H("$&");
     } else if (nonHtml.h) {
@@ -2026,7 +2026,7 @@ var taraskSync = (text, options) => {
     text = text.replace(G_REGEX, gReplacer);
   if (noFix.length)
     text = text.replace(NOFIX_REGEX, () => noFix.shift());
-  return (html ? finalizer.html(text) : finalizer.nonHtml(text, nonHtml, apply)).trim();
+  return (html ? finalizer.html(text) : finalizer.nonHtml(text, nonHtml)).trim();
 };
 var tarask = (...args) => new Promise((res) => res(taraskSync(...args)));
 function restoreCase(text, orig) {
@@ -2065,15 +2065,15 @@ function toTags(text, orig, abc, applyF) {
       continue;
     if (!/\(/.test(word)) {
       if (word.length === oWord.length) {
-        const LettersText = word.split("");
-        for (let x = 0; x < LettersText.length; x++) {
-          if (LettersText[x] !== oWord[x])
-            LettersText[x] = applyF(LettersText[x]);
+        const wordLetters = word.split("");
+        for (let j = 0; j < wordLetters.length; j++) {
+          if (wordH[j] !== oWord[j])
+            wordLetters[j] = applyF(wordLetters[j]);
         }
-        text[i] = LettersText.join("");
+        text[i] = wordLetters.join("");
         continue;
       }
-      if (abc === CYRILLIC) {
+      if (abc === ALPHABET.CYRILLIC) {
         const word1 = word.replace(/ь/g, "");
         switch (oWord) {
           case word1:
@@ -2144,19 +2144,22 @@ var finalizer = {
     const main = options.shift();
     return `<tarL data-l='${options}'>${main}</tarL>`;
   }).replace(/ \n /g, "<br>"),
-  nonHtml(text, options, apply) {
-    if (options && options.variations !== 2) {
+  nonHtml(text, options) {
+    if (options && options.variations !== VARIATION.ALL) {
       const WORD_INDEX = options.variations;
       const replacer = ($0) => $0.slice(1, -1).split("|")[WORD_INDEX];
       text = text.replace(
         OPTIONAL_WORDS_REGEX,
-        options.nodeColors ? ($0) => apply.L(replacer($0)) : replacer
+        options.nodeColors ? ($0) => tagApplications.nonHtml.L(replacer($0)) : replacer
       );
     }
     return text.replace(/&#40/g, "(");
   }
 };
 export {
+  ALPHABET,
+  J,
+  VARIATION,
   gobj,
   tarask,
   taraskSync

package/package.json

@@ -2,7 +2,7 @@
 	"name": "taraskevizer",
 	"author": "GooseOb",
 	"license": "MIT",
-	"version": "1.2.2",
+	"version": "1.3.0",
 	"private": false,
 	"homepage": "https://gooseob.github.io/taraskevizatar/",
 	"main": "dist/index.js",
@@ -28,6 +28,7 @@
 		"type": "git",
 		"url": "git+https://github.com/GooseOb/taraskevizer.git"
 	},
+	"description": "Канвэртацыя акадэмічнага правапісу ў клясычны",
 	"keywords": [
 		"taraskevizatar",
 		"taraskevica",