@solidjs/web 2.0.0-rc.5 → 2.0.0-rc.6

package/dist/web.js

@@ -48,6 +48,7 @@ const Namespaces = {
 const VoidElements = /*#__PURE__*/new Set(["area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta", "param", "source", "track", "wbr"]);
 const RawTextElements = /*#__PURE__*/new Set(["style", "script", "noscript", "template", "textarea", "title"]);
 const DOMElements = /*#__PURE__*/new Set(/*#__PURE__*/"a,abbr,acronym,address,applet,area,article,aside,audio,b,base,basefont,bdi,bdo,bgsound,big,blink,blockquote,body,br,button,canvas,caption,center,cite,code,col,colgroup,content,data,datalist,dd,del,details,dfn,dialog,dir,div,dl,dt,em,embed,fieldset,figcaption,figure,font,footer,form,frame,frameset,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,image,img,input,ins,isindex,kbd,keygen,label,legend,li,link,listing,main,map,mark,marquee,math,menu,menuitem,meta,meter,multicol,nav,nextid,nobr,noembed,noframes,noindex,noscript,object,ol,optgroup,option,output,p,param,picture,plaintext,portal,pre,progress,q,rb,rp,rt,rtc,ruby,s,samp,script,search,section,select,shadow,slot,small,source,spacer,span,strike,strong,style,sub,summary,sup,svg,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,tt,u,ul,var,video,wbr,webview,xmp".split(","));
+const COMPOSED_BODY_FRAMING = /*#__PURE__*/new Set(["content-length", "content-encoding", "transfer-encoding"]);
 
 const transparentOptions = {
   transparent: true,
@@ -339,6 +340,8 @@ function installListDriver(driver) {
   listDriver = driver;
 }
 const $$EVENT_OWNER = "_$SOLID_EVENT_OWNER";
+const $$EVENT_TUPLE = Symbol();
+const hasOwn = Object.prototype.hasOwnProperty;
 const INNER_OWNED = {};
 const delegatedEvents = new Set();
 const delegatedContainers = new Map();
@@ -456,7 +459,8 @@ function findOwner(target, state) {
 }
 function setProperty(node, name, value) {
   if (isHydrating(node)) return;
-  node[name] = value;
+  const nodeName = node.nodeName;
+  if (name === "value" && nodeName === "SELECT") queueMicrotask(() => node.value = value) || (node.value = value);else if ((name === "value" || name === "defaultValue") && (nodeName === "INPUT" || nodeName === "TEXTAREA")) node[name] = value ?? "";else node[name] = value;
 }
 let claimHandlers = null;
 const CLAIM_SEAM = Symbol.for("solid.element-claims");
@@ -490,7 +494,17 @@ function claimElement(node) {
 }
 function setAttribute(node, name, value) {
   if (isHydrating(node)) return;
-  if (value == null || value === false) node.removeAttribute(name);else node.setAttribute(name, value === true ? "" : value);
+  const selectMultiple = name === "multiple" && node.localName === "select";
+  if (value == null || value === false) node.removeAttribute(name);else {
+    node.setAttribute(name, value === true ? "" : value);
+    if (selectMultiple && !node._$multiple) {
+      const options = node.options;
+      for (let i = 0; i < options.length; i++) {
+        if (options[i].defaultSelected) options[i].selected = true;
+      }
+    }
+  }
+  if (selectMultiple) node._$multiple = true;
   if (claimHandlers !== null && (name === "href" || name === "action")) claimElement(node);
 }
 function setAttributeNS(node, namespace, name, value) {
@@ -498,22 +512,32 @@ function setAttributeNS(node, namespace, name, value) {
   if (value == null || value === false) node.removeAttributeNS(namespace, name.indexOf(":") > -1 ? name.split(":").pop() : name);else node.setAttributeNS(namespace, name, value === true ? "" : value);
 }
 function className(node, value, prev) {
-  if (isHydrating(node)) return;
+  if (typeof value === "number") value = "" + value;
+  if (typeof prev === "number") prev = "" + prev;
+  if (isHydrating(node)) {
+    node._$classes = value && typeof value === "object" ? classListToObject(value) : undefined;
+    return;
+  }
   if (value == null || value === false) {
-    prev && node.removeAttribute("class");
+    if (prev || node._$classes) {
+      node.removeAttribute("class");
+      node._$classes = undefined;
+    }
     return;
   }
   if (typeof value === "string") {
+    node._$classes = undefined;
     value !== prev && node.setAttribute("class", value);
     return;
   }
+  let applied;
   if (typeof prev === "string") {
-    prev = {};
+    applied = {};
     node.removeAttribute("class");
-  } else prev = classListToObject(prev || {});
+  } else applied = node._$classes || classListToObject(prev || {});
   value = classListToObject(value);
-  const classKeys = Object.keys(value || {});
-  const prevKeys = Object.keys(prev);
+  const classKeys = Object.keys(value);
+  const prevKeys = Object.keys(applied);
   let i, len;
   for (i = 0, len = prevKeys.length; i < len; i++) {
     const key = prevKeys[i];
@@ -523,22 +547,34 @@ function className(node, value, prev) {
   for (i = 0, len = classKeys.length; i < len; i++) {
     const key = classKeys[i],
       classValue = !!value[key];
-    if (!key || key === "undefined" || prev[key] === classValue || !classValue) continue;
+    if (!key || key === "undefined" || applied[key] === classValue || !classValue) continue;
     node.classList.add(key);
   }
+  node._$classes = value;
 }
 function addEvent(node, name, handler, delegate) {
   if (delegate) {
+    const key = `$$${name}`;
+    let data;
     if (Array.isArray(handler)) {
-      node[`$$${name}`] = handler[0];
-      node[`$$${name}Data`] = handler[1];
-    } else node[`$$${name}`] = handler;
-  } else if (Array.isArray(handler)) {
+      data = handler[1];
+      node[key] = handler[0];
+    } else node[key] = handler;
+    node[`${key}Data`] = data;
+    return;
+  }
+  if (Array.isArray(handler)) {
     const handlerFn = handler[0];
-    node.addEventListener(name, handler[0] = e => handlerFn.call(node, handler[1], e));
-  } else node.addEventListener(name, handler, typeof handler !== "function" && handler);
+    const listener = e => handlerFn.call(node, handler[1], e);
+    listener[$$EVENT_TUPLE] = handler;
+    node.addEventListener(name, listener);
+    return listener;
+  }
+  node.addEventListener(name, handler, typeof handler !== "function" && handler);
+  return handler;
 }
 function style(node, value, prev) {
+  if (isHydrating(node)) return;
   if (!value) {
     if (prev || node._$styles) {
       setAttribute(node, "style");
@@ -563,12 +599,13 @@ function style(node, value, prev) {
   }
   let v, s;
   for (s in applied) {
-    if (value[s] == null) {
+    if (!hasOwn.call(value, s) || value[s] == null) {
       nodeStyle.removeProperty(s);
       delete applied[s];
     }
   }
   for (s in value) {
+    if (!hasOwn.call(value, s)) continue;
     v = value[s];
     if (v != null && v !== applied[s]) {
       nodeStyle.setProperty(s, v);
@@ -577,20 +614,26 @@ function style(node, value, prev) {
   }
 }
 function setStyleProperty(node, name, value) {
+  if (isHydrating(node)) return;
   value != null ? node.style.setProperty(name, value) : node.style.removeProperty(name);
 }
 function spread(node, props = {}, skipChildren) {
   const prevProps = {};
   const get = typeof props === "function" ? props : () => props;
-  if (!skipChildren) insert(node, () => get().children);
+  if (!skipChildren) insert(node, () => {
+    const source = get();
+    return hasOwn.call(source, "children") ? source.children : undefined;
+  });
   effect(() => {
-    const r = get().ref;
+    const source = get();
+    const r = hasOwn.call(source, "ref") && source.ref;
     (typeof r === "function" || Array.isArray(r)) && ref(() => r, node);
   }, () => {});
   effect(() => {
     const source = get();
     const newProps = {};
     for (const prop in source) {
+      if (!hasOwn.call(source, prop)) continue;
       if (prop === "children" || prop === "ref") continue;
       newProps[prop] = source[prop];
     }
@@ -622,6 +665,19 @@ function scope(fn) {
 const SCOPE_OPTIONS = {
   scope: true
 };
+let insertionParent = null;
+function getInsertionParent() {
+  return insertionParent;
+}
+function withInsertionParent(parent, fn) {
+  const prev = insertionParent;
+  insertionParent = parent;
+  try {
+    return fn();
+  } finally {
+    insertionParent = prev;
+  }
+}
 let hydrationRt = null;
 function installHydrationRuntime() {
   hydrationRt = {
@@ -689,7 +745,7 @@ function insert(parent, accessor, marker, initial, options) {
     if (listDriver(parent, accessor, marker, () => runWithOwner(owner, () => insert(parent, () => listAccessor(), marker, marker !== undefined ? [] : undefined, options)))) return;
   }
   if (typeof accessor !== "function") {
-    accessor = normalize(accessor, initial, multi, true);
+    accessor = withInsertionParent(parent, () => normalize(accessor, initial, multi, true));
     if (typeof accessor !== "function") {
       insertExpression(parent, accessor, initial, marker);
       host && tagHost(accessor, host);
@@ -704,9 +760,9 @@ function insert(parent, accessor, marker, initial, options) {
   let current = initial;
   effect(prev => {
     if (hydrationRt !== null) current = hydrationRt.reclaimRegion(current, parent, marker);
-    const value = normalize(accessor(), current, multi, true);
+    const value = withInsertionParent(parent, () => normalize(accessor(), current, multi, true));
     if (typeof value !== "function") return value;
-    effect(() => (hydrationRt !== null && (current = hydrationRt.reclaimRegion(current, parent, marker)), normalize(value, current, multi)), inner => {
+    effect(() => (hydrationRt !== null && (current = hydrationRt.reclaimRegion(current, parent, marker)), withInsertionParent(parent, () => normalize(value, current, multi))), inner => {
       current = insertExpression(parent, inner, current, marker);
       host && tagHost(current, host);
     }, prev !== undefined && !(options && options.schedule) ? {
@@ -1366,7 +1422,8 @@ function classListToObject(classList) {
 function flattenClassList(list, result) {
   for (let i = 0, len = list.length; i < len; i++) {
     const item = list[i];
-    if (Array.isArray(item)) flattenClassList(item, result);else if (typeof item === "object" && item != null) Object.assign(result, item);else if (item || item === 0) result[item] = true;
+    if (Array.isArray(item)) flattenClassList(item, result);else if (typeof item === "object" && item != null) Object.assign(result, item);
+    else if (typeof item !== "boolean" && (item || item === 0)) result[item] = true;
   }
 }
 function assignProp(node, prop, value, prev, skipRef, nodeName) {
@@ -1382,12 +1439,13 @@ function assignProp(node, prop, value, prev, skipRef, nodeName) {
     const name = prop.slice(2).toLowerCase();
     const delegate = DelegatedEvents.has(name);
     if (!delegate && prev) {
-      const h = Array.isArray(prev) ? prev[0] : prev;
-      node.removeEventListener(name, h);
+      if (Array.isArray(value) && typeof prev === "function" && prev[$$EVENT_TUPLE] === value) return prev;
+      node.removeEventListener(name, prev, typeof prev !== "function" && prev);
     }
     if (delegate || value) {
-      addEvent(node, name, value, delegate);
+      const attached = addEvent(node, name, value, delegate);
       delegate && delegateEvents([name]);
+      if (!delegate) return attached;
     }
   } else if (hasNamespace && prop.slice(0, 5) === "prop:" || ChildProperties.has(prop) || DOMWithState[nodeName]?.[prop]) {
     if (hasNamespace) prop = prop.slice(5);else if (isHydrating(node)) return value;
@@ -1427,7 +1485,7 @@ function eventHandler(e, container, state) {
     }
     if (handler && !node.disabled) {
       const data = node[`${key}Data`];
-      data !== undefined ? handler.call(node, data, e) : handler.call(node, e);
+      data !== undefined ? handler.call(node, data, e) : typeof handler === "function" ? handler.call(node, e) : handler.handleEvent(e);
       if (e.cancelBubble) return;
     }
     node.host && typeof node.host !== "string" && !node.host._$host && node.contains(e.target) && retarget(node.host);
@@ -1547,7 +1605,7 @@ function normalize(value, current, multi, doNotUnwrap) {
       const item = value[i],
         prev = current && current[i],
         t = typeof item;
-      if ((t === "string" || t === "number") && prev && prev.nodeType === 3) value[i] = prev;
+      if ((t === "string" || t === "number") && prev && prev.nodeType === 3 && isHydrating(prev)) value[i] = prev;
     }
   }
   return value;
@@ -2091,6 +2149,7 @@ function respond(value, init = {}) {
     responseInit,
     headers
   } = initWithRevalidate(init);
+  for (const header of COMPOSED_BODY_FRAMING) headers.delete(header);
   if (NULL_BODY_STATUSES.has(responseInit.status)) {
     return new ResponseEnvelope(new Response(null, {
       ...responseInit,
@@ -2203,9 +2262,24 @@ function dynamic(source) {
             return untrack(() => component(props));
           }
         case "string":
-          const el = sharedConfig.hydrating ? getNextElement() : createElement(component, untrack(() => props.is));
-          spread(el, props);
-          return el;
+          {
+            if (sharedConfig.hydrating) {
+              const el = getNextElement();
+              spread(el, props);
+              return el;
+            }
+            const owner = getOwner();
+            let el;
+            return () => {
+              if (!el) {
+                runWithOwner(owner, () => {
+                  el = createElement(component, untrack(() => props.is));
+                  spread(el, props);
+                });
+              }
+              return el;
+            };
+          }
       }
     });
   };
@@ -2214,8 +2288,15 @@ function Dynamic(props) {
   const Comp = dynamic(() => props.component);
   return createComponent(Comp, omit(props, "component"));
 }
+const AmbiguousSVGElements = /*#__PURE__*/new Set(["a", "script", "style", "title"]);
 function createElement(tagName, is = undefined) {
-  return SVGElements.has(tagName) ? document.createElementNS(Namespaces.svg, tagName) : MathMLElements.has(tagName) ? document.createElementNS(Namespaces.mathml, tagName) : document.createElement(tagName, {
+  if (SVGElements.has(tagName)) return document.createElementNS(Namespaces.svg, tagName);
+  if (MathMLElements.has(tagName)) return document.createElementNS(Namespaces.mathml, tagName);
+  if (AmbiguousSVGElements.has(tagName)) {
+    const parent = getInsertionParent();
+    if (parent && parent.namespaceURI === Namespaces.svg && parent.localName !== "foreignObject") return document.createElementNS(Namespaces.svg, tagName);
+  }
+  return document.createElement(tagName, {
     is
   });
 }
@@ -2247,4 +2328,4 @@ _moduleUrl) {
 function httpStatus(_code, _text) {}
 function httpHeader(_name, _value, _options) {}
 
-export { ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, HydrationScript, MathMLElements, NULL_BODY_STATUSES, Namespaces, Portal, RESPONSE_HEADER_VALUE_LIMIT, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, acquireAsset, addEvent, applyRef, assign, claimElement, claimElementTree, className, clearFlashCookie, clientOnly, commitEventResponse, composeMiddleware, createRequestEvent, createResponseStub, createSSRResponse, delegateEvents, driveList, dynamic, dynamicProperty, effect, escape, generateHydrationScript, getDelegatedRoot, getExpectedRedirectStatus, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, getRequestEvent, getServerFunctionMetadata, getServerFunctionRPC, hasFlashCookie, httpHeader, httpStatus, hydrate, insert, installHydrationRuntime, installListDriver, isDev, isHref, isResponseEnvelope, isSafeError, isServer, isServerFunction, listDriver, markSafeError, memo, parseCookieHeader, patchDriver, redirect, ref, registerDelegatedContainer, registerDelegatedRoot, registerElementClaim, reload, render, renderToStream, renderToString, resolveSSRNode, respond, rowProof, runHydrationEvents, scope, serializeCookie, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrStyle, ssrStyleProperty, style, template, unregisterDelegatedContainer, unregisterDelegatedRoot, useHead, waitAsset, warmAsset };
+export { ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, HydrationScript, MathMLElements, NULL_BODY_STATUSES, Namespaces, Portal, RESPONSE_HEADER_VALUE_LIMIT, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, acquireAsset, addEvent, applyRef, assign, claimElement, claimElementTree, className, clearFlashCookie, clientOnly, commitEventResponse, composeMiddleware, createRequestEvent, createResponseStub, createSSRResponse, delegateEvents, driveList, dynamic, dynamicProperty, effect, escape, generateHydrationScript, getDelegatedRoot, getExpectedRedirectStatus, getFirstChild, getHydrationKey, getInsertionParent, getNextElement, getNextMarker, getNextMatch, getNextSibling, getRequestEvent, getServerFunctionMetadata, getServerFunctionRPC, hasFlashCookie, httpHeader, httpStatus, hydrate, insert, installHydrationRuntime, installListDriver, isDev, isHref, isResponseEnvelope, isSafeError, isServer, isServerFunction, listDriver, markSafeError, memo, parseCookieHeader, patchDriver, redirect, ref, registerDelegatedContainer, registerDelegatedRoot, registerElementClaim, reload, render, renderToStream, renderToString, resolveSSRNode, respond, rowProof, runHydrationEvents, scope, serializeCookie, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrStyle, ssrStyleProperty, style, template, unregisterDelegatedContainer, unregisterDelegatedRoot, useHead, waitAsset, warmAsset };

package/frames/dist/server.cjs

@@ -101,6 +101,8 @@ const ContainerTracePlugin = {
   }
 };
 
+const COMPOSED_BODY_FRAMING = /*#__PURE__*/new Set(["content-length", "content-encoding", "transfer-encoding"]);
+
 setContainerTraceStreamMint(iterable => {
   const stream = seroval.createStream();
   (async () => {
@@ -2791,8 +2793,55 @@ function resolveSSRSync(node) {
   if (!res.h.length) return res.t[0];
   throw new Error("This value cannot be rendered synchronously. Are you missing a boundary?");
 }
-/*#__PURE__*/new Set([ERROR_HEADER, BODY_FORMAT_HEADER, SINGLE_FLIGHT_HEADER, REVALIDATE_HEADER, REDIRECT_HEADER, "Location"].map(header => header.toLowerCase()));
+/*#__PURE__*/new Set([ERROR_HEADER, BODY_FORMAT_HEADER, SINGLE_FLIGHT_HEADER, REVALIDATE_HEADER, REDIRECT_HEADER, "Location",
+...COMPOSED_BODY_FRAMING].map(header => header.toLowerCase()));
 
+function scopeDeferredResult(value, scope) {
+  if (value === null || typeof value !== "object" && typeof value !== "function") return value;
+  const promised = scope(() => nativePromise(value));
+  if (promised) {
+    return promised.then(result => scope(() => scopeDeferredResult(result, scope)));
+  }
+  if (typeof ReadableStream !== "undefined" && value instanceof ReadableStream) {
+    let reader;
+    return new ReadableStream({
+      async pull(controller) {
+        try {
+          const step = await scope(() => {
+            if (!reader) reader = value.getReader();
+            return reader.read();
+          });
+          if (step.done) controller.close();else controller.enqueue(step.value);
+        } catch (error) {
+          controller.error(error);
+        }
+      },
+      cancel(reason) {
+        return scope(() => reader ? reader.cancel(reason) : value.cancel(reason));
+      }
+    }, {
+      highWaterMark: 0
+    });
+  }
+  const scopedIterator = symbol => ({
+    [symbol]() {
+      const iterator = scope(() => value[symbol]());
+      return new Proxy(iterator, {
+        get(target, property) {
+          const member = Reflect.get(target, property, target);
+          return typeof member === "function" && (property === "next" || property === "return" || property === "throw") ? (...args) => scope(() => member.apply(target, args)) : member;
+        }
+      });
+    }
+  });
+  if (typeof value[Symbol.asyncIterator] === "function") {
+    return scopedIterator(Symbol.asyncIterator);
+  }
+  if (typeof value[Symbol.iterator] === "function" && !Array.isArray(value) && !(value instanceof Map) && !(value instanceof Set) && !ArrayBuffer.isView(value)) {
+    return scopedIterator(Symbol.iterator);
+  }
+  return value;
+}
 const INVOCATIONS = new WeakMap();
 function getEventServerFunctionInvocation(event) {
   return event && INVOCATIONS.get(event);
@@ -2857,14 +2906,11 @@ function guardFailures(value, state) {
         top.next.add(guarded);
         if (guarded !== original) top.changed = true;
       } else if (guarded !== original || top.accessorRead === i) {
-        Object.defineProperty(top.next, items[i], top.accessorRead === i ? {
-          enumerable: true,
-          configurable: true,
+        Object.defineProperty(top.next, items[i], {
+          value: guarded,
           writable: true,
-          value: guarded
-        } : {
-          ...top.descriptors[items[i]],
-          value: guarded
+          configurable: true,
+          enumerable: top.descriptors[items[i]].enumerable
         });
         top.changed = true;
       }
@@ -2899,6 +2945,9 @@ class Frame {
     this.pendingKey = undefined;
   }
 }
+function guardOperation(state, run) {
+  return state.scope ? state.scope(run) : run();
+}
 function enterGuard(value, state) {
   if (value === null || typeof value !== "object") return value;
   if (state.seen.has(value)) {
@@ -2913,7 +2962,7 @@ function enterGuard(value, state) {
       if (finished) return;
       finished = true;
       try {
-        const cancelled = reader ? reader.cancel() : value.cancel();
+        const cancelled = guardOperation(state, () => reader ? reader.cancel() : value.cancel());
         if (cancelled && typeof cancelled.then === "function") cancelled.then(undefined, () => {});
       } catch {}
     };
@@ -2925,19 +2974,19 @@ function enterGuard(value, state) {
             controller.close();
             return;
           }
-          if (!reader) reader = value.getReader();
+          if (!reader) reader = guardOperation(state, () => value.getReader());
           const {
             done,
             value: chunk
-          } = await reader.read();
-          done ? controller.close() : controller.enqueue(guardFailures(chunk, state));
+          } = await guardOperation(state, () => reader.read());
+          done ? controller.close() : controller.enqueue(guardOperation(state, () => guardFailures(chunk, state)));
         } catch (error) {
-          controller.error(sanitizeServerError(error));
+          controller.error(guardOperation(state, () => sanitizeServerError(error)));
         }
       },
       cancel(reason) {
         finished = true;
-        return reader ? reader.cancel(reason) : value.cancel(reason);
+        return guardOperation(state, () => reader ? reader.cancel(reason) : value.cancel(reason));
       }
     });
     if (gate) gate.onOpen(close);
@@ -2945,9 +2994,10 @@ function enterGuard(value, state) {
     return guardedStream;
   }
   if (typeof value.then === "function") {
-    const guardedPromise = Promise.resolve(value).then(resolved => guardFailures(resolved, state), error => {
-      throw sanitizeServerError(error);
+    const guardedPromise = Promise.resolve(value).then(resolved => guardOperation(state, () => guardFailures(resolved, state)), error => {
+      throw guardOperation(state, () => sanitizeServerError(error));
     });
+    guardedPromise.catch(() => {});
     state.seen.set(value, guardedPromise);
     return guardedPromise;
   }
@@ -2956,13 +3006,13 @@ function enterGuard(value, state) {
     const gate = state.gate;
     const guardedIterable = {
       [Symbol.asyncIterator]() {
-        const iterator = source[Symbol.asyncIterator]();
+        const iterator = guardOperation(state, () => source[Symbol.asyncIterator]());
         let finished = false;
         const close = () => {
           if (finished) return;
           finished = true;
           try {
-            const returned = iterator.return && iterator.return();
+            const returned = iterator.return && guardOperation(state, () => iterator.return());
             if (returned && typeof returned.then === "function") returned.then(undefined, () => {});
           } catch {}
         };
@@ -2970,17 +3020,17 @@ function enterGuard(value, state) {
         const step = () => finished ? Promise.resolve({
           done: true,
           value: undefined
-        }) : iterator.next().then(step => {
+        }) : guardOperation(state, () => iterator.next()).then(step => {
           if (step.done) {
             finished = true;
             return step;
           }
           return {
             done: false,
-            value: guardFailures(step.value, state)
+            value: guardOperation(state, () => guardFailures(step.value, state))
           };
         }, error => {
-          throw sanitizeServerError(error);
+          throw guardOperation(state, () => sanitizeServerError(error));
         });
         return {
           next: () => finished || !gate || gate.wantsMore() ? step() : gate.awaitDemand().then(step),
@@ -2997,6 +3047,11 @@ function enterGuard(value, state) {
     state.seen.set(value, guardedIterable);
     return guardedIterable;
   }
+  if (state.scope && typeof value[Symbol.iterator] === "function" && !Array.isArray(value) && !(value instanceof Map) && !(value instanceof Set) && !ArrayBuffer.isView(value)) {
+    const scopedIterable = scopeDeferredResult(value, state.scope);
+    state.seen.set(value, scopedIterable);
+    return scopedIterable;
+  }
   if (Array.isArray(value)) {
     const next = value.slice();
     state.seen.set(value, next);
@@ -3020,9 +3075,13 @@ function enterGuard(value, state) {
     return value;
   }
   const descriptors = Object.getOwnPropertyDescriptors(value);
+  for (const key of Object.keys(descriptors)) {
+    descriptors[key].configurable = true;
+    if ("value" in descriptors[key]) descriptors[key].writable = true;
+  }
   const next = Object.create(prototype, descriptors);
   state.seen.set(value, next);
-  return new Frame(OBJECT, value, next, Object.keys(descriptors), descriptors);
+  return new Frame(OBJECT, value, next, Object.keys(value), descriptors);
 }
 function keepGuarded(value, next, changed, state) {
   if (changed || state.cyclic.has(value)) return next;
@@ -3034,6 +3093,12 @@ function sanitizeServerError(value) {
   if (isSafeError(value)) return value;
   return new Error(GENERIC_SERVER_ERROR_MESSAGE);
 }
+function nativePromise(value) {
+  if (value instanceof Promise) return value;
+  try {
+    if (Object.prototype.toString.call(value) === "[object Promise]") return Promise.prototype.then.call(value, value => value);
+  } catch {}
+}
 
 const FRAME_STREAM_HEADER = "X-Frame-Stream";
 function isFrameStreamResponse(response) {