taraskevizer 1.0.3 → 1.1.1

package/dist/index.d.ts

@@ -9,7 +9,7 @@ type TaraskOptions = {
     html: false | HtmlOptions;
 };
 type Promisify<T> = T extends (...args: infer TArgs) => infer TReturn ? (...args: TArgs) => Promise<TReturn> : never;
-type Tarask = (text: string, options: TaraskOptions) => string;
+type Tarask = (text: string, options?: TaraskOptions) => string;
 type TaraskAsync = Promisify<Tarask>;
 type Dict = Record<string, RegExp>;
 type AlphabetDependentDict = {

package/dist/index.js

@@ -1323,8 +1323,7 @@ var rawWordlist = {
   "($&|акмяны)": /акмяне(?= )/,
   "($&|аліта)": /аліўтс(?= )/,
   "($&|анікшты)": /анікшчэй(?= )/,
-  "($&|араны)": /варэны(?= )/,
-  " (варэн|аран)": / варэн/,
+  " (варэ|ара)": / варэ(?=н(ы|а[мх]|амі) )/,
   // '($&|белая вака)':/балтайі воке(?= )/,
   "($&|біржы)": /біржай(?= )/,
   "($&|бірштаны)": /бірштанас(?= )/,
@@ -1996,7 +1995,8 @@ var additionalReplacements = {
   },
   [ARABIC]: {}
 };
-var taraskSync = (text, { abc = 0, j = 0, html }) => {
+var taraskSync = (text, options) => {
+  const { abc = 0, j = 0, html = false } = options || {};
   const noFix = [];
   const LEFT_ANGLE_BRACKET = html ? "&lt;" : "<";
   text = ` ${text.trim()}  `.replace(/<([,.]?)((?:.|\s)*?)>/g, ($0, $1, $2) => {
@@ -2004,7 +2004,7 @@ var taraskSync = (text, { abc = 0, j = 0, html }) => {
       return LEFT_ANGLE_BRACKET + $2 + ">";
     noFix[noFix.length] = $1 === "." ? $2 : $0;
     return NOFIX_CHAR;
-  }).replace(/г'(?![еёіюя])/g, "ґ").replace(/(\n|\t)/g, " $1 ").replace(/ - /g, " — ").replace(/(\p{P}|\p{S}|\d)/gu, " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
+  }).replace(/г'(?![еёіюя])/g, "ґ").replace(/([\n\t])/g, " $1 ").replace(/ - /g, " — ").replace(/(\p{P}|\p{S}|\d)/gu, " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
   let splittedOrig, splitted;
   splittedOrig = replaceWithDict(
     replaceWithDict(text, letters[abc]),
@@ -2096,8 +2096,10 @@ function toHtmlTags(text, orig, abc) {
     let fromOWordEnd = oWordEnd;
     while (wordH[fromStart] === oWord[fromStart])
       ++fromStart;
-    while (wordH[fromWordEnd] === oWord[fromOWordEnd])
-      --fromWordEnd, --fromOWordEnd;
+    while (wordH[fromWordEnd] === oWord[fromOWordEnd]) {
+      --fromWordEnd;
+      --fromOWordEnd;
+    }
     if (oWord.length < word.length) {
       if (fromOWordEnd === oWordEnd) {
         text[i] = `<tarF>${word}</tarF>`;
@@ -2129,7 +2131,7 @@ function toTarask(text) {
     ($0, $1, $2) => /([ая]ў|ну)$/.test($2) ? $1 + "ь і" + $2 : $0
   );
 }
-function replaceWithDict(text, dict = null) {
+function replaceWithDict(text, dict = {}) {
   for (const key in dict)
     text = text.replace(dict[key], key);
   return text;

package/dist/index.mjs

@@ -1296,8 +1296,7 @@ var rawWordlist = {
   "($&|акмяны)": /акмяне(?= )/,
   "($&|аліта)": /аліўтс(?= )/,
   "($&|анікшты)": /анікшчэй(?= )/,
-  "($&|араны)": /варэны(?= )/,
-  " (варэн|аран)": / варэн/,
+  " (варэ|ара)": / варэ(?=н(ы|а[мх]|амі) )/,
   // '($&|белая вака)':/балтайі воке(?= )/,
   "($&|біржы)": /біржай(?= )/,
   "($&|бірштаны)": /бірштанас(?= )/,
@@ -1969,7 +1968,8 @@ var additionalReplacements = {
   },
   [ARABIC]: {}
 };
-var taraskSync = (text, { abc = 0, j = 0, html }) => {
+var taraskSync = (text, options) => {
+  const { abc = 0, j = 0, html = false } = options || {};
   const noFix = [];
   const LEFT_ANGLE_BRACKET = html ? "&lt;" : "<";
   text = ` ${text.trim()}  `.replace(/<([,.]?)((?:.|\s)*?)>/g, ($0, $1, $2) => {
@@ -1977,7 +1977,7 @@ var taraskSync = (text, { abc = 0, j = 0, html }) => {
       return LEFT_ANGLE_BRACKET + $2 + ">";
     noFix[noFix.length] = $1 === "." ? $2 : $0;
     return NOFIX_CHAR;
-  }).replace(/г'(?![еёіюя])/g, "ґ").replace(/(\n|\t)/g, " $1 ").replace(/ - /g, " — ").replace(/(\p{P}|\p{S}|\d)/gu, " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
+  }).replace(/г'(?![еёіюя])/g, "ґ").replace(/([\n\t])/g, " $1 ").replace(/ - /g, " — ").replace(/(\p{P}|\p{S}|\d)/gu, " $1 ").replace(/ ['`’] (?=\S)/g, "ʼ").replace(/\(/g, "&#40");
   let splittedOrig, splitted;
   splittedOrig = replaceWithDict(
     replaceWithDict(text, letters[abc]),
@@ -2069,8 +2069,10 @@ function toHtmlTags(text, orig, abc) {
     let fromOWordEnd = oWordEnd;
     while (wordH[fromStart] === oWord[fromStart])
       ++fromStart;
-    while (wordH[fromWordEnd] === oWord[fromOWordEnd])
-      --fromWordEnd, --fromOWordEnd;
+    while (wordH[fromWordEnd] === oWord[fromOWordEnd]) {
+      --fromWordEnd;
+      --fromOWordEnd;
+    }
     if (oWord.length < word.length) {
       if (fromOWordEnd === oWordEnd) {
         text[i] = `<tarF>${word}</tarF>`;
@@ -2102,7 +2104,7 @@ function toTarask(text) {
     ($0, $1, $2) => /([ая]ў|ну)$/.test($2) ? $1 + "ь і" + $2 : $0
   );
 }
-function replaceWithDict(text, dict = null) {
+function replaceWithDict(text, dict = {}) {
   for (const key in dict)
     text = text.replace(dict[key], key);
   return text;

package/package.json

@@ -2,7 +2,7 @@
 	"name": "taraskevizer",
 	"author": "GooseOb",
 	"license": "MIT",
-	"version": "1.0.3",
+	"version": "1.1.1",
 	"private": false,
 	"homepage": "https://gooseob.github.io/taraskevizatar/",
 	"main": "dist/index.js",
@@ -14,6 +14,8 @@
 	],
 	"scripts": {
 		"build": "tsup --config build-config/index.js",
+		"dev:build": "tsup --config build-config/dev.js && npm run test",
+		"test": "node test",
 		"prepare": "husky install"
 	},
 	"repository": {
@@ -28,6 +30,7 @@
 		"belarusian"
 	],
 	"devDependencies": {
+		"@digitak/esrun": "^3.2.24",
 		"husky": "^8.0.3",
 		"prettier": "^3.0.0",
 		"tsup": "^6.5.0",