@hadss/hmrouter-plugin 1.2.1 → 1.2.2

package/README.md

@@ -21,7 +21,7 @@ HMRouter编译插件是一个基于hvigor的编译插件，用于：
 ```json5
 {
   "dependencies": {
-    "@hadss/hmrouter-plugin": "^1.2.1"  // 使用最新版本
+    "@hadss/hmrouter-plugin": "^1.2.2"  // 使用最新版本
   },
   // ...其余配置
 }
@@ -438,9 +438,13 @@ hvigor 5.7.3及以上
 
 ## 更新日志
 
+### 1.2.2 (2025.10.24)
+
+- [修复系统路由表合并异常的问题](https://gitcode.com/openharmony-sig/ohrouter/issues/215)
+
 ### 1.2.1 (2025.10.20)
 
-- [修复低版本IDE编译错误](https://gitcode.com/openharmony-sig/ohrouter/issues/206)
+- [修复低版本IDE编译错误的问题](https://gitcode.com/openharmony-sig/ohrouter/issues/206)
 
 ### 1.2.0 (2025.09.28)
 

package/dist/HMRouterPluginManager.d.ts

@@ -4,8 +4,9 @@ export declare class HMRouterPluginManager {
     private static instance;
     private controllerMap;
     private moduleNodes;
+    private nodeIgnored;
     private constructor();
     static getInstance(): HMRouterPluginManager;
     registerPlugin(node: HvigorNode, pluginId: string, options: PluginParam): void;
-    addModuleNode(node: HvigorNode): void;
+    addModuleNode(node: HvigorNode, isIgnored: boolean): void;
 }

package/dist/HMRouterPluginManager.js

@@ -9,6 +9,7 @@ class HMRouterPluginManager {
     constructor() {
         this.controllerMap = new Map();
         this.moduleNodes = [];
+        this.nodeIgnored = new Set();
         framework_1.Logger.info('', 'HMRouterPlugin starting...');
         (0, framework_1.registerPluginExtension)(new HMRouterExtension_1.HMRouterDefaultExtension());
         hvigor_1.hvigor.nodesEvaluated(() => {
@@ -16,7 +17,6 @@ class HMRouterPluginManager {
                 if (this.controllerMap.has(node.getNodeName())) {
                     return;
                 }
-                ;
                 node.getAllPluginIds().forEach((pluginId) => {
                     this.registerPlugin(node, pluginId, {});
                 });
@@ -47,7 +47,7 @@ class HMRouterPluginManager {
         if (!moduleContext) {
             throw PluginError_1.PluginError.create(PluginError_1.ErrorCode.ERROR_CONFIG, node.getNodeName(), node.getNodePath());
         }
-        const controller = new framework_1.PluginExecutionController(node, moduleContext, options.extensions);
+        const controller = new framework_1.PluginExecutionController(node, moduleContext, this.nodeIgnored.has(node.getNodeName()), options.extensions);
         this.controllerMap.set(node.getNodeName(), controller);
         if ((0, framework_1.isHspModule)(node)) {
             let packageJsonPath = framework_1.PluginFileUtil.pathResolve(node.getNodePath(), 'oh-package.json5');
@@ -63,12 +63,15 @@ class HMRouterPluginManager {
             framework_1.PluginStore.getInstance().get('hspModuleNames')?.push(packageJson.name);
             framework_1.PluginStore.getInstance().get('hspModulesInfo')?.push({
                 moduleName: node.getNodeName(),
-                packageName: packageJson.name
+                packageName: packageJson.name,
             });
         }
     }
-    addModuleNode(node) {
+    addModuleNode(node, isIgnored) {
         this.moduleNodes.push(node);
+        if (isIgnored) {
+            this.nodeIgnored.add(node.getNodeName());
+        }
     }
 }
 exports.HMRouterPluginManager = HMRouterPluginManager;

package/dist/Index.js

@@ -65,16 +65,17 @@ function appPlugin(options) {
             if (!options) {
                 throw new Error('No options provided');
             }
-            hondleNode(options, node);
+            handleNode(options, node);
         },
     };
 }
 exports.appPlugin = appPlugin;
-function hondleNode(options, node) {
-    node.subNodes(subNode => {
+function handleNode(options, node) {
+    node.subNodes((subNode) => {
+        let isIgnored = false;
         if (options.ignoreModuleNames.includes(subNode.getNodeName())) {
-            return;
+            isIgnored = true;
         }
-        HMRouterPluginManager_1.HMRouterPluginManager.getInstance().addModuleNode(subNode);
+        HMRouterPluginManager_1.HMRouterPluginManager.getInstance().addModuleNode(subNode, isIgnored);
     });
 }

package/dist/framework/core/PluginExecutionController.d.ts

@@ -7,7 +7,7 @@ export declare class PluginExecutionController {
     private readonly taskManager;
     private readonly baseContext;
     private originalBuilderDir?;
-    constructor(node: HvigorNode, moduleContext: OhosModuleContext, moduleExtensions?: PluginExtension[]);
+    constructor(node: HvigorNode, moduleContext: OhosModuleContext, moduleIgnored: boolean, moduleExtensions?: PluginExtension[]);
     start(): void;
     complete(): void;
     private initializeContext;

package/dist/framework/core/PluginExecutionController.js

@@ -7,10 +7,11 @@ const constants_1 = require("../constants");
 const extension_1 = require("../extension");
 const utils_1 = require("../utils");
 class PluginExecutionController {
-    constructor(node, moduleContext, moduleExtensions) {
+    constructor(node, moduleContext, moduleIgnored, moduleExtensions) {
         this.node = node;
         this.moduleContext = moduleContext;
         this.baseContext = this.initializeContext();
+        this.baseContext.moduleIgnored = moduleIgnored;
         this.taskManager = new TaskManager_1.TaskManager(this.baseContext, moduleExtensions);
     }
     start() {

package/dist/framework/extension/context/ExtensionContextImpl.d.ts

@@ -5,6 +5,7 @@ export declare class ExtensionContextImpl implements ExtensionContext {
     node: HvigorNode;
     moduleContext: OhosModuleContext;
     currentTarget?: Target;
+    moduleIgnored?: boolean;
     private moduleScanFilesMaster;
     private templateMetadata;
     private perTargetState;

package/dist/framework/extension/context/Interface.d.ts

@@ -10,6 +10,7 @@ export interface BaseExtensionContext {
     readonly moduleContext: OhosModuleContext;
     readonly currentView: ReadonlyArray<BaseAnalyzeResult>;
     currentTarget?: Target;
+    moduleIgnored?: boolean;
     scanFiles: string[];
 }
 export interface ExtensionContext extends BaseExtensionContext {

package/dist/hmrouter_extension/HMRouterExtension.js

@@ -15,6 +15,10 @@ class HMRouterDefaultExtension extends framework_1.PluginExtension {
         initializer.execute();
     }
     afterAnnotationAnalysis(sourceFile, filePath, context) {
+        if (context.moduleIgnored) {
+            framework_2.Logger.debug(this.name, 'module ignored: annotationAnalysis');
+            return;
+        }
         AnnotationAnalyzerRegistry_1.AnnotationAnalyzerRegistry.getInstance().initialize(context.config.modulePath);
         const analyzers = AnnotationAnalyzerRegistry_1.AnnotationAnalyzerRegistry.getInstance().getAnalyzers();
         for (const analyzer of analyzers) {
@@ -78,6 +82,10 @@ class HMRouterDefaultExtension extends framework_1.PluginExtension {
         }
     }
     afterCodeGeneration(context) {
+        if (context.moduleIgnored) {
+            framework_2.Logger.debug(this.name, 'module ignored: codeGeneration');
+            return;
+        }
         const generator = new processor_1.CodeGenerationProcessor(context);
         generator.execute();
     }
@@ -90,6 +98,10 @@ class HMRouterDefaultExtension extends framework_1.PluginExtension {
         processor.execute();
     }
     afterObfuscationProcess(context) {
+        if (context.moduleIgnored) {
+            framework_2.Logger.debug(this.name, 'module ignored: obfuscationProcess');
+            return;
+        }
         const processor = new processor_1.ObfuscationProcessor(context);
         processor.execute();
     }

package/dist/hmrouter_extension/processor/ConfigUpdateProcessor.d.ts

@@ -1,5 +1,6 @@
 import { HMRouterExtensionContext } from '../HMRouterExtensionContext';
 export declare class ConfigUpdateProcessor {
+    private context;
     private moduleContext;
     private readonly routerMap;
     private readonly nodeName;

package/dist/hmrouter_extension/processor/ConfigUpdateProcessor.js

@@ -5,13 +5,21 @@ const framework_1 = require("../../framework");
 const constants_1 = require("../constants");
 class ConfigUpdateProcessor {
     constructor(context) {
+        this.context = context;
         this.moduleContext = context.moduleContext;
         this.routerMap = context.routerMap;
         this.nodeName = context.node.getNodeName();
     }
     execute() {
         framework_1.Logger.debug(this.nodeName, `Start to update module.json and build profile...`);
-        this.updateModuleJson();
+        const isHar = (0, framework_1.isHarModule)(this.context.node);
+        if (this.context.moduleIgnored && isHar) {
+            framework_1.Logger.info(this.nodeName, `skip update module.json and build profile...`);
+            return;
+        }
+        if (this.routerMap.length > 0 || !isHar) {
+            this.updateModuleJson();
+        }
         this.updateBuildProfile();
     }
     updateModuleJson() {

package/dist/hmrouter_extension/processor/InitializerProcessor.js

@@ -13,6 +13,10 @@ class InitializerProcessor {
         this.context.config = this.initConfig(this.context.node);
         this.context.routerMap = [];
         framework_1.Logger.debug(this.context.node.getNodeName(), `read config finished, config: ${this.context.config}`);
+        if (this.context.moduleIgnored) {
+            framework_1.Logger.debug(this.context.node.getNodeName(), `module ignored: initialize`);
+            return;
+        }
         this.scanFiles();
         framework_1.Logger.debug(this.context.node.getNodeName(), `Scanned ${this.context.scanFiles.length} files ${this.context.scanFiles}`);
     }

package/dist/hmrouter_extension/processor/ObfuscationProcessor.js

@@ -9,6 +9,10 @@ class ObfuscationProcessor {
     }
     execute() {
         framework_1.Logger.debug(this.context.node.getNodeName(), `Start to obfuscation...`);
+        if (!this.context.routerMap || this.context.routerMap.length === 0) {
+            framework_1.Logger.info(this.context.node.getNodeName(), 'Skip generating obfuscation files');
+            return;
+        }
         const buildProfileOpt = this.context.moduleContext?.getBuildProfileOpt();
         if (!this.isEnableObfuscation(buildProfileOpt)) {
             framework_1.Logger.info(this.context.node.getNodeName(), 'This compilation does not turn on code obfuscation, skip hmrouter_obfuscation_rules.txt file generation');
@@ -20,7 +24,10 @@ class ObfuscationProcessor {
     }
     generateObfuscationRuleFile() {
         const obfuscationFilePath = framework_1.PluginFileUtil.pathResolve(this.context.config.modulePath, constants_1.FilePathConstants.OBFUSCATION_FILE_NAME);
-        const routerMap = JSON.parse(framework_1.PluginFileUtil.readFileSync(this.context.config.getRouterMapDir()).toString()).routerMap;
+        let routerMap = [];
+        if (framework_1.PluginFileUtil.exist(this.context.config.getRouterMapDir())) {
+            routerMap = JSON.parse(framework_1.PluginFileUtil.readFileSync(this.context.config.getRouterMapDir()).toString()).routerMap;
+        }
         const obfuscationString = this.buildObfuscatedStrings(routerMap);
         framework_1.PluginFileUtil.ensureFileSync(obfuscationFilePath);
         framework_1.PluginFileUtil.writeFileSync(obfuscationFilePath, obfuscationString);

package/dist/hmrouter_extension/processor/ResourceProcessor.js

@@ -9,6 +9,11 @@ class ResourceProcessProcessor {
     }
     execute() {
         framework_1.Logger.debug(this.context.node.getNodeName(), `Start to copy router map to raw file...`);
+        const isHar = (0, framework_1.isHarModule)(this.context.node);
+        if ((isHar && !this.context.routerMap) || (isHar && this.context.routerMap.length === 0)) {
+            framework_1.Logger.info(this.context.node.getNodeName(), 'Skip copy router map');
+            return;
+        }
         this.copyRouterMapToRawFile();
         this.processHspModuleName();
     }
@@ -16,7 +21,9 @@ class ResourceProcessProcessor {
         let routerMapFilePath = framework_1.PluginFileUtil.pathResolve(this.context.currentTarget?.getBuildTargetOutputPath(), constants_1.FilePathConstants.TEMP_ROUTER_MAP_PATH, this.context.currentTarget?.getTargetName(), constants_1.RouterMapConstants.ROUTER_MAP_NAME);
         let rawFilePath = this.context.config.getRawFilePath();
         framework_1.PluginFileUtil.ensureFileSync(rawFilePath);
-        framework_1.PluginFileUtil.copyFileSync(routerMapFilePath, rawFilePath);
+        if (framework_1.PluginFileUtil.exist(routerMapFilePath)) {
+            framework_1.PluginFileUtil.copyFileSync(routerMapFilePath, rawFilePath);
+        }
         framework_1.Logger.info(this.context.node.getNodeName(), `Copy router map to raw file successfully, filePath: ${rawFilePath}`);
     }
     processHspModuleName() {
@@ -38,7 +45,7 @@ class ResourceProcessProcessor {
         for (const remoteName of remoteHspModuleNames) {
             rawFileRouterMap.hspModulesInfo.push({
                 moduleName: remoteName,
-                packageName: remoteName
+                packageName: remoteName,
             });
         }
         framework_1.PluginFileUtil.writeFileSync(rawFilePath, JSON.stringify(rawFileRouterMap));

package/dist/hmrouter_extension/processor/RouterMapBuildingProcessor.js

@@ -10,10 +10,15 @@ class RouterMapBuildingProcessor {
     }
     execute() {
         framework_1.Logger.debug(this.context.node.getNodeName(), `Start to build router map...`);
-        this.readExistingRouterMap();
         for (const result of this.context.getAnalyzeResults()) {
             this.buildRouterMap(result);
         }
+        const isHar = (0, framework_1.isHarModule)(this.context.node);
+        if ((isHar && !this.context.routerMap) || (isHar && this.context.routerMap.length === 0)) {
+            framework_1.Logger.info(this.context.node.getNodeName(), `Skip generating routerMap`);
+            return;
+        }
+        this.readExistingRouterMap();
         this.generateRouterMapFile();
     }
     buildRouterMap(result) {
@@ -103,7 +108,7 @@ class RouterMapBuildingProcessor {
     readExistingRouterMap() {
         const moduleJsonOpt = this.context.moduleContext.getModuleJsonOpt();
         if (!moduleJsonOpt?.module.routerMap) {
-            framework_1.Logger.debug(this.context.node.getNodeName(), `No routerMap found in the module configuration`);
+            framework_1.Logger.info(this.context.node.getNodeName(), `No routerMap found in the module configuration`);
             return;
         }
         const routerMapFileName = moduleJsonOpt.module.routerMap.split(':')[1];
@@ -113,7 +118,7 @@ class RouterMapBuildingProcessor {
             const systemRouterMap = routerMapObj[constants_1.RouterMapConstants.ROUTER_MAP_KEY];
             if (systemRouterMap && systemRouterMap.length > 0) {
                 this.context.routerMap.unshift(...systemRouterMap);
-                framework_1.Logger.debug(this.context.node.getNodeName(), `System routerMap added to the current routerMap`);
+                framework_1.Logger.info(this.context.node.getNodeName(), `System routerMap added to the current routerMap`);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hadss/hmrouter-plugin",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "HMRouter Compiler Plugin",
   "main": "dist/Index.js",
   "scripts": {
@@ -8,8 +8,8 @@
     "test": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
     "dev": "tsc && node dist/index.js",
     "build": "tsc",
-    "package": "rm -rf ./dist && tsc && npm pack",
-    "release": "rm -rf ./dist && npm i && tsc && npm publish --access public"
+    "package": "rm -rf ./dist && npm i && npx tsc && npm pack",
+    "release": "rm -rf ./dist && npm i && npx tsc && npm publish --access public"
   },
   "keywords": [
     "hmrouter",