diff --git a/.gitignore b/.gitignore index 9005920..ecd1bd8 100644 --- a/.gitignore +++ b/.gitignore @@ -66,4 +66,5 @@ build package-lock.json dist src/base-app-domain -src/base-app-domain-back \ No newline at end of file +src/base-app-domain-back +test \ No newline at end of file diff --git a/lib/utils/version.d.ts b/lib/utils/version.d.ts index 1486776..a6e0782 100644 --- a/lib/utils/version.d.ts +++ b/lib/utils/version.d.ts @@ -4,4 +4,10 @@ * @param reqVersion 比较版本 * @returns */ -export declare const compareVersion: (curVersion: string, reqVersion: string) => number; +export declare function compareVersion(curVersion: string, reqVersion: string): number; +/** + * 是不是一个有效的版本号 + * @param version + * @returns + */ +export declare function isVersion(version: string): boolean; diff --git a/lib/utils/version.js b/lib/utils/version.js index 6737b06..7c7846b 100644 --- a/lib/utils/version.js +++ b/lib/utils/version.js @@ -1,13 +1,13 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.compareVersion = void 0; +exports.isVersion = exports.compareVersion = void 0; /** * 版本比较 * @param curVersion 当前版本 * @param reqVersion 比较版本 * @returns */ -const compareVersion = (curVersion, reqVersion) => { +function compareVersion(curVersion, reqVersion) { const v1 = curVersion.split('.'); const v2 = reqVersion.split('.'); for (let i = 0; i < Math.max(v1.length, v2.length); i++) { @@ -17,5 +17,15 @@ const compareVersion = (curVersion, reqVersion) => { return num1 - num2; } return 0; -}; +} exports.compareVersion = compareVersion; +; +/** + * 是不是一个有效的版本号 + * @param version + * @returns + */ +function isVersion(version) { + return /([1-9][0-9]*|[0-9])\.([1-9][0-9]*|[0-9])*\.([1-9][0-9]*|[0-9])*(\-[0-9A-Za-z-](\.[0-9A-Za-z-])*)*/g.test(version); +} +exports.isVersion = isVersion; diff --git a/src/utils/version.ts b/src/utils/version.ts index c1ebd62..b8f6a13 100644 --- a/src/utils/version.ts +++ b/src/utils/version.ts @@ -5,7 +5,7 @@ * @param reqVersion 比较版本 * @returns */ -export const compareVersion = (curVersion: string, reqVersion: string): number => { +export function compareVersion (curVersion: string, reqVersion: string): number { const v1 = curVersion.split('.'); const v2 = reqVersion.split('.'); @@ -15,4 +15,13 @@ export const compareVersion = (curVersion: string, reqVersion: string): number = if (num1 !== num2) return num1 - num2; } return 0; -}; \ No newline at end of file +}; + +/** + * 是不是一个有效的版本号 + * @param version + * @returns + */ +export function isVersion(version: string) { + return /([1-9][0-9]*|[0-9])\.([1-9][0-9]*|[0-9])*\.([1-9][0-9]*|[0-9])*(\-[0-9A-Za-z-](\.[0-9A-Za-z-])*)*/g.test(version); +} \ No newline at end of file