taraskevizer 9.2.3 → 9.3.0

package/dist/lib/after-tarask.d.ts

@@ -1,2 +1 @@
-import type { Dict } from '../dict/types';
-export declare const endZSoftenAndNiaBiaz: Dict;
+export declare const endZSoftenAndNiaBiaz: import("../dict").CallableDict;

package/dist/lib/after-tarask.js

@@ -1,4 +1,5 @@
-export const endZSoftenAndNiaBiaz = [
+import { callableDict } from '../dict/lib.js';
+export const endZSoftenAndNiaBiaz = callableDict([
     // / не (?=
     //   {зычны}*{сымбаль}{націск}
     //  |{зычны}*{галосны}{зычны}*{канец слова}
@@ -19,4 +20,4 @@ export const endZSoftenAndNiaBiaz = [
     
     [/ б[ея]з(?= і\S*[ая]ў|ну )/g, ' бязь'],
     [/ (?:пра|цера)?з(?= і\S*[ая]ў|ну )/g, '$&ь'],
-];
+]);

package/dist/lib/debug.d.ts

@@ -0,0 +1,3 @@
+import type { CallableDict } from '../dict/types';
+export declare const dict: (dict: CallableDict, regex: RegExp) => CallableDict;
+export declare const log: (...msgs: unknown[]) => unknown;

package/dist/lib/debug.js

@@ -0,0 +1,16 @@
+const prefix = '[debug]';
+export const dict = (dict, regex) => {
+    const fn = (text) => fn.value.reduce((acc, item) => {
+        if (regex.test(text)) {
+            console.log(prefix, 'replaceWithDict:', item);
+            process.exit(1);
+        }
+        return acc.replace(item[0], item[1]);
+    }, text);
+    fn.value = dict.value;
+    return fn;
+};
+export const log = (...msgs) => {
+    console.log(prefix, ...msgs);
+    return msgs[0];
+};

package/dist/lib/index.d.ts

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

package/dist/lib/index.js

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

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

@@ -12,10 +12,10 @@ import type { TaraskStep } from '../steps/types';
  *   ({ text, storage: { wrapText } }) => wrapText(text.trim())
  * );
  * // is equivalent to
- * const trimStep: TaraskStep<TextWrapperStorage> = (options) => {
- *   options.text = options.storage.wrapText(
- *     options.text.trim()
+ * const trimStep: TaraskStep<TextWrapperStorage> = (ctx) => {
+ *   ctx.text = options.storage.wrapText(
+ *     ctx.text.trim()
  *   );
  * };
  */
-export declare const mutatingStep: <T extends object = {}>(callback: (...args: Parameters<TaraskStep<T>>) => string) => TaraskStep<T>;
+export declare const mutatingStep: <T extends object = object>(callback: (...args: Parameters<TaraskStep<T>>) => string) => TaraskStep<T>;

package/dist/lib/mutating-step.js

@@ -1,4 +1,4 @@
 
-export const mutatingStep = (callback) => (options) => {
-    options.text = callback(options);
+export const mutatingStep = (callback) => (ctx) => {
+    ctx.text = callback(ctx);
 };

package/dist/lib/replace-g.js

@@ -1,3 +1,3 @@
 export const replaceG = (replacer) => (text) => text.replace(/[Ґґ]/g, 
-// @ts-ignore
+// @ts-expect-error TS can't infer the type of replacer
 replacer);

package/dist/lib/soften.js

@@ -1,9 +1,8 @@
 import { noSoften, softeners } from '../dict/softening.js';
-import { replaceWithDict } from './replace-with-dict.js';
 export const soften = (text) => {
-    text = replaceWithDict(text, noSoften);
+    text = noSoften(text);
     do {
-        text = replaceWithDict(text, softeners);
-    } while (softeners.some(([pattern]) => pattern.test(text)));
+        text = softeners(text);
+    } while (softeners.value.some(({ 0: pattern }) => pattern.test(text)));
     return text.replace(/\ue0ff/g, '');
 };

package/dist/lib/types.d.ts

@@ -2,3 +2,8 @@ export type ExtendedDict = readonly (readonly [
     RegExp,
     string | ((...substrings: string[]) => string)
 ])[];
+declare global {
+    interface String {
+        replace(...args: ExtendedDict[number]): string;
+    }
+}

package/dist/pipelines.d.ts

@@ -39,7 +39,7 @@ export declare const abc: (TaraskStep<import("./steps").SpecialSyntaxStorage> |
  *
  * Used by {@link tar} and {@link phonetic}.
  *
- * @param subPipeline - Steps used instead of [{@link subPipeline.taraskevize}].
+ * @param subPipeline - Steps used instead of [{@link steps.taraskevize}].
  */
 export declare const _createPipeline: (subPipeline: Pipeline) => (TaraskStep<import("./steps").SplittedTextStorage> | TaraskStep<import("./steps").SpecialSyntaxStorage> | TaraskStep<import("./steps").WhiteSpaceStorage> | TaraskStep<import("./steps").TrimStorage>)[];
 /**

package/dist/steps/apply-g.js

@@ -1,12 +1,8 @@
 import { replaceG } from '../lib/index.js';
 import { alphabets, gobj } from '../dict/index.js';
-export const applyG = (options) => {
-    const { abc, g, wrapperDict } = options.cfg;
-    const colorize = wrapperDict?.letterH;
-    if (abc === alphabets.cyrillic && (colorize || !g))
-        options.text = replaceG(colorize
-            ? g
-                ? colorize('$&')
-                : ($0) => colorize(gobj[$0])
-            : ($0) => gobj[$0])(options.text);
+export const applyG = (ctx) => {
+    const { abc, g, wrapperDict } = ctx.cfg;
+    const wrap = wrapperDict?.letterH;
+    if (abc === alphabets.cyrillic && (wrap || !g))
+        ctx.text = replaceG(wrap ? (g ? wrap('$&') : ($0) => wrap(gobj[$0])) : ($0) => gobj[$0])(ctx.text);
 };

package/dist/steps/apply-variations.d.ts

@@ -1 +1 @@
-export declare const applyVariations: import("./types").TaraskStep<{}>;
+export declare const applyVariations: import("./types").TaraskStep<object>;

package/dist/steps/convert-alphabet.d.ts

@@ -1,2 +1,2 @@
-export declare const convertAlphabet: import("./types").TaraskStep<{}>;
-export declare const convertAlphabetLowerCase: import("./types").TaraskStep<{}>;
+export declare const convertAlphabet: import("./types").TaraskStep<object>;
+export declare const convertAlphabetLowerCase: import("./types").TaraskStep<object>;

package/dist/steps/convert-alphabet.js

@@ -1,3 +1,7 @@
-import { mutatingStep, replaceWithDict } from '../lib/index.js';
-export const convertAlphabet = mutatingStep(({ text, cfg: { abc: { upper, lower }, }, }) => replaceWithDict(replaceWithDict(text, lower), upper));
-export const convertAlphabetLowerCase = mutatingStep(({ text, cfg: { abc: { lower }, }, }) => replaceWithDict(text, lower));
+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;
+});
+export const convertAlphabetLowerCase = mutatingStep(({ text, cfg: { abc: { lower }, }, }) => lower(text));

package/dist/steps/finalize.d.ts

@@ -1,6 +1,4 @@
 /**
- * @param newLine - The string to replace new lines with.
- *
  * Reverse the changes made in the {@link prepare} step
  * and replace new lines with the passed string.
  *
@@ -8,6 +6,8 @@
  * `(` from `&#40`,
  * ` ` from ` `,
  *
+ * Replaces new lines with the `newLine` config value.
+ *
  * Removes spaces around punctuation marks and digits.
  */
-export declare const finalize: import("./types").TaraskStep<{}>;
+export declare const finalize: import("./types").TaraskStep<object>;

package/dist/steps/i-to-j.js

@@ -1,9 +1,9 @@
 import { alphabets } from '../dict/index.js';
 const toJ = (shortU) => 'й ' + (shortU ? 'у' : '');
-export const replaceIbyJ = (options) => {
-    const { abc, j } = options.cfg;
+export const replaceIbyJ = (ctx) => {
+    const { abc, j } = ctx.cfg;
     if (j !== 'never' && abc !== alphabets.latinJi)
-        options.text = options.text.replace(/(?<=[аеёіоуыэюя] )і (ў?)/g, j === 'always'
+        ctx.text = ctx.text.replace(/(?<=[аеёіоуыэюя] )і (ў?)/g, j === 'always'
             ? (_$0, $1) => toJ($1)
             : ($0, $1) => (Math.random() >= 0.5 ? toJ($1) : $0));
 };

package/dist/steps/iotacize-ji.d.ts

@@ -1 +1 @@
-export declare const iotacizeJi: import("./types").TaraskStep<{}>;
+export declare const iotacizeJi: import("./types").TaraskStep<object>;

package/dist/steps/iotacize-ji.js

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

package/dist/steps/phonetize.d.ts

@@ -1 +1 @@
-export declare const phonetize: import("./types").TaraskStep<{}>;
+export declare const phonetize: import("./types").TaraskStep<object>;

package/dist/steps/phonetize.js

@@ -1,4 +1,3 @@
 import { iaWords, phonetic } from '../dict/index.js';
-import { endZSoftenAndNiaBiaz, mutatingStep, replaceWithDict, soften, } from '../lib/index.js';
-const dict = iaWords.concat(phonetic);
-export const phonetize = mutatingStep(({ text }) => replaceWithDict(replaceWithDict(soften(text), dict), endZSoftenAndNiaBiaz));
+import { endZSoftenAndNiaBiaz, mutatingStep, soften } from '../lib/index.js';
+export const phonetize = mutatingStep(({ text }) => endZSoftenAndNiaBiaz(phonetic(iaWords(soften(text)))));

package/dist/steps/prepare.d.ts

@@ -3,4 +3,4 @@
  *
  * Some changes should be reverted in the {@link finalize} step.
  */
-export declare const prepare: import("./types").TaraskStep<{}>;
+export declare const prepare: import("./types").TaraskStep<object>;

package/dist/steps/resolve-syntax.js

@@ -1,18 +1,18 @@
-import { restoreCase, replaceWithDict, mutatingStep } from '../lib/index.js';
+import { restoreCase, mutatingStep } from '../lib/index.js';
 const NOFIX_CHAR = ' \ue0fe ';
 const NOFIX_REGEX = new RegExp(NOFIX_CHAR, 'g');
 
-export const applyNoFix = (options) => {
-    const { noFixArr } = options.storage;
+export const applyNoFix = (ctx) => {
+    const { noFixArr } = ctx.storage;
     if (noFixArr.length) {
         noFixArr.reverse();
-        options.text = options.text.replace(NOFIX_REGEX, () => noFixArr.pop());
+        ctx.text = ctx.text.replace(NOFIX_REGEX, () => noFixArr.pop());
     }
 };
 
 export const resolveSpecialSyntax = mutatingStep(({ text, storage, cfg: { doEscapeCapitalized, abc, leftAngleBracket } }) => {
     const noFixArr = (storage.noFixArr = []);
-    const convertAlphavet = (abcOnlyText, abc) => restoreCase(replaceWithDict(abcOnlyText.toLowerCase(), abc.lower).split(' '), abcOnlyText.split(' ')).join(' ');
+    const convertAlphavet = (abcOnlyText, abc) => restoreCase(abc.lower(abcOnlyText.toLowerCase()).split(' '), abcOnlyText.split(' ')).join(' ');
     const escapeCapsIfNeeded = (text) => doEscapeCapitalized
         ? text.replace(/(?!<=\p{Lu} )\p{Lu}{2}[\p{Lu} ]*(?!= \p{Lu})/gu, ($0) => {
             noFixArr.push(convertAlphavet($0, abc));

package/dist/steps/store-splitted-abc-converted-orig.js

@@ -1,4 +1,4 @@
-import { replaceWithDict } from '../lib/index.js';
 export const storeSplittedAbcConvertedOrig = ({ cfg: { abc: { lower, upper }, }, text, storage, }) => {
-    storage.origArr = replaceWithDict(replaceWithDict(text, lower), upper).split(' ');
+    text = lower(text);
+    storage.origArr = (upper ? upper(text) : text).split(' ');
 };

package/dist/steps/taraskevize.d.ts

@@ -1 +1 @@
-export declare const taraskevize: import("./types").TaraskStep<{}>;
+export declare const taraskevize: import("./types").TaraskStep<object>;

package/dist/steps/taraskevize.js

@@ -1,3 +1,3 @@
 import { wordlist } from '../dict/index.js';
-import { endZSoftenAndNiaBiaz, mutatingStep, replaceWithDict, soften, } from '../lib/index.js';
-export const taraskevize = mutatingStep(({ text }) => replaceWithDict(soften(replaceWithDict(text, wordlist)), endZSoftenAndNiaBiaz));
+import { endZSoftenAndNiaBiaz, mutatingStep, soften } from '../lib/index.js';
+export const taraskevize = mutatingStep(({ text }) => endZSoftenAndNiaBiaz(soften(wordlist(text))));

package/dist/steps/to-lower-case.d.ts

@@ -1 +1 @@
-export declare const toLowerCase: import("./types").TaraskStep<{}>;
+export declare const toLowerCase: import("./types").TaraskStep<object>;

package/dist/steps/types.d.ts

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

package/dist/tarask.js

@@ -1,8 +1,8 @@
 import { TaraskConfig } from './config.js';
 
 export const tarask = (text, pipeline, cfg = new TaraskConfig()) => {
-    const options = { text, cfg, storage: {} };
+    const ctx = { text, cfg, storage: {} };
     for (const step of pipeline)
-        step(options);
-    return options.text;
+        step(ctx);
+    return ctx.text;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "taraskevizer",
-	"version": "9.2.3",
+	"version": "9.3.0",
 	"author": "GooseOb",
 	"repository": {
 		"type": "git",
@@ -10,12 +10,16 @@
 	"module": "dist/index.js",
 	"devDependencies": {
 		"@digitak/esrun": "^3.2.26",
-		"@types/node": "^20.16.11",
-		"bun-types": "^1.1.30",
+		"@eslint/js": "^9.13.0",
+		"@types/node": "^20.16.12",
+		"bun-types": "^1.1.31",
+		"eslint": "^9.13.0",
+		"globals": "^15.11.0",
 		"husky": "^9.1.6",
 		"prettier": "^3.3.3",
-		"typedoc": "^0.26.9",
-		"typescript": "^5.6.3"
+		"typedoc": "^0.26.10",
+		"typescript": "^5.6.3",
+		"typescript-eslint": "^8.11.0"
 	},
 	"bin": {
 		"tarask": "dist/bin.js"
@@ -38,6 +42,7 @@
 	"scripts": {
 		"build": "bun ./build.ts",
 		"prettier": "prettier --write .",
+		"lint": "eslint .",
 		"dev": "esrun --watch=src/*,test/* --send-code-mode=temporaryFile test",
 		"dev:bun": "bun test --watch",
 		"test": "esrun --send-code-mode=temporaryFile test",

package/dist/lib/replace-with-dict.d.ts

@@ -1,2 +0,0 @@
-import type { ExtendedDict } from './types';
-export declare const replaceWithDict: (text: string, dict?: ExtendedDict) => string;

package/dist/lib/replace-with-dict.js

@@ -1,7 +0,0 @@
-export const replaceWithDict = (text, dict = []) => {
-    for (const [pattern, result] of dict)
-        text = text.replace(pattern, 
-        //@ts-ignore
-        result);
-    return text;
-};

package/dist/lib/tools.debug.d.ts

@@ -1,3 +0,0 @@
-import type { ExtendedDict } from './types';
-export declare const replaceWithDict: (text: string, dict: ExtendedDict, regex: RegExp) => string;
-export declare const log: (...msgs: any[]) => any;

package/dist/lib/tools.debug.js

@@ -1,17 +0,0 @@
-export const replaceWithDict = (text, dict, regex) => {
-    for (const item of dict) {
-        const [pattern, result] = item;
-        text = text.replace(pattern, 
-        //@ts-ignore
-        result);
-        if (regex.test(text)) {
-            log('replaceWithDict:', item);
-            process.exit(1);
-        }
-    }
-    return text;
-};
-export const log = (...msgs) => {
-    console.log('[debug]', ...msgs);
-    return msgs[0];
-};