@appstrate/validation 1.3.0 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appstrate/validation",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "type": "module",
   "files": [
     "src"
@@ -10,7 +10,8 @@
     "./zip": "./src/zip.ts",
     "./integrity": "./src/integrity.ts",
     "./naming": "./src/naming.ts",
-    "./dependencies": "./src/dependencies.ts"
+    "./dependencies": "./src/dependencies.ts",
+    "./semver": "./src/semver.ts"
   },
   "scripts": {
     "test": "bun test",

package/src/index.ts

@@ -36,8 +36,11 @@ export const serviceRequirementSchema = z.looseObject({
   connectionMode: z.enum(["user", "admin"]).optional(),
 });
 
-const slugString = z.string().min(1).regex(SLUG_REGEX, {
-  error: "Must be a valid slug (a-z, 0-9, hyphens, no leading/trailing hyphen)",
+export const PACKAGE_REF_REGEX =
+  /^(?:@[a-z0-9]([a-z0-9-]*[a-z0-9])?\/)?[a-z0-9]([a-z0-9-]*[a-z0-9])?$/;
+
+const packageRefString = z.string().min(1).regex(PACKAGE_REF_REGEX, {
+  error: "Must be a valid slug or scoped name (@scope/name)",
 });
 
 const semverRangeString = z.string().refine((val) => semver.validRange(val) !== null, {
@@ -89,8 +92,8 @@ export type FlowJsonSchemaObject = z.infer<typeof jsonSchemaObjectSchema>;
 const flowSharedFields = {
   requires: z.looseObject({
     services: z.array(serviceRequirementSchema),
-    skills: z.array(slugString).optional(),
-    extensions: z.array(slugString).optional(),
+    skills: z.array(packageRefString).optional(),
+    extensions: z.array(packageRefString).optional(),
   }),
   input: z
     .object({

package/src/semver.ts

@@ -0,0 +1,35 @@
+import semver from "semver";
+
+/** Check whether `v` is a valid semver version string. */
+export function isValidVersion(v: string): boolean {
+  return semver.valid(v) !== null;
+}
+
+/** Check whether `v` is a valid semver range string. */
+export function isValidRange(v: string): boolean {
+  return semver.validRange(v) !== null;
+}
+
+/** Return `true` if version `a` is strictly greater than version `b`. Returns `false` if either is invalid. */
+export function versionGt(a: string, b: string): boolean {
+  try {
+    return semver.gt(a, b);
+  } catch {
+    return false;
+  }
+}
+
+/** Comparator for sorting versions in descending order (highest first). */
+export function compareVersionsDesc(a: string, b: string): number {
+  return semver.rcompare(a, b);
+}
+
+/** Find the highest version in `versions` that satisfies `range`, or `null` if none match. */
+export function matchVersion(versions: string[], range: string): string | null {
+  return semver.maxSatisfying(versions, range);
+}
+
+/** Return `true` if `v` is a prerelease version (e.g. `1.0.0-beta.1`). */
+export function isPrerelease(v: string): boolean {
+  return semver.prerelease(v) !== null;
+}