taraskevizer 9.3.0 → 9.3.2

package/dist/bin.js

@@ -6,7 +6,7 @@ const printWithPrefix = (msg) => {
 process.argv.splice(0, 2);
 const checkForOptions = (options) => process.argv[0] && options.includes(process.argv[0].toLowerCase());
 if (checkForOptions(['-v', '--version'])) {
-    printWithPrefix("9.3.0");
+    printWithPrefix("9.3.2");
     process.exit(0);
 }
 if (checkForOptions(['-h', '--help'])) {

package/dist/dict/alphabets/arabic.js

@@ -1,4 +1,5 @@
-import { callableDict, regexGI } from '../lib.js';
+import { re } from '../../lib/index.js';
+import { callableDict } from '../lib.js';
 const soft = '\u0652(?=[еёіюяь])';
 const presoft = '([تزكثࢮбвгджзйклмнпрстфхцчшў])\u0652?(\u0651?)';
 
@@ -17,17 +18,17 @@ export const arabic = {
         [/[Аа]/g, '\u0627а'],
         // першая галосная, аліф
         [/ (?=[ЕеЭэЫыУуОо])/g, ' \u0627'],
-        [regexGI('д\u0652з' + soft), 'ࢮ'],
-        [regexGI('з' + soft), 'ز'],
-        [regexGI('к' + soft), 'ك'],
-        [regexGI('с' + soft), 'ث'],
-        [regexGI('т' + soft), 'ت'],
+        [re.gi('д\u0652з' + soft), 'ࢮ'],
+        [re.gi('з' + soft), 'ز'],
+        [re.gi('к' + soft), 'ك'],
+        [re.gi('с' + soft), 'ث'],
+        [re.gi('т' + soft), 'ت'],
         [/([تزكث])[Іі]/g, 'ы'],
         // $2 - шадда
-        [regexGI(presoft + '[аяэе]'), '$1$2\u064E'],
-        [regexGI(presoft + '[іы]'), '$1$2\u0650'],
+        [re.gi(presoft + '[аяэе]'), '$1$2\u064E'],
+        [re.gi(presoft + '[іы]'), '$1$2\u0650'],
         [/ [Iі] /g, ' \u0627\u0650 '],
-        [regexGI(presoft + '[оёую]'), '$1$2\u064F'],
+        [re.gi(presoft + '[оёую]'), '$1$2\u064F'],
         [/[ʼ]/g, 'ع'],
         [/[Ьь]/g, ''],
         // [/[ьʼ]/g, ''],

package/dist/dict/alphabets/latin.js

@@ -1,5 +1,6 @@
 import { iwords } from '../iwords.js';
-import { callableDict, regexG } from '../lib.js';
+import { callableDict } from '../lib.js';
+import { re } from '../../lib/index.js';
 const common = {
     lower: [
         [
@@ -120,9 +121,9 @@ export const latinJi = {
         [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )І Ў/g, '$1J U'],
         [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )І ў/g, '$1J u'],
         [/([аеёіоуыэюяАЕЁІОУЫЭЮЯ] )І /g, '$1J '],
-        [regexG(` і(?=${iwords})`), ' ji'],
-        [regexG(` І(?=${iwords})`), ' Ji'],
-        [regexG(` І(?=${iwords.toUpperCase()})`), ' JI'],
+        [re.g(` і(?=${iwords})`), ' ji'],
+        [re.g(` І(?=${iwords})`), ' Ji'],
+        [re.g(` І(?=${iwords.toUpperCase()})`), ' JI'],
         ...common.lower[0],
         [/([eouaаеёіоуыэюяʼАЕЁІОУЫЭЮЯЬ] *)і/g, '$1ji'],
         ...common.lower[1],

package/dist/dict/iawords.js

@@ -1,6 +1,7 @@
 import { iwords } from './iwords.js';
-import { callableDict, regexG, toOneLine } from './lib.js';
-const ia = (word, words) => regexG(` ${word}(?= \\(?(?:[бвгджзйклмнпрстфхцчшўьʼ]*[оё]|${toOneLine(words).replace(/\(/g, '(?:')}|i(?:${iwords})))`);
+import { callableDict, toOneLine } from './lib.js';
+import { re } from '../lib/index.js';
+const ia = (word, words) => re.g(` ${word}(?= \\(?(?:[бвгджзйклмнпрстфхцчшўьʼ]*[оё]|${toOneLine(words).replace(/\(/g, '(?:')}|i(?:${iwords})))`);
 export const iaWords = callableDict([
     
     [

package/dist/dict/lib.d.ts

@@ -1,21 +1,13 @@
 import type { CallableDict, Dict } from './types';
 export declare const copyDict: <T extends [any, any][]>(dict: T) => T;
 /**
- * Collection of MUTATING functions
- * that help to work with dictionaries.
+ * @returns function with property `value` that references the dictionary
+ * passed as an argument.
  *
- * Use {@link copyDict} before applying these functions
- * to avoid mutating the original dictionary.
+ * It is possible to change the dictionary after initialization by modifying
+ * the `value` property.
  *
- * @example
- * const rawDict = [
- *   ["pattern", "result"],
- * ];
- *
- * const dict = dict.raw(copyDict(rawDict));
- * // [ [ /pattern/g, "result" ] ]
+ * You can use {@link copyDict} before passing the dictionary to this function
  */
-export declare const callableDict: (dict: Dict) => CallableDict;
+export declare const callableDict: (value: Dict) => CallableDict;
 export declare const toOneLine: (str: string) => string;
-export declare const regexG: (pattern: string) => RegExp;
-export declare const regexGI: (pattern: string) => RegExp;

package/dist/dict/lib.js

@@ -1,10 +1,8 @@
 export const copyDict = (dict) => dict.map(({ 0: pattern, 1: result }) => [pattern, result]);
 
-export const callableDict = (dict) => {
+export const callableDict = (value) => {
     const fn = (text) => fn.value.reduce((acc, item) => acc.replace(item[0], item[1]), text);
-    fn.value = dict;
+    fn.value = value;
     return fn;
 };
 export const toOneLine = (str) => str.replace(/\n/g, '|');
-export const regexG = (pattern) => new RegExp(pattern, 'g');
-export const regexGI = (pattern) => new RegExp(pattern, 'gi');

package/dist/dict/softening.js

@@ -1,4 +1,5 @@
-import { callableDict, regexG } from './lib.js';
+import { callableDict } from './lib.js';
+import { re } from '../lib/index.js';
 import { iwords } from './iwords.js';
 export const noSoften = callableDict([
     [/масфільм/g, 'мас\ue0ffфільм'],
@@ -12,7 +13,7 @@ export const softeners = callableDict([
     [/с(?=[бвлмнпсфц][еёіюяь])/g, 'сь'],
     [/ц(?=[вм][еёіюяь])/g, 'ць'],
     [
-        regexG(`( (?:б[ея]|пра|цера)?з) (?=\\(?)(?=[еёюяь]|([бвзйлмнпстфц]|дз)[еёіюяь]|імі? |іх(?:ні)?|і(?:${iwords}))`),
+        re.g(`( (?:б[ея]|пра|цера)?з) (?=\\(?)(?=[еёюяь]|([бвзйлмнпстфц]|дз)[еёіюяь]|імі? |іх(?:ні)?|і(?:${iwords}))`),
         '$1ь ',
     ],
     [/([сз])ʼ(?=[яюеё])/g, '$1ь'],

package/dist/dict/types.d.ts

@@ -1,13 +1,12 @@
-export type Callable<Value> = {
+export type Dict<T = RegExp> = readonly (readonly [T, string])[];
+export type CallableDict<T = RegExp> = {
     (value: string): string;
-    value: Value;
+    value: Dict<T>;
 };
-export type Dict<T = RegExp> = readonly (readonly [T, string])[];
-export type CallableDict<T = RegExp> = Callable<Dict<T>>;
 /**
  * Useful if you want to modify the dictionary.
  *
- * Consider converting it to the type {@link CallableDict}
+ * Consider converting it to the type {@link Dict} or {@link CallableDict}
  * if you no longer need to modify it.
  */
 export type WritableDict<T = RegExp> = [T, string][];

package/dist/dict/wordlist.js

@@ -1,5 +1,5 @@
 import { iaWords } from './iawords.js';
-import { callableDict, regexG } from './lib.js';
+import { callableDict, re } from '../lib/index.js';
 import { commonPhonetic } from "./phonetic.js";
 const chemicalElements1 = [
     'сканд|ванад|рубід|род|ірыд|рэзэрфорд',
@@ -1200,18 +1200,18 @@ export const wordlist = callableDict([
     [/ гeлі(?=[юя] |е)/g, ' (гэ|г\ue0ffе)л'],
     [/ гeліі /g, ' (гэ|г\ue0ffе)ле '],
     [/ гелі/g, ' гэлі'],
-    [regexG(`(${chemicalElements1[0] + chemicalElements1[1]}|інд|франц|рад)ый `), '$1 '],
-    [regexG(`(${chemicalElements1[3]})ы[ея]`), '$1а'],
-    [regexG(`(${chemicalElements1[3]})ыю`), '$1у'],
-    [regexG(`(${chemicalElements1[3]}|рад)ыі`), '$1зе'],
-    [regexG(`(${chemicalElements1[2]})ыі`), '$1ы'],
-    [regexG(`(${chemicalElements2[0]}|герман)ій`), '$1'],
-    [regexG(`(${chemicalElements2[1]})і[ея]`), '$1а'],
-    [regexG(`(${chemicalElements2[1]})ію`), '$1у'],
-    [regexG(`(${chemicalElements3}| тал)ій `), '$1ь '],
+    [re.g(`(${chemicalElements1[0] + chemicalElements1[1]}|інд|франц|рад)ый `), '$1 '],
+    [re.g(`(${chemicalElements1[3]})ы[ея]`), '$1а'],
+    [re.g(`(${chemicalElements1[3]})ыю`), '$1у'],
+    [re.g(`(${chemicalElements1[3]}|рад)ыі`), '$1зе'],
+    [re.g(`(${chemicalElements1[2]})ыі`), '$1ы'],
+    [re.g(`(${chemicalElements2[0]}|герман)ій`), '$1'],
+    [re.g(`(${chemicalElements2[1]})і[ея]`), '$1а'],
+    [re.g(`(${chemicalElements2[1]})ію`), '$1у'],
+    [re.g(`(${chemicalElements3}| тал)ій `), '$1ь '],
     [/ таліе/g, ' тале'],
-    [regexG(`(${chemicalElements3})і(?=[юя] |е)`), '$1'],
-    [regexG(`(${chemicalElements3})іі `), '$1е '],
+    [re.g(`(${chemicalElements3})і(?=[юя] |е)`), '$1'],
+    [re.g(`(${chemicalElements3})іі `), '$1е '],
     
     [/(антрэпрэн|бакс|грав|грым|гіпнатыз|паз|партн|плян|прыз|рэжыс|рэзан|сап|сутэн|трас|фантаз)ёр/g, '$1эр'],
     [/(біле|брэ|ман|мушке|(ім|рэ|транс|экс)пар|салі)цёр/g, '$1тэр'],

package/dist/lib/index.d.ts

@@ -1,8 +1,9 @@
+export * as re from './re';
 export * from './after-tarask';
 export * from './highlight-diff';
 export * from './replace-g';
 export * from './restore-case';
 export * from './mutating-step';
 export * from './soften';
-export { callableDict as dict, copyDict } from './../dict/lib';
+export { callableDict, copyDict } from '@/dict/lib';
 export type * from './types';

package/dist/lib/index.js

@@ -1,7 +1,8 @@
+export * as re from './re.js';
 export * from './after-tarask.js';
 export * from './highlight-diff.js';
 export * from './replace-g.js';
 export * from './restore-case.js';
 export * from './mutating-step.js';
 export * from './soften.js';
-export { callableDict as dict, copyDict } from './../dict/lib.js';
+export { callableDict, copyDict } from '../dict/lib.js';

package/dist/lib/mutating-step.d.ts

@@ -1,4 +1,4 @@
-import type { TaraskStep } from '../steps/types';
+import type { TaraskStep } from '@/steps/types';
 /**
  * An abstraction for a step that always changes the text.
  *

package/dist/lib/re.d.ts

@@ -0,0 +1,2 @@
+export declare const g: (pattern: string) => RegExp;
+export declare const gi: (pattern: string) => RegExp;

package/dist/lib/re.js

@@ -0,0 +1,2 @@
+export const g = (pattern) => new RegExp(pattern, 'g');
+export const gi = (pattern) => new RegExp(pattern, 'gi');

package/dist/pipelines.d.ts

@@ -15,12 +15,6 @@
  * @module
  */
 import { type TaraskStep } from './steps';
-/**
- * Storage for the pipeline {@link abc}.
- */
-type AbcOnlyStorage = {
-    doEscapeCapitalized: boolean;
-};
 export type Pipeline = TaraskStep<any>[];
 /**
  * Pipeline for changing only the alphabet.
@@ -29,11 +23,7 @@ export type Pipeline = TaraskStep<any>[];
  *
  * To see the full list of steps, check the source code.
  */
-export declare const abc: (TaraskStep<import("./steps").SpecialSyntaxStorage> | TaraskStep<import("./steps").WhiteSpaceStorage> | TaraskStep<import("./steps").TrimStorage> | (({ storage, cfg }: {
-    text: string;
-    storage: AbcOnlyStorage;
-    cfg: import("./config").TaraskConfig;
-}) => void))[];
+export declare const abc: (TaraskStep<import("./steps").SpecialSyntaxStorage> | TaraskStep<import("./steps").WhiteSpaceStorage> | TaraskStep<import("./steps").TrimStorage>)[];
 /**
  * For better tree-shaking instead of `Array.prototype.flatMap`
  *
@@ -51,4 +41,3 @@ export declare const tar: (TaraskStep<import("./steps").SplittedTextStorage> | T
  * @alpha
  */
 export declare const phonetic: (TaraskStep<import("./steps").SplittedTextStorage> | TaraskStep<import("./steps").SpecialSyntaxStorage> | TaraskStep<import("./steps").WhiteSpaceStorage> | TaraskStep<import("./steps").TrimStorage>)[];
-export {};

package/dist/pipelines.js

@@ -2,10 +2,9 @@
 import { highlightDiffStep, applyNoFix, convertAlphabet, convertAlphabetLowerCase, joinSplittedText, prepare, replaceIbyJ, resolveSpecialSyntax, restoreCaseStep, restoreWhitespaces, storeSplittedAbcConvertedOrig, storeSplittedText, taraskevize, phonetize, whitespacesToSpaces, trim, finalize, toLowerCase, iotacizeJi, untrim, applyG, applyVariations, } from './steps/index.js';
 
 export const abc = [
-    (({ storage, cfg }) => {
-        storage.doEscapeCapitalized = cfg.doEscapeCapitalized;
-        cfg.doEscapeCapitalized = false;
-    }),
+    (ctx) => {
+        ctx.cfg = { ...ctx.cfg, doEscapeCapitalized: false };
+    },
     trim,
     resolveSpecialSyntax,
     prepare,
@@ -15,9 +14,6 @@ export const abc = [
     applyNoFix,
     finalize,
     untrim,
-    (({ storage, cfg }) => {
-        cfg.doEscapeCapitalized = storage.doEscapeCapitalized;
-    }),
 ];
 
 export const _createPipeline = (subPipeline) => [

package/dist/steps/convert-alphabet.js

@@ -1,7 +1,6 @@
 import { mutatingStep } from '../lib/index.js';
-import * as debug from '../lib/debug.js';
 export const convertAlphabet = mutatingStep(({ text, cfg: { abc: { upper, lower }, }, }) => {
     text = lower(text);
-    return upper ? debug.dict(upper, /K/)(text) : text;
+    return upper ? upper(text) : text;
 });
 export const convertAlphabetLowerCase = mutatingStep(({ text, cfg: { abc: { lower }, }, }) => lower(text));

package/dist/steps/iotacize-ji.js

@@ -1,10 +1,9 @@
 import { iwords } from '../dict/index.js';
-import { regexG } from '../dict/lib.js';
-import { dict, mutatingStep } from '../lib/index.js';
-const iDict = dict([
+import { callableDict, mutatingStep, re } from '../lib/index.js';
+const iDict = callableDict([
     [/([аеёіоуыэюя\u0301] )і ў/g, '$1й у'],
     [/([аеёіоуыэюя\u0301] )і /g, '$1й '],
     [/([аеёіоуыэюя\u0301] ?)і/g, '$1йі'],
-    [regexG(` і(?=${iwords})`), ' йі'],
+    [re.g(` і(?=${iwords})`), ' йі'],
 ]);
 export const iotacizeJi = mutatingStep(({ text }) => iDict(text));

package/dist/steps/types.d.ts

@@ -1,4 +1,4 @@
-import type { TaraskConfig } from '../config';
+import type { TaraskConfig } from '@/config';
 export type TaraskStep<Storage extends object = object> = (context: {
     text: string;
     storage: Storage;

package/package.json

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