octane 0.13.6 → 0.13.8

package/dist/cjs/index.cjs

@@ -83,6 +83,7 @@ __export(index_exports, {
   compilerCacheMappedArray: () => import_runtime.compilerCacheMappedArray,
   compilerOwnsContextProvider: () => import_runtime.compilerOwnsContextProvider,
   componentSlot: () => import_runtime.componentSlot,
+  componentSlotFromConfig: () => import_runtime.componentSlotFromConfig,
   componentSlotLite: () => import_runtime.componentSlotLite,
   componentSlotVoid: () => import_runtime.componentSlotVoid,
   createCompiledContext: () => import_runtime.createCompiledContext,
@@ -334,6 +335,7 @@ var import_method_dep = require("./method-dep.cjs");
   compilerCacheMappedArray,
   compilerOwnsContextProvider,
   componentSlot,
+  componentSlotFromConfig,
   componentSlotLite,
   componentSlotVoid,
   createCompiledContext,

package/dist/cjs/runtime.cjs

@@ -98,6 +98,7 @@ __export(runtime_exports, {
   compilerOpaqueTag: () => compilerOpaqueTag,
   compilerOwnsContextProvider: () => compilerOwnsContextProvider,
   componentSlot: () => componentSlot,
+  componentSlotFromConfig: () => componentSlotFromConfig,
   componentSlotLite: () => componentSlotLite,
   componentSlotVoid: () => componentSlotVoid,
   createCompiledContext: () => createCompiledContext,
@@ -9861,14 +9862,25 @@ function createCompiledContext(defaultValue) {
 function CompiledContext(props, scope) {
   provideContext(scope, props.context, props.value);
   const children = props.children;
-  if (children == null) return;
+  if (children == null) {
+    const previous2 = scope.hooks?.get(CHILDREN_DIALECT_SLOT);
+    if (previous2 !== void 0 && previous2 !== 2) {
+      resetScopeChildren(scope);
+      if (scope.block.disposed) return;
+      ensureHooks(scope).set(CHILDREN_DIALECT_SLOT, 2);
+    }
+    return;
+  }
   if (!isChildrenBlock(children)) {
     throw new TypeError((0, import_error_codes_client_generated.formatClientError)(345));
   }
   const dialect = children[CHILDREN_BODY] ?? children;
   const previous = scope.hooks?.get(CHILDREN_DIALECT_SLOT);
   if (previous !== dialect) {
-    if (previous !== void 0) {
+    if (previous === 2) {
+      resetScopeChildren(scope);
+      if (scope.block.disposed) return;
+    } else if (previous !== void 0) {
       invalidateSharedBodyOutput(scope);
       if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
         const hooks = scope.hooks;
@@ -9884,6 +9896,7 @@ function initializeContext(ctx, defaultValue) {
   ctx.$$kind = import_runtime_tags.CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   ctx.$$version = 0;
+  ctx.$$providerVersion = 0;
   (0, import_context_identity.registerContext)(ctx);
   if (__octaneDev) {
     (0, import_context_identity.defineRemovedContextMembers)(ctx);
@@ -9898,7 +9911,7 @@ function renderClientContextProvider(context, props, renderScope) {
   const scope = renderScope;
   provideContext(scope, ctx, props.value);
   const children = props.children;
-  if (children != null) {
+  if (children != null || scope.hooks?.get(CHILDREN_DIALECT_SLOT) !== void 0) {
     const dialect = typeof children === "function" ? children[CHILDREN_BODY] ?? children : 2;
     const previous = scope.hooks?.get(CHILDREN_DIALECT_SLOT);
     if (previous !== dialect) {
@@ -9958,6 +9971,7 @@ function provideContext(scope, context, value) {
       else values.delete(context);
     });
   if (had) {
+    context.$$providerVersion = context.$$providerVersion === context.$$version ? context.$$version + 1 : -1;
     context.$$version++;
     (0, import_context_epoch.bumpContextEpoch)();
   }
@@ -11472,12 +11486,29 @@ function promoteMemoAncestry(scope) {
 function recordContextDependency(block, context) {
   if (block === null || !block.memoInChain) return;
   SKIPPED_ROW_REFRESH = refreshSkippedRows;
-  (block.$$ctxDirect ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
+  const direct = block.$$ctxDirect ??= /* @__PURE__ */ new Map();
+  const previous = direct.get(context);
+  direct.set(context, context.$$version);
   for (let current = block; current !== null; current = current.parentBlock) {
     if (current.body?.__memo === true || current.$$implicitBail === true) {
       (current.$$ctxReads ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
     }
   }
+  return previous;
+}
+function recordLocalContextValue(reader, block, context, value, previous) {
+  if (reader === null || block === null || !block.memoInChain) return;
+  if (typeof previous === "number" || context.$$providerVersion !== context.$$version) return;
+  const cache = reader.$$ctxCache;
+  const owner = cache === context ? reader.$$ctxCacheOwner : cache !== null && reader.$$ctxCacheOwner === null ? cache.get(context) : void 0;
+  if (owner === null || owner === void 0 || owner === DEFAULT_CTX) return;
+  if (previous !== void 0) {
+    if (previous.owner !== owner || !Object.is(previous.value, value)) return;
+    previous.version = context.$$version;
+    block.$$ctxDirect.set(context, previous);
+  } else {
+    block.$$ctxDirect.set(context, { version: context.$$version, owner, value });
+  }
 }
 let SCOPED_READ_TRACKING = false;
 let SCOPED_READS = null;
@@ -11635,8 +11666,10 @@ function readContextFrom(reader, block, context) {
   return context.defaultValue;
 }
 function readContextFromScope(scope, context) {
-  recordContextDependency(scope.block, context);
-  return readContextFrom(scope, scope.block, context);
+  const previous = recordContextDependency(scope.block, context);
+  const value = readContextFrom(scope, scope.block, context);
+  recordLocalContextValue(scope, scope.block, context, value, previous);
+  return value;
 }
 function getRendererOwnerVisibility(scope) {
   if (findHiddenActivity(scope.block) !== null) return "activity";
@@ -11654,8 +11687,10 @@ function reportRendererOwnerError(scope, error) {
   }
 }
 function useContextInternal(context) {
-  recordContextDependency(CURRENT_BLOCK, context);
-  return readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  const previous = recordContextDependency(CURRENT_BLOCK, context);
+  const value = readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  recordLocalContextValue(CURRENT_SCOPE, CURRENT_BLOCK, context, value, previous);
+  return value;
 }
 class SuspenseException {
   constructor(thenable) {
@@ -12685,7 +12720,13 @@ function parseTemplate(html, ns, frag) {
   initDomOperations();
   const t = (STAGED_DOM ? STAGED_DOM.view(document) : document).createElement("template");
   if (ns === 0) {
-    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = frag ? `<octane-frag>${html}</octane-frag>` : html;
+    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = html;
+    if (frag) {
+      const owner = t.content.ownerDocument;
+      const wrapper = (STAGED_DOM ? STAGED_DOM.view(owner) : owner).createElement("octane-frag");
+      (STAGED_DOM ? STAGED_DOM.view(wrapper) : wrapper).appendChild(t.content);
+      return fragmentTemplate(wrapper);
+    }
     const root = getFirstChild(t.content);
     if (root.nodeType === 1 && root.localName === "octane-frag") {
       return fragmentTemplate(root);
@@ -21711,6 +21752,31 @@ function componentSlotVoid(parentScope, slotKey, domParent, comp, props, invocat
     invocationSite
   );
 }
+function componentSlotFromConfig(parentScope, slotKey, domParent, comp, config, invocationSite, anchor) {
+  if (typeof comp === "function" && (0, import_renderer_bridge.isRendererContext)(comp)) {
+    (0, import_renderer_bridge.registerClientRendererBridge)(renderClientContextProvider, flushSync);
+  }
+  const key = hasElementConfigKey(config) ? "" + config.key : void 0;
+  const props = copyElementConfig(config);
+  (0, import_shared_value_helpers.applyElementDefaultProps)(comp, props);
+  const body = comp === Fragment ? props.ref != null || import_has_own.hasOwnProp.call(props, "ref") ? renderFragmentRefDescriptor : renderFragmentConfig : comp;
+  componentSlot(
+    parentScope,
+    slotKey,
+    domParent,
+    body,
+    props,
+    invocationSite,
+    anchor,
+    false,
+    false,
+    key,
+    true
+  );
+}
+function renderFragmentConfig(props) {
+  return props.children;
+}
 function rejectCompiledReturn(_block, _out, reset) {
   if (reset !== true) {
     throw new TypeError((0, import_error_codes_client_generated.formatClientError)(346));
@@ -21865,7 +21931,7 @@ function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body,
     registerSlot(parentScope, state);
   }
   const nextKey = key === void 0 ? NO_KEY : "" + key;
-  const keyChanged = key !== void 0 && state.prevKey !== NO_KEY && nextKey !== state.prevKey;
+  const keyChanged = nextKey !== state.prevKey;
   const replacing = identity !== state.currentComp || keyChanged;
   const journaledSlot = ROOT_RENDER_TRANSACTION !== null && state.block !== null && replacing;
   if (journaledSlot) {
@@ -25039,8 +25105,12 @@ function ctxDepsChanged(block) {
 function ctxDirectChanged(block) {
   const direct = block.$$ctxDirect;
   if (direct === null) return false;
-  for (const [ctx, version] of direct) {
-    if (ctx.$$version !== version) return true;
+  for (const [ctx, read] of direct) {
+    const version = typeof read === "number" ? read : read.version;
+    if (ctx.$$version === version) continue;
+    if (typeof read === "number" || ctx.$$providerVersion !== ctx.$$version || !Object.is(read.owner.$$ctxValues?.get(ctx), read.value))
+      return true;
+    read.version = ctx.$$version;
   }
   return false;
 }
@@ -25109,7 +25179,8 @@ function restampCtxDeps(block) {
       }
     }
     if (hasDirect) {
-      for (const [ctx, v] of direct) {
+      for (const [ctx, read] of direct) {
+        const v = typeof read === "number" ? read : read.version;
         const cur = m.get(ctx);
         if (cur !== v) {
           const live = ctx.$$version;
@@ -32627,6 +32698,7 @@ function scriptResource(attrs) {
   compilerOpaqueTag,
   compilerOwnsContextProvider,
   componentSlot,
+  componentSlotFromConfig,
   componentSlotLite,
   componentSlotVoid,
   createCompiledContext,

package/dist/cjs/runtime.server.cjs

@@ -128,6 +128,7 @@ __export(runtime_server_exports, {
   ssrChildrenSources: () => ssrChildrenSources,
   ssrClass: () => ssrClass,
   ssrComponent: () => ssrComponent,
+  ssrComponentFromConfig: () => ssrComponentFromConfig,
   ssrComponentNS: () => ssrComponentNS,
   ssrControl: () => ssrControl,
   ssrElement: () => ssrElement,
@@ -1453,34 +1454,16 @@ function ssrTextPre(v) {
   const s = ssrText(v);
   return s.charCodeAt(0) === 10 ? "\n" + s : s;
 }
-function ssrComponentDescriptor(d, scope, keyScoped) {
-  if (SCOPED_ELEMENT_PROPS.has(d.props)) {
-    return ssrComponent(
-      scope,
-      d.type,
-      d.props,
-      void 0,
-      d.key ?? void 0,
-      keyScoped,
-      d.__octaneInvocationSite
-    );
-  }
+function descriptorProps(d) {
+  if (SCOPED_ELEMENT_PROPS.has(d.props)) return d.props;
   const children = d.children;
-  if (children == null || children === d.props?.children) {
-    return ssrComponent(
-      scope,
-      d.type,
-      d.props,
-      void 0,
-      d.key ?? void 0,
-      keyScoped,
-      d.__octaneInvocationSite
-    );
-  }
+  return children == null || children === d.props?.children ? d.props : { ...d.props, children };
+}
+function ssrComponentDescriptor(d, scope, keyScoped) {
   return ssrComponent(
     scope,
     d.type,
-    { ...d.props, children },
+    descriptorProps(d),
     void 0,
     d.key ?? void 0,
     keyScoped,
@@ -3473,6 +3456,16 @@ function ssrComponentNS(parent, comp, props, namespace, inherit, key, invocation
     NEXT_COMPONENT_NAMESPACE = previous;
   }
 }
+function ssrComponentFromConfig(parent, comp, config, invocationSite, namespace = null) {
+  const key = hasElementConfigKey(config) ? "" + config.key : void 0;
+  const props = copyElementConfig(config);
+  (0, import_shared_value_helpers.applyElementDefaultProps)(comp, props);
+  const body = comp === Fragment ? props.ref != null || import_has_own.hasOwnProp.call(props, "ref") ? renderFragmentRefDescriptor : renderFragmentConfig : comp;
+  return namespace === null ? ssrComponent(parent, body, props, false, key, void 0, invocationSite) : ssrComponentNS(parent, body, props, namespace, false, key, invocationSite);
+}
+function renderFragmentConfig(props, scope) {
+  return ssrHtml(ssrChild(props.children, scope));
+}
 function ssrInNamespace(namespace, render) {
   const frame = FRAME;
   if (frame === null) return render();
@@ -5288,6 +5281,10 @@ function spliceHead(body, head, documentRoot = isDocumentRoot(body)) {
 function renderEntryValue(props, scope) {
   return ssrHtml(ssrChild(props.value, scope));
 }
+function renderEntry(entry, props, options) {
+  if (typeof entry === "function") return [entry, props, options];
+  return isElementDescriptor(entry) && typeof entry.type === "function" ? [entry.type, descriptorProps(entry), options ?? props] : [renderEntryValue, { value: entry }, options ?? props];
+}
 const MAX_SUSPENSE_PASSES = 50;
 let SUSPENSE_TIMEOUT_MS = 1e4;
 function setSsrSuspenseTimeout(ms) {
@@ -6141,11 +6138,8 @@ function insertBufferedInjection(pass, injection) {
   pass.body = tailStart === -1 ? pass.body + injection : pass.body.slice(0, tailStart) + injection + pass.body.slice(tailStart);
 }
 async function prerender(entryComponent, props, options) {
-  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
-  if (typeof entryComponent !== "function") {
-    options ??= props;
-    props = { value: entryComponent };
-  }
+  let component;
+  [component, props, options] = renderEntry(entryComponent, props, options);
   const preparedOptions = needsAutomaticSignalInjection(options) ? await prepareAutomaticSignalInjection(options) : options;
   const injection = preparedOptions?.injection;
   const cancelRender = injection === void 0 ? void 0 : new AbortController();
@@ -6276,11 +6270,8 @@ function renderHostedAttempt(session, component, props, options) {
   return { status: "complete", html: body, head: pass.head, cssEntries: pass.cssEntries };
 }
 function renderToString(entryComponent, props, options) {
-  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
-  if (typeof entryComponent !== "function") {
-    options ??= props;
-    props = { value: entryComponent };
-  }
+  let component;
+  [component, props, options] = renderEntry(entryComponent, props, options);
   options?.signal?.throwIfAborted();
   const nonceAttr = nonceAttrOf(options);
   const resolved = newResolvedMap(options ?? null);
@@ -6306,11 +6297,8 @@ function renderToString(entryComponent, props, options) {
   );
 }
 function renderToStaticMarkup(entryComponent, props, options) {
-  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
-  if (typeof entryComponent !== "function") {
-    options ??= props;
-    props = { value: entryComponent };
-  }
+  let component;
+  [component, props, options] = renderEntry(entryComponent, props, options);
   options?.signal?.throwIfAborted();
   const nonceAttr = nonceAttrOf(options);
   const resolved = newResolvedMap(options ?? null);
@@ -7658,11 +7646,8 @@ async function runStream(component, props, options, sink, resolved, cancelInject
   sink.allReady();
 }
 function renderToPipeableStream(entryComponent, props, options) {
-  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
-  if (typeof entryComponent !== "function") {
-    options ??= props;
-    props = { value: entryComponent };
-  }
+  let component;
+  [component, props, options] = renderEntry(entryComponent, props, options);
   const controller = new AbortController();
   let removeOuterAbort;
   if (options?.signal) {
@@ -7906,11 +7891,8 @@ function renderToPipeableStream(entryComponent, props, options) {
   };
 }
 function renderToReadableStream(entryComponent, props, options) {
-  const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
-  if (typeof entryComponent !== "function") {
-    options ??= props;
-    props = { value: entryComponent };
-  }
+  let component;
+  [component, props, options] = renderEntry(entryComponent, props, options);
   if (needsAutomaticSignalInjection(options)) {
     return prepareAutomaticSignalInjection(options).then(
       (prepared) => renderToReadableStream(component, props, prepared)
@@ -8502,6 +8484,7 @@ function preinitModule(href, options) {
   ssrChildrenSources,
   ssrClass,
   ssrComponent,
+  ssrComponentFromConfig,
   ssrComponentNS,
   ssrControl,
   ssrElement,

package/dist/cjs/server/index.cjs

@@ -107,6 +107,7 @@ __export(server_exports, {
   ssrChildrenSources: () => import_runtime_server.ssrChildrenSources,
   ssrClass: () => import_runtime_server.ssrClass,
   ssrComponent: () => import_runtime_server.ssrComponent,
+  ssrComponentFromConfig: () => import_runtime_server.ssrComponentFromConfig,
   ssrComponentNS: () => import_runtime_server.ssrComponentNS,
   ssrControl: () => import_runtime_server.ssrControl,
   ssrElement: () => import_runtime_server.ssrElement,
@@ -292,6 +293,7 @@ var import_runtime_server = require("../runtime.server.cjs");
   ssrChildrenSources,
   ssrClass,
   ssrComponent,
+  ssrComponentFromConfig,
   ssrComponentNS,
   ssrControl,
   ssrElement,

package/dist/cjs/signals/seed-serialization.cjs

@@ -64,7 +64,8 @@ function serializeScopeRead(root, read) {
   const scope = root.owner;
   if (!scope.seedable) return [];
   const rootEntry = scopeSeedEntry(scope, root, read);
-  if (!rootEntry) return void 0;
+  if (!rootEntry)
+    return read === "snapshot" && root.state?.snapshot.status !== "ready" ? [] : void 0;
   const owners = /* @__PURE__ */ new Map();
   const keys = /* @__PURE__ */ new Map();
   const seen = /* @__PURE__ */ new Set();

package/dist/cjs/version.cjs

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