octane 0.1.45 → 0.1.46

package/README.md

@@ -25,6 +25,11 @@ Vite builds can fold proven immutable CSS-module class strings into templates.
 See the [CSS-module constants guide](https://github.com/octanejs/octane/blob/main/docs/compiler-css-module-constants.md)
 for the provider contract and stylesheet-loading guarantees.
 
+Custom native integrations can opt into the experimental
+[Valdi writer compiler](https://github.com/octanejs/octane/blob/main/docs/valdi-compiler.md).
+It requires an application-provided adapter; Octane does not bundle a Valdi
+runtime or native build integration.
+
 Direct Node or Bun server scripts can preload `octane/compiler/register` to
 compile imported Octane components without going through Vite. See the
 [SSR guide](https://github.com/octanejs/octane/blob/main/docs/ssr.md#run-an-ssg-script-directly).

package/dist/cjs/runtime.cjs

@@ -12041,6 +12041,14 @@ function reconcileDeoptNode(prev, value, ownerBlock, ns) {
   return null;
 }
 function reconcileDeoptChildren(el, children, ownerBlock) {
+  const type = typeof children;
+  if (type === "string" && children !== "" || type === "number" || type === "bigint") {
+    const first = getFirstChild(el);
+    if (first !== null && first.nodeType === 3 && getNextSibling(first) === null && first.$$deoptKey === 0 && first.$$portalEnd == null) {
+      updateTextValue(first, String(children));
+      return;
+    }
+  }
   const childNs = deoptChildNamespace(el);
   const next = [];
   const nextKeys = [];
@@ -12165,7 +12173,7 @@ function deoptItemBody(item, scope) {
   const block = scope.block;
   const hydration = activeHydration();
   const existingChild = scope.slots[0];
-  const needsBlocks = descNeedsBlocks(item) || isHostDescriptor(item) && existingChild?.__kind === "childSlot" && existingChild.currentComp === hostElementBody;
+  const needsBlocks = isHostDescriptor(item) && existingChild?.__kind === "childSlot" && existingChild.currentComp === hostElementBody || descNeedsBlocks(item);
   const sm = block.startMarker;
   if (sm !== null && sm === block.endMarker && sm.nodeType !== 8 && sm.parentNode !== null && (needsBlocks || !isHostDescriptor(item))) {
     const p = sm.parentNode;
@@ -12981,7 +12989,7 @@ function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsH
   if (iterable !== null) value = iterable;
   const preparedList = compiledMapBody !== void 0 ? { items: value, keys: null } : prepareDeoptList(value, false, includeKeyedSingle);
   let state = parentScope.slots[slotKey];
-  const pureHost = preparedList === null && isHostDescriptor(value) && !descNeedsBlocks(value) && state?.currentComp !== hostElementBody;
+  const pureHost = preparedList === null && isHostDescriptor(value) && state?.currentComp !== hostElementBody && !descNeedsBlocks(value);
   let rootShapeChanged = false;
   if (state !== void 0 && ROOT_RENDER_TRANSACTION !== null) {
     const component = pureHost || preparedList !== null ? null : isHostDescriptor(value) ? hostElementBody : valueComponent;

package/dist/cjs/runtime.server.cjs

@@ -1932,21 +1932,9 @@ function captureComponentReplayState(scope, frame) {
     streamNextId: stream?.nextId ?? 0,
     streamActiveTryKeys: stream?.activeTryKeys.slice() ?? [],
     streamActiveOwnerKeys: stream?.activeOwnerKeys.slice() ?? [],
-    streamPassBoundaryKeys: stream?.activePassBoundaryKeys === null || stream?.activePassBoundaryKeys === void 0 ? null : new Set(stream.activePassBoundaryKeys),
+    streamPassBoundaryCount: stream?.activePassBoundaryKeys?.size ?? 0,
     asyncScope: ASYNC_SCOPE,
-    streamBoundaries: stream === null ? null : Array.from(stream.boundaries, ([key, entry]) => ({
-      key,
-      entry,
-      id: entry.id,
-      order: entry.order,
-      state: entry.state,
-      html: entry.html,
-      seeds: entry.seeds.slice(),
-      pendingIdOffset: entry.pendingIdOffset,
-      ancestors: entry.ancestors.slice(),
-      owners: entry.owners.slice(),
-      namespace: entry.namespace
-    })),
+    streamReplayCheckpoint: stream?.replay?.length ?? 0,
     frameDeferred: frame?.deferred ?? false,
     frameNextChild: frame?.nextChild ?? 0,
     frameScopedChildren: frame?.scopedChildren === null || frame?.scopedChildren === void 0 ? null : new Map(frame.scopedChildren),
@@ -1996,30 +1984,19 @@ function rewindComponentReplayState(snapshot, scope, frame) {
     VT_SSR_STACK.push(entry.candidate);
   }
   const stream = snapshot.stream;
-  if (stream !== null && snapshot.streamBoundaries !== null) {
+  if (stream !== null) {
     stream.nextId = snapshot.streamNextId;
-    if (stream.activePassBoundaryKeys !== null && snapshot.streamPassBoundaryKeys !== null) {
-      stream.activePassBoundaryKeys.clear();
-      for (const key of snapshot.streamPassBoundaryKeys) stream.activePassBoundaryKeys.add(key);
+    if (stream.activePassBoundaryKeys !== null) {
+      let index = 0;
+      for (const key of stream.activePassBoundaryKeys) {
+        if (index++ >= snapshot.streamPassBoundaryCount) stream.activePassBoundaryKeys.delete(key);
+      }
     }
     stream.activeTryKeys.length = 0;
     stream.activeTryKeys.push(...snapshot.streamActiveTryKeys);
     stream.activeOwnerKeys.length = 0;
     stream.activeOwnerKeys.push(...snapshot.streamActiveOwnerKeys);
-    stream.boundaries.clear();
-    for (const saved of snapshot.streamBoundaries) {
-      const entry = saved.entry;
-      entry.id = saved.id;
-      entry.order = saved.order;
-      entry.state = saved.state;
-      entry.html = saved.html;
-      entry.seeds = saved.seeds.slice();
-      entry.pendingIdOffset = saved.pendingIdOffset;
-      entry.ancestors = saved.ancestors.slice();
-      entry.owners = saved.owners.slice();
-      entry.namespace = saved.namespace;
-      stream.boundaries.set(saved.key, entry);
-    }
+    rewindStreamBoundaryReplay(stream, snapshot.streamReplayCheckpoint);
   }
   scope.$$ctxValues = snapshot.context;
   if (frame !== null) {
@@ -3920,6 +3897,40 @@ function renderToStaticMarkup(entryComponent, props, options) {
   const html = spliceHead(pass.body, pass.head);
   return { html: pass.vtCandidates ? vtSsrStrip(html) : html, css: pass.css };
 }
+function recordStreamBoundaryMutation(stream, key) {
+  if (stream.replay === null) return;
+  const boundary = stream.boundaries.get(key);
+  stream.replay.push({
+    key,
+    boundary,
+    value: boundary === void 0 ? void 0 : { ...boundary }
+  });
+}
+function rewindStreamBoundaryReplay(stream, checkpoint) {
+  const replay = stream.replay;
+  if (replay === null) return;
+  let restoredDeletion = false;
+  while (replay.length > checkpoint) {
+    const saved = replay.pop();
+    if (saved.boundary === void 0) {
+      stream.boundaries.delete(saved.key);
+    } else {
+      const boundary = saved.boundary;
+      const value = saved.value;
+      Object.assign(boundary, value);
+      boundary.error = value.error;
+      boundary.errorReported = value.errorReported;
+      boundary.errorFlushed = value.errorFlushed;
+      if (!stream.boundaries.has(saved.key)) restoredDeletion = true;
+      stream.boundaries.set(saved.key, boundary);
+    }
+  }
+  if (restoredDeletion) {
+    const ordered = [...stream.boundaries].sort((a, b) => a[1].order - b[1].order);
+    stream.boundaries.clear();
+    for (const [key, boundary] of ordered) stream.boundaries.set(key, boundary);
+  }
+}
 let STREAM_REALM_SALT = null;
 function streamRealmSalt() {
   if (STREAM_REALM_SALT !== null) return STREAM_REALM_SALT;
@@ -3948,6 +3959,7 @@ function pruneUnrepresentedStreamDescendants(stream, ownerKey, ownerHtml) {
       }
       if (nearestOwner !== ownerKey) continue;
       if (ownerHtml.includes(import_constants.STREAM_BOUNDARY_ATTR + '="' + child.id + '"')) continue;
+      recordStreamBoundaryMutation(stream, childKey);
       stream.boundaries.delete(childKey);
       removed = true;
     }
@@ -3987,7 +3999,10 @@ function ssrTry(scope, siteKey, tryFn, pendFn, catchFn, namespace = FRAME?.names
     ancestorKeys = stream.activeTryKeys.slice();
     ownerKeys = stream.activeOwnerKeys.slice();
     entry = stream.boundaries.get(key);
-    if (entry !== void 0) entry.namespace = namespace;
+    if (entry !== void 0) {
+      recordStreamBoundaryMutation(stream, key);
+      entry.namespace = namespace;
+    }
     if (entry !== void 0 && entry.state === "pending") {
       entry.ancestors = ancestorKeys;
       entry.owners = ownerKeys;
@@ -4183,6 +4198,7 @@ function ssrTry(scope, siteKey, tryFn, pendFn, catchFn, namespace = FRAME?.names
               ancestors: ancestorKeys,
               owners: ownerKeys
             };
+            recordStreamBoundaryMutation(stream, key);
             stream.boundaries.set(key, entry);
             enterBoundaryIds(pendingIdOffset);
           } else {
@@ -4235,6 +4251,7 @@ function ssrTry(scope, siteKey, tryFn, pendFn, catchFn, namespace = FRAME?.names
             ancestors: ancestorKeys,
             owners: ownerKeys
           };
+          recordStreamBoundaryMutation(stream, key);
           stream.boundaries.set(key, entry);
           enterBoundaryIds(pendingIdOffset);
         } else if (entry.state === "pending") {
@@ -4337,12 +4354,15 @@ async function runStream(component, props, options, sink) {
     token: createStreamToken(),
     activePassBoundaryKeys: null,
     activeTryKeys: [],
-    activeOwnerKeys: []
+    activeOwnerKeys: [],
+    replay: null
   };
   const renderFullPass = () => {
     const boundaryKeys = /* @__PURE__ */ new Set();
     const previousBoundaryKeys = stream.activePassBoundaryKeys;
+    const previousReplay = stream.replay;
     stream.activePassBoundaryKeys = boundaryKeys;
+    stream.replay = [];
     try {
       return {
         pass: withStream(
@@ -4353,6 +4373,7 @@ async function runStream(component, props, options, sink) {
       };
     } finally {
       stream.activePassBoundaryKeys = previousBoundaryKeys;
+      stream.replay = previousReplay;
     }
   };
   const injection = options?.injection;

package/dist/cjs/version.cjs

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

package/dist/compiler/bundler.js

@@ -1082,7 +1082,7 @@ class OctaneBundlerCompiler {
 		if (!hostOwned) this._assertClientOnlySourceSupported(file, filename, renderer, collected);
 		if (
 			plainHelperSource &&
-			renderer.target === 'universal' &&
+			(renderer.target === 'universal' || renderer.target === 'valdi') &&
 			renderer.validation !== undefined &&
 			this._isProjectOwnedSource(file) &&
 			!this.exclude.some((path) => file.includes(path)) &&

package/dist/compiler/compile-universal.js

@@ -1622,6 +1622,12 @@ function importSourceRanges(sources) {
 export function validateRendererModuleSource(source, filename, renderer) {
 	if (renderer?.validation === undefined) return;
 	const ast = parseModule(source, filename);
+	validateRendererAst(ast, filename, renderer);
+}
+
+/** Reuse renderer restrictions without reparsing an already adopted AST. */
+export function validateRendererAst(ast, filename, renderer) {
+	if (renderer?.validation === undefined) return;
 	validateRendererSource(ast, { filename, renderer });
 }