fix(builder): compare dotted versions correctly for Xcode and iOS checks

Author: yangchao

src/core/base/test/parse.test.ts

@@ -0,0 +1,14 @@
+import { compareVersion } from '../utils/parse';
+
+describe('parse.compareVersion', () => {
+    it('compares versions segment by segment', () => {
+        expect(compareVersion('1.0.10', '1.0.2')).toBeGreaterThan(0);
+        expect(compareVersion('14.10', '14.3')).toBeGreaterThan(0);
+        expect(compareVersion('1.0.0.2', '1.0.0.3')).toBeLessThan(0);
+        expect(compareVersion('14.3', '14.3.0')).toBe(0);
+    });
+
+    it('throws when params are not strings', () => {
+        expect(() => compareVersion(null as unknown as string, '1.0.0')).toThrow('invalid param');
+    });
+});

src/core/base/utils/parse.ts

@@ -1,17 +1,31 @@
 'use strict';
 
 /**
- * return result of versionMax > versionMin，其中仅支持纯数字版本，最高支持三位数版本号：333.666.345
- * @example (3.6.2, 3.7.0) => false; (3.9.0, 3.8.0) => true; (3.8.0, 3.8.0) => false;
- * @param versionMax
- * @param versionMin
+ * Compare dotted numeric versions segment by segment.
+ * @example compareVersion('3.6.2', '3.7.0') => -1
+ * @example compareVersion('3.9.0', '3.8.0') => 1
+ * @example compareVersion('3.8.0', '3.8.0') => 0
+ * @param versionLeft
+ * @param versionRight
  * @param split
  */
-export function compareVersion(versionMax: string, versionMin: string, split = '.') {
-    if (typeof versionMax !== 'string' || typeof versionMin !== 'string') {
-        throw new Error(`invalid param: ${versionMax}, ${versionMin}`);
+export function compareVersion(versionLeft: string, versionRight: string, split = '.') {
+    if (typeof versionLeft !== 'string' || typeof versionRight !== 'string') {
+        throw new Error(`invalid param: ${versionLeft}, ${versionRight}`);
     }
-    versionMax = versionMax.replace(split, '').padStart(3, '0');
-    versionMin = versionMin.replace(split, '').padStart(3, '0');
-    return Number(versionMax) > Number(versionMin);
+
+    const leftParts = versionLeft.split(split).map((part) => Number.parseInt(part, 10) || 0);
+    const rightParts = versionRight.split(split).map((part) => Number.parseInt(part, 10) || 0);
+    const maxLength = Math.max(leftParts.length, rightParts.length);
+
+    for (let i = 0; i < maxLength; i++) {
+        const leftValue = leftParts[i] ?? 0;
+        const rightValue = rightParts[i] ?? 0;
+
+        if (leftValue !== rightValue) {
+            return leftValue - rightValue;
+        }
+    }
+
+    return 0;
 }

src/core/builder/platforms/ios/src/utils.ts

@@ -7,6 +7,7 @@ import { ITaskOption } from '../../native-common/type';
 import { IOptions } from './type'
 import { BuildCheckResult } from '../../../@types/protected';
 import i18n from '../../../../base/i18n';
+import { compareVersion } from '../../../../base/utils/parse';
 
 /**
  * 修改 ios 的包名
@@ -218,11 +219,11 @@ export function verificationFunc(key: keyof IOptions, value: any, options: ITask
             }
             if (options.packages.native.JobSystem === 'taskFlow') {
                 minVersion = '12.0';
-                if (!compareVersion(value, minVersion)) {
+                if (compareVersion(value, minVersion) < 0) {
                     setError('i18n:ios.tips.targetVersionErrorWithTaskFlow', minVersion);
                 }
             }
-            if (res.valid && !compareVersion(value, minVersion)) {
+            if (res.valid && compareVersion(value, minVersion) < 0) {
                 setError('i18n:ios.tips.targetVersionError', minVersion);
             }
         }
@@ -262,19 +263,3 @@ export function verificationFunc(key: keyof IOptions, value: any, options: ITask
     }
     return res;
 }
-
-/**
- * return result of versionMax > versionMin
- * @param versionOne
- * @param versionTwo
- * @param split
- */
-export function compareVersion(versionMax: string, versionMin: string, split = '.') {
-    if (typeof versionMax !== 'string' || typeof versionMin !== 'string') {
-        return true;
-    }
-    const padNum = Math.max(versionMax.length, versionMin.length);
-    versionMax = versionMax.replace(split, '').padStart(padNum, '0');
-    versionMin = versionMin.replace(split, '').padStart(padNum, '0');
-    return Number(versionMax) > Number(versionMin) || Number(versionMax) === Number(versionMin);
-}

src/core/builder/platforms/native-common/pack-tool/platforms/mac-os.ts

@@ -4,6 +4,7 @@ import * as os from 'os';
 import { execSync } from "child_process";
 import NativePackTool, { CocosParams } from '../base/default';
 import { cchelper, toolHelper } from "../utils";
+import { compareVersion } from '../../../../../base/utils/parse';
 
 export interface IOrientation {
     landscapeLeft: boolean;
@@ -51,22 +52,6 @@ export abstract class MacOSPackTool extends NativePackTool {
         return /Apple/.test(model) && process.platform === 'darwin';
     }
 
-    protected compareVersion(a: string, b: string): number {
-        const aParts = a.split('.').map((part) => Number.parseInt(part, 10) || 0);
-        const bParts = b.split('.').map((part) => Number.parseInt(part, 10) || 0);
-        const maxLength = Math.max(aParts.length, bParts.length);
-
-        for (let i = 0; i < maxLength; i++) {
-            const aValue = aParts[i] ?? 0;
-            const bValue = bParts[i] ?? 0;
-            if (aValue !== bValue) {
-                return aValue - bValue;
-            }
-        }
-
-        return 0;
-    }
-
     protected getXcodeVersion(): string {
         try {
             const output = execSync('xcrun xcodebuild -version').toString('utf8');
@@ -90,7 +75,7 @@ export abstract class MacOSPackTool extends NativePackTool {
 
     protected getIosSimulatorArch(): 'arm64' | 'x86_64' {
         // Xcode 14.3+ no longer supports running iOS Simulator under Rosetta on Apple Silicon.
-        if (this.isAppleSilicon() && this.compareVersion(this.getXcodeVersion(), '14.3') >= 0) {
+        if (this.isAppleSilicon() && compareVersion(this.getXcodeVersion(), '14.3') >= 0) {
             return 'arm64';
         }
         return 'x86_64';

src/core/builder/worker/builder/manager/build-template.ts

@@ -62,7 +62,7 @@ export class BuildTemplate implements IBuildTemplate {
             }
             this._versionUser = this._versionUser || '1.0.0';
             // 用户构建模板版本小于默认构建模板版本，警告建议更新
-            if (utils.Parse.compareVersion(this.config.version, this._versionUser)) {
+            if (utils.Parse.compareVersion(this.config.version, this._versionUser) > 0) {
                 console.warn(i18n.t('builder.tips.template_version_warning', {
                     version: this._versionUser,
                     internalConfig: this.config.version,