ohos-router 1.1.4 → 1.1.6

package/package.json

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

package/router.ts

@@ -167,6 +167,12 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
                                     "RouterConfig } from '" + item + "';\n"
                             }
                         })
+
+                       if(importHaveConfig.indexOf(name + "RouterConfig")==-1){
+                           //证明没导入，那就手动再导入一次
+                           importHaveConfig = importHaveConfig + "\nimport { " + name +
+                               "RouterConfig } from '" + name.toLowerCase() + "';\n";
+                       }
                     }
                 })
 
@@ -217,21 +223,34 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
 
 }
 
+function hasTwoOccurrencesIndexOf(str: string, target: string): boolean {
+    const firstIndex = str.indexOf(target);
+    if (firstIndex === -1) return false;
 
-let moduleSrcEntry: string
+    const secondIndex = str.indexOf(target, firstIndex + target.length);
+    return secondIndex !== -1;
+}
 
+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)
     }
 }
 
@@ -344,12 +363,19 @@ function dependenciesJSONParse(ohPackageData: string) {
             }
         }
     } catch (error) {
-        let errorArray = error.message.split(" ")
-        let position = Number(errorArray[errorArray.length - 1])
-        let endString = ohPackageData.substring(0, position)
-        const lastIndex = endString.lastIndexOf(",")
-        let replacedStr = replaceCharUsingSubstring(endString, lastIndex, '');
-        dependenciesJSONParse(replacedStr + ohPackageData.substring(position, ohPackageData.length))
+        // 尝试修复常见的 JSON 错误
+        const repairedJson = ohPackageData
+            // 修复单引号
+            .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, '');
+        dependenciesJSONParse(repairedJson)
     }
 }
 
@@ -376,12 +402,18 @@ function buildProfileJSONParse(buildProfileData: string) {
             }
         }
     } catch (error) {
-        let errorArray = error.message.split(" ")
-        let position = Number(errorArray[errorArray.length - 1])
-        let endString = buildProfileData.substring(0, position)
-        const lastIndex = endString.lastIndexOf(",")
-        let replacedStr = replaceCharUsingSubstring(endString, lastIndex, '');
-        buildProfileJSONParse(replacedStr + buildProfileData.substring(position, buildProfileData.length))
+        const repairedJson = buildProfileData
+            // 修复单引号
+            .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, '');
+        buildProfileJSONParse(repairedJson)
     }
 }
 
@@ -484,12 +516,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;
-}