@hadss/hmrouter-plugin 1.0.0-rc.9 → 1.1.1-alpha.0

package/dist/HMRouterPluginHandle.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HMRouterPluginHandle = void 0;
-const hvigor_1 = require("@ohos/hvigor");
 const hvigor_ohos_plugin_1 = require("@ohos/hvigor-ohos-plugin");
 const HMRouterPluginConfig_1 = require("./HMRouterPluginConfig");
 const HMRouterHvigorPlugin_1 = require("./HMRouterHvigorPlugin");
@@ -13,12 +12,14 @@ const CommonConstants_1 = __importDefault(require("./constants/CommonConstants")
 const TaskConstants_1 = __importDefault(require("./constants/TaskConstants"));
 const FileUtil_1 = __importDefault(require("./utils/FileUtil"));
 const ObfuscationUtil_1 = __importDefault(require("./utils/ObfuscationUtil"));
+const PluginStore_1 = __importDefault(require("./store/PluginStore"));
 class HMRouterPluginHandle {
     constructor(node, moduleContext) {
         this.node = node;
         this.moduleContext = moduleContext;
         this.config = this.readConfig();
         this.appContext = this.node.getParentNode()?.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN);
+        PluginStore_1.default.getInstance().projectFilePath = this.appContext.getProjectPath();
         this.plugin = new HMRouterHvigorPlugin_1.HMRouterHvigorPlugin(this.config);
     }
     start() {
@@ -29,6 +30,8 @@ class HMRouterPluginHandle {
                 name: targetName + TaskConstants_1.default.PLUGIN_TASK,
                 run: () => {
                     this.taskExec();
+                    this.plugin.scanFiles = [];
+                    this.plugin.routerMap = [];
                 },
                 dependencies: [targetName + TaskConstants_1.default.PRE_BUILD],
                 postDependencies: [targetName + TaskConstants_1.default.MERGE_PROFILE]
@@ -58,8 +61,15 @@ class HMRouterPluginHandle {
             return;
         }
         let obfuscationFilePath = FileUtil_1.default.pathResolve(this.config.modulePath, CommonConstants_1.default.OBFUSCATION_FILE_NAME);
+        let routerMap = JSON.parse(FileUtil_1.default.readFileSync(this.config.getRouterMapDir()).toString()).routerMap;
+        let obfuscationString = ObfuscationUtil_1.default.buildObfuscatedStrings(routerMap);
         FileUtil_1.default.ensureFileSync(obfuscationFilePath);
-        FileUtil_1.default.writeFileSync(obfuscationFilePath, ObfuscationUtil_1.default.buildObfuscatedStrings(this.plugin.routerMap));
+        FileUtil_1.default.writeFileSync(obfuscationFilePath, obfuscationString);
+        if (this.moduleContext.getModuleType() === CommonConstants_1.default.HAR_MODULE_NAME) {
+            let consumerRulesPath = FileUtil_1.default.pathResolve(this.config.modulePath, CommonConstants_1.default.CONSUMER_FILE_NAME);
+            FileUtil_1.default.ensureFileSync(consumerRulesPath);
+            FileUtil_1.default.writeFileSync(consumerRulesPath, obfuscationString);
+        }
         Logger_1.Logger.info('Generate obfuscation rule file successfully, filePath:', obfuscationFilePath);
     }
     isEnableObfuscation(buildProfileOpt) {
@@ -67,25 +77,40 @@ class HMRouterPluginHandle {
         let buildOption = buildProfileOpt.buildOptionSet?.find((item) => {
             return item.name == currentBuildMode;
         });
-        if (buildOption) {
-            let ruleOptions = this.ensureNestedObject(buildOption, ['arkOptions', 'obfuscation', 'ruleOptions']);
-            if (this.config.autoObfuscation && ruleOptions.enable) {
-                let files = this.ensureNestedObject(buildOption, ['arkOptions', 'obfuscation', 'ruleOptions', 'files']);
-                let obfuscationFilePath = CommonConstants_1.default.CURRENT_DELIMITER +
-                    CommonConstants_1.default.OBFUSCATION_FILE_NAME;
-                if (typeof files === 'string') {
-                    ruleOptions.files = [files, obfuscationFilePath];
+        if (!buildOption)
+            return false;
+        let ruleOptions = this.ensureNestedObject(buildOption, ['arkOptions', 'obfuscation', 'ruleOptions']);
+        if (this.config.autoObfuscation && ruleOptions.enable) {
+            let files = this.ensureNestedObject(buildOption, ['arkOptions', 'obfuscation', 'ruleOptions', 'files']);
+            let obfuscationFilePath = CommonConstants_1.default.CURRENT_DELIMITER +
+                CommonConstants_1.default.OBFUSCATION_FILE_NAME;
+            if (typeof files === 'string') {
+                ruleOptions.files = [files, obfuscationFilePath];
+            }
+            else if (Array.isArray(files)) {
+                files.push(obfuscationFilePath);
+            }
+            else {
+                ruleOptions.files = obfuscationFilePath;
+            }
+            if (this.moduleContext.getModuleType() === CommonConstants_1.default.HAR_MODULE_NAME) {
+                let consumerFiles = this.ensureNestedObject(buildOption, ['arkOptions', 'obfuscation', 'consumerFiles']);
+                let consumerRulesPath = CommonConstants_1.default.CURRENT_DELIMITER +
+                    CommonConstants_1.default.CONSUMER_FILE_NAME;
+                if (typeof consumerFiles === 'string') {
+                    this.ensureNestedObject(buildOption, ['arkOptions', 'obfuscation']).consumerFiles =
+                        [consumerFiles, consumerRulesPath];
+                }
+                else if (Array.isArray(consumerFiles)) {
+                    consumerFiles.push(consumerRulesPath);
                 }
                 else {
-                    files.push(obfuscationFilePath);
+                    this.ensureNestedObject(buildOption, ['arkOptions', 'obfuscation']).consumerFiles = consumerRulesPath;
                 }
-                this.moduleContext.setBuildProfileOpt(buildProfileOpt);
             }
-            return ruleOptions.enable;
-        }
-        else {
-            return false;
+            this.moduleContext.setBuildProfileOpt(buildProfileOpt);
         }
+        return ruleOptions.enable;
     }
     copyRouterMapToRawFileTask(buildOutputPath, targetName) {
         let routerMapFilePath = FileUtil_1.default.pathResolve(buildOutputPath, CommonConstants_1.default.TEMP_ROUTER_MAP_PATH, targetName, CommonConstants_1.default.ROUTER_MAP_NAME);
@@ -94,36 +119,33 @@ class HMRouterPluginHandle {
         FileUtil_1.default.copyFileSync(routerMapFilePath, rawFilePath);
     }
     writeHspModuleName() {
-        if (this.node.getAllPluginIds().includes(hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN)) {
-            let rawFilePath = this.config.getRawFilePath();
-            let rawFileRouterMap = JSON.parse(FileUtil_1.default.readFileSync(rawFilePath).toString());
-            rawFileRouterMap.hspModuleNames = [];
-            hvigor_1.hvigor.getAllNodes().forEach((node) => {
-                let pluginIds = node.getAllPluginIds();
-                if (pluginIds.includes(hvigor_ohos_plugin_1.OhosPluginId.OHOS_HSP_PLUGIN)) {
-                    let packageJson = FileUtil_1.default.readJson5(FileUtil_1.default.pathResolve(node.getNodePath(), 'oh-package.json5'));
-                    rawFileRouterMap.hspModuleNames.push(packageJson.name);
-                }
-                try {
-                    pluginIds.forEach((id) => {
-                        let context = node.getContext(id);
-                        let signedHspObj = context.getOhpmRemoteHspDependencyInfo(true);
-                        let remoteHspObj = context.getOhpmRemoteHspDependencyInfo(false);
-                        for (const key in signedHspObj) {
-                            rawFileRouterMap.hspModuleNames.push(signedHspObj[key].name);
-                        }
-                        for (const key in remoteHspObj) {
-                            rawFileRouterMap.hspModuleNames.push(remoteHspObj[key].name);
-                        }
-                    });
+        if (!this.node.getAllPluginIds().includes(hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN))
+            return;
+        let rawFilePath = this.config.getRawFilePath();
+        let rawFileRouterMap = JSON.parse(FileUtil_1.default.readFileSync(rawFilePath).toString());
+        rawFileRouterMap.hspModuleNames = [...new Set(PluginStore_1.default.getInstance().hspModuleNames)];
+        rawFileRouterMap.hspModuleNames.push(...this.getRemoteHspModuleNames(this.node, this.node.getAllPluginIds()));
+        FileUtil_1.default.writeFileSync(rawFilePath, JSON.stringify(rawFileRouterMap));
+    }
+    getRemoteHspModuleNames(node, pluginIds) {
+        let remoteHspModuleNames = [];
+        try {
+            pluginIds.forEach((id) => {
+                let context = node.getContext(id);
+                let signedHspObj = context.getOhpmRemoteHspDependencyInfo(true);
+                let remoteHspObj = context.getOhpmRemoteHspDependencyInfo(false);
+                for (const key in signedHspObj) {
+                    remoteHspModuleNames.push(signedHspObj[key].name);
                 }
-                catch (error) {
-                    Logger_1.Logger.warn('Your DevEco Studio version less than 5.0.3.800, may cause remote hsp dependencies get failed');
+                for (const key in remoteHspObj) {
+                    remoteHspModuleNames.push(remoteHspObj[key].name);
                 }
             });
-            rawFileRouterMap.hspModuleNames = [...new Set(rawFileRouterMap.hspModuleNames)];
-            FileUtil_1.default.writeFileSync(rawFilePath, JSON.stringify(rawFileRouterMap));
         }
+        catch (error) {
+            Logger_1.Logger.warn('Your DevEco Studio version less than 5.0.3.800, may cause remote hsp dependencies get failed');
+        }
+        return remoteHspModuleNames;
     }
     taskExec() {
         let startTime = Date.now();
@@ -141,7 +163,9 @@ class HMRouterPluginHandle {
             let routerMapFileName = moduleJsonOpt.module.routerMap.split(':')[1];
             let routerMapFilePath = this.config.getModuleRouterMapFilePath(routerMapFileName);
             let routerMapObj = FileUtil_1.default.readJson5(routerMapFilePath);
-            this.plugin.routerMap.unshift(...routerMapObj[CommonConstants_1.default.ROUTER_MAP_KEY]);
+            if (routerMapFileName !== 'hm_router_map') {
+                this.plugin.routerMap.unshift(...routerMapObj[CommonConstants_1.default.ROUTER_MAP_KEY]);
+            }
         }
         this.plugin.generateRouterMap();
         moduleJsonOpt.module.routerMap = CommonConstants_1.default.MODULE_ROUTER_MAP_NAME;
@@ -169,19 +193,21 @@ class HMRouterPluginHandle {
         });
     }
     readConfig() {
-        let levels = 0;
-        let configParam = {};
-        let configFilePath = '';
-        while (levels < 4) {
-            configFilePath = FileUtil_1.default.pathResolve(this.node.getNodePath(), CommonConstants_1.default.PARENT_DELIMITER.repeat(levels) + CommonConstants_1.default.CONFIG_FILE_NAME);
-            if (FileUtil_1.default.exist(configFilePath)) {
-                configParam = FileUtil_1.default.readJson5(configFilePath);
-                break;
-            }
-            levels++;
+        let configParam;
+        let configFilePath;
+        let configDir;
+        configFilePath = FileUtil_1.default.pathResolve(this.node.getNodePath(), CommonConstants_1.default.CONFIG_FILE_NAME);
+        if (!FileUtil_1.default.exist(configFilePath)) {
+            configFilePath =
+                FileUtil_1.default.pathResolve(PluginStore_1.default.getInstance().projectFilePath, CommonConstants_1.default.CONFIG_FILE_NAME);
+        }
+        if (FileUtil_1.default.exist(configFilePath)) {
+            configParam = FileUtil_1.default.readJson5(configFilePath);
+        }
+        else {
+            configParam = {};
         }
-        let configDir = configFilePath.split(CommonConstants_1.default.FILE_SEPARATOR).slice(0, -1)
-            .join(CommonConstants_1.default.FILE_SEPARATOR);
+        configDir = FileUtil_1.default.pathResolve(configFilePath, CommonConstants_1.default.PARENT_DELIMITER);
         return new HMRouterPluginConfig_1.HMRouterPluginConfig(this.node.getNodeName(), this.node.getNodePath(), configDir, configParam);
     }
     ensureNestedObject(obj, path) {

package/dist/HMRouterPluginManager.d.ts

@@ -0,0 +1,9 @@
+import { HvigorNode } from '@ohos/hvigor';
+import { PluginParam } from './Index';
+export declare class HMRouterPluginManager {
+    private static instance;
+    private controllerSet;
+    private constructor();
+    static getInstance(): HMRouterPluginManager;
+    registerPlugin(node: HvigorNode, pluginId: string, options: PluginParam): void;
+}

package/dist/HMRouterPluginManager.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HMRouterPluginManager = void 0;
+const hvigor_1 = require("@ohos/hvigor");
+const PluginError_1 = require("./hmrouter_extension/error/PluginError");
+const HMRouterExtension_1 = require("./hmrouter_extension/HMRouterExtension");
+const framework_1 = require("./framework");
+class HMRouterPluginManager {
+    constructor() {
+        this.controllerSet = new Set();
+        framework_1.Logger.info('', 'HMRouterPlugin starting...');
+        (0, framework_1.registerPluginExtension)(new HMRouterExtension_1.HMRouterDefaultExtension());
+        hvigor_1.hvigor.nodesEvaluated(() => {
+            this.controllerSet.forEach((controller) => {
+                controller.start();
+            });
+        });
+        hvigor_1.hvigor.buildFinished(() => {
+            this.controllerSet.forEach((controller) => {
+                controller.complete();
+            });
+            HMRouterPluginManager.instance = null;
+            framework_1.PluginStore.destroy();
+            framework_1.ExtensionManager.destroy();
+            this.controllerSet.clear();
+            framework_1.TsAstUtil.clearProject();
+        });
+    }
+    static getInstance() {
+        if (!HMRouterPluginManager.instance) {
+            HMRouterPluginManager.instance = new HMRouterPluginManager();
+        }
+        return HMRouterPluginManager.instance;
+    }
+    registerPlugin(node, pluginId, options) {
+        const moduleContext = node.getContext(pluginId);
+        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);
+        this.controllerSet.add(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 hspNameArr = framework_1.PluginStore.getInstance().get('hspModuleNames');
+            if (!hspNameArr) {
+                framework_1.PluginStore.getInstance().set('hspModuleNames', []);
+            }
+            framework_1.PluginStore.getInstance().get('hspModuleNames')?.push(packageJson.name);
+        }
+    }
+}
+exports.HMRouterPluginManager = HMRouterPluginManager;
+HMRouterPluginManager.instance = null;

package/dist/Index.d.ts

@@ -1,4 +1,10 @@
 import { HvigorPlugin } from '@ohos/hvigor';
-export declare function hapPlugin(): HvigorPlugin;
-export declare function hspPlugin(): HvigorPlugin;
-export declare function harPlugin(): HvigorPlugin;
+import { PluginExtension } from './framework';
+export * from './framework/utils';
+export * from './framework/extension';
+export interface PluginParam {
+    extensions?: PluginExtension[];
+}
+export declare function hapPlugin(options?: PluginParam): HvigorPlugin;
+export declare function hspPlugin(options?: PluginParam): HvigorPlugin;
+export declare function harPlugin(options?: PluginParam): HvigorPlugin;

package/dist/Index.js

@@ -1,119 +1,49 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hapPlugin = hapPlugin;
-exports.hspPlugin = hspPlugin;
-exports.harPlugin = harPlugin;
-const hvigor_1 = require("@ohos/hvigor");
+exports.harPlugin = exports.hspPlugin = exports.hapPlugin = void 0;
 const hvigor_ohos_plugin_1 = require("@ohos/hvigor-ohos-plugin");
-const Logger_1 = require("./common/Logger");
-const CommonConstants_1 = __importDefault(require("./constants/CommonConstants"));
-const TsAstUtil_1 = require("./utils/TsAstUtil");
-const FileUtil_1 = __importDefault(require("./utils/FileUtil"));
-const HMRouterPluginHandle_1 = require("./HMRouterPluginHandle");
-class HMRouterPluginMgr {
-    constructor() {
-        this.hmRouterPluginSet = new Set();
-        hvigor_1.hvigor.nodesEvaluated(() => {
-            this.hmRouterPluginSet.forEach((pluginHandle) => {
-                pluginHandle.start();
-            });
-        });
-        hvigor_1.hvigor.buildFinished(() => {
-            Logger_1.Logger.info('buildFinished deleteFile exec...');
-            this.hmRouterPluginSet.forEach((pluginHandle) => {
-                if (pluginHandle.config.saveGeneratedFile) {
-                    Logger_1.Logger.info(pluginHandle.config.moduleName + ' saveGeneratedFile is true, skip deleting');
-                    return;
-                }
-                this.deleteRouterMapFile(pluginHandle);
-                this.deleteRawFile(pluginHandle);
-                this.deleteGeneratorFile(pluginHandle);
-                if (pluginHandle.config.autoObfuscation) {
-                    this.deleteObfuscationFile(pluginHandle);
-                }
-            });
-            HMRouterPluginMgrInstance = null;
-            TsAstUtil_1.TsAstUtil.clearProject();
-        });
-    }
-    registerHMRouterPlugin(node, pluginId) {
-        const moduleContext = node.getContext(pluginId);
-        if (!moduleContext) {
-            Logger_1.Logger.error(Logger_1.PluginError.ERR_ERROR_CONFIG, node.getNodePath());
-            throw new Error('moduleContext is null');
-        }
-        let pluginHandle = new HMRouterPluginHandle_1.HMRouterPluginHandle(node, moduleContext);
-        if (pluginId === hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN) {
-            let packageJson = FileUtil_1.default.readJson5(FileUtil_1.default.pathResolve(node.getNodePath(), 'oh-package.json5'));
-            pluginHandle.config.moduleName = packageJson.name;
-        }
-        this.hmRouterPluginSet.add(pluginHandle);
-    }
-    deleteGeneratorFile(pluginHandle) {
-        let builderDirPath = pluginHandle.config.getBuilderDir();
-        if (FileUtil_1.default.exist(builderDirPath)) {
-            FileUtil_1.default.rmSync(builderDirPath, {
-                recursive: true
-            });
-            Logger_1.Logger.info(pluginHandle.config.modulePath + ' delete builder dir');
-        }
-    }
-    deleteRouterMapFile(pluginHandle) {
-        let routerMapDirPath = pluginHandle.config.getRouterMapDir();
-        if (FileUtil_1.default.exist(routerMapDirPath)) {
-            FileUtil_1.default.unlinkSync(routerMapDirPath);
-            Logger_1.Logger.info(routerMapDirPath + ' delete hm_router_map.json');
-        }
-    }
-    deleteRawFile(pluginHandle) {
-        let rawFilePath = pluginHandle.config.getRawFilePath();
-        if (FileUtil_1.default.exist(rawFilePath)) {
-            FileUtil_1.default.unlinkSync(rawFilePath);
-            Logger_1.Logger.info(pluginHandle.config.modulePath + ' delete rawfile hm_router_map.json');
-        }
-    }
-    deleteObfuscationFile(pluginHandle) {
-        let obfuscationFilePath = pluginHandle.config.getObfuscationFilePath();
-        if (FileUtil_1.default.exist(obfuscationFilePath)) {
-            FileUtil_1.default.unlinkSync(obfuscationFilePath);
-            Logger_1.Logger.info(pluginHandle.config.modulePath + ' delete obfuscation hmrouter_obfuscation_rules.txt');
-        }
-    }
-}
-let HMRouterPluginMgrInstance = null;
-function hapPlugin() {
+const constants_1 = require("./hmrouter_extension/constants");
+const HMRouterPluginManager_1 = require("./HMRouterPluginManager");
+__exportStar(require("./framework/utils"), exports);
+__exportStar(require("./framework/extension"), exports);
+function hapPlugin(options = {}) {
     return {
-        pluginId: CommonConstants_1.default.HAP_PLUGIN_ID,
+        pluginId: constants_1.PluginConstants.HAP_PLUGIN_ID,
         apply(node) {
-            if (!HMRouterPluginMgrInstance) {
-                HMRouterPluginMgrInstance = new HMRouterPluginMgr();
-            }
-            HMRouterPluginMgrInstance.registerHMRouterPlugin(node, hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN);
-        }
+            HMRouterPluginManager_1.HMRouterPluginManager.getInstance().registerPlugin(node, hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN, options);
+        },
     };
 }
-function hspPlugin() {
+exports.hapPlugin = hapPlugin;
+function hspPlugin(options = {}) {
     return {
-        pluginId: CommonConstants_1.default.HSP_PLUGIN_ID,
+        pluginId: constants_1.PluginConstants.HSP_PLUGIN_ID,
         apply(node) {
-            if (!HMRouterPluginMgrInstance) {
-                HMRouterPluginMgrInstance = new HMRouterPluginMgr();
-            }
-            HMRouterPluginMgrInstance.registerHMRouterPlugin(node, hvigor_ohos_plugin_1.OhosPluginId.OHOS_HSP_PLUGIN);
-        }
+            HMRouterPluginManager_1.HMRouterPluginManager.getInstance().registerPlugin(node, hvigor_ohos_plugin_1.OhosPluginId.OHOS_HSP_PLUGIN, options);
+        },
     };
 }
-function harPlugin() {
+exports.hspPlugin = hspPlugin;
+function harPlugin(options = {}) {
     return {
-        pluginId: CommonConstants_1.default.HAR_PLUGIN_ID,
+        pluginId: constants_1.PluginConstants.HAR_PLUGIN_ID,
         apply(node) {
-            if (!HMRouterPluginMgrInstance) {
-                HMRouterPluginMgrInstance = new HMRouterPluginMgr();
-            }
-            HMRouterPluginMgrInstance.registerHMRouterPlugin(node, hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAR_PLUGIN);
-        }
+            HMRouterPluginManager_1.HMRouterPluginManager.getInstance().registerPlugin(node, hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAR_PLUGIN, options);
+        },
     };
 }
+exports.harPlugin = harPlugin;

package/dist/common/Logger.js

@@ -27,7 +27,7 @@ var PluginError;
     PluginError["ERR_ERROR_CONFIG"] = "ERR_INIT_COMPONENT";
     PluginError["ERR_NOT_EMPTY_STRING"] = "ERR_INIT_NOT_READY";
     PluginError["ERR_INVALID_STRING_VALUE"] = "ERR_INVALID_STRING_VALUE";
-})(PluginError || (exports.PluginError = PluginError = {}));
+})(PluginError = exports.PluginError || (exports.PluginError = {}));
 const DEFINED_ERROR = new Map();
 DEFINED_ERROR.set(PluginError.ERR_DUPLICATE_NAME, {
     errorCode: 40000001,

package/dist/common/PluginModel.d.ts

@@ -4,6 +4,7 @@ export interface BaseAnalyzeResult {
     module?: string;
     annotation?: string;
     pageSourceFile?: string;
+    isDefaultExport?: boolean;
 }
 export interface HMRouterResult extends BaseAnalyzeResult {
     pageUrl?: any;
@@ -12,6 +13,7 @@ export interface HMRouterResult extends BaseAnalyzeResult {
     interceptors?: string[];
     animator?: string;
     lifecycle?: string;
+    useNavDst?: boolean;
 }
 export interface HMAnimatorResult extends BaseAnalyzeResult {
     animatorName?: string;
@@ -37,7 +39,8 @@ export declare class TemplateModel {
     componentName: string;
     dialog: boolean;
     generatorViewName: string;
-    constructor(pageUrl: string, importPath: string, componentName: string, dialog: boolean, generatorViewName: string);
+    isDefaultExport?: boolean;
+    constructor(pageUrl: string, importPath: string, componentName: string, dialog: boolean, generatorViewName: string, isDefaultExport?: boolean);
 }
 export declare class RouterInfo {
     name: string;

package/dist/common/PluginModel.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouterInfo = exports.TemplateModel = void 0;
 class TemplateModel {
-    constructor(pageUrl, importPath, componentName, dialog, generatorViewName) {
+    constructor(pageUrl, importPath, componentName, dialog, generatorViewName, isDefaultExport) {
+        this.isDefaultExport = isDefaultExport;
         this.pageUrl = pageUrl;
         this.importPath = importPath;
         this.componentName = componentName;

package/dist/constants/CommonConstants.d.ts

@@ -3,10 +3,9 @@ export default class HMRouterPluginConstant {
     static readonly INTERCEPTOR_PREFIX = "__interceptor__";
     static readonly LIFECYCLE_PREFIX = "__lifecycle__";
     static readonly SERVICE_PREFIX = "__service__";
-    static readonly PAGE_URL_PREFIX = "";
-    static readonly OBFUSCATION_FILE_NAME = "hmrouter_obfuscation_rules.txt";
-    static readonly VARIABLE_SEPARATOR = "__";
-    static readonly PAGE_URL = "pageUrl";
+    static readonly SERVICE_PROVIDE_PREFIX = "__service_provider__";
+    static readonly OBFUSCATION_FILE_NAME = "hmrouter-obfuscation-rules.txt";
+    static readonly CONSUMER_FILE_NAME = "hmrouter-consumer-rules.txt";
     static readonly ROUTER_MAP_KEY = "routerMap";
     static readonly FILE_SEPARATOR: "\\" | "/";
     static readonly DELIMITER = "/";
@@ -15,20 +14,26 @@ export default class HMRouterPluginConstant {
     static readonly TEMP_ROUTER_MAP_PATH = "../../intermediates/router_map";
     static readonly RAWFILE_DIR = "src/main/resources/rawfile/hm_router_map.json";
     static readonly VIEW_NAME_PREFIX = "HM";
-    static readonly VIEW_NAME_SUFFIX = ".ets";
+    static readonly ETS_SUFFIX = ".ets";
     static readonly JSON_SUFFIX = ".json";
     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 HAR_MODULE_NAME = "har";
     static readonly ROUTER_ANNOTATION = "HMRouter";
     static readonly ANIMATOR_ANNOTATION = "HMAnimator";
     static readonly INTERCEPTOR_ANNOTATION = "HMInterceptor";
     static readonly LIFECYCLE_ANNOTATION = "HMLifecycle";
     static readonly SERVICE_ANNOTATION = "HMService";
+    static readonly SERVICE_PROVIDE_ANNOTATION = "HMServiceProvider";
     static readonly CONFIG_FILE_NAME = "hmrouter_config.json";
     static readonly PARENT_DELIMITER = "../";
     static readonly CURRENT_DELIMITER = "./";
     static readonly LINE_BREAK = "\n";
     static readonly KEEP_FILE_NAME = "-keep-file-name";
     static readonly KEEP_PROPERTY_NAME = "-keep-property-name";
+    static readonly KEEP_GLOBAL_NAME = "-keep-global-name";
+    static readonly OH_MODULE_PATH = "oh_modules";
+    static readonly WARP_BUILDER = "WrapBuilder";
+    static readonly CUSTOM_BUILDER_TEMPLATE = "template/customBuilder.ejs";
 }

package/dist/constants/CommonConstants.js

@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 class HMRouterPluginConstant {
 }
+exports.default = HMRouterPluginConstant;
 HMRouterPluginConstant.ANIMATOR_PREFIX = '__animator__';
 HMRouterPluginConstant.INTERCEPTOR_PREFIX = '__interceptor__';
 HMRouterPluginConstant.LIFECYCLE_PREFIX = '__lifecycle__';
 HMRouterPluginConstant.SERVICE_PREFIX = '__service__';
-HMRouterPluginConstant.PAGE_URL_PREFIX = '';
-HMRouterPluginConstant.OBFUSCATION_FILE_NAME = 'hmrouter_obfuscation_rules.txt';
-HMRouterPluginConstant.VARIABLE_SEPARATOR = '__';
-HMRouterPluginConstant.PAGE_URL = 'pageUrl';
+HMRouterPluginConstant.SERVICE_PROVIDE_PREFIX = '__service_provider__';
+HMRouterPluginConstant.OBFUSCATION_FILE_NAME = 'hmrouter-obfuscation-rules.txt';
+HMRouterPluginConstant.CONSUMER_FILE_NAME = 'hmrouter-consumer-rules.txt';
 HMRouterPluginConstant.ROUTER_MAP_KEY = 'routerMap';
 HMRouterPluginConstant.FILE_SEPARATOR = path_1.default.sep;
 HMRouterPluginConstant.DELIMITER = '/';
@@ -22,20 +22,25 @@ HMRouterPluginConstant.ROUTER_MAP_NAME = 'hm_router_map.json';
 HMRouterPluginConstant.TEMP_ROUTER_MAP_PATH = '../../intermediates/router_map';
 HMRouterPluginConstant.RAWFILE_DIR = 'src/main/resources/rawfile/hm_router_map.json';
 HMRouterPluginConstant.VIEW_NAME_PREFIX = 'HM';
-HMRouterPluginConstant.VIEW_NAME_SUFFIX = '.ets';
+HMRouterPluginConstant.ETS_SUFFIX = '.ets';
 HMRouterPluginConstant.JSON_SUFFIX = '.json';
 HMRouterPluginConstant.HAP_PLUGIN_ID = 'HAP_HMROUTER_PLUGIN';
 HMRouterPluginConstant.HSP_PLUGIN_ID = 'HSP_HMROUTER_PLUGIN';
 HMRouterPluginConstant.HAR_PLUGIN_ID = 'HAR_HMROUTER_PLUGIN';
+HMRouterPluginConstant.HAR_MODULE_NAME = 'har';
 HMRouterPluginConstant.ROUTER_ANNOTATION = 'HMRouter';
 HMRouterPluginConstant.ANIMATOR_ANNOTATION = 'HMAnimator';
 HMRouterPluginConstant.INTERCEPTOR_ANNOTATION = 'HMInterceptor';
 HMRouterPluginConstant.LIFECYCLE_ANNOTATION = 'HMLifecycle';
 HMRouterPluginConstant.SERVICE_ANNOTATION = 'HMService';
+HMRouterPluginConstant.SERVICE_PROVIDE_ANNOTATION = 'HMServiceProvider';
 HMRouterPluginConstant.CONFIG_FILE_NAME = 'hmrouter_config.json';
 HMRouterPluginConstant.PARENT_DELIMITER = '../';
 HMRouterPluginConstant.CURRENT_DELIMITER = './';
 HMRouterPluginConstant.LINE_BREAK = '\n';
 HMRouterPluginConstant.KEEP_FILE_NAME = '-keep-file-name';
 HMRouterPluginConstant.KEEP_PROPERTY_NAME = '-keep-property-name';
-exports.default = HMRouterPluginConstant;
+HMRouterPluginConstant.KEEP_GLOBAL_NAME = '-keep-global-name';
+HMRouterPluginConstant.OH_MODULE_PATH = 'oh_modules';
+HMRouterPluginConstant.WARP_BUILDER = 'WrapBuilder';
+HMRouterPluginConstant.CUSTOM_BUILDER_TEMPLATE = 'template/customBuilder.ejs';

package/dist/constants/ConfigConstants.d.ts

@@ -2,10 +2,11 @@ export default class ConfigConstants {
     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 DEFAULT_BUILD_TPL = "viewBuilder.ejs";
+    static readonly DEFAULT_BUILD_TPL = "template/viewBuilder.ejs";
     static readonly ROUTER_ANNOTATION = "HMRouter";
     static readonly ANIMATOR_ANNOTATION = "HMAnimator";
     static readonly INTERCEPTOR_ANNOTATION = "HMInterceptor";
     static readonly LIFECYCLE_ANNOTATION = "HMLifecycle";
     static readonly SERVICE_ANNOTATION = "HMService";
+    static readonly SERVICE_PROVIDE_ANNOTATION = "HMServiceProvider";
 }

package/dist/constants/ConfigConstants.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 class ConfigConstants {
 }
+exports.default = ConfigConstants;
 ConfigConstants.DEFAULT_SCAN_DIR = 'src/main/ets';
 ConfigConstants.DEFAULT_ROUTER_MAP_DIR = 'src/main/resources/base/profile';
 ConfigConstants.DEFAULT_BUILD_DIR = 'src/main/ets/generated';
-ConfigConstants.DEFAULT_BUILD_TPL = 'viewBuilder.ejs';
+ConfigConstants.DEFAULT_BUILD_TPL = 'template/viewBuilder.ejs';
 ConfigConstants.ROUTER_ANNOTATION = 'HMRouter';
 ConfigConstants.ANIMATOR_ANNOTATION = 'HMAnimator';
 ConfigConstants.INTERCEPTOR_ANNOTATION = 'HMInterceptor';
 ConfigConstants.LIFECYCLE_ANNOTATION = 'HMLifecycle';
 ConfigConstants.SERVICE_ANNOTATION = 'HMService';
-exports.default = ConfigConstants;
+ConfigConstants.SERVICE_PROVIDE_ANNOTATION = 'HMServiceProvider';
 ;

package/dist/constants/TaskConstants.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 class TaskConstants {
 }
+exports.default = TaskConstants;
 TaskConstants.PRE_BUILD = '@PreBuild';
 TaskConstants.MERGE_PROFILE = '@MergeProfile';
 TaskConstants.PROCESS_ROUTER_MAP = '@ProcessRouterMap';
@@ -9,5 +10,4 @@ TaskConstants.PROCESS_RESOURCE = '@ProcessResource';
 TaskConstants.PLUGIN_TASK = '@HMRouterPluginTask';
 TaskConstants.COPY_ROUTER_MAP_TASK = '@HMRouterCopyRouterMapToRawFileTask';
 TaskConstants.GENERATE_OBFUSCATION_TASK = '@HMRouterGenerateObfuscationFileTask';
-exports.default = TaskConstants;
 ;

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

@@ -0,0 +1,8 @@
+export declare class TaskConstants {
+    static readonly PRE_BUILD = "@PreBuild";
+    static readonly PROCESS_ROUTER_MAP = "@ProcessRouterMap";
+    static readonly PROCESS_RESOURCE = "@ProcessResource";
+    static readonly PLUGIN_TASK = "@HMRouterPluginTask";
+    static readonly COPY_ROUTER_MAP_TASK = "@HMRouterCopyRouterMapToRawFileTask";
+    static readonly GENERATE_OBFUSCATION_TASK = "@HMRouterGenerateObfuscationFileTask";
+}