shelving 1.187.1 → 1.187.3

package/markup/rule/inline.js

@@ -3,7 +3,7 @@ import { REACT_ELEMENT_TYPE } from "../util/internal.js";
 import { getWordRegExp } from "../util/regexp.js";
 import { getMarkupRule } from "../util/rule.js";
 /** Map characters, e.g. `*`, to their coresponding HTML tag, e.g. `strong` */
-const INLINE_CHARS = { "-": "del", "~": "del", "+": "ins", "*": "strong", _: "em", "=": "mark", ":": "mark" }; // Hyphen must be first so it works when we use the keys as a character class.
+const INLINE_CHARS = { "-": "del", "~": "del", "+": "ins", "*": "strong", _: "em", "=": "mark" }; // Hyphen must be first so it works when we use the keys as a character class.
 const INLINE_REGEXP = getWordRegExp(`(?<wrap>(?<char>[${Object.keys(INLINE_CHARS).join("")}])+)(?<text>(?!\\k<char>)\\S(?:[\\s\\S]*?(?!\\k<char>)\\S)?)\\k<wrap>`);
 /**
  * Inline strong, emphasis, insert, delete, highlight.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "shelving",
-	"version": "1.187.1",
+	"version": "1.187.3",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"repository": {
 		"type": "git",
@@ -14,7 +14,7 @@
 		"@types/bun": "^1.3.12",
 		"@types/react": "^19.2.14",
 		"@types/react-dom": "^19.2.3",
-		"@typescript/native-preview": "^7.0.0-dev.20260417.1",
+		"@typescript/native-preview": "^7.0.0-dev.20260418.1",
 		"firebase": "^12.12.0",
 		"react": "^19.2.5",
 		"react-dom": "^19.2.5",

package/schema/ChoiceSchema.d.ts

@@ -13,10 +13,6 @@ export type ChoiceOptions<K extends string> = {
  * - Array of string options in `[key]` format (`key` will be used as the `title` too).
  */
 export type PossibleChoiceOptions<K extends string> = ImmutableArray<K> | ChoiceOptions<K>;
-/** A single tuple for a choice option in `[key, title]` format. */
-export type ChoiceOption<K extends string> = readonly [title: K, title: string];
-/** Get a `ChoiceOptions` object for a set of `PossibleChoiceOptions`. */
-export declare function getChoiceOptions<K extends string>(options: PossibleChoiceOptions<K>): ChoiceOptions<K>;
 /** Allowed options for `ChoiceSchema` */
 export interface ChoiceSchemaOptions<K extends string> extends Omit<SchemaOptions, "value"> {
     /** Specify correct options using a dictionary of entries. */
@@ -33,4 +29,4 @@ export declare class ChoiceSchema<K extends string> extends Schema<K> {
     format(value: K): string;
 }
 /** Choose from an allowed set of values. */
-export declare function CHOICE<K extends string>(options: PossibleChoiceOptions<K> | ImmutableArray<K>): ChoiceSchema<K>;
+export declare function CHOICE<K extends string>(options: PossibleChoiceOptions<K>): ChoiceSchema<K>;

package/schema/ChoiceSchema.js

@@ -2,7 +2,7 @@ import { isArray } from "../util/array.js";
 import { isProp } from "../util/object.js";
 import { Schema } from "./Schema.js";
 /** Get a `ChoiceOptions` object for a set of `PossibleChoiceOptions`. */
-export function getChoiceOptions(options) {
+function _getChoiceOptions(options) {
     return isArray(options) ? Object.fromEntries(options.map(_getChoiceOption)) : options;
 }
 function _getChoiceOption(k) {
@@ -13,7 +13,7 @@ export class ChoiceSchema extends Schema {
     options;
     constructor({ one = "choice", title = "Choice", placeholder = `No ${one}`, options, value, ...rest }) {
         super({ one, title, value, placeholder, ...rest });
-        this.options = getChoiceOptions(options);
+        this.options = _getChoiceOptions(options);
     }
     validate(unsafeValue = this.value) {
         if (typeof unsafeValue === "string" && isProp(this.options, unsafeValue))

package/util/template.d.ts

@@ -1,4 +1,4 @@
-import type { ImmutableArray } from "./array.js";
+import { type ImmutableArray } from "./array.js";
 import { type ImmutableDictionary } from "./dictionary.js";
 import { type AnyCaller } from "./function.js";
 import { type NotString, type PossibleString } from "./string.js";

package/util/template.js

@@ -1,9 +1,10 @@
 import { RequiredError } from "../error/RequiredError.js";
 import { ValueError } from "../error/ValueError.js";
+import { isArray } from "./array.js";
+import { getDataProp, isData } from "./data.js";
 import { EMPTY_DICTIONARY } from "./dictionary.js";
 import { isFunction } from "./function.js";
 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;
@@ -114,24 +115,32 @@ export function renderTemplate(template, values, caller = renderTemplate) {
     if (!chunks.length)
         return template;
     let output = template;
-    for (const { name, placeholder } of chunks)
-        output = output.replace(placeholder, _replaceTemplateKey(name, values, caller));
-    return output;
-}
-function _replaceTemplateKey(key, values, caller) {
-    if (isFunction(values))
-        return values(key);
-    if (isObject(values)) {
-        // Dictionary or array of values.
-        const v = getString(values[key]);
-        if (v !== undefined)
-            return v;
+    if (isFunction(values)) {
+        for (const { name, placeholder } of chunks)
+            output = output.replace(placeholder, values(name));
+    }
+    else if (isData(values)) {
+        for (const { name, placeholder } of chunks) {
+            const v = getString(getDataProp(values, name));
+            if (v === undefined)
+                throw new RequiredError(`Template placeholder "${name}" not found in object`, { received: values, name, caller });
+            output = output.replace(placeholder, v);
+        }
+    }
+    else if (isArray(values)) {
+        for (const { name, placeholder } of chunks) {
+            const v = getString(values[Number(name)]);
+            if (v === undefined)
+                throw new RequiredError(`Template placeholder "${name}" not found in array`, { received: values, name, caller });
+            output = output.replace(placeholder, v);
+        }
     }
     else {
-        // Single value for all placeholders.
         const v = getString(values);
-        if (v !== undefined)
-            return v;
+        if (v === undefined)
+            throw new RequiredError(`Template value must be string`, { received: values, caller });
+        for (const { placeholder } of chunks)
+            output = output.replace(placeholder, v);
     }
-    throw new RequiredError(`Template value for "${key}" must be string`, { received: values, key, caller });
+    return output;
 }