switch normalize-diacritics to diacritics

cityssm · Feb 7, 2022 · ab01365 · ab01365
1 parent d889854
commit ab01365
Show file tree

Hide file tree

Showing 4 changed files with 697 additions and 1,564 deletions.
diff --git a/index.js b/index.js
@@ -1,4 +1,4 @@
-import { normalizeSync } from "normalize-diacritics";
+import { remove as removeDiacritics } from "diacritics";
 import * as utils from "./utils.js";
 import { simpleTranslations, complexTranslations } from "./translations.js";
 const unleetRecurse = (lowerCaseLeetString, unleetStrings, previousStrings, complexTranslationKeys) => {
@@ -32,11 +32,12 @@ export const unleet = (leetString) => {
     if (leetString === null || leetString === undefined || leetString === "") {
         return [""];
     }
-    let cleanLeetString = leetString.toString().toLowerCase();
+    let cleanLeetString = leetString.toString();
     cleanLeetString = cleanLeetString.replace(/\./g, " ");
     cleanLeetString = cleanLeetString.replace(utils.whitespaceCharactersRegex, " ");
     cleanLeetString = cleanLeetString.replace(/ +/g, " ");
-    cleanLeetString = normalizeSync(cleanLeetString);
+    cleanLeetString = removeDiacritics(cleanLeetString);
+    cleanLeetString = cleanLeetString.toLowerCase();
     for (const leetSymbol of Object.keys(simpleTranslations)) {
         while (cleanLeetString.includes(leetSymbol)) {
             cleanLeetString = cleanLeetString.replace(leetSymbol, simpleTranslations[leetSymbol][0]);

diff --git a/index.ts b/index.ts
@@ -1,4 +1,4 @@
-import { normalizeSync } from "normalize-diacritics";
+import { remove as removeDiacritics } from "diacritics";
 import * as utils from "./utils.js";
 
 import { simpleTranslations, complexTranslations } from "./translations.js";
@@ -58,8 +58,8 @@ export const unleet = (leetString: string | number): string[] => {
     return [""];
   }
 
-  // Convert to lower case
-  let cleanLeetString = leetString.toString().toLowerCase();
+  // Ensure the input is a string
+  let cleanLeetString = leetString.toString();
 
   // Remove periods
   cleanLeetString = cleanLeetString.replace(/\./g, " ");
@@ -71,7 +71,10 @@ export const unleet = (leetString: string | number): string[] => {
   cleanLeetString = cleanLeetString.replace(/ +/g, " ");
 
   // Remove accents
-  cleanLeetString = normalizeSync(cleanLeetString);
+  cleanLeetString = removeDiacritics(cleanLeetString);
+
+  // Convert to lower case
+  cleanLeetString = cleanLeetString.toLowerCase();
 
   // Do simple translations
   for (const leetSymbol of Object.keys(simpleTranslations)) {