taraskevizer 5.3.1 → 5.3.3

package/dist/index.cjs

@@ -51,6 +51,7 @@ var iwords = toOneLine(`біс
 л(іст| )
 лістас
 льк
+м 
 мант
 мась?ц
 мбры[кч]
@@ -67,7 +68,7 @@ var iwords = toOneLine(`біс
 нфікс
 нфімум
 ншась?ц
-нш(а[ейя]?|ась?ц|ую|ы(мі|х|я)?) 
+нш(а[ейя]?|ась?ц|ую|ы(мі?|х|я)?) 
 псілан
 р([аыу]|а[мхйў]|амі|) 
 рад
@@ -216,14 +217,14 @@ var rawLatinLettersJi = [
   [`І(?=${iwords})`, "Ji"],
   [`І(?=${iwords.toUpperCase()})`, "JI"],
   ...common.lower[0],
-  [/(?<=[eouaаеёіоуўыэюяьʼАЕЁІОУЎЫЭЮЯЬ] *)і/, "ji"],
+  [/(?<=[eouaаеёіоуўыэюяʼАЕЁІОУЎЫЭЮЯЬ] *)і/, "ji"],
   ...common.lower[1]
 ];
 var rawLatinLettersUpperCaseJi = [
   ...common.upper[0],
   [new RegExp("(?<=[eoua] *)І(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), "Ji"],
   ...common.upper[1],
-  [/(?<=[AOEUАЕЁІОУЎЫЭЮЯЬ][( ]*)І/, "JI"],
+  [/(?<=[AOEUАЕЁІОУЎЫЭЮЯ][( ]*)І/, "JI"],
   ...common.upper[2]
 ];
 
@@ -2003,7 +2004,6 @@ for (const word of gwords)
   wordlist.push([RegExp(word.replace(/ґ/g, "г"), "g"), word]);
 
 // src/tarask.ts
-var import_diff = require("diff");
 var isUpperCase = (str) => str === str.toUpperCase();
 var getLastLetter = (word, i) => {
   for (let i2 = word.length - 1; i2 >= 0; i2--)
@@ -2096,13 +2096,62 @@ var restoreCase = (text, orig) => {
   }
   return text;
 };
-var highlightChanges = (text, orig, highlight) => (0, import_diff.diffChars)(orig, text).reduce(
-  (acc, diff) => acc + (diff.removed ? "�" : diff.added ? highlight(diff.value) : diff.value),
-  ""
-).replace(
-  /([^<>\x1b])�([^<>\x1b])/g,
-  ($0, $1, $2) => highlight($1 + $2)
-).replace(/�/g, "");
+var highlightDiff = (text, orig, isCyrillic, highlight) => {
+  for (let i = 0; i < text.length; i++) {
+    const word = text[i];
+    const oWord = orig[i];
+    if (oWord === word)
+      continue;
+    const wordH = isCyrillic ? replaceG(word, ($0) => gobj[$0]) : word;
+    if (oWord === wordH)
+      continue;
+    if (!/\(/.test(word)) {
+      if (word.length === oWord.length) {
+        const wordLetters = word.split("");
+        for (let j = 0; j < wordLetters.length; j++) {
+          if (wordH[j] !== oWord[j])
+            wordLetters[j] = highlight(wordLetters[j]);
+        }
+        text[i] = wordLetters.join("");
+        continue;
+      }
+      if (isCyrillic) {
+        const word1 = word.replace(/ь/g, "");
+        switch (oWord) {
+          case word1:
+            text[i] = word.replace(/ь/g, highlight("ь"));
+            continue;
+          case word1 + "ь":
+            text[i] = word.slice(0, -1).replace(/ь/g, highlight("ь")) + "ь";
+            continue;
+        }
+      }
+    }
+    const oWordEnd = oWord.length - 1;
+    let fromStart = 0;
+    let fromWordEnd = word.length - 1;
+    let fromOWordEnd = oWordEnd;
+    while (wordH[fromStart] === oWord[fromStart])
+      ++fromStart;
+    while (wordH[fromWordEnd] === oWord[fromOWordEnd]) {
+      --fromWordEnd;
+      --fromOWordEnd;
+    }
+    if (oWord.length < word.length) {
+      if (fromOWordEnd === oWordEnd) {
+        text[i] = highlight(word);
+        continue;
+      }
+      if (fromWordEnd < 0)
+        fromWordEnd = 0;
+    }
+    if (fromStart === fromWordEnd + 1) {
+      --fromStart;
+      ++fromWordEnd;
+    }
+    text[i] = word.slice(0, fromStart) + highlight(word.slice(fromStart, fromWordEnd + 1)) + word.slice(fromWordEnd + 1);
+  }
+};
 var replaceWithDict = (text, dict = []) => {
   for (const [pattern, result] of dict)
     text = text.replace(
@@ -2156,17 +2205,15 @@ var Taraskevizer = class {
   }
   convert(text) {
     const wrapInColorOf = wrappers.ansiColors;
+    const isCyrillic = this.abc === ALPHABET.CYRILLIC;
     const noFixArr = [];
-    text = this.prepare(text, noFixArr, "<");
-    const origInTargetAlphabet = convertAlphabet(text, this.abc);
-    text = this.process(text, origInTargetAlphabet);
+    const { splitted, splittedOrig } = this.process(
+      this.prepare(text, noFixArr, "<")
+    );
     if (this.nonHtml.ansiColors)
-      text = highlightChanges(
-        text,
-        afterJoin(origInTargetAlphabet),
-        wrapInColorOf.fix
-      );
-    if (this.abc === ALPHABET.CYRILLIC && (this.nonHtml.h || this.nonHtml.ansiColors))
+      highlightDiff(splitted, splittedOrig, isCyrillic, wrapInColorOf.fix);
+    text = join(splitted);
+    if (isCyrillic && (this.nonHtml.h || this.nonHtml.ansiColors))
       text = replaceG(
         text,
         this.nonHtml.ansiColors ? this.nonHtml.h ? ($0) => wrapInColorOf.variable(gobj[$0]) : wrapInColorOf.variable("$&") : ($0) => gobj[$0]
@@ -2183,15 +2230,14 @@ var Taraskevizer = class {
   }
   convertToHtml(text) {
     const wrapInTag = wrappers.html;
+    const isCyrillic = this.abc === ALPHABET.CYRILLIC;
     const noFixArr = [];
-    text = this.prepare(text, noFixArr, "&lt;");
-    const origInTargetAlphabet = convertAlphabet(text, this.abc);
-    text = highlightChanges(
-      this.process(text, origInTargetAlphabet),
-      afterJoin(origInTargetAlphabet),
-      wrapInTag.fix
+    const { splitted, splittedOrig } = this.process(
+      this.prepare(text, noFixArr, "&lt;")
     );
-    if (this.abc === ALPHABET.CYRILLIC)
+    highlightDiff(splitted, splittedOrig, isCyrillic, wrapInTag.fix);
+    text = join(splitted);
+    if (isCyrillic)
       text = replaceG(
         text,
         this.html.g ? wrapInTag.letterH("$&") : ($0) => wrapInTag.letterH(gobj[$0])
@@ -2234,9 +2280,9 @@ var Taraskevizer = class {
       "\n"
     );
   }
-  process(text, textInTargetAlphabet) {
+  process(text) {
     const { abc, j } = this;
-    const splittedOrig = textInTargetAlphabet.split(" ");
+    const splittedOrig = convertAlphabet(text, abc).split(" ");
     text = this.taraskevize(text.toLowerCase());
     if (j && abc !== ALPHABET.LATIN_JI)
       text = replaceIbyJ(text, j === REPLACE_J.ALWAYS);
@@ -2244,7 +2290,7 @@ var Taraskevizer = class {
     let splitted = text.split(" ");
     if (abc !== ALPHABET.ARABIC)
       splitted = restoreCase(splitted, splittedOrig);
-    return join(splitted);
+    return { splittedOrig, splitted };
   }
   taraskevize(text) {
     text = replaceWithDict(text, wordlist);

package/dist/index.js

@@ -20,6 +20,7 @@ var iwords = toOneLine(`біс
 л(іст| )
 лістас
 льк
+м 
 мант
 мась?ц
 мбры[кч]
@@ -36,7 +37,7 @@ var iwords = toOneLine(`біс
 нфікс
 нфімум
 ншась?ц
-нш(а[ейя]?|ась?ц|ую|ы(мі|х|я)?) 
+нш(а[ейя]?|ась?ц|ую|ы(мі?|х|я)?) 
 псілан
 р([аыу]|а[мхйў]|амі|) 
 рад
@@ -185,14 +186,14 @@ var rawLatinLettersJi = [
   [`І(?=${iwords})`, "Ji"],
   [`І(?=${iwords.toUpperCase()})`, "JI"],
   ...common.lower[0],
-  [/(?<=[eouaаеёіоуўыэюяьʼАЕЁІОУЎЫЭЮЯЬ] *)і/, "ji"],
+  [/(?<=[eouaаеёіоуўыэюяʼАЕЁІОУЎЫЭЮЯЬ] *)і/, "ji"],
   ...common.lower[1]
 ];
 var rawLatinLettersUpperCaseJi = [
   ...common.upper[0],
   [new RegExp("(?<=[eoua] *)І(?=[ \\p{P}\\d]*\\p{Lu}?\\p{Ll})", "u"), "Ji"],
   ...common.upper[1],
-  [/(?<=[AOEUАЕЁІОУЎЫЭЮЯЬ][( ]*)І/, "JI"],
+  [/(?<=[AOEUАЕЁІОУЎЫЭЮЯ][( ]*)І/, "JI"],
   ...common.upper[2]
 ];
 
@@ -1972,7 +1973,6 @@ for (const word of gwords)
   wordlist.push([RegExp(word.replace(/ґ/g, "г"), "g"), word]);
 
 // src/tarask.ts
-import { diffChars } from "diff";
 var isUpperCase = (str) => str === str.toUpperCase();
 var getLastLetter = (word, i) => {
   for (let i2 = word.length - 1; i2 >= 0; i2--)
@@ -2065,13 +2065,62 @@ var restoreCase = (text, orig) => {
   }
   return text;
 };
-var highlightChanges = (text, orig, highlight) => diffChars(orig, text).reduce(
-  (acc, diff) => acc + (diff.removed ? "�" : diff.added ? highlight(diff.value) : diff.value),
-  ""
-).replace(
-  /([^<>\x1b])�([^<>\x1b])/g,
-  ($0, $1, $2) => highlight($1 + $2)
-).replace(/�/g, "");
+var highlightDiff = (text, orig, isCyrillic, highlight) => {
+  for (let i = 0; i < text.length; i++) {
+    const word = text[i];
+    const oWord = orig[i];
+    if (oWord === word)
+      continue;
+    const wordH = isCyrillic ? replaceG(word, ($0) => gobj[$0]) : word;
+    if (oWord === wordH)
+      continue;
+    if (!/\(/.test(word)) {
+      if (word.length === oWord.length) {
+        const wordLetters = word.split("");
+        for (let j = 0; j < wordLetters.length; j++) {
+          if (wordH[j] !== oWord[j])
+            wordLetters[j] = highlight(wordLetters[j]);
+        }
+        text[i] = wordLetters.join("");
+        continue;
+      }
+      if (isCyrillic) {
+        const word1 = word.replace(/ь/g, "");
+        switch (oWord) {
+          case word1:
+            text[i] = word.replace(/ь/g, highlight("ь"));
+            continue;
+          case word1 + "ь":
+            text[i] = word.slice(0, -1).replace(/ь/g, highlight("ь")) + "ь";
+            continue;
+        }
+      }
+    }
+    const oWordEnd = oWord.length - 1;
+    let fromStart = 0;
+    let fromWordEnd = word.length - 1;
+    let fromOWordEnd = oWordEnd;
+    while (wordH[fromStart] === oWord[fromStart])
+      ++fromStart;
+    while (wordH[fromWordEnd] === oWord[fromOWordEnd]) {
+      --fromWordEnd;
+      --fromOWordEnd;
+    }
+    if (oWord.length < word.length) {
+      if (fromOWordEnd === oWordEnd) {
+        text[i] = highlight(word);
+        continue;
+      }
+      if (fromWordEnd < 0)
+        fromWordEnd = 0;
+    }
+    if (fromStart === fromWordEnd + 1) {
+      --fromStart;
+      ++fromWordEnd;
+    }
+    text[i] = word.slice(0, fromStart) + highlight(word.slice(fromStart, fromWordEnd + 1)) + word.slice(fromWordEnd + 1);
+  }
+};
 var replaceWithDict = (text, dict = []) => {
   for (const [pattern, result] of dict)
     text = text.replace(
@@ -2125,17 +2174,15 @@ var Taraskevizer = class {
   }
   convert(text) {
     const wrapInColorOf = wrappers.ansiColors;
+    const isCyrillic = this.abc === ALPHABET.CYRILLIC;
     const noFixArr = [];
-    text = this.prepare(text, noFixArr, "<");
-    const origInTargetAlphabet = convertAlphabet(text, this.abc);
-    text = this.process(text, origInTargetAlphabet);
+    const { splitted, splittedOrig } = this.process(
+      this.prepare(text, noFixArr, "<")
+    );
     if (this.nonHtml.ansiColors)
-      text = highlightChanges(
-        text,
-        afterJoin(origInTargetAlphabet),
-        wrapInColorOf.fix
-      );
-    if (this.abc === ALPHABET.CYRILLIC && (this.nonHtml.h || this.nonHtml.ansiColors))
+      highlightDiff(splitted, splittedOrig, isCyrillic, wrapInColorOf.fix);
+    text = join(splitted);
+    if (isCyrillic && (this.nonHtml.h || this.nonHtml.ansiColors))
       text = replaceG(
         text,
         this.nonHtml.ansiColors ? this.nonHtml.h ? ($0) => wrapInColorOf.variable(gobj[$0]) : wrapInColorOf.variable("$&") : ($0) => gobj[$0]
@@ -2152,15 +2199,14 @@ var Taraskevizer = class {
   }
   convertToHtml(text) {
     const wrapInTag = wrappers.html;
+    const isCyrillic = this.abc === ALPHABET.CYRILLIC;
     const noFixArr = [];
-    text = this.prepare(text, noFixArr, "&lt;");
-    const origInTargetAlphabet = convertAlphabet(text, this.abc);
-    text = highlightChanges(
-      this.process(text, origInTargetAlphabet),
-      afterJoin(origInTargetAlphabet),
-      wrapInTag.fix
+    const { splitted, splittedOrig } = this.process(
+      this.prepare(text, noFixArr, "&lt;")
     );
-    if (this.abc === ALPHABET.CYRILLIC)
+    highlightDiff(splitted, splittedOrig, isCyrillic, wrapInTag.fix);
+    text = join(splitted);
+    if (isCyrillic)
       text = replaceG(
         text,
         this.html.g ? wrapInTag.letterH("$&") : ($0) => wrapInTag.letterH(gobj[$0])
@@ -2203,9 +2249,9 @@ var Taraskevizer = class {
       "\n"
     );
   }
-  process(text, textInTargetAlphabet) {
+  process(text) {
     const { abc, j } = this;
-    const splittedOrig = textInTargetAlphabet.split(" ");
+    const splittedOrig = convertAlphabet(text, abc).split(" ");
     text = this.taraskevize(text.toLowerCase());
     if (j && abc !== ALPHABET.LATIN_JI)
       text = replaceIbyJ(text, j === REPLACE_J.ALWAYS);
@@ -2213,7 +2259,7 @@ var Taraskevizer = class {
     let splitted = text.split(" ");
     if (abc !== ALPHABET.ARABIC)
       splitted = restoreCase(splitted, splittedOrig);
-    return join(splitted);
+    return { splittedOrig, splitted };
   }
   taraskevize(text) {
     text = replaceWithDict(text, wordlist);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "taraskevizer",
-	"version": "5.3.1",
+	"version": "5.3.3",
 	"author": "GooseOb",
 	"repository": {
 		"type": "git",
@@ -8,9 +8,6 @@
 	},
 	"main": "dist/index.js",
 	"module": "dist/index.js",
-	"dependencies": {
-		"diff": "^5.2.0"
-	},
 	"devDependencies": {
 		"@digitak/esrun": "^3.2.26",
 		"@types/diff": "^5.2.0",