ohos-router 1.1.6 → 1.1.7

package/package.json

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

package/router.ts

@@ -168,11 +168,11 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
                             }
                         })
 
-                       if(importHaveConfig.indexOf(name + "RouterConfig")==-1){
-                           //证明没导入，那就手动再导入一次
-                           importHaveConfig = importHaveConfig + "\nimport { " + name +
-                               "RouterConfig } from '" + name.toLowerCase() + "';\n";
-                       }
+                        if (importHaveConfig.indexOf(name + "RouterConfig") == -1) {
+                            //证明没导入，那就手动再导入一次
+                            importHaveConfig = importHaveConfig + "\nimport { " + name +
+                                "RouterConfig } from '" + name.toLowerCase() + "';\n";
+                        }
                     }
                 })
 
@@ -232,25 +232,15 @@ function hasTwoOccurrencesIndexOf(str: string, target: string): boolean {
 }
 
 let moduleSrcEntry: string
-function moduleJson5JSONParse(moduleJson5Data: string) {
+
+function moduleJson5JSONParse(json: string) {
     try {
+        let moduleJson5Data = getEndJson(json);
         let moduleJsonBean = JSON.parse(moduleJson5Data)
         let module = moduleJsonBean.module
         moduleSrcEntry = module.srcEntry
     } catch (error) {
-        // 尝试修复常见的 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)
+        moduleJson5JSONParse(getEndJson(json))
     }
 }
 
@@ -352,8 +342,9 @@ function log(params: string) {
 
 let dependenciesKey: string[]
 
-function dependenciesJSONParse(ohPackageData: string) {
+function dependenciesJSONParse(json: string) {
     try {
+        let ohPackageData = getEndJson(json);
         dependenciesKey = []
         let ohPackAgeBean = JSON.parse(ohPackageData)
         let dependencies = ohPackAgeBean.dependencies
@@ -363,24 +354,13 @@ function dependenciesJSONParse(ohPackageData: string) {
             }
         }
     } catch (error) {
-        // 尝试修复常见的 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)
+        dependenciesJSONParse(getEndJson(json))
     }
 }
 
-function buildProfileJSONParse(buildProfileData: string) {
+function buildProfileJSONParse(json: string) {
     try {
+        let buildProfileData = getEndJson(json);
         let buildProfileBean = JSON.parse(buildProfileData)
         let buildOptionBean = buildProfileBean.buildOption
         if (buildOptionBean.arkOptions == undefined) {
@@ -402,21 +382,25 @@ function buildProfileJSONParse(buildProfileData: string) {
             }
         }
     } catch (error) {
-        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)
+        buildProfileJSONParse(getEndJson(json))
     }
 }
 
+function getEndJson(json: string) {
+    const repairedJson = json
+        // 修复单引号
+        .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, '');
+    return repairedJson;
+}
+
 
 function printBuildProFile(buildProfileData: string, type: number) {
     let endArray = ""
@@ -464,13 +448,16 @@ function printBuildProFile(buildProfileData: string, type: number) {
         let buildProfilePosition = buildProfileData.indexOf(buildProfileTag) + buildProfileTag.length
         let buildProfileBuilder = "\n        \"packages\": [\n" +
             endArray +
-            "        ]\n"
+            "        ],\n"
         buildProfileContent = insertString(buildProfileData, buildProfilePosition, buildProfileBuilder)
     } else if (type == 3) {
+        let buildProfileBean = JSON.parse(buildProfileData)
+        buildProfileBean.buildOption.arkOptions.runtimeOnly.packages = [];
+        let endJson = JSON.stringify(buildProfileBean)
         let buildProfileTag = "\"packages\": ["
-        let buildProfilePosition = buildProfileData.indexOf(buildProfileTag) + buildProfileTag.length
+        let buildProfilePosition = endJson.indexOf(buildProfileTag) + buildProfileTag.length
         let buildProfileBuilder = "\n" + endArray
-        buildProfileContent = insertString(buildProfileData, buildProfilePosition, buildProfileBuilder)
+        buildProfileContent = insertString(endJson, buildProfilePosition, buildProfileBuilder)
     }
 
     FileUtil.writeFileSync(buildProfilePath, buildProfileContent);