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

package/README.md

@@ -438,6 +438,14 @@ hvigor 5.7.3及以上
 
 ## 更新日志
 
+### 1.2.0-beta.1 (2025.07.29)
+
+- 修复相同组件名称冲突的问题
+- 修复默认模版的问题
+- 修复ohosTest编译错误
+- 修复oh-package.json5含注解的编译错误
+- 修复自动混淆问题
+
 ### 1.2.0-beta.0 (2025.06.17)
 
 - 新增插件扩展能力

package/dist/HMRouterPluginManager.js

@@ -49,13 +49,20 @@ class HMRouterPluginManager {
         this.controllerMap.set(node.getNodeName(), controller);
         if ((0, framework_1.isHspModule)(node)) {
             let packageJsonPath = framework_1.PluginFileUtil.pathResolve(node.getNodePath(), 'oh-package.json5');
-            let packageJsonContent = framework_1.PluginFileUtil.readFileSync(packageJsonPath);
-            let packageJson = JSON.parse(packageJsonContent.toString());
+            let packageJson = framework_1.PluginFileUtil.readJson5(packageJsonPath);
             let hspNameArr = framework_1.PluginStore.getInstance().get('hspModuleNames');
             if (!hspNameArr) {
                 framework_1.PluginStore.getInstance().set('hspModuleNames', []);
             }
+            let hspModulesInfo = framework_1.PluginStore.getInstance().get('hspModulesInfo');
+            if (!hspModulesInfo) {
+                framework_1.PluginStore.getInstance().set('hspModulesInfo', []);
+            }
             framework_1.PluginStore.getInstance().get('hspModuleNames')?.push(packageJson.name);
+            framework_1.PluginStore.getInstance().get('hspModulesInfo')?.push({
+                moduleName: node.getNodeName(),
+                packageName: packageJson.name
+            });
         }
     }
     addModuleNode(node) {

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

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

package/dist/framework/core/PluginExecutionController.js

@@ -5,6 +5,7 @@ const TaskManager_1 = require("./TaskManager");
 const TaskStage_1 = require("./TaskStage");
 const constants_1 = require("../constants");
 const extension_1 = require("../extension");
+const utils_1 = require("../utils");
 class PluginExecutionController {
     constructor(node, moduleContext, moduleExtensions) {
         this.extensionContextCache = new Map();
@@ -28,35 +29,141 @@ class PluginExecutionController {
     registerHvigorTasks() {
         this.moduleContext.targets((target) => {
             const targetName = target.getTargetName();
-            this.node.registerTask({
-                name: targetName + constants_1.TaskConstants.PLUGIN_TASK,
-                run: () => {
+            this.taskManager.context.currentTarget = target;
+            this.registerMainPluginTask(targetName);
+            this.registerObfuscationTask(targetName);
+            if ((0, utils_1.isHapModule)(this.node) || (0, utils_1.isHspModule)(this.node)) {
+                this.registerCopyRouterMapTask(targetName);
+            }
+        });
+    }
+    filterScanFilesForTarget() {
+        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 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) => {
+            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`;
+    }
+    registerMainPluginTask(targetName) {
+        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);
-                },
-                dependencies: [],
-                postDependencies: [targetName + constants_1.TaskConstants.PRE_BUILD],
-            });
-            this.node.registerTask({
-                name: targetName + constants_1.TaskConstants.GENERATE_OBFUSCATION_TASK,
-                run: () => {
+                }
+                finally {
+                    this.restoreConfig();
+                    this.restoreScanFiles(scanFilesBackup);
+                }
+            },
+            dependencies: [],
+            postDependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PRE_BUILD)],
+        });
+    }
+    registerObfuscationTask(targetName) {
+        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);
-                },
-                dependencies: [targetName + constants_1.TaskConstants.PLUGIN_TASK],
-                postDependencies: [targetName + constants_1.TaskConstants.PRE_BUILD],
-            });
-            this.node.registerTask({
-                name: targetName + constants_1.TaskConstants.COPY_ROUTER_MAP_TASK,
-                run: () => {
-                    this.taskManager.context.currentTarget = target;
+                }
+                finally {
+                    this.restoreConfig();
+                    this.restoreScanFiles(scanFilesBackup);
+                }
+            },
+            dependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PLUGIN_TASK)],
+            postDependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PRE_BUILD)],
+        });
+    }
+    registerCopyRouterMapTask(targetName) {
+        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);
-                },
-                dependencies: [targetName + constants_1.TaskConstants.PROCESS_ROUTER_MAP],
-                postDependencies: [targetName + constants_1.TaskConstants.PROCESS_RESOURCE],
-            });
+                }
+                finally {
+                    this.restoreConfig();
+                    this.restoreScanFiles(scanFilesBackup);
+                }
+            },
+            dependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PROCESS_ROUTER_MAP)],
+            postDependencies: [this.getTaskName(targetName, constants_1.TaskConstants.PROCESS_RESOURCE)],
         });
     }
+    getTaskName(targetName, taskConstant) {
+        return targetName + taskConstant;
+    }
 }
 exports.PluginExecutionController = PluginExecutionController;

package/dist/framework/utils/FileUtil.d.ts

@@ -3,6 +3,7 @@
 import { FileUtil } from '@ohos/hvigor';
 import fs from 'fs';
 export declare class PluginFileUtil extends FileUtil {
+    static readonly sep: "\\" | "/";
     static rmSync(path: fs.PathLike, options?: fs.RmOptions): void;
     static unlinkSync(path: fs.PathLike): void;
     static readdirSync(path: fs.PathLike, options?: {
@@ -10,4 +11,7 @@ export declare class PluginFileUtil extends FileUtil {
         withFileTypes?: false | undefined;
         recursive?: boolean | undefined;
     }): string[];
+    static normalize(filePath: string): string;
+    static resolve(...paths: string[]): string;
+    static join(...paths: string[]): string;
 }

package/dist/framework/utils/FileUtil.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginFileUtil = void 0;
 const hvigor_1 = require("@ohos/hvigor");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 class PluginFileUtil extends hvigor_1.FileUtil {
     static rmSync(path, options) {
         return fs_1.default.rmSync(path, options);
@@ -16,5 +17,15 @@ class PluginFileUtil extends hvigor_1.FileUtil {
     static readdirSync(path, options) {
         return fs_1.default.readdirSync(path, options);
     }
+    static normalize(filePath) {
+        return path_1.default.normalize(filePath);
+    }
+    static resolve(...paths) {
+        return path_1.default.resolve(...paths);
+    }
+    static join(...paths) {
+        return path_1.default.join(...paths);
+    }
 }
 exports.PluginFileUtil = PluginFileUtil;
+PluginFileUtil.sep = path_1.default.sep;

package/dist/hmrouter_extension/config/HMRouterPluginConfig.js

@@ -48,11 +48,10 @@ class HMRouterPluginConfig {
         return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.RAWFILE_DIR);
     }
     getDefaultTplFilePath() {
-        let templateFilePath = framework_1.PluginFileUtil.pathResolve(this.configDir, this.defaultPageTemplate);
-        if (framework_1.PluginFileUtil.exist(templateFilePath)) {
-            return templateFilePath;
+        if (path_1.default.isAbsolute(this.defaultPageTemplate) && framework_1.PluginFileUtil.exist(this.defaultPageTemplate)) {
+            return this.defaultPageTemplate;
         }
-        return framework_1.PluginFileUtil.pathResolve(__dirname, constants_1.FilePathConstants.PARENT_DELIMITER.repeat(3) + this.defaultPageTemplate);
+        return framework_1.PluginFileUtil.pathResolve(__dirname, constants_1.FilePathConstants.PARENT_DELIMITER.repeat(3) + constants_1.TemplateConstants.VIEW_BUILDER_TEMPLATE);
     }
     getObfuscationFilePath() {
         return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.OBFUSCATION_FILE_NAME);

package/dist/hmrouter_extension/processor/CodeGenerationProcessor.js

@@ -33,7 +33,8 @@ class CodeGenerationProcessor {
         tempFilePath = this.determineTemplatePath(result, tempFilePath);
         const generatedFilePath = this.generateFile(templateModel, tempFilePath);
         framework_1.Logger.info(this.context.node.getNodeName(), `Builder ${templateModel.generatorViewName}.ets has been generated in ${generatedFilePath}`);
-        this.context.generatedPaths.set(result.name, generatedFilePath);
+        const uniqueKey = `${result.name}#${result.pageUrl}`;
+        this.context.generatedPaths.set(uniqueKey, generatedFilePath);
     }
     matchedPath(filePath, customPageTemplate, defaultTplFilePath) {
         for (const template of customPageTemplate) {

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

@@ -9,6 +9,7 @@ export declare class InitializerProcessor {
     private readConfigFile;
     private readProjectConfig;
     private readModuleConfig;
+    private resolveConfigPaths;
     private mergeConfigs;
     private setupAppContext;
     private createConfigInstance;

package/dist/hmrouter_extension/processor/InitializerProcessor.js

@@ -52,12 +52,27 @@ class InitializerProcessor {
         return configParam;
     }
     readProjectConfig() {
-        const projectConfigFilePath = framework_1.PluginFileUtil.pathResolve(framework_1.PluginStore.getInstance().get('projectFilePath'), constants_1.FilePathConstants.CONFIG_FILE_NAME);
-        return this.readConfigFile(projectConfigFilePath);
+        const projectPath = framework_1.PluginStore.getInstance().get('projectFilePath');
+        const projectConfigFilePath = framework_1.PluginFileUtil.pathResolve(projectPath, constants_1.FilePathConstants.CONFIG_FILE_NAME);
+        const configParam = this.readConfigFile(projectConfigFilePath);
+        return this.resolveConfigPaths(configParam, projectPath);
     }
     readModuleConfig(node) {
-        const moduleConfigFilePath = framework_1.PluginFileUtil.pathResolve(node.getNodePath(), constants_1.FilePathConstants.CONFIG_FILE_NAME);
-        return this.readConfigFile(moduleConfigFilePath);
+        const modulePath = node.getNodePath();
+        const moduleConfigFilePath = framework_1.PluginFileUtil.pathResolve(modulePath, constants_1.FilePathConstants.CONFIG_FILE_NAME);
+        const configParam = this.readConfigFile(moduleConfigFilePath);
+        return this.resolveConfigPaths(configParam, modulePath);
+    }
+    resolveConfigPaths(configParam, basePath) {
+        if (configParam.defaultPageTemplate) {
+            configParam.defaultPageTemplate = framework_1.PluginFileUtil.pathResolve(basePath, configParam.defaultPageTemplate);
+        }
+        if (configParam.customPageTemplate) {
+            configParam.customPageTemplate.forEach((item) => {
+                item.templatePath = framework_1.PluginFileUtil.pathResolve(basePath, item.templatePath);
+            });
+        }
+        return configParam;
     }
     mergeConfigs(projectConfigParam, moduleConfigParam) {
         const defaultConfig = {
@@ -90,7 +105,16 @@ class InitializerProcessor {
             let packageJson = framework_1.PluginFileUtil.readJson5(framework_1.PluginFileUtil.pathResolve(node.getNodePath(), constants_1.FilePathConstants.OH_PACKAGE_FILE_NAME));
             nodeName = packageJson.name;
         }
-        return new HMRouterPluginConfig_1.HMRouterPluginConfig(nodeName, modulePath, modulePath, configParam);
+        let configDir = modulePath;
+        const moduleConfigPath = framework_1.PluginFileUtil.pathResolve(modulePath, constants_1.FilePathConstants.CONFIG_FILE_NAME);
+        const projectConfigPath = framework_1.PluginFileUtil.pathResolve(framework_1.PluginStore.getInstance().get('projectFilePath'), constants_1.FilePathConstants.CONFIG_FILE_NAME);
+        if (framework_1.PluginFileUtil.exist(moduleConfigPath)) {
+            configDir = modulePath;
+        }
+        else if (framework_1.PluginFileUtil.exist(projectConfigPath)) {
+            configDir = framework_1.PluginStore.getInstance().get('projectFilePath');
+        }
+        return new HMRouterPluginConfig_1.HMRouterPluginConfig(nodeName, modulePath, configDir, configParam);
     }
 }
 exports.InitializerProcessor = InitializerProcessor;

package/dist/hmrouter_extension/processor/ObfuscationProcessor.js

@@ -86,7 +86,7 @@ class ObfuscationProcessor {
                 return routerInfo.name.includes('__');
             })
                 .map((routerInfo) => {
-                return routerInfo.customData.className;
+                return routerInfo.customData.name;
             })),
         ];
         let functionName = [

package/dist/hmrouter_extension/processor/ResourceProcessor.js

@@ -27,6 +27,20 @@ class ResourceProcessProcessor {
         let rawFileRouterMap = JSON.parse(framework_1.PluginFileUtil.readFileSync(rawFilePath).toString());
         rawFileRouterMap.hspModuleNames = [...new Set(framework_1.PluginStore.getInstance().get('hspModuleNames'))];
         rawFileRouterMap.hspModuleNames.push(...this.getRemoteHspModuleNames(this.context.node.getAllPluginIds()));
+        let hspModulesInfo = framework_1.PluginStore.getInstance().get('hspModulesInfo');
+        if (hspModulesInfo && hspModulesInfo.length > 0) {
+            rawFileRouterMap.hspModulesInfo = hspModulesInfo;
+        }
+        else {
+            rawFileRouterMap.hspModulesInfo = [];
+        }
+        let remoteHspModuleNames = this.getRemoteHspModuleNames(this.context.node.getAllPluginIds());
+        for (const remoteName of remoteHspModuleNames) {
+            rawFileRouterMap.hspModulesInfo.push({
+                moduleName: remoteName,
+                packageName: remoteName
+            });
+        }
         framework_1.PluginFileUtil.writeFileSync(rawFilePath, JSON.stringify(rawFileRouterMap));
     }
     getRemoteHspModuleNames(pluginIds) {

package/dist/hmrouter_extension/processor/RouterMapBuildingProcessor.js

@@ -25,7 +25,8 @@ class RouterMapBuildingProcessor {
             .replaceAll(constants_1.FilePathConstants.FILE_SEPARATOR, constants_1.FilePathConstants.DELIMITER);
         if (result.annotation === constants_1.AnnotationConstants.ROUTER_ANNOTATION) {
             let pageUrl = result.pageUrl;
-            let builderPath = this.context.generatedPaths.get(result.name) || '';
+            let uniqueKey = `${result.name}#${pageUrl}`;
+            let builderPath = this.context.generatedPaths.get(uniqueKey) || '';
             this.context.routerMap.push({
                 name: pageUrl,
                 pageSourceFile: builderPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hadss/hmrouter-plugin",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.2",
   "description": "HMRouter Compiler Plugin",
   "main": "dist/Index.js",
   "scripts": {

package/dist/HMRouterAnalyzer.d.ts

@@ -1,31 +0,0 @@
-import { AnalyzerResultLike } from './common/PluginModel';
-import { HMRouterPluginConfig } from './HMRouterPluginConfig';
-export declare class AnalyzerController {
-    private analyzeResult;
-    analyzeFile(sourceFilePath: string, config: HMRouterPluginConfig): void;
-    parseConstants(): void;
-    private parsePropertyValue;
-    getAnalyzeResultSet(): Set<AnalyzerResultLike>;
-    clearAnalyzeResultSet(): void;
-}
-export declare class AnalyzerService {
-    private readonly sourceFilePath;
-    private sourceFile;
-    private config;
-    private analyzerResultSet;
-    private importMap;
-    constructor(sourceFilePath: string, config: HMRouterPluginConfig);
-    start(): void;
-    getResult(): Set<AnalyzerResultLike>;
-    private analyzeImport;
-    private analyzeRouter;
-    private parseFileByLineOrder;
-    private analyzeComponent;
-    private addToResultSet;
-    private parseDecorator;
-    private parseDecoratorArguments;
-    private parseIdentifierPropertyValue;
-    private parsePrimitiveValue;
-    private getVariableFilePath;
-    private getOtherModuleVariableFilePath;
-}