@hadss/hmrouter-plugin 1.2.0-rc.0 → 1.2.0

package/README.md

@@ -21,7 +21,7 @@ HMRouter编译插件是一个基于hvigor的编译插件，用于：
 ```json5
 {
   "dependencies": {
-    "@hadss/hmrouter-plugin": "^1.2.0-rc.0"  // 使用最新版本
+    "@hadss/hmrouter-plugin": "^1.2.0"  // 使用最新版本
   },
   // ...其余配置
 }

package/dist/HMRouterPluginManager.js

@@ -13,8 +13,10 @@ class HMRouterPluginManager {
         (0, framework_1.registerPluginExtension)(new HMRouterExtension_1.HMRouterDefaultExtension());
         hvigor_1.hvigor.nodesEvaluated(() => {
             this.moduleNodes.forEach((node) => {
-                if (this.controllerMap.has(node.getNodeName()))
+                if (this.controllerMap.has(node.getNodeName())) {
                     return;
+                }
+                ;
                 node.getAllPluginIds().forEach((pluginId) => {
                     this.registerPlugin(node, pluginId, {});
                 });

package/dist/Index.js

@@ -65,13 +65,16 @@ function appPlugin(options) {
             if (!options) {
                 throw new Error('No options provided');
             }
-            node.subNodes(subNode => {
-                if (options.ignoreModuleNames.includes(subNode.getNodeName())) {
-                    return;
-                }
-                HMRouterPluginManager_1.HMRouterPluginManager.getInstance().addModuleNode(subNode);
-            });
+            hondleNode(options, node);
         },
     };
 }
 exports.appPlugin = appPlugin;
+function hondleNode(options, node) {
+    node.subNodes(subNode => {
+        if (options.ignoreModuleNames.includes(subNode.getNodeName())) {
+            return;
+        }
+        HMRouterPluginManager_1.HMRouterPluginManager.getInstance().addModuleNode(subNode);
+    });
+}

package/dist/framework/core/TaskManager.js

@@ -43,10 +43,12 @@ class TaskManager {
         return allExtensions.sort((a, b) => {
             const aIsHMRouter = a.name?.includes('HMRouter') || false;
             const bIsHMRouter = b.name?.includes('HMRouter') || false;
-            if (aIsHMRouter && !bIsHMRouter)
+            if (aIsHMRouter && !bIsHMRouter) {
                 return -1;
-            if (!aIsHMRouter && bIsHMRouter)
+            }
+            if (!aIsHMRouter && bIsHMRouter) {
                 return 1;
+            }
             return 0;
         });
     }

package/dist/framework/extension/context/ExtensionContextImpl.d.ts

@@ -15,8 +15,8 @@ export declare class ExtensionContextImpl implements ExtensionContext {
     get currentView(): ReadonlyArray<BaseAnalyzeResult>;
     addAnalyzeResults(results: BaseAnalyzeResult | BaseAnalyzeResult[]): void;
     getAnalyzeResults<T extends BaseAnalyzeResult = BaseAnalyzeResult>(): Set<T>;
-    getTemplateData(componentName: string): Record<string, any> | undefined;
-    getTemplateDataMap(): Map<string, Record<string, any>>;
+    getTemplateData(componentName: string): Record<string, unknown> | undefined;
+    getTemplateDataMap(): Map<string, Record<string, unknown>>;
     addTemplateData(componentName: string, data: Record<string, any>): void;
     private validateAnalyzeResult;
     private syncToCurrentView;

package/dist/framework/extension/context/ExtensionContextImpl.js

@@ -76,8 +76,10 @@ class ExtensionContextImpl {
     syncToCurrentView(results) {
         const key = this.getActiveTargetKey();
         const state = this.getOrCreateState(key);
-        if (!state.currentFilePath)
+        if (!state.currentFilePath) {
             return;
+        }
+        ;
         const resultsArray = Array.isArray(results) ? results : [results];
         const currentFileResults = resultsArray.filter(result => result.sourceFilePath === state.currentFilePath);
         state.currentView.push(...currentFileResults);

package/dist/framework/utils/Logger.d.ts

@@ -7,6 +7,6 @@ export declare class Logger {
         error: (msg: string, ...args: unknown[]) => void;
         info: (msg: string, ...args: unknown[]) => void;
         warn: (msg: string, ...args: unknown[]) => void;
-        debug: (msg: string, ...args: unknown[]) => void;
+        debug: (msg: string, args: unknown[]) => void;
     };
 }

package/dist/hmrouter_extension/HMRouterExtension.d.ts

@@ -6,6 +6,7 @@ export declare class HMRouterDefaultExtension extends PluginExtension<HMRouterEx
     afterInitialize(context: HMRouterExtensionContext): void;
     afterAnnotationAnalysis(sourceFile: SourceFile, filePath: string, context: HMRouterExtensionContext): void;
     private executeConstantParsing;
+    private getCurrentView;
     afterCodeGeneration(context: HMRouterExtensionContext): void;
     afterRouterMapBuilding(context: HMRouterExtensionContext): void;
     afterConfigUpdate(context: HMRouterExtensionContext): void;

package/dist/hmrouter_extension/HMRouterExtension.js

@@ -58,15 +58,7 @@ class HMRouterDefaultExtension extends framework_1.PluginExtension {
             });
             contextImpl.analyzeResults = updatedResults;
             for (let i = 0; i < currentView.length; i++) {
-                const viewResult = currentView[i];
-                if (viewResult.sourceFilePath === currentFilePath) {
-                    for (const parsedResult of resultsSet) {
-                        if (parsedResult.name === viewResult.name && parsedResult.sourceFilePath === viewResult.sourceFilePath) {
-                            currentView[i] = parsedResult;
-                            break;
-                        }
-                    }
-                }
+                this.getCurrentView(currentView, currentFilePath, resultsSet, i);
             }
             framework_2.Logger.debug(this.name, `Constant parsing completed for file: ${filePath}`);
         }
@@ -74,6 +66,17 @@ class HMRouterDefaultExtension extends framework_1.PluginExtension {
             framework_2.Logger.warn(this.name, `Failed to execute constant parsing for file ${filePath}: ${error}`);
         }
     }
+    getCurrentView(currentView, currentFilePath, resultsSet, i) {
+        const viewResult = currentView[i];
+        if (viewResult.sourceFilePath === currentFilePath) {
+            for (const parsedResult of resultsSet) {
+                if (parsedResult.name === viewResult.name && parsedResult.sourceFilePath === viewResult.sourceFilePath) {
+                    currentView[i] = parsedResult;
+                    break;
+                }
+            }
+        }
+    }
     afterCodeGeneration(context) {
         const generator = new processor_1.CodeGenerationProcessor(context);
         generator.execute();

package/dist/hmrouter_extension/analyzer/utils/DecoratorParser.d.ts

@@ -4,4 +4,5 @@ import { BaseAnalyzeResult } from '../../../framework';
 export declare class DecoratorParser {
     static parseDecorator(decorator: Decorator, constantResolver: IConstantResolver, sourceFile: SourceFile, filePath: string): BaseAnalyzeResult;
     static parseDecoratorArguments(decorator: Decorator, constantResolver: IConstantResolver, sourceFile: SourceFile, filePath: string): BaseAnalyzeResult;
+    static hondleObjLiteral(prop: any, constantResolver: IConstantResolver, sourceFile: SourceFile, filePath: string, argResult: BaseAnalyzeResult): void;
 }

package/dist/hmrouter_extension/analyzer/utils/DecoratorParser.js

@@ -23,19 +23,22 @@ class DecoratorParser {
             const objLiteral = arg.asKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
             if (objLiteral) {
                 objLiteral.getProperties().forEach((prop) => {
-                    if (prop.getKind() === ts_morph_1.SyntaxKind.PropertyAssignment) {
-                        const propertyAssignment = prop;
-                        const propertyName = propertyAssignment.getName();
-                        const initializer = propertyAssignment.getInitializer();
-                        if (initializer) {
-                            const propertyValue = constantResolver.resolvePropertyValue(initializer, sourceFile, filePath);
-                            Reflect.set(argResult, propertyName, propertyValue);
-                        }
-                    }
+                    this.hondleObjLiteral(prop, constantResolver, sourceFile, filePath, argResult);
                 });
             }
         });
         return argResult;
     }
+    static hondleObjLiteral(prop, constantResolver, sourceFile, filePath, argResult) {
+        if (prop.getKind() === ts_morph_1.SyntaxKind.PropertyAssignment) {
+            const propertyAssignment = prop;
+            const propertyName = propertyAssignment.getName();
+            const initializer = propertyAssignment.getInitializer();
+            if (initializer) {
+                const propertyValue = constantResolver.resolvePropertyValue(initializer, sourceFile, filePath);
+                Reflect.set(argResult, propertyName, propertyValue);
+            }
+        }
+    }
 }
 exports.DecoratorParser = DecoratorParser;

package/dist/hmrouter_extension/error/PluginError.d.ts

@@ -22,8 +22,8 @@ export declare enum ErrorCode {
 export declare class PluginError extends Error {
     readonly code: ErrorCode;
     readonly module: string;
-    readonly data?: any;
-    constructor(code: ErrorCode, module: string, params?: string | string[], data?: any);
+    readonly data?: unknown;
+    constructor(code: ErrorCode, module: string, params?: string | string[], data?: unknown);
     private logError;
     static create(code: ErrorCode, module: string, params?: string | string[], data?: any): PluginError;
 }

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

@@ -1,6 +1,6 @@
 import { BaseAnalyzeResult } from '../../framework';
 export interface HMRouterResult extends BaseAnalyzeResult {
-    pageUrl: any;
+    pageUrl: string;
     dialog?: boolean;
     singleton?: boolean;
     interceptors?: string[];

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

@@ -9,5 +9,6 @@ export declare class CodeGenerationProcessor {
     private determineTemplatePath;
     private generateFile;
     private detectLibraryVersion;
+    private detectLibraryVersion2;
     private getLibraryPossiblePaths;
 }

package/dist/hmrouter_extension/processor/CodeGenerationProcessor.js

@@ -91,18 +91,23 @@ class CodeGenerationProcessor {
         let libraryVersion = '';
         const possiblePaths = this.getLibraryPossiblePaths();
         for (const packagePath of possiblePaths) {
-            try {
-                if (framework_1.PluginFileUtil.exist(packagePath)) {
-                    const packageJson = framework_1.PluginFileUtil.readJson5(packagePath);
-                    libraryVersion = packageJson[constants_1.VersionConstants.HMROUTER_VERSION_KEY] || '';
-                    if (libraryVersion) {
-                        break;
-                    }
-                }
+            libraryVersion = this.detectLibraryVersion2(packagePath);
+            if (libraryVersion) {
+                break;
             }
-            catch (error) {
+        }
+        return libraryVersion;
+    }
+    detectLibraryVersion2(packagePath) {
+        let libraryVersion = '';
+        try {
+            if (framework_1.PluginFileUtil.exist(packagePath)) {
+                const packageJson = framework_1.PluginFileUtil.readJson5(packagePath);
+                libraryVersion = packageJson[constants_1.VersionConstants.HMROUTER_VERSION_KEY] || '';
             }
         }
+        catch (error) {
+        }
         return libraryVersion;
     }
     getLibraryPossiblePaths() {

package/dist/hmrouter_extension/processor/ObfuscationProcessor.js

@@ -37,18 +37,35 @@ class ObfuscationProcessor {
     isEnableObfuscation(buildProfileOpt) {
         const currentBuildMode = framework_1.PluginStore.getInstance().get('buildMode');
         const buildOption = buildProfileOpt.buildOptionSet?.find((item) => item.name === currentBuildMode);
-        if (!buildOption) {
-            return false;
+        const target = buildProfileOpt.targets?.find((item) => item.name === this.context.currentTarget?.getTargetName);
+        if (target) {
+            const config = framework_1.ObjectUtils.ensureNestedObject(target, ['config']);
+            const buildOption = framework_1.ObjectUtils.ensureNestedObject(config, ['buildOption']);
+            const arkOptions = framework_1.ObjectUtils.ensureNestedObject(buildOption, ['arkOptions']);
+            const obfuscation = framework_1.ObjectUtils.ensureNestedObject(arkOptions, ['obfuscation']);
+            const ruleOptions = framework_1.ObjectUtils.ensureNestedObject(obfuscation, ['ruleOptions']);
+            const isObfuscationEnabled = !!ruleOptions.enable;
+            if (!isObfuscationEnabled) {
+                return false;
+            }
+            if (this.context.config?.autoObfuscation) {
+                this.addHMRouterObfuscationRules(ruleOptions, obfuscation);
+            }
         }
-        const arkOptions = framework_1.ObjectUtils.ensureNestedObject(buildOption, ['arkOptions']);
-        const obfuscationOptions = framework_1.ObjectUtils.ensureNestedObject(arkOptions, ['obfuscation']);
-        const ruleOptions = framework_1.ObjectUtils.ensureNestedObject(obfuscationOptions, ['ruleOptions']);
-        const isObfuscationEnabled = !!ruleOptions.enable;
-        if (!isObfuscationEnabled) {
-            return false;
+        else if (buildOption) {
+            const arkOptions = framework_1.ObjectUtils.ensureNestedObject(buildOption, ['arkOptions']);
+            const obfuscationOptions = framework_1.ObjectUtils.ensureNestedObject(arkOptions, ['obfuscation']);
+            const ruleOptions = framework_1.ObjectUtils.ensureNestedObject(obfuscationOptions, ['ruleOptions']);
+            const isObfuscationEnabled = !!ruleOptions.enable;
+            if (!isObfuscationEnabled) {
+                return false;
+            }
+            if (this.context.config?.autoObfuscation) {
+                this.addHMRouterObfuscationRules(ruleOptions, obfuscationOptions);
+            }
         }
-        if (this.context.config?.autoObfuscation) {
-            this.addHMRouterObfuscationRules(ruleOptions, obfuscationOptions);
+        else {
+            return false;
         }
         return true;
     }

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

@@ -4,6 +4,7 @@ export declare class RouterMapBuildingProcessor {
     constructor(context: HMRouterExtensionContext);
     execute(): void;
     private buildRouterMap;
+    private useAnnotationConfig;
     private generateRouterMapFile;
     private readExistingRouterMap;
 }

package/dist/hmrouter_extension/processor/RouterMapBuildingProcessor.js

@@ -35,6 +35,9 @@ class RouterMapBuildingProcessor {
             });
             return;
         }
+        this.useAnnotationConfig(result, pageSourceFile);
+    }
+    useAnnotationConfig(result, pageSourceFile) {
         const annotationConfig = {
             [constants_1.AnnotationConstants.ANIMATOR_ANNOTATION]: {
                 prefix: constants_1.PrefixConstants.ANIMATOR_PREFIX,

package/examples/CustomExtension.ts

@@ -55,51 +55,56 @@ export class RouterParamAnalyzer {
     // 解析结构体声明中的RouterParam注解
     sourceFile.getChildrenOfKind(SyntaxKind.MissingDeclaration).forEach((node, index) => {
       node.getChildrenOfKind(SyntaxKind.Decorator).forEach((decorator) => {
-        if (decorator.getName() === "RouterParam") {
-          // 解析RouterParam注解的参数
-          const result: MyAnalyzeResult = {
-            name: viewNameArr[index],
-            annotation: decorator.getName(),
-            sourceFilePath: filePath
-          };
-
-          // 解析装饰器参数
-          decorator.getArguments().forEach((arg) => {
-            const objLiteral = arg.asKind(SyntaxKind.ObjectLiteralExpression);
-            if (objLiteral) {
-              objLiteral.getProperties().forEach((prop) => {
-                if (prop.getKind() === SyntaxKind.PropertyAssignment) {
-                  const propertyAssignment = prop as PropertyAssignment;
-                  const propertyName = propertyAssignment.getName();
-                  const initializer = propertyAssignment.getInitializer();
-
-                  if (initializer) {
-                    // 将解析结果添加到result对象
-                    result[propertyName] = this.parsePrimitiveValue(initializer);
-                  }
-                }
-              });
-            }
-          });
+        this.getDecorator(decorator, viewNameArr, index, filePath, context);
+      });
+    });
+  }
 
-          // 如果需要后续保存到路由表中请调用addAnalyzeResults添加分析结果
-          // context.addAnalyzeResults(result);
+  private getDecorator(decorator: any, viewNameArr: any, index: number, filePath: any, context: MyExtensionContext): void {
+    if (decorator.getName() === 'RouterParam') {
+      // 解析RouterParam注解的参数
+      const result: MyAnalyzeResult = {
+        name: viewNameArr[index],
+        annotation: decorator.getName(),
+        sourceFilePath: filePath
+      };
+
+      // 解析装饰器参数
+      decorator.getArguments().forEach((arg) => {
+        const objLiteral = arg.asKind(SyntaxKind.ObjectLiteralExpression);
+        if (objLiteral) {
+          this.handleObjLiteral(objLiteral, result);
+        }
+      });
 
-          // 为组件添加模板数据，用于代码生成
-          context.addTemplateData(result.name, {
-            paramType: result['paramType'] || 'default',
-            isCustomParam: true,
-            customParams: result['params'] || [],
-            sourceFile: filePath
-          });
+      // 为组件添加模板数据，用于代码生成
+      context.addTemplateData(result.name, {
+        paramType: result.paramType || 'default',
+        isCustomParam: true,
+        customParams: result.params || [],
+        sourceFile: filePath
+      });
+
+      Logger.debug('', `发现RouterParam注解: ${result.name}`);
+    }
+  }
 
-          Logger.debug('', `发现RouterParam注解: ${result.name}`);
+  private handleObjLiteral(objLiteral: any, result: MyAnalyzeResult): void {
+    objLiteral.getProperties().forEach((prop) => {
+      if (prop.getKind() === SyntaxKind.PropertyAssignment) {
+        const propertyAssignment = prop as PropertyAssignment;
+        const propertyName = propertyAssignment.getName();
+        const initializer = propertyAssignment.getInitializer();
+
+        if (initializer) {
+          // 将解析结果添加到result对象
+          result[propertyName] = this.parsePrimitiveValue(initializer);
         }
-      });
+      }
     });
   }
 
-  private parsePrimitiveValue(value: Expression): any {
+  private parsePrimitiveValue(value: Expression): string {
     let propertyValue;
     switch (value.getKind()) {
       case SyntaxKind.StringLiteral:
@@ -141,45 +146,53 @@ export class CustomPageAnalyzer {
     // 分析使用@CustomPage注解的类
     sourceFile.getClasses().forEach((cls: ClassDeclaration) => {
       cls.getDecorators().forEach(decorator => {
-        if (decorator.getName() === 'CustomPage') {
-          const className = cls.getName() || '';
-
-          // 创建分析结果
-          const result: MyAnalyzeResult = {
-            name: className,
-            annotation: 'CustomPage',
-            sourceFilePath: filePath
-          };
-
-          // 解析装饰器参数
-          decorator.getArguments().forEach((arg) => {
-            const objLiteral = arg.asKind(SyntaxKind.ObjectLiteralExpression);
-            if (objLiteral) {
-              objLiteral.getProperties().forEach((prop) => {
-                if (prop.getKind() === SyntaxKind.PropertyAssignment) {
-                  const propertyAssignment = prop as PropertyAssignment;
-                  const propertyName = propertyAssignment.getName();
-                  const initializer = propertyAssignment.getInitializer();
-
-                  if (initializer && initializer.getKind() === SyntaxKind.StringLiteral) {
-                    result[propertyName] = initializer.asKind(SyntaxKind.StringLiteral)?.getLiteralValue();
-                  }
-                }
-              });
-            }
-          });
+        this.getDecorator(decorator, cls, filePath, context);
+      });
+    });
+  }
+
+  private getDecorator(decorator: any, cls: ClassDeclaration, filePath: any, context: MyExtensionContext): void {
+    if (decorator.getName() === 'CustomPage') {
+      const className = cls.getName() || '';
+
+      // 创建分析结果
+      const result: MyAnalyzeResult = {
+        name: className,
+        annotation: 'CustomPage',
+        sourceFilePath: filePath
+      };
+
+      // 解析装饰器参数
+      decorator.getArguments().forEach((arg) => {
+        const objLiteral = arg.asKind(SyntaxKind.ObjectLiteralExpression);
+        if (objLiteral) {
+          this.handleObjLiteral(objLiteral, result);
+        }
+      });
+
+      // 添加分析结果
+      context.addAnalyzeResults(result);
 
-          // 添加分析结果
-          context.addAnalyzeResults(result);
+      // 存储自定义页面路径信息
+      const customPages = context.customPages || [];
+      customPages.push(result);
+      context.customPages = customPages;
 
-          // 存储自定义页面路径信息
-          const customPages = context.customPages || [];
-          customPages.push(result);
-          context.customPages = customPages;
+      Logger.debug('', `发现CustomPage注解: ${className}, pageUrl: ${result.pageUrl}`);
+    }
+  }
 
-          Logger.debug('', `发现CustomPage注解: ${className}, pageUrl: ${result['pageUrl']}`);
+  private handleObjLiteral(objLiteral: any, result: MyAnalyzeResult): void {
+    objLiteral.getProperties().forEach((prop) => {
+      if (prop.getKind() === SyntaxKind.PropertyAssignment) {
+        const propertyAssignment = prop as PropertyAssignment;
+        const propertyName = propertyAssignment.getName();
+        const initializer = propertyAssignment.getInitializer();
+
+        if (initializer && initializer.getKind() === SyntaxKind.StringLiteral) {
+          result[propertyName] = initializer.asKind(SyntaxKind.StringLiteral)?.getLiteralValue();
         }
-      });
+      }
     });
   }
 }
@@ -222,7 +235,7 @@ export class CustomPluginExtension extends PluginExtension<MyExtensionContext> {
 
     // 将CustomPage添加到路由表
     for (const page of customPages) {
-      const pageUrl = page.customData['pageUrl'];
+      const pageUrl = page.customData.pageUrl;
       if (pageUrl) {
         // 检查路由表中是否已存在该路径
         const existingRoute = context.routerMap.find(route => route.customData.pageUrl === pageUrl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hadss/hmrouter-plugin",
-  "version": "1.2.0-rc.0",
+  "version": "1.2.0",
   "description": "HMRouter Compiler Plugin",
   "main": "dist/Index.js",
   "scripts": {

package/template/viewBuilder.ejs

@@ -30,22 +30,87 @@ export struct <%= componentName %>Generated {
   private helper: NavDestinationHelper = new NavDestinationHelper(this);
 
   build() {
-    NavDestination() {
-      <%= componentName %>()
+    if(this.helper.sdkApiVersion>=19){
+      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.onWillShow()})
+      .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())
+      .onResult((result:ESObject)=>{this.helper.onResult(result)})
+      .onActive((activeReason:NavDestinationActiveReason)=>{this.helper.onActive(activeReason)})
+      .onInactive((inactiveReason:NavDestinationActiveReason)=>{this.helper.onInactive(inactiveReason)})
+      .onNewParam((newParam:ESObject)=>{this.helper.onNewParam(newParam)})
+    }else if(this.helper.sdkApiVersion>=17){
+      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.onWillShow()})
+      .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())
+      .onResult((result:ESObject)=>{this.helper.onResult(result)})
+      .onActive((activeReason:NavDestinationActiveReason)=>{this.helper.onActive(activeReason)})
+      .onInactive((inactiveReason:NavDestinationActiveReason)=>{this.helper.onInactive(inactiveReason)})
+    }else if(this.helper.sdkApiVersion>=15){
+      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.onWillShow()})
+      .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())
+      .onResult((result:ESObject)=>{this.helper.onResult(result)})
+    }else{
+      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.onWillShow()})
+      .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())
     }
-    <% 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.onWillShow()})
-    .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())
+    
   }
 }