octane 0.4.2 → 0.4.3

package/dist/cjs/runtime.server.cjs

@@ -156,6 +156,7 @@ __export(runtime_server_exports, {
   ssrStylesheetResource: () => ssrStylesheetResource,
   ssrText: () => ssrText,
   ssrTextPre: () => ssrTextPre,
+  ssrTextSlot: () => ssrTextSlot,
   ssrTextareaValue: () => ssrTextareaValue,
   ssrTextareaValueSources: () => ssrTextareaValueSources,
   ssrTry: () => ssrTry,
@@ -205,6 +206,7 @@ var import_head_ownership = require("./head-ownership.cjs");
 var import_resource_hint_diagnostics = require("./resource-hint-diagnostics.cjs");
 var import_aria_diagnostics = require("./aria-diagnostics.cjs");
 var import_host_property_diagnostics = require("./host-property-diagnostics.cjs");
+var import_hydration_markers2 = require("./hydration-markers.cjs");
 var import_early_signals = require("./server/early-signals.cjs");
 var import_shared_value_helpers = require("./shared-value-helpers.cjs");
 var import_css = require("./css.cjs");
@@ -1338,6 +1340,9 @@ function ssrText(v) {
   if (v == null || v === false) return "";
   return escapeHtml(v);
 }
+function ssrTextSlot(text) {
+  return text === "" ? import_constants.EMPTY_COMMENT : text;
+}
 function ssrTextPre(v) {
   const s = ssrText(v);
   return s.charCodeAt(0) === 10 ? "\n" + s : s;
@@ -1745,13 +1750,20 @@ function ssrControl(siteKey, fn) {
     SIGNAL_CONTROL_SITE = previousSignalControl;
   }
 }
-function enterAsyncArm(armKey, mapped = false) {
+function enterAsyncArm(armKey, mapped = false, signalSite) {
   const previous = ASYNC_SCOPE;
   const frame = FRAME;
   const occurrence = frame === null ? 0 : nextFrameOccurrence(frame, "@arm-position:");
   const fallbackPosition = armKey !== null && (typeof armKey === "object" || typeof armKey === "function" || typeof armKey === "symbol") ? previous + "|@arm-position:" + occurrence : void 0;
   if (SERVER_SIGNAL_BINDINGS_POTENTIAL && SIGNAL_CONTROL_SITE.charCodeAt(0) === 102) {
-    SIGNAL_LIST_KEYS = { parent: SIGNAL_LIST_KEYS, key: armKey, mapped, values: null };
+    SIGNAL_LIST_KEYS = {
+      parent: SIGNAL_LIST_KEYS,
+      key: armKey,
+      mapped,
+      signalSite,
+      position: occurrence,
+      values: null
+    };
   }
   ASYNC_SCOPE = previous + "|@arm:" + asyncIdentityKey(armKey, false, fallbackPosition);
 }
@@ -1766,18 +1778,47 @@ function ssrArm(armKey, fn) {
     SIGNAL_LIST_KEYS = previousSignalKeys;
   }
 }
-function ssrForItem(armKey, fn, item, index, scope, block, mapped = false) {
+function ssrForItem(armKey, fn, item, index, scope, block, mapped = false, signalSite) {
   const previous = ASYNC_SCOPE;
   const previousSignalKeys = SIGNAL_LIST_KEYS;
+  const previousSignalOwnerActive = SERVER_SIGNAL_OWNER_ACTIVE;
+  let previousOwner;
   try {
-    enterAsyncArm(armKey, mapped);
-    const html = index === void 0 ? fn(item, scope) : fn(item, index, scope);
+    enterAsyncArm(armKey, mapped, signalSite);
+    const owner = signalSite !== void 0 && RESOLVED !== null && (SERVER_SIGNAL_BINDINGS_ENABLED || RESOLVED.signalOwner !== void 0) ? serverSignalOwner(FRAME, serverStructuralSignalInstanceKey(signalSite, void 0)) : void 0;
+    let html;
+    if (owner === void 0) {
+      html = index === void 0 ? fn(item, scope) : fn(item, index, scope);
+    } else {
+      SERVER_SIGNAL_OWNER_ACTIVE = true;
+      const injection = RESOLVED?.resourceOptions?.injection;
+      if (injection?.observeSignalAttempt !== void 0 || (previousOwner = (0, import_owner_context.enterSynchronousSignalOwner)(owner)) === void 0) {
+        html = invokeServerSignalForItem(owner, fn, item, index, scope);
+      } else {
+        html = index === void 0 ? fn(item, scope) : fn(item, index, scope);
+      }
+    }
     return block ? ssrBlock(html) : html;
   } finally {
+    if (previousOwner !== void 0) (0, import_owner_context.restoreSynchronousSignalOwner)(previousOwner);
+    SERVER_SIGNAL_OWNER_ACTIVE = previousSignalOwnerActive;
     ASYNC_SCOPE = previous;
     SIGNAL_LIST_KEYS = previousSignalKeys;
   }
 }
+function invokeServerSignalForItem(owner, fn, item, index, scope) {
+  const invoke = () => index === void 0 ? fn(item, scope) : fn(item, index, scope);
+  const injection = RESOLVED?.resourceOptions?.injection;
+  return (0, import_owner_context.runWithSignalOwner)(
+    owner,
+    () => injection?.observeSignalAttempt === void 0 ? invoke() : (0, import_query_attempt_observer.runWithServerSignalQueryAttemptObserver)(
+      owner,
+      (attempt) => injection.observeSignalAttempt(attempt, (0, import_owner_context.captureSignalOwner)(owner)),
+      injection.createSignalAttemptObservations,
+      invoke
+    )
+  );
+}
 function ssrPortal() {
   return import_constants.EMPTY_COMMENT;
 }
@@ -2812,18 +2853,60 @@ function replayUpdatedComponentBody(comp, props, scope, frame, hp, snapshot, war
   } while (hp.update);
   return out;
 }
-function signalIdentityKey(value) {
+function signalIdentityToken(value, position) {
   if (value === null) return "null";
   const kind = typeof value;
-  return kind === "string" || kind === "number" || kind === "bigint" || kind === "boolean" ? kind.charCodeAt(0).toString(36) + ":" + String(value) : kind === "undefined" ? "u:" : "o:" + String(value);
+  return kind === "string" || kind === "number" || kind === "bigint" || kind === "boolean" ? kind.charCodeAt(0).toString(36) + ":" + String(value) : kind === "undefined" ? "u:" : { value, position };
 }
-function serverStructuralSignalInstanceKey(invocationSite, key) {
-  return resolveServerSignalInstanceKey(SIGNAL_COMPONENT_INSTANCE_KEY) + JSON.stringify([
+function signalIdentityKey(token, base, site, parents, componentKey) {
+  if (typeof token === "string") return token;
+  const resolved = RESOLVED;
+  const namespace = base + JSON.stringify([site ?? "legacy", parents, componentKey]);
+  const namespaces = resolved.signalIdentityKeys ??= /* @__PURE__ */ new Map();
+  let keys = namespaces.get(namespace);
+  if (keys === void 0) {
+    keys = { ids: /* @__PURE__ */ new Map(), used: /* @__PURE__ */ new Set(), next: 0 };
+    namespaces.set(namespace, keys);
+  }
+  const value = asyncIdentityKey(token.value, false);
+  let id = keys.ids.get(value);
+  if (id === void 0) {
+    id = token.position;
+    if (id === void 0 || keys.used.has(id)) {
+      while (keys.used.has(keys.next)) keys.next++;
+      id = keys.next++;
+    }
+    keys.used.add(id);
+    keys.ids.set(value, id);
+  }
+  return "o:" + id.toString(36);
+}
+function serverSignalSegmentKey(base, invocationSite, listKeys, key) {
+  const tokens = resolveServerSignalListKeys(listKeys);
+  let itemKeys = tokens;
+  for (const token of tokens) {
+    if (typeof token === "string") continue;
+    const values = [];
+    for (const entry of tokens) {
+      values.push(signalIdentityKey(entry, base, invocationSite, values, false));
+    }
+    itemKeys = values;
+    break;
+  }
+  return base + JSON.stringify([
     invocationSite ?? "legacy",
-    resolveServerSignalListKeys(SIGNAL_LIST_KEYS),
-    key != null ? signalIdentityKey(key) : ""
+    itemKeys,
+    key != null ? signalIdentityKey(signalIdentityToken(key), base, invocationSite, itemKeys, true) : ""
   ]);
 }
+function serverStructuralSignalInstanceKey(invocationSite, key) {
+  return serverSignalSegmentKey(
+    resolveServerSignalInstanceKey(SIGNAL_COMPONENT_INSTANCE_KEY),
+    invocationSite,
+    SIGNAL_LIST_KEYS,
+    key
+  );
+}
 function resolveServerSignalListKeys(keys) {
   if (keys === null) return EMPTY_SIGNAL_LIST_KEYS;
   if (keys.values !== null) return keys.values;
@@ -2836,7 +2919,10 @@ function resolveServerSignalListKeys(keys) {
   let values = parent?.values ?? EMPTY_SIGNAL_LIST_KEYS;
   for (let index = pending.length - 1; index >= 0; index--) {
     const entry = pending[index];
-    values = [...values, signalIdentityKey(entry.mapped ? "k" + String(entry.key) : entry.key)];
+    values = [
+      ...values,
+      signalIdentityToken(entry.mapped ? "k" + String(entry.key) : entry.key, entry.position)
+    ];
     entry.values = values;
   }
   return values;
@@ -2855,23 +2941,27 @@ function resolveServerSignalInstanceKey(identity) {
   }
   for (let index = pending.length - 1; index >= 0; index--) {
     const frame = pending[index];
-    identity += JSON.stringify([
-      frame.signalInvocationSite ?? "legacy",
-      resolveServerSignalListKeys(frame.signalListKeys ?? null),
-      frame.signalKey != null ? signalIdentityKey(frame.signalKey) : ""
-    ]);
+    identity = serverSignalSegmentKey(
+      identity,
+      frame.signalInvocationSite,
+      frame.signalListKeys ?? null,
+      frame.signalKey
+    );
     frame.signalInstanceKey = identity;
   }
   return identity;
 }
-function serverSignalOwner(_frame) {
+function serverSignalOwner(_frame, rowInstanceKey) {
   const resolved = RESOLVED;
   if (resolved !== null && SERVER_SIGNAL_BINDINGS_ENABLED && resolved.signalOwner === void 0) {
     ensureServerSignalOwner();
   }
   if (resolved === null || resolved.signalOwner === void 0 || resolved.signalInstances === void 0)
     return;
-  const instanceKey = resolveServerSignalInstanceKey(SIGNAL_COMPONENT_INSTANCE_KEY) || JSON.stringify([SIGNAL_INSTANCE_PREFIX, "root"]);
+  if (rowInstanceKey === void 0 && SIGNAL_LIST_KEYS?.signalSite !== void 0) {
+    rowInstanceKey = serverStructuralSignalInstanceKey(SIGNAL_LIST_KEYS.signalSite, void 0);
+  }
+  const instanceKey = (rowInstanceKey ?? resolveServerSignalInstanceKey(SIGNAL_COMPONENT_INSTANCE_KEY)) || JSON.stringify([SIGNAL_INSTANCE_PREFIX, "root"]);
   let owner = resolved.signalInstances.get(instanceKey);
   if (owner === void 0) {
     owner = Object.freeze({
@@ -3028,7 +3118,7 @@ function renderComponentFramed(comp, props, parent, frame, inherit, instanceKey,
 function ssrComponent(parent, comp, props, inherit, key, identityScoped, invocationSite, bindingMarker) {
   const activity = comp === Activity;
   if (activity && key === void 0) key = props?.key;
-  let signalInstanceKey = SERVER_SIGNAL_BINDINGS_ENABLED ? serverStructuralSignalInstanceKey(invocationSite, key) : void 0;
+  let signalInstanceKey = SERVER_SIGNAL_BINDINGS_ENABLED && RESOLVED !== null ? serverStructuralSignalInstanceKey(invocationSite, key) : void 0;
   const previousIdentityScope = ASYNC_SCOPE;
   if (identityScoped !== true) {
     ASYNC_SCOPE = previousIdentityScope + "|@component-type:" + asyncIdentityKey(comp, false);
@@ -3147,6 +3237,10 @@ function streamTokenForPendingHtml(html) {
 function ssrIndependentHydrateSidecar(props, instanceId) {
   const independent = props.__independent;
   if (independent === void 0) return "";
+  const when = typeof props.when === "function" ? "dynamic" : props.when?._t;
+  if (when === "dynamic" || when === "condition") {
+    throw new Error((0, import_error_codes_server_generated.formatServerError)(80, when));
+  }
   const registry = RESOLVED?.resourceOptions?.independentHydration;
   if (registry === void 0) {
     throw new Error((0, import_error_codes_server_generated.formatServerError)(69));
@@ -3188,7 +3282,23 @@ function withServerIndependentIdentity(prefix, idSeed, render) {
     ID_COUNTER = previousIdCounter + ID_COUNTER - idSeed;
   }
 }
-function ssrHydrateAttrs(id, when, idCount, permanentStaticAncestor = false, streamToken = null) {
+function ssrIndependentStrategyAttrs(strategy) {
+  const params = strategy._p;
+  if (strategy._t === "media") return ssrAttr(import_hydration_markers2.HYDRATE_MEDIA_ATTR, params, "div");
+  if (params === null || typeof params !== "object") return "";
+  if (strategy._t === "idle") {
+    const { timeout } = params;
+    return timeout === void 0 ? "" : ssrAttr(import_hydration_markers2.HYDRATE_IDLE_TIMEOUT_ATTR, timeout, "div");
+  }
+  if (strategy._t !== "visible") return "";
+  const { rootMargin, threshold } = params;
+  return (rootMargin === void 0 ? "" : ssrAttr(import_hydration_markers2.HYDRATE_VISIBLE_MARGIN_ATTR, rootMargin, "div")) + (threshold === void 0 ? "" : ssrAttr(
+    import_hydration_markers2.HYDRATE_VISIBLE_THRESHOLD_ATTR,
+    Array.isArray(threshold) ? threshold.join(",") : threshold,
+    "div"
+  ));
+}
+function ssrHydrateAttrs(id, when, idCount, permanentStaticAncestor = false, streamToken = null, independent = false) {
   const direct = typeof when !== "function" && when !== null ? when : null;
   let attrs = ssrAttr(import_constants.HYDRATE_ID_ATTR, id, "div") + ssrAttr(
     import_constants.HYDRATE_WHEN_ATTR,
@@ -3197,6 +3307,7 @@ function ssrHydrateAttrs(id, when, idCount, permanentStaticAncestor = false, str
   ) + ssrAttr(import_constants.HYDRATE_ID_COUNT_ATTR, idCount, "div");
   if (streamToken !== null) attrs += ssrAttr(import_constants.HYDRATE_STREAM_TOKEN_ATTR, streamToken, "div");
   if (permanentStaticAncestor) return attrs;
+  if (independent && direct !== null) attrs += ssrIndependentStrategyAttrs(direct);
   const strategyAttrs = direct?._a?.();
   if (strategyAttrs === void 0) return attrs;
   for (const name of Object.keys(strategyAttrs)) {
@@ -3290,7 +3401,8 @@ const hydrate = /* @__PURE__ */ (0, import_component_flags.markComponentFlags)(
             props.when,
             idCount,
             permanentStaticAncestor,
-            streamTokenForPendingHtml(children)
+            streamTokenForPendingHtml(children),
+            props.__independent !== void 0
           );
           const seedJson = permanentStaticAncestor || childSeeds.length === 0 ? null : serializeSuspenseSeedJson(childSeeds);
           const seedSidecar = seedJson === null || seedJson === "[]" ? "" : '<script type="application/json" ' + import_constants.HYDRATE_SEED_ATTR + NONCE_ATTR + ">" + seedJson + "</script>";
@@ -3711,19 +3823,7 @@ function createContext(defaultValue) {
   ctx.defaultValue = defaultValue;
   (0, import_context_identity.registerContext)(ctx);
   if (process.env.NODE_ENV !== "production") {
-    let consumerWarned = false;
-    Object.defineProperty(ctx, "Consumer", {
-      configurable: true,
-      get() {
-        if (!consumerWarned) {
-          consumerWarned = true;
-          console.error(
-            "Octane has no Context.Consumer. Read the context directly with use(Context) or useContext(Context) in the child component \u2014 Octane hooks are call-site keyed, so the read is legal behind any condition the render-prop form was working around."
-          );
-        }
-        return void 0;
-      }
-    });
+    (0, import_context_identity.defineRemovedContextMembers)(ctx);
   }
   return ctx;
 }
@@ -4924,6 +5024,7 @@ function releaseServerRenderResources(resolved) {
     for (const owner of resolved.signalInstances.values()) (0, import_owner_context.retireSignalOwnerIdentity)(owner);
     resolved.signalInstances.clear();
   }
+  resolved.signalIdentityKeys?.clear();
   if (resolved.ownedSignalOwner && resolved.signalOwner !== void 0) {
     (0, import_owner_context.retireSignalOwnerIdentity)(resolved.signalOwner);
   }
@@ -7864,6 +7965,7 @@ function preinitModule(href, options) {
   ssrStylesheetResource,
   ssrText,
   ssrTextPre,
+  ssrTextSlot,
   ssrTextareaValue,
   ssrTextareaValueSources,
   ssrTry,

package/dist/cjs/server/index.cjs

@@ -137,6 +137,7 @@ __export(server_exports, {
   ssrStylesheetResource: () => import_runtime_server.ssrStylesheetResource,
   ssrText: () => import_runtime_server.ssrText,
   ssrTextPre: () => import_runtime_server.ssrTextPre,
+  ssrTextSlot: () => import_runtime_server.ssrTextSlot,
   ssrTextareaValue: () => import_runtime_server.ssrTextareaValue,
   ssrTextareaValueSources: () => import_runtime_server.ssrTextareaValueSources,
   ssrTry: () => import_runtime_server.ssrTry,
@@ -315,6 +316,7 @@ var import_runtime_server = require("../runtime.server.cjs");
   ssrStylesheetResource,
   ssrText,
   ssrTextPre,
+  ssrTextSlot,
   ssrTextareaValue,
   ssrTextareaValueSources,
   ssrTry,

package/dist/cjs/server/streamed-signals.cjs

@@ -49,23 +49,54 @@ function limits(options) {
 function isAsyncIterable(value) {
   return value !== null && (typeof value === "object" || typeof value === "function") && typeof value[Symbol.asyncIterator] === "function";
 }
-async function* createStreamedSignalResultFrames(identity, result, options = {}) {
+const CANCELLED = /* @__PURE__ */ Symbol("octane.streamedSignalResultCancelled");
+function createStreamedSignalResultFrames(identity, result, options = {}) {
+  let cancelled = false;
+  let reject;
+  const waits = {
+    wait(value) {
+      if (cancelled) return Promise.reject(CANCELLED);
+      return new Promise((resolve, fail) => {
+        reject = fail;
+        Promise.resolve(value).then(resolve, fail);
+      });
+    },
+    interrupt(reason) {
+      const fail = reject;
+      reject = void 0;
+      fail?.(reason);
+    }
+  };
+  const frames = produceStreamedSignalResultFrames(identity, result, options, waits);
+  const returnFrames = frames.return;
+  frames.return = (value) => {
+    cancelled = true;
+    waits.interrupt(CANCELLED);
+    return returnFrames.call(frames, value);
+  };
+  return frames;
+}
+async function* produceStreamedSignalResultFrames(identity, result, options, waits) {
   if (!(0, import_streamed_signals_protocol.isStreamFrameIdentity)(identity)) throw new TypeError("Invalid streamed signal identity.");
   let sequence = 0;
   let resource = "promise";
   let iterator;
   const run = options.run ?? ((callback) => callback());
+  const signal = options.signal;
+  const abort = () => waits.interrupt(signal.reason);
+  signal?.addEventListener("abort", abort, { once: true });
   try {
-    const resolved = await result;
-    options.signal?.throwIfAborted();
+    signal?.throwIfAborted();
+    const resolved = await waits.wait(result);
+    signal?.throwIfAborted();
     if (isAsyncIterable(resolved)) {
       resource = "stream";
       iterator = run(() => resolved[Symbol.asyncIterator]());
       yield { identity, sequence: sequence++, channel: "result", kind: "open", resource: "stream" };
       for (; ; ) {
-        options.signal?.throwIfAborted();
-        const next = await run(() => iterator.next());
-        options.signal?.throwIfAborted();
+        signal?.throwIfAborted();
+        const next = await waits.wait(run(() => iterator.next()));
+        signal?.throwIfAborted();
         if (next.done) break;
         yield {
           identity,
@@ -93,12 +124,14 @@ async function* createStreamedSignalResultFrames(identity, result, options = {})
       };
     }
     yield { identity, sequence, channel: "result", kind: "complete" };
-  } catch {
+  } catch (error) {
+    if (error === CANCELLED) return;
     if (sequence === 0) {
       yield { identity, sequence: sequence++, channel: "result", kind: "open", resource };
     }
     yield { identity, sequence, channel: "result", kind: "error", code: "SERVER_RESULT_FAILED" };
   } finally {
+    signal?.removeEventListener("abort", abort);
     if (iterator !== void 0) {
       try {
         await run(() => iterator.return?.());
@@ -469,12 +502,11 @@ function createAutomaticStreamedSignalInjection(options, external) {
         attempt.release();
         return;
       }
+      observedAttempts.add(attemptKey);
       if (children.size >= 256) {
         attempt.release();
-        fail(new Error("Automatic streamed signals exceeded their channel budget."));
         return;
       }
-      observedAttempts.add(attemptKey);
       hasSignalAttempts = true;
       const identity = {
         protocol: 1,

package/dist/cjs/signals/client.cjs

@@ -24,7 +24,6 @@ __export(client_exports, {
 module.exports = __toCommonJS(client_exports);
 __reExport(client_exports, require("./index.cjs"), module.exports);
 var import_runtime = require("../runtime.cjs");
-var import_diagnostic_local_hook = require("./diagnostic-local-hook.cjs");
 var import_engine = require("./engine.cjs");
 function disposeLocalSignal(cell) {
   cell.scope.dispose();
@@ -38,11 +37,7 @@ function useSignal$(initial, slot) {
       return { scope, signal$: scope.signal$("value", value) };
     },
     disposeLocalSignal,
-    slot,
-    process.env.NODE_ENV === "production" || typeof initial === "function" || !(0, import_runtime.isNativeSignalDiagnosticProbe)() ? void 0 : (0, import_diagnostic_local_hook.createNativeSignalDiagnosticInitializer)(() => {
-      const scope = (0, import_engine.createDiagnosticLocalScope)("octane/useSignal$");
-      return { scope, signal$: scope.signal$("value", initial) };
-    })
+    slot
   );
   return cell.signal$;
 }

package/dist/cjs/signals/engine.cjs

@@ -24,7 +24,6 @@ __export(engine_exports, {
   bindScopeStreamedSelection: () => bindScopeStreamedSelection,
   createDeclaredSignalCell: () => createDeclaredSignalCell,
   createDerivedCellWith: () => createDerivedCellWith,
-  createDiagnosticLocalScope: () => createDiagnosticLocalScope,
   createLocalScope: () => createLocalScope,
   createResourceCellWith: () => createResourceCellWith,
   createScope: () => createScope,
@@ -106,7 +105,6 @@ function decodeSeed(scopeKey, seed) {
   }
   return entries;
 }
-const DIAGNOSTIC_LOCAL_SCOPES = /* @__PURE__ */ new WeakSet();
 class ScopeImpl {
   constructor(key, options, seedable = true) {
     this.key = key;
@@ -593,8 +591,7 @@ class ScopeImpl {
   }
   dispose() {
     if (this.disposed) return;
-    if (process.env.NODE_ENV === "production" || !DIAGNOSTIC_LOCAL_SCOPES.has(this))
-      (0, import_graph.assertWritable)();
+    (0, import_graph.assertWritable)();
     (0, import_graph.signalBatch)(() => {
       this.disposed = true;
       this.lifetime++;
@@ -737,13 +734,6 @@ function createScope(options) {
 function createLocalScope(scopeKey) {
   return new ScopeImpl(scopeKey, { scopeKey }, false);
 }
-function createDiagnosticLocalScope(scopeKey) {
-  if (process.env.NODE_ENV === "production" || !(0, import_read_protocol.isNativeWriteGuarded)() || (0, import_read_protocol.getNativeReadObserver)() !== null)
-    throw new import_errors.SignalFrameError("Diagnostic local scopes require an isolated historical read.");
-  const scope = new ScopeImpl(scopeKey, { scopeKey }, false);
-  DIAGNOSTIC_LOCAL_SCOPES.add(scope);
-  return scope;
-}
 function createDeclaredSignalCell(owner, key, initial, preferInitial = false) {
   if (!(owner instanceof ScopeImpl)) throw new TypeError("A direct signal needs an Octane scope.");
   return owner.createSignalDeclaration(key, initial, preferInitial);
@@ -786,7 +776,6 @@ function failScopeStreamedResult(owner, identity, error) {
   bindScopeStreamedSelection,
   createDeclaredSignalCell,
   createDerivedCellWith,
-  createDiagnosticLocalScope,
   createLocalScope,
   createResourceCellWith,
   createScope,

package/dist/cjs/version.cjs

@@ -21,7 +21,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-const version = "0.4.2";
+const version = "0.4.3";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/compiler/client-only-server.js

@@ -9,6 +9,7 @@
  * diagnostic before a sentinel can affect server behavior.
  */
 import { builders as b, parseModule } from '@tsrx/core';
+import { inheritGeneratedOrigin } from './generated-origin.js';
 import { print as esrapPrint } from 'esrap';
 import esrapTsx from 'esrap/languages/tsx';
 
@@ -260,34 +261,6 @@ function collectRuntimeExports(ast, filename) {
 		.sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));
 }
 
-/**
- * Generated stub scaffolding has no authored syntax of its own, but every
- * printed node still inherits a source origin so the auxiliary module carries
- * a useful esrap map. The tree is compiler-owned; parsed nodes are never
- * embedded or mutated.
- */
-function inheritGeneratedOrigin(root, origin) {
-	const seen = new WeakSet();
-	const visit = (value) => {
-		if (!value || typeof value !== 'object' || seen.has(value)) return;
-		seen.add(value);
-		if (Array.isArray(value)) {
-			for (const item of value) visit(item);
-			return;
-		}
-		if (typeof value.type === 'string' && value.loc == null && origin?.loc != null) {
-			value.start = origin.start;
-			value.end = origin.end;
-			value.loc = origin.loc;
-		}
-		for (const [key, child] of Object.entries(value)) {
-			if (key !== 'loc' && key !== 'metadata') visit(child);
-		}
-	};
-	visit(root);
-	return root;
-}
-
 function createProgram(body, origin) {
 	return inheritGeneratedOrigin(
 		{

package/dist/compiler/compile-renderer-boundaries.js

@@ -5,6 +5,7 @@ import {
 } from './renderer-boundaries.js';
 import { lowerUniversalRendererRegionAst } from './compile-universal.js';
 import { builders as b, clone_ast_node, parseModule } from '@tsrx/core';
+import { inheritGeneratedOrigin } from './generated-origin.js';
 
 const DOM_RENDERER = Object.freeze({ id: 'dom', module: 'octane', target: 'dom' });
 const AUTO_RUNTIME_HOOKS = new Set([
@@ -32,28 +33,6 @@ const AUTO_RUNTIME_HOOKS = new Set([
 ]);
 const AST_SKIP_KEYS = new Set(['end', 'loc', 'metadata', 'parent', 'range', 'start']);
 
-function inheritGeneratedOrigin(root, origin) {
-	const seen = new WeakSet();
-	const visit = (value) => {
-		if (!value || typeof value !== 'object' || seen.has(value)) return;
-		seen.add(value);
-		if (Array.isArray(value)) {
-			for (const item of value) visit(item);
-			return;
-		}
-		if (typeof value.type === 'string' && value.loc == null && origin?.loc != null) {
-			value.start = origin.start;
-			value.end = origin.end;
-			value.loc = origin.loc;
-		}
-		for (const [key, child] of Object.entries(value)) {
-			if (!AST_SKIP_KEYS.has(key)) visit(child);
-		}
-	};
-	visit(root);
-	return root;
-}
-
 function mapAstCow(value, replace) {
 	if (!value || typeof value !== 'object') return value;
 	if (Array.isArray(value)) {

package/dist/compiler/compile-universal.js

@@ -10,6 +10,7 @@
 import { builders as b, clone_ast_node, parseModule } from '@tsrx/core';
 import { normalizeUniversalRuntime } from './universal-runtime.js';
 import { createContextSourceFacts } from './context-provider.js';
+import { inheritGeneratedOrigin } from './generated-origin.js';
 
 // Keep this catalogue in the compiler, never in generated application code. It
 // is the union of actual constructor exports from Three r156, r172, and r183,
@@ -402,28 +403,6 @@ function withPlanOrigin(value, origin) {
 	return value;
 }
 
-function inheritGeneratedOrigin(root, origin) {
-	const seen = new WeakSet();
-	const visit = (value) => {
-		if (!value || typeof value !== 'object' || seen.has(value)) return;
-		seen.add(value);
-		if (Array.isArray(value)) {
-			for (const item of value) visit(item);
-			return;
-		}
-		if (typeof value.type === 'string' && value.loc == null && origin?.loc != null) {
-			value.start = origin.start;
-			value.end = origin.end;
-			value.loc = origin.loc;
-		}
-		for (const [key, child] of Object.entries(value)) {
-			if (!AST_SKIP_KEYS.has(key)) visit(child);
-		}
-	};
-	visit(root);
-	return root;
-}
-
 function jsonValueToAst(value, origin) {
 	const valueOrigin =
 		value && typeof value === 'object' && value[PLAN_ORIGIN] ? value[PLAN_ORIGIN] : origin;