@hadss/hmrouter-plugin 1.2.0-beta.2 → 1.2.0-rc.0

package/README.md

@@ -21,7 +21,7 @@ HMRouter编译插件是一个基于hvigor的编译插件，用于：
 ```json5
 {
   "dependencies": {
-    "@hadss/hmrouter-plugin": "^1.2.0-beta.0"  // 使用最新版本
+    "@hadss/hmrouter-plugin": "^1.2.0-rc.0"  // 使用最新版本
   },
   // ...其余配置
 }
@@ -438,6 +438,10 @@ hvigor 5.7.3及以上
 
 ## 更新日志
 
+### 1.2.0-rc.0 (2025.09.02)
+
+- [修复多target工程下编译app的问题](https://gitcode.com/openharmony-sig/ohrouter/issues/131)
+
 ### 1.2.0-beta.1 (2025.07.29)
 
 - 修复相同组件名称冲突的问题

package/dist/framework/constants/TaskConstants.d.ts

@@ -5,4 +5,5 @@ export declare class TaskConstants {
     static readonly PLUGIN_TASK = "@HMRouterPluginTask";
     static readonly COPY_ROUTER_MAP_TASK = "@HMRouterCopyRouterMapToRawFileTask";
     static readonly GENERATE_OBFUSCATION_TASK = "@HMRouterGenerateObfuscationFileTask";
+    static readonly DEFAULT_SOURCE_ROOT = "./src/main";
 }

package/dist/framework/constants/TaskConstants.js

@@ -10,3 +10,4 @@ TaskConstants.PROCESS_RESOURCE = '@ProcessResource';
 TaskConstants.PLUGIN_TASK = '@HMRouterPluginTask';
 TaskConstants.COPY_ROUTER_MAP_TASK = '@HMRouterCopyRouterMapToRawFileTask';
 TaskConstants.GENERATE_OBFUSCATION_TASK = '@HMRouterGenerateObfuscationFileTask';
+TaskConstants.DEFAULT_SOURCE_ROOT = './src/main';

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

@@ -6,7 +6,6 @@ export declare class PluginExecutionController {
     private readonly moduleContext;
     private readonly taskManager;
     private readonly baseContext;
-    private extensionContextCache;
     private originalBuilderDir?;
     constructor(node: HvigorNode, moduleContext: OhosModuleContext, moduleExtensions?: PluginExtension[]);
     start(): void;
@@ -14,11 +13,7 @@ export declare class PluginExecutionController {
     private initializeContext;
     private registerHvigorTasks;
     private filterScanFilesForTarget;
-    private backupScanFiles;
-    private restoreScanFiles;
-    private backupConfig;
-    private restoreConfig;
-    private adjustConfigForTarget;
+    private getAbsoluteSourceRoots;
     private registerMainPluginTask;
     private registerObfuscationTask;
     private registerCopyRouterMapTask;

package/dist/framework/core/PluginExecutionController.js

@@ -8,7 +8,6 @@ const extension_1 = require("../extension");
 const utils_1 = require("../utils");
 class PluginExecutionController {
     constructor(node, moduleContext, moduleExtensions) {
-        this.extensionContextCache = new Map();
         this.node = node;
         this.moduleContext = moduleContext;
         this.baseContext = this.initializeContext();
@@ -29,94 +28,54 @@ class PluginExecutionController {
     registerHvigorTasks() {
         this.moduleContext.targets((target) => {
             const targetName = target.getTargetName();
-            this.taskManager.context.currentTarget = target;
-            this.registerMainPluginTask(targetName);
+            this.registerMainPluginTask(target);
             this.registerObfuscationTask(targetName);
             if ((0, utils_1.isHapModule)(this.node) || (0, utils_1.isHspModule)(this.node)) {
-                this.registerCopyRouterMapTask(targetName);
+                this.registerCopyRouterMapTask(target);
             }
         });
     }
-    filterScanFilesForTarget() {
-        const currentTargetName = this.taskManager.context.currentTarget?.getTargetName();
-        if (!currentTargetName) {
-            return;
-        }
+    filterScanFilesForTarget(currentTargetName) {
         const buildProfileTargets = this.moduleContext.getBuildProfileOpt().targets || [];
         const targetOpt = buildProfileTargets.find((target) => target.name === currentTargetName);
+        let absoluteSourceRoots;
         if (!targetOpt?.source?.sourceRoots || targetOpt.source.sourceRoots.length === 0) {
-            return;
+            absoluteSourceRoots = this.getAbsoluteSourceRoots([constants_1.TaskConstants.DEFAULT_SOURCE_ROOT]);
         }
-        const moduleRoot = this.moduleContext.getModulePath();
-        const absoluteSourceRoots = targetOpt.source.sourceRoots.map((sourceRoot) => {
-            const absolutePath = utils_1.PluginFileUtil.resolve(moduleRoot, sourceRoot);
-            const normalizedPath = utils_1.PluginFileUtil.normalize(absolutePath);
-            return normalizedPath.endsWith(utils_1.PluginFileUtil.sep) ? normalizedPath : normalizedPath + utils_1.PluginFileUtil.sep;
-        });
-        this.baseContext.scanFiles = this.baseContext.scanFiles.filter((filePath) => {
+        else {
+            if (!targetOpt.source.sourceRoots.find((value) => value === constants_1.TaskConstants.DEFAULT_SOURCE_ROOT)) {
+                targetOpt.source.sourceRoots.push(constants_1.TaskConstants.DEFAULT_SOURCE_ROOT);
+            }
+            absoluteSourceRoots = this.getAbsoluteSourceRoots(targetOpt.source.sourceRoots);
+        }
+        const masterFiles = this.baseContext.getModuleScanFiles();
+        return masterFiles.filter((filePath) => {
             const normalizedFilePath = utils_1.PluginFileUtil.normalize(filePath);
             return absoluteSourceRoots.some((sourceRootPath) => {
                 return normalizedFilePath.startsWith(sourceRootPath);
             });
         });
     }
-    backupScanFiles() {
-        return [...this.baseContext.scanFiles];
-    }
-    restoreScanFiles(backup) {
-        this.baseContext.scanFiles = backup;
-    }
-    backupConfig() {
-        const hmrouterContext = this.taskManager.context;
-        if (hmrouterContext.config && hmrouterContext.config.builderDir) {
-            this.originalBuilderDir = hmrouterContext.config.builderDir;
-        }
-    }
-    restoreConfig() {
-        if (this.originalBuilderDir) {
-            const hmrouterContext = this.taskManager.context;
-            if (hmrouterContext.config) {
-                hmrouterContext.config.builderDir = this.originalBuilderDir;
-            }
-            this.originalBuilderDir = undefined;
-        }
-    }
-    adjustConfigForTarget() {
-        const currentTargetName = this.taskManager.context.currentTarget?.getTargetName();
-        if (!currentTargetName) {
-            return;
-        }
-        const buildProfileTargets = this.moduleContext.getBuildProfileOpt().targets || [];
-        const targetOpt = buildProfileTargets.find((target) => target.name === currentTargetName);
-        if (!targetOpt?.source?.sourceRoots || targetOpt.source.sourceRoots.length === 0) {
-            return;
-        }
-        const hmrouterContext = this.taskManager.context;
-        if (!hmrouterContext.config || !hmrouterContext.config.builderDir) {
-            return;
-        }
-        const firstSourceRoot = targetOpt.source.sourceRoots[0];
-        const cleanSourceRoot = firstSourceRoot.replace(/^\.\//, '');
-        hmrouterContext.config.builderDir = `${cleanSourceRoot}/ets/generated`;
+    getAbsoluteSourceRoots(sourceRoots) {
+        const moduleRoot = this.moduleContext.getModulePath();
+        return sourceRoots.map((sourceRoot) => {
+            const absolutePath = utils_1.PluginFileUtil.resolve(moduleRoot, sourceRoot);
+            const normalizedPath = utils_1.PluginFileUtil.normalize(absolutePath);
+            return normalizedPath.endsWith(utils_1.PluginFileUtil.sep) ? normalizedPath : normalizedPath + utils_1.PluginFileUtil.sep;
+        });
     }
-    registerMainPluginTask(targetName) {
+    registerMainPluginTask(target) {
+        const targetName = target.getTargetName();
         this.node.registerTask({
             name: this.getTaskName(targetName, constants_1.TaskConstants.PLUGIN_TASK),
             run: () => {
-                const scanFilesBackup = this.backupScanFiles();
-                try {
-                    this.backupConfig();
-                    this.filterScanFilesForTarget();
-                    this.adjustConfigForTarget();
-                    this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_ANNOTATION_ANALYSIS);
-                    this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_CODE_GENERATION);
-                    this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_ROUTER_MAP_BUILDING);
-                    this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_CONFIG_UPDATE);
-                }
-                finally {
-                    this.restoreConfig();
-                    this.restoreScanFiles(scanFilesBackup);
-                }
+                this.taskManager.context.currentTarget = target;
+                const filtered = this.filterScanFilesForTarget(targetName);
+                this.baseContext.scanFiles = filtered;
+                this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_ANNOTATION_ANALYSIS);
+                this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_CODE_GENERATION);
+                this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_ROUTER_MAP_BUILDING);
+                this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_CONFIG_UPDATE);
             },
             dependencies: [],
             postDependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PRE_BUILD)],
@@ -126,37 +85,19 @@ class PluginExecutionController {
         this.node.registerTask({
             name: this.getTaskName(targetName, constants_1.TaskConstants.GENERATE_OBFUSCATION_TASK),
             run: () => {
-                const scanFilesBackup = this.backupScanFiles();
-                try {
-                    this.backupConfig();
-                    this.filterScanFilesForTarget();
-                    this.adjustConfigForTarget();
-                    this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_OBFUSCATION_PROCESS);
-                }
-                finally {
-                    this.restoreConfig();
-                    this.restoreScanFiles(scanFilesBackup);
-                }
+                this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_OBFUSCATION_PROCESS);
             },
             dependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PLUGIN_TASK)],
             postDependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PRE_BUILD)],
         });
     }
-    registerCopyRouterMapTask(targetName) {
+    registerCopyRouterMapTask(target) {
+        const targetName = target.getTargetName();
         this.node.registerTask({
             name: this.getTaskName(targetName, constants_1.TaskConstants.COPY_ROUTER_MAP_TASK),
             run: () => {
-                const scanFilesBackup = this.backupScanFiles();
-                try {
-                    this.backupConfig();
-                    this.filterScanFilesForTarget();
-                    this.adjustConfigForTarget();
-                    this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_RESOURCE_PROCESS);
-                }
-                finally {
-                    this.restoreConfig();
-                    this.restoreScanFiles(scanFilesBackup);
-                }
+                this.taskManager.context.currentTarget = target;
+                this.taskManager.executeStage(TaskStage_1.TaskStage.AFTER_RESOURCE_PROCESS);
             },
             dependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PROCESS_ROUTER_MAP)],
             postDependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PROCESS_RESOURCE)],

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

@@ -5,12 +5,13 @@ export declare class ExtensionContextImpl implements ExtensionContext {
     node: HvigorNode;
     moduleContext: OhosModuleContext;
     currentTarget?: Target;
-    scanFiles: string[];
+    private moduleScanFilesMaster;
     private templateMetadata;
-    private analyzeResults;
-    private _currentView;
-    private _currentFilePath?;
+    private perTargetState;
     constructor(node: HvigorNode, moduleContext: OhosModuleContext);
+    private getActiveTargetKey;
+    private getOrCreateState;
+    getModuleScanFiles(): string[];
     get currentView(): ReadonlyArray<BaseAnalyzeResult>;
     addAnalyzeResults(results: BaseAnalyzeResult | BaseAnalyzeResult[]): void;
     getAnalyzeResults<T extends BaseAnalyzeResult = BaseAnalyzeResult>(): Set<T>;
@@ -20,4 +21,16 @@ export declare class ExtensionContextImpl implements ExtensionContext {
     private validateAnalyzeResult;
     private syncToCurrentView;
     setCurrentFilePath(filePath: string): void;
+    get scanFiles(): string[];
+    set scanFiles(files: string[]);
+    get analyzeResults(): Set<BaseAnalyzeResult>;
+    set analyzeResults(v: Set<BaseAnalyzeResult>);
+    get _currentView(): BaseAnalyzeResult[];
+    set _currentView(v: BaseAnalyzeResult[]);
+    get _currentFilePath(): string | undefined;
+    set _currentFilePath(v: string | undefined);
+    get routerMap(): any[];
+    set routerMap(v: any[]);
+    get generatedPaths(): Map<string, string>;
+    set generatedPaths(v: Map<string, string>);
 }

package/dist/framework/extension/context/ExtensionContextImpl.js

@@ -5,24 +5,47 @@ const TemplateMetadataImpl_1 = require("./TemplateMetadataImpl");
 const utils_1 = require("../../utils");
 class ExtensionContextImpl {
     constructor(node, moduleContext) {
-        this.scanFiles = [];
-        this.analyzeResults = new Set();
-        this._currentView = [];
+        this.moduleScanFilesMaster = [];
+        this.perTargetState = new Map();
         this.node = node;
         this.moduleContext = moduleContext;
         this.templateMetadata = new TemplateMetadataImpl_1.TemplateMetadataImpl();
     }
+    getActiveTargetKey() {
+        return this.currentTarget?.getTargetName() ?? '__global__';
+    }
+    getOrCreateState(key) {
+        let state = this.perTargetState.get(key);
+        if (!state) {
+            state = {
+                scanFiles: [],
+                analyzeResults: new Set(),
+                currentView: [],
+                currentFilePath: undefined,
+                routerMap: [],
+                generatedPaths: new Map(),
+            };
+            this.perTargetState.set(key, state);
+        }
+        return state;
+    }
+    getModuleScanFiles() {
+        return this.moduleScanFilesMaster;
+    }
     get currentView() {
-        return this._currentView;
+        const key = this.getActiveTargetKey();
+        return this.getOrCreateState(key).currentView;
     }
     addAnalyzeResults(results) {
+        const key = this.getActiveTargetKey();
+        const state = this.getOrCreateState(key);
         if (Array.isArray(results)) {
             results.forEach((result) => {
                 if (!this.validateAnalyzeResult(result)) {
                     utils_1.Logger.warn(this.node.getNodeName(), `Invalid analyze result: ${JSON.stringify(result)}`);
                     return;
                 }
-                this.analyzeResults.add(result);
+                state.analyzeResults.add(result);
             });
         }
         else {
@@ -30,12 +53,13 @@ class ExtensionContextImpl {
                 utils_1.Logger.warn(this.node.getNodeName(), `Invalid analyze result: ${JSON.stringify(results)}`);
                 return;
             }
-            this.analyzeResults.add(results);
+            state.analyzeResults.add(results);
         }
         this.syncToCurrentView(results);
     }
     getAnalyzeResults() {
-        return this.analyzeResults;
+        const key = this.getActiveTargetKey();
+        return this.getOrCreateState(key).analyzeResults;
     }
     getTemplateData(componentName) {
         return this.templateMetadata.getTemplateData(componentName);
@@ -50,15 +74,75 @@ class ExtensionContextImpl {
         return result.name !== undefined && result.sourceFilePath !== undefined && result.annotation !== undefined;
     }
     syncToCurrentView(results) {
-        if (!this._currentFilePath)
+        const key = this.getActiveTargetKey();
+        const state = this.getOrCreateState(key);
+        if (!state.currentFilePath)
             return;
         const resultsArray = Array.isArray(results) ? results : [results];
-        const currentFileResults = resultsArray.filter(result => result.sourceFilePath === this._currentFilePath);
-        this._currentView.push(...currentFileResults);
+        const currentFileResults = resultsArray.filter(result => result.sourceFilePath === state.currentFilePath);
+        state.currentView.push(...currentFileResults);
     }
     setCurrentFilePath(filePath) {
-        this._currentFilePath = filePath;
-        this._currentView = [];
+        const key = this.getActiveTargetKey();
+        const state = this.getOrCreateState(key);
+        state.currentFilePath = filePath;
+        state.currentView = [];
+    }
+    get scanFiles() {
+        const key = this.getActiveTargetKey();
+        if (key === '__global__') {
+            return this.moduleScanFilesMaster;
+        }
+        return this.getOrCreateState(key).scanFiles;
+    }
+    set scanFiles(files) {
+        const key = this.getActiveTargetKey();
+        if (key === '__global__') {
+            this.moduleScanFilesMaster = files;
+        }
+        else {
+            this.getOrCreateState(key).scanFiles = files;
+        }
+    }
+    get analyzeResults() {
+        const key = this.getActiveTargetKey();
+        return this.getOrCreateState(key).analyzeResults;
+    }
+    set analyzeResults(v) {
+        const key = this.getActiveTargetKey();
+        this.getOrCreateState(key).analyzeResults = v;
+    }
+    get _currentView() {
+        const key = this.getActiveTargetKey();
+        return this.getOrCreateState(key).currentView;
+    }
+    set _currentView(v) {
+        const key = this.getActiveTargetKey();
+        this.getOrCreateState(key).currentView = v;
+    }
+    get _currentFilePath() {
+        const key = this.getActiveTargetKey();
+        return this.getOrCreateState(key).currentFilePath;
+    }
+    set _currentFilePath(v) {
+        const key = this.getActiveTargetKey();
+        this.getOrCreateState(key).currentFilePath = v;
+    }
+    get routerMap() {
+        const key = this.getActiveTargetKey();
+        return this.getOrCreateState(key).routerMap;
+    }
+    set routerMap(v) {
+        const key = this.getActiveTargetKey();
+        this.getOrCreateState(key).routerMap = v;
+    }
+    get generatedPaths() {
+        const key = this.getActiveTargetKey();
+        return this.getOrCreateState(key).generatedPaths;
+    }
+    set generatedPaths(v) {
+        const key = this.getActiveTargetKey();
+        this.getOrCreateState(key).generatedPaths = v;
     }
 }
 exports.ExtensionContextImpl = ExtensionContextImpl;

package/package.json

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