From c355a9d2d97534501ee9c3a8b99a0a698d80e3f2 Mon Sep 17 00:00:00 2001 From: BluJ Date: Tue, 25 Apr 2023 09:28:00 -0600 Subject: [PATCH] chore: Update the emver --- lib/emverLite/mod.ts | 2 +- lib/{emverLite => test}/emverList.test.ts | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) rename lib/{emverLite => test}/emverList.test.ts (94%) diff --git a/lib/emverLite/mod.ts b/lib/emverLite/mod.ts index cb7cde9..c892cc8 100644 --- a/lib/emverLite/mod.ts +++ b/lib/emverLite/mod.ts @@ -2,7 +2,7 @@ import * as matches from "ts-matches"; const starSub = /((\d+\.)*\d+)\.\*/; // prettier-ignore -export type ValidEmVer = `${'>' | '<' | '>=' | '<=' | '=' | ''}${number | '*'}${`.${number | '*'}` | ""}${`.${number | '*'}` | ""}${`.${number | '*'}` | ""}${`-${string}` | ""}`; +export type ValidEmVer = `${number | '*'}${`.${number | '*'}` | ""}${`.${number | '*'}` | ""}${`-${string}` | ""}`; function incrementLastNumber(list: number[]) { const newList = [...list]; diff --git a/lib/emverLite/emverList.test.ts b/lib/test/emverList.test.ts similarity index 94% rename from lib/emverLite/emverList.test.ts rename to lib/test/emverList.test.ts index 7509873..e65d0e4 100644 --- a/lib/emverLite/emverList.test.ts +++ b/lib/test/emverList.test.ts @@ -1,9 +1,17 @@ -import { EmVer, notRange, rangeAnd, rangeOf, rangeOr } from "./mod"; +import { EmVer, notRange, rangeAnd, rangeOf, rangeOr } from "../emverLite/mod"; describe("EmVer", () => { { { const checker = rangeOf("*"); test("rangeOf('*')", () => { + checker.check("1"); + checker.check("1.2"); + checker.check("1.2.3"); + checker.check("1.2.3.4"); + // @ts-expect-error + checker.check("1.2.3.4.5"); + // @ts-expect-error + checker.check("1.2.3.4.5.6"); expect(checker.check("1")).toEqual(true); expect(checker.check("1.2")).toEqual(true); expect(checker.check("1.2.3.4")).toEqual(true); @@ -23,6 +31,7 @@ describe("EmVer", () => { expect(checker.check("2-beta123")).toEqual(true); expect(checker.check("2")).toEqual(true); expect(checker.check("1.2.3.5")).toEqual(true); + // @ts-expect-error expect(checker.check("1.2.3.4.1")).toEqual(true); }); @@ -49,6 +58,7 @@ describe("EmVer", () => { test(`rangeOf(">=1.2.3.4") valid`, () => { expect(checker.check("2")).toEqual(true); expect(checker.check("1.2.3.5")).toEqual(true); + // @ts-expect-error expect(checker.check("1.2.3.4.1")).toEqual(true); expect(checker.check("1.2.3.4")).toEqual(true); }); @@ -63,6 +73,7 @@ describe("EmVer", () => { test(`rangeOf("<1.2.3.4") invalid`, () => { expect(checker.check("2")).toEqual(false); expect(checker.check("1.2.3.5")).toEqual(false); + // @ts-expect-error expect(checker.check("1.2.3.4.1")).toEqual(false); expect(checker.check("1.2.3.4")).toEqual(false); }); @@ -77,6 +88,7 @@ describe("EmVer", () => { test(`rangeOf("<=1.2.3.4") invalid`, () => { expect(checker.check("2")).toEqual(false); expect(checker.check("1.2.3.5")).toEqual(false); + // @ts-expect-error expect(checker.check("1.2.3.4.1")).toEqual(false); }); @@ -184,6 +196,7 @@ describe("EmVer", () => { test(`rangeOf("!>1.2.3.4") invalid`, () => { expect(checker.check("2")).toEqual(false); expect(checker.check("1.2.3.5")).toEqual(false); + // @ts-expect-error expect(checker.check("1.2.3.4.1")).toEqual(false); });