@hadss/hmrouter-plugin 1.2.3-rc.1 → 1.2.3

package/dist/hmrouter_extension/config/HMRouterPluginConfig.d.ts

@@ -1,27 +1,32 @@
+import { HMRouterResult } from '../model';
 export declare class HMRouterPluginConfig {
     moduleName: string;
     modulePath: string;
     configDir: string;
     scanDir: string[];
+    commonScanFullDir: string;
     routerMapDir: string;
     builderDir: string;
     defaultPageTemplate: string;
     customPageTemplate: CustomPageTemplateImpl[];
     saveGeneratedFile: boolean;
     autoObfuscation: boolean;
+    incremental: boolean;
     constructor(moduleName: string, modulePath: string, configDir: string, param: HMRouterPluginConfigParam);
     getScanPath(dir: string): string;
     getRelativeSourcePath(filePath: string): string;
-    getRelativeBuilderPath(filePath: string): string;
-    getGeneratedFilePath(generatorViewName: string): string;
-    getBuilderDir(): string;
-    getBuilderFilePath(generatorViewName: string): string;
-    getRouterMapDir(): string;
+    getRelativeShortSourcePath(analyzeResult: HMRouterResult): string;
+    getRelativeBuilderPath(filePath: string, relativeShortPath: string): string;
+    getGeneratedFilePath(relativeShortPath: string): string;
+    getBuilderDir(isDetele?: boolean): string;
+    getBuilderFilePath(relativeShortPath: string): string;
+    getRouterMapDir(isDetele?: boolean): string;
+    getDefaultRouterMapDir(): string;
     getModuleRouterMapFilePath(routerMapFileName: string): string;
-    getRawFilePath(): string;
+    getRawFilePath(isDetele?: boolean): string;
     getDefaultTplFilePath(): string;
-    getObfuscationFilePath(): string;
-    getConsumerRulesFilePath(): string;
+    getObfuscationFilePath(isDetele?: boolean): string;
+    getConsumerRulesFilePath(isDetele?: boolean): string;
 }
 export interface HMRouterPluginConfigParam {
     scanDir?: string[];
@@ -31,6 +36,7 @@ export interface HMRouterPluginConfigParam {
     saveGeneratedFile?: boolean;
     defaultPageTemplate?: string;
     customPageTemplate?: CustomPageTemplateImpl[];
+    incremental?: boolean;
 }
 export interface CustomPageTemplateImpl {
     srcPath: string[];

package/dist/hmrouter_extension/config/HMRouterPluginConfig.js

@@ -7,18 +7,32 @@ exports.HMRouterPluginConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const framework_1 = require("../../framework");
 const constants_1 = require("../constants");
+const hvigor_1 = require("@ohos/hvigor");
 class HMRouterPluginConfig {
     constructor(moduleName, modulePath, configDir, param) {
         this.moduleName = moduleName;
         this.modulePath = modulePath;
         this.configDir = configDir;
-        this.scanDir = param.scanDir ? [...new Set(param.scanDir)] : [];
-        this.routerMapDir = param.routerMapDir || '';
-        this.builderDir = param.builderDir || '';
-        this.defaultPageTemplate = param.defaultPageTemplate || '';
-        this.customPageTemplate = param.customPageTemplate || [];
-        this.saveGeneratedFile = !!param.saveGeneratedFile;
-        this.autoObfuscation = !!param.autoObfuscation;
+        this.scanDir = param.scanDir ? [...new Set(param.scanDir)] : [constants_1.FilePathConstants.DEFAULT_SCAN_DIR];
+        const scanFullDir = this.scanDir.map(item => framework_1.PluginFileUtil.pathResolve(modulePath, item));
+        this.commonScanFullDir = framework_1.StringUtil.longestCommonPrefixOpt(scanFullDir);
+        this.routerMapDir = param.routerMapDir ?? constants_1.FilePathConstants.DEFAULT_ROUTER_MAP_DIR;
+        this.builderDir = param.builderDir ?? constants_1.FilePathConstants.DEFAULT_BUILD_DIR;
+        this.defaultPageTemplate = param.defaultPageTemplate ?? constants_1.TemplateConstants.VIEW_BUILDER_TEMPLATE;
+        this.customPageTemplate = param.customPageTemplate ?? [];
+        this.saveGeneratedFile = param.saveGeneratedFile ?? false;
+        this.autoObfuscation = param.autoObfuscation ?? false;
+        const isSupportIncremental = hvigor_1.hvigor.getHvigorVersion?.() !== undefined;
+        if (param.incremental === undefined) {
+            this.incremental = isSupportIncremental && param.builderDir === undefined &&
+                this.customPageTemplate.length === 0 && this.defaultPageTemplate === constants_1.TemplateConstants.VIEW_BUILDER_TEMPLATE;
+        }
+        else if (param.incremental === false) {
+            this.incremental = false;
+        }
+        else {
+            this.incremental = isSupportIncremental;
+        }
     }
     getScanPath(dir) {
         return framework_1.PluginFileUtil.pathResolve(this.modulePath, dir);
@@ -26,26 +40,72 @@ class HMRouterPluginConfig {
     getRelativeSourcePath(filePath) {
         return path_1.default.relative(this.modulePath, filePath);
     }
-    getRelativeBuilderPath(filePath) {
-        return path_1.default.relative(this.builderDir, filePath);
+    getRelativeShortSourcePath(analyzeResult) {
+        if (this.incremental) {
+            const relativeShortPath = path_1.default.relative(this.commonScanFullDir, analyzeResult.sourceFilePath);
+            const ext = path_1.default.extname(relativeShortPath);
+            return relativeShortPath.replace(ext, `${framework_1.StringUtil.stringToHashCode(analyzeResult.name)}${ext}`);
+        }
+        else {
+            return constants_1.PrefixConstants.VIEW_NAME_PREFIX + analyzeResult.name + framework_1.StringUtil.stringToHashCode(analyzeResult.name) + constants_1.FilePathConstants.ETS_SUFFIX;
+        }
     }
-    getGeneratedFilePath(generatorViewName) {
-        return framework_1.PluginFileUtil.pathResolve(this.modulePath, this.builderDir, generatorViewName + constants_1.FilePathConstants.ETS_SUFFIX);
+    getRelativeBuilderPath(filePath, relativeShortPath) {
+        if (this.incremental) {
+            const absoluteFilePath = framework_1.PluginFileUtil.pathResolve(this.modulePath, filePath);
+            const isolatedEtsPath = this.getGeneratedFilePath(relativeShortPath);
+            const relativeBuilderPath = path_1.default.relative(path_1.default.dirname(isolatedEtsPath), absoluteFilePath);
+            return relativeBuilderPath;
+        }
+        else {
+            return path_1.default.relative(this.builderDir, filePath);
+        }
     }
-    getBuilderDir() {
-        return framework_1.PluginFileUtil.pathResolve(this.modulePath, this.builderDir);
+    getGeneratedFilePath(relativeShortPath) {
+        if (this.incremental) {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.ISOLATED_ETS_DIR, relativeShortPath);
+        }
+        else {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, this.builderDir, relativeShortPath);
+        }
     }
-    getBuilderFilePath(generatorViewName) {
-        return path_1.default.join(this.builderDir, generatorViewName + constants_1.FilePathConstants.ETS_SUFFIX);
+    getBuilderDir(isDetele) {
+        if (this.incremental && !isDetele) {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.ISOLATED_ETS_DIR);
+        }
+        else {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, this.builderDir);
+        }
     }
-    getRouterMapDir() {
-        return framework_1.PluginFileUtil.pathResolve(this.modulePath, this.routerMapDir, constants_1.RouterMapConstants.ROUTER_MAP_NAME);
+    getBuilderFilePath(relativeShortPath) {
+        if (this.incremental) {
+            return constants_1.FilePathConstants.ISOLATED_PAGE_SOURCE_PREFIX + constants_1.FilePathConstants.DELIMITER + relativeShortPath;
+        }
+        else {
+            return path_1.default.join(this.builderDir, relativeShortPath);
+        }
+    }
+    getRouterMapDir(isDetele) {
+        if (this.incremental && !isDetele) {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.ISOLATED_PROFILE_DIR, constants_1.RouterMapConstants.ROUTER_MAP_NAME);
+        }
+        else {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, this.routerMapDir, constants_1.RouterMapConstants.ROUTER_MAP_NAME);
+        }
+    }
+    getDefaultRouterMapDir() {
+        return framework_1.PluginFileUtil.pathResolve(this.modulePath, this.routerMapDir);
     }
     getModuleRouterMapFilePath(routerMapFileName) {
         return framework_1.PluginFileUtil.pathResolve(this.modulePath, this.routerMapDir, routerMapFileName + constants_1.FilePathConstants.JSON_SUFFIX);
     }
-    getRawFilePath() {
-        return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.RAWFILE_DIR);
+    getRawFilePath(isDetele) {
+        if (this.incremental && !isDetele) {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.ISOLATED_RAWFILE_DIR);
+        }
+        else {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.RAWFILE_DIR);
+        }
     }
     getDefaultTplFilePath() {
         if (path_1.default.isAbsolute(this.defaultPageTemplate) && framework_1.PluginFileUtil.exist(this.defaultPageTemplate)) {
@@ -53,11 +113,21 @@ class HMRouterPluginConfig {
         }
         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);
+    getObfuscationFilePath(isDetele) {
+        if (this.incremental && !isDetele) {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.ISOLATED_OBFUSCATION_FILE_NAME);
+        }
+        else {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.OBFUSCATION_FILE_NAME);
+        }
     }
-    getConsumerRulesFilePath() {
-        return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.CONSUMER_FILE_NAME);
+    getConsumerRulesFilePath(isDetele) {
+        if (this.incremental && !isDetele) {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.ISOLATED_CONSUMER_FILE_NAME);
+        }
+        else {
+            return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.CONSUMER_FILE_NAME);
+        }
     }
 }
 exports.HMRouterPluginConfig = HMRouterPluginConfig;

package/dist/hmrouter_extension/constants/FilePathConstants.d.ts

@@ -6,6 +6,7 @@ export default class FilePathConstants {
     static readonly TEMP_ROUTER_MAP_PATH = "../../intermediates/router_map";
     static readonly RAWFILE_DIR = "src/main/resources/rawfile/hm_router_map.json";
     static readonly ETS_SUFFIX = ".ets";
+    static readonly D_ETS_SUFFIX = ".d.ets";
     static readonly JSON_SUFFIX = ".json";
     static readonly CONFIG_FILE_NAME = "hmrouter_config.json";
     static readonly PARENT_DELIMITER = "../";
@@ -20,4 +21,13 @@ export default class FilePathConstants {
     static readonly DEFAULT_SCAN_DIR = "src/main/ets";
     static readonly DEFAULT_ROUTER_MAP_DIR = "src/main/resources/base/profile";
     static readonly DEFAULT_BUILD_DIR = "src/main/ets/generated";
+    static readonly ISOLATED_OBFUSCATION_FILE_NAME = "build/hmrouter/hmrouter-obfuscation-rules.txt";
+    static readonly ISOLATED_CONSUMER_FILE_NAME = "build/hmrouter/hmrouter-consumer-rules.txt";
+    static readonly ISOLATED_BUILD_DIR = "build/hmrouter";
+    static readonly ISOLATED_ETS_DIR = "build/hmrouter/ets";
+    static readonly ISOLATED_RESOURCES_DIR = "build/hmrouter/resources";
+    static readonly ISOLATED_PROFILE_DIR = "build/hmrouter/resources/base/profile";
+    static readonly ISOLATED_RAWFILE_DIR = "build/hmrouter/resources/rawfile/hm_router_map.json";
+    static readonly ISOLATED_PAGE_SOURCE_PREFIX = "src/../build/hmrouter/ets";
+    static readonly DEFAULT_RESOURCES_DIR = "./src/main/resources";
 }

package/dist/hmrouter_extension/constants/FilePathConstants.js

@@ -14,6 +14,7 @@ FilePathConstants.DELIMITER = '/';
 FilePathConstants.TEMP_ROUTER_MAP_PATH = '../../intermediates/router_map';
 FilePathConstants.RAWFILE_DIR = 'src/main/resources/rawfile/hm_router_map.json';
 FilePathConstants.ETS_SUFFIX = '.ets';
+FilePathConstants.D_ETS_SUFFIX = '.d.ets';
 FilePathConstants.JSON_SUFFIX = '.json';
 FilePathConstants.CONFIG_FILE_NAME = 'hmrouter_config.json';
 FilePathConstants.PARENT_DELIMITER = '../';
@@ -28,3 +29,12 @@ FilePathConstants.DEFAULT_VALUE = 10;
 FilePathConstants.DEFAULT_SCAN_DIR = 'src/main/ets';
 FilePathConstants.DEFAULT_ROUTER_MAP_DIR = 'src/main/resources/base/profile';
 FilePathConstants.DEFAULT_BUILD_DIR = 'src/main/ets/generated';
+FilePathConstants.ISOLATED_OBFUSCATION_FILE_NAME = 'build/hmrouter/hmrouter-obfuscation-rules.txt';
+FilePathConstants.ISOLATED_CONSUMER_FILE_NAME = 'build/hmrouter/hmrouter-consumer-rules.txt';
+FilePathConstants.ISOLATED_BUILD_DIR = 'build/hmrouter';
+FilePathConstants.ISOLATED_ETS_DIR = 'build/hmrouter/ets';
+FilePathConstants.ISOLATED_RESOURCES_DIR = 'build/hmrouter/resources';
+FilePathConstants.ISOLATED_PROFILE_DIR = 'build/hmrouter/resources/base/profile';
+FilePathConstants.ISOLATED_RAWFILE_DIR = 'build/hmrouter/resources/rawfile/hm_router_map.json';
+FilePathConstants.ISOLATED_PAGE_SOURCE_PREFIX = 'src/../build/hmrouter/ets';
+FilePathConstants.DEFAULT_RESOURCES_DIR = './src/main/resources';

package/dist/hmrouter_extension/constants/PluginConstants.d.ts

@@ -2,6 +2,8 @@ export default class PluginConstants {
     static readonly HAP_PLUGIN_ID = "HAP_HMROUTER_PLUGIN";
     static readonly HSP_PLUGIN_ID = "HSP_HMROUTER_PLUGIN";
     static readonly HAR_PLUGIN_ID = "HAR_HMROUTER_PLUGIN";
+    static readonly PLUGIN_ID = "HMROUTER_PLUGIN";
+    static readonly APP_PLUGIN_ID = "APP_HMROUTER_PLUGIN";
     static readonly HAR_MODULE_NAME = "har";
     static readonly STRUCT_KEYWORD = "struct";
 }

package/dist/hmrouter_extension/constants/PluginConstants.js

@@ -6,5 +6,7 @@ exports.default = PluginConstants;
 PluginConstants.HAP_PLUGIN_ID = 'HAP_HMROUTER_PLUGIN';
 PluginConstants.HSP_PLUGIN_ID = 'HSP_HMROUTER_PLUGIN';
 PluginConstants.HAR_PLUGIN_ID = 'HAR_HMROUTER_PLUGIN';
+PluginConstants.PLUGIN_ID = 'HMROUTER_PLUGIN';
+PluginConstants.APP_PLUGIN_ID = 'APP_HMROUTER_PLUGIN';
 PluginConstants.HAR_MODULE_NAME = 'har';
 PluginConstants.STRUCT_KEYWORD = 'struct';

package/dist/hmrouter_extension/model/HMAnnotationModel.d.ts

@@ -7,6 +7,7 @@ export interface HMRouterResult extends BaseAnalyzeResult {
     animator?: string;
     lifecycle?: string;
     useNavDst?: boolean;
+    templatePath?: string;
 }
 export interface HMAnimatorResult extends BaseAnalyzeResult {
     animatorName: string;

package/dist/hmrouter_extension/model/TemplateModel.d.ts

@@ -4,6 +4,6 @@ export interface TemplateModel {
     importPath: string;
     componentName: string;
     dialog: boolean;
-    generatorViewName: string;
+    relativeShortPath: string;
     isDefaultExport?: boolean;
 }

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

@@ -8,15 +8,7 @@ export declare class CodeGenerationProcessor {
     getCompileSdkVersion(): number;
     getSdkVersion(json5FilePath: string, index: number): number;
     private generatePageFile;
-    private matchedPath;
+    private deleteOtherFile;
     private prepareTemplateModel;
-    private determineTemplatePath;
-    private determineTemplateType;
     private generateFile;
-    private detectLibraryVersion;
-    private detectLibraryVersion2;
-    private extractHMRouterVersion;
-    private getLibraryPossiblePaths;
-    private parseVersion;
-    private compareVersions;
 }

package/dist/hmrouter_extension/processor/CodeGenerationProcessor.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodeGenerationProcessor = void 0;
-const micromatch_1 = __importDefault(require("micromatch"));
 const ejs_1 = __importDefault(require("ejs"));
 const framework_1 = require("../../framework");
 const PluginError_1 = require("../error/PluginError");
@@ -17,7 +16,7 @@ class CodeGenerationProcessor {
     execute() {
         this.sdkVersion = this.getCompileSdkVersion();
         framework_1.Logger.debug(this.context.node.getNodeName(), `Start to code generation...`);
-        this.context.generatedPaths = new Map();
+        const generatedFilePaths = [];
         this.context.getAnalyzeResults().forEach((result) => {
             if (result.annotation === constants_1.AnnotationConstants.ROUTER_ANNOTATION) {
                 if (!result.sourceFilePath) {
@@ -26,9 +25,11 @@ class CodeGenerationProcessor {
                 let pageSourceFile = this.context.config
                     .getRelativeSourcePath(result.sourceFilePath)
                     .replaceAll(constants_1.FilePathConstants.FILE_SEPARATOR, constants_1.FilePathConstants.DELIMITER);
-                this.generatePageFile(result, pageSourceFile, this.matchedPath(pageSourceFile, this.context.config.customPageTemplate, this.context.config.getDefaultTplFilePath()));
+                const generatePageFilePath = this.generatePageFile(result, pageSourceFile);
+                generatedFilePaths.push(generatePageFilePath);
             }
         });
+        this.deleteOtherFile(generatedFilePaths);
     }
     extractVersion(compatibleSdkVersion) {
         if (typeof compatibleSdkVersion === 'number') {
@@ -87,29 +88,36 @@ class CodeGenerationProcessor {
         }
         return constants_1.FilePathConstants.DEFAULT_VALUE;
     }
-    generatePageFile(result, pageSourceFile, tempFilePath) {
+    generatePageFile(result, pageSourceFile) {
         const templateModel = this.prepareTemplateModel(result, pageSourceFile);
-        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}`);
-        const uniqueKey = `${result.name}#${result.pageUrl}`;
-        this.context.generatedPaths.set(uniqueKey, generatedFilePath);
-    }
-    matchedPath(filePath, customPageTemplate, defaultTplFilePath) {
-        for (const template of customPageTemplate) {
-            if (micromatch_1.default.isMatch(filePath, template.srcPath)) {
-                framework_1.Logger.debug(this.context.node.getNodeName(), `${filePath} detected matching template: ${template.templatePath}`);
-                return framework_1.PluginFileUtil.pathResolve(this.context.config.configDir, template.templatePath);
+        const generatedFilePath = this.generateFile(templateModel, result.templatePath ?? '');
+        framework_1.Logger.info(this.context.node.getNodeName(), `Builder ${result.sourceFilePath}.ets has been generated in ${generatedFilePath}`);
+        return generatedFilePath;
+    }
+    deleteOtherFile(generatedFilePaths) {
+        framework_1.Logger.debug(this.context.node.getNodeName(), `Start to delete other file...`);
+        const buildDir = this.context.config.getBuilderDir();
+        if (!framework_1.PluginFileUtil.exist(buildDir)) {
+            framework_1.Logger.debug(this.context.node.getNodeName(), `${buildDir} does not exist`);
+            return;
+        }
+        const files = framework_1.PluginFileUtil.readdirSync(buildDir, { recursive: true, encoding: null });
+        framework_1.Logger.debug(this.context.node.getNodeName(), `Files in ${buildDir}: ${files}`);
+        for (const file of files) {
+            const absoluteFilePath = framework_1.PluginFileUtil.join(buildDir, file);
+            framework_1.Logger.debug(this.context.node.getNodeName(), `Delete other file: ${absoluteFilePath}`);
+            const isExist = generatedFilePaths.findIndex((path) => path.indexOf(absoluteFilePath) >= 0);
+            if (isExist < 0) {
+                framework_1.PluginFileUtil.rmSync(absoluteFilePath);
             }
         }
-        return defaultTplFilePath;
     }
     prepareTemplateModel(analyzeResult, pageSourceFile) {
+        const relativeShortPath = this.context.config.getRelativeShortSourcePath(analyzeResult);
         let importPath = this.context.config
-            .getRelativeBuilderPath(pageSourceFile)
+            .getRelativeBuilderPath(pageSourceFile, relativeShortPath)
             .replaceAll(constants_1.FilePathConstants.FILE_SEPARATOR, constants_1.FilePathConstants.DELIMITER)
             .replaceAll(constants_1.FilePathConstants.ETS_SUFFIX, '');
-        let generatorViewName = constants_1.PrefixConstants.VIEW_NAME_PREFIX + analyzeResult.name + framework_1.StringUtil.stringToHashCode(analyzeResult.pageUrl);
         let templateData = this.context.getTemplateData(analyzeResult.name);
         return {
             sdkVersion: this.sdkVersion,
@@ -118,147 +126,20 @@ class CodeGenerationProcessor {
             dialog: !!analyzeResult.dialog,
             isDefaultExport: !!templateData?.isDefaultExport,
             importPath,
-            generatorViewName,
+            relativeShortPath,
             ...templateData,
         };
     }
-    determineTemplatePath(analyzeResult, defaultTemplatePath) {
-        const libraryVersion = this.detectLibraryVersion();
-        framework_1.Logger.debug(this.context.node.getNodeName(), `Library version: ${libraryVersion}`);
-        if (analyzeResult.useNavDst === true) {
-            return framework_1.PluginFileUtil.pathResolve(__dirname, constants_1.FilePathConstants.PARENT_DELIMITER.repeat(3), constants_1.TemplateConstants.CUSTOM_BUILDER_TEMPLATE);
-        }
-        const templateType = this.determineTemplateType(libraryVersion);
-        if (templateType !== 'latest' && libraryVersion) {
-            framework_1.Logger.warn(this.context.node.getNodeName(), `[HMRouter Version Compatibility] Detected library version ${libraryVersion}, ` +
-                `which is below the minimum recommended version ${constants_1.VersionConstants.HMROUTER_MIN_VERSION_FOR_SDK_API}. ` +
-                `Automatically switched to compatible template (${templateType}). ` +
-                `Please upgrade @hadss/hmrouter to ${constants_1.VersionConstants.HMROUTER_MIN_VERSION_FOR_SDK_API} or higher for full feature support.`);
-        }
-        switch (templateType) {
-            case 'v1':
-                return framework_1.PluginFileUtil.pathResolve(__dirname, constants_1.FilePathConstants.PARENT_DELIMITER.repeat(3) + constants_1.TemplateConstants.V1_TEMPLATE);
-            case 'v1_1':
-                return framework_1.PluginFileUtil.pathResolve(__dirname, constants_1.FilePathConstants.PARENT_DELIMITER.repeat(3) + constants_1.TemplateConstants.V1_1_TEMPLATE);
-            case 'latest':
-            default:
-                return defaultTemplatePath;
-        }
-    }
-    determineTemplateType(libraryVersion) {
-        if (!libraryVersion) {
-            return 'v1';
-        }
-        const currentVersion = this.parseVersion(libraryVersion);
-        const v1_1Version = this.parseVersion(constants_1.VersionConstants.HMROUTER_MIN_VERSION_FOR_NAV_HELPER);
-        const v1_2Version = this.parseVersion(constants_1.VersionConstants.HMROUTER_MIN_VERSION_FOR_SDK_API);
-        if (!currentVersion || !v1_1Version || !v1_2Version) {
-            return 'v1';
-        }
-        if (this.compareVersions(currentVersion, v1_2Version) >= 0) {
-            return 'latest';
-        }
-        if (this.compareVersions(currentVersion, v1_1Version) >= 0) {
-            return 'v1_1';
-        }
-        return 'v1';
-    }
     generateFile(templateModel, templatePath) {
         if (!framework_1.PluginFileUtil.exist(templatePath)) {
             throw PluginError_1.PluginError.create(PluginError_1.ErrorCode.TEMPLATE_NOT_FOUND, this.context.config.moduleName, templatePath);
         }
         const tpl = framework_1.PluginFileUtil.readFileSync(templatePath).toString();
         const templateStr = ejs_1.default.render(tpl, templateModel);
-        const generatorFilePath = this.context.config.getGeneratedFilePath(templateModel.generatorViewName);
+        const generatorFilePath = this.context.config.getGeneratedFilePath(templateModel.relativeShortPath);
         framework_1.PluginFileUtil.ensureFileSync(generatorFilePath);
         framework_1.PluginFileUtil.writeFileSync(generatorFilePath, templateStr);
-        return this.context.config
-            .getBuilderFilePath(templateModel.generatorViewName)
-            .replaceAll(constants_1.FilePathConstants.FILE_SEPARATOR, constants_1.FilePathConstants.DELIMITER);
-    }
-    detectLibraryVersion() {
-        let libraryVersion = '';
-        const possiblePaths = this.getLibraryPossiblePaths();
-        for (const packagePath of possiblePaths) {
-            libraryVersion = this.detectLibraryVersion2(packagePath);
-            if (libraryVersion) {
-                break;
-            }
-        }
-        return libraryVersion;
-    }
-    detectLibraryVersion2(lockFilePath) {
-        try {
-            if (!framework_1.PluginFileUtil.exist(lockFilePath)) {
-                return '';
-            }
-            const lockFileData = framework_1.PluginFileUtil.readJson5(lockFilePath);
-            return this.extractHMRouterVersion(lockFileData.packages);
-        }
-        catch (error) {
-            return '';
-        }
-    }
-    extractHMRouterVersion(packages) {
-        if (!packages) {
-            return '';
-        }
-        const hmrouterPrefix = `${constants_1.VersionConstants.HMROUTER_ORGANIZATION}/${constants_1.VersionConstants.HMROUTER_LIB_NAME}@`;
-        for (const key of Object.keys(packages)) {
-            if (!key.startsWith(hmrouterPrefix)) {
-                continue;
-            }
-            const packageInfo = packages[key];
-            if (packageInfo && packageInfo[constants_1.VersionConstants.HMROUTER_VERSION_KEY]) {
-                return packageInfo[constants_1.VersionConstants.HMROUTER_VERSION_KEY];
-            }
-        }
-        return '';
-    }
-    getLibraryPossiblePaths() {
-        const paths = [];
-        paths.push(framework_1.PluginFileUtil.pathResolve(this.context.config.modulePath, constants_1.FilePathConstants.OH_PACKAGE_LOCK_FILE_NAME));
-        const projectRoot = framework_1.PluginStore.getInstance().get('projectFilePath');
-        if (projectRoot && projectRoot !== this.context.config.modulePath) {
-            paths.push(framework_1.PluginFileUtil.pathResolve(projectRoot, constants_1.FilePathConstants.OH_PACKAGE_LOCK_FILE_NAME));
-        }
-        return paths;
-    }
-    parseVersion(version) {
-        const match = version.match(/^(\d+)\.(\d+)\.(\d+)(-.*)?/);
-        if (!match) {
-            return null;
-        }
-        return {
-            major: parseInt(match[1], 10),
-            minor: parseInt(match[2], 10),
-            patch: parseInt(match[3], 10),
-            preRelease: match[4] || '',
-        };
-    }
-    compareVersions(v1, v2) {
-        if (v1.major !== v2.major) {
-            return v1.major < v2.major ? -1 : 1;
-        }
-        if (v1.minor !== v2.minor) {
-            return v1.minor < v2.minor ? -1 : 1;
-        }
-        if (v1.patch !== v2.patch) {
-            return v1.patch < v2.patch ? -1 : 1;
-        }
-        if (v1.preRelease && !v2.preRelease) {
-            return -1;
-        }
-        if (!v1.preRelease && v2.preRelease) {
-            return 1;
-        }
-        if (v1.preRelease < v2.preRelease) {
-            return -1;
-        }
-        if (v1.preRelease > v2.preRelease) {
-            return 1;
-        }
-        return 0;
+        return generatorFilePath;
     }
 }
 exports.CodeGenerationProcessor = CodeGenerationProcessor;

package/dist/hmrouter_extension/processor/CompletionProcessor.js

@@ -21,21 +21,21 @@ class CompletionProcessor {
         }
     }
     deleteRouterMapFile() {
-        let routerMapDirPath = this.config.getRouterMapDir();
+        let routerMapDirPath = this.config.getRouterMapDir(true);
         if (framework_1.PluginFileUtil.exist(routerMapDirPath)) {
             framework_1.PluginFileUtil.unlinkSync(routerMapDirPath);
             framework_1.Logger.info(this.context.node.getNodeName(), `Delete router map file successfully, filePath: ${routerMapDirPath}`);
         }
     }
     deleteRawFile() {
-        let rawFilePath = this.config.getRawFilePath();
+        let rawFilePath = this.config.getRawFilePath(true);
         if (framework_1.PluginFileUtil.exist(rawFilePath)) {
             framework_1.PluginFileUtil.unlinkSync(rawFilePath);
             framework_1.Logger.info(this.context.node.getNodeName(), `Delete raw file successfully, filePath: ${rawFilePath}`);
         }
     }
     deleteGeneratorFile() {
-        let builderDirPath = this.config.getBuilderDir();
+        let builderDirPath = this.config.getBuilderDir(true);
         if (framework_1.PluginFileUtil.exist(builderDirPath)) {
             framework_1.PluginFileUtil.rmSync(builderDirPath, {
                 recursive: true,
@@ -44,12 +44,12 @@ class CompletionProcessor {
         }
     }
     deleteObfuscationFile() {
-        let obfuscationFilePath = this.config.getObfuscationFilePath();
+        let obfuscationFilePath = this.config.getObfuscationFilePath(true);
         if (framework_1.PluginFileUtil.exist(obfuscationFilePath)) {
             framework_1.PluginFileUtil.unlinkSync(obfuscationFilePath);
             framework_1.Logger.info(this.context.node.getNodeName(), `Delete obfuscation file successfully, filePath: ${obfuscationFilePath}`);
         }
-        let consumerRulesPath = this.config.getConsumerRulesFilePath();
+        let consumerRulesPath = this.config.getConsumerRulesFilePath(true);
         if (framework_1.PluginFileUtil.exist(consumerRulesPath)) {
             framework_1.PluginFileUtil.unlinkSync(consumerRulesPath);
             framework_1.Logger.info(this.context.node.getNodeName(), `Delete consumer rules file successfully, filePath: ${consumerRulesPath}`);

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

@@ -9,4 +9,5 @@ export declare class ConfigUpdateProcessor {
     private updateModuleJson;
     private updateBuildProfile;
     private pushRouterInfo;
+    private updateDirectories;
 }

package/dist/hmrouter_extension/processor/ConfigUpdateProcessor.js

@@ -40,11 +40,14 @@ class ConfigUpdateProcessor {
             buildProfileOpt.buildOption.arkOptions.runtimeOnly.sources = [];
         }
         this.pushRouterInfo(buildProfileOpt, this.routerMap);
+        if (this.context.config.incremental) {
+            this.updateDirectories(buildProfileOpt);
+        }
         this.moduleContext.setBuildProfileOpt(buildProfileOpt);
-        framework_1.Logger.info(this.nodeName, `Update build profile successfully, current sources: ${this.moduleContext.getBuildProfileOpt()?.buildOption?.arkOptions?.runtimeOnly?.sources}`);
+        framework_1.Logger.debug(this.nodeName, `Update build profile successfully, current sources: ${this.moduleContext.getBuildProfileOpt()?.buildOption?.arkOptions?.runtimeOnly?.sources}`);
     }
     pushRouterInfo(buildProfileOpt, routerMap) {
-        let sources = buildProfileOpt.buildOption.arkOptions.runtimeOnly.sources;
+        let sources = buildProfileOpt.buildOption.arkOptions.runtimeOnly.sources ?? [];
         routerMap.forEach((item) => {
             const name = item.name;
             if (name.includes(constants_1.PrefixConstants.LIFECYCLE_PREFIX) ||
@@ -57,5 +60,29 @@ class ConfigUpdateProcessor {
         });
         sources = [...new Set(sources)];
     }
+    updateDirectories(buildProfileOpt) {
+        const targets = buildProfileOpt.targets;
+        if (!targets || !Array.isArray(targets)) {
+            framework_1.Logger.warn(this.nodeName, `No targets found in build-profile.json5, skip updating directories`);
+            return;
+        }
+        const isolatedResourcesDir = constants_1.FilePathConstants.CURRENT_DELIMITER + constants_1.FilePathConstants.ISOLATED_RESOURCES_DIR;
+        if (!framework_1.PluginFileUtil.exist(framework_1.PluginFileUtil.pathResolve(this.context.moduleContext.getModulePath(), isolatedResourcesDir))) {
+            framework_1.Logger.warn(this.nodeName, `${isolatedResourcesDir} is not exist, skip updating directories`);
+            return;
+        }
+        targets.forEach((target) => {
+            if (!target.resource) {
+                target.resource = {};
+            }
+            if (!target.resource.directories) {
+                target.resource.directories = [constants_1.FilePathConstants.DEFAULT_RESOURCES_DIR];
+            }
+            if (!target.resource.directories.includes(isolatedResourcesDir)) {
+                target.resource.directories.unshift(isolatedResourcesDir);
+            }
+            framework_1.Logger.debug(this.nodeName, `Update target '${target.name}' directories: ${JSON.stringify(target.resource.directories)}`);
+        });
+    }
 }
 exports.ConfigUpdateProcessor = ConfigUpdateProcessor;

package/dist/hmrouter_extension/processor/InitializerProcessor.js

@@ -79,17 +79,7 @@ class InitializerProcessor {
         return configParam;
     }
     mergeConfigs(projectConfigParam, moduleConfigParam) {
-        const defaultConfig = {
-            scanDir: [constants_1.FilePathConstants.DEFAULT_SCAN_DIR],
-            routerMapDir: constants_1.FilePathConstants.DEFAULT_ROUTER_MAP_DIR,
-            builderDir: constants_1.FilePathConstants.DEFAULT_BUILD_DIR,
-            defaultPageTemplate: constants_1.TemplateConstants.VIEW_BUILDER_TEMPLATE,
-            customPageTemplate: [],
-            saveGeneratedFile: false,
-            autoObfuscation: false,
-        };
         return {
-            ...defaultConfig,
             ...projectConfigParam,
             ...moduleConfigParam,
         };