@simpreact/simpreact 0.0.4 → 0.0.5

package/compat/core.js

@@ -50,13 +50,14 @@ export function isValidElement(element) {
 export function Suspense(props) {
     const [isSuspended, setIsSuspended] = SimpReactHooks.useState(false);
     SimpReactHooks.useCatch(error => {
+        if (!(error instanceof Promise)) {
+            throw error;
+        }
         if (isSuspended) {
             return;
         }
-        if (error instanceof Promise) {
-            setIsSuspended(true);
-            error.then(() => setIsSuspended(false));
-        }
+        setIsSuspended(true);
+        error.then(() => setIsSuspended(false));
     });
     return isSuspended ? props.fallback : props.children;
 }

package/core/mounting.js

@@ -3,7 +3,6 @@ import { hostAdapter } from './hostAdapter.js';
 import { createTextElement, normalizeRoot } from './createElement.js';
 import { applyRef } from './ref.js';
 import { lifecycleEventBus } from './lifecycleEventBus.js';
-import { batchingRerenderLocker } from './rerender.js';
 export function mount(element, parentReference, nextReference, context, hostNamespace) {
     if (element.flag === 'TEXT') {
         mountTextElement(element, parentReference, nextReference);
@@ -84,9 +83,7 @@ export function mountFunctionalElement(element, parentReference, nextReference,
                 throw new Error('Too many re-renders.');
             }
             lifecycleEventBus.publish({ type: 'beforeRender', element, phase: 'mounting' });
-            batchingRerenderLocker.lock();
             children = element.type(element.props || emptyObject);
-            batchingRerenderLocker.flush();
             lifecycleEventBus.publish({ type: 'afterRender', element, phase: 'mounting' });
         } while (triedToRerender);
         children = normalizeRoot(children, false);

package/core/patching.js

@@ -5,7 +5,6 @@ import { clearElementHostReference, remove, unmount } from './unmounting.js';
 import { mount, mountArrayChildren, mountFunctionalElement } from './mounting.js';
 import { applyRef } from './ref.js';
 import { lifecycleEventBus } from './lifecycleEventBus.js';
-import { batchingRerenderLocker } from './rerender.js';
 import { isMemo } from './memo.js';
 export function patch(prevElement, nextElement, parentReference, nextReference, context, hostNamespace) {
     if (prevElement.type !== nextElement.type || prevElement.key !== nextElement.key) {
@@ -90,9 +89,7 @@ function patchFunctionalComponent(prevElement, nextElement, parentReference, nex
                 throw new Error('Too many re-renders.');
             }
             lifecycleEventBus.publish({ type: 'beforeRender', element: nextElement, phase: 'updating' });
-            batchingRerenderLocker.lock();
             nextChildren = nextElement.type(nextElement.props || emptyObject);
-            batchingRerenderLocker.flush();
             lifecycleEventBus.publish({ type: 'afterRender', element: nextElement, phase: 'updating' });
         } while (triedToRerender);
         nextChildren = normalizeRoot(nextChildren, false);

package/hooks/index.js

@@ -1,4 +1,4 @@
-import { batchingRerenderLocker, lifecycleEventBus, rerender as _rerender } from '../core/internal.js';
+import { lifecycleEventBus, rerender as _rerender } from '../core/internal.js';
 import { callOrGet, noop } from '../shared/index.js';
 let currentIndex = 0;
 // In runtime this is a nullable variable.
@@ -20,19 +20,16 @@ lifecycleEventBus.subscribe(event => {
     if (event.type === 'mounted') {
         const element = event.element;
         if (element.store?.effectsHookStates) {
-            batchingRerenderLocker.lock();
             const effects = element.store.effectsHookStates;
             element.store.effectsHookStates = undefined;
             for (const state of effects) {
                 state.cleanup = state.effect() || undefined;
             }
-            batchingRerenderLocker.flush();
         }
     }
     if (event.type === 'updated') {
         const element = event.element;
         if (element.store?.effectsHookStates) {
-            batchingRerenderLocker.lock();
             const effects = element.store.effectsHookStates;
             element.store.effectsHookStates = undefined;
             for (const state of effects) {
@@ -41,7 +38,6 @@ lifecycleEventBus.subscribe(event => {
                 }
                 state.cleanup = state.effect() || undefined;
             }
-            batchingRerenderLocker.flush();
         }
     }
     if (event.type === 'unmounted') {
@@ -57,17 +53,21 @@ lifecycleEventBus.subscribe(event => {
         }
     }
     if (event.type === 'errored') {
-        const element = findElementWithCatchHandlers(event.element);
-        if (!element) {
-            throw new Error('Error occurred during rendering a component', { cause: event.error });
-        }
-        if (element.store.catchHandlers) {
-            batchingRerenderLocker.lock();
-            for (const state of element.store.catchHandlers) {
-                state(event.error);
+        function handleError(element, error) {
+            element = findElementWithCatchHandlers(element);
+            if (!element) {
+                throw new Error('Error occurred during rendering a component', { cause: error });
+            }
+            try {
+                for (const state of element.store.catchHandlers) {
+                    state(error);
+                }
+            }
+            catch (error) {
+                handleError(element.parent, error);
             }
-            batchingRerenderLocker.flush();
         }
+        handleError(event.element, event.error);
     }
 });
 function findElementWithCatchHandlers(element) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simpreact/simpreact",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "",
   "homepage": "https://github.com/dPaskhin/simpreact#readme",
   "main": "./core/index.js",