@simpreact/simpreact 0.0.3 → 0.0.5

package/hooks/index.js

@@ -1,6 +1,5 @@
-import { batchingRerenderLocker, lifecycleEventBus, rerender as _rerender } from '../core/internal.js';
-import { noop } from '../shared/index.js';
-import { callOrGet } from '../shared/utils.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.
 let currentElement;
@@ -21,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) {
@@ -42,13 +38,14 @@ lifecycleEventBus.subscribe(event => {
                 }
                 state.cleanup = state.effect() || undefined;
             }
-            batchingRerenderLocker.flush();
         }
     }
     if (event.type === 'unmounted') {
         const element = event.element;
         if (element.store?.hookStates) {
-            for (const state of element.store.hookStates) {
+            const hookStates = element.store.hookStates;
+            element.store.hookStates = undefined;
+            for (const state of hookStates) {
                 if (state && 'cleanup' in state && typeof state.cleanup === 'function') {
                     state.cleanup();
                 }
@@ -56,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) {
@@ -91,6 +92,7 @@ export function useRerender() {
     if (!hookStates[currentIndex]) {
         const elementStore = currentElement.store;
         hookStates[currentIndex] = function rerender() {
+            elementStore.forceRender = true;
             _rerender(elementStore.latestElement);
         };
     }
@@ -108,6 +110,7 @@ export function useState(initialState) {
                 return;
             }
             state[0] = nextValue;
+            elementStore.forceRender = true;
             _rerender(elementStore.latestElement);
         };
     }
@@ -141,9 +144,6 @@ export function useUnmounted(cleanup) {
     }
     currentIndex++;
 }
-export function useContext(context) {
-    return currentElement.contextMap?.get(context) ?? context.defaultValue;
-}
 export function useCatch(cb) {
     if (!currentElement.store) {
         currentElement.store = {};
@@ -189,7 +189,6 @@ export default {
     useEffect,
     useMounted,
     useUnmounted,
-    useContext,
     useCatch,
     areDepsEqual,
 };

package/package.json

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

package/shared/index.d.ts

@@ -17,3 +17,9 @@ declare class EventBus<Event = void> {
 }
 
 declare function isSimpText(value: unknown): value is SimpText;
+
+declare function noop(): void;
+
+declare function callOrGet<T, A extends any[]>(value: T | ((...args: A) => T), ...args: A): T;
+
+declare function shallowEqual(objA: any, objB: any): boolean;

package/shared/index.js

@@ -1,5 +1,14 @@
 import { EventBus } from './EventBus.js';
 import { emptyArray, emptyMap, emptyObject } from './lang.js';
-import { isSimpText, noop } from './utils.js';
-export { emptyObject, emptyMap, emptyArray, isSimpText, EventBus, noop };
-export default { isSimpText, EMPTY_MAP: emptyMap, EMPTY_ARRAY: emptyArray, EMPTY_OBJECT: emptyObject, EventBus, noop };
+import { callOrGet, isSimpText, noop, shallowEqual } from './utils.js';
+export { emptyObject, emptyMap, emptyArray, isSimpText, EventBus, noop, callOrGet, shallowEqual };
+export default {
+    isSimpText,
+    EMPTY_MAP: emptyMap,
+    EMPTY_ARRAY: emptyArray,
+    EMPTY_OBJECT: emptyObject,
+    EventBus,
+    noop,
+    callOrGet,
+    emptyObject,
+};

package/shared/utils.d.ts

@@ -2,3 +2,4 @@ import type { SimpText } from './public.js';
 export declare function isSimpText(value: unknown): value is SimpText;
 export declare function noop(): void;
 export declare function callOrGet<T, A extends any[]>(value: T | ((...args: A) => T), ...args: A): T;
+export declare function shallowEqual(objA: any, objB: any): boolean;

package/shared/utils.js

@@ -18,3 +18,23 @@ export function callOrGet(value) {
     }
     return value(...args);
 }
+export function shallowEqual(objA, objB) {
+    if (Object.is(objA, objB)) {
+        return true;
+    }
+    if (typeof objA !== 'object' || objA === null || typeof objB !== 'object' || objB === null) {
+        return false;
+    }
+    const keysA = Object.keys(objA);
+    const keysB = Object.keys(objB);
+    if (keysA.length !== keysB.length) {
+        return false;
+    }
+    for (let i = 0; i < keysA.length; i++) {
+        const currentKey = keysA[i];
+        if (!Object.prototype.hasOwnProperty.call(objB, currentKey) || !Object.is(objA[currentKey], objB[currentKey])) {
+            return false;
+        }
+    }
+    return true;
+}

package/compat/utils.d.ts

@@ -1 +0,0 @@
-export declare function identity(value: any): any;

package/compat/utils.js

@@ -1,3 +0,0 @@
-export function identity(value) {
-    return value;
-}

package/core/context.d.ts

@@ -1,18 +0,0 @@
-import type { SimpNode } from './createElement.js';
-type Provider<T = any> = (props: {
-    value: T;
-    children: SimpNode;
-}) => SimpNode;
-type Consumer<T = any> = (props: {
-    children: (value: T) => SimpNode;
-}, contextMap: SimpContextMap) => SimpNode;
-export interface SimpContext<T> {
-    defaultValue: T;
-    Provider: Provider<T>;
-    Consumer: Consumer<T>;
-}
-export type SimpContextMap = Map<SimpContext<any>, any>;
-export declare function createContext<T>(defaultValue: T): SimpContext<T>;
-export declare function isProvider(type: any): boolean;
-export declare function isConsumer(type: any): boolean;
-export {};

package/core/context.js

@@ -1,18 +0,0 @@
-export function createContext(defaultValue) {
-    const context = {
-        defaultValue,
-        Provider: Object.create(null),
-        Consumer(props, contextMap) {
-            return props.children(contextMap.get(context) ?? defaultValue);
-        },
-    };
-    Object.defineProperty(context.Consumer, 'isConsumer', { value: true });
-    Object.defineProperty(context.Provider, 'context', { value: context, enumerable: true });
-    return context;
-}
-export function isProvider(type) {
-    return type != null && type.context != null;
-}
-export function isConsumer(type) {
-    return type != null && type.isConsumer === true;
-}