taraskevizer 2.0.1 → 2.0.2

package/bin/index.js

@@ -2,21 +2,22 @@
 import { tarask, taraskToHtml } from '../dist/index.js';
 import { readFile } from 'fs/promises';
 
-const print = (...msgs) => {
-	console.log('\x1b[34m[taraskevizer]\x1b[0m', ...msgs);
+const printWithPrefix = (msg) => {
+	process.stdout.write(
+		'\x1b[34m[taraskevizer]\x1b[0m ' + msg.toString() + '\n'
+	);
 };
 
-const getPkg = () =>
-	readFile(new URL('../package.json', import.meta.url)).then(JSON.parse);
-
 process.argv.splice(0, 2);
 
 const checkForOptions = (options) =>
 	options.includes(process.argv[0].toLowerCase());
 
 if (checkForOptions(['-v', '--version'])) {
-	const { version } = await getPkg();
-	print(version);
+	const { version } = JSON.parse(
+		await readFile(new URL('../package.json', import.meta.url), 'utf8')
+	);
+	printWithPrefix(version);
 	process.exit(0);
 }
 
@@ -29,7 +30,14 @@ const htmlOptions = { g: true };
 
 let isHtml = false;
 
-const optionDict = [
+const toHashTable = (dict) => {
+	const result = {};
+	for (const [options, callback] of dict)
+		for (const option of options) result[option] = callback;
+	return result;
+};
+
+const optionDict = toHashTable([
 	[
 		['--latin', '-l'],
 		() => {
@@ -91,21 +99,22 @@ const optionDict = [
 			isHtml = true;
 		},
 	],
-];
+]);
+
+let currOption;
 
-optionEater: while (true) {
-	for (const [options, callback] of optionDict)
-		if (checkForOptions(options)) {
-			process.argv.shift();
-			callback();
-			continue optionEater;
-		}
-	break;
+while ((currOption = process.argv.shift())) {
+	if (currOption in optionDict) {
+		optionDict[currOption]();
+	} else {
+		process.argv.unshift(currOption);
+		break;
+	}
 }
 
 const text = process.argv.join(' ');
 
-console.log(
+process.stdout.write(
 	isHtml
 		? taraskToHtml(text, taraskOptions, htmlOptions)
 		: tarask(text, taraskOptions, nonHtmlOptions)

package/dist/index.cjs

@@ -854,6 +854,7 @@ var rawWordlist = [
   [/календ/, "кале�нд"],
   [/ленд/, "лэнд"],
   [/люксем/, "люксэм"],
+  [/ луіш/, " лу�іш"],
   [/ луі/, " люі"],
   [/лунаці/, "люнаты"],
   [/люнебур/, "люнэбур"],
@@ -1055,6 +1056,7 @@ var rawWordlist = [
   [/персі(?=[ійя])/, "пэрсі"],
   [/персід/, "пэрсыд"],
   [/ перу/, " пэру"],
+  [/перыгел/, "пэрыг�ел"],
   [/перыяд/, "пэрыяд"],
   [/ песа /, " пэса "],
   [/песімі(?=[зс])/, "пэсымі"],
@@ -1891,7 +1893,7 @@ var rawWordlist = [
   [/нкск/, "нск"],
   [/[ктцч]ск/, "цк"],
   [/падскарб/, "пад�скарб"],
-  [/ райхск/, " райх�ск"],
+  [/ (звыш|райх)ск/, " $1�ск"],
   [/ г[еэ]рцагс/, " гэрцаг�с"],
   [/ (дву|тро|чатыро)хс/, " $1х�с"],
   [/[гґзжхш]с(?=(?:к|тв)\S)/, "с"],
@@ -2263,7 +2265,7 @@ var tarask = (text, taraskOptions, nonHtmlOptions = {}) => {
     const replacer = ($0) => $0.slice(1, -1).split("|")[wordIndex];
     text = text.replace(
       OPTIONAL_WORDS_REGEX,
-      nonHtmlOptions.nodeColors ? ($0) => tagApplications.nonHtml.L(replacer($0)) : replacer
+      nonHtmlOptions.nodeColors ? ($0) => apply.L(replacer($0)) : replacer
     );
   }
   return finilize(applyNoFix(text).replace(/&#40/g, "("), "\n");

package/dist/index.js

@@ -823,6 +823,7 @@ var rawWordlist = [
   [/календ/, "кале�нд"],
   [/ленд/, "лэнд"],
   [/люксем/, "люксэм"],
+  [/ луіш/, " лу�іш"],
   [/ луі/, " люі"],
   [/лунаці/, "люнаты"],
   [/люнебур/, "люнэбур"],
@@ -1024,6 +1025,7 @@ var rawWordlist = [
   [/персі(?=[ійя])/, "пэрсі"],
   [/персід/, "пэрсыд"],
   [/ перу/, " пэру"],
+  [/перыгел/, "пэрыг�ел"],
   [/перыяд/, "пэрыяд"],
   [/ песа /, " пэса "],
   [/песімі(?=[зс])/, "пэсымі"],
@@ -1860,7 +1862,7 @@ var rawWordlist = [
   [/нкск/, "нск"],
   [/[ктцч]ск/, "цк"],
   [/падскарб/, "пад�скарб"],
-  [/ райхск/, " райх�ск"],
+  [/ (звыш|райх)ск/, " $1�ск"],
   [/ г[еэ]рцагс/, " гэрцаг�с"],
   [/ (дву|тро|чатыро)хс/, " $1х�с"],
   [/[гґзжхш]с(?=(?:к|тв)\S)/, "с"],
@@ -2232,7 +2234,7 @@ var tarask = (text, taraskOptions, nonHtmlOptions = {}) => {
     const replacer = ($0) => $0.slice(1, -1).split("|")[wordIndex];
     text = text.replace(
       OPTIONAL_WORDS_REGEX,
-      nonHtmlOptions.nodeColors ? ($0) => tagApplications.nonHtml.L(replacer($0)) : replacer
+      nonHtmlOptions.nodeColors ? ($0) => apply.L(replacer($0)) : replacer
     );
   }
   return finilize(applyNoFix(text).replace(/&#40/g, "("), "\n");

package/package.json

@@ -2,7 +2,7 @@
 	"name": "taraskevizer",
 	"author": "GooseOb",
 	"license": "MIT",
-	"version": "2.0.1",
+	"version": "2.0.2",
 	"private": false,
 	"homepage": "https://gooseob.github.io/taraskevizatar/",
 	"main": "dist/index.js",
@@ -18,7 +18,7 @@
 		"README.md"
 	],
 	"scripts": {
-		"build": "tsup --config build-config/index.js",
+		"build": "tsup --config build-config/index.ts",
 		"build:bun_EXPERIMENTAL": "bun ./build-config/bun.ts",
 		"dev": "esrun --watch=src/*,test/*,bin/* --send-code-mode=temporaryFile test",
 		"dev:bun": "bun ./test/bun-watch.ts",