shelving 1.164.0 → 1.165.0

package/package.json

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

package/schema/DataSchema.d.ts

@@ -1,5 +1,6 @@
 import type { Data, Database, PartialData } from "../util/data.js";
 import type { Identifier, Item } from "../util/item.js";
+import { type Key } from "../util/object.js";
 import type { NullableSchema } from "./NullableSchema.js";
 import type { SchemaOptions, Schemas } from "./Schema.js";
 import { Schema } from "./Schema.js";
@@ -15,6 +16,8 @@ export declare class DataSchema<T extends Data> extends Schema<unknown> {
     readonly props: Schemas<T>;
     constructor({ one, title, props, value: partialValue, ...options }: DataSchemaOptions<T>);
     validate(unsafeValue?: unknown): T;
+    pick<K extends Key<T>>(...keys: K[]): DataSchema<Pick<T, K>>;
+    omit<K extends Key<T>>(...keys: K[]): DataSchema<Omit<T, K>>;
 }
 /** Set of named data schemas. */
 export type DataSchemas<T extends Database> = {

package/schema/DataSchema.js

@@ -1,5 +1,6 @@
 import { ValueFeedback } from "../feedback/Feedback.js";
 import { isData } from "../util/data.js";
+import { omitProps, pickProps } from "../util/object.js";
 import { mapProps } from "../util/transform.js";
 import { validateData } from "../util/validate.js";
 import { NULLABLE } from "./NullableSchema.js";
@@ -19,6 +20,12 @@ export class DataSchema extends Schema {
             throw new ValueFeedback("Must be object", unsafeValue);
         return validateData(unsafeValue, this.props);
     }
+    pick(...keys) {
+        return new DataSchema({ ...this, props: pickProps(this.props, ...keys) });
+    }
+    omit(...keys) {
+        return new DataSchema({ ...this, props: omitProps(this.props, ...keys) });
+    }
 }
 function _getSchemaValue([, { value }]) {
     return value;

package/util/template.d.ts

@@ -26,6 +26,9 @@ export declare function getPlaceholders(template: string): readonly string[];
  *
  * @param templates Either a single template string, or an iterator that returns multiple template template strings.
  * - Template strings can include placeholders (e.g. `:name-${country}/{city}`).
+ * - Template strings do not match the `/` character.
+ * - The `**` double splat placeholder _can_ match multiple path segments (e.g. `a/b/c`).
+ *
  * @param target The string containing values, e.g. `Dave-UK/Manchester`
  *
  * @return An object containing values, e.g. `{ name: "Dave", country: "UK", city: "Manchester" }`, or undefined if target didn't match the template.

package/util/template.js

@@ -5,7 +5,7 @@ import { setMapItem } from "./map.js";
 import { isObject } from "./object.js";
 import { getString } from "./string.js";
 // RegExp to find named variables in several formats e.g. `:a`, `${b}`, `{{c}}` or `{d}`
-const R_PLACEHOLDERS = /(\*|:[a-z][a-z0-9]*|\$\{[a-z][a-z0-9]*\}|\{\{[a-z][a-z0-9]*\}\}|\{[a-z][a-z0-9]*\})/i;
+const R_PLACEHOLDERS = /(\*\*?|:[a-z][a-z0-9]*|\$\{[a-z][a-z0-9]*\}|\{\{[a-z][a-z0-9]*\}\}|\{[a-z][a-z0-9]*\})/i;
 // Find actual name within template placeholder e.g. `${name}` → `name`
 const R_NAME = /[a-z0-9]+/i;
 /**
@@ -26,7 +26,7 @@ function _splitTemplate(template, caller) {
         const post = matches[i + 1];
         if (i > 1 && !pre.length)
             throw new ValueError("Template placeholders must be separated by at least one character", { received: template, caller });
-        const name = placeholder === "*" ? String(asterisks++) : R_NAME.exec(placeholder)?.[0] || "";
+        const name = placeholder[0] === "*" ? String(asterisks++) : R_NAME.exec(placeholder)?.[0] || "";
         chunks.push({ pre, placeholder, name, post });
     }
     return chunks;
@@ -53,6 +53,9 @@ function _getPlaceholder({ name }) {
  *
  * @param templates Either a single template string, or an iterator that returns multiple template template strings.
  * - Template strings can include placeholders (e.g. `:name-${country}/{city}`).
+ * - Template strings do not match the `/` character.
+ * - The `**` double splat placeholder _can_ match multiple path segments (e.g. `a/b/c`).
+ *
  * @param target The string containing values, e.g. `Dave-UK/Manchester`
  *
  * @return An object containing values, e.g. `{ name: "Dave", country: "UK", city: "Manchester" }`, or undefined if target didn't match the template.
@@ -70,13 +73,15 @@ export function matchTemplate(template, target, caller = matchTemplate) {
     // Loop through the placeholders (placeholders are at all the even-numbered positions in `chunks`).
     let startIndex = firstChunk.pre.length;
     const values = {};
-    for (const { name, post } of chunks) {
+    for (const { name, post, placeholder } of chunks) {
         const stopIndex = !post ? Number.POSITIVE_INFINITY : target.indexOf(post, startIndex);
         if (stopIndex < 0)
             return undefined; // Target doesn't match template because chunk post wasn't found.
         const value = target.slice(startIndex, stopIndex);
         if (!value.length)
             return undefined; // Target doesn't match template because chunk value was missing.
+        if (placeholder !== "**" && value.includes("/"))
+            return undefined; // Placeholders can't consume multiple path segments.
         values[name] = value;
         startIndex = stopIndex + post.length;
     }