@hadss/hmrouter-plugin 1.0.0-rc.9 → 1.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hadss/hmrouter-plugin",
-  "version": "1.0.0-rc.9",
+  "version": "1.1.0-beta.0",
   "description": "HMRouter Compiler Plugin",
   "main": "dist/Index.js",
   "scripts": {
@@ -8,7 +8,6 @@
     "test": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
     "dev": "tsc && node dist/index.js",
     "build": "tsc",
-    "package": "tsc && npm pack && mv hadss*.tgz ../libs",
     "release": "tsc && npm publish --access public"
   },
   "keywords": [
@@ -24,8 +23,9 @@
     "ts-morph": "^23.0.0"
   },
   "devDependencies": {
-    "@ohos/hvigor": "5.7.4",
-    "@ohos/hvigor-ohos-plugin": "5.7.4",
+    "@ohos/hvigor": "^5.8.9",
+    "@ohos/hvigor-ohos-plugin": "^5.8.9",
+    "typescript": "4.9.5",
     "@types/chai": "^4.3.19",
     "@types/ejs": "^3.1.5",
     "@types/micromatch": "^4.0.9",
@@ -39,9 +39,10 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "homepage": "https://gitee.com/hadss/hmrouter",
+  "homepage": "https://gitcode.com/openharmony-sig/ohrouter",
   "repository": {
     "type": "git",
-    "url": "https://gitee.com/hadss/hmrouter"
+    "url": "git+https://gitcode.com/openharmony-sig/ohrouter.git",
+    "directory": "HMRouterPlugin"
   }
-}
+}

package/template/customBuilder.ejs

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// auto-generated <%= componentName %>Builder.ets by HMRouter
+import <%if(isDefaultExport) {%> <%= componentName %> <% } else {%> { <%= componentName %> } <% } %> from '<%= importPath %>'
+
+@Builder
+export function <%= componentName %>Builder(name: string, param: Object) {
+  <%= componentName %>()
+}
+
+export const <%= componentName %>BuilderWrapBuilder = wrapBuilder(<%= componentName %>Builder)

package/template/viewBuilder.ejs

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// auto-generated <%= componentName %>Builder.ets by HMRouter
+import <%if(isDefaultExport) {%> <%= componentName %> <% } else {%> { <%= componentName %> } <% } %> from '<%= importPath %>'
+import { NavDestinationHelper } from '@hadss/hmrouter';
+
+@Builder
+export function <%= componentName %>Builder(name: string, param: Object) {
+  <%= componentName %>Generated()
+}
+
+export const <%= componentName %>BuilderWrapBuilder = wrapBuilder(<%= componentName %>Builder)
+
+@Component
+export struct <%= componentName %>Generated {
+  private helper: NavDestinationHelper = new NavDestinationHelper(this);
+
+  build() {
+    NavDestination() {
+      <%= componentName %>()
+    }
+    <% if(dialog){ %>.mode(NavDestinationMode.DIALOG)<% } %>
+    .hideTitleBar(true)
+    .attributeModifier(this.helper.modifier)
+    .gestureModifier(this.helper.gestureModifier)
+    .onWillAppear(()=>{this.helper.onWillAppear()})
+    .onAppear(() => {this.helper.onAppear()})
+    .onWillShow(()=>{this.helper.onWillAppear()})
+    .onShown(()=>{this.helper.onShown()})
+    .onWillHide(()=>{this.helper.onWillHide()})
+    .onHidden(()=>{this.helper.onHidden()})
+    .onWillDisappear(()=>{this.helper.onWillDisappear()})
+    .onDisAppear(()=>{this.helper.onDisAppear()})
+    .onReady((ctx)=>{this.helper.onReady(ctx)})
+    .onBackPressed(()=> this.helper.onBackPressed())
+  }
+}

package/dist/common/Constant.d.ts

@@ -1,27 +0,0 @@
-export declare class HMRouterPluginConstant {
-    static readonly ANIMATOR_PREFIX = "__animator__";
-    static readonly INTERCEPTOR_PREFIX = "__interceptor__";
-    static readonly LIFECYCLE_PREFIX = "__lifecycle__";
-    static readonly SERVICE_PREFIX = "__service__";
-    static readonly PAGE_URL_PREFIX = "";
-    static readonly FILE_SEPARATOR: "\\" | "/";
-    static readonly DELIMITER = "/";
-    static readonly MODULE_ROUTER_MAP_NAME = "$profile:hm_router_map";
-    static readonly ROUTER_MAP_NAME = "hm_router_map.json";
-    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 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 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 CLASS_ANNOTATION_ARR: string[];
-    static readonly CONFIG_FILE_NAME = "hmrouter_config.json";
-    static readonly PARENT_DELIMITER = "../";
-}

package/dist/common/Constant.js

@@ -1,35 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HMRouterPluginConstant = void 0;
-const path_1 = __importDefault(require("path"));
-class HMRouterPluginConstant {
-}
-exports.HMRouterPluginConstant = HMRouterPluginConstant;
-HMRouterPluginConstant.ANIMATOR_PREFIX = '__animator__';
-HMRouterPluginConstant.INTERCEPTOR_PREFIX = '__interceptor__';
-HMRouterPluginConstant.LIFECYCLE_PREFIX = '__lifecycle__';
-HMRouterPluginConstant.SERVICE_PREFIX = '__service__';
-HMRouterPluginConstant.PAGE_URL_PREFIX = '';
-HMRouterPluginConstant.FILE_SEPARATOR = path_1.default.sep;
-HMRouterPluginConstant.DELIMITER = '/';
-HMRouterPluginConstant.MODULE_ROUTER_MAP_NAME = '$profile:hm_router_map';
-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.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.ROUTER_ANNOTATION = 'HMRouter';
-HMRouterPluginConstant.ANIMATOR_ANNOTATION = 'HMAnimator';
-HMRouterPluginConstant.INTERCEPTOR_ANNOTATION = 'HMInterceptor';
-HMRouterPluginConstant.LIFECYCLE_ANNOTATION = 'HMLifecycle';
-HMRouterPluginConstant.SERVICE_ANNOTATION = 'HMService';
-HMRouterPluginConstant.CLASS_ANNOTATION_ARR = ['HMAnimator', 'HMInterceptor', 'HMLifecycle'];
-HMRouterPluginConstant.CONFIG_FILE_NAME = 'hmrouter_config.json';
-HMRouterPluginConstant.PARENT_DELIMITER = '../';

package/dist/utils/ConfusionUtil.d.ts

@@ -1,4 +0,0 @@
-import { RouterInfo } from '../common/PluginModel';
-export default class ConfusionUtil {
-    static buildObfuscatedStrings(routerMap: RouterInfo[]): string;
-}

package/dist/utils/ConfusionUtil.js

@@ -1,27 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const CommonConstants_1 = __importDefault(require("../constants/CommonConstants"));
-class ConfusionUtil {
-    static buildObfuscatedStrings(routerMap) {
-        let srcPathArr = [...new Set(routerMap.map((routerInfo) => {
-                return CommonConstants_1.default.CURRENT_DELIMITER + routerInfo.pageSourceFile;
-            }))];
-        let classNameArr = [...new Set(routerMap.filter((routerInfo) => {
-                return routerInfo.name.includes('__');
-            }).map((routerInfo) => {
-                return routerInfo.customData.name;
-            }))];
-        let functionName = [...new Set(routerMap.filter((routerInfo) => {
-                return routerInfo.name.includes(CommonConstants_1.default.SERVICE_PREFIX);
-            }).map((routerInfo) => {
-                return routerInfo.customData.functionName;
-            }))];
-        return CommonConstants_1.default.KEEP_FILE_NAME + CommonConstants_1.default.LINE_BREAK +
-            srcPathArr.concat(CommonConstants_1.default.KEEP_PROPERTY_NAME, classNameArr, functionName)
-                .join(CommonConstants_1.default.LINE_BREAK);
-    }
-}
-exports.default = ConfusionUtil;

package/viewBuilder.ejs

@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// auto-generated <%= componentName %>Builder.ets by HMRouter
-import { <%= componentName %> } from '<%= importPath %>'
-import { TemplateService, TranslateOption, ScaleOption, OpacityOption } from '@hadss/hmrouter'
-
-@Builder
-export function <%= componentName %>Builder(name: string, param: Object) {
-  <%= componentName %>Generated()
-}
-
-@Component
-export struct <%= componentName %>Generated {
-  @State translateOption: TranslateOption = new TranslateOption()
-  @State scaleOption: ScaleOption = new ScaleOption()
-  @State opacityOption: OpacityOption = new OpacityOption()
-  private pageUrl: string = '<%= pageUrl %>'
-  private ndId: string = ''
-  private navigationId: string = ''
-
-  aboutToAppear(): void {
-    this.navigationId = this.queryNavigationInfo()!.navigationId;
-    TemplateService.aboutToAppear(this.navigationId, this.pageUrl, <%= dialog %>,
-      this.translateOption, this.scaleOption, this.opacityOption)
-  }
-
-  aboutToDisappear(): void {
-    TemplateService.aboutToDisappear(this.navigationId, this.pageUrl, this.ndId)
-  }
-
-  build() {
-    NavDestination() {
-      <%= componentName %>()
-    }
-    <% if(dialog){ %>.mode(NavDestinationMode.DIALOG)<% } %>
-    .hideTitleBar(true)
-    .hitTestBehavior(HitTestMode.Transparent)
-    .gesture(PanGesture()
-      .onActionStart((event: GestureEvent) => {
-        TemplateService.interactiveStart(this.navigationId, this.ndId, event)
-      })
-      .onActionUpdate((event: GestureEvent) =>{
-        TemplateService.interactiveProgress(this.navigationId, this.ndId, event)
-      })
-      .onActionEnd((event: GestureEvent) =>{
-        TemplateService.interactiveFinish(this.navigationId, this.ndId, event)
-      })
-    )
-    .translate(this.translateOption)
-    .scale(this.scaleOption)
-    .opacity(this.opacityOption.opacity)
-    .onAppear(() => {
-      TemplateService.onAppear(this.navigationId, this.pageUrl, this.ndId)
-    })
-    .onDisAppear(() => {
-      TemplateService.onDisAppear(this.navigationId, this.pageUrl, this.ndId)
-    })
-    .onShown(() => {
-      TemplateService.onShown(this.navigationId, this.pageUrl, this.ndId)
-    })
-    .onHidden(() => {
-      TemplateService.onHidden(this.navigationId, this.pageUrl, this.ndId)
-    })
-    .onWillAppear(() => {
-      TemplateService.onWillAppear(this.navigationId, this.pageUrl)
-    })
-    .onWillDisappear(() => {
-      TemplateService.onWillDisappear(this.navigationId, this.pageUrl, this.ndId)
-    })
-    .onWillShow(() => {
-      TemplateService.onWillShow(this.navigationId, this.pageUrl, this.ndId)
-    })
-    .onWillHide(() => {
-      TemplateService.onWillHide(this.navigationId, this.pageUrl, this.ndId)
-    })
-    .onReady((navContext: NavDestinationContext) => {
-      this.ndId = navContext.navDestinationId!
-      TemplateService.onReady(this.navigationId, this.pageUrl, navContext)
-    })
-    .onBackPressed(() => {
-      return TemplateService.onBackPressed(this.navigationId, this.pageUrl, this.ndId)
-    })
-  }
-}