From f992d6cb8fb2a99223597b48a1b18a0ee9369377 Mon Sep 17 00:00:00 2001 From: BluJ Date: Thu, 27 Apr 2023 12:39:31 -0600 Subject: [PATCH] feat: Make manifest use better range --- lib/emverLite/mod.ts | 4 +++- lib/manifest/ManifestTypes.ts | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/emverLite/mod.ts b/lib/emverLite/mod.ts index db1e983..0564e65 100644 --- a/lib/emverLite/mod.ts +++ b/lib/emverLite/mod.ts @@ -2,7 +2,9 @@ import * as matches from "ts-matches" const starSub = /((\d+\.)*\d+)\.\*/ // prettier-ignore -export type ValidEmVer = `${number | '*'}${`.${number | '*'}` | ""}${`.${number | '*'}` | ""}${`-${string}` | ""}`; +export type ValidEmVer = `${number}${`.${number}` | ""}${`.${number}` | ""}${`-${string}` | ""}`; +// prettier-ignore +export type ValidEmVerRange = `${'>=' | '<='| '<' | '>' | ''}${number | '*'}${`.${number | '*'}` | ""}${`.${number | '*'}` | ""}${`-${string}` | ""}`; function incrementLastNumber(list: number[]) { const newList = [...list] diff --git a/lib/manifest/ManifestTypes.ts b/lib/manifest/ManifestTypes.ts index 8600942..61dc477 100644 --- a/lib/manifest/ManifestTypes.ts +++ b/lib/manifest/ManifestTypes.ts @@ -1,4 +1,4 @@ -import { ValidEmVer } from "../emverLite/mod" +import { ValidEmVer, ValidEmVerRange } from "../emverLite/mod" import { ActionMetaData } from "../types" export interface Container { @@ -70,7 +70,7 @@ export interface Dependency { /** The range of versions that would satisfy the dependency * ie: >=3.4.5 && <4.0.0 */ - version: string + version: ValidEmVerRange /** * A human readable explanation on what the dependency is used for */