shelving 1.149.0 → 1.149.1

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.149.0",
+	"version": "1.149.1",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",

package/schema/StringSchema.js

@@ -29,7 +29,7 @@ export class StringSchema extends Schema {
             throw new ValueFeedback("Must be string", unsafeValue);
         const saneString = this.sanitize(possibleString);
         if (saneString.length < this.min)
-            throw new ValueFeedback(saneString.length ? `Minimum ${this.min} characters` : "Required", saneString);
+            throw new ValueFeedback(possibleString.length ? `Minimum ${this.min} characters` : "Required", saneString);
         if (saneString.length > this.max)
             throw new ValueFeedback(`Maximum ${this.max} characters`, saneString);
         return saneString;

package/schema/UUIDSchema.js

@@ -12,8 +12,8 @@ export class UUIDSchema extends StringSchema {
         super({
             title,
             ...rest,
-            min: 36,
-            max: 36, // 36 chars including hyphens
+            min: 32,
+            max: 36, // 36 chars including hyphens (which get stripped by sanitize for appearances).
         });
     }
     sanitize(str) {

package/util/uuid.js

@@ -1,17 +1,18 @@
 import { RequiredError } from "../error/RequiredError.js";
+const R_NOT_LOWERCHAR = /[^0-9a-f]/g;
 /** Return a random UUID (v4) */
 export function randomUUID() {
-    return crypto.randomUUID();
+    return crypto.randomUUID().replace(R_NOT_LOWERCHAR, "");
 }
 /** Convert/validate a unknown value as as UUID. */
 export function getUUID(value) {
     if (typeof value !== "string" || !value)
         return;
     // Strip any non-hex characters (including existing dashes), then normalize to lowercase.
-    const cleaned = value.replace(/[^0-9A-Fa-f]/g, "").toLowerCase();
+    const cleaned = value.toLowerCase().replace(R_NOT_LOWERCHAR, "");
     if (cleaned.length !== 32)
         return;
-    return `${cleaned.slice(0, 8)}-${cleaned.slice(8, 12)}-${cleaned.slice(12, 16)}-${cleaned.slice(16, 20)}-${cleaned.slice(20)}`;
+    return `${cleaned.slice(0, 8)}${cleaned.slice(8, 12)}${cleaned.slice(12, 16)}${cleaned.slice(16, 20)}${cleaned.slice(20)}`;
 }
 /** Require a valid UUID. */
 export function requireUUID(value) {