@takazudo/zfb 3.0.0 → 3.2.0

package/dist/zudo-react/reactive.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactive.js","sourceRoot":"","sources":["../../src/zudo-react/reactive.ts"],"names":[],"mappings":"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","sourcesContent":["import { enqueue, type Job, type Phase } from \"./scheduler.js\";\nimport type { ReadonlySignal, Signal } from \"./reactive-types.js\";\n\ninterface Source {\n  readonly subscribers: Set<Observer>;\n}\ninterface Observer {\n  readonly id: string;\n  readonly dependencies: Set<Source>;\n  invalidate(): void;\n}\nlet currentObserver: Observer | null = null;\nlet evaluating = 0;\nconst evaluationStack: Computed<unknown>[] = [];\nlet nextId = 0;\n\n// The quoted own key is the retained runtime definition witness.\nconst core = { \"@takazudo/zfb/zudo-react/runtime-definition-v1\": true, nextId: () => ++nextId };\n\nfunction track(source: Source): void {\n  if (!currentObserver) return;\n  source.subscribers.add(currentObserver);\n  currentObserver.dependencies.add(source);\n}\nfunction detach(observer: Observer): void {\n  for (const source of observer.dependencies) source.subscribers.delete(observer);\n  observer.dependencies.clear();\n}\nfunction untracked<T>(fn: () => T): T {\n  const previous = currentObserver;\n  currentObserver = null;\n  try {\n    return fn();\n  } finally {\n    currentObserver = previous;\n  }\n}\nexport { untracked };\n\nclass Writable<T> implements Signal<T>, Source {\n  readonly $$zudoReactive = \"zudo-react.reactive.v1\" as const;\n  readonly $$zudoWritable = \"zudo-react.writable.v1\" as const;\n  readonly subscribers = new Set<Observer>();\n  constructor(private current: T) {\n    if (!core[\"@takazudo/zfb/zudo-react/runtime-definition-v1\"])\n      throw new Error(\"ZR_RUNTIME_DEFINITION\");\n  }\n  get value(): T {\n    track(this);\n    return this.current;\n  }\n  set value(value: T) {\n    if (evaluating > 0) throw new Error(\"ZR_COMPUTED_WRITE: write during computed evaluation\");\n    if (Object.is(value, this.current)) return;\n    this.current = value;\n    for (const observer of [...this.subscribers]) observer.invalidate();\n  }\n}\n\nclass Computed<T> implements ReadonlySignal<T>, Source, Observer {\n  readonly $$zudoReactive = \"zudo-react.reactive.v1\" as const;\n  readonly id = `computed:${core.nextId()}`;\n  readonly subscribers = new Set<Observer>();\n  readonly dependencies = new Set<Source>();\n  private cached!: T;\n  private dirty = true;\n  private evaluatingNow = false;\n  constructor(private readonly read: () => T) {}\n  get value(): T {\n    if (this.evaluatingNow) {\n      throw new Error(\n        `ZR_COMPUTED_CYCLE: ${[...evaluationStack.map((entry) => entry.id), this.id].join(\" -> \")}`,\n      );\n    }\n    if (this.dirty) this.evaluate();\n    track(this);\n    if (this.subscribers.size === 0) {\n      detachAndRelease(this);\n      this.dirty = true;\n    }\n    return this.cached;\n  }\n  private evaluate(): void {\n    detachAndRelease(this);\n    const previous = currentObserver;\n    currentObserver = this;\n    this.evaluatingNow = true;\n    evaluationStack.push(this as Computed<unknown>);\n    evaluating++;\n    try {\n      this.cached = this.read();\n      this.dirty = false;\n    } catch (error) {\n      detachAndRelease(this);\n      throw error;\n    } finally {\n      evaluating--;\n      evaluationStack.pop();\n      this.evaluatingNow = false;\n      currentObserver = previous;\n    }\n  }\n  invalidate(): void {\n    if (this.dirty) return;\n    this.dirty = true;\n    for (const observer of [...this.subscribers]) observer.invalidate();\n  }\n  release(): void {\n    if (this.subscribers.size === 0) {\n      detachAndRelease(this);\n      this.dirty = true;\n    }\n  }\n}\n\nfunction release(source: Source): void {\n  if (source instanceof Computed) source.release();\n}\nfunction detachAndRelease(observer: Observer): void {\n  const sources = [...observer.dependencies];\n  detach(observer);\n  for (const source of sources) release(source);\n}\n\nexport function signal<T>(initial: T): Signal<T> {\n  return new Writable(initial);\n}\nexport function computed<T>(read: () => T): ReadonlySignal<T> {\n  return new Computed(read);\n}\nexport function readSnapshot<T>(value: ReadonlySignal<T>): T {\n  return untracked(() => value.value);\n}\n\nexport interface Subscription {\n  readonly id: string;\n  run(): void;\n  dispose(): void;\n}\nexport function subscribe(\n  callback: () => void,\n  options: { phase?: Phase; id?: string; active?: () => boolean; report?: Job[\"report\"] } = {},\n): Subscription {\n  let disposed = false;\n  const observer: Observer = {\n    id: options.id ?? `subscriber:${core.nextId()}`,\n    dependencies: new Set(),\n    invalidate() {\n      enqueue(job);\n    },\n  };\n  const job: Job = {\n    id: observer.id,\n    phase: options.phase ?? \"commit\",\n    active: () => !disposed && (options.active?.() ?? true),\n    run: () => subscription.run(),\n    ...(options.report ? { report: options.report } : {}),\n  };\n  const subscription: Subscription = {\n    id: observer.id,\n    run() {\n      if (!job.active()) return;\n      detachAndRelease(observer);\n      const previous = currentObserver;\n      currentObserver = observer;\n      try {\n        callback();\n      } finally {\n        currentObserver = previous;\n      }\n    },\n    dispose() {\n      disposed = true;\n      detachAndRelease(observer);\n    },\n  };\n  return subscription;\n}\n\n/** Internal test introspection; absent from every public entry. */\nexport function subscriberCount(value: ReadonlySignal<unknown>): number {\n  return value instanceof Writable || value instanceof Computed ? value.subscribers.size : 0;\n}\n"]}
+{"version":3,"file":"reactive.js","sourceRoot":"","sources":["../../src/zudo-react/reactive.ts"],"names":[],"mappings":"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","sourcesContent":["import { enqueue, type Job, type Phase } from \"./scheduler.js\";\nimport type { ReadonlySignal, Signal } from \"./reactive-types.js\";\n\ninterface Source {\n  readonly subscribers: Set<Observer>;\n}\ninterface Observer {\n  readonly id: string;\n  readonly dependencies: Set<Source>;\n  invalidate(): void;\n}\nlet currentObserver: Observer | null = null;\nlet evaluating = 0;\nconst evaluationStack: Computed<unknown>[] = [];\nlet nextId = 0;\n\n// The quoted own key is the retained runtime definition witness.\nconst core = { \"@takazudo/zfb/zudo-react/runtime-definition-v1\": true, nextId: () => ++nextId };\n\nfunction track(source: Source): void {\n  if (!currentObserver) return;\n  source.subscribers.add(currentObserver);\n  currentObserver.dependencies.add(source);\n}\nfunction detach(observer: Observer): void {\n  for (const source of observer.dependencies) source.subscribers.delete(observer);\n  observer.dependencies.clear();\n}\nfunction untracked<T>(fn: () => T): T {\n  const previous = currentObserver;\n  currentObserver = null;\n  try {\n    return fn();\n  } finally {\n    currentObserver = previous;\n  }\n}\nexport { untracked };\n\nclass Writable<T> implements Signal<T>, Source {\n  readonly $$zudoReactive = \"zudo-react.reactive.v1\" as const;\n  readonly $$zudoWritable = \"zudo-react.writable.v1\" as const;\n  readonly subscribers = new Set<Observer>();\n  constructor(private current: T) {\n    if (!core[\"@takazudo/zfb/zudo-react/runtime-definition-v1\"])\n      throw new Error(\"ZR_RUNTIME_DEFINITION\");\n  }\n  get value(): T {\n    track(this);\n    return this.current;\n  }\n  set value(value: T) {\n    if (evaluating > 0) throw new Error(\"ZR_COMPUTED_WRITE: write during computed evaluation\");\n    if (Object.is(value, this.current)) return;\n    this.current = value;\n    for (const observer of [...this.subscribers]) observer.invalidate();\n  }\n}\n\nclass Computed<T> implements ReadonlySignal<T>, Source, Observer {\n  readonly $$zudoReactive = \"zudo-react.reactive.v1\" as const;\n  readonly id = `computed:${core.nextId()}`;\n  readonly subscribers = new Set<Observer>();\n  readonly dependencies = new Set<Source>();\n  private cached!: T;\n  private dirty = true;\n  private evaluatingNow = false;\n  constructor(private readonly read: () => T) {}\n  get value(): T {\n    if (this.evaluatingNow) {\n      throw new Error(\n        `ZR_COMPUTED_CYCLE: ${[...evaluationStack.map((entry) => entry.id), this.id].join(\" -> \")}`,\n      );\n    }\n    if (this.dirty) this.evaluate();\n    track(this);\n    if (this.subscribers.size === 0) {\n      detachAndRelease(this);\n      this.dirty = true;\n    }\n    return this.cached;\n  }\n  private evaluate(): void {\n    detachAndRelease(this);\n    const previous = currentObserver;\n    currentObserver = this;\n    this.evaluatingNow = true;\n    evaluationStack.push(this as Computed<unknown>);\n    evaluating++;\n    try {\n      this.cached = this.read();\n      this.dirty = false;\n    } catch (error) {\n      detachAndRelease(this);\n      throw error;\n    } finally {\n      evaluating--;\n      evaluationStack.pop();\n      this.evaluatingNow = false;\n      currentObserver = previous;\n    }\n  }\n  invalidate(): void {\n    if (this.dirty) return;\n    this.dirty = true;\n    for (const observer of [...this.subscribers]) observer.invalidate();\n  }\n  release(): void {\n    if (this.subscribers.size === 0) {\n      detachAndRelease(this);\n      this.dirty = true;\n    }\n  }\n}\n\nfunction release(source: Source): void {\n  if (source instanceof Computed) source.release();\n}\nfunction detachAndRelease(observer: Observer): void {\n  const sources = [...observer.dependencies];\n  detach(observer);\n  for (const source of sources) release(source);\n}\n\nexport function signal<T>(initial: T): Signal<T> {\n  return new Writable(initial);\n}\nexport function computed<T>(read: () => T): ReadonlySignal<T> {\n  return new Computed(read);\n}\nexport function readSnapshot<T>(value: ReadonlySignal<T>): T {\n  return untracked(() => value.value);\n}\n\nexport interface Subscription {\n  readonly id: string;\n  run(): void;\n  dispose(): void;\n}\nexport function subscribe(\n  callback: () => void,\n  options: { phase?: Phase; id?: string; active?: () => boolean; report?: Job[\"report\"] } = {},\n): Subscription {\n  let disposed = false;\n  const observer: Observer = {\n    id: options.id ?? `subscriber:${core.nextId()}`,\n    dependencies: new Set(),\n    invalidate() {\n      enqueue(job);\n    },\n  };\n  const job: Job = {\n    id: observer.id,\n    phase: options.phase ?? \"commit\",\n    active: () => !disposed && (options.active?.() ?? true),\n    run: () => subscription.run(),\n    ...(options.report ? { report: options.report } : {}),\n  };\n  const subscription: Subscription = {\n    id: observer.id,\n    run() {\n      if (!job.active()) return;\n      detachAndRelease(observer);\n      const previous = currentObserver;\n      currentObserver = observer;\n      try {\n        callback();\n      } finally {\n        currentObserver = previous;\n      }\n    },\n    dispose() {\n      disposed = true;\n      detachAndRelease(observer);\n    },\n  };\n  return subscription;\n}\n\n/** Internal test introspection; absent from every public entry. */\nexport function subscriberCount(value: ReadonlySignal<unknown>): number {\n  return value instanceof Writable || value instanceof Computed ? value.subscribers.size : 0;\n}\n"]}

package/dist/zudo-react/render-html.d.ts

@@ -1,3 +1,13 @@
-import { type Child } from "./description.js";
+import { type Child, type DescriptionSite } from "./description.js";
 import type { RenderOptions } from "./server.js";
+export interface RenderDiagnostic {
+    readonly code: string;
+    readonly path: string;
+    readonly component: string;
+    readonly spelling?: {
+        readonly name: string;
+        readonly suggestion?: string;
+    };
+    readonly site?: DescriptionSite;
+}
 export declare function renderHtml(node: Child, options: RenderOptions): string;

package/dist/zudo-react/render-html.js

@@ -1,21 +1,15 @@
-import { Fragment, isDescription } from "./description.js";
+import { serializeStyle } from "./style.js";
+import { Fragment, descriptionSite, isDescription, } from "./description.js";
 import { escapeAttribute, escapeText } from "./escape.js";
+import { rawHtmlReserved } from "./raw-html.js";
 import { readSnapshot } from "./reactive.js";
 import { createScope, withScope } from "./scope.js";
-import { serializeProps } from "./props-transport.js";
+import { emptyChildren, normalizeProps } from "./props-transport.js";
 import { islandRootType } from "./island-root-type.js";
-import { Show, For, showProps, forProps, keyed, keyPayload, view } from "./structure.js";
+import { isShowType, isForType, showProps, forProps, keyed, keyPayload, view, } from "./structure.js";
+import { attributeError, attributeText, booleanAttrs, commonAttrs, dialectSuggestion, emptyIframeChildren, formProps, htmlAttrs, htmlTags, isDialectProp, reactiveModelSuggestion, svgAttrs, svgTags, voidTags, } from "./vocabulary.js";
 const words = (value) => new Set(value.split(" "));
-const voidTags = words("area base br col embed hr img input link meta param source track wbr");
-const booleanAttrs = words("hidden inert readonly autofocus required disabled checked selected multiple open controls muted loop autoplay novalidate formnovalidate allowfullscreen");
-const commonAttrs = words("id class title lang dir slot role style hidden inert contenteditable draggable spellcheck tabindex accesskey translate onclick onload onerror");
-const htmlAttrs = words("href target rel download src alt width height type name value placeholder for charset datetime readonly autofocus required disabled checked selected multiple open controls muted loop autoplay novalidate formnovalidate maxlength minlength min max step pattern autocomplete accept accept-charset http-equiv content media method action enctype rows cols colspan rowspan scope cite poster loading decoding sizes srcset crossorigin referrerpolicy sandbox allow allowfullscreen");
-const svgAttrs = words("width height viewBox preserveAspectRatio gradientUnits gradientTransform markerWidth markerHeight refX refY xlink:href xml:lang stroke-width fill-rule clip-rule stroke-linecap stroke-linejoin stop-color stop-opacity fill stroke d x y x1 x2 y1 y2 cx cy r rx ry points transform opacity offset");
-const svgTags = words("svg g path circle ellipse rect line polyline polygon text tspan defs symbol use clipPath mask linearGradient radialGradient stop title desc foreignObject");
-const htmlTags = words("html head body title base link meta style script div span p a br hr main header footer nav section article aside h1 h2 h3 h4 h5 h6 ul ol li dl dt dd blockquote pre code strong em b i small mark time figure figcaption img picture source video audio track canvas form label input button textarea select option optgroup fieldset legend output progress meter datalist table caption thead tbody tfoot tr th td col colgroup details summary dialog template slot iframe noscript address abbr bdi bdo cite data del dfn ins kbd map area object param q rp rt ruby s samp sub sup u var wbr embed xmp noembed noframes plaintext");
-const dialect = words("className htmlFor charSet dateTime tabIndex readOnly strokeWidth dangerouslySetInnerHTML");
 const reserved = words("key ref children rawHtml");
-const forms = words("modelValue modelChecked defaultValue defaultChecked");
 const sensitive = words("noscript xmp iframe noembed noframes plaintext");
 const tableChildren = {
     table: words("caption colgroup thead tbody tfoot"),
@@ -25,8 +19,19 @@ const tableChildren = {
     tr: words("td th"),
     colgroup: words("col"),
 };
-function fail(code, context, detail) {
-    throw new TypeError(`${code}: ${detail} at ${context.path} in ${context.identity?.component ?? "static render"}`);
+function fail(code, context, detail, spelling) {
+    const component = context.identity?.component ?? "static render";
+    const site = context.node && descriptionSite(context.node);
+    const diagnostic = {
+        code,
+        path: context.path,
+        component,
+        ...(spelling && { spelling }),
+        ...(site && { site }),
+    };
+    throw Object.assign(new TypeError(`${code}: ${detail} at ${context.path} in ${component}`), {
+        diagnostic,
+    });
 }
 function reactive(value) {
     return (typeof value === "object" &&
@@ -70,34 +75,26 @@ function renderText(value, context) {
     fail("ZR_CHILD", context, `invalid scalar ${typeof value}`);
 }
 function style(value, context) {
-    if (typeof value === "string")
-        return value;
-    if (value === null ||
-        typeof value !== "object" ||
-        Array.isArray(value) ||
-        Object.getPrototypeOf(value) !== Object.prototype)
-        fail("ZR_STYLE", context, "style must be a string or flat object");
-    let result = "";
-    for (const [name, entry] of Object.entries(value)) {
-        if (!/^(--[a-zA-Z0-9_-]+|[a-z][a-z0-9-]*)$/.test(name) || /[A-Z]/.test(name))
-            fail("ZR_STYLE", context, `invalid property ${name}`);
-        if (entry == null)
-            continue;
-        if (typeof entry !== "string" && !(typeof entry === "number" && Number.isFinite(entry)))
-            fail("ZR_STYLE", context, `invalid value for ${name}`);
-        result += `${name}:${entry};`;
+    try {
+        return serializeStyle(value);
+    }
+    catch (error) {
+        if (error instanceof TypeError)
+            fail("ZR_STYLE", context, error.message.replace(/^ZR_STYLE: /, ""));
+        throw error;
     }
-    return result;
 }
 function attributes(tag, props, context, namespace, custom) {
     let output = "";
     for (const [name, original] of Object.entries(props)) {
         if (reserved.has(name))
             continue;
-        if (forms.has(name))
+        if (formProps.has(name))
             continue;
-        if (dialect.has(name) || /^on[A-Z]/.test(name))
-            fail("ZR_PROP_DIALECT", context, `${tag}.${name}`);
+        if (isDialectProp(name, namespace, custom)) {
+            const suggestion = dialectSuggestion(name, namespace, custom);
+            fail("ZR_PROP_DIALECT", context, `${tag}.${name}${suggestion ? ` (use \`${suggestion}\` instead of \`${name}\`)` : ""}`, suggestion ? { name, suggestion } : { name });
+        }
         if (name.startsWith("on:")) {
             if (!/^on:[A-Za-z][A-Za-z0-9_-]*(?::capture)?$/.test(name))
                 fail("ZR_LISTENER", context, `${tag}.${name}`);
@@ -118,37 +115,32 @@ function attributes(tag, props, context, namespace, custom) {
             !/^on[a-z]+$/.test(name))
             fail("ZR_ATTRIBUTE", context, `${tag}.${name}`);
         const value = read(original);
-        if ((name === "value" || name === "checked") && reactive(original))
-            fail("ZR_MODEL_UNSUPPORTED", context, `${tag}.${name} requires modelValue/modelChecked`);
+        if ((name === "value" || name === "checked") && reactive(original)) {
+            const suggestion = reactiveModelSuggestion(tag, name, String(read(props.type) ?? "text"), custom);
+            fail("ZR_MODEL_UNSUPPORTED", context, `${tag}.${name} requires ${suggestion ?? "a static value"}`);
+        }
+        if (/^on[a-z]/.test(name) && typeof value === "function")
+            fail("ZR_PROP_DIALECT", context, `${tag}.${name} must use on:${name.slice(2)}`, {
+                name,
+                suggestion: `on:${name.slice(2)}`,
+            });
+        const error = attributeError(name, value, custom);
+        if (error)
+            fail("ZR_ATTRIBUTE", context, `${tag}.${name} ${error}`);
         if (value == null)
             continue;
-        if (/^on[a-z]/.test(name) && typeof value === "function")
-            fail("ZR_PROP_DIALECT", context, `${tag}.${name} must use on:${name.slice(2)}`);
-        if (custom && typeof value !== "string")
-            fail("ZR_ATTRIBUTE", context, `${tag}.${name} requires a string`);
-        if (name === "style")
-            output += ` style="${escapeAttribute(style(value, context))}"`;
-        else if (booleanAttrs.has(name)) {
-            if (typeof value !== "boolean")
-                fail("ZR_ATTRIBUTE", context, `${tag}.${name} requires a boolean`);
-            if (value)
-                output += ` ${name}`;
-        }
-        else {
-            if (typeof value !== "string" &&
-                typeof value !== "boolean" &&
-                !(typeof value === "number" && Number.isFinite(value)))
-                fail("ZR_ATTRIBUTE", context, `${tag}.${name} requires a scalar`);
-            if (typeof value === "boolean" && !name.startsWith("aria-") && !name.startsWith("data-"))
-                fail("ZR_ATTRIBUTE", context, `${tag}.${name} requires a string`);
-            if (/^on[a-z]/.test(name) && typeof value !== "string")
-                fail("ZR_ATTRIBUTE", context, `${tag}.${name} requires a string`);
-            output += ` ${name}="${escapeAttribute(String(value))}"`;
-        }
+        const text = name === "style" ? style(value, context) : attributeText(name, value);
+        if (text === null)
+            continue;
+        output +=
+            booleanAttrs.has(name) && value === true ? ` ${name}` : ` ${name}="${escapeAttribute(text)}"`;
     }
     return output;
 }
 function restricted(value, context, namespace, parent) {
+    return tracked(value, context, () => restrictedValue(value, context, namespace, parent));
+}
+function restrictedValue(value, context, namespace, parent) {
     if (value == null || typeof value === "boolean")
         return "";
     if (Array.isArray(value))
@@ -173,7 +165,7 @@ function element(description, context, namespace, parent) {
     const childNamespace = tag === "foreignObject" ? "html" : elementNamespace;
     if (elementNamespace === "svg" ? !svgTags.has(tag) : !custom && !htmlTags.has(tag))
         fail("ZR_TAG", context, tag);
-    if (context.identity && (tag === "template" || sensitive.has(tag)))
+    if (context.identity && (tag === "template" || (tag !== "iframe" && sensitive.has(tag))))
         fail("ZR_PARSER_CONTEXT", context, tag);
     if (parent in tableChildren && !tableChildren[parent]?.has(tag))
         fail("ZR_PARSER_CONTEXT", context, `${parent} > ${tag}`);
@@ -188,6 +180,12 @@ function element(description, context, namespace, parent) {
                 : `form:${context.nextFormId++}`;
     const source = description.props;
     const props = { ...source };
+    if (tag === "iframe") {
+        if (Object.hasOwn(props, "rawHtml"))
+            fail("ZR_RAW_HTML", context, "iframe forbids rawHtml");
+        if (!emptyIframeChildren(props.children))
+            fail("ZR_PARSER_CONTEXT", context, "iframe requires empty children");
+    }
     const hasValue = source.modelValue !== undefined;
     const hasChecked = source.modelChecked !== undefined;
     if ((hasValue && hasChecked) ||
@@ -315,7 +313,7 @@ function element(description, context, namespace, parent) {
         const payload = read(raw);
         if (typeof payload !== "string")
             fail("ZR_RAW_HTML", context, `${tag} requires string rawHtml`);
-        if (/<!--\/?zr:1:|data-zfb-island(?:-skip-ssr)?\s*=/.test(payload))
+        if (rawHtmlReserved(payload, tag))
             fail("ZR_RAW_HTML", context, "reserved boundary in rawHtml");
         if ((tag === "script" && /<\/script/i.test(payload)) ||
             (tag === "style" && /<\/style/i.test(payload)))
@@ -328,6 +326,9 @@ function element(description, context, namespace, parent) {
             fail("ZR_MODEL_VALUE", context, "textarea requires string");
         content = `${value.startsWith("\n") ? "\n" : ""}${escapeText(value)}`;
     }
+    else if (tag === "iframe") {
+        // The shell has no owned children; srcdoc belongs to the browser's foreign document.
+    }
     else if (tag === "script" || tag === "style") {
         if (hasChildren)
             fail("ZR_RAW_HTML", context, `${tag} requires rawHtml`);
@@ -363,10 +364,27 @@ function element(description, context, namespace, parent) {
     }
     else
         content = children(props.children, context, childNamespace, tag);
+    if (tag === "pre" && raw === undefined && (content.startsWith("\n") || content.startsWith("\r")))
+        content = `\n${content}`;
     context.formId = previousFormId;
     return `<${tag}${attrs}>${voidTags.has(tag) ? "" : `${content}</${tag}>`}`;
 }
+// A failure is attributed only to the value being rendered: a description's own site,
+// or no site at all for scalars, promises and other non-description children.
+function tracked(value, context, fn) {
+    const prior = context.node;
+    context.node = isDescription(value) ? value : undefined;
+    try {
+        return fn();
+    }
+    finally {
+        context.node = prior;
+    }
+}
 function render(value, context, namespace, parent) {
+    return tracked(value, context, () => renderValue(value, context, namespace, parent));
+}
+function renderValue(value, context, namespace, parent) {
     if (value == null || typeof value === "boolean")
         return "";
     if (Array.isArray(value))
@@ -383,7 +401,7 @@ function render(value, context, namespace, parent) {
         return island(value, context, namespace, parent);
     if (value.type === Fragment)
         return region(context, "f", () => children(value.props.children, context, namespace, parent));
-    if (value.type === Show) {
+    if (isShowType(value.type)) {
         if (parent in tableChildren ||
             ["select", "optgroup", "option", "title", "textarea", "script", "style"].includes(parent))
             fail("ZR_PARSER_CONTEXT", context, parent);
@@ -410,7 +428,7 @@ function render(value, context, namespace, parent) {
             }
         });
     }
-    if (value.type === For) {
+    if (isForType(value.type)) {
         if (parent in tableChildren ||
             ["select", "optgroup", "option", "title", "textarea", "script", "style"].includes(parent))
             fail("ZR_PARSER_CONTEXT", context, parent);
@@ -455,9 +473,6 @@ function render(value, context, namespace, parent) {
         context.scope = prior;
     }
 }
-function empty(value) {
-    return (value == null || typeof value === "boolean" || (Array.isArray(value) && value.every(empty)));
-}
 function island(description, context, namespace, parent) {
     if (context.boundary)
         fail("ZR_NESTED_ISLAND", context, "nested island");
@@ -472,13 +487,13 @@ function island(description, context, namespace, parent) {
     const component = child.type.displayName ?? child.type.name;
     if (component !== options.identity.component)
         fail("ZR_ISLAND_IDENTITY", context, `expected ${options.identity.component}, got ${component}`);
-    if (Object.hasOwn(child.props, "children") && !empty(child.props.children))
+    if (Object.hasOwn(child.props, "children") && !emptyChildren(child.props.children))
         fail("ZR_ISLAND_CHILD", context, "nonempty children");
-    const props = { ...child.props };
-    delete props.children;
+    let props;
     let payload;
     try {
-        payload = serializeProps(props);
+        props = normalizeProps(child.props);
+        payload = JSON.stringify(props);
     }
     catch (error) {
         throw new TypeError(`ZR_ISLAND_PROPS ${component}: ${error instanceof Error ? error.message : String(error)}`);
@@ -488,8 +503,18 @@ function island(description, context, namespace, parent) {
         (when === "media" && !options.media?.trim()) ||
         (when !== "media" && options.media !== undefined))
         fail("ZR_ISLAND_WHEN", context, when);
+    if (options.persist !== undefined &&
+        (typeof options.persist !== "string" ||
+            !options.persist.trim() ||
+            options.persist !== options.persist.trim() ||
+            /[\u0000-\u001f\u007f]/.test(options.persist)))
+        fail("ZR_ISLAND_PERSIST", context, "persist must be a nonempty string without surrounding whitespace or control characters");
+    if (options.persistProps !== undefined && typeof options.persistProps !== "boolean")
+        fail("ZR_ISLAND_PERSIST", context, "persistProps must be a boolean");
+    if (options.persistProps !== undefined && options.persist === undefined)
+        fail("ZR_ISLAND_PERSIST", context, "persistProps requires persist");
     const marker = options.skipSsr ? "data-zfb-island-skip-ssr" : "data-zfb-island";
-    const attrs = ` ${marker}="${escapeAttribute(options.identity.component)}" data-when="${when}"${when === "media" ? ` data-media="${escapeAttribute(options.media)}"` : ""} data-zfb-transport="json/1" data-zfb-protocol="zudo-react/1" data-zfb-build="${escapeAttribute(options.identity.build)}" data-props="${escapeAttribute(payload)}"`;
+    const attrs = ` ${marker}="${escapeAttribute(options.identity.component)}" data-when="${when}"${when === "media" ? ` data-media="${escapeAttribute(options.media)}"` : ""} data-zfb-transport="json/1" data-zfb-protocol="zudo-react/1" data-zfb-build="${escapeAttribute(options.identity.build)}" data-props="${escapeAttribute(payload)}"${options.persist === undefined ? "" : ` data-zfb-transition-persist="${escapeAttribute(options.persist)}"`}${options.persistProps === true ? ' data-zfb-transition-persist-props="true"' : ""}`;
     const local = {
         radioGroups: new Map(),
         radioNames: new Map(),