fix: roll back SSR behavior of error-boundary

Author: atellmer

packages/core/src/boundary/boundary.tsx

@@ -1,76 +1,44 @@
-import type { DarkElement, SlotProps, Callback, AppResource } from '../shared';
-import { detectIsFunction, createError } from '../utils';
+import type { DarkElement, SlotProps, Callback } from '../shared';
 import { __useCursor as useCursor } from '../internal';
+import { detectIsFunction } from '../utils';
 import { useUpdate } from '../use-update';
 import { useEffect } from '../use-effect';
 import { component } from '../component';
 import { useState } from '../use-state';
 import { useEvent } from '../use-event';
-import { useMemo } from '../use-memo';
-import { $$scope } from '../scope';
 
-function useError(__id?: number): [Error | null, Callback] {
+function useError(): [Error | null, Callback] {
   const cursor = useCursor();
-  const $scope = $$scope();
-  const inBoundary = cursor.parent?.hook?.getIsBoundary();
-  const res = inBoundary ? $scope.getResource(__id) : null;
-  const [error, setError] = useState<Error>(() => (inBoundary ? init(res) : null));
-  const reset = useEvent(() => {
-    inBoundary && $scope.setResource(__id, null);
-    setError(null);
-  });
+  const update = useUpdate();
+  const [error, setError] = useState<Error>(null);
+  const reset = useEvent(() => setError(null));
 
-  if (inBoundary) {
-    cursor.parent.hook.setCatch(setError);
-  } else {
-    cursor.hook.setCatch(setError);
-  }
+  cursor.hook.setIsBoundary(true);
+  cursor.hook.setCatch(setError);
+  cursor.hook.setUpdate(update);
 
   return [error, reset];
 }
 
-const init = (res: AppResource) => (res?.[1] ? createError(res?.[1]) : null);
-
 type ErrorBoundaryProps = {
   fallback?: DarkElement;
   renderFallback?: (x: RenderFallbackOptions) => DarkElement;
   onError?: (e: Error) => void;
 } & Required<SlotProps>;
 
 const ErrorBoundary = component<ErrorBoundaryProps>(
-  props => {
-    const cursor = useCursor();
-    const update = useUpdate();
-    const $scope = $$scope();
-    const id = useMemo(() => $scope.getNextResourceId(), []);
-
-    cursor.hook.setIsBoundary(true);
-    cursor.hook.setUpdate(update);
-    cursor.hook.setLevel($scope.getMountLevel());
-    cursor.hook.setResId(id);
-
-    return <ErrorBoundaryInternal {...props} id={id} />;
-  },
-  {
-    displayName: 'ErrorBoundary',
-  },
-);
-
-type ErrorBoundaryInternalProps = {
-  id: number;
-} & ErrorBoundaryProps;
-
-const ErrorBoundaryInternal = component<ErrorBoundaryInternalProps>(
-  ({ id, fallback = null, renderFallback, onError, slot }) => {
-    const [error, reset] = useError(id);
+  ({ fallback = null, renderFallback, onError, slot }) => {
+    const [error, reset] = useError();
 
     useEffect(() => {
       detectIsFunction(onError) && onError(error);
     }, [error]);
 
     return error ? (detectIsFunction(renderFallback) ? renderFallback({ error, reset }) : fallback) : slot;
   },
-  { displayName: 'ErrorBoundaryInternal' },
+  {
+    displayName: 'ErrorBoundary',
+  },
 );
 
 type RenderFallbackOptions = {

packages/core/src/fiber/fiber.ts

@@ -187,24 +187,6 @@ class Hook<T = unknown> {
   getPendings() {
     return this.box?.pendings;
   }
-
-  setResId(x: number) {
-    this.__box();
-    this.box.resId = x;
-  }
-
-  getResId() {
-    return this.box?.resId;
-  }
-
-  setLevel(x: number) {
-    this.__box();
-    this.box.level = x;
-  }
-
-  getLevel() {
-    return this.box?.level;
-  }
 }
 
 function getHook(alt: Fiber, prevInst: Instance, nextInst: Instance): Hook | null {
@@ -220,8 +202,6 @@ type Box = {
   catch?: Catch;
   pendings?: number;
   update?: Callback;
-  resId?: number;
-  level?: number;
 };
 
 type Batch = {

packages/core/src/scope/scope.ts

@@ -156,11 +156,6 @@ class Scope {
     this.mountLevel = this.mountLevel - 1;
   }
 
-  setMount(level: number) {
-    this.mountLevel = level;
-    this.mountNav[this.mountLevel] = 0;
-  }
-
   navToPrev() {
     const idx = this.getMountIndex();
 
@@ -173,10 +168,6 @@ class Scope {
     }
   }
 
-  getMountLevel() {
-    return this.mountLevel;
-  }
-
   getMountIndex() {
     return this.mountNav[this.mountLevel];
   }

packages/core/src/utils/utils.ts

@@ -99,9 +99,7 @@ const createIndexKey = (idx: number) => `${INDEX_KEY}:${idx}`;
 
 const mapRecord = <T extends object>(record: T) => keys(record).map(x => record[x]);
 
-function createError(reason: unknown) {
-  return reason instanceof Error ? reason : new Error(String(reason).replace('Error: ', ''));
-}
+const createError = (x: unknown) => (x instanceof Error ? x : new Error(String(x)));
 
 export {
   detectIsFunction,

packages/core/src/workloop/workloop.ts

@@ -411,7 +411,7 @@ function mount(fiber: Fiber, prev: Fiber, $scope: Scope) {
             throw promise;
           }
         } else {
-          handleAsync(promise, boundary, reset, $scope);
+          reset();
           throw promise;
         }
       } else {
@@ -432,19 +432,6 @@ function mount(fiber: Fiber, prev: Fiber, $scope: Scope) {
   return inst;
 }
 
-async function handleAsync(promise: Promise<unknown>, boundary: Fiber, reset: Callback, $scope: Scope) {
-  let isRejected = false;
-
-  try {
-    await promise;
-  } catch (reason) {
-    isRejected = true;
-    boundary && restartFromBoundary(boundary, reason, $scope);
-  } finally {
-    (!isRejected || !boundary) && reset();
-  }
-}
-
 const createReset = (fiber: Fiber, prev: Fiber, $scope: Scope) => () => {
   if (prev) {
     fiber.hook.owner = null;
@@ -458,17 +445,6 @@ const createReset = (fiber: Fiber, prev: Fiber, $scope: Scope) => () => {
   }
 };
 
-function restartFromBoundary(fiber: Fiber, reason: unknown, $scope: Scope) {
-  const resId = fiber.hook.getResId();
-
-  fiber.child = null;
-  fiber.cec = 0;
-  Fiber.setNextId(fiber.id);
-  $scope.setMount(fiber.hook.getLevel());
-  $scope.setNextUnitOfWork(fiber);
-  $scope.setResource(resId, [null, reason instanceof Error ? reason.stack : (reason as string)]);
-}
-
 function extractKeys(alt: Fiber, children: Array<Instance>) {
   let nextFiber = alt;
   let idx = 0;

packages/data/src/use-query/use-query.ts

@@ -94,12 +94,7 @@ function useQuery<T, V extends Variables>(key: string, query: Query<T, V>, optio
       cache.__emit({ type: 'query', phase: 'error', key, id: $cacheId, data: error, initiator });
 
       if (isServer) {
-        if (inBoundary) {
-          throwThis(error);
-        } else {
-          logError(error);
-        }
-
+        logError(error);
         $scope.setResource(id, [null, String(error)]);
       } else {
         if (inBoundary && !isStateOnly) {