octane 0.3.4 → 0.3.6

package/dist/cjs/runtime.cjs

@@ -23278,6 +23278,7 @@ function commitResume(state) {
 }
 function commitResumeInner(state) {
   if (state.parentBlock.disposed) return;
+  let deferredNativeAcceptance = false;
   if (NATIVE_READ_DRIVER !== null && state.hiddenDom !== null) {
     const staged = state.stagedCapture;
     if (staged === null || !NATIVE_READ_DRIVER.validateCapture(staged)) {
@@ -23293,7 +23294,8 @@ function commitResumeInner(state) {
       }
       return;
     }
-    if (WIP_CAPTURE === null) acceptNativeCapture(staged, state.parentBlock.idState.renderOwner);
+    if (WIP_CAPTURE === null)
+      deferredNativeAcceptance = acceptNativeCapture(staged, state.parentBlock.idState.renderOwner);
   }
   const wasPending = state.branch === 2;
   const hiddenActivity = findHiddenActivity(state.parentBlock);
@@ -23330,7 +23332,7 @@ function commitResumeInner(state) {
         tryBlock2.pendingMode = null;
         tryBlock2.pendingDeferred = false;
         if (state.detachedRefs !== null) stagedCapture.refs.length = 0;
-        spliceOffscreenCapture(stagedCapture);
+        spliceOffscreenCapture(stagedCapture, deferredNativeAcceptance);
         state.hasResolved = true;
       } else {
         const journalCheckpoint = armTransitionJournal(state);
@@ -23353,7 +23355,10 @@ function commitResumeInner(state) {
           if (NATIVE_READ_DRIVER !== null) {
             invalidNativeReads = !NATIVE_READ_DRIVER.validateCapture(resumeCapture);
             if (!invalidNativeReads && previousCapture === null)
-              acceptNativeCapture(resumeCapture, state.parentBlock.idState.renderOwner);
+              deferredNativeAcceptance = acceptNativeCapture(
+                resumeCapture,
+                state.parentBlock.idState.renderOwner
+              );
           }
         } catch (err) {
           didThrow = true;
@@ -23386,7 +23391,7 @@ function commitResumeInner(state) {
             refDetachQueue.splice(refDetachCheckpoint);
             resumeCapture.refs.length = 0;
           }
-          spliceOffscreenCapture(resumeCapture);
+          spliceOffscreenCapture(resumeCapture, deferredNativeAcceptance);
           state.hasResolved = true;
         } else {
           try {
@@ -23657,6 +23662,7 @@ function attemptHiddenRevealInner(state, scheduledMode, reason = "update") {
   const retryMode = scheduledMode ?? tryBlock2.pendingMode ?? CURRENT_BLOCK?.currentRenderMode ?? "urgent";
   const stagesHeldTransition = retryMode === "transition" && HELD_TRANSITIONS.has(state);
   const hiddenCapture = createOffscreenCapture();
+  let deferredNativeAcceptance = false;
   const previousCapture = WIP_CAPTURE;
   const refDetachCheckpoint = refDetachQueue.length;
   WIP_CAPTURE = hiddenCapture;
@@ -23717,7 +23723,10 @@ function attemptHiddenRevealInner(state, scheduledMode, reason = "update") {
       return;
     }
     if (WIP_CAPTURE === null)
-      acceptNativeCapture(hiddenCapture, state.parentBlock.idState.renderOwner);
+      deferredNativeAcceptance = acceptNativeCapture(
+        hiddenCapture,
+        state.parentBlock.idState.renderOwner
+      );
   }
   try {
     if (state.block !== null && state.block !== tryBlock2) {
@@ -23733,7 +23742,7 @@ function attemptHiddenRevealInner(state, scheduledMode, reason = "update") {
     setTryBranch(state, 1);
     state.hasResolved = true;
     state.pendingThenable = null;
-    spliceOffscreenCapture(hiddenCapture);
+    spliceOffscreenCapture(hiddenCapture, deferredNativeAcceptance);
     recordSuspenseCommit(state);
     publishHiddenRevealActions(state);
     queueCurrentHiddenRefs(state);

package/dist/cjs/version.cjs

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

package/dist/compiler/vite.js

@@ -931,7 +931,7 @@ export function octane(options = {}) {
 			const runtimeRequest = compiler.resolveRuntimeRequest(source, 'server');
 			if (runtimeRequest === null || runtimeRequest === source) return null;
 			const resolved = await this.resolve(runtimeRequest, importer, { skipSelf: true });
-			return resolved?.id ?? null;
+			return resolved ?? null;
 		},
 		transform(code, id, transformOptions) {
 			const server =

package/dist/hydration/stream-result-receiver.d.ts

@@ -29,6 +29,7 @@ interface ResultState {
     values: number;
     terminal: boolean;
     frames: StreamedSignalResultFrame[];
+    frameSizes: number[];
     bytes: number;
     consumer?: StreamedResultConsumer;
     timer?: ReturnType<typeof setTimeout>;

package/dist/hydration/stream-result-receiver.js

@@ -14,6 +14,7 @@ class StreamedReceiverError extends Error {
 function retainCompletedResult(result) {
   if (result.frames.at(-1)?.kind === "complete" && result.consumer?.retainCompleted?.(result.frames) === true) {
     result.frames = [];
+    result.frameSizes.length = 0;
     result.bytes = 0;
   }
 }
@@ -54,6 +55,7 @@ function createStreamedResultReceiverState(options, commitPlacement) {
         } catch {
         }
         state.result.frames.length = 0;
+        state.result.frameSizes.length = 0;
         state.result.bytes = 0;
       }
       if (state.result.timer !== void 0) clearTimeout(state.result.timer);
@@ -96,7 +98,15 @@ function createStreamedResultReceiverState(options, commitPlacement) {
     }
     const state = {
       identity,
-      result: { sequence: 0, opened: false, values: 0, terminal: false, frames: [], bytes: 0 },
+      result: {
+        sequence: 0,
+        opened: false,
+        values: 0,
+        terminal: false,
+        frames: [],
+        frameSizes: [],
+        bytes: 0
+      },
       placementSequence: 0,
       contentRevision
     };
@@ -128,10 +138,11 @@ function createStreamedResultReceiverState(options, commitPlacement) {
       if (accepted === state.result.frames.length) state.result.bytes = 0;
       else {
         for (let index = 0; index < accepted; index++) {
-          state.result.bytes -= frameBytes(state.result.frames[index]);
+          state.result.bytes -= state.result.frameSizes[index];
         }
       }
       state.result.frames.splice(0, accepted);
+      state.result.frameSizes.splice(0, accepted);
     }
     retainCompletedResult(state.result);
     return () => {
@@ -174,6 +185,7 @@ function createStreamedResultReceiverState(options, commitPlacement) {
         throw new StreamedReceiverError("overflow", "Streamed result mailbox exceeded its bound.");
       }
       result.frames.push(frame);
+      result.frameSizes.push(bytes);
       result.bytes += bytes;
     }
     if (frame.kind === "complete" || frame.kind === "error") {

package/dist/runtime.js

@@ -23140,6 +23140,7 @@ function commitResume(state) {
 }
 function commitResumeInner(state) {
   if (state.parentBlock.disposed) return;
+  let deferredNativeAcceptance = false;
   if (NATIVE_READ_DRIVER !== null && state.hiddenDom !== null) {
     const staged = state.stagedCapture;
     if (staged === null || !NATIVE_READ_DRIVER.validateCapture(staged)) {
@@ -23155,7 +23156,8 @@ function commitResumeInner(state) {
       }
       return;
     }
-    if (WIP_CAPTURE === null) acceptNativeCapture(staged, state.parentBlock.idState.renderOwner);
+    if (WIP_CAPTURE === null)
+      deferredNativeAcceptance = acceptNativeCapture(staged, state.parentBlock.idState.renderOwner);
   }
   const wasPending = state.branch === 2;
   const hiddenActivity = findHiddenActivity(state.parentBlock);
@@ -23192,7 +23194,7 @@ function commitResumeInner(state) {
         tryBlock2.pendingMode = null;
         tryBlock2.pendingDeferred = false;
         if (state.detachedRefs !== null) stagedCapture.refs.length = 0;
-        spliceOffscreenCapture(stagedCapture);
+        spliceOffscreenCapture(stagedCapture, deferredNativeAcceptance);
         state.hasResolved = true;
       } else {
         const journalCheckpoint = armTransitionJournal(state);
@@ -23215,7 +23217,10 @@ function commitResumeInner(state) {
           if (NATIVE_READ_DRIVER !== null) {
             invalidNativeReads = !NATIVE_READ_DRIVER.validateCapture(resumeCapture);
             if (!invalidNativeReads && previousCapture === null)
-              acceptNativeCapture(resumeCapture, state.parentBlock.idState.renderOwner);
+              deferredNativeAcceptance = acceptNativeCapture(
+                resumeCapture,
+                state.parentBlock.idState.renderOwner
+              );
           }
         } catch (err) {
           didThrow = true;
@@ -23248,7 +23253,7 @@ function commitResumeInner(state) {
             refDetachQueue.splice(refDetachCheckpoint);
             resumeCapture.refs.length = 0;
           }
-          spliceOffscreenCapture(resumeCapture);
+          spliceOffscreenCapture(resumeCapture, deferredNativeAcceptance);
           state.hasResolved = true;
         } else {
           try {
@@ -23519,6 +23524,7 @@ function attemptHiddenRevealInner(state, scheduledMode, reason = "update") {
   const retryMode = scheduledMode ?? tryBlock2.pendingMode ?? CURRENT_BLOCK?.currentRenderMode ?? "urgent";
   const stagesHeldTransition = retryMode === "transition" && HELD_TRANSITIONS.has(state);
   const hiddenCapture = createOffscreenCapture();
+  let deferredNativeAcceptance = false;
   const previousCapture = WIP_CAPTURE;
   const refDetachCheckpoint = refDetachQueue.length;
   WIP_CAPTURE = hiddenCapture;
@@ -23579,7 +23585,10 @@ function attemptHiddenRevealInner(state, scheduledMode, reason = "update") {
       return;
     }
     if (WIP_CAPTURE === null)
-      acceptNativeCapture(hiddenCapture, state.parentBlock.idState.renderOwner);
+      deferredNativeAcceptance = acceptNativeCapture(
+        hiddenCapture,
+        state.parentBlock.idState.renderOwner
+      );
   }
   try {
     if (state.block !== null && state.block !== tryBlock2) {
@@ -23595,7 +23604,7 @@ function attemptHiddenRevealInner(state, scheduledMode, reason = "update") {
     setTryBranch(state, 1);
     state.hasResolved = true;
     state.pendingThenable = null;
-    spliceOffscreenCapture(hiddenCapture);
+    spliceOffscreenCapture(hiddenCapture, deferredNativeAcceptance);
     recordSuspenseCommit(state);
     publishHiddenRevealActions(state);
     queueCurrentHiddenRefs(state);

package/dist/version.js

@@ -1,4 +1,4 @@
-const version = "0.3.4";
+const version = "0.3.6";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octane",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "license": "MIT",
   "type": "module",
   "sideEffects": [