@hadss/hmrouter-plugin 1.0.0-rc.10 → 1.0.0-rc.11

package/dist/HMRouterAnalyzer.js

@@ -199,6 +199,9 @@ class AnalyzerService {
     parseIdentifierPropertyValue(value) {
         switch (value.getKind()) {
             case ts_morph_1.SyntaxKind.Identifier:
+                if (value.getText() === 'undefined') {
+                    throw new Error(`Invalid property value, in ${this.sourceFilePath}`);
+                }
                 return {
                     type: 'constant',
                     variableName: value.getText(),

package/dist/HMRouterHvigorPlugin.js

@@ -96,6 +96,10 @@ class HMRouterHvigorPlugin {
                 let serviceName = CommonConstants_1.default.SERVICE_PREFIX + analyzeResult.serviceName;
                 this.routerMap.push(new PluginModel_1.RouterInfo(serviceName, pageSourceFile, '', analyzeResult));
                 break;
+            case CommonConstants_1.default.SERVICE_PROVIDE_ANNOTATION:
+                let className = CommonConstants_1.default.SERVICE_PROVIDE_PREFIX + analyzeResult.serviceName;
+                this.routerMap.push(new PluginModel_1.RouterInfo(className, pageSourceFile, '', analyzeResult));
+                break;
         }
     }
     generateBuilder(analyzeResult, pageSourceFile, tempFilePath) {

package/dist/HMRouterPluginConfig.js

@@ -21,7 +21,8 @@ class HMRouterPluginConfig {
             ConfigConstants_1.default.ANIMATOR_ANNOTATION,
             ConfigConstants_1.default.INTERCEPTOR_ANNOTATION,
             ConfigConstants_1.default.LIFECYCLE_ANNOTATION,
-            ConfigConstants_1.default.SERVICE_ANNOTATION
+            ConfigConstants_1.default.SERVICE_ANNOTATION,
+            ConfigConstants_1.default.SERVICE_PROVIDE_ANNOTATION
         ];
         this.defaultPageTemplate =
             param.defaultPageTemplate ? param.defaultPageTemplate : ConfigConstants_1.default.DEFAULT_BUILD_TPL;

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");
@@ -124,16 +123,8 @@ class HMRouterPluginHandle {
             return;
         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);
-            }
-            rawFileRouterMap.hspModuleNames.push(...this.getRemoteHspModuleNames(node, pluginIds));
-        });
-        rawFileRouterMap.hspModuleNames = [...new Set(rawFileRouterMap.hspModuleNames)];
+        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) {

package/dist/Index.js

@@ -13,6 +13,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 +47,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) {

package/dist/constants/CommonConstants.d.ts

@@ -3,11 +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 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 VARIABLE_SEPARATOR = "__";
-    static readonly PAGE_URL = "pageUrl";
     static readonly ROUTER_MAP_KEY = "routerMap";
     static readonly FILE_SEPARATOR: "\\" | "/";
     static readonly DELIMITER = "/";
@@ -27,6 +25,7 @@ export default class HMRouterPluginConstant {
     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 = "./";

package/dist/constants/CommonConstants.js

@@ -10,11 +10,9 @@ HMRouterPluginConstant.ANIMATOR_PREFIX = '__animator__';
 HMRouterPluginConstant.INTERCEPTOR_PREFIX = '__interceptor__';
 HMRouterPluginConstant.LIFECYCLE_PREFIX = '__lifecycle__';
 HMRouterPluginConstant.SERVICE_PREFIX = '__service__';
-HMRouterPluginConstant.PAGE_URL_PREFIX = '';
+HMRouterPluginConstant.SERVICE_PROVIDE_PREFIX = '__service_provider__';
 HMRouterPluginConstant.OBFUSCATION_FILE_NAME = 'hmrouter-obfuscation-rules.txt';
 HMRouterPluginConstant.CONSUMER_FILE_NAME = 'hmrouter-consumer-rules.txt';
-HMRouterPluginConstant.VARIABLE_SEPARATOR = '__';
-HMRouterPluginConstant.PAGE_URL = 'pageUrl';
 HMRouterPluginConstant.ROUTER_MAP_KEY = 'routerMap';
 HMRouterPluginConstant.FILE_SEPARATOR = path_1.default.sep;
 HMRouterPluginConstant.DELIMITER = '/';
@@ -34,6 +32,7 @@ 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 = './';

package/dist/constants/ConfigConstants.d.ts

@@ -8,4 +8,5 @@ export default class ConfigConstants {
     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

@@ -11,5 +11,6 @@ ConfigConstants.ANIMATOR_ANNOTATION = 'HMAnimator';
 ConfigConstants.INTERCEPTOR_ANNOTATION = 'HMInterceptor';
 ConfigConstants.LIFECYCLE_ANNOTATION = 'HMLifecycle';
 ConfigConstants.SERVICE_ANNOTATION = 'HMService';
+ConfigConstants.SERVICE_PROVIDE_ANNOTATION = 'HMServiceProvider';
 exports.default = ConfigConstants;
 ;

package/dist/store/PluginStore.d.ts

@@ -2,11 +2,13 @@ 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

@@ -4,6 +4,7 @@ class PluginStore {
     constructor() {
         this.variableCache = new Map();
         this.projectFilePath = '';
+        this.hspModuleNames = [];
     }
     static clear() {
         this.instance = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hadss/hmrouter-plugin",
-  "version": "1.0.0-rc.10",
+  "version": "1.0.0-rc.11",
   "description": "HMRouter Compiler Plugin",
   "main": "dist/Index.js",
   "scripts": {
@@ -43,4 +43,4 @@
     "type": "git",
     "url": "https://gitee.com/hadss/hmrouter"
   }
-}
+}