@protobase/schema 0.46.14 → 0.47.0

package/dist/plugin-version.d.ts

@@ -1,7 +1,7 @@
 //#region src/plugin-version.d.ts
 /**
  * Whether `version` is in `range`: comparators such as `>=0.12.0 <1.0.0`, separated by spaces, all of which must hold.
- * Undefined when the range is not one of those, or the version is no x.y.z version.
+ * Undefined when the range is not one of those, or the version is no semver version.
  */
 export declare const inRange: (version: string, range: string) => boolean | undefined;
 /** What a plugin's plugin.json says it is built for: a plugin API, and the Protobase versions it runs on. */

package/dist/plugin-version.js

@@ -1,38 +1,22 @@
+import semver from "semver";
 //#region src/plugin-version.ts
-const versionPattern = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
-const parseVersion = (text) => {
-	const match = versionPattern.exec(text);
-	return match ? [
-		Number(match[1]),
-		Number(match[2]),
-		Number(match[3])
-	] : void 0;
-};
-const compare = (a, b) => a[0] - b[0] || a[1] - b[1] || a[2] - b[2];
-const comparatorPattern = /^(>=|<=|>|<|=)?(.+)$/;
-const holds = {
-	">=": (order) => order >= 0,
-	"<=": (order) => order <= 0,
-	">": (order) => order > 0,
-	"<": (order) => order < 0,
-	"=": (order) => order === 0
+const isComparator = (text) => {
+	try {
+		new semver.Comparator(text);
+		return true;
+	} catch (error) {
+		if (error instanceof TypeError) return false;
+		throw error;
+	}
 };
 /**
 * Whether `version` is in `range`: comparators such as `>=0.12.0 <1.0.0`, separated by spaces, all of which must hold.
-* Undefined when the range is not one of those, or the version is no x.y.z version.
+* Undefined when the range is not one of those, or the version is no semver version.
 */
 const inRange = (version, range) => {
-	const own = parseVersion(version);
 	const comparators = range.trim().split(/\s+/);
-	if (!own || range.trim() === "") return void 0;
-	let result = true;
-	for (const comparator of comparators) {
-		const [, operator = "=", text = ""] = comparatorPattern.exec(comparator) ?? [];
-		const bound = parseVersion(text);
-		if (!bound) return void 0;
-		result &&= holds[operator](compare(own, bound));
-	}
-	return result;
+	if (semver.valid(version) === null || range.trim() === "" || !comparators.every(isComparator)) return void 0;
+	return semver.satisfies(version, range);
 };
 /**
 * Why an app does not load a plugin built for `requirement`, or undefined when it does: the plugin API must be the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/schema",
-  "version": "0.46.14",
+  "version": "0.47.0",
   "description": "Resource, field, view and access definitions for Protobase configs.",
   "license": "Apache-2.0",
   "repository": {
@@ -31,6 +31,10 @@
   },
   "dependencies": {
     "aip-parsers": "^1.0.0",
+    "semver": "^7.8.5",
     "zod": "^4.6.5"
+  },
+  "devDependencies": {
+    "@types/semver": "^7.8.0"
   }
 }