@hadss/hmrouter-plugin 1.2.0 → 1.2.1

package/README.md

@@ -21,7 +21,7 @@ HMRouter编译插件是一个基于hvigor的编译插件，用于：
 ```json5
 {
   "dependencies": {
-    "@hadss/hmrouter-plugin": "^1.2.0"  // 使用最新版本
+    "@hadss/hmrouter-plugin": "^1.2.1"  // 使用最新版本
   },
   // ...其余配置
 }
@@ -438,6 +438,14 @@ hvigor 5.7.3及以上
 
 ## 更新日志
 
+### 1.2.1 (2025.10.20)
+
+- [修复低版本IDE编译错误](https://gitcode.com/openharmony-sig/ohrouter/issues/206)
+
+### 1.2.0 (2025.09.28)
+
+- 支持API20新接口的生成
+
 ### 1.2.0-rc.0 (2025.09.02)
 
 - [修复多target工程下编译app的问题](https://gitcode.com/openharmony-sig/ohrouter/issues/131)

package/dist/hmrouter_extension/constants/FilePathConstants.d.ts

@@ -13,6 +13,9 @@ export default class FilePathConstants {
     static readonly OH_MODULE_PATH = "oh_modules";
     static readonly OH_PACKAGE_FILE_NAME = "oh-package.json5";
     static readonly LINE_BREAK = "\n";
+    static readonly BUILD_PROFILE = "build-profile.json5";
+    static readonly SDK_HOME = "default/openharmony/ets/oh-uni-package.json";
+    static readonly DEFAULT_VALUE = 10;
     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";

package/dist/hmrouter_extension/constants/FilePathConstants.js

@@ -21,6 +21,9 @@ FilePathConstants.CURRENT_DELIMITER = './';
 FilePathConstants.OH_MODULE_PATH = 'oh_modules';
 FilePathConstants.OH_PACKAGE_FILE_NAME = 'oh-package.json5';
 FilePathConstants.LINE_BREAK = '\n';
+FilePathConstants.BUILD_PROFILE = 'build-profile.json5';
+FilePathConstants.SDK_HOME = 'default/openharmony/ets/oh-uni-package.json';
+FilePathConstants.DEFAULT_VALUE = 10;
 FilePathConstants.DEFAULT_SCAN_DIR = 'src/main/ets';
 FilePathConstants.DEFAULT_ROUTER_MAP_DIR = 'src/main/resources/base/profile';
 FilePathConstants.DEFAULT_BUILD_DIR = 'src/main/ets/generated';

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

@@ -1,4 +1,5 @@
 export interface TemplateModel {
+    sdkVersion: number;
     pageUrl: string;
     importPath: string;
     componentName: string;

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

@@ -1,8 +1,12 @@
 import { HMRouterExtensionContext } from '../HMRouterExtensionContext';
 export declare class CodeGenerationProcessor {
     private context;
+    private sdkVersion;
     constructor(context: HMRouterExtensionContext);
     execute(): void;
+    extractVersion(compatibleSdkVersion: string | number): number;
+    getCompileSdkVersion(): number;
+    getSdkVersion(json5FilePath: string, index: number): number;
     private generatePageFile;
     private matchedPath;
     private prepareTemplateModel;

package/dist/hmrouter_extension/processor/CodeGenerationProcessor.js

@@ -11,9 +11,11 @@ const PluginError_1 = require("../error/PluginError");
 const constants_1 = require("../constants");
 class CodeGenerationProcessor {
     constructor(context) {
+        this.sdkVersion = 0;
         this.context = context;
     }
     execute() {
+        this.sdkVersion = this.getCompileSdkVersion();
         framework_1.Logger.debug(this.context.node.getNodeName(), `Start to code generation...`);
         this.context.generatedPaths = new Map();
         this.context.getAnalyzeResults().forEach((result) => {
@@ -28,6 +30,63 @@ class CodeGenerationProcessor {
             }
         });
     }
+    extractVersion(compatibleSdkVersion) {
+        if (typeof compatibleSdkVersion === 'number') {
+            return compatibleSdkVersion;
+        }
+        else {
+            const match = compatibleSdkVersion.match(/\((\d+)\)/);
+            if (match && match[1]) {
+                return parseInt(match[1], 10);
+            }
+            const num = parseFloat(compatibleSdkVersion);
+            if (!isNaN(num) && num > constants_1.FilePathConstants.DEFAULT_VALUE) {
+                return num;
+            }
+            return constants_1.FilePathConstants.DEFAULT_VALUE;
+        }
+    }
+    getCompileSdkVersion() {
+        let json5FilePath = '';
+        let sdkVersion = constants_1.FilePathConstants.DEFAULT_VALUE;
+        let arrData = ['DEVECO_SDK_HOME', 'HOS_SDK_HOME', 'OHOS_SDK_HOME'];
+        for (let index = 0; index <= 4; index++) {
+            if (index < 3 && process.env[arrData[index]]) {
+                json5FilePath = framework_1.PluginFileUtil.pathResolve(process.env[arrData[index]], constants_1.FilePathConstants.SDK_HOME);
+            }
+            else if (index === 3) {
+                json5FilePath = framework_1.PluginFileUtil.pathResolve(framework_1.PluginStore.getInstance().get('projectFilePath'), constants_1.FilePathConstants.BUILD_PROFILE);
+            }
+            else if (index === 4) {
+                json5FilePath = framework_1.PluginFileUtil.pathResolve(framework_1.PluginStore.getInstance().get('projectFilePath'), constants_1.FilePathConstants.BUILD_PROFILE);
+            }
+            const sdkVer = this.getSdkVersion(json5FilePath, index);
+            if (sdkVer > constants_1.FilePathConstants.DEFAULT_VALUE) {
+                sdkVersion = sdkVer;
+                break;
+            }
+        }
+        return sdkVersion;
+    }
+    getSdkVersion(json5FilePath, index) {
+        if (framework_1.PluginFileUtil.exist(json5FilePath)) {
+            const data = framework_1.PluginFileUtil.readJson5(json5FilePath);
+            if (index < 3) {
+                return this.extractVersion(data.apiVersion);
+            }
+            else if (index === 3) {
+                if (data.app.products[0].compileSdkVersion) {
+                    return this.extractVersion(data.app.products[0].compileSdkVersion);
+                }
+            }
+            else if (index === 4) {
+                if (data.app.products[0].compatibleSdkVersion) {
+                    return this.extractVersion(data.app.products[0].compatibleSdkVersion);
+                }
+            }
+        }
+        return constants_1.FilePathConstants.DEFAULT_VALUE;
+    }
     generatePageFile(result, pageSourceFile, tempFilePath) {
         const templateModel = this.prepareTemplateModel(result, pageSourceFile);
         tempFilePath = this.determineTemplatePath(result, tempFilePath);
@@ -53,6 +112,7 @@ class CodeGenerationProcessor {
         let generatorViewName = constants_1.PrefixConstants.VIEW_NAME_PREFIX + analyzeResult.name + framework_1.StringUtil.stringToHashCode(analyzeResult.pageUrl);
         let templateData = this.context.getTemplateData(analyzeResult.name);
         return {
+            sdkVersion: this.sdkVersion,
             pageUrl: analyzeResult.pageUrl,
             componentName: analyzeResult.name,
             dialog: !!analyzeResult.dialog,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hadss/hmrouter-plugin",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "HMRouter Compiler Plugin",
   "main": "dist/Index.js",
   "scripts": {
@@ -8,7 +8,8 @@
     "test": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
     "dev": "tsc && node dist/index.js",
     "build": "tsc",
-    "release": "rm -rf ./dist && tsc && npm publish --access public"
+    "package": "rm -rf ./dist && tsc && npm pack",
+    "release": "rm -rf ./dist && npm i && tsc && npm publish --access public"
   },
   "keywords": [
     "hmrouter",

package/template/viewBuilder.ejs

@@ -48,10 +48,10 @@ export struct <%= componentName %>Generated {
       .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)})
+      <% if(sdkVersion>=15){ %>.onResult((result:ESObject)=>{this.helper.onResult(result)})<% } %>
+      <% if(sdkVersion>=17){ %>.onActive((activeReason:NavDestinationActiveReason)=>{this.helper.onActive(activeReason)})<% } %>
+      <% if(sdkVersion>=17){ %>.onInactive((inactiveReason:NavDestinationActiveReason)=>{this.helper.onInactive(inactiveReason)})<% } %>
+      <% if(sdkVersion>=19){ %>.onNewParam((newParam:ESObject)=>{this.helper.onNewParam(newParam)})<% } %>
     }else if(this.helper.sdkApiVersion>=17){
       NavDestination() {
         <%= componentName %>()
@@ -70,9 +70,9 @@ export struct <%= componentName %>Generated {
       .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)})
+      <% if(sdkVersion>=15){ %>.onResult((result:ESObject)=>{this.helper.onResult(result)})<% } %>
+      <% if(sdkVersion>=17){ %>.onActive((activeReason:NavDestinationActiveReason)=>{this.helper.onActive(activeReason)})<% } %>
+      <% if(sdkVersion>=17){ %>.onInactive((inactiveReason:NavDestinationActiveReason)=>{this.helper.onInactive(inactiveReason)})<% } %>
     }else if(this.helper.sdkApiVersion>=15){
       NavDestination() {
         <%= componentName %>()
@@ -91,7 +91,7 @@ export struct <%= componentName %>Generated {
       .onDisAppear(()=>{this.helper.onDisAppear()})
       .onReady((ctx)=>{this.helper.onReady(ctx)})
       .onBackPressed(()=> this.helper.onBackPressed())
-      .onResult((result:ESObject)=>{this.helper.onResult(result)})
+      <% if(sdkVersion>=15){ %>.onResult((result:ESObject)=>{this.helper.onResult(result)})<% } %>
     }else{
       NavDestination() {
         <%= componentName %>()