@tanstack/redact 0.0.14 → 0.0.16

package/dist/dom/reconcile.js

@@ -20,7 +20,8 @@ import {
   setHydrationCursor,
   getHydrationCursor,
   clearHydrationCursor,
-  findHostParent as findHydrationHost
+  findHostParent as findHydrationHost,
+  abortHydration
 } from "./features/hydration";
 var currentRoot = null;
 var flushing = false;
@@ -28,15 +29,15 @@ var isBatching = false;
 var pendingRoots = /* @__PURE__ */ new Set();
 var forceRerenderingFiber = null;
 function scheduleUpdate(fiber) {
-  if (fiber.unmounted) return;
+  if (fiber.um) return;
   const root = findRoot(fiber);
   if (!root) return;
-  root.pending.add(fiber);
-  fiber.dirty = true;
+  root.p.add(fiber);
+  fiber.dy = true;
   pendingRoots.add(root);
   if (isBatching) return;
-  if (!root.scheduled) {
-    root.scheduled = true;
+  if (!root.s) {
+    root.s = true;
     queueMicrotask(flushPending);
   }
 }
@@ -67,14 +68,17 @@ function flushPending() {
     let guard = 0;
     while (pendingRoots.size > 0) {
       if (++guard > 50) {
-        throw new Error("flushPending exceeded 50 iterations \u2014 suspected infinite update loop.");
+        if (true) {
+          throw new Error("flushPending exceeded 50 iterations \u2014 suspected infinite update loop.");
+        }
+        throw new Error();
       }
       const roots = [...pendingRoots];
       pendingRoots.clear();
       for (const root of roots) {
-        root.scheduled = false;
-        const pending = [...root.pending];
-        root.pending.clear();
+        root.s = false;
+        const pending = [...root.p];
+        root.p.clear();
         pending.sort((a, b) => fiberDepth(a) - fiberDepth(b));
         for (const fiber of pending) {
           rerenderFiber(fiber, root);
@@ -86,6 +90,11 @@ function flushPending() {
     flushing = false;
   }
 }
+function discardPendingWork(root) {
+  root.p.clear();
+  root.s = false;
+  pendingRoots.delete(root);
+}
 function fiberDepth(fiber) {
   let d = 0;
   let p = fiber.parent;
@@ -104,28 +113,28 @@ function findRoot(fiber) {
   return null;
 }
 function renderRoot(root, children) {
-  const rootFiber = root.current;
-  rootFiber.pendingProps = { children };
+  const rootFiber = root.r;
+  rootFiber.pp = { children };
   currentRoot = root;
   try {
-    reconcileChildren(rootFiber, childrenToArray(children), root.container, null);
-    rootFiber.memoizedProps = rootFiber.pendingProps;
-    rootFiber.dirty = false;
+    reconcileChildren(rootFiber, childrenToArray(children), root.c, null);
+    rootFiber.mp = rootFiber.pp;
+    rootFiber.dy = false;
   } finally {
     currentRoot = null;
   }
   runEffects(root);
 }
 function rerenderFiber(fiber, root) {
-  if (!fiber.dirty) return;
-  if (fiber.unmounted) return;
-  fiber.dirty = false;
+  if (!fiber.dy) return;
+  if (fiber.um) return;
+  fiber.dy = false;
   currentRoot = root;
-  const resumeHydration = fiber.memoizedState && fiber.memoizedState._pendingHydration === true;
-  const prevHydrating = root.hydrating;
+  const resumeHydration = fiber.ms && fiber.ms.p === true;
+  const prevHydrating = root.h;
   if (resumeHydration) {
-    delete fiber.memoizedState._pendingHydration;
-    root.hydrating = true;
+    delete fiber.ms.p;
+    root.h = true;
   }
   const prevForcing = forceRerenderingFiber;
   forceRerenderingFiber = fiber;
@@ -134,7 +143,7 @@ function rerenderFiber(fiber, root) {
   } finally {
     forceRerenderingFiber = prevForcing;
     if (resumeHydration) {
-      root.hydrating = prevHydrating;
+      root.h = prevHydrating;
       clearHydrationCursor(fiber);
     }
     currentRoot = null;
@@ -182,7 +191,7 @@ function pushChildren(node, out) {
   }
 }
 function isIterable(obj) {
-  return obj != null && typeof obj !== "string" && typeof obj[Symbol.iterator] === "function";
+  return obj != null && typeof obj[Symbol.iterator] == "function";
 }
 function sameType(fiber, child) {
   if (!child) return false;
@@ -196,7 +205,7 @@ function fiberFromChild(child, parent) {
   if (!child) return createFiber(FiberTag.Fragment, null, null);
   if (isTextChild(child)) {
     const f2 = createFiber(FiberTag.Text, null, null);
-    f2.pendingProps = child;
+    f2.pp = child;
     f2.parent = parent;
     return f2;
   }
@@ -213,18 +222,18 @@ function fiberFromChild(child, parent) {
       if (matched !== null) break;
     }
     if (matched !== null) tag = matched;
-    else if (typeof type === "function") {
+    else if (typeof type == "function") {
       tag = type.prototype && type.prototype.isReactComponent ? FiberTag.Class : FiberTag.Function;
     }
   }
   const f = createFiber(tag, type, child.key ?? null);
   f.ref = child.ref ?? null;
-  f.pendingProps = child.props;
+  f.pp = child.props;
   f.parent = parent;
   return f;
 }
 function reconcileChildren(parent, newChildren, domParent, anchor) {
-  if (!currentRoot?.hydrating) {
+  if (!currentRoot?.h) {
     let f = parent.child;
     let ok = true;
     for (let i = 0; i < newChildren.length; i++) {
@@ -238,7 +247,7 @@ function reconcileChildren(parent, newChildren, domParent, anchor) {
           ok = false;
           break;
         }
-        f.pendingProps = child;
+        f.pp = child;
       } else {
         if (child.key != null) {
           ok = false;
@@ -248,7 +257,7 @@ function reconcileChildren(parent, newChildren, domParent, anchor) {
           ok = false;
           break;
         }
-        f.pendingProps = child.props;
+        f.pp = child.props;
         f.ref = child.ref ?? null;
       }
       f = f.sibling;
@@ -319,10 +328,10 @@ function reconcileChildren(parent, newChildren, domParent, anchor) {
       claimed.add(match);
       fiber = match;
       if (isTextChild(child)) {
-        fiber.pendingProps = child;
+        fiber.pp = child;
       } else {
         fiber.type = child.type;
-        fiber.pendingProps = child.props;
+        fiber.pp = child.props;
         fiber.ref = child.ref ?? null;
       }
     } else {
@@ -336,7 +345,7 @@ function reconcileChildren(parent, newChildren, domParent, anchor) {
     else parent.child = fiber;
     prevNewFiber = fiber;
   }
-  const hydrating = !!currentRoot?.hydrating;
+  const hydrating = !!currentRoot?.h;
   for (let f = parent.child; f; f = f.sibling) {
     let a = anchor;
     if (!hydrating) {
@@ -367,8 +376,8 @@ function reconcileChildren(parent, newChildren, domParent, anchor) {
       }
     }
   }
-  const parentIsHead = domParent.nodeType === 1 && domParent.tagName.toLowerCase() === "head";
-  if (structurallyChanged && !currentRoot?.hydrating && !parentIsHead) {
+  const parentIsHead = domParent.nodeName === "HEAD";
+  if (structurallyChanged && !currentRoot?.h && !parentIsHead) {
     placeChildrenInOrder(parent, domParent, anchor);
   }
 }
@@ -466,10 +475,10 @@ function renderFiber(fiber, domParent, anchor) {
   if (fn) fn(fiber, domParent, anchor);
 }
 function renderText(fiber, domParent, anchor) {
-  const text = fiber.pendingProps;
-  if (fiber.dom && fiber.memoizedProps === text) return;
+  const text = fiber.pp;
+  if (fiber.dom && fiber.mp === text) return;
   if (!fiber.dom) {
-    const hydrated = currentRoot?.hydrating ? adoptTextDom(fiber, fiber.parent, text) : false;
+    const hydrated = currentRoot?.h ? adoptTextDom(fiber, fiber.parent, text) : false;
     if (!hydrated) {
       fiber.dom = document.createTextNode(text);
       insertInto(domParent, fiber.dom, anchor);
@@ -478,17 +487,17 @@ function renderText(fiber, domParent, anchor) {
     ;
     fiber.dom.data = text;
   }
-  fiber.memoizedProps = text;
+  fiber.mp = text;
 }
 function renderHost(fiber, domParent, anchor) {
-  const props = fiber.pendingProps ?? {};
-  const prev = fiber.memoizedProps ?? {};
+  const props = fiber.pp ?? {};
+  const prev = fiber.mp ?? {};
   const type = fiber.type;
   const isSvg = type === "svg" || domParent.namespaceURI === "http://www.w3.org/2000/svg";
   const isSelect = type === "select";
   const deferredSelectValue = isSelect && (props.value !== void 0 || props.defaultValue !== void 0) ? props.value !== void 0 ? props.value : props.defaultValue : void 0;
   if (!fiber.dom) {
-    const hydrated = currentRoot?.hydrating ? adoptHostDom(fiber, fiber.parent) : false;
+    const hydrated = currentRoot?.h ? adoptHostDom(fiber, fiber.parent) : false;
     if (!hydrated) {
       fiber.dom = createHostNode(type, isSvg);
       for (const k in props) {
@@ -529,21 +538,18 @@ function renderHost(fiber, domParent, anchor) {
     syncRefIfChanged(fiber, fiber.dom);
   }
   reconcileChildren(fiber, childrenToArray(props.children), fiber.dom, null);
-  if (currentRoot?.hydrating) {
+  if (currentRoot?.h) {
     const parentTag = fiber.type.toLowerCase();
-    if (parentTag !== "head" && parentTag !== "html") {
+    const hasOpaqueHydrationChildren = props.dangerouslySetInnerHTML != null || parentTag === "textarea" && (props.value != null || props.defaultValue != null);
+    if (parentTag !== "head" && parentTag !== "html" && !hasOpaqueHydrationChildren) {
       const cursor = getHydrationCursor(fiber);
       if (cursor) {
-        const leftover = cursor.remaining().filter(
-          (n) => n.nodeType === 1 || n.nodeType === 3
-        );
-        if (leftover.length > 0 && currentRoot.onRecoverableError) {
-          currentRoot.onRecoverableError(
-            new Error(
-              `Hydration mismatch: server rendered ${leftover.length} extra ${leftover.length === 1 ? "node" : "nodes"} inside <${parentTag}> that the client tree did not.`
-            )
+        if (cursor.has()) {
+          const error = new Error(
+            true ? `Hydration mismatch: server rendered extra nodes inside <${parentTag}>.` : "Hydration mismatch."
           );
-          for (const n of leftover) n.parentNode?.removeChild(n);
+          if (currentRoot.re) currentRoot.re(error);
+          abortHydration(error, fiber);
         }
       }
     }
@@ -559,47 +565,24 @@ function renderHost(fiber, domParent, anchor) {
       select.value = "" + deferredSelectValue;
     }
   }
-  fiber.memoizedProps = props;
+  fiber.mp = props;
 }
 function renderFunction(fiber, domParent, anchor) {
   const prevDispatcher = ReactSharedInternals.H;
-  const prevFiber = ReactSharedInternals.currentFiber;
-  const prevHook = ReactSharedInternals.currentHook;
-  const prevIndex = ReactSharedInternals.hookIndex;
+  const prevFiber = ReactSharedInternals.F;
+  const prevHook = ReactSharedInternals.K;
+  const prevIndex = ReactSharedInternals.I;
   ReactSharedInternals.H = makeDispatcher();
-  ReactSharedInternals.currentFiber = fiber;
-  ReactSharedInternals.currentHook = null;
-  ReactSharedInternals.hookIndex = 0;
+  ReactSharedInternals.F = fiber;
+  ReactSharedInternals.K = null;
+  ReactSharedInternals.I = 0;
   let rendered;
   let deferredForHydration = false;
   try {
-    rendered = fiber.type(fiber.pendingProps ?? {});
+    rendered = fiber.type(fiber.pp ?? {});
   } catch (e) {
     if (isThenable(e)) {
-      if (currentRoot?.hydrating) {
-        const hostParent = findHydrationHost(fiber);
-        const inheritedCursor = getHydrationCursor(hostParent);
-        if (inheritedCursor) {
-          setHydrationCursor(fiber, inheritedCursor);
-        }
-        fiber.memoizedState = {
-          ...fiber.memoizedState ?? {},
-          _pendingHydration: true
-        };
-        let sus = fiber.parent;
-        while (sus && sus.tag !== FiberTag.Suspense) sus = sus.parent;
-        if (sus && sus.memoizedState) {
-          ;
-          sus.memoizedState._awaitingLazyHydration = true;
-        }
-        const clearAwait = () => {
-          if (sus && sus.memoizedState) {
-            ;
-            sus.memoizedState._awaitingLazyHydration = false;
-          }
-          scheduleUpdate(fiber);
-        };
-        e.then(clearAwait, clearAwait);
+      if (deferHydration(fiber, e)) {
         deferredForHydration = true;
       } else {
         CAPABILITIES.handleSuspended(fiber, e);
@@ -611,18 +594,40 @@ function renderFunction(fiber, domParent, anchor) {
     }
   } finally {
     ReactSharedInternals.H = prevDispatcher;
-    ReactSharedInternals.currentFiber = prevFiber;
-    ReactSharedInternals.currentHook = prevHook;
-    ReactSharedInternals.hookIndex = prevIndex;
+    ReactSharedInternals.F = prevFiber;
+    ReactSharedInternals.K = prevHook;
+    ReactSharedInternals.I = prevIndex;
   }
   if (deferredForHydration) return;
   reconcileChildren(fiber, childrenToArray(rendered), domParent, anchor);
-  fiber.memoizedProps = fiber.pendingProps;
+  fiber.mp = fiber.pp;
+}
+function deferHydration(fiber, thenable) {
+  if (!currentRoot?.h) return false;
+  const hostParent = findHydrationHost(fiber);
+  const inheritedCursor = getHydrationCursor(hostParent);
+  if (inheritedCursor) setHydrationCursor(fiber, inheritedCursor);
+  (fiber.ms ??= {}).p = true;
+  let sus = fiber.parent;
+  while (sus && sus.tag !== FiberTag.Suspense) sus = sus.parent;
+  if (sus && sus.ms) {
+    ;
+    sus.ms.a = true;
+  }
+  const clearAwait = () => {
+    if (sus && sus.ms) {
+      ;
+      sus.ms.a = false;
+    }
+    scheduleUpdate(fiber);
+  };
+  thenable.then(clearAwait, clearAwait);
+  return true;
 }
 function renderFragment(fiber, domParent, anchor) {
-  const props = fiber.pendingProps ?? {};
+  const props = fiber.pp ?? {};
   reconcileChildren(fiber, childrenToArray(props.children), domParent, anchor);
-  fiber.memoizedProps = props;
+  fiber.mp = props;
 }
 function defaultHandleSuspended(fiber, thenable) {
   thenable.then(
@@ -641,11 +646,14 @@ function handleSuspended(fiber, thenable) {
   CAPABILITIES.handleSuspended(fiber, thenable);
 }
 function handleErrorInRender(fiber, err) {
+  if (currentRoot?.h) {
+    abortHydration(err, fiber);
+  }
   let f = fiber.parent;
   while (f) {
     if (f.tag === FiberTag.Class) {
       const Ctor = f.type;
-      const instance = f.stateNode;
+      const instance = f.sn;
       if (Ctor.getDerivedStateFromError) {
         const update = Ctor.getDerivedStateFromError(err);
         instance.state = { ...instance.state, ...update };
@@ -661,14 +669,14 @@ function handleErrorInRender(fiber, err) {
     }
     f = f.parent;
   }
-  if (currentRoot?.onUncaughtError) currentRoot.onUncaughtError(err);
+  if (currentRoot?.ue) currentRoot.ue(err);
   else throw err;
 }
 function isThenable(x) {
-  return x != null && typeof x.then === "function";
+  return x != null && typeof x.then == "function";
 }
 function unmountFiber(fiber, domParent) {
-  fiber.unmounted = true;
+  fiber.um = true;
   let c = fiber.child;
   while (c) {
     const next = c.sibling;
@@ -676,25 +684,25 @@ function unmountFiber(fiber, domParent) {
     c = next;
   }
   fiber.child = null;
-  if (fiber.cleanups) {
-    for (const cleanup of fiber.cleanups) {
+  if (fiber.cu) {
+    for (const cleanup of fiber.cu) {
       try {
         cleanup();
       } catch (e) {
-        if (currentRoot?.onRecoverableError) currentRoot.onRecoverableError(e);
+        if (currentRoot?.re) currentRoot.re(e);
       }
     }
-    fiber.cleanups = null;
+    fiber.cu = null;
   }
-  if (fiber.tag === FiberTag.Class && fiber.stateNode?.componentWillUnmount) {
+  if (fiber.tag === FiberTag.Class && fiber.sn?.componentWillUnmount) {
     try {
-      fiber.stateNode.componentWillUnmount();
+      fiber.sn.componentWillUnmount();
     } catch (e) {
-      if (currentRoot?.onRecoverableError) currentRoot.onRecoverableError(e);
+      if (currentRoot?.re) currentRoot.re(e);
     }
-    fiber.stateNode._fiber = null;
-    fiber.stateNode._enqueueUpdate = null;
-    fiber.stateNode._forceUpdate = null;
+    fiber.sn._fiber = null;
+    fiber.sn._enqueueUpdate = null;
+    fiber.sn._forceUpdate = null;
   }
   if (fiber.ref) detachRef(fiber.ref);
   if (fiber.tag === FiberTag.Host && fiber.dom && fiber.dom.parentNode) {
@@ -736,14 +744,17 @@ function getHostParent(fiber) {
   while (p) {
     if (p.tag === FiberTag.Host) return p.dom;
     if (p.tag === FiberTag.Root)
-      return p.stateNode || p.dom || p.root?.container;
+      return p.sn || p.dom || p.root?.c;
     if (p.tag === FiberTag.Portal) {
-      const props = p.pendingProps ?? p.memoizedProps;
-      return props?.container || p.stateNode || p.dom || p.root?.container;
+      const props = p.pp ?? p.mp;
+      return props?.container || p.sn || p.dom || p.root?.c;
     }
     p = p.parent;
   }
-  throw new Error("No host parent found.");
+  if (true) {
+    throw new Error("No host parent found.");
+  }
+  throw new Error();
 }
 function getAnchor(fiber) {
   let f = fiber.sibling;
@@ -779,20 +790,20 @@ function defaultReadContext(_fiber, ctx) {
   return ctx._currentValue;
 }
 function attachRef(fiber, value) {
-  const ref = fiber.ref ?? (fiber.pendingProps?.ref ?? null);
+  const ref = fiber.ref ?? (fiber.pp?.ref ?? null);
   if (!ref) return;
-  if (typeof ref === "function") {
+  if (typeof ref == "function") {
     scheduleLifecycle(fiber, () => {
       const cleanup = ref(value);
-      fiber.cleanups ||= [];
-      fiber.cleanups.push(typeof cleanup === "function" ? cleanup : () => ref(null));
+      fiber.cu ||= [];
+      fiber.cu.push(typeof cleanup == "function" ? cleanup : () => ref(null));
     });
   } else {
     ref.current = value;
   }
 }
 function syncRefIfChanged(fiber, value) {
-  const ref = fiber.ref ?? (fiber.pendingProps?.ref ?? null);
+  const ref = fiber.ref ?? (fiber.pp?.ref ?? null);
   if (!ref) return;
   if (typeof ref === "object" && ref.current !== value) ref.current = value;
 }
@@ -805,45 +816,44 @@ var pendingEffects = [];
 var pendingLayoutEffects = [];
 var pendingLifecycles = [];
 function enqueueEffect(fiber, effect) {
-  if (effect.tag === "layout" || effect.tag === "insertion") {
-    pendingLayoutEffects.push({ fiber, effect });
+  if (effect.t) {
+    pendingLayoutEffects.push([fiber, effect]);
   } else {
-    pendingEffects.push({ fiber, effect });
+    pendingEffects.push([fiber, effect]);
   }
 }
-function scheduleLifecycle(fiber, fn) {
-  pendingLifecycles.push({ fiber, fn });
+function scheduleLifecycle(_fiber, fn) {
+  pendingLifecycles.push(fn);
 }
 function runEffects(root) {
   while (pendingLayoutEffects.length) {
-    const { fiber, effect } = pendingLayoutEffects.shift();
+    const [fiber, effect] = pendingLayoutEffects.shift();
     runEffect(fiber, effect, root);
   }
   while (pendingLifecycles.length) {
-    const { fn } = pendingLifecycles.shift();
+    const fn = pendingLifecycles.shift();
     try {
       fn();
     } catch (e) {
-      if (root.onCaughtError) root.onCaughtError(e);
+      if (root.ce) root.ce(e);
     }
   }
   if (pendingEffects.length) {
     const batch = pendingEffects.splice(0);
     queueMicrotask(() => {
-      for (const { fiber, effect } of batch) runEffect(fiber, effect, root);
+      for (const [fiber, effect] of batch) runEffect(fiber, effect, root);
     });
   }
 }
 function runEffect(fiber, effect, root) {
   try {
-    const cleanup = effect.create();
-    effect.destroy = typeof cleanup === "function" ? cleanup : void 0;
-    if (effect.destroy) {
-      fiber.cleanups ||= [];
-      fiber.cleanups.push(effect.destroy);
+    const cleanup = effect.c();
+    if (typeof cleanup == "function") {
+      fiber.cu ||= [];
+      fiber.cu.push(cleanup);
     }
   } catch (e) {
-    if (root.onCaughtError) root.onCaughtError(e);
+    if (root.ce) root.ce(e);
   }
 }
 function isEventProp(name) {
@@ -852,6 +862,8 @@ function isEventProp(name) {
 export {
   batchedUpdates,
   childrenToArray,
+  deferHydration,
+  discardPendingWork,
   enqueueEffect,
   findRoot,
   flushSyncWork,