octane 0.9.0 → 0.9.1

package/dist/behavior-form-submissions.js

@@ -97,7 +97,8 @@ function createSubmissionController(root, mailbox, services) {
     flush: () => mailbox.flush(),
     skip: (owner, event) => enabledRoots.has(owner) && mailbox.has(event),
     release: (entry) => {
-      if (enabledRoots.has(entry.root)) releaseBehaviorSubmissions(entry, services);
+      if (enabledRoots.has(entry.root) && entry.root.behaviors.has(entry))
+        releaseBehaviorSubmissions(entry, services);
     },
     dispose: (owner) => {
       if (registry.roots.get(owner.container) !== owner) return;

package/dist/cjs/behavior-form-submissions.cjs

@@ -100,7 +100,8 @@ function createSubmissionController(root, mailbox, services) {
     flush: () => mailbox.flush(),
     skip: (owner, event) => enabledRoots.has(owner) && mailbox.has(event),
     release: (entry) => {
-      if (enabledRoots.has(entry.root)) releaseBehaviorSubmissions(entry, services);
+      if (enabledRoots.has(entry.root) && entry.root.behaviors.has(entry))
+        releaseBehaviorSubmissions(entry, services);
     },
     dispose: (owner) => {
       if (registry.roots.get(owner.container) !== owner) return;

package/dist/cjs/runtime.cjs

@@ -198,6 +198,7 @@ __export(runtime_exports, {
   nativeStyleBinding: () => nativeStyleBinding,
   nativeWarmMemo: () => nativeWarmMemo,
   normalizeClass: () => import_css.normalizeClass,
+  ownSlotAnchor: () => ownSlotAnchor,
   portal: () => portal,
   positionalChildren: () => positionalChildren,
   preconnect: () => preconnect,
@@ -1005,11 +1006,12 @@ function scheduleNativeRead(target) {
     if (retainPriority) TRANSITION_DEPTH--;
   }
 }
-function currentSignalDeclarationStage() {
+function currentSignalDeclarationStage(declaring) {
   const block = CURRENT_BLOCK;
-  const capture = WIP_CAPTURE;
+  const declared = declaring === void 0 ? void 0 : NATIVE_READ_DRIVER?.enclosingInvocation(declaring);
+  const capture = declared === void 0 ? WIP_CAPTURE : declared.capture;
   if (block === null || capture === null || ROOT_RENDER_ROLLBACK) return void 0;
-  const invocation = NATIVE_READ_DRIVER?.invocation(block);
+  const invocation = declared ?? NATIVE_READ_DRIVER?.invocation(block);
   const current = invocation?.invocationData;
   if (current != null && !current.settled && current.capture === capture) return current;
   const callbacks = [];
@@ -7365,6 +7367,7 @@ class LiteBlockImpl {
     this.parentNode = parentNode;
     this.endMarker = endMarker;
     this.parentBlock = parentBlock;
+    this.memoInChain = parentBlock.memoInChain;
     this.$$ctxValues = null;
     this.idState = parentBlock.idState;
     this.signalInstanceParent = null;
@@ -10034,6 +10037,20 @@ function createHydrateSlot(props, scope, boundaryId, boundaryBody) {
   }
   return state;
 }
+function resumeFreshHydrateSource(source) {
+  const anchor = source.endMarker;
+  const parent = source.parentNode;
+  const before = anchor ? domNode(anchor).previousSibling : domNode(parent).lastChild;
+  try {
+    renderBlock(source);
+  } finally {
+    const first = before ? getNextSibling(before) : getFirstChild(parent);
+    for (let arm = source.parentBlock; first !== anchor && arm?.kind === "control-flow" && !arm.mounted && arm.startMarker === null && arm.endMarker === anchor; arm = arm.parentBlock) {
+      journalRootProperty(arm, "startMarker", null);
+      arm.startMarker = first;
+    }
+  }
+}
 function activateHydrateBoundary(state) {
   if (state.start === null || state.end === null) return;
   const block = state.block;
@@ -10084,7 +10101,7 @@ function activateHydrateBoundary(state) {
       const source = preserved.source;
       hydration.node = preserved.cursor;
       try {
-        if (preserved.fresh) hydration.suspend(() => renderBlock(source));
+        if (preserved.fresh) hydration.suspend(() => resumeFreshHydrateSource(source));
         else hydration.renderSuspended(source);
       } catch (error) {
         if (!isSuspenseException(error)) throw error;
@@ -23943,25 +23960,14 @@ function ctxBailDepsClean(block) {
   return true;
 }
 function refreshContextConsumers(block) {
-  const slots = block._slots;
-  if (slots !== null) {
-    for (let i = 0, n = slots.length; i < n; i++) {
-      const s = slots[i];
-      const k = s.__kind;
-      if (k === "forBlockSlot") {
-        const items = s.items;
-        for (const item of items.values()) refreshBlockForContext(item);
-        if (s.emptyBlock) refreshBlockForContext(s.emptyBlock);
-      } else if (s.block) {
-        refreshBlockForContext(s.block);
-      } else if (s.__kind === "childSlot" && s.forSlot) {
-        const items = s.forSlot.items;
-        for (const item of items.values()) refreshBlockForContext(item);
-      } else if (s.__kind === "childSlot" && s.portal !== null && s.portal.block !== null) {
-        refreshBlockForContext(s.portal.block);
-      }
-    }
+  forEachSubtreeChild(block, refreshContextSubtree, false);
+}
+function refreshContextSubtree(scope) {
+  if (scope.block === scope) {
+    refreshBlockForContext(scope);
+    return;
   }
+  forEachSubtreeChild(scope, refreshContextSubtree, false);
 }
 function tryMemoBail(block, comp, props) {
   if (comp.__memo !== true) return false;
@@ -24717,6 +24723,7 @@ function renderPassthroughTry(state) {
   }
 }
 function errorBlock(parentScope, slotKey, domParent, tryBody, catchBody, anchor, env) {
+  if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return noop;
   const parentBlock = parentScope.block;
   const hydration = activeHydration();
   let state = parentScope.slots[slotKey];
@@ -24766,6 +24773,7 @@ function errorBlock(parentScope, slotKey, domParent, tryBody, catchBody, anchor,
     registerSlot(parentScope, newState);
     state = newState;
   } else {
+    if (state.env !== env) journalRootProperty(state, "env", state.env);
     state.tryBody = tryBody;
     state.catchBody = catchBody;
     state.env = env;
@@ -24963,6 +24971,7 @@ function switchErrorToCatchInner(state, error, reportInline, adoptedStart, adopt
   }
 }
 function tryBlock(parentScope, slotKey, domParent, tryBody, catchBody, pendingBody, anchor, env, propagateSuspense = false) {
+  if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return noop;
   propagateSuspense ||= pendingBody === null;
   if (pendingBody !== null) {
     ensureTransitionSwapDriver();
@@ -25039,12 +25048,19 @@ function tryBlock(parentScope, slotKey, domParent, tryBody, catchBody, pendingBo
   } else {
     supersedesInputs = (state.branch === 2 || state.retrySignalOwners !== void 0) && (state.tryBody !== tryBody || state.env !== env && depsChanged(state.env, env));
     if (supersedesInputs) supersedeSignalRetryOwners(state);
+    if (state.tryBody !== tryBody) journalRootProperty(state, "tryBody", state.tryBody);
+    if (state.catchBody !== catchBody) journalRootProperty(state, "catchBody", state.catchBody);
+    if (state.pendingBody !== pendingBody)
+      journalRootProperty(state, "pendingBody", state.pendingBody);
     state.tryBody = tryBody;
     state.catchBody = catchBody;
     state.pendingBody = pendingBody;
     state.propagateSuspense = propagateSuspense;
-    if (ACTIVE_TRANSITION_ATTEMPT !== null && state.env !== env)
-      TRANSITION_JOURNAL.push(JOURNAL_PROP, state, "env", state.env);
+    if (state.env !== env) {
+      if (ACTIVE_TRANSITION_ATTEMPT !== null)
+        TRANSITION_JOURNAL.push(JOURNAL_PROP, state, "env", state.env);
+      else journalRootProperty(state, "env", state.env);
+    }
     state.env = env;
   }
   const s = state;
@@ -26158,6 +26174,14 @@ function attemptHiddenReveal(state, scheduledMode, reason = "update") {
     if (hiddenActivity !== null) rehideActivityAfterDescendantRender(hiddenActivity);
   }
 }
+function journalRootReveal(state) {
+  journalObjectOnce(state);
+  const parked = HIDDEN_REVEAL_ACTIONS?.get(state);
+  if (parked !== void 0)
+    journalUndo(() => {
+      HIDDEN_REVEAL_ACTIONS.set(state, parked);
+    });
+}
 function attemptHiddenRevealInner(state, scheduledMode, reason = "update") {
   if (state.nativeTransition !== void 0 && NATIVE_TRANSITION_ATTEMPT === null) {
     queueNativeTransition(state.nativeTransition);
@@ -26184,6 +26208,7 @@ function attemptHiddenRevealInner(state, scheduledMode, reason = "update") {
     discardOffscreenCapture(supersededCapture);
     deactivateScope(tryBlock2, false);
   }
+  if (ROOT_RENDER_TRANSACTION !== null && !ROOT_RENDER_ROLLBACK) journalRootReveal(state);
   const effectDeps = snapshotSubtreeEffectDeps(tryBlock2);
   if (reason === "parent" && !RESUME_REPLAY && !state.hasResolved) {
     let uncommitted = true;
@@ -27035,6 +27060,16 @@ function handleResumeError(block, error) {
     if (root.kind === "root" && !root.disposed) unmountBlock(root);
   }
 }
+function ownSlotAnchor(scope, slotKey, block) {
+  const anchor = block.endMarker;
+  const parent = block.parentNode;
+  const hydration = activeHydration();
+  if (scope.slots[slotKey] !== void 0 || hydration !== null && !hydration.inFreshRange(anchor, parent) || CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate)
+    return anchor;
+  const own = (STAGED_DOM?.view(document) ?? document).createComment("");
+  (STAGED_DOM?.view(parent) ?? parent).insertBefore(own, anchor);
+  return own;
+}
 function preservesCommittedSuspense(block) {
   for (let current = block; current !== null; current = current.parentBlock) {
     const state = current.__trySlot;
@@ -27086,6 +27121,24 @@ function finalizeMarkerlessBranch(state, domParent, block, marker, before, after
     state.end = first;
   } else delimitMarkerlessBranch(state, domParent, block, marker, first, after, contentEnd);
 }
+function pendingArmBefore(block, domParent) {
+  const first = block.startMarker;
+  const node = first !== null && domNode(first).parentNode === domParent ? first : block.endMarker;
+  return node ? domNode(node).previousSibling : domNode(domParent).lastChild;
+}
+function renderMarkerlessArm(state, domParent, block, marker) {
+  const after = block.endMarker;
+  const before = pendingArmBefore(block, domParent);
+  state.markerlessBefore = null;
+  try {
+    renderBlock(block);
+  } catch (error) {
+    if ((before ? getNextSibling(before) : getFirstChild(domParent)) !== after)
+      finalizeMarkerlessBranch(state, domParent, block, marker, before, after);
+    throw error;
+  }
+  finalizeMarkerlessBranch(state, domParent, block, marker, before, after);
+}
 function delimitMarkerlessBranch(state, domParent, block, marker, first, after, contentEnd) {
   const start = (STAGED_DOM?.view(document) ?? document).createComment(marker);
   const end = (STAGED_DOM?.view(document) ?? document).createComment("/" + marker);
@@ -27113,14 +27166,18 @@ function sharesBlockBoundary(parent, start, end) {
   return parent !== null && start !== null && end !== null && parent.startMarker === start && parent.endMarker === end;
 }
 function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, marker, env) {
-  if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
   const parentBlock = parentScope.block;
   const hydration = activeHydration();
   if (next !== state.branch) {
     if (ROOT_RENDER_TRANSACTION !== null && (state.branch !== -1 || hydration !== null)) {
       const previousBlock = state.block;
       if (state.markerlessBefore !== void 0 && previousBlock !== null) {
-        journalRootSlot(state, domParent, state.markerlessBefore, previousBlock.endMarker);
+        journalRootSlot(
+          state,
+          domParent,
+          state.markerlessBefore ?? pendingArmBefore(previousBlock, domParent),
+          previousBlock.endMarker
+        );
       } else if (state.start !== null) {
         journalRootSlot(
           state,
@@ -27162,7 +27219,7 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
       const pending = state.block;
       const heldEnd = hydration?.heldBranchEnd(markerlessBefore, domParent, pending.endMarker);
       provisionalAfter = heldEnd === void 0 ? pending.endMarker : heldEnd;
-      let node = markerlessBefore ? getNextSibling(markerlessBefore) : getFirstChild(domParent);
+      let node = markerlessBefore === null ? pending.startMarker ?? provisionalAfter : getNextSibling(markerlessBefore);
       state.block = null;
       state.markerlessBefore = void 0;
       unmountBlock(pending, false);
@@ -27426,9 +27483,7 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
         removeRange(getNextSibling(state.start), state.end);
       }
     } else if (body) {
-      const before = after ? (STAGED_DOM?.view(after) ?? after).previousSibling : (STAGED_DOM?.view(domParent) ?? domParent).lastChild;
       const cursor = hydration !== null && !state.borrowed ? hydration.markerlessCursor(domParent, after) : null;
-      const contentBefore = cursor === null ? before : domNode(cursor).previousSibling;
       const b = createBlock(
         "control-flow",
         parentBlock,
@@ -27440,40 +27495,43 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
         env
       );
       state.block = b;
-      state.markerlessBefore = before;
-      let contentEnd;
-      try {
-        if (cursor === null) renderBlock(b);
-        else contentEnd = hydration.renderMarkerless(b, cursor);
-      } catch (error) {
-        const rebuilt = cursor === null ? null : hydration.freshAfter(contentBefore, domParent);
-        if (cursor === null ? (before ? getNextSibling(before) : getFirstChild(domParent)) !== after : rebuilt !== null && rebuilt !== cursor)
-          finalizeMarkerlessBranch(
-            state,
-            domParent,
-            b,
-            marker,
-            contentBefore,
-            after,
-            cursor === null ? after : hydration.markerlessEnd(contentBefore, domParent, after)
-          );
-        else if (cursor !== null && hydration.replaces(cursor)) {
-          state.markerlessBefore = void 0;
-          hydration.save(domParent);
-          delimitMarkerlessBranch(
-            state,
-            domParent,
-            b,
-            marker,
-            cursor,
-            after,
-            hydration.markerlessEnd(contentBefore, domParent, after)
-          );
-        } else if (cursor !== null)
-          hydration.holdMarkerlessBranch(state, domParent, marker, contentBefore, after, error);
-        throw error;
+      if (cursor === null) renderMarkerlessArm(state, domParent, b, marker);
+      else {
+        const contentBefore = domNode(cursor).previousSibling;
+        state.markerlessBefore = after ? domNode(after).previousSibling : domNode(domParent).lastChild;
+        let contentEnd;
+        try {
+          contentEnd = hydration.renderMarkerless(b, cursor);
+        } catch (error) {
+          const rebuilt = hydration.freshAfter(contentBefore, domParent);
+          if (rebuilt !== null && rebuilt !== cursor)
+            finalizeMarkerlessBranch(
+              state,
+              domParent,
+              b,
+              marker,
+              contentBefore,
+              after,
+              hydration.markerlessEnd(contentBefore, domParent, after)
+            );
+          else if (hydration.replaces(cursor)) {
+            state.markerlessBefore = void 0;
+            hydration.save(domParent);
+            delimitMarkerlessBranch(
+              state,
+              domParent,
+              b,
+              marker,
+              cursor,
+              after,
+              hydration.markerlessEnd(contentBefore, domParent, after)
+            );
+          } else
+            hydration.holdMarkerlessBranch(state, domParent, marker, contentBefore, after, error);
+          throw error;
+        }
+        finalizeMarkerlessBranch(state, domParent, b, marker, contentBefore, after, contentEnd);
       }
-      finalizeMarkerlessBranch(state, domParent, b, marker, contentBefore, after, contentEnd);
       replaceSharedBlockBoundary(
         parentBlock,
         oldBlockStart,
@@ -27498,21 +27556,24 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
     if (state.block.extra !== env) journalRootProperty(state.block, "extra", state.block.extra);
     state.block.body = body;
     state.block.extra = env;
-    renderBlock(state.block);
-    const markerlessBefore = state.markerlessBefore;
-    if (markerlessBefore !== void 0) {
-      const after = state.block.endMarker;
-      const end = hydration?.heldBranchEnd(markerlessBefore, domParent, after);
-      finalizeMarkerlessBranch(
-        state,
-        domParent,
-        state.block,
-        marker,
-        markerlessBefore,
-        after,
-        end === void 0 ? after : end
-      );
-      if (end !== void 0) hydration.dropHeldStart(markerlessBefore, domParent);
+    if (state.markerlessBefore === null) renderMarkerlessArm(state, domParent, state.block, marker);
+    else {
+      renderBlock(state.block);
+      const markerlessBefore = state.markerlessBefore;
+      if (markerlessBefore !== void 0) {
+        const after = state.block.endMarker;
+        const end = hydration?.heldBranchEnd(markerlessBefore, domParent, after);
+        finalizeMarkerlessBranch(
+          state,
+          domParent,
+          state.block,
+          marker,
+          markerlessBefore,
+          after,
+          end === void 0 ? after : end
+        );
+        if (end !== void 0) hydration.dropHeldStart(markerlessBefore, domParent);
+      }
     }
   }
   if (hydration !== null && !state.borrowed && state.end !== null) {
@@ -27520,9 +27581,9 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
   }
 }
 function ifBlock(parentScope, slotKey, domParent, cond, thenBody, elseBody, anchor, env) {
+  if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
   let state = parentScope.slots[slotKey];
   if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state?.returnedOutput === true) {
-    if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
     if (state.__kind === "ifBlockSlot") {
       setReturnedOutputOwner(state, false);
     } else {
@@ -28155,9 +28216,9 @@ function deactivateScope(scope, disconnectPassive = true) {
   forEachSubtreeChild(scope, (child2) => deactivateScope(child2, disconnectPassive));
 }
 function switchBlock(parentScope, slotKey, domParent, discriminant, cases, defaultBody, anchor, env) {
+  if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
   let state = parentScope.slots[slotKey];
   if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state?.returnedOutput === true) {
-    if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
     if (state.__kind === "switchBlockSlot") {
       setReturnedOutputOwner(state, false);
     } else {
@@ -31484,6 +31545,7 @@ function scriptResource(attrs) {
   nativeStyleBinding,
   nativeWarmMemo,
   normalizeClass,
+  ownSlotAnchor,
   portal,
   positionalChildren,
   preconnect,

package/dist/cjs/signals/computations.cjs

@@ -30,9 +30,18 @@ var import_redeclaration = require("./redeclaration.cjs");
 var import_transition_state = require("./transition-state.cjs");
 var import_candidate_producers = require("./candidate-producers.cjs");
 var import_types = require("./types.cjs");
-function createDeclaredDerivedCell(owner, key, compute, options, sequence, captures) {
+function createDeclaredDerivedCell(owner, key, compute, options, sequence, captures, declaring) {
   (0, import_candidate_producers.installDerivedCandidates)();
-  return (0, import_engine.createDerivedCellWith)(owner, key, compute, options, DerivedBinding, sequence, captures);
+  return (0, import_engine.createDerivedCellWith)(
+    owner,
+    key,
+    compute,
+    options,
+    DerivedBinding,
+    sequence,
+    captures,
+    declaring
+  );
 }
 function attempt(binding) {
   let resolve;

package/dist/cjs/signals/derived-facade.cjs

@@ -37,9 +37,9 @@ function __derivedAt(site, compute, options, captures) {
   site ??= explicit;
   const key = (0, import_facade.declarationKey)(site, (0, import_facade.descriptorKey)(site, explicit));
   const sequence = (0, import_engine.signalDeclarationSequence)(site);
-  return new import_facade.DerivedDescriptor(key, "derived", (owner) => {
+  return new import_facade.DerivedDescriptor(key, "derived", (owner, declaring) => {
     const wrapped = compute.length ? (context) => (0, import_owner_context.runWithSignalOwner)(owner, () => compute(context)) : () => (0, import_owner_context.runWithSignalOwner)(owner, () => compute());
-    return (0, import_computations.createDeclaredDerivedCell)(owner, key, wrapped, options, sequence, captures);
+    return (0, import_computations.createDeclaredDerivedCell)(owner, key, wrapped, options, sequence, captures, declaring);
   }, site);
 }
 function derived$(compute, options) {

package/dist/cjs/signals/engine.cjs

@@ -263,21 +263,21 @@ class ScopeImpl {
     this.consumeSeed(key);
     return node;
   }
-  createDerivedDeclaration(key, compute, options, Binding, sequence = 0, captures) {
+  createDerivedDeclaration(key, compute, options, Binding, sequence = 0, captures, declaring = 0) {
     if (typeof compute !== "function") throw new TypeError((0, import_error_codes_client_generated.formatClientError)(122));
     const [node, created] = this.declaredNode(key, "derived");
     if (!created) {
       const binding2 = this.derivedBindings?.get(node);
-      return binding2?.redeclare(compute, sequence, captures) ?? node;
+      return binding2?.redeclare(compute, sequence, captures, declaring) ?? node;
     }
     const binding = new Binding(this, node, compute, options);
-    binding.declared(sequence, captures);
+    binding.declared(sequence, captures, declaring);
     (this.derivedBindings ??= /* @__PURE__ */ new Map()).set(node, binding);
     this.initializeRetention(node);
     this.consumeSeed(key);
     return node;
   }
-  createResourceDeclaration(key, describe, initialize, unique = false, sequence = 0, captures) {
+  createResourceDeclaration(key, describe, initialize, unique = false, sequence = 0, captures, declaring = 0) {
     if (typeof describe !== "function") throw new TypeError((0, import_error_codes_client_generated.formatClientError)(137));
     let node;
     if (unique) node = this.createNode(key, "async");
@@ -285,7 +285,7 @@ class ScopeImpl {
       const [declared, created] = this.declaredNode(key, "async");
       if (!created) {
         const binding = this.resources?.get(declared);
-        return binding?.redeclare(describe, sequence, captures) ?? declared;
+        return binding?.redeclare(describe, sequence, captures, declaring) ?? declared;
       }
       node = declared;
     }
@@ -294,7 +294,7 @@ class ScopeImpl {
     this.initializeRetention(node);
     (0, import_graph.signalBatch)(() => {
       const binding = initialize(this, node, describe, seed, retained);
-      binding.declared(sequence, captures);
+      binding.declared(sequence, captures, declaring);
       (this.resources ??= /* @__PURE__ */ new Map()).set(node, binding);
       (0, import_graph.refreshNode)(node);
       this.streams?.flush(node, binding);
@@ -623,17 +623,33 @@ function createDeclaredSignalCell(owner, key, initial, preferInitial = false) {
   if (!(owner instanceof ScopeImpl)) throw new TypeError((0, import_error_codes_client_generated.formatClientError)(148));
   return owner.createSignalDeclaration(key, initial, preferInitial);
 }
-function createDerivedCellWith(owner, key, compute, options, Binding, sequence = 0, captures) {
+function createDerivedCellWith(owner, key, compute, options, Binding, sequence = 0, captures, declaring = 0) {
   if (!(owner instanceof ScopeImpl)) throw new TypeError((0, import_error_codes_client_generated.formatClientError)(149));
-  return owner.createDerivedDeclaration(key, compute, options, Binding, sequence, captures);
+  return owner.createDerivedDeclaration(
+    key,
+    compute,
+    options,
+    Binding,
+    sequence,
+    captures,
+    declaring
+  );
 }
 let declarationSequence = 0;
 function signalDeclarationSequence(site) {
   return site?.startsWith("i:") ? ++declarationSequence : 0;
 }
-function createResourceCellWith(owner, key, describe, initialize, unique = false, sequence = 0, captures) {
+function createResourceCellWith(owner, key, describe, initialize, unique = false, sequence = 0, captures, declaring = 0) {
   if (!(owner instanceof ScopeImpl)) throw new TypeError((0, import_error_codes_client_generated.formatClientError)(150));
-  return owner.createResourceDeclaration(key, describe, initialize, unique, sequence, captures);
+  return owner.createResourceDeclaration(
+    key,
+    describe,
+    initialize,
+    unique,
+    sequence,
+    captures,
+    declaring
+  );
 }
 function adoptResourceValue(handle$, requestKey, value) {
   if (!(handle$ instanceof import_graph.ScopedNode) || !(handle$.owner instanceof ScopeImpl)) return false;