ohos-router 1.0.8 → 1.0.9

package/package.json

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

package/router.ts

@@ -1,5 +1,4 @@
-import {HvigorNode} from '@ohos/hvigor';
-import {readFileSync, writeFileSync, existsSync} from 'fs'
+import { HvigorNode, FileUtil } from '@ohos/hvigor';
 
 let entryModulePath = ""
 let entryUpperCaseNameArray: string[] = []
@@ -9,13 +8,12 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
     if (!isExecute) {
         return
     }
-
     entryUpperCaseNameArray = []
     entryIsHsp = []
     node.subNodes((childNode: HvigorNode) => {
         try {
-            let hvigorfilePath = childNode.getNodePath() + "\\hvigorfile.ts"
-            let hvigorfileData = readFileSync(hvigorfilePath, 'utf-8');
+            let hvigorfilePath = FileUtil.pathResolve(childNode.getNodePath(), "hvigorfile.ts")
+            let hvigorfileData = FileUtil.readFileSync(hvigorfilePath);
             let isHsp = hvigorfileData.indexOf("hspTasks") != -1
             let isHap = hvigorfileData.indexOf("hapTasks") != -1
             let nodeName = childNode.getNodeName()
@@ -25,42 +23,40 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
                 entryUpperCaseNameArray.push(upperCaseName)
                 entryIsHsp.push(isHsp)
             }
-            let configPath = childNode.getNodePath() + "\\" + upperCaseName + "RouterConfig.ets"
+            let configPath = FileUtil.pathResolve(childNode.getNodePath(), upperCaseName + "RouterConfig.ets")
 
-            if (!existsSync(configPath)) {
-                try {
-                    writeFileSync(configPath, getRouterConfig(upperCaseName, nodeName, isHsp));
-                } catch (error) {
-                    log(JSON.stringify(error))
-                }
+            if (!FileUtil.exist(configPath)) {
+                FileUtil.ensureFileSync(configPath)
+                FileUtil.writeFileSync(configPath, getRouterConfig(upperCaseName, nodeName, isHsp))
                 if (!isHap) {
-                    let indexFilePath = childNode.getNodePath() + "\\" + "Index.ets"
-                    let indexFileData = readFileSync(indexFilePath, 'utf-8');
+                    let indexFilePath = FileUtil.pathResolve(childNode.getNodePath(), "Index.ets")
+                    let indexFileData = FileUtil.readFileSync(indexFilePath);
                     if (indexFileData.indexOf(upperCaseName) == -1) {
                         indexFileData = "export { " + upperCaseName +
                             "RouterConfig } from './" + upperCaseName +
                             "RouterConfig'\n" + indexFileData
-                        writeFileSync(indexFilePath, indexFileData);
+
+                        FileUtil.writeFileSync(indexFilePath, indexFileData)
                     }
                 }
             }
+
             if (isHap) {
                 entryModulePath = childNode.getNodePath()
                 writeBuildProfile(childNode)
             }
+
             let fileList = childNode.getNodeDir()
                 .asFileList()
                 .filter(item => {
-                    return item.getPath().indexOf("build") == -1
-                        && item.getPath().indexOf("oh_modules") == -1
-                        && item.getPath().indexOf("src\\main") != -1
-                        && item.getPath().endsWith(".ets")
+                    return item.getPath().endsWith(".ets") && item.getPath().indexOf("build") == -1 &&
+                        item.getPath().indexOf("oh_modules") == -1 && item.getPath().indexOf("ohosTest") == -1
                 })
 
             fileList.forEach((file) => {
-                let data = readFileSync(file.filePath, 'utf-8');
+                let data = FileUtil.readFileSync(file.filePath);
                 if (data.indexOf("@RouterPath") != -1) {
-                    let routerPathEnd = data.split("@RouterPath")[1]
+                    let routerPathEnd = data.toString().split("@RouterPath")[1]
                     let routerName = ""
                     if (routerPathEnd.startsWith("(\"")) {
                         routerName = routerPathEnd.substring(2, routerPathEnd.indexOf(")") - 1)
@@ -70,7 +66,7 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
                     var importPath = "./src" + file.filePath.split("src")[1]
                     importPath = importPath.replace(".ets", "").replaceAll("\\", "/")
                     let viewName = importPath.substring(importPath.lastIndexOf("/") + 1, importPath.length)
-                    let fileData = readFileSync(configPath, 'utf-8')
+                    let fileData = FileUtil.readFileSync(configPath)
                     if (fileData.indexOf(routerName) == -1) {
                         let switchTag = "switch (builderName) {"
                         let switchPosition = fileData.indexOf(switchTag) + switchTag.length
@@ -121,7 +117,7 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
                         }
                         destinationEnd = importContent + destinationEnd
 
-                        writeFileSync(configPath, destinationEnd);
+                        FileUtil.writeFileSync(configPath, destinationEnd);
                     }
                 }
             })
@@ -132,21 +128,21 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
     })
 
     try {
-        let moduleJson5Path = entryModulePath + "\\src\\main\\module.json5"
-        let moduleJson5Data = readFileSync(moduleJson5Path, 'utf-8');
+        let moduleJson5Path = FileUtil.pathResolve(entryModulePath + "/src/main/", "module.json5")
+        let moduleJson5Data = FileUtil.readJson5(moduleJson5Path)
         moduleJson5JSONParse(moduleJson5Data)
-        let appPath = entryModulePath + "\\src\\main\\ets\\App.ets"
+        let appPath = FileUtil.pathResolve(entryModulePath + "/src/main/ets/", "App.ets")
         if (moduleSrcEntry == undefined) {
-            writeFileSync(appPath, getApp());
-            let moduleTag = "\"module\": {"
-            let modulePosition = moduleJson5Data.indexOf(moduleTag) + moduleTag.length
-            let mJson = "\n    \"srcEntry\": \"./ets/App.ets\","
-            let moduleContent = insertString(moduleJson5Data, modulePosition, mJson)
-            writeFileSync(moduleJson5Path, moduleContent);
+            FileUtil.ensureFileSync(appPath)
+            FileUtil.writeFileSync(appPath, getApp())
+            let moduleBean = moduleJson5Data.module
+            const updated = addPropertyToBeginning(moduleBean, "srcEntry", "./ets/App.ets")
+            moduleJson5Data.module = updated
+            FileUtil.writeFileSync(moduleJson5Path, JSON.stringify(moduleJson5Data))
         } else {
-            let endSrc = moduleSrcEntry.substring(1, moduleSrcEntry.length).replaceAll("/", "\\")
-            let endAppPath = entryModulePath + "\\src\\main" + endSrc
-            let appFileData = readFileSync(endAppPath, 'utf-8');
+            let endSrc = moduleSrcEntry.substring(1, moduleSrcEntry.length)
+            let endAppPath = entryModulePath + "/src/main" + endSrc
+            let appFileData = FileUtil.readFileSync(endAppPath);
             if (appFileData.indexOf("routerInitConfig([") != -1) {
                 let initHaveConfig = ""
                 let importHaveConfig = ""
@@ -176,7 +172,7 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
                     let routerHaveJson = "\n" + initHaveConfig
                     let routerInitHaveContent = insertString(appFileData, routerInitHavePosition, routerHaveJson)
                     routerInitHaveContent = importHaveConfig + routerInitHaveContent
-                    writeFileSync(endAppPath, routerInitHaveContent);
+                    FileUtil.writeFileSync(endAppPath, routerInitHaveContent);
                 }
             } else {
                 let initNewConfig = ""
@@ -207,7 +203,7 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
                     "import { EntryRouterConfig } from '../../../EntryRouterConfig';\n"
                     + importNewConfig
                     + routerInitContent
-                writeFileSync(endAppPath, routerInitContent);
+                FileUtil.writeFileSync(endAppPath, routerInitContent);
             }
         }
 
@@ -217,22 +213,22 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
 
 }
 
+
 let moduleSrcEntry: string
 
-function moduleJson5JSONParse(moduleJson5Data: string) {
+function moduleJson5JSONParse(moduleJsonBean) {
     try {
-        let moduleJsonBean = JSON.parse(moduleJson5Data)
         let module = moduleJsonBean.module
         moduleSrcEntry = module.srcEntry
     } catch (error) {
+        let moduleJson5Data = JSON.stringify(moduleJsonBean)
         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(replacedStr + moduleJson5Data.substring(position, moduleJson5Data.length))
+        moduleJson5JSONParse(JSON.parse(replacedStr + moduleJson5Data.substring(position, moduleJson5Data.length)))
     }
-
 }
 
 function insertString(src: string, pos: number, val: string): string {
@@ -251,7 +247,8 @@ function getRouterConfig(upperCaseName: string, nodeName: string, isHsp: boolean
     if (isHsp) {
         configText = configText + " ARouter, setARouter, "
     }
-    configText = configText + "RouterConfig,routerGetBuilderType, routerInitBuilder,NavDestinationView } from '@abner/router';\n" +
+    configText =
+        configText + "RouterConfig,routerGetBuilderType, routerInitBuilder,NavDestinationView } from '@abner/router';\n" +
         "\n" +
         "/**\n" +
         " * AUTHOR:AbnerMing\n" +
@@ -303,19 +300,19 @@ function getRouterConfig(upperCaseName: string, nodeName: string, isHsp: boolean
         "  }\n" +
         "}"
 
-
     return configText
 }
 
+
 var buildProfilePath = ""
 
 function writeBuildProfile(childNode: HvigorNode) {
-    let ohPackagePath = childNode.getNodePath() + "\\oh-package.json5"
-    let ohPackageData = readFileSync(ohPackagePath, 'utf-8');
-    dependenciesJSONParse(ohPackageData)
-    buildProfilePath = childNode.getNodePath() + "\\build-profile.json5"
-    let buildProfileData = readFileSync(buildProfilePath, 'utf-8');
-    buildProfileJSONParse(buildProfileData)
+    let ohPackagePath = FileUtil.pathResolve(childNode.getNodePath(), "oh-package.json5")
+    let ohPackageData = FileUtil.readJson5(ohPackagePath)
+    dependenciesJSONParse(JSON.stringify(ohPackageData))
+    buildProfilePath = FileUtil.pathResolve(childNode.getNodePath(), "build-profile.json5")
+    let buildProfileData = FileUtil.readJson5(buildProfilePath)
+    buildProfileJSONParse(JSON.stringify(buildProfileData))
 }
 
 function getNowTime() {
@@ -329,6 +326,7 @@ function log(params: string) {
     console.error(params);
 }
 
+
 let dependenciesKey: string[]
 
 function dependenciesJSONParse(ohPackageData: string) {
@@ -383,6 +381,7 @@ function buildProfileJSONParse(buildProfileData: string) {
     }
 }
 
+
 function printBuildProFile(buildProfileData: string, type: number) {
     let endArray = ""
     dependenciesKey.forEach((item, index) => {
@@ -438,8 +437,7 @@ function printBuildProFile(buildProfileData: string, type: number) {
         buildProfileContent = insertString(buildProfileData, buildProfilePosition, buildProfileBuilder)
     }
 
-    writeFileSync(buildProfilePath, buildProfileContent);
-
+    FileUtil.writeFileSync(buildProfilePath, buildProfileContent);
 }
 
 function getApp() {
@@ -454,7 +452,6 @@ function getApp() {
         initAppConfig = initAppConfig + ("      new " + name + "RouterConfig(" + endHsp + "),\n")
         dependenciesKey.forEach((item, index) => {
             if (item.indexOf(name.toLowerCase()) != -1) {
-                //证明是包含的
                 importAppConfig = importAppConfig + "\nimport { " + name +
                     "RouterConfig } from '" + item + "';\n"
             }
@@ -482,4 +479,13 @@ function replaceCharUsingSubstring(str: string, index: number, newChar: string)
         return str;
     }
     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;
 }