octane 0.2.11 → 0.2.13

package/dist/universal-core.js

@@ -1,3 +1,4 @@
+import { bumpContextEpoch } from "./context-epoch.js";
 import { hasOwnProp } from "./has-own.js";
 import { resolveHookPath } from "./hook-slot-cache.js";
 import {
@@ -394,35 +395,48 @@ function universalProps(entries, children = NO_CHILDREN, canonicalizeHostClass =
       hasChildren: false
     };
   }
-  const props = {};
+  let props = {};
+  let key = null;
+  let hasKey = false;
   if (!canonicalizeHostClass) {
     for (const entry of entries) {
       if (entry[0] === "set") {
-        if (entry[1] === "__proto__") defineUniversalProtoProp(props, entry[2]);
+        if (entry[1] === "key") {
+          key = entry[2];
+          hasKey = true;
+        } else if (entry[1] === "__proto__") defineUniversalProtoProp(props, entry[2]);
         else props[entry[1]] = entry[2];
         continue;
       }
       const spread = entry[1];
       if (spread == null) continue;
       assignUniversalPropSpread(props, spread, false);
+      if (hasOwnProp.call(props, "key")) {
+        ({ key, ...props } = props);
+        hasKey = true;
+      }
     }
   } else {
     for (const entry of entries) {
       if (entry[0] === "set") {
         const name = entry[1];
-        if (name === "__proto__") defineUniversalProtoProp(props, entry[2]);
+        if (name === "key") {
+          key = entry[2];
+          hasKey = true;
+        } else if (name === "__proto__") defineUniversalProtoProp(props, entry[2]);
         else props[name === "className" ? "class" : name] = entry[2];
         continue;
       }
       const spread = entry[1];
       if (spread == null) continue;
       assignUniversalPropSpread(props, spread, true);
+      if (hasOwnProp.call(props, "key")) {
+        ({ key, ...props } = props);
+        hasKey = true;
+      }
     }
   }
   if (children !== NO_CHILDREN) props.children = children;
-  const hasKey = hasOwnProp.call(props, "key");
-  const key = hasKey ? props.key : null;
-  if (hasKey) delete props.key;
   return {
     $$kind: UNIVERSAL_PROPS,
     props: Object.freeze(props),
@@ -1086,7 +1100,8 @@ function materializeComponentValue(value, expectedRenderer, path) {
   const normalized = normalizePropsValue(value.props);
   const host = trustedUniversalHostComponent(value.component, expectedRenderer);
   if (host !== null) {
-    const nodes2 = materializeNode(host.plan.root, [normalized], expectedRenderer, path);
+    const nodes2 = [];
+    materializeNode(host.plan.root, [normalized], expectedRenderer, path, nodes2);
     if (value.hasKey) nodes2[0].key = normalizeUniversalKey(value.key);
     return nodes2;
   }
@@ -1127,7 +1142,7 @@ function materializeComponentValue(value, expectedRenderer, path) {
   });
   return ownerRange(owner, nodes);
 }
-function materializeScoped(parent, path, key, build, contextValues = null) {
+function materializeScoped(parent, path, key, build, contextValues = null, outputPath = [...path, "output"]) {
   const attempt = currentAttempt();
   const universalIdCheckpoint = attempt.nextUniversalId;
   const owner = claimChildOwner(parent, null, path, key);
@@ -1135,7 +1150,7 @@ function materializeScoped(parent, path, key, build, contextValues = null) {
   try {
     const nodes = executeOwner(
       owner,
-      () => materializeValue(build(), parent.record.renderer, null, [...path, "output"])
+      () => materializeValue(build(), parent.record.renderer, null, outputPath)
     );
     return ownerRange(owner, nodes);
   } catch (error) {
@@ -1298,7 +1313,7 @@ function ownerlessLeafHostPlan(plan) {
   OWNERLESS_LEAF_PLAN_CACHE.set(plan, host);
   return host;
 }
-function materializeOwnerlessLeafValue(value, expectedRenderer, compilerLeafProps, owner = CURRENT_OWNER) {
+function materializeOwnerlessLeafValue(value, expectedRenderer, owner = CURRENT_OWNER) {
   if (value?.$$kind !== UNIVERSAL_VALUE) return null;
   const planValue = value;
   if (planValue.plan.renderer !== expectedRenderer) {
@@ -1311,9 +1326,6 @@ function materializeOwnerlessLeafValue(value, expectedRenderer, compilerLeafProp
   if (node === null) return null;
   const props = { ...node.props ?? {} };
   for (const [name, slot] of node.bindings ?? []) props[name] = planValue.values[slot];
-  let events = null;
-  let lifecycles = null;
-  let localCallbacks = null;
   let hostBindings = null;
   const attempt = currentAttempt();
   for (const name of Object.keys(props)) {
@@ -1329,76 +1341,9 @@ function materializeOwnerlessLeafValue(value, expectedRenderer, compilerLeafProp
       props[name] = attempt.root.encodeHostProp(node.type, name, handler.getSnapshot());
       continue;
     }
-    if (compilerLeafProps) {
-      if (isRendererRegion(handler)) markUniversalTreeFeature(UNIVERSAL_TREE_REGION);
-      props[name] = attempt.root.encodeHostProp(node.type, name, handler);
-      continue;
-    }
-    const lifecycle = attempt.root.classifyLifecycle(name, handler);
-    if (lifecycle !== null) {
-      delete props[name];
-      if (handler == null) continue;
-      if (typeof handler !== "function") {
-        throw new TypeError(
-          `Universal lifecycle prop ${JSON.stringify(name)} for renderer ${JSON.stringify(expectedRenderer)} must be a function, null, or undefined.`
-        );
-      }
-      (lifecycles ??= /* @__PURE__ */ new Map()).set(lifecycle.type, {
-        prop: name,
-        type: lifecycle.type,
-        handler,
-        owner: owner.record
-      });
-      continue;
-    }
-    const local = attempt.root.classifyLocalCallback(name, handler);
-    if (local !== null) {
-      delete props[name];
-      if (attempt.root.driverCapabilities().localHostCallbacks !== true) {
-        throw new Error(
-          `Universal renderer ${JSON.stringify(expectedRenderer)} does not declare the local-host-callback capability.`
-        );
-      }
-      if (handler == null) continue;
-      if (typeof handler !== "function") {
-        throw new TypeError(
-          `Universal local callback prop ${JSON.stringify(name)} for renderer ${JSON.stringify(expectedRenderer)} must be a function, null, or undefined.`
-        );
-      }
-      (localCallbacks ??= /* @__PURE__ */ new Map()).set(local.type, {
-        prop: name,
-        type: local.type,
-        handler,
-        owner: owner.record
-      });
-      continue;
-    }
-    const definition = attempt.root.classifyEvent(name);
-    if (definition !== null) {
-      delete props[name];
-      if (handler == null) continue;
-      if (typeof handler !== "function") {
-        throw new TypeError(
-          `Universal event prop ${JSON.stringify(name)} for renderer ${JSON.stringify(expectedRenderer)} must be a function, null, or undefined.`
-        );
-      }
-      (events ??= /* @__PURE__ */ new Map()).set(definition.type, {
-        prop: name,
-        type: definition.type,
-        priority: definition.priority ?? "default",
-        handler,
-        owner: owner.record
-      });
-      continue;
-    }
     if (isRendererRegion(handler)) markUniversalTreeFeature(UNIVERSAL_TREE_REGION);
     props[name] = attempt.root.encodeHostProp(node.type, name, handler);
   }
-  if (events !== null && events.size !== 0) markUniversalTreeFeature(UNIVERSAL_TREE_EVENT);
-  if (lifecycles !== null && lifecycles.size !== 0)
-    markUniversalTreeFeature(UNIVERSAL_TREE_LIFECYCLE);
-  if (localCallbacks !== null && localCallbacks.size !== 0)
-    markUniversalTreeFeature(UNIVERSAL_TREE_LOCAL_CALLBACK);
   if (owner.visibility !== "visible") markUniversalTreeFeature(UNIVERSAL_TREE_HIDDEN);
   return {
     kind: "host",
@@ -1408,9 +1353,9 @@ function materializeOwnerlessLeafValue(value, expectedRenderer, compilerLeafProp
     ...hostBindings === null ? null : { hostBindings },
     ref: null,
     owner: owner.record,
-    events: events ?? EMPTY_BLUEPRINT_EVENTS,
-    lifecycles: lifecycles ?? EMPTY_BLUEPRINT_HOST_CALLBACKS,
-    localCallbacks: localCallbacks ?? EMPTY_BLUEPRINT_HOST_CALLBACKS,
+    events: EMPTY_BLUEPRINT_EVENTS,
+    lifecycles: EMPTY_BLUEPRINT_HOST_CALLBACKS,
+    localCallbacks: EMPTY_BLUEPRINT_HOST_CALLBACKS,
     visibility: owner.visibility,
     children: []
   };
@@ -1668,6 +1613,7 @@ function materializeValue(value, expectedRenderer, key, path) {
       if (compactIndex !== 0 && owner.visibility !== "visible") {
         markUniversalTreeFeature(UNIVERSAL_TREE_HIDDEN);
       }
+      currentAttempt().hasCompactLists = true;
       return [
         {
           kind: "range",
@@ -1706,6 +1652,8 @@ function materializeValue(value, expectedRenderer, key, path) {
       }
     }
     const componentPath = componentScopeEnabled ? [...lazyOwnerScope.identityPath, "output"] : null;
+    let listOwnerPath = lazyOwnerScope?.identityPath ?? null;
+    let listOutputPath = componentPath;
     let index = 0;
     for (const item of list.items) {
       const itemIndex = index++;
@@ -1817,12 +1765,7 @@ function materializeValue(value, expectedRenderer, key, path) {
         );
         const rendered = materializeRawUniversalListValue(list, rawOutput, expectedRenderer);
         const itemOwner = lazyOwnerScope.owner ?? parent;
-        const leaf = materializeOwnerlessLeafValue(
-          rendered,
-          expectedRenderer,
-          compilerLeafProps,
-          itemOwner
-        );
+        const leaf = materializeOwnerlessLeafValue(rendered, expectedRenderer, itemOwner);
         if (leaf !== null) {
           leaf.key = itemKey;
           output.push(leaf);
@@ -1847,18 +1790,26 @@ function materializeValue(value, expectedRenderer, key, path) {
         nodes[0].key = itemKey;
         output.push(nodes[0]);
       } else {
+        listOwnerPath ??= [...path, "for"];
+        listOutputPath ??= [...listOwnerPath, "output"];
         output.push(
-          ...materializeScoped(parent, [...path, "for"], itemKey, () => {
-            return materializeRawUniversalListValue(
+          ...materializeScoped(
+            parent,
+            listOwnerPath,
+            itemKey,
+            () => materializeRawUniversalListValue(
               list,
               list.render(item, itemIndex),
               expectedRenderer
-            );
-          })
+            ),
+            null,
+            listOutputPath
+          )
         );
       }
     }
     if (compactTemplateEnabled && compactTemplateList !== null) {
+      attempt.hasCompactLists = true;
       return [{ kind: "range", key: null, children: [], compactTemplateList }];
     }
     if (index === 0 && list.empty !== null) {
@@ -1959,13 +1910,23 @@ function materializeValue(value, expectedRenderer, key, path) {
   }
   if (Array.isArray(value)) {
     const output = [];
-    const keys = /* @__PURE__ */ new Set();
+    let firstKey = null;
+    let keys;
     for (let index = 0; index < value.length; index++) {
       const item = value[index];
       const itemKey = renderableKey(item);
       if (itemKey !== null) {
-        if (keys.has(itemKey)) throw new Error(`Duplicate universal child key ${String(itemKey)}.`);
-        keys.add(itemKey);
+        if (firstKey === null) {
+          firstKey = itemKey;
+        } else {
+          if (keys === void 0) {
+            keys = /* @__PURE__ */ new Set();
+            keys.add(firstKey);
+          }
+          if (keys.has(itemKey))
+            throw new Error(`Duplicate universal child key ${String(itemKey)}.`);
+          keys.add(itemKey);
+        }
       }
       output.push(
         ...materializeValue(item, expectedRenderer, itemKey, [
@@ -2004,21 +1965,37 @@ function materializeValue(value, expectedRenderer, key, path) {
     `Unsupported universal dynamic child ${Object.prototype.toString.call(value)}.`
   );
 }
-function materializeNode(node, values, renderer, path) {
-  if (node.kind === "slot")
-    return materializeValue(values[node.slot], renderer, null, [...path, "slot", node.slot]);
+function copyUniversalHostPropPrefix(source, names, end) {
+  const props = {};
+  for (let index = 0; index < end; index++) {
+    const name = names[index];
+    if (name === "__proto__") defineUniversalProtoProp(props, source[name]);
+    else props[name] = source[name];
+  }
+  for (const symbol of Object.getOwnPropertySymbols(source)) {
+    props[symbol] = source[symbol];
+  }
+  return props;
+}
+function materializeNode(node, values, renderer, path, output) {
+  if (node.kind === "slot") {
+    output.push(
+      ...materializeValue(values[node.slot], renderer, null, [...path, "slot", node.slot])
+    );
+    return;
+  }
   if (node.kind === "text") {
     const value = node.slot === void 0 ? node.value ?? "" : values[node.slot];
-    return materializeValue(value, renderer, null, [...path, "text"]);
+    output.push(...materializeValue(value, renderer, null, [...path, "text"]));
+    return;
   }
   if (node.kind === "range") {
     const children2 = [];
     for (let index = 0; index < node.children.length; index++) {
-      children2.push(
-        ...materializeNode(node.children[index], values, renderer, [...path, "range", index])
-      );
+      materializeNode(node.children[index], values, renderer, [...path, "range", index], children2);
     }
-    return [{ kind: "range", key: null, children: children2 }];
+    output.push({ kind: "range", key: null, children: children2 });
+    return;
   }
   if (node.kind === "component") {
     const component = node.component ?? values[node.componentSlot];
@@ -2031,33 +2008,36 @@ function materializeNode(node, values, renderer, path) {
       const children2 = universalChildren(renderer, () => universalValue(childPlan, values));
       props2 = universalProps([["spread", props2.props]], children2);
     }
-    return materializeComponentValue(
-      universalComponent(
-        node.renderer,
-        component,
-        props2,
-        node.keySlot === void 0 ? NO_KEY : values[node.keySlot]
-      ),
-      renderer,
-      [...path, "component"]
+    output.push(
+      ...materializeComponentValue(
+        universalComponent(
+          node.renderer,
+          component,
+          props2,
+          node.keySlot === void 0 ? NO_KEY : values[node.keySlot]
+        ),
+        renderer,
+        [...path, "component"]
+      )
     );
+    return;
   }
   if (node.kind === "if") {
     const selected = values[node.conditionSlot] ? node.then : node.else;
-    if (selected === void 0) return [];
+    if (selected === void 0) return;
     const owner = claimChildOwner(
       CURRENT_OWNER,
       null,
       [...path, "if"],
       values[node.conditionSlot] ? 1 : 0
     );
-    return ownerRange(
-      owner,
-      executeOwner(
-        owner,
-        () => materializeNode(selected, values, renderer, [...path, "if-output"])
-      )
-    );
+    const children2 = executeOwner(owner, () => {
+      const nodes = [];
+      materializeNode(selected, values, renderer, [...path, "if-output"], nodes);
+      return nodes;
+    });
+    output.push(...ownerRange(owner, children2));
+    return;
   }
   if (node.kind === "switch") {
     let selected = node.default;
@@ -2069,19 +2049,19 @@ function materializeNode(node, values, renderer, path) {
         break;
       }
     }
-    if (selected === void 0) return [];
+    if (selected === void 0) return;
     const owner = claimChildOwner(CURRENT_OWNER, null, [...path, "switch"], selectedKey);
-    return ownerRange(
-      owner,
-      executeOwner(
-        owner,
-        () => materializeNode(selected, values, renderer, [...path, "switch-output"])
-      )
-    );
+    const children2 = executeOwner(owner, () => {
+      const nodes = [];
+      materializeNode(selected, values, renderer, [...path, "switch-output"], nodes);
+      return nodes;
+    });
+    output.push(...ownerRange(owner, children2));
+    return;
   }
   if (node.type === "#text") {
     const text = currentAttempt().root.textPolicy();
-    if (text === "ignore") return [];
+    if (text === "ignore") return;
     if (text === "reject") {
       throw new Error(
         `Universal renderer ${JSON.stringify(renderer)} rejects primitive text children.`
@@ -2091,35 +2071,37 @@ function materializeNode(node, values, renderer, path) {
   const attempt = currentAttempt();
   const root = attempt.root;
   const staticProps = root.materializeStaticHostProps(node);
-  const props = staticProps ?? { ...node.props ?? {} };
+  const sourceProps = staticProps ?? { ...node.props ?? {} };
   if (staticProps === null) {
-    for (const [name, slot] of node.bindings ?? []) props[name] = values[slot];
+    for (const [name, slot] of node.bindings ?? []) sourceProps[name] = values[slot];
   }
   let propsValue = null;
   if (node.propsSlot !== void 0) {
     propsValue = normalizePropsValue(values[node.propsSlot]);
-    Object.assign(props, propsValue.props);
+    Object.assign(sourceProps, propsValue.props);
   }
-  if (isUniversalHostBinding(props.ref) || isUniversalHostBinding(props.key) || isUniversalHostBinding(props.children)) {
+  if (isUniversalHostBinding(sourceProps.ref) || isUniversalHostBinding(sourceProps.key) || isUniversalHostBinding(sourceProps.children)) {
     throw new Error("Experimental host bindings require an ordinary host property.");
   }
-  const hasKey = staticProps === null && (propsValue?.hasKey || hasOwnProp.call(props, "key"));
+  const hasKey = staticProps === null && (propsValue?.hasKey || hasOwnProp.call(sourceProps, "key"));
   const hostKey = normalizeUniversalKey(
-    propsValue?.hasKey ? propsValue.key : hasKey ? props.key : null
+    propsValue?.hasKey ? propsValue.key : hasKey ? sourceProps.key : null
   );
-  const ref = staticProps === null && hasOwnProp.call(props, "ref") ? props.ref : null;
-  const dynamicChildren = staticProps === null && hasOwnProp.call(props, "children") ? props.children : void 0;
-  if (staticProps === null) {
-    delete props.ref;
-    delete props.key;
-    delete props.children;
-  }
+  const ref = staticProps === null && hasOwnProp.call(sourceProps, "ref") ? sourceProps.ref : null;
+  const dynamicChildren = staticProps === null && hasOwnProp.call(sourceProps, "children") ? sourceProps.children : void 0;
+  let props = sourceProps;
   let events = null;
   let lifecycles = null;
   let localCallbacks = null;
   let hostBindings = null;
-  for (const name of staticProps === null ? Object.keys(props) : EMPTY_STATIC_PROP_NAMES) {
-    const handler = props[name];
+  const names = staticProps === null ? Object.keys(sourceProps) : EMPTY_STATIC_PROP_NAMES;
+  for (let index = 0; index < names.length; index++) {
+    const name = names[index];
+    if (name === "ref" || name === "key" || name === "children") {
+      if (props === sourceProps) props = copyUniversalHostPropPrefix(sourceProps, names, index);
+      continue;
+    }
+    const handler = sourceProps[name];
     if (isUniversalHostBinding(handler)) {
       if (root.hasHostBindingUnsupportedConfiguration() || name.startsWith("on")) {
         throw new Error(
@@ -2128,12 +2110,14 @@ function materializeNode(node, values, renderer, path) {
       }
       markUniversalTreeFeature(UNIVERSAL_TREE_HOST_BINDING);
       (hostBindings ??= /* @__PURE__ */ new Map()).set(name, handler);
-      props[name] = root.encodeHostProp(node.type, name, handler.getSnapshot());
+      const encoded2 = root.encodeHostProp(node.type, name, handler.getSnapshot());
+      if (name === "__proto__") defineUniversalProtoProp(props, encoded2);
+      else props[name] = encoded2;
       continue;
     }
     const lifecycle = root.classifyLifecycle(name, handler);
     if (lifecycle !== null) {
-      delete props[name];
+      if (props === sourceProps) props = copyUniversalHostPropPrefix(sourceProps, names, index);
       if (handler == null) continue;
       if (typeof handler !== "function") {
         throw new TypeError(
@@ -2150,7 +2134,7 @@ function materializeNode(node, values, renderer, path) {
     }
     const local = root.classifyLocalCallback(name, handler);
     if (local !== null) {
-      delete props[name];
+      if (props === sourceProps) props = copyUniversalHostPropPrefix(sourceProps, names, index);
       if (root.driverCapabilities().localHostCallbacks !== true) {
         throw new Error(
           `Universal renderer ${JSON.stringify(renderer)} does not declare the local-host-callback capability.`
@@ -2172,7 +2156,7 @@ function materializeNode(node, values, renderer, path) {
     }
     const definition = root.classifyEvent(name);
     if (definition !== null) {
-      delete props[name];
+      if (props === sourceProps) props = copyUniversalHostPropPrefix(sourceProps, names, index);
       if (handler == null) continue;
       if (typeof handler !== "function") {
         throw new TypeError(
@@ -2189,8 +2173,11 @@ function materializeNode(node, values, renderer, path) {
       continue;
     }
     if (isRendererRegion(handler)) markUniversalTreeFeature(UNIVERSAL_TREE_REGION);
-    props[name] = root.encodeHostProp(node.type, name, handler);
+    const encoded = root.encodeHostProp(node.type, name, handler);
+    if (name === "__proto__") defineUniversalProtoProp(props, encoded);
+    else props[name] = encoded;
   }
+  if (props !== sourceProps) Object.setPrototypeOf(props, Object.getPrototypeOf(sourceProps));
   if (events !== null && events.size !== 0) markUniversalTreeFeature(UNIVERSAL_TREE_EVENT);
   if (lifecycles !== null && lifecycles.size !== 0)
     markUniversalTreeFeature(UNIVERSAL_TREE_LIFECYCLE);
@@ -2201,29 +2188,25 @@ function materializeNode(node, values, renderer, path) {
   const children = [];
   if ((node.children?.length ?? 0) > 0) {
     for (let index = 0; index < node.children.length; index++) {
-      children.push(
-        ...materializeNode(node.children[index], values, renderer, [...path, "host", index])
-      );
+      materializeNode(node.children[index], values, renderer, [...path, "host", index], children);
     }
   } else if (dynamicChildren !== void 0) {
     children.push(...materializeValue(dynamicChildren, renderer, null, [...path, "host-children"]));
   }
-  return [
-    {
-      kind: "host",
-      key: hostKey,
-      type: node.type,
-      props,
-      ...hostBindings === null ? null : { hostBindings },
-      ref,
-      owner: CURRENT_OWNER.record,
-      events: events ?? EMPTY_BLUEPRINT_EVENTS,
-      lifecycles: lifecycles ?? EMPTY_BLUEPRINT_HOST_CALLBACKS,
-      localCallbacks: localCallbacks ?? EMPTY_BLUEPRINT_HOST_CALLBACKS,
-      visibility: CURRENT_OWNER.visibility,
-      children
-    }
-  ];
+  output.push({
+    kind: "host",
+    key: hostKey,
+    type: node.type,
+    props,
+    ...hostBindings === null ? null : { hostBindings },
+    ref,
+    owner: CURRENT_OWNER.record,
+    events: events ?? EMPTY_BLUEPRINT_EVENTS,
+    lifecycles: lifecycles ?? EMPTY_BLUEPRINT_HOST_CALLBACKS,
+    localCallbacks: localCallbacks ?? EMPTY_BLUEPRINT_HOST_CALLBACKS,
+    visibility: CURRENT_OWNER.visibility,
+    children
+  });
 }
 function materializePlanValue(value, expectedRenderer, path = []) {
   if (value.plan.renderer !== expectedRenderer) {
@@ -2236,7 +2219,8 @@ function materializePlanValue(value, expectedRenderer, path = []) {
     if (value.key !== null) collapsed.key = value.key;
     return [collapsed];
   }
-  const nodes = materializeNode(value.plan.root, value.values, expectedRenderer, [...path, "plan"]);
+  const nodes = [];
+  materializeNode(value.plan.root, value.values, expectedRenderer, [...path, "plan"], nodes);
   if (currentAttempt().root.driverCapabilities().templateMount === true && value.plan.root.kind === "host" && nodes.length === 1 && nodes[0].kind === "host") {
     nodes[0].templatePlan = value.plan.root;
   }
@@ -2285,17 +2269,21 @@ function materializeCollapsedTemplate(value) {
       nodes[index] = { props: staticProps };
       continue;
     }
-    const props = { ...node.props ?? EMPTY_STATIC_HOST_PROPS };
-    for (const [name, slot] of node.bindings ?? []) props[name] = value.values[slot];
+    const sourceProps = { ...node.props ?? EMPTY_STATIC_HOST_PROPS };
+    for (const [name, slot] of node.bindings ?? []) sourceProps[name] = value.values[slot];
+    let props = sourceProps;
     let events;
-    for (const name of Object.keys(props)) {
-      const current = props[name];
+    const names = Object.keys(sourceProps);
+    for (let propIndex = 0; propIndex < names.length; propIndex++) {
+      const name = names[propIndex];
+      const current = sourceProps[name];
       if (isUniversalHostBinding(current) || root.classifyLifecycle(name, current) !== null || root.classifyLocalCallback(name, current) !== null || isRendererRegion(current)) {
         return null;
       }
       const definition = root.classifyEvent(name);
       if (definition !== null) {
-        delete props[name];
+        if (props === sourceProps)
+          props = copyUniversalHostPropPrefix(sourceProps, names, propIndex);
         if (current == null) continue;
         if (typeof current !== "function") return null;
         (events ??= []).push({
@@ -2307,8 +2295,11 @@ function materializeCollapsedTemplate(value) {
         });
         continue;
       }
-      props[name] = root.encodeHostProp(node.type, name, current);
+      const encoded = root.encodeHostProp(node.type, name, current);
+      if (name === "__proto__") defineUniversalProtoProp(props, encoded);
+      else props[name] = encoded;
     }
+    if (props !== sourceProps) Object.setPrototypeOf(props, Object.getPrototypeOf(sourceProps));
     if (events !== void 0) markUniversalTreeFeature(UNIVERSAL_TREE_EVENT);
     nodes[index] = events === void 0 ? { props } : { props, events };
   }
@@ -2444,7 +2435,8 @@ function createLogicalRecord(id, blueprint) {
     visibility: blueprint.kind === "host" ? blueprint.visibility : "visible",
     portalRegistration: null,
     parent: null,
-    children: []
+    children: [],
+    treeFeatures: null
   };
 }
 function hasCrossRealmPlainPrototype(value) {
@@ -2678,27 +2670,34 @@ function walkDraftPostOrder(record, visit) {
   for (const child of record.children) walkDraftPostOrder(child, visit);
   visit(record);
 }
+function invalidateLogicalTreeFeatures(record) {
+  let current = record;
+  while (current !== null && current.treeFeatures !== null) {
+    current.treeFeatures = null;
+    current = current.parent;
+  }
+}
 function logicalTreeFeatures(record) {
+  if (record.treeFeatures !== null) return record.treeFeatures;
   let features = 0;
-  walkLogical(record, (current) => {
-    if (current.kind === "portal") {
-      features |= UNIVERSAL_TREE_PORTAL;
-      return;
-    }
-    if (current.kind !== "host") return;
-    if (current.events.size !== 0) features |= UNIVERSAL_TREE_EVENT;
-    if (current.lifecycles.size !== 0) features |= UNIVERSAL_TREE_LIFECYCLE;
-    if (current.localCallbacks.size !== 0) features |= UNIVERSAL_TREE_LOCAL_CALLBACK;
-    if (current.ref != null) features |= UNIVERSAL_TREE_REF;
-    if (current.visibility !== "visible") features |= UNIVERSAL_TREE_HIDDEN;
-    for (const value of Object.values(current.props)) {
-      if (isRendererRegion(value)) {
+  if (record.kind === "portal") features |= UNIVERSAL_TREE_PORTAL;
+  else if (record.kind === "host") {
+    if (record.events.size !== 0 || (record.collapsedTemplate?.events.length ?? 0) !== 0) {
+      features |= UNIVERSAL_TREE_EVENT;
+    }
+    if (record.lifecycles.size !== 0) features |= UNIVERSAL_TREE_LIFECYCLE;
+    if (record.localCallbacks.size !== 0) features |= UNIVERSAL_TREE_LOCAL_CALLBACK;
+    if (record.ref != null) features |= UNIVERSAL_TREE_REF;
+    if (record.visibility !== "visible") features |= UNIVERSAL_TREE_HIDDEN;
+    for (const name of Object.keys(record.props)) {
+      if (isRendererRegion(record.props[name])) {
         features |= UNIVERSAL_TREE_REGION;
         break;
       }
     }
-  });
-  return features;
+  }
+  for (const child of record.children) features |= logicalTreeFeatures(child);
+  return record.treeFeatures = features;
 }
 function ownerTreeHasWarmPlan(owner) {
   if (owner.component?.__warm !== void 0) return true;
@@ -4505,7 +4504,8 @@ class UniversalRootImpl {
       visibility: "visible",
       portalRegistration: null,
       parent: null,
-      children: []
+      children: [],
+      treeFeatures: null
     };
     this.initializeHostAttachments();
   }
@@ -5247,6 +5247,7 @@ class UniversalRootImpl {
       if (current === void 0) events.set(entry.index, current = /* @__PURE__ */ new Map());
       current.set(entry.event.type, entry.event);
     }
+    invalidateLogicalTreeFeatures(record);
     const records = [record];
     for (let index = 1; index < state.shape.length; index++) {
       const node = materializeCommittedCollapsedNode(state, index);
@@ -5266,7 +5267,8 @@ class UniversalRootImpl {
         visibility: "visible",
         portalRegistration: null,
         parent: records[state.shape[index].parent],
-        children: []
+        children: [],
+        treeFeatures: null
       };
       records.push(child);
       child.parent.children.push(child);
@@ -6132,6 +6134,7 @@ class UniversalRootImpl {
       owners: [owner],
       draftLookup: null,
       treeFeatures: 0,
+      hasCompactLists: false,
       replayEntries: [],
       retryThenables: /* @__PURE__ */ new Set(),
       nextUniversalId: this.nextUniversalId,
@@ -6191,7 +6194,7 @@ class UniversalRootImpl {
       owner: target,
       children: nodes
     };
-    this.expandCompactLeafLists(blueprint);
+    if (attempt.hasCompactLists) this.expandCompactLeafLists(blueprint);
     let scopePlacement = null;
     if (range !== this.rootRecord && !stableLogicalChildren(range.children, blueprint.children)) {
       scopePlacement = this.scopePhysicalPlacement(range);
@@ -6364,6 +6367,7 @@ class UniversalRootImpl {
       owners: [owner],
       draftLookup: null,
       treeFeatures: 0,
+      hasCompactLists: false,
       replayEntries,
       retryThenables: /* @__PURE__ */ new Set(),
       nextUniversalId: this.nextUniversalId,
@@ -6963,7 +6967,7 @@ class UniversalRootImpl {
   }
   createTransaction(blueprint, attempt, component, props) {
     const hasHostBindings = (this.boundHosts?.size ?? 0) !== 0 || (attempt.treeFeatures & UNIVERSAL_TREE_HOST_BINDING) !== 0;
-    if (!hasHostBindings) {
+    if (attempt.hasCompactLists && !hasHostBindings) {
       const compactTemplateUpdate = this.tryCreateCompactTemplateUpdateTransaction(
         blueprint,
         attempt,
@@ -6979,7 +6983,7 @@ class UniversalRootImpl {
       );
       if (compactLeafUpdate !== null) return compactLeafUpdate;
     }
-    this.expandCompactLeafLists(blueprint);
+    if (attempt.hasCompactLists) this.expandCompactLeafLists(blueprint);
     if (!hasHostBindings) {
       const stableLeafUpdate = this.tryCreateStableLeafUpdateTransaction(
         blueprint,
@@ -7090,7 +7094,7 @@ class UniversalRootImpl {
         let keys;
         for (let index = 0; index < blueprints.length; index++) {
           let child = blueprints[index];
-          if (child.key !== null) {
+          if (child.key !== null && blueprints.length > 1) {
             keys ??= /* @__PURE__ */ new Set();
             if (keys.has(child.key)) {
               throw new Error(`Duplicate universal child key ${String(child.key)}.`);
@@ -7144,16 +7148,19 @@ class UniversalRootImpl {
       const keyed = /* @__PURE__ */ new Map();
       for (const old of oldChildren) if (old.key !== null) keyed.set(old.key, old);
       const claimed = /* @__PURE__ */ new Set();
-      const nextKeys = /* @__PURE__ */ new Set();
+      let nextKeys;
       const output = [];
       for (let childIndex = 0; childIndex < blueprints.length; childIndex++) {
         let child = blueprints[childIndex];
         let record;
         if (child.key !== null) {
-          if (nextKeys.has(child.key)) {
-            throw new Error(`Duplicate universal child key ${String(child.key)}.`);
+          if (blueprints.length > 1) {
+            nextKeys ??= /* @__PURE__ */ new Set();
+            if (nextKeys.has(child.key)) {
+              throw new Error(`Duplicate universal child key ${String(child.key)}.`);
+            }
+            nextKeys.add(child.key);
           }
-          nextKeys.add(child.key);
           const candidate = keyed.get(child.key);
           if (candidate !== void 0 && !claimed.has(candidate) && sameRecordShape(candidate, child)) {
             record = candidate;
@@ -8210,6 +8217,7 @@ class UniversalRootImpl {
       const applyHost = (draft) => {
         const record = draft.record;
         const host = draft.blueprint;
+        invalidateLogicalTreeFeatures(record);
         record.type = host.type;
         record.props = host.props;
         record.ref = host.ref;
@@ -8234,6 +8242,7 @@ class UniversalRootImpl {
           record.parent = parent;
           return;
         }
+        invalidateLogicalTreeFeatures(record);
         record.parent = parent;
         record.key = draft.blueprint.key;
         if (record.kind === "host") {
@@ -8488,6 +8497,7 @@ class UniversalRootImpl {
         this.nextListener = nextListener;
         this.treeFeatures = scoped ? this.treeFeatures | attempt.treeFeatures : attempt.treeFeatures;
         for (const context of changedContexts) context.$$version++;
+        if (changedContexts.size !== 0) bumpContextEpoch();
         const retainedRegionCells = /* @__PURE__ */ new Set();
         for (const { next, previous } of stagedRegionBridges) {
           retainedRegionCells.add(next.activate(previous));
@@ -8903,6 +8913,7 @@ class UniversalRootImpl {
           }
         }
         this.rootRecord.children = [];
+        this.rootRecord.treeFeatures = null;
         this.rootRecord.owner = null;
         let portalReleaseError = NO_PENDING_PASSIVE_ERROR;
         for (const registration of portalRegistrations) {
@@ -9056,6 +9067,7 @@ class UniversalBoundHostTransaction {
       }
       try {
         for (let index = 0; index < this.changedRecords.length; index++) {
+          invalidateLogicalTreeFeatures(this.changedRecords[index]);
           this.changedRecords[index].props = this.batch.commands[index].props;
         }
       } catch (error) {