@plumix/core 0.5.0 → 0.6.0

package/dist/route/render/render-template.js

@@ -54,7 +54,10 @@ async function renderThroughThemeInner({ ctx, theme, document, templateDeps, ass
     const deps = await loadTemplateDeps(mergeTemplateDepDeclarations(theme, template), templateDeps, ctx);
     const merged = resolveRenderDocument({ template, document, data, ctx, deps });
     const filtered = await ctx.hooks.applyFilter("render:document", merged, data, ctx);
-    const renderDocument = await applyHeadMeta(applyCanonical(filtered, ctx), data, ctx, title);
+    // Head assembly reads site settings from the DB — worth its own row in the
+    // waterfall. The `render:document` subscribers above are already traced per
+    // handler as `hook:` spans.
+    const renderDocument = await ctx.telemetry.span("render: head", () => applyHeadMeta(applyCanonical(filtered, ctx), data, ctx, title));
     const loaderData = await prefetchEntryLoaders(ctx, data, template);
     return renderTree({
         ctx,
@@ -93,7 +96,15 @@ const ERROR_VARIANTS = {
         fallback: DefaultServerError,
     },
 };
-export async function renderErrorThroughTheme({ ctx, theme, document, templateDeps, assetManifest, kind, data, }) {
+export function renderErrorThroughTheme(args) {
+    // Same phase span as the happy path — without it the error render's queries
+    // dangle directly under `dispatch` in the trace (#1491).
+    return args.ctx.telemetry.span("render", (s) => {
+        s.set("render.node", `error: ${ERROR_VARIANTS[args.kind].tier}`);
+        return renderErrorThroughThemeInner(args);
+    });
+}
+async function renderErrorThroughThemeInner({ ctx, theme, document, templateDeps, assetManifest, kind, data, }) {
     const variant = ERROR_VARIANTS[kind];
     const raw = resolveErrorTemplate(templateRules(theme.templates), variant.tier)
         ?.template ?? variant.fallback;
@@ -126,24 +137,29 @@ async function prefetchEntryLoaders(ctx, data, template) {
     const blocks = collectLoaderBlocks(data, template);
     if (blocks.length === 0)
         return undefined;
-    return resolveBlockLoaders(blocks, ctx.blocks, ctx, {
-        // Fire-and-forget bridge into the framework filter so plugins can
-        // subscribe via `addFilter("blocks:loader:error", ...)`. `applyFilter`
-        // is async; we don't await (the loader resolver shouldn't back-pressure
-        // on observability), but we DO catch — a throwing subscriber would
-        // otherwise surface as an unhandledRejection and on workers that
-        // kills the request. `LoaderErrorEvent` shape matches `BlockLoaderErrorContext`.
-        onLoaderError: (event) => {
-            ctx.hooks
-                .applyFilter("blocks:loader:error", undefined, event)
-                .catch((hookError) => {
-                ctx.logger.error("[plumix] blocks:loader:error hook threw", {
-                    hookError,
-                    blockName: event.spec.name,
-                    nodeId: event.node.id,
+    // Loader fan-out gets its own span so the DB/fetch work it triggers nests
+    // here instead of parenting onto `render` directly.
+    return ctx.telemetry.span("render: loaders", (s) => {
+        s.set("loaders.blocks", blocks.length);
+        return resolveBlockLoaders(blocks, ctx.blocks, ctx, {
+            // Fire-and-forget bridge into the framework filter so plugins can
+            // subscribe via `addFilter("blocks:loader:error", ...)`. `applyFilter`
+            // is async; we don't await (the loader resolver shouldn't back-pressure
+            // on observability), but we DO catch — a throwing subscriber would
+            // otherwise surface as an unhandledRejection and on workers that
+            // kills the request. `LoaderErrorEvent` shape matches `BlockLoaderErrorContext`.
+            onLoaderError: (event) => {
+                ctx.hooks
+                    .applyFilter("blocks:loader:error", undefined, event)
+                    .catch((hookError) => {
+                    ctx.logger.error("[plumix] blocks:loader:error hook threw", {
+                        hookError,
+                        blockName: event.spec.name,
+                        nodeId: event.node.id,
+                    });
                 });
-            });
-        },
+            },
+        });
     });
 }
 function collectLoaderBlocks(data, template) {
@@ -239,7 +255,8 @@ function renderTree({ ctx, document, assetManifest, data, title, template, deps,
     process.env.PLUMIX_DEV && editMode.mode !== "edit"
         ? createElement(PlumixDebugBar, { ctx })
         : null, createElement(TemplateAdapter));
-    const rendered = renderToString(templateTree);
+    // The bulk of `render` self-time (#1494).
+    const rendered = ctx.telemetry.span("render: react", () => renderToString(templateTree));
     const { hoisted, body } = splitHoistedMetadata(rendered);
     const scripts = groupScriptsByPosition(document.script);
     const { code, direction } = ctx.locale;
@@ -271,7 +288,7 @@ function renderTree({ ctx, document, assetManifest, data, title, template, deps,
         hoisted +
         titleFallback +
         voidTagsToHtml("link", document.link) +
-        bundledCssTags(assetManifest, ctx.basePath) +
+        bundledCssTags(assetManifest, command, ctx.basePath) +
         devThemeStylesTag(command, ctx.basePath) +
         voidTagsToHtml("meta", document.meta) +
         scripts.headEnd.map(scriptToHtml).join("");

package/dist/route/render/render-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"render-template.js","sourceRoot":"","sources":["../../../src/route/render/render-template.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"render-template.js","sourceRoot":"","sources":["../../../src/route/render/render-template.tsx"],"names":[],"mappings":"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"}

package/dist/rpc/meta/core.d.ts

@@ -9,10 +9,9 @@ type MetaMap = Record<string, unknown>;
  * doesn't have to double-parse. `applyMetaPatch` JSON-encodes at the
  * last moment, before the UPDATE.
  *
- * `upserts` is mutable: `validateMetaReferences` rewrites values for
- * cached-object reference fields (`referenceTarget.valueShape ===
- * "object"`) to merge adapter-supplied cached fields into the
- * stored shape. Other callers should treat it as read-only.
+ * `upserts` is mutable: `validateMetaReferences` normalizes reference
+ * values to the plain-id storage form (a legacy `{ id, ... }` object
+ * self-heals to its id). Other callers should treat it as read-only.
  */
 export interface MetaPatch {
     readonly upserts: Map<string, unknown>;

package/dist/rpc/meta/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/rpc/meta/core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/rpc/meta/core.ts"],"names":[],"mappings":"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"}

package/dist/rpc/meta/core.js

@@ -133,25 +133,13 @@ export async function validateMetaReferences(ctx, findField, patch) {
                 throw MetaSanitizationError.invalidValue({ key });
             }
             const ids = referenceIdsForValidation(key, value, target, fieldMax(field));
+            // Normalize eagerly — a validation failure below aborts the whole
+            // save, so a rewritten patch never persists on the failure path.
+            patch.upserts.set(key, target.multiple ? ids : ids[0]);
             const group = upsertGroup(groups, target, registered);
             for (const id of ids)
                 group.ids.add(id);
-            group.contributions.push({
-                errorKey: key,
-                ids,
-                applyNormalize: (rowsById) => {
-                    if (target.valueShape !== "object")
-                        return;
-                    if (target.multiple) {
-                        patch.upserts.set(key, ids.map((id) => buildCachedReference(id, rowsById)));
-                        return;
-                    }
-                    const [singleId] = ids;
-                    if (singleId !== undefined) {
-                        patch.upserts.set(key, buildCachedReference(singleId, rowsById));
-                    }
-                },
-            });
+            group.contributions.push({ errorKey: key, ids });
             continue;
         }
         // Repeater fields don't carry a `referenceTarget` themselves but
@@ -169,11 +157,10 @@ export async function validateMetaReferences(ctx, findField, patch) {
     for (const group of groups.values()) {
         if (group.ids.size === 0)
             continue;
-        const liveRows = await fetchLiveRows(ctx, group.registered, group.scope, group.ids, "validateMetaReferences");
-        const rowsById = new Map(liveRows.map((r) => [r.id, r]));
+        const liveIds = await fetchLiveIds(ctx, group.registered, group.scope, group.ids, "validateMetaReferences");
         for (const contribution of group.contributions) {
             for (const id of contribution.ids) {
-                if (!rowsById.has(id)) {
+                if (!liveIds.has(id)) {
                     if (contribution.diagnostic !== undefined) {
                         // Wire error keys on the top-level field; this log line
                         // is the only place the row index + subKey surface, so
@@ -192,7 +179,6 @@ export async function validateMetaReferences(ctx, findField, patch) {
                     });
                 }
             }
-            contribution.applyNormalize(rowsById);
         }
     }
 }
@@ -222,30 +208,17 @@ function collectRepeaterReferences(ctx, topKey, field, rows, groups) {
                 throw MetaSanitizationError.invalidValue({ key: topKey });
             }
             const ids = referenceIdsForValidation(topKey, subValue, target, fieldMax(subField));
+            // Normalize the row's slot in place — the top-level upsert array
+            // is the live storage shape, so mutating an object inside it is
+            // what the caller will serialize.
+            rowObj[subField.key] = target.multiple ? ids : ids[0];
             const group = upsertGroup(groups, target, registered);
             for (const id of ids)
                 group.ids.add(id);
-            const subKey = subField.key;
             group.contributions.push({
                 errorKey: topKey,
                 ids,
-                diagnostic: { rowIdx, subKey },
-                applyNormalize: (rowsById) => {
-                    if (target.valueShape !== "object")
-                        return;
-                    // Rewrite the row's cached-object value in place — the
-                    // top-level upsert array is the live storage shape, so
-                    // mutating an object inside it is what the caller will
-                    // serialize.
-                    if (target.multiple) {
-                        rowObj[subKey] = ids.map((id) => buildCachedReference(id, rowsById));
-                        return;
-                    }
-                    const [singleId] = ids;
-                    if (singleId !== undefined) {
-                        rowObj[subKey] = buildCachedReference(singleId, rowsById);
-                    }
-                },
+                diagnostic: { rowIdx, subKey: subField.key },
             });
         }
     }
@@ -264,13 +237,6 @@ function upsertGroup(groups, target, registered) {
     }
     return group;
 }
-// Adapter cached fields override anything; user-supplied non-id keys
-// don't survive. Per-usage user fields (e.g. alt overrides) are a
-// post-v0.1 feature — when added, this is where they'd merge in.
-function buildCachedReference(id, rowsById) {
-    const row = rowsById.get(id);
-    return { id, ...(row?.cached ?? {}) };
-}
 // Defense-in-depth ceiling on the internal-aggregated id-batch size.
 // Above this, the live-id fetch throws rather than silently truncating.
 // The wire cap (100) and per-field cap (`HARD_MULTI_REFERENCE_LIMIT`,
@@ -305,20 +271,17 @@ function referenceGroupKey(target) {
 // 100, so we only hit the ceiling when many fields share `(kind, scope)`
 // and aggregate — at which point throwing beats silent truncation
 // (truncation would either reject valid writes or hide live targets).
-//
-// Returns `LookupResult[]` rather than just live ids so the validator
-// can read `cached` for the cached-object normalize step. Callers that
-// only care about presence build a `Set` from the row ids.
-async function fetchLiveRows(ctx, registered, scope, ids, callsite) {
+async function fetchLiveIds(ctx, registered, scope, ids, callsite) {
     if (ids.size > MAX_REFERENCE_GROUP_BATCH) {
         throw MetaReferenceError.batchSizeExceeded(callsite, ids.size, MAX_REFERENCE_GROUP_BATCH);
     }
     const idList = [...ids];
-    return registered.adapter.list(ctx, {
+    const rows = await registered.adapter.list(ctx, {
         ids: idList,
         scope,
         limit: idList.length,
     });
+    return new Set(rows.map((row) => row.id));
 }
 // Defensive upper bound on multi-reference array length, applied
 // per-field before grouping. Even with the batched `list({ ids })`
@@ -328,18 +291,11 @@ async function fetchLiveRows(ctx, registered, scope, ids, callsite) {
 // can declare a lower `max` and the validator picks the smaller.
 const HARD_MULTI_REFERENCE_LIMIT = 100;
 // Validates the wire shape of a reference value and returns the ids
-// to feed into the group's batched `list({ ids })` call. Four shapes
-// are accepted, dispatching on `target.multiple` + `target.valueShape`:
-//
-//  - multi=true,  valueShape="id"  (default): string[] of non-empty ids
-//  - multi=true,  valueShape="object":        `{ id }[]` — each item a
-//                                             cached-object reference
-//                                             (or bare strings for
-//                                             leniency on first write)
-//  - multi=false, valueShape="id"  (default): bare string id
-//  - multi=false, valueShape="object":        `{ id: string, ... }`
-//                                             (or a bare string for
-//                                             leniency on first write)
+// to feed into the group's batched `list({ ids })` call. Storage is
+// plain ids — a bare string (single) or string[] (multi) — but each
+// slot leniently accepts the retired cached-object shape
+// (`{ id, ... }`) so legacy values self-heal to the plain form on
+// the entity's next save.
 function referenceIdsForValidation(key, value, target, max) {
     if (target.multiple) {
         if (!Array.isArray(value)) {
@@ -351,47 +307,17 @@ function referenceIdsForValidation(key, value, target, max) {
         if (max !== undefined && value.length > max) {
             throw MetaSanitizationError.invalidValue({ key });
         }
-        if (target.valueShape === "object") {
-            // Lenient on input: each item can be `"42"` (first-write
-            // convenience) or `{ id: "42", ... }`. Always rewritten to the
-            // canonical `{ id, ...cached }` shape after the live-id check.
-            const ids = [];
-            for (const item of value) {
-                if (typeof item === "string" && item !== "") {
-                    ids.push(item);
-                    continue;
-                }
-                const id = extractStringId(item);
-                if (id !== null && id !== "") {
-                    ids.push(id);
-                    continue;
-                }
-                throw MetaSanitizationError.invalidValue({ key });
-            }
-            return ids;
-        }
-        for (const item of value) {
-            if (typeof item !== "string" || item === "") {
-                throw MetaSanitizationError.invalidValue({ key });
-            }
-        }
-        return value;
-    }
-    if (target.valueShape === "object") {
-        // Lenient on input: accept either `"42"` (first-write convenience)
-        // or `{ id: "42", ... }`. Always rewritten to the canonical
-        // `{ id, ...cached }` shape after the live-id check.
-        if (typeof value === "string" && value !== "")
-            return [value];
-        const id = extractStringId(value);
-        if (id !== null && id !== "")
-            return [id];
-        throw MetaSanitizationError.invalidValue({ key });
-    }
-    if (typeof value !== "string") {
-        throw MetaSanitizationError.invalidValue({ key });
+        return value.map((item) => referenceItemId(key, item));
     }
-    return [value];
+    return [referenceItemId(key, value)];
+}
+function referenceItemId(key, item) {
+    if (typeof item === "string" && item !== "")
+        return item;
+    const id = extractStringId(item);
+    if (id !== null && id !== "")
+        return id;
+    throw MetaSanitizationError.invalidValue({ key });
 }
 // Returns the `id` string of a `{ id: string, ... }` object, or null
 // for any other shape (string, array, null, primitive, missing key).
@@ -478,7 +404,6 @@ export async function filterMetaOrphans(ctx, findField, decoded) {
         candidates.push({
             key: occ.key,
             multiple: occ.target.multiple === true,
-            valueShape: occ.target.valueShape ?? "id",
             groupKey,
             ids,
             nested: occ.nested,
@@ -496,38 +421,26 @@ export async function filterMetaOrphans(ctx, findField, decoded) {
     // Pass 2: one `list({ ids })` per group, keyed for O(1) apply lookup.
     const liveIdsByGroup = new Map();
     for (const [groupKey, group] of groups) {
-        const rows = await fetchLiveRows(ctx, group.registered, group.scope, group.ids, "filterMetaOrphans");
-        liveIdsByGroup.set(groupKey, new Set(rows.map((row) => row.id)));
-    }
-    // Pass 3: apply the filter. Orphan handling differs by shape:
-    //  - multi + id: filter the string[] in place, dropping missing
-    //  - multi + object: filter the object[] preserving order
-    //  - single + id: null on missing
-    //  - single + object: null on missing; otherwise keep the stored
-    //    cached value as-is (no read-time refresh — write rewrites)
-    // Nested-in-repeater candidates rewrite the row's subField slot in
-    // a per-key cloned array so the input bag stays untouched.
+        const liveIds = await fetchLiveIds(ctx, group.registered, group.scope, group.ids, "filterMetaOrphans");
+        liveIdsByGroup.set(groupKey, liveIds);
+    }
+    // Pass 3: apply the filter. Multi refs filter the string[] dense
+    // and in order; single refs null on missing. Nested-in-repeater
+    // candidates rewrite the row's subField slot in a per-key cloned
+    // array so the input bag stays untouched.
     const out = { ...decoded };
     const empty = new Set();
     for (const candidate of candidates) {
-        const { key, multiple, valueShape, groupKey, ids, nested } = candidate;
+        const { key, multiple, groupKey, ids, nested } = candidate;
         const liveIds = liveIdsByGroup.get(groupKey) ?? empty;
         if (nested !== undefined) {
             const rowObj = takeWritableRow(out, decoded, key, nested.rowIdx);
             if (!rowObj)
                 continue;
-            applyOrphanToSlot(rowObj, nested.subKey, multiple, valueShape, ids, liveIds);
+            applyOrphanToSlot(rowObj, nested.subKey, multiple, ids, liveIds);
             continue;
         }
         if (multiple) {
-            if (valueShape === "object") {
-                const stored = decoded[key];
-                out[key] = stored.filter((item) => {
-                    const id = extractStringId(item);
-                    return id !== null && liveIds.has(id);
-                });
-                continue;
-            }
             out[key] = ids.filter((id) => liveIds.has(id));
             continue;
         }
@@ -560,16 +473,8 @@ function takeWritableRow(out, decoded, key, rowIdx) {
         return null;
     return row;
 }
-function applyOrphanToSlot(rowObj, subKey, multiple, valueShape, ids, liveIds) {
+function applyOrphanToSlot(rowObj, subKey, multiple, ids, liveIds) {
     if (multiple) {
-        if (valueShape === "object") {
-            const stored = rowObj[subKey];
-            rowObj[subKey] = stored.filter((item) => {
-                const id = extractStringId(item);
-                return id !== null && liveIds.has(id);
-            });
-            return;
-        }
         rowObj[subKey] = ids.filter((id) => liveIds.has(id));
         return;
     }
@@ -582,29 +487,15 @@ function applyOrphanToSlot(rowObj, subKey, multiple, valueShape, ids, liveIds) {
 // Returns `null` to mean "no candidates from this key" (skip), or
 // the ids to feed into the group's batch query. Mirrors the storage-
 // shape guards in the apply step so we don't enqueue work that's
-// going to be skipped. Cached-object values (`valueShape === "object"`)
-// extract `id` from the object — the rest of the cached fields are
-// trusted on read (refresh happens on next write via the validator's
-// normalize step, not on every render).
+// going to be skipped. Callers pass values already decoded through
+// `decodeMetaBag`, so legacy object shapes have been healed to plain
+// ids by the time this runs.
 function orphanCandidateIds(target, value) {
     if (target.multiple) {
         if (!Array.isArray(value))
             return null;
-        if (target.valueShape === "object") {
-            const ids = [];
-            for (const item of value) {
-                const id = extractStringId(item);
-                if (id !== null)
-                    ids.push(id);
-            }
-            return ids;
-        }
         return value.filter((id) => typeof id === "string");
     }
-    if (target.valueShape === "object") {
-        const id = extractStringId(value);
-        return id !== null ? [id] : null;
-    }
     return typeof value === "string" ? [value] : null;
 }
 function referenceTargetOf(field) {
@@ -626,10 +517,54 @@ export function decodeMetaBag(findField, raw) {
     const out = {};
     for (const [key, value] of Object.entries(raw)) {
         const field = findField(key);
-        out[key] = field ? coerceOnRead(field.type, value) : value;
+        out[key] = field ? decodeFieldValue(field, value) : value;
     }
     return out;
 }
+// Reference storage is plain ids, but bags written before the
+// write-time snapshot machinery was removed may hold `{ id, ... }`
+// objects. Reads yield the id; the next save persists the plain form
+// (`referenceItemId` accepts the legacy shape on write).
+function decodeFieldValue(field, value) {
+    const target = referenceTargetOf(field);
+    if (target)
+        return healReferenceValue(target, value);
+    if (isRepeaterField(field) && Array.isArray(value)) {
+        return value.map((row) => healRepeaterRow(field, row));
+    }
+    return coerceOnRead(field.type, value);
+}
+function healReferenceValue(target, value) {
+    if (target.multiple) {
+        if (!Array.isArray(value))
+            return value;
+        // Identity-preserving on the already-plain path — `healRepeaterRow`
+        // clones a row only when the healed slot differs.
+        if (!value.some((item) => extractStringId(item) !== null)) {
+            return value;
+        }
+        return value.map((item) => extractStringId(item) ?? item);
+    }
+    return extractStringId(value) ?? value;
+}
+function healRepeaterRow(field, row) {
+    if (!row || typeof row !== "object" || Array.isArray(row))
+        return row;
+    const rowObj = row;
+    let healed = null;
+    for (const subField of field.subFields) {
+        const target = referenceTargetOf(subField);
+        if (!target)
+            continue;
+        const value = rowObj[subField.key];
+        const next = healReferenceValue(target, value);
+        if (next !== value) {
+            healed ??= { ...rowObj };
+            healed[subField.key] = next;
+        }
+    }
+    return healed ?? row;
+}
 export function isEmptyMetaPatch(patch) {
     return (patch === null || (patch.upserts.size === 0 && patch.deletes.length === 0));
 }