ohos-router 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohos-router",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "鸿蒙路由管理插件",
   "main": "main.js",
   "scripts": {

package/router.ts

@@ -217,21 +217,26 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
 
 }
 
-
 let moduleSrcEntry: string
-
 function moduleJson5JSONParse(moduleJson5Data: string) {
     try {
         let moduleJsonBean = JSON.parse(moduleJson5Data)
         let module = moduleJsonBean.module
         moduleSrcEntry = module.srcEntry
     } catch (error) {
-        let errorArray = error.message.split(" ")
-        let position = Number(errorArray[errorArray.length - 1])
-        let endString = moduleJson5Data.substring(0, position)
-        const lastIndex = endString.lastIndexOf(",")
-        let replacedStr = replaceCharUsingSubstring(endString, lastIndex, '');
-        moduleJson5JSONParse(JSON.parse(replacedStr + moduleJson5Data.substring(position, moduleJson5Data.length)))
+        // 尝试修复常见的 JSON 错误
+        const repairedJson = moduleJson5Data
+            // 修复单引号
+            .replace(/'/g, '"')
+            // 修复未加引号的键名
+            .replace(/([{,]\s*)([a-zA-Z_$][a-zA-Z0-9_$]*)(\s*:)/g, '$1"$2"$3')
+            // 修复尾随逗号
+            .replace(/,\s*}/g, '}')
+            .replace(/,\s*]/g, ']')
+            // 修复注释（移除单行和多行注释）
+            .replace(/\/\/.*$/gm, '')
+            .replace(/\/\*[\s\S]*?\*\//g, '');
+        moduleJson5JSONParse(repairedJson)
     }
 }
 
@@ -484,12 +489,3 @@ function replaceCharUsingSubstring(str: string, index: number, newChar: string)
     }
     return str.substring(0, index) + newChar + str.substring(index + 1);
 }
-
-function addPropertyToBeginning<T extends object, K extends string, V>(
-    obj: T,
-    key: K,
-    value: V
-): T & { [P in K]: V } {
-    const newObj = {[key]: value, ...obj} as T & { [P in K]: V };
-    return newObj;
-}