taraskevizer 8.0.1 → 8.0.3

package/dist/bin.js

@@ -14,7 +14,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("8.0.1");
+  printWithPrefix("8.0.3");
   process.exit(0);
 }
 if (checkForOptions(["-h", "--help"])) {

package/dist/index.cjs

@@ -2106,7 +2106,6 @@ var tarask = (text, pipeline, cfg = new TaraskConfig()) => {
 // src/steps/index.ts
 var steps_exports = {};
 __export(steps_exports, {
-  afterJoin: () => afterJoin,
   applyGHtml: () => applyGHtml,
   applyGNonHtml: () => applyGNonHtml,
   applyNoFix: () => applyNoFix,
@@ -2123,7 +2122,6 @@ __export(steps_exports, {
   replaceIbyJ: () => replaceIbyJ,
   resolveSpecialSyntax: () => resolveSpecialSyntax,
   restoreCaseStep: () => restoreCaseStep,
-  restoreParentheses: () => restoreParentheses,
   restoreWhitespaces: () => restoreWhitespaces,
   storeSplittedAbcConvertedOrig: () => storeSplittedAbcConvertedOrig,
   storeSplittedText: () => storeSplittedText,
@@ -2141,6 +2139,7 @@ __export(lib_exports, {
   dictFrom: () => dictFrom,
   highlightDiff: () => highlightDiff,
   htmlWrappers: () => htmlWrappers,
+  mutatingStep: () => mutatingStep,
   replaceG: () => replaceG,
   replaceWithDict: () => replaceWithDict,
   restoreCase: () => restoreCase
@@ -2283,15 +2282,33 @@ var ansiColorWrappers = {
   variable: (content) => `\x1B[35m${content}\x1B[0m`
 };
 
-// src/steps/convert-alphabet.ts
-var convertAlphabet = (options) => {
-  const { lower, upper } = options.cfg.general.abc;
-  options.text = replaceWithDict(replaceWithDict(options.text, lower), upper);
-};
-var convertAlphabetLowerCase = (options) => {
-  options.text = replaceWithDict(options.text, options.cfg.general.abc.lower);
+// src/lib/mutating-step.ts
+var mutatingStep = (callback) => (options) => {
+  options.text = callback(options);
 };
 
+// src/steps/convert-alphabet.ts
+var convertAlphabet = mutatingStep(
+  ({
+    text,
+    cfg: {
+      general: {
+        abc: { upper, lower }
+      }
+    }
+  }) => replaceWithDict(replaceWithDict(text, lower), upper)
+);
+var convertAlphabetLowerCase = mutatingStep(
+  ({
+    text,
+    cfg: {
+      general: {
+        abc: { lower }
+      }
+    }
+  }) => replaceWithDict(text, lower)
+);
+
 // src/steps/highlight-diff.ts
 var highlightDiffStep = (highlight) => ({
   cfg: {
@@ -2329,9 +2346,9 @@ var replaceIbyJ = (options) => {
 };
 
 // src/steps/join-splitted.ts
-var joinSplittedText = (options) => {
-  options.text = options.storage.textArr.join(" ");
-};
+var joinSplittedText = mutatingStep(
+  ({ storage: { textArr } }) => textArr.join(" ")
+);
 
 // src/steps/apply-g.ts
 var applyGHtml = (options) => {
@@ -2356,12 +2373,9 @@ var applyGNonHtml = (options) => {
 };
 
 // src/steps/apply-variations.ts
-var applyVariableParts = (callback) => (options) => {
-  options.text = options.text.replace(
-    /\([^)]*?\)/g,
-    ($0) => callback($0.slice(1, -1).split("|"))
-  );
-};
+var applyVariableParts = (callback) => mutatingStep(
+  ({ text }) => text.replace(/\([^)]*?\)/g, ($0) => callback($0.slice(1, -1).split("|")))
+);
 var applyVariationsHtml = applyVariableParts((parts) => {
   const main = parts.shift();
   return `<tarL data-l='${parts}'>${main}</tarL>`;
@@ -2376,9 +2390,9 @@ var applyVariationsNonHtml = (options) => {
 };
 
 // src/steps/prepare.ts
-var prepare = (options) => {
-  options.text = options.text.replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("(\\p{P}|\\p{S}|\\d+)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
-};
+var prepare = mutatingStep(
+  ({ text }) => text.replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("(\\p{P}|\\p{S}|\\d+)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40")
+);
 
 // src/steps/resolve-syntax.ts
 var NOFIX_CHAR = "  ";
@@ -2388,77 +2402,76 @@ var applyNoFix = (options) => {
   if (noFixArr.length)
     options.text = options.text.replace(NOFIX_REGEX, () => noFixArr.shift());
 };
-var resolveSpecialSyntax = (leftAngleBracket) => (options) => {
-  const {
+var resolveSpecialSyntax = (leftAngleBracket) => mutatingStep(
+  ({
     text,
     storage,
     cfg: {
       general: { doEscapeCapitalized, abc }
     }
-  } = options;
-  const noFixArr = storage.noFixArr = [];
-  const convertAlphavet = (abcOnlyText, abc2) => restoreCase(
-    replaceWithDict(abcOnlyText.toLowerCase(), abc2.lower).split(" "),
-    abcOnlyText.split(" ")
-  ).join(" ");
-  const escapeCapsIfNeeded = (text2) => doEscapeCapitalized ? text2.replace(
-    new RegExp("(?!<=\\p{Lu} )\\p{Lu}{2}[\\p{Lu} ]*(?!= \\p{Lu})", "gu"),
-    ($0) => {
-      noFixArr.push(convertAlphavet($0, abc));
-      return NOFIX_CHAR;
-    }
-  ) : text2;
-  const parts = text.split(/(?=[<>])/g);
-  if (parts.length === 1) {
-    options.text = escapeCapsIfNeeded(text);
-    return;
-  }
-  let result = text.startsWith("<") ? "" : escapeCapsIfNeeded(parts.shift());
-  let depth = 0;
-  let currentPart = "";
-  for (const part of parts) {
-    if (part.startsWith("<")) {
-      ++depth;
-      currentPart += part;
-    } else if (depth) {
-      --depth;
-      if (depth) {
+  }) => {
+    const noFixArr = storage.noFixArr = [];
+    const convertAlphavet = (abcOnlyText, abc2) => restoreCase(
+      replaceWithDict(abcOnlyText.toLowerCase(), abc2.lower).split(" "),
+      abcOnlyText.split(" ")
+    ).join(" ");
+    const escapeCapsIfNeeded = (text2) => doEscapeCapitalized ? text2.replace(
+      new RegExp("(?!<=\\p{Lu} )\\p{Lu}{2}[\\p{Lu} ]*(?!= \\p{Lu})", "gu"),
+      ($0) => {
+        noFixArr.push(convertAlphavet($0, abc));
+        return NOFIX_CHAR;
+      }
+    ) : text2;
+    const parts = text.split(/(?=[<>])/g);
+    if (parts.length === 1)
+      return escapeCapsIfNeeded(text);
+    let result = text.startsWith("<") ? "" : escapeCapsIfNeeded(parts.shift());
+    let depth = 0;
+    let currentPart = "";
+    for (const part of parts) {
+      if (part.startsWith("<")) {
+        ++depth;
         currentPart += part;
-      } else {
-        let char = "";
-        const isAbc = currentPart[1] === "*";
-        if (isAbc) {
-          char = currentPart[2];
-          currentPart = convertAlphavet(
-            currentPart.slice(char === "," || char === "." ? 3 : 2),
-            abc
-          );
+      } else if (depth) {
+        --depth;
+        if (depth) {
+          currentPart += part;
         } else {
-          char = currentPart[1];
-          currentPart = currentPart.slice(2);
+          let char = "";
+          const isAbc = currentPart[1] === "*";
+          if (isAbc) {
+            char = currentPart[2];
+            currentPart = convertAlphavet(
+              currentPart.slice(char === "," || char === "." ? 3 : 2),
+              abc
+            );
+          } else {
+            char = currentPart[1];
+            currentPart = currentPart.slice(2);
+          }
+          let toAddToResult;
+          switch (char) {
+            case ".":
+              toAddToResult = NOFIX_CHAR;
+              noFixArr.push(currentPart);
+              break;
+            case ",":
+              toAddToResult = leftAngleBracket + currentPart + ">";
+              break;
+            default:
+              toAddToResult = leftAngleBracket + NOFIX_CHAR;
+              noFixArr.push((isAbc ? "" : char) + currentPart + ">");
+          }
+          result += toAddToResult + escapeCapsIfNeeded(part.slice(1));
+          currentPart = "";
         }
-        let toAddToResult;
-        switch (char) {
-          case ".":
-            toAddToResult = NOFIX_CHAR;
-            noFixArr.push(currentPart);
-            break;
-          case ",":
-            toAddToResult = leftAngleBracket + currentPart + ">";
-            break;
-          default:
-            toAddToResult = leftAngleBracket + NOFIX_CHAR;
-            noFixArr.push((isAbc ? "" : char) + currentPart + ">");
-        }
-        result += toAddToResult + escapeCapsIfNeeded(part.slice(1));
-        currentPart = "";
+      } else {
+        result += escapeCapsIfNeeded(part);
       }
-    } else {
-      result += escapeCapsIfNeeded(part);
     }
+    return result + escapeCapsIfNeeded(currentPart);
   }
-  options.text = result + escapeCapsIfNeeded(currentPart);
-};
+);
 
 // src/steps/restore-case.ts
 var restoreCaseStep = ({
@@ -2502,8 +2515,7 @@ var storeSplittedText = ({
 
 // src/steps/taraskevize.ts
 var wordlistPlusNoSoften = wordlist.concat(noSoften);
-var taraskevize = (options) => {
-  let { text } = options;
+var taraskevize = mutatingStep(({ text }) => {
   text = replaceWithDict(text, wordlistPlusNoSoften);
   softening:
     do {
@@ -2513,42 +2525,39 @@ var taraskevize = (options) => {
           continue softening;
       break;
     } while (true);
-  options.text = replaceWithDict(text.replace(//g, ""), afterTarask);
-};
+  return replaceWithDict(
+    text.replace(//g, "").replace(/не пра/g, "не&nbsp;пра"),
+    afterTarask
+  ).replace(/не&nbsp;пра/g, "не пра");
+});
 
 // src/steps/whitespaces.ts
-var whitespacesToSpaces = (options) => {
-  const { storage } = options;
-  storage.spaces = [];
-  options.text = options.text.replace(/\s+/g, (match) => {
-    storage.spaces.push(match);
-    return " ";
-  });
-};
-var restoreWhitespaces = (options) => {
-  const { spaces } = options.storage;
-  spaces.reverse();
-  options.text = options.text.replace(/ /g, () => spaces.pop());
-};
+var whitespacesToSpaces = mutatingStep(
+  ({ text, storage }) => {
+    storage.spaces = [];
+    return text.replace(/\s+/g, (match) => {
+      storage.spaces.push(match);
+      return " ";
+    });
+  }
+);
+var restoreWhitespaces = mutatingStep(
+  ({ text, storage: { spaces } }) => {
+    spaces.reverse();
+    return text.replace(/ /g, () => spaces.pop());
+  }
+);
 
 // src/steps/trim.ts
-var trim = (options) => {
-  options.text = ` ${options.text.trim()} `;
-};
+var trim = mutatingStep(({ text }) => ` ${text.trim()} `);
 
-// src/steps/other.ts
-var restoreParentheses = (options) => {
-  options.text = options.text.replace(/&#40/g, "(");
-};
-var afterJoin = (options) => {
-  options.text = options.text.replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d+|&#40) ", "gu"), "$1");
-};
-var finalize = (newLine) => (options) => {
-  options.text = options.text.replace(/\n/g, newLine).trim();
-};
-var toLowerCase = (options) => {
-  options.text = options.text.toLowerCase();
-};
+// src/steps/finalize.ts
+var finalize = (newLine) => mutatingStep(
+  ({ text }) => text.replace(/&#40/g, "(").replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d+) ", "gu"), "$1").replace(/\n/g, newLine).trim()
+);
+
+// src/steps/to-lower-case.ts
+var toLowerCase = mutatingStep(({ text }) => text.toLowerCase());
 
 // src/pipelines.ts
 var pipelines_exports = {};
@@ -2571,8 +2580,6 @@ var abcOnly = [
   convertAlphabet,
   restoreWhitespaces,
   applyNoFix,
-  restoreParentheses,
-  afterJoin,
   finalizeWithNewLine,
   ({ storage, cfg: { general } }) => {
     general.doEscapeCapitalized = storage.doEscapeCapitalized;
@@ -2593,8 +2600,6 @@ var createPipeline = (resolveSpecialSyntax2, applyG, applyVariations, finalize2,
   highlightDiffStep2,
   joinSplittedText,
   restoreWhitespaces,
-  restoreParentheses,
-  afterJoin,
   applyG,
   applyVariations,
   applyNoFix,

package/dist/index.d.ts

@@ -175,7 +175,7 @@ declare class TaraskConfig {
     nonHtml: NonHtmlOptions;
 }
 
-type TaraskStep<Storage = {}> = (args: {
+type TaraskStep<Storage extends object = {}> = (args: {
     text: string;
     storage: Storage;
     cfg: TaraskConfig;
@@ -185,8 +185,8 @@ type SplittedTextStorage = {
     origArr: readonly string[];
 };
 
-declare const convertAlphabet: TaraskStep;
-declare const convertAlphabetLowerCase: TaraskStep;
+declare const convertAlphabet: TaraskStep<{}>;
+declare const convertAlphabetLowerCase: TaraskStep<{}>;
 
 /**
  * Uses {@link highlightDiff}
@@ -228,7 +228,12 @@ declare const applyVariationsHtml: TaraskStep;
  */
 declare const applyVariationsNonHtml: TaraskStep;
 
-declare const prepare: TaraskStep;
+/**
+ * Prepares the text for correct processing.
+ *
+ * Some changes should be reverted in the {@link finalize} step.
+ */
+declare const prepare: TaraskStep<{}>;
 
 /**
  * Created in {@link resolveSpecialSyntax}.
@@ -260,7 +265,7 @@ declare const storeSplittedAbcConvertedOrig: TaraskStep<SplittedTextStorage>;
 
 declare const storeSplittedText: TaraskStep<SplittedTextStorage>;
 
-declare const taraskevize: TaraskStep;
+declare const taraskevize: TaraskStep<{}>;
 
 /**
  * Created in {@link whitespacesToSpaces}.
@@ -283,12 +288,23 @@ declare const whitespacesToSpaces: TaraskStep<WhiteSpaceStorage>;
  */
 declare const restoreWhitespaces: TaraskStep<WhiteSpaceStorage>;
 
-declare const trim: TaraskStep;
+declare const trim: TaraskStep<{}>;
 
-declare const restoreParentheses: TaraskStep;
-declare const afterJoin: TaraskStep;
+/**
+ * @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.
+ *
+ * Restores:
+ * `(` from `&#40`,
+ * ` ` from `&nbsp;`,
+ *
+ * Removes spaces around punctuation marks and digits.
+ */
 declare const finalize: (newLine: string) => TaraskStep;
-declare const toLowerCase: TaraskStep;
+
+declare const toLowerCase: TaraskStep<{}>;
 
 /**
  * This module exports all the steps
@@ -305,9 +321,8 @@ declare const toLowerCase: TaraskStep;
 
 type index$1_SpecialSyntaxStorage = SpecialSyntaxStorage;
 type index$1_SplittedTextStorage = SplittedTextStorage;
-type index$1_TaraskStep<Storage = {}> = TaraskStep<Storage>;
+type index$1_TaraskStep<Storage extends object = {}> = TaraskStep<Storage>;
 type index$1_WhiteSpaceStorage = WhiteSpaceStorage;
-declare const index$1_afterJoin: typeof afterJoin;
 declare const index$1_applyGHtml: typeof applyGHtml;
 declare const index$1_applyGNonHtml: typeof applyGNonHtml;
 declare const index$1_applyNoFix: typeof applyNoFix;
@@ -324,7 +339,6 @@ declare const index$1_prepare: typeof prepare;
 declare const index$1_replaceIbyJ: typeof replaceIbyJ;
 declare const index$1_resolveSpecialSyntax: typeof resolveSpecialSyntax;
 declare const index$1_restoreCaseStep: typeof restoreCaseStep;
-declare const index$1_restoreParentheses: typeof restoreParentheses;
 declare const index$1_restoreWhitespaces: typeof restoreWhitespaces;
 declare const index$1_storeSplittedAbcConvertedOrig: typeof storeSplittedAbcConvertedOrig;
 declare const index$1_storeSplittedText: typeof storeSplittedText;
@@ -333,7 +347,7 @@ declare const index$1_toLowerCase: typeof toLowerCase;
 declare const index$1_trim: typeof trim;
 declare const index$1_whitespacesToSpaces: typeof whitespacesToSpaces;
 declare namespace index$1 {
-  export { type index$1_SpecialSyntaxStorage as SpecialSyntaxStorage, type index$1_SplittedTextStorage as SplittedTextStorage, type index$1_TaraskStep as TaraskStep, type index$1_WhiteSpaceStorage as WhiteSpaceStorage, index$1_afterJoin as afterJoin, index$1_applyGHtml as applyGHtml, index$1_applyGNonHtml as applyGNonHtml, index$1_applyNoFix as applyNoFix, index$1_applyVariableParts as applyVariableParts, index$1_applyVariationsHtml as applyVariationsHtml, index$1_applyVariationsNonHtml as applyVariationsNonHtml, index$1_convertAlphabet as convertAlphabet, index$1_convertAlphabetLowerCase as convertAlphabetLowerCase, index$1_finalize as finalize, index$1_highlightDiffStep as highlightDiffStep, index$1_highlightDiffStepNonHtml as highlightDiffStepNonHtml, index$1_joinSplittedText as joinSplittedText, index$1_prepare as prepare, index$1_replaceIbyJ as replaceIbyJ, index$1_resolveSpecialSyntax as resolveSpecialSyntax, index$1_restoreCaseStep as restoreCaseStep, index$1_restoreParentheses as restoreParentheses, index$1_restoreWhitespaces as restoreWhitespaces, index$1_storeSplittedAbcConvertedOrig as storeSplittedAbcConvertedOrig, index$1_storeSplittedText as storeSplittedText, index$1_taraskevize as taraskevize, index$1_toLowerCase as toLowerCase, index$1_trim as trim, index$1_whitespacesToSpaces as whitespacesToSpaces };
+  export { type index$1_SpecialSyntaxStorage as SpecialSyntaxStorage, type index$1_SplittedTextStorage as SplittedTextStorage, type index$1_TaraskStep as TaraskStep, type index$1_WhiteSpaceStorage as WhiteSpaceStorage, index$1_applyGHtml as applyGHtml, index$1_applyGNonHtml as applyGNonHtml, index$1_applyNoFix as applyNoFix, index$1_applyVariableParts as applyVariableParts, index$1_applyVariationsHtml as applyVariationsHtml, index$1_applyVariationsNonHtml as applyVariationsNonHtml, index$1_convertAlphabet as convertAlphabet, index$1_convertAlphabetLowerCase as convertAlphabetLowerCase, index$1_finalize as finalize, index$1_highlightDiffStep as highlightDiffStep, index$1_highlightDiffStepNonHtml as highlightDiffStepNonHtml, index$1_joinSplittedText as joinSplittedText, index$1_prepare as prepare, index$1_replaceIbyJ as replaceIbyJ, index$1_resolveSpecialSyntax as resolveSpecialSyntax, index$1_restoreCaseStep as restoreCaseStep, index$1_restoreWhitespaces as restoreWhitespaces, index$1_storeSplittedAbcConvertedOrig as storeSplittedAbcConvertedOrig, index$1_storeSplittedText as storeSplittedText, index$1_taraskevize as taraskevize, index$1_toLowerCase as toLowerCase, index$1_trim as trim, index$1_whitespacesToSpaces as whitespacesToSpaces };
 }
 
 /**
@@ -407,6 +421,14 @@ declare const ansiColorWrappers: {
     variable: (content: string) => string;
 };
 
+/**
+ * An abstraction for a step that always changes the text.
+ *
+ * > Not recommended to use if
+ * a step doesn't ALWAYS change the text.
+ */
+declare const mutatingStep: <T extends object = {}>(callback: (...args: Parameters<TaraskStep<T>>) => string) => TaraskStep<T>;
+
 /**
  * Collection of functions that help to work with dictionaries.
  */
@@ -424,11 +446,12 @@ declare const index_ansiColorWrappers: typeof ansiColorWrappers;
 declare const index_dictFrom: typeof dictFrom;
 declare const index_highlightDiff: typeof highlightDiff;
 declare const index_htmlWrappers: typeof htmlWrappers;
+declare const index_mutatingStep: typeof mutatingStep;
 declare const index_replaceG: typeof replaceG;
 declare const index_replaceWithDict: typeof replaceWithDict;
 declare const index_restoreCase: typeof restoreCase;
 declare namespace index {
-  export { type index_ExtendedDict as ExtendedDict, index_afterTarask as afterTarask, index_ansiColorWrappers as ansiColorWrappers, index_dictFrom as dictFrom, index_highlightDiff as highlightDiff, index_htmlWrappers as htmlWrappers, index_replaceG as replaceG, index_replaceWithDict as replaceWithDict, index_restoreCase as restoreCase };
+  export { type index_ExtendedDict as ExtendedDict, index_afterTarask as afterTarask, index_ansiColorWrappers as ansiColorWrappers, index_dictFrom as dictFrom, index_highlightDiff as highlightDiff, index_htmlWrappers as htmlWrappers, index_mutatingStep as mutatingStep, index_replaceG as replaceG, index_replaceWithDict as replaceWithDict, index_restoreCase as restoreCase };
 }
 
 export { type HtmlOptions, type NonHtmlOptions, REPLACE_J, TaraskConfig, type TaraskOptions, VARIATION, index$3 as dicts, index as lib, pipelines, index$1 as steps, tarask };

package/dist/index.js

@@ -2079,7 +2079,6 @@ var tarask = (text, pipeline, cfg = new TaraskConfig()) => {
 // src/steps/index.ts
 var steps_exports = {};
 __export(steps_exports, {
-  afterJoin: () => afterJoin,
   applyGHtml: () => applyGHtml,
   applyGNonHtml: () => applyGNonHtml,
   applyNoFix: () => applyNoFix,
@@ -2096,7 +2095,6 @@ __export(steps_exports, {
   replaceIbyJ: () => replaceIbyJ,
   resolveSpecialSyntax: () => resolveSpecialSyntax,
   restoreCaseStep: () => restoreCaseStep,
-  restoreParentheses: () => restoreParentheses,
   restoreWhitespaces: () => restoreWhitespaces,
   storeSplittedAbcConvertedOrig: () => storeSplittedAbcConvertedOrig,
   storeSplittedText: () => storeSplittedText,
@@ -2114,6 +2112,7 @@ __export(lib_exports, {
   dictFrom: () => dictFrom,
   highlightDiff: () => highlightDiff,
   htmlWrappers: () => htmlWrappers,
+  mutatingStep: () => mutatingStep,
   replaceG: () => replaceG,
   replaceWithDict: () => replaceWithDict,
   restoreCase: () => restoreCase
@@ -2256,15 +2255,33 @@ var ansiColorWrappers = {
   variable: (content) => `\x1B[35m${content}\x1B[0m`
 };
 
-// src/steps/convert-alphabet.ts
-var convertAlphabet = (options) => {
-  const { lower, upper } = options.cfg.general.abc;
-  options.text = replaceWithDict(replaceWithDict(options.text, lower), upper);
-};
-var convertAlphabetLowerCase = (options) => {
-  options.text = replaceWithDict(options.text, options.cfg.general.abc.lower);
+// src/lib/mutating-step.ts
+var mutatingStep = (callback) => (options) => {
+  options.text = callback(options);
 };
 
+// src/steps/convert-alphabet.ts
+var convertAlphabet = mutatingStep(
+  ({
+    text,
+    cfg: {
+      general: {
+        abc: { upper, lower }
+      }
+    }
+  }) => replaceWithDict(replaceWithDict(text, lower), upper)
+);
+var convertAlphabetLowerCase = mutatingStep(
+  ({
+    text,
+    cfg: {
+      general: {
+        abc: { lower }
+      }
+    }
+  }) => replaceWithDict(text, lower)
+);
+
 // src/steps/highlight-diff.ts
 var highlightDiffStep = (highlight) => ({
   cfg: {
@@ -2302,9 +2319,9 @@ var replaceIbyJ = (options) => {
 };
 
 // src/steps/join-splitted.ts
-var joinSplittedText = (options) => {
-  options.text = options.storage.textArr.join(" ");
-};
+var joinSplittedText = mutatingStep(
+  ({ storage: { textArr } }) => textArr.join(" ")
+);
 
 // src/steps/apply-g.ts
 var applyGHtml = (options) => {
@@ -2329,12 +2346,9 @@ var applyGNonHtml = (options) => {
 };
 
 // src/steps/apply-variations.ts
-var applyVariableParts = (callback) => (options) => {
-  options.text = options.text.replace(
-    /\([^)]*?\)/g,
-    ($0) => callback($0.slice(1, -1).split("|"))
-  );
-};
+var applyVariableParts = (callback) => mutatingStep(
+  ({ text }) => text.replace(/\([^)]*?\)/g, ($0) => callback($0.slice(1, -1).split("|")))
+);
 var applyVariationsHtml = applyVariableParts((parts) => {
   const main = parts.shift();
   return `<tarL data-l='${parts}'>${main}</tarL>`;
@@ -2349,9 +2363,9 @@ var applyVariationsNonHtml = (options) => {
 };
 
 // src/steps/prepare.ts
-var prepare = (options) => {
-  options.text = options.text.replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("(\\p{P}|\\p{S}|\\d+)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
-};
+var prepare = mutatingStep(
+  ({ text }) => text.replace(/г'(?![еёіюя])/g, "ґ").replace(/ - /g, " — ").replace(new RegExp("(\\p{P}|\\p{S}|\\d+)", "gu"), " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40")
+);
 
 // src/steps/resolve-syntax.ts
 var NOFIX_CHAR = "  ";
@@ -2361,77 +2375,76 @@ var applyNoFix = (options) => {
   if (noFixArr.length)
     options.text = options.text.replace(NOFIX_REGEX, () => noFixArr.shift());
 };
-var resolveSpecialSyntax = (leftAngleBracket) => (options) => {
-  const {
+var resolveSpecialSyntax = (leftAngleBracket) => mutatingStep(
+  ({
     text,
     storage,
     cfg: {
       general: { doEscapeCapitalized, abc }
     }
-  } = options;
-  const noFixArr = storage.noFixArr = [];
-  const convertAlphavet = (abcOnlyText, abc2) => restoreCase(
-    replaceWithDict(abcOnlyText.toLowerCase(), abc2.lower).split(" "),
-    abcOnlyText.split(" ")
-  ).join(" ");
-  const escapeCapsIfNeeded = (text2) => doEscapeCapitalized ? text2.replace(
-    new RegExp("(?!<=\\p{Lu} )\\p{Lu}{2}[\\p{Lu} ]*(?!= \\p{Lu})", "gu"),
-    ($0) => {
-      noFixArr.push(convertAlphavet($0, abc));
-      return NOFIX_CHAR;
-    }
-  ) : text2;
-  const parts = text.split(/(?=[<>])/g);
-  if (parts.length === 1) {
-    options.text = escapeCapsIfNeeded(text);
-    return;
-  }
-  let result = text.startsWith("<") ? "" : escapeCapsIfNeeded(parts.shift());
-  let depth = 0;
-  let currentPart = "";
-  for (const part of parts) {
-    if (part.startsWith("<")) {
-      ++depth;
-      currentPart += part;
-    } else if (depth) {
-      --depth;
-      if (depth) {
+  }) => {
+    const noFixArr = storage.noFixArr = [];
+    const convertAlphavet = (abcOnlyText, abc2) => restoreCase(
+      replaceWithDict(abcOnlyText.toLowerCase(), abc2.lower).split(" "),
+      abcOnlyText.split(" ")
+    ).join(" ");
+    const escapeCapsIfNeeded = (text2) => doEscapeCapitalized ? text2.replace(
+      new RegExp("(?!<=\\p{Lu} )\\p{Lu}{2}[\\p{Lu} ]*(?!= \\p{Lu})", "gu"),
+      ($0) => {
+        noFixArr.push(convertAlphavet($0, abc));
+        return NOFIX_CHAR;
+      }
+    ) : text2;
+    const parts = text.split(/(?=[<>])/g);
+    if (parts.length === 1)
+      return escapeCapsIfNeeded(text);
+    let result = text.startsWith("<") ? "" : escapeCapsIfNeeded(parts.shift());
+    let depth = 0;
+    let currentPart = "";
+    for (const part of parts) {
+      if (part.startsWith("<")) {
+        ++depth;
         currentPart += part;
-      } else {
-        let char = "";
-        const isAbc = currentPart[1] === "*";
-        if (isAbc) {
-          char = currentPart[2];
-          currentPart = convertAlphavet(
-            currentPart.slice(char === "," || char === "." ? 3 : 2),
-            abc
-          );
+      } else if (depth) {
+        --depth;
+        if (depth) {
+          currentPart += part;
         } else {
-          char = currentPart[1];
-          currentPart = currentPart.slice(2);
+          let char = "";
+          const isAbc = currentPart[1] === "*";
+          if (isAbc) {
+            char = currentPart[2];
+            currentPart = convertAlphavet(
+              currentPart.slice(char === "," || char === "." ? 3 : 2),
+              abc
+            );
+          } else {
+            char = currentPart[1];
+            currentPart = currentPart.slice(2);
+          }
+          let toAddToResult;
+          switch (char) {
+            case ".":
+              toAddToResult = NOFIX_CHAR;
+              noFixArr.push(currentPart);
+              break;
+            case ",":
+              toAddToResult = leftAngleBracket + currentPart + ">";
+              break;
+            default:
+              toAddToResult = leftAngleBracket + NOFIX_CHAR;
+              noFixArr.push((isAbc ? "" : char) + currentPart + ">");
+          }
+          result += toAddToResult + escapeCapsIfNeeded(part.slice(1));
+          currentPart = "";
         }
-        let toAddToResult;
-        switch (char) {
-          case ".":
-            toAddToResult = NOFIX_CHAR;
-            noFixArr.push(currentPart);
-            break;
-          case ",":
-            toAddToResult = leftAngleBracket + currentPart + ">";
-            break;
-          default:
-            toAddToResult = leftAngleBracket + NOFIX_CHAR;
-            noFixArr.push((isAbc ? "" : char) + currentPart + ">");
-        }
-        result += toAddToResult + escapeCapsIfNeeded(part.slice(1));
-        currentPart = "";
+      } else {
+        result += escapeCapsIfNeeded(part);
       }
-    } else {
-      result += escapeCapsIfNeeded(part);
     }
+    return result + escapeCapsIfNeeded(currentPart);
   }
-  options.text = result + escapeCapsIfNeeded(currentPart);
-};
+);
 
 // src/steps/restore-case.ts
 var restoreCaseStep = ({
@@ -2475,8 +2488,7 @@ var storeSplittedText = ({
 
 // src/steps/taraskevize.ts
 var wordlistPlusNoSoften = wordlist.concat(noSoften);
-var taraskevize = (options) => {
-  let { text } = options;
+var taraskevize = mutatingStep(({ text }) => {
   text = replaceWithDict(text, wordlistPlusNoSoften);
   softening:
     do {
@@ -2486,42 +2498,39 @@ var taraskevize = (options) => {
           continue softening;
       break;
     } while (true);
-  options.text = replaceWithDict(text.replace(//g, ""), afterTarask);
-};
+  return replaceWithDict(
+    text.replace(//g, "").replace(/не пра/g, "не&nbsp;пра"),
+    afterTarask
+  ).replace(/не&nbsp;пра/g, "не пра");
+});
 
 // src/steps/whitespaces.ts
-var whitespacesToSpaces = (options) => {
-  const { storage } = options;
-  storage.spaces = [];
-  options.text = options.text.replace(/\s+/g, (match) => {
-    storage.spaces.push(match);
-    return " ";
-  });
-};
-var restoreWhitespaces = (options) => {
-  const { spaces } = options.storage;
-  spaces.reverse();
-  options.text = options.text.replace(/ /g, () => spaces.pop());
-};
+var whitespacesToSpaces = mutatingStep(
+  ({ text, storage }) => {
+    storage.spaces = [];
+    return text.replace(/\s+/g, (match) => {
+      storage.spaces.push(match);
+      return " ";
+    });
+  }
+);
+var restoreWhitespaces = mutatingStep(
+  ({ text, storage: { spaces } }) => {
+    spaces.reverse();
+    return text.replace(/ /g, () => spaces.pop());
+  }
+);
 
 // src/steps/trim.ts
-var trim = (options) => {
-  options.text = ` ${options.text.trim()} `;
-};
+var trim = mutatingStep(({ text }) => ` ${text.trim()} `);
 
-// src/steps/other.ts
-var restoreParentheses = (options) => {
-  options.text = options.text.replace(/&#40/g, "(");
-};
-var afterJoin = (options) => {
-  options.text = options.text.replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d+|&#40) ", "gu"), "$1");
-};
-var finalize = (newLine) => (options) => {
-  options.text = options.text.replace(/\n/g, newLine).trim();
-};
-var toLowerCase = (options) => {
-  options.text = options.text.toLowerCase();
-};
+// src/steps/finalize.ts
+var finalize = (newLine) => mutatingStep(
+  ({ text }) => text.replace(/&#40/g, "(").replace(/&nbsp;/g, " ").replace(new RegExp(" (\\p{P}|\\p{S}|\\d+) ", "gu"), "$1").replace(/\n/g, newLine).trim()
+);
+
+// src/steps/to-lower-case.ts
+var toLowerCase = mutatingStep(({ text }) => text.toLowerCase());
 
 // src/pipelines.ts
 var pipelines_exports = {};
@@ -2544,8 +2553,6 @@ var abcOnly = [
   convertAlphabet,
   restoreWhitespaces,
   applyNoFix,
-  restoreParentheses,
-  afterJoin,
   finalizeWithNewLine,
   ({ storage, cfg: { general } }) => {
     general.doEscapeCapitalized = storage.doEscapeCapitalized;
@@ -2566,8 +2573,6 @@ var createPipeline = (resolveSpecialSyntax2, applyG, applyVariations, finalize2,
   highlightDiffStep2,
   joinSplittedText,
   restoreWhitespaces,
-  restoreParentheses,
-  afterJoin,
   applyG,
   applyVariations,
   applyNoFix,

package/package.json

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