@hadss/hmrouter-plugin 1.0.0-rc.9 → 1.1.0-beta.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/Index.js

@@ -3,9 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hapPlugin = hapPlugin;
-exports.hspPlugin = hspPlugin;
-exports.harPlugin = harPlugin;
+exports.harPlugin = exports.hspPlugin = exports.hapPlugin = void 0;
 const hvigor_1 = require("@ohos/hvigor");
 const hvigor_ohos_plugin_1 = require("@ohos/hvigor-ohos-plugin");
 const Logger_1 = require("./common/Logger");
@@ -13,6 +11,7 @@ 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");
+const PluginStore_1 = __importDefault(require("./store/PluginStore"));
 class HMRouterPluginMgr {
     constructor() {
         this.hmRouterPluginSet = new Set();
@@ -46,10 +45,13 @@ class HMRouterPluginMgr {
             throw new Error('moduleContext is null');
         }
         let pluginHandle = new HMRouterPluginHandle_1.HMRouterPluginHandle(node, moduleContext);
+        let packageJson = FileUtil_1.default.readJson5(FileUtil_1.default.pathResolve(node.getNodePath(), 'oh-package.json5'));
         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;
         }
+        if (pluginId === hvigor_ohos_plugin_1.OhosPluginId.OHOS_HSP_PLUGIN) {
+            PluginStore_1.default.getInstance().hspModuleNames.push(packageJson.name);
+        }
         this.hmRouterPluginSet.add(pluginHandle);
     }
     deleteGeneratorFile(pluginHandle) {
@@ -79,7 +81,12 @@ class HMRouterPluginMgr {
         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');
+            Logger_1.Logger.info(pluginHandle.config.modulePath + ' delete obfuscation hmrouter-obfuscation-rules.txt');
+        }
+        let consumerRulesPath = pluginHandle.config.getConsumerRulesFilePath();
+        if (FileUtil_1.default.exist(consumerRulesPath)) {
+            FileUtil_1.default.unlinkSync(consumerRulesPath);
+            Logger_1.Logger.info(pluginHandle.config.modulePath + ' delete hmrouter-consumer-rules.txt');
         }
     }
 }
@@ -95,6 +102,7 @@ function hapPlugin() {
         }
     };
 }
+exports.hapPlugin = hapPlugin;
 function hspPlugin() {
     return {
         pluginId: CommonConstants_1.default.HSP_PLUGIN_ID,
@@ -106,6 +114,7 @@ function hspPlugin() {
         }
     };
 }
+exports.hspPlugin = hspPlugin;
 function harPlugin() {
     return {
         pluginId: CommonConstants_1.default.HAR_PLUGIN_ID,
@@ -117,3 +126,4 @@ function harPlugin() {
         }
     };
 }
+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/store/PluginStore.d.ts

@@ -0,0 +1,14 @@
+export default class PluginStore implements IPluginStore {
+    private static instance;
+    variableCache: Map<string, Map<string, string[]>>;
+    projectFilePath: string;
+    hspModuleNames: string[];
+    static clear(): void;
+    static getInstance(): IPluginStore;
+}
+interface IPluginStore {
+    variableCache: Map<string, Map<string, string[]>>;
+    projectFilePath: string;
+    hspModuleNames: string[];
+}
+export {};

package/dist/store/PluginStore.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class PluginStore {
+    constructor() {
+        this.variableCache = new Map();
+        this.projectFilePath = '';
+        this.hspModuleNames = [];
+    }
+    static clear() {
+        this.instance = null;
+    }
+    static getInstance() {
+        if (!this.instance) {
+            this.instance = new PluginStore();
+        }
+        return this.instance;
+    }
+}
+exports.default = PluginStore;
+PluginStore.instance = null;

package/dist/utils/FileUtil.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { FileUtil } from '@ohos/hvigor';
 import fs from 'fs';
 export default class HMFileUtil extends FileUtil {

package/dist/utils/ObfuscationUtil.js

@@ -19,8 +19,14 @@ class ObfuscationUtil {
             }).map((routerInfo) => {
                 return routerInfo.customData.functionName;
             }))];
+        let watchFunctionName = [...new Set(routerMap.filter((routerInfo) => {
+                return routerInfo.buildFunction;
+            }).map((routerInfo) => {
+                return routerInfo.buildFunction + CommonConstants_1.default.WARP_BUILDER;
+            }))];
         return CommonConstants_1.default.KEEP_FILE_NAME + CommonConstants_1.default.LINE_BREAK +
-            srcPathArr.concat(CommonConstants_1.default.KEEP_PROPERTY_NAME, classNameArr, functionName)
+            srcPathArr.concat(CommonConstants_1.default.KEEP_PROPERTY_NAME, functionName)
+                .concat(CommonConstants_1.default.KEEP_GLOBAL_NAME, classNameArr, watchFunctionName)
                 .join(CommonConstants_1.default.LINE_BREAK);
     }
 }

package/dist/utils/TsAstUtil.d.ts

@@ -1,8 +1,9 @@
 import { Project, SourceFile } from 'ts-morph';
 export declare let project: Project | null;
-export declare const importVariableCache: Map<string, string>;
 export declare class TsAstUtil {
-    static getSourceFile(filePath: string): SourceFile | null;
+    static getSourceFile(filePath: string): SourceFile;
     static clearProject(): void;
     static parseConstantValue(sourceFile: SourceFile, variableName: string, propertyName?: string): string;
+    static parseCrossModuleVariable(scanDir: string): Map<string, string[]>;
+    private static getExportedVariables;
 }

package/dist/utils/TsAstUtil.js

@@ -1,15 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TsAstUtil = exports.importVariableCache = exports.project = void 0;
+exports.TsAstUtil = exports.project = void 0;
 const ts_morph_1 = require("ts-morph");
 const hvigor_1 = require("@ohos/hvigor");
 const Logger_1 = require("../common/Logger");
 exports.project = null;
-exports.importVariableCache = new Map();
 class TsAstUtil {
     static getSourceFile(filePath) {
         if (!hvigor_1.FileUtil.exist(filePath)) {
-            return null;
+            Logger_1.Logger.warn(`File not found: ${filePath}`);
+            const normalizedPath = filePath.replace(/\.+\/+/g, './');
+            if (normalizedPath !== filePath && hvigor_1.FileUtil.exist(normalizedPath)) {
+                Logger_1.Logger.info(`Using normalized path instead: ${normalizedPath}`);
+                filePath = normalizedPath;
+            }
+            else {
+                throw new Error(`File not found: ${filePath}`);
+            }
         }
         if (!exports.project) {
             exports.project = new ts_morph_1.Project({
@@ -24,24 +31,24 @@ class TsAstUtil {
     static parseConstantValue(sourceFile, variableName, propertyName) {
         let result;
         if (propertyName) {
-            let classInstance = sourceFile.getClasses().filter((classes) => {
+            let classInstance = sourceFile.getClasses().find((classes) => {
                 return classes.getName() === variableName;
             });
-            if (classInstance.length === 0) {
+            if (!classInstance) {
                 throw new Error(`Unknown class '${variableName}'`);
             }
-            let property = classInstance[0].getProperties().filter((properties) => {
+            let property = classInstance.getProperties().find((properties) => {
                 return properties.getName() === propertyName;
             });
-            if (property.length === 0) {
+            if (!property) {
                 throw new Error(`Unknown property '${propertyName}'`);
             }
-            result = property[0].getInitializer();
+            result = property.getInitializer();
         }
         else {
-            let constant = sourceFile.getVariableDeclarations().filter(declaration => {
+            let constant = sourceFile.getVariableDeclarations().find(declaration => {
                 return declaration.getName() === variableName;
-            })[0];
+            });
             if (!constant) {
                 throw new Error(`Unknown constant '${variableName}'`);
             }
@@ -49,9 +56,42 @@ class TsAstUtil {
         }
         if (result.getKind() !== ts_morph_1.SyntaxKind.StringLiteral) {
             Logger_1.Logger.error(Logger_1.PluginError.ERR_INVALID_STRING_VALUE, variableName);
-            throw new Error('Invalid constant value');
+            throw new Error('Invalid constants value, only string literal is supported, variableName:' + variableName);
         }
         return result.asKind(ts_morph_1.SyntaxKind.StringLiteral)?.getLiteralValue();
     }
+    static parseCrossModuleVariable(scanDir) {
+        let sourceFiles = exports.project.addSourceFilesAtPaths(`${scanDir}/**/*.ets`);
+        const exportMap = new Map();
+        for (let sourceFile of sourceFiles) {
+            const exportedNames = this.getExportedVariables(sourceFile);
+            if (exportedNames.length > 0) {
+                exportMap.set(sourceFile.getFilePath(), exportedNames);
+            }
+        }
+        return exportMap;
+    }
+    static getExportedVariables(sourceFile) {
+        const exportSymbols = [];
+        let exportKeywordNodes = sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.ExportKeyword);
+        exportKeywordNodes.forEach((node) => {
+            let parentNodeKind = node.getParent()?.getKind();
+            switch (parentNodeKind) {
+                case ts_morph_1.SyntaxKind.VariableStatement:
+                    let variableStatement = node.getParent()?.asKind(ts_morph_1.SyntaxKind.VariableStatement);
+                    let variableNames = variableStatement.getDeclarationList().getDeclarations().map((declaration) => {
+                        return declaration.getName();
+                    });
+                    exportSymbols.push(...variableNames);
+                    break;
+                case ts_morph_1.SyntaxKind.ClassDeclaration:
+                    let classDeclaration = node.getParent();
+                    let className = classDeclaration?.asKind(ts_morph_1.SyntaxKind.ClassDeclaration)?.getName();
+                    exportSymbols.push(className);
+                    break;
+            }
+        });
+        return exportSymbols;
+    }
 }
 exports.TsAstUtil = TsAstUtil;