octane 0.2.7 → 0.2.8

package/dist/cjs/runtime.server.cjs

@@ -417,6 +417,120 @@ const PORTAL_TAG = /* @__PURE__ */ Symbol.for("octane.portal");
 const Fragment = /* @__PURE__ */ Symbol.for("octane.Fragment");
 const Activity = /* @__PURE__ */ Symbol.for("octane.Activity");
 const SCOPED_ELEMENT_PROPS = /* @__PURE__ */ new WeakSet();
+const SCOPED_CHILDREN_RESOLVER = /* @__PURE__ */ Symbol("octane.scopedChildrenResolver");
+const SCOPED_VALUE_RESOLVER = /* @__PURE__ */ Symbol("octane.scopedValueResolver");
+function getScopedChildren() {
+  return this[SCOPED_CHILDREN_RESOLVER]();
+}
+const SCOPED_CHILDREN_PROPERTY = { configurable: true, enumerable: true, get: getScopedChildren };
+function setScopedChildrenResolver(target, resolve) {
+  Object.defineProperty(target, SCOPED_CHILDREN_RESOLVER, { value: resolve });
+}
+const SCOPED_VALUE_PROPERTIES = {
+  type: {
+    configurable: true,
+    enumerable: true,
+    get() {
+      return this[SCOPED_VALUE_RESOLVER]().type;
+    }
+  },
+  props: {
+    configurable: true,
+    enumerable: true,
+    get() {
+      return this[SCOPED_VALUE_RESOLVER]().props;
+    }
+  },
+  key: {
+    configurable: true,
+    enumerable: true,
+    get() {
+      return this[SCOPED_VALUE_RESOLVER]().key;
+    }
+  },
+  ref: {
+    configurable: true,
+    enumerable: true,
+    get() {
+      return this[SCOPED_VALUE_RESOLVER]().ref;
+    }
+  },
+  children: {
+    configurable: true,
+    enumerable: true,
+    get() {
+      return this[SCOPED_VALUE_RESOLVER]().children;
+    }
+  }
+};
+function restoreWritableScopedChildren(props, name, value) {
+  const inherited = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(props), name);
+  if (inherited?.get === void 0 && inherited?.set === void 0) return false;
+  Object.defineProperty(props, "children", {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value
+  });
+  return true;
+}
+function copyScopedElementConfig(type, config) {
+  if (config != null && import_has_own.hasOwnProp.call(config, "__proto__") || import_has_own.hasOwnProp.call(Object.prototype, "children")) {
+    const props2 = copyElementConfig(config);
+    (0, import_shared_value_helpers.applyElementDefaultProps)(type, props2);
+    Object.defineProperty(props2, "children", SCOPED_CHILDREN_PROPERTY);
+    return props2;
+  }
+  const props = {};
+  let copiedChildren;
+  let hasChildren = false;
+  let childrenAreWritable = false;
+  if (config != null) {
+    for (const name in config) {
+      if (name === "key" || !import_has_own.hasOwnProp.call(config, name)) continue;
+      if (name === "children") {
+        copiedChildren = config[name];
+        Object.defineProperty(props, "children", SCOPED_CHILDREN_PROPERTY);
+        hasChildren = true;
+      } else {
+        const value = config[name];
+        if (hasChildren && !childrenAreWritable && !import_has_own.hasOwnProp.call(props, name) && restoreWritableScopedChildren(props, name, copiedChildren)) {
+          childrenAreWritable = true;
+        }
+        props[name] = value;
+      }
+    }
+  }
+  const defaults = type?.defaultProps;
+  if (defaults != null) {
+    for (const name in defaults) {
+      if (name === "children") {
+        if ((childrenAreWritable ? props.children : hasChildren ? copiedChildren : props.children) === void 0) {
+          const defaultChildren = defaults[name];
+          copiedChildren = defaultChildren;
+          if (childrenAreWritable) {
+            props.children = defaultChildren;
+          } else if (!hasChildren) {
+            if (Object.getPrototypeOf(props) !== Object.prototype || Object.getOwnPropertyDescriptor(Object.prototype, "children") !== void 0) {
+              props.children = defaultChildren;
+            } else {
+              Object.defineProperty(props, "children", SCOPED_CHILDREN_PROPERTY);
+              hasChildren = true;
+            }
+          }
+        }
+      } else {
+        if (hasChildren && !childrenAreWritable && !import_has_own.hasOwnProp.call(props, name) && restoreWritableScopedChildren(props, name, copiedChildren)) {
+          childrenAreWritable = true;
+        }
+        if (props[name] === void 0) props[name] = defaults[name];
+      }
+    }
+  }
+  if (childrenAreWritable || !hasChildren)
+    Object.defineProperty(props, "children", SCOPED_CHILDREN_PROPERTY);
+  return props;
+}
 function hasElementConfigKey(config) {
   if (config == null || typeof config !== "object" && typeof config !== "function") return false;
   if (import_has_own.hasOwnProp.call(config, "key")) {
@@ -495,32 +609,20 @@ function nativeCreateScopedValue(readElement) {
   return scopedValueDescriptor(createNativeServerScopedResolver(readElement));
 }
 function scopedValueDescriptor(resolve) {
-  const descriptor = {
-    $$kind: ELEMENT_TAG,
-    get type() {
-      return resolve().type;
-    },
-    get props() {
-      return resolve().props;
-    },
-    get key() {
-      return resolve().key;
-    },
-    get ref() {
-      return resolve().ref;
-    },
-    get children() {
-      return resolve().children;
-    }
-  };
+  const descriptor = { $$kind: ELEMENT_TAG };
+  Object.defineProperty(descriptor, SCOPED_VALUE_RESOLVER, { value: resolve });
+  Object.defineProperty(descriptor, "type", SCOPED_VALUE_PROPERTIES.type);
+  Object.defineProperty(descriptor, "props", SCOPED_VALUE_PROPERTIES.props);
+  Object.defineProperty(descriptor, "key", SCOPED_VALUE_PROPERTIES.key);
+  Object.defineProperty(descriptor, "ref", SCOPED_VALUE_PROPERTIES.ref);
+  Object.defineProperty(descriptor, "children", SCOPED_VALUE_PROPERTIES.children);
   if (process.env.NODE_ENV !== "production") Object.freeze(descriptor);
   return descriptor;
 }
 function createScopedElement(type, props, readChildren) {
   const src = props ?? null;
   const key = hasElementConfigKey(src) ? "" + src.key : null;
-  const copiedProps = copyElementConfig(src);
-  (0, import_shared_value_helpers.applyElementDefaultProps)(type, copiedProps);
+  const copiedProps = copyScopedElementConfig(type, src);
   let resolved = false;
   let resolvedScope = null;
   let resolvedChildren;
@@ -539,8 +641,7 @@ function createScopedElement(type, props, readChildren) {
 function nativeCreateScopedElement(type, props, readChildren) {
   const src = props ?? null;
   const key = hasElementConfigKey(src) ? "" + src.key : null;
-  const copiedProps = copyElementConfig(src);
-  (0, import_shared_value_helpers.applyElementDefaultProps)(type, copiedProps);
+  const copiedProps = copyScopedElementConfig(type, src);
   return scopedElementDescriptor(
     type,
     copiedProps,
@@ -549,18 +650,17 @@ function nativeCreateScopedElement(type, props, readChildren) {
   );
 }
 function scopedElementDescriptor(type, copiedProps, key, children) {
-  const childProperty = { configurable: true, enumerable: true, get: children };
-  Object.defineProperty(copiedProps, "children", childProperty);
+  setScopedChildrenResolver(copiedProps, children);
   SCOPED_ELEMENT_PROPS.add(copiedProps);
   const descriptor = {
     $$kind: ELEMENT_TAG,
     type,
     props: copiedProps,
     key,
-    ref: copiedProps.ref !== void 0 ? copiedProps.ref : null,
-    children: null
+    ref: copiedProps.ref !== void 0 ? copiedProps.ref : null
   };
-  Object.defineProperty(descriptor, "children", childProperty);
+  Object.defineProperty(descriptor, "children", SCOPED_CHILDREN_PROPERTY);
+  setScopedChildrenResolver(descriptor, children);
   return finalizeElementDescriptor(descriptor);
 }
 function createElement(type, props, ...children) {
@@ -624,16 +724,50 @@ function ssrDeoptKey(item, index) {
 }
 function scopedSsrDeoptKey(path, item, index, key) {
   const explicit = isElementDescriptor(item) && item.key != null;
+  if (path.length === 0 && !explicit) return index;
   return JSON.stringify([path, explicit ? "key" : "index", explicit ? String(key) : index]);
 }
+const SSR_DEOPT_KEY_STRINGIFY = JSON.stringify;
+function nestedImplicitSsrKeyPrefix(path) {
+  if (JSON.stringify !== SSR_DEOPT_KEY_STRINGIFY || "toJSON" in path) return null;
+  for (let i = 0; i < path.length; i++) {
+    const type = typeof path[i];
+    if (type !== "string" && type !== "number") return null;
+  }
+  return "[" + JSON.stringify(path) + ',"index",';
+}
+function appendNestedSsrDeoptKey(outKeys, path, item, index, key, implicitPrefix) {
+  const explicit = isElementDescriptor(item) && item.key != null;
+  if (!explicit) {
+    if (implicitPrefix === void 0) implicitPrefix = nestedImplicitSsrKeyPrefix(path);
+    if (implicitPrefix !== null && JSON.stringify === SSR_DEOPT_KEY_STRINGIFY && !("toJSON" in path)) {
+      outKeys.push(implicitPrefix + index + "]");
+      return implicitPrefix;
+    }
+  }
+  outKeys.push(JSON.stringify([path, explicit ? "key" : "index", explicit ? String(key) : index]));
+  return implicitPrefix;
+}
 function flattenSsrChildContainer(outItems, outKeys, children, kind, path) {
   const count = children.length;
+  let implicitPrefix;
   for (let i = 0; i < count; i++) {
     const item = children[i];
     if (isFragmentDescriptor(item)) {
       if (item.ref != null || import_has_own.hasOwnProp.call(item.props, "ref")) {
         outItems.push(fragmentRefDescriptor(item));
-        outKeys.push(scopedSsrDeoptKey(path, item, i, ssrDeoptKey(item, i)));
+        if (path.length === 0 || count === 1) {
+          outKeys.push(scopedSsrDeoptKey(path, item, i, ssrDeoptKey(item, i)));
+        } else {
+          implicitPrefix = appendNestedSsrDeoptKey(
+            outKeys,
+            path,
+            item,
+            i,
+            ssrDeoptKey(item, i),
+            implicitPrefix
+          );
+        }
         continue;
       }
       const nested = fragmentDescriptorChildren(item);
@@ -656,7 +790,18 @@ function flattenSsrChildContainer(outItems, outKeys, children, kind, path) {
       continue;
     }
     outItems.push(item);
-    outKeys.push(scopedSsrDeoptKey(path, item, i, ssrDeoptKey(item, i)));
+    if (path.length === 0 || count === 1) {
+      outKeys.push(scopedSsrDeoptKey(path, item, i, ssrDeoptKey(item, i)));
+    } else {
+      implicitPrefix = appendNestedSsrDeoptKey(
+        outKeys,
+        path,
+        item,
+        i,
+        ssrDeoptKey(item, i),
+        implicitPrefix
+      );
+    }
   }
 }
 function prepareSsrDeoptList(value, includeKeyedSingle) {
@@ -692,9 +837,16 @@ function cloneElement(element, config, ...children) {
     throw new Error((0, import_error_codes_server_generated.formatServerError)(4));
   }
   let scopedChildren;
+  let scopedResolver;
   let props;
   if (SCOPED_ELEMENT_PROPS.has(element.props)) {
     scopedChildren = Object.getOwnPropertyDescriptor(element, "children").get;
+    if (scopedChildren === getScopedChildren) {
+      scopedResolver = element[SCOPED_CHILDREN_RESOLVER];
+    } else if (scopedChildren === SCOPED_VALUE_PROPERTIES.children.get) {
+      const get = scopedChildren;
+      scopedChildren = () => get.call(element);
+    }
     props = {};
     for (const name in element.props) {
       if (name !== "key" && name !== "children" && import_has_own.hasOwnProp.call(element.props, name)) {
@@ -719,44 +871,85 @@ function cloneElement(element, config, ...children) {
   }
   const n = children.length;
   let kids;
-  let childProperty;
+  let preserveScopedChildren = false;
   if (n === 1) {
     kids = children[0];
   } else if (n > 1) {
     kids = children;
   } else if (scopedChildren !== void 0 && !replacedChildren) {
-    childProperty = { configurable: true, enumerable: true, get: scopedChildren };
-    Object.defineProperty(props, "children", childProperty);
+    Object.defineProperty(
+      props,
+      "children",
+      scopedResolver === void 0 ? { configurable: true, enumerable: true, get: scopedChildren } : SCOPED_CHILDREN_PROPERTY
+    );
+    if (scopedResolver !== void 0) setScopedChildrenResolver(props, scopedResolver);
     SCOPED_ELEMENT_PROPS.add(props);
+    preserveScopedChildren = true;
     kids = null;
   } else {
     kids = "children" in props ? props.children : element.children;
   }
   if (n > 0) props.children = kids;
-  const descriptor = {
-    $$kind: ELEMENT_TAG,
-    type: element.type,
-    props,
-    key,
-    ref: props.ref !== void 0 ? props.ref : null,
-    children: kids ?? null
-  };
-  if (childProperty !== void 0) Object.defineProperty(descriptor, "children", childProperty);
+  let descriptor;
+  if (preserveScopedChildren) {
+    descriptor = {
+      $$kind: ELEMENT_TAG,
+      type: element.type,
+      props,
+      key,
+      ref: props.ref !== void 0 ? props.ref : null
+    };
+    Object.defineProperty(
+      descriptor,
+      "children",
+      scopedResolver === void 0 ? { configurable: true, enumerable: true, get: scopedChildren } : SCOPED_CHILDREN_PROPERTY
+    );
+    if (scopedResolver !== void 0) setScopedChildrenResolver(descriptor, scopedResolver);
+  } else {
+    descriptor = {
+      $$kind: ELEMENT_TAG,
+      type: element.type,
+      props,
+      key,
+      ref: props.ref !== void 0 ? props.ref : null,
+      children: kids ?? null
+    };
+  }
   return finalizeElementDescriptor(descriptor);
 }
 function cloneAndReplaceElementKey(element, key) {
   const scopedChildren = SCOPED_ELEMENT_PROPS.has(element.props);
-  const descriptor = {
-    $$kind: ELEMENT_TAG,
-    type: element.type,
-    props: element.props,
-    key,
-    ref: element.ref,
-    children: scopedChildren ? null : element.children
-  };
+  let descriptor;
   if (scopedChildren) {
     const get = Object.getOwnPropertyDescriptor(element, "children").get;
-    Object.defineProperty(descriptor, "children", { configurable: true, enumerable: true, get });
+    const copiedGetter = get === SCOPED_VALUE_PROPERTIES.children.get ? () => get.call(element) : get;
+    descriptor = {
+      $$kind: ELEMENT_TAG,
+      type: element.type,
+      props: element.props,
+      key,
+      ref: element.ref
+    };
+    Object.defineProperty(
+      descriptor,
+      "children",
+      get === getScopedChildren ? SCOPED_CHILDREN_PROPERTY : { configurable: true, enumerable: true, get: copiedGetter }
+    );
+    if (get === getScopedChildren) {
+      setScopedChildrenResolver(
+        descriptor,
+        element[SCOPED_CHILDREN_RESOLVER]
+      );
+    }
+  } else {
+    descriptor = {
+      $$kind: ELEMENT_TAG,
+      type: element.type,
+      props: element.props,
+      key,
+      ref: element.ref,
+      children: element.children
+    };
   }
   return finalizeElementDescriptor(descriptor);
 }
@@ -3593,26 +3786,33 @@ function useFormStatus() {
 function useOptimistic(state) {
   return [state, NOOP];
 }
+const MEMO_OWNER = /* @__PURE__ */ Symbol("memoOwner");
+const MEMO_MARKER_DESCRIPTOR = {
+  get() {
+    return this === this[MEMO_OWNER];
+  }
+};
+const MEMO_DEFAULT_PROPS_DESCRIPTOR = {
+  configurable: true,
+  // Static hoisters must copy `type` along with this accessor.
+  get() {
+    return this.type.defaultProps;
+  },
+  set(value) {
+    this.type.defaultProps = value;
+  }
+};
 function memo(component) {
   const memoWrapper = (props, scope, extra) => component(props, scope, extra);
+  Object.defineProperty(memoWrapper, MEMO_OWNER, { value: memoWrapper });
   Object.defineProperty(memoWrapper, "type", { value: component });
   Object.defineProperty(memoWrapper, "displayName", {
     configurable: true,
     writable: true,
     value: component.displayName || component.name || "Memo"
   });
-  Object.defineProperty(memoWrapper, "__memo", {
-    get() {
-      return this === memoWrapper;
-    }
-  });
-  Object.defineProperty(memoWrapper, "defaultProps", {
-    configurable: true,
-    get: () => component.defaultProps,
-    set: (value) => {
-      component.defaultProps = value;
-    }
-  });
+  Object.defineProperty(memoWrapper, "__memo", MEMO_MARKER_DESCRIPTOR);
+  Object.defineProperty(memoWrapper, "defaultProps", MEMO_DEFAULT_PROPS_DESCRIPTOR);
   return memoWrapper;
 }
 function markWarm(component, plan) {
@@ -3784,10 +3984,12 @@ function namespaceHeadElement(headKey, tag, attrs, text, authoredKey) {
   if (key !== void 0) config.key = key;
   return createElement(namespaceHead, config);
 }
-function spliceHead(body, head) {
-  if (!isDocumentRoot(body)) return head === "" ? body : head + body;
-  const headClose = body.indexOf("</head>");
+function spliceHead(body, head, documentRoot = isDocumentRoot(body)) {
+  if (!documentRoot && (head === "" || !isLeadingHeadRoot(body)))
+    return head === "" ? body : head + body;
+  const headClose = documentRoot ? body.indexOf("</head>") : findFragmentHeadClose(body, documentHeadInsertionPoint(body));
   if (headClose !== -1) return body.slice(0, headClose) + head + body.slice(headClose);
+  if (!documentRoot) return head + body;
   const openingEnd = documentTagEnd(body, body.indexOf("<html") + 5);
   if (openingEnd !== -1)
     return body.slice(0, openingEnd) + "<head>" + head + "</head>" + body.slice(openingEnd);
@@ -5012,6 +5214,13 @@ function isDocumentRoot(body) {
   const next = body.charCodeAt(i + 5);
   return next === 62 || next === 32 || next === 9 || next === 10 || next === 13;
 }
+function isLeadingHeadRoot(body) {
+  let i = 0;
+  while (body.startsWith("<!--[-->", i)) i += 8;
+  if (!body.startsWith("<head", i)) return false;
+  const next = body.charCodeAt(i + 5);
+  return next === 62 || next === 32 || next === 9 || next === 10 || next === 13;
+}
 function documentHeadInsertionPoint(body) {
   let searchFrom = 0;
   for (; ; ) {
@@ -5036,6 +5245,37 @@ function documentTagEnd(body, from) {
   }
   return -1;
 }
+function findFragmentHeadClose(body, from) {
+  while (from !== -1) {
+    const start = body.indexOf("<", from);
+    if (start === -1) return -1;
+    if (body.startsWith("<!--", start)) {
+      const end2 = body.indexOf("-->", start + 4);
+      if (end2 === -1) return -1;
+      from = end2 + 3;
+      continue;
+    }
+    if (body.startsWith("</head>", start)) return start;
+    const end = documentTagEnd(body, start + 1);
+    if (end === -1) return -1;
+    let rawClose = null;
+    if (body.startsWith("<script", start)) {
+      const next = body.charCodeAt(start + 7);
+      if (next === 62 || next === 32 || next === 9 || next === 10 || next === 13)
+        rawClose = "</script>";
+    } else if (body.startsWith("<style", start)) {
+      const next = body.charCodeAt(start + 6);
+      if (next === 62 || next === 32 || next === 9 || next === 10 || next === 13)
+        rawClose = "</style>";
+    }
+    if (rawClose !== null) {
+      const rawEnd = body.indexOf(rawClose, end);
+      if (rawEnd === -1) return -1;
+      from = rawEnd + rawClose.length;
+    } else from = end;
+  }
+  return -1;
+}
 function segmentChunk(b, nonceAttr) {
   let seedScript = "";
   if (b.seeds.length > 0) {
@@ -5312,7 +5552,8 @@ async function runStream(component, props, options, sink, resolved) {
       shell += spliceHead(pass.body, leadingStyles + shellHead);
     }
   } else {
-    shell += documentRoot ? spliceHead(pass.body, leadingStyles + shellHead) : leadingStyles + shellHead + pass.body;
+    const shellPrefix = leadingStyles + shellHead;
+    shell += documentRoot ? spliceHead(pass.body, shellPrefix, true) : shellPrefix === "" ? pass.body : spliceHead(pass.body, shellPrefix, false);
   }
   if (pass.serial.length > 0) shell += serializeSuspenseSeeds(pass.serial, nonceAttr);
   if (pass.signals !== void 0) shell += serializeNativeSignalSeeds(pass.signals, nonceAttr);

package/dist/cjs/version.cjs

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