fix(core): 修改 typr 库，减少部分打包体积。

ocsjs · May 17, 2022 · 51e26de · 51e26de
1 parent a20965f
commit 51e26de
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -23,7 +23,7 @@
     "node-fetch": "^2.6.7",
     "string-similarity": "^4.0.4",
     "tesseract.js": "^2.1.5",
-    "typr-ts": "^1.1.5",
+    "typr.js": "^1.0.0",
     "vue": "^3.2.31"
   },
   "repository": {

diff --git a/packages/core/src/script/cx/recognize.ts b/packages/core/src/script/cx/recognize.ts
@@ -1,8 +1,9 @@
 import md5 from 'md5';
-import { Typr, TyprU } from 'typr-ts';
 import { request } from '../../core/utils';
 import { logger, OCR, store } from '../../main';
 import CXAnalyses from './utils';
+// @ts-ignore
+import Typr from 'typr.js';
 
 /**
  * 繁体字识别-字典匹配
@@ -35,9 +36,9 @@ export async function mapRecognize() {
         // 匹配解密字体
         const match: any = {};
         for (let i = 19968; i < 40870; i++) { // 中文[19968, 40869]
-          const Glyph = TyprU.codeToGlyph(code, i);
+          const Glyph = Typr.U.codeToGlyph(code, i);
           if (!Glyph) continue;
-          const path = TyprU.glyphToPath(code, Glyph);
+          const path = Typr.U.glyphToPath(code, Glyph);
           const hex = md5(JSON.stringify(path)).slice(24); // 8位即可区分
           match[i.toString()] = fontMap[hex];
         }
@@ -49,7 +50,9 @@ export async function mapRecognize() {
           for (const key in match) {
             const word = String.fromCharCode(parseInt(key));
             const value = String.fromCharCode(match[key]);
-            html = html.replaceAll(word, value);
+            while (html.indexOf(word) !== -1) {
+              html = html.replace(word, value);
+            }
           }
           el.innerHTML = html;
           el.classList.remove('font-cxsecret'); // 移除字体加密
@@ -58,6 +61,7 @@ export async function mapRecognize() {
     }
   }
 }
+
 /** 繁体字识别-OCR文字识别 */
 export async function ocrRecognize() {
   const ocr = new OCR({

diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -9,15 +9,12 @@
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "lib": [
-      "DOM",
-      "es2021"
+      "DOM"
     ],
     "jsx": "preserve",
     "resolveJsonModule": true
   },
   "include": [
-    "./src/core/index.ts",
     "./src/**/*.ts",
-    "src/script/zhs/index.ts"
   ]
 }