taraskevizer 2.1.2 → 3.0.0-alpha.2

package/README.md

@@ -19,7 +19,7 @@ const taraskedText = tarask(
 		j: J.ALWAYS,
 	},
 	{
-		nodeColors: true,
+		ansiColors: true,
 		variations: VARIATION.FIRST,
 		h: false,
 	}
@@ -110,7 +110,7 @@ true: <tarH>ґ</tarH> <tarH>Ґ</tarH>
 
 ## NonHtmlOptions
 
-### nodeColors
+### ansiColors
 
 Type: `boolean`
 

package/dist/bin.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import { tarask, taraskToHtml } from "./index.js";
+import readline from "readline/promises";
 import { readFile } from "fs/promises";
+const prefix = "\x1B[34m[taraskevizer]\x1B[0m ";
 const printWithPrefix = (msg) => {
-  process.stdout.write(
-    "\x1B[34m[taraskevizer]\x1B[0m " + msg.toString() + "\n"
-  );
+  process.stdout.write(prefix + msg.toString() + "\n");
 };
 process.argv.splice(0, 2);
-const checkForOptions = (options) => options.includes(process.argv[0].toLowerCase());
+const checkForOptions = (options) => process.argv[0] && options.includes(process.argv[0].toLowerCase());
 if (checkForOptions(["-v", "--version"])) {
   const { version } = JSON.parse(
     await readFile(new URL("../package.json", import.meta.url), "utf8")
@@ -18,7 +18,7 @@ if (checkForOptions(["-v", "--version"])) {
 const taraskOptions = {};
 const nonHtmlOptions = {
   variations: 2,
-  nodeColors: true
+  ansiColors: true
 };
 const htmlOptions = { g: true };
 let isHtml = false;
@@ -82,7 +82,7 @@ const optionDict = toHashTable([
   [
     ["--no-color", "-nc"],
     () => {
-      nonHtmlOptions.nodeColors = false;
+      nonHtmlOptions.ansiColors = false;
     }
   ],
   [
@@ -101,7 +101,11 @@ while (currOption = process.argv.shift()) {
     break;
   }
 }
-const text = process.argv.join(" ");
+let text = process.argv.length ? process.argv.join(" ") : await readline.createInterface({
+  input: process.stdin,
+  output: process.stdout
+}).question(prefix + "Enter the text:\n");
 process.stdout.write(
   isHtml ? taraskToHtml(text, taraskOptions, htmlOptions) : tarask(text, taraskOptions, nonHtmlOptions)
 );
+process.exit(0);

package/dist/index.cjs

@@ -2153,15 +2153,14 @@ var lettersUpperCase = {
   [ALPHABET.LATIN]: latinLettersUpperCase,
   [ALPHABET.GREEK]: greekLettersUpperCase
 };
-var tagApplications = {
+var wrappers = {
   html: {
-    F: (content) => `<tarF>${content}</tarF>`,
-    H: (content) => `<tarH>${content}</tarH>`
+    fix: (content) => `<tarF>${content}</tarF>`,
+    letterH: (content) => `<tarH>${content}</tarH>`
   },
-  nonHtml: {
-    F: (content) => `\x1B[32m${content}\x1B[0m`,
-    H: (content) => `\x1B[35m${content}\x1B[0m`,
-    L: (content) => `\x1B[35m${content}\x1B[0m`
+  ansiColors: {
+    fix: (content) => `\x1B[32m${content}\x1B[0m`,
+    variable: (content) => `\x1B[35m${content}\x1B[0m`
   }
 };
 var iaReplacer = ($0, $1, $2) => {
@@ -2230,15 +2229,15 @@ var getCompletedOptions = (options) => ({
 });
 var taraskToHtml = (text, taraskOptions, htmlOptions = {}) => {
   const options = getCompletedOptions(taraskOptions);
-  const apply = tagApplications.html;
+  const wrapInTag = wrappers.html;
   const isCyrillic = options.abc === ALPHABET.CYRILLIC;
   const { splitted, splittedOrig } = process(text, "&lt;", options);
-  addTags(splitted, splittedOrig, isCyrillic, apply.F);
+  highlightChanges(splitted, splittedOrig, isCyrillic, wrapInTag.fix);
   text = join(splitted);
   if (isCyrillic)
     text = replaceG(
       text,
-      htmlOptions.g ? apply.H("$&") : ($0) => apply.H(gobj[$0])
+      htmlOptions.g ? wrapInTag.letterH("$&") : ($0) => wrapInTag.letterH(gobj[$0])
     );
   return finilize(
     applyNoFix(text).replace(OPTIONAL_WORDS_REGEX, ($0) => {
@@ -2251,23 +2250,23 @@ var taraskToHtml = (text, taraskOptions, htmlOptions = {}) => {
 };
 var tarask = (text, taraskOptions, nonHtmlOptions = {}) => {
   const options = getCompletedOptions(taraskOptions);
-  const apply = tagApplications.nonHtml;
+  const wrapInColorOf = wrappers.ansiColors;
   const isCyrillic = options.abc === ALPHABET.CYRILLIC;
   const { splitted, splittedOrig } = process(text, "&lt;", options);
-  if (nonHtmlOptions.nodeColors)
-    addTags(splitted, splittedOrig, isCyrillic, apply.F);
+  if (nonHtmlOptions.ansiColors)
+    highlightChanges(splitted, splittedOrig, isCyrillic, wrapInColorOf.fix);
   text = join(splitted);
-  if (isCyrillic && (nonHtmlOptions.h || nonHtmlOptions.nodeColors))
+  if (isCyrillic && (nonHtmlOptions.h || nonHtmlOptions.ansiColors))
     text = replaceG(
       text,
-      nonHtmlOptions.nodeColors ? nonHtmlOptions.h ? ($0) => apply.H(gobj[$0]) : apply.H("$&") : ($0) => gobj[$0]
+      nonHtmlOptions.ansiColors ? nonHtmlOptions.h ? ($0) => wrapInColorOf.variable(gobj[$0]) : wrapInColorOf.variable("$&") : ($0) => gobj[$0]
     );
   if ("variations" in nonHtmlOptions && nonHtmlOptions.variations !== VARIATION.ALL) {
     const wordIndex = nonHtmlOptions.variations ?? 0;
     const replacer = ($0) => $0.slice(1, -1).split("|")[wordIndex];
     text = text.replace(
       OPTIONAL_WORDS_REGEX,
-      nonHtmlOptions.nodeColors ? ($0) => apply.L(replacer($0)) : replacer
+      nonHtmlOptions.ansiColors ? ($0) => wrapInColorOf.variable(replacer($0)) : replacer
     );
   }
   return finilize(applyNoFix(text).replace(/&#40/g, "("), "\n");
@@ -2297,7 +2296,7 @@ var restoreCase = (text, orig) => {
   }
   return text;
 };
-var addTags = (text, orig, isCyrillic, applyF) => {
+var highlightChanges = (text, orig, isCyrillic, highlight) => {
   for (let i = 0; i < text.length; i++) {
     const word = text[i];
     const oWord = orig[i];
@@ -2311,7 +2310,7 @@ var addTags = (text, orig, isCyrillic, applyF) => {
         const wordLetters = word.split("");
         for (let j = 0; j < wordLetters.length; j++) {
           if (wordH[j] !== oWord[j])
-            wordLetters[j] = applyF(wordLetters[j]);
+            wordLetters[j] = highlight(wordLetters[j]);
         }
         text[i] = wordLetters.join("");
         continue;
@@ -2320,10 +2319,10 @@ var addTags = (text, orig, isCyrillic, applyF) => {
         const word1 = word.replace(/ь/g, "");
         switch (oWord) {
           case word1:
-            text[i] = word.replace(/ь/g, applyF("ь"));
+            text[i] = word.replace(/ь/g, highlight("ь"));
             continue;
           case word1 + "ь":
-            text[i] = word.slice(0, -1).replace(/ь/g, applyF("ь")) + "ь";
+            text[i] = word.slice(0, -1).replace(/ь/g, highlight("ь")) + "ь";
             continue;
         }
       }
@@ -2340,13 +2339,13 @@ var addTags = (text, orig, isCyrillic, applyF) => {
     }
     if (oWord.length < word.length) {
       if (fromOWordEnd === oWordEnd) {
-        text[i] = applyF(word);
+        text[i] = highlight(word);
         continue;
       }
       if (fromWordEnd < 0)
         fromWordEnd = 0;
     }
-    text[i] = word.slice(0, fromStart) + applyF(word.slice(fromStart, fromWordEnd + 1)) + word.slice(fromWordEnd + 1);
+    text[i] = word.slice(0, fromStart) + highlight(word.slice(fromStart, fromWordEnd + 1)) + word.slice(fromWordEnd + 1);
   }
 };
 var toTarask = (text, replaceWithDict2, wordlist2, softers2, afterTarask2) => {

package/dist/index.d.ts

@@ -11,7 +11,7 @@ type TaraskOptions = {
     OVERRIDE_toTarask?: ToTarask;
 };
 type NonHtmlOptions = {
-    nodeColors: boolean;
+    ansiColors: boolean;
     h: boolean;
     variations: Variation;
 };

package/dist/index.js

@@ -2122,15 +2122,14 @@ var lettersUpperCase = {
   [ALPHABET.LATIN]: latinLettersUpperCase,
   [ALPHABET.GREEK]: greekLettersUpperCase
 };
-var tagApplications = {
+var wrappers = {
   html: {
-    F: (content) => `<tarF>${content}</tarF>`,
-    H: (content) => `<tarH>${content}</tarH>`
+    fix: (content) => `<tarF>${content}</tarF>`,
+    letterH: (content) => `<tarH>${content}</tarH>`
   },
-  nonHtml: {
-    F: (content) => `\x1B[32m${content}\x1B[0m`,
-    H: (content) => `\x1B[35m${content}\x1B[0m`,
-    L: (content) => `\x1B[35m${content}\x1B[0m`
+  ansiColors: {
+    fix: (content) => `\x1B[32m${content}\x1B[0m`,
+    variable: (content) => `\x1B[35m${content}\x1B[0m`
   }
 };
 var iaReplacer = ($0, $1, $2) => {
@@ -2199,15 +2198,15 @@ var getCompletedOptions = (options) => ({
 });
 var taraskToHtml = (text, taraskOptions, htmlOptions = {}) => {
   const options = getCompletedOptions(taraskOptions);
-  const apply = tagApplications.html;
+  const wrapInTag = wrappers.html;
   const isCyrillic = options.abc === ALPHABET.CYRILLIC;
   const { splitted, splittedOrig } = process(text, "&lt;", options);
-  addTags(splitted, splittedOrig, isCyrillic, apply.F);
+  highlightChanges(splitted, splittedOrig, isCyrillic, wrapInTag.fix);
   text = join(splitted);
   if (isCyrillic)
     text = replaceG(
       text,
-      htmlOptions.g ? apply.H("$&") : ($0) => apply.H(gobj[$0])
+      htmlOptions.g ? wrapInTag.letterH("$&") : ($0) => wrapInTag.letterH(gobj[$0])
     );
   return finilize(
     applyNoFix(text).replace(OPTIONAL_WORDS_REGEX, ($0) => {
@@ -2220,23 +2219,23 @@ var taraskToHtml = (text, taraskOptions, htmlOptions = {}) => {
 };
 var tarask = (text, taraskOptions, nonHtmlOptions = {}) => {
   const options = getCompletedOptions(taraskOptions);
-  const apply = tagApplications.nonHtml;
+  const wrapInColorOf = wrappers.ansiColors;
   const isCyrillic = options.abc === ALPHABET.CYRILLIC;
   const { splitted, splittedOrig } = process(text, "&lt;", options);
-  if (nonHtmlOptions.nodeColors)
-    addTags(splitted, splittedOrig, isCyrillic, apply.F);
+  if (nonHtmlOptions.ansiColors)
+    highlightChanges(splitted, splittedOrig, isCyrillic, wrapInColorOf.fix);
   text = join(splitted);
-  if (isCyrillic && (nonHtmlOptions.h || nonHtmlOptions.nodeColors))
+  if (isCyrillic && (nonHtmlOptions.h || nonHtmlOptions.ansiColors))
     text = replaceG(
       text,
-      nonHtmlOptions.nodeColors ? nonHtmlOptions.h ? ($0) => apply.H(gobj[$0]) : apply.H("$&") : ($0) => gobj[$0]
+      nonHtmlOptions.ansiColors ? nonHtmlOptions.h ? ($0) => wrapInColorOf.variable(gobj[$0]) : wrapInColorOf.variable("$&") : ($0) => gobj[$0]
     );
   if ("variations" in nonHtmlOptions && nonHtmlOptions.variations !== VARIATION.ALL) {
     const wordIndex = nonHtmlOptions.variations ?? 0;
     const replacer = ($0) => $0.slice(1, -1).split("|")[wordIndex];
     text = text.replace(
       OPTIONAL_WORDS_REGEX,
-      nonHtmlOptions.nodeColors ? ($0) => apply.L(replacer($0)) : replacer
+      nonHtmlOptions.ansiColors ? ($0) => wrapInColorOf.variable(replacer($0)) : replacer
     );
   }
   return finilize(applyNoFix(text).replace(/&#40/g, "("), "\n");
@@ -2266,7 +2265,7 @@ var restoreCase = (text, orig) => {
   }
   return text;
 };
-var addTags = (text, orig, isCyrillic, applyF) => {
+var highlightChanges = (text, orig, isCyrillic, highlight) => {
   for (let i = 0; i < text.length; i++) {
     const word = text[i];
     const oWord = orig[i];
@@ -2280,7 +2279,7 @@ var addTags = (text, orig, isCyrillic, applyF) => {
         const wordLetters = word.split("");
         for (let j = 0; j < wordLetters.length; j++) {
           if (wordH[j] !== oWord[j])
-            wordLetters[j] = applyF(wordLetters[j]);
+            wordLetters[j] = highlight(wordLetters[j]);
         }
         text[i] = wordLetters.join("");
         continue;
@@ -2289,10 +2288,10 @@ var addTags = (text, orig, isCyrillic, applyF) => {
         const word1 = word.replace(/ь/g, "");
         switch (oWord) {
           case word1:
-            text[i] = word.replace(/ь/g, applyF("ь"));
+            text[i] = word.replace(/ь/g, highlight("ь"));
             continue;
           case word1 + "ь":
-            text[i] = word.slice(0, -1).replace(/ь/g, applyF("ь")) + "ь";
+            text[i] = word.slice(0, -1).replace(/ь/g, highlight("ь")) + "ь";
             continue;
         }
       }
@@ -2309,13 +2308,13 @@ var addTags = (text, orig, isCyrillic, applyF) => {
     }
     if (oWord.length < word.length) {
       if (fromOWordEnd === oWordEnd) {
-        text[i] = applyF(word);
+        text[i] = highlight(word);
         continue;
       }
       if (fromWordEnd < 0)
         fromWordEnd = 0;
     }
-    text[i] = word.slice(0, fromStart) + applyF(word.slice(fromStart, fromWordEnd + 1)) + word.slice(fromWordEnd + 1);
+    text[i] = word.slice(0, fromStart) + highlight(word.slice(fromStart, fromWordEnd + 1)) + word.slice(fromWordEnd + 1);
   }
 };
 var toTarask = (text, replaceWithDict2, wordlist2, softers2, afterTarask2) => {

package/package.json

@@ -2,7 +2,7 @@
 	"name": "taraskevizer",
 	"author": "GooseOb",
 	"license": "MIT",
-	"version": "2.1.2",
+	"version": "3.0.0-alpha.2",
 	"private": false,
 	"homepage": "https://gooseob.github.io/taraskevizatar/",
 	"main": "dist/index.js",
@@ -13,7 +13,10 @@
 		"tarask": "dist/bin.js"
 	},
 	"files": [
-		"dist/**/*",
+		"dist/index.js",
+		"dist/index.cjs",
+		"dist/index.d.ts",
+		"dist/bin.js",
 		"README.md"
 	],
 	"scripts": {
@@ -23,7 +26,8 @@
 		"dev:bun": "bun ./test/bun-watch.ts",
 		"dev-bun": "bun test --watch",
 		"test": "esrun --send-code-mode=temporaryFile test",
-		"prepare": "husky install"
+		"prepare": "husky install",
+		"typecheck": "tsc --project src/tsconfig.json"
 	},
 	"repository": {
 		"type": "git",