@kuindji/reactive 1.0.23 → 1.1.0

package/dist/react.d.ts

@@ -1,13 +1,13 @@
-export * from "./react/ErrorBoundary";
-export * from "./react/useAction";
-export * from "./react/useActionBus";
-export * from "./react/useActionMap";
-export * from "./react/useEvent";
-export * from "./react/useEventBus";
-export * from "./react/useListenToAction";
-export * from "./react/useListenToActionBus";
-export * from "./react/useListenToEvent";
-export * from "./react/useListenToEventBus";
-export * from "./react/useListenToStoreChanges";
-export * from "./react/useStore";
-export * from "./react/useStoreState";
+export * from "./react/ErrorBoundary.js";
+export * from "./react/useAction.js";
+export * from "./react/useActionBus.js";
+export * from "./react/useActionMap.js";
+export * from "./react/useEvent.js";
+export * from "./react/useEventBus.js";
+export * from "./react/useListenToAction.js";
+export * from "./react/useListenToActionBus.js";
+export * from "./react/useListenToEvent.js";
+export * from "./react/useListenToEventBus.js";
+export * from "./react/useListenToStoreChanges.js";
+export * from "./react/useStore.js";
+export * from "./react/useStoreState.js";

package/dist/react.js

@@ -1,29 +1,13 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./react/ErrorBoundary"), exports);
-__exportStar(require("./react/useAction"), exports);
-__exportStar(require("./react/useActionBus"), exports);
-__exportStar(require("./react/useActionMap"), exports);
-__exportStar(require("./react/useEvent"), exports);
-__exportStar(require("./react/useEventBus"), exports);
-__exportStar(require("./react/useListenToAction"), exports);
-__exportStar(require("./react/useListenToActionBus"), exports);
-__exportStar(require("./react/useListenToEvent"), exports);
-__exportStar(require("./react/useListenToEventBus"), exports);
-__exportStar(require("./react/useListenToStoreChanges"), exports);
-__exportStar(require("./react/useStore"), exports);
-__exportStar(require("./react/useStoreState"), exports);
+export * from "./react/ErrorBoundary.js";
+export * from "./react/useAction.js";
+export * from "./react/useActionBus.js";
+export * from "./react/useActionMap.js";
+export * from "./react/useEvent.js";
+export * from "./react/useEventBus.js";
+export * from "./react/useListenToAction.js";
+export * from "./react/useListenToActionBus.js";
+export * from "./react/useListenToEvent.js";
+export * from "./react/useListenToEventBus.js";
+export * from "./react/useListenToStoreChanges.js";
+export * from "./react/useStore.js";
+export * from "./react/useStoreState.js";

package/dist/store.d.ts

@@ -1,5 +1,5 @@
-import { EventBusDefinitionHelper } from "./eventBus";
-import type { ApiType, ErrorListenerSignature, KeyOf, MapKey } from "./lib/types";
+import { EventBusDefinitionHelper } from "./eventBus.js";
+import type { ApiType, ErrorListenerSignature, KeyOf, MapKey } from "./lib/types.js";
 export interface BasePropMap {
     [key: MapKey]: any;
 }
@@ -44,12 +44,13 @@ export declare function createStore<PropMap extends BasePropMap = BasePropMap>(i
     };
     readonly isEmpty: () => boolean;
     readonly reset: () => void;
-    readonly onChange: <K extends KeyOf<import("./eventBus").GetEventsMap<StoreChangeEvents<PropMap>>>, H extends import("./eventBus").GetEventsMap<StoreChangeEvents<PropMap>>[K]["signature"]>(name: K, handler: H, options?: import("./event").ListenerOptions) => void;
-    readonly removeOnChange: <K extends KeyOf<import("./eventBus").GetEventsMap<StoreChangeEvents<PropMap>>>, H extends import("./eventBus").GetEventsMap<StoreChangeEvents<PropMap>>[K]["signature"]>(name: K, handler: H, context?: object | null, tag?: string | null) => void;
-    readonly control: <K extends KeyOf<import("./eventBus").GetEventsMap<StoreControlEvents<PropMap>>>, H extends import("./eventBus").GetEventsMap<StoreControlEvents<PropMap>>[K]["signature"]>(name: K, handler: H, options?: import("./event").ListenerOptions) => void;
-    readonly removeControl: <K extends KeyOf<import("./eventBus").GetEventsMap<StoreControlEvents<PropMap>>>, H extends import("./eventBus").GetEventsMap<StoreControlEvents<PropMap>>[K]["signature"]>(name: K, handler: H, context?: object | null, tag?: string | null) => void;
-    readonly pipe: <K extends KeyOf<import("./eventBus").GetEventsMap<StorePipeEvents<PropMap>>>, H extends import("./eventBus").GetEventsMap<StorePipeEvents<PropMap>>[K]["signature"]>(name: K, handler: H, options?: import("./event").ListenerOptions) => void;
-    readonly removePipe: <K extends KeyOf<import("./eventBus").GetEventsMap<StorePipeEvents<PropMap>>>, H extends import("./eventBus").GetEventsMap<StorePipeEvents<PropMap>>[K]["signature"]>(name: K, handler: H, context?: object | null, tag?: string | null) => void;
+    readonly onChange: <K extends KeyOf<import("./eventBus.js").GetEventsMap<StoreChangeEvents<PropMap>>>, H extends import("./eventBus.js").GetEventsMap<StoreChangeEvents<PropMap>>[K]["signature"]>(name: K, handler: H, options?: import("./event.js").ListenerOptions) => void;
+    readonly removeOnChange: <K extends KeyOf<import("./eventBus.js").GetEventsMap<StoreChangeEvents<PropMap>>>, H extends import("./eventBus.js").GetEventsMap<StoreChangeEvents<PropMap>>[K]["signature"]>(name: K, handler: H, context?: object | null, tag?: string | null) => void;
+    readonly updateOnChangeOptions: <K extends KeyOf<import("./eventBus.js").GetEventsMap<StoreChangeEvents<PropMap>>>, H extends import("./eventBus.js").GetEventsMap<StoreChangeEvents<PropMap>>[K]["signature"]>(name: K, handler: H, context?: object | null, nextOptions?: import("./event.js").ListenerOptions) => boolean;
+    readonly control: <K extends KeyOf<import("./eventBus.js").GetEventsMap<StoreControlEvents<PropMap>>>, H extends import("./eventBus.js").GetEventsMap<StoreControlEvents<PropMap>>[K]["signature"]>(name: K, handler: H, options?: import("./event.js").ListenerOptions) => void;
+    readonly removeControl: <K extends KeyOf<import("./eventBus.js").GetEventsMap<StoreControlEvents<PropMap>>>, H extends import("./eventBus.js").GetEventsMap<StoreControlEvents<PropMap>>[K]["signature"]>(name: K, handler: H, context?: object | null, tag?: string | null) => void;
+    readonly pipe: <K extends KeyOf<import("./eventBus.js").GetEventsMap<StorePipeEvents<PropMap>>>, H extends import("./eventBus.js").GetEventsMap<StorePipeEvents<PropMap>>[K]["signature"]>(name: K, handler: H, options?: import("./event.js").ListenerOptions) => void;
+    readonly removePipe: <K extends KeyOf<import("./eventBus.js").GetEventsMap<StorePipeEvents<PropMap>>>, H extends import("./eventBus.js").GetEventsMap<StorePipeEvents<PropMap>>[K]["signature"]>(name: K, handler: H, context?: object | null, tag?: string | null) => void;
 }>;
 export type BaseStoreDefinition = StoreDefinitionHelper<BasePropMap>;
 export type BaseStore = ReturnType<typeof createStore<any>>;

package/dist/store.js

@@ -1,21 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EffectEventName = exports.ErrorEventName = exports.ResetEventName = exports.ChangeEventName = exports.BeforeChangeEventName = void 0;
-exports.createStore = createStore;
-const eventBus_1 = require("./eventBus");
-exports.BeforeChangeEventName = "before";
-exports.ChangeEventName = "change";
-exports.ResetEventName = "reset";
-exports.ErrorEventName = "error";
-exports.EffectEventName = "effect";
-function createStore(initialData = {}) {
+import { createEventBus } from "./eventBus.js";
+export const BeforeChangeEventName = "before";
+export const ChangeEventName = "change";
+export const ResetEventName = "reset";
+export const ErrorEventName = "error";
+export const EffectEventName = "effect";
+export function createStore(initialData = {}) {
     const data = new Map(Object.entries(initialData));
-    const changes = (0, eventBus_1.createEventBus)();
-    const pipe = (0, eventBus_1.createEventBus)();
-    const control = (0, eventBus_1.createEventBus)();
+    const changes = createEventBus();
+    const pipe = createEventBus();
+    const control = createEventBus();
     let effectKeys = [];
     const effectInterceptor = (name, args) => {
-        if (name === exports.ChangeEventName) {
+        if (name === ChangeEventName) {
             effectKeys.push(...args[0]);
             return false;
         }
@@ -25,8 +21,8 @@ function createStore(initialData = {}) {
         var _a, _b, _c, _d, _e;
         const prev = data.get(name);
         if (prev !== value) {
-            if (control.firstNonEmpty(exports.BeforeChangeEventName, name, value)
-                === false) {
+            const beforeChangeResults = control.all(BeforeChangeEventName, name, value);
+            if (beforeChangeResults.some((result) => result === false)) {
                 return;
             }
             const pipeArgs = [value];
@@ -35,7 +31,7 @@ function createStore(initialData = {}) {
                 newValue = pipe.pipe(name, ...pipeArgs);
             }
             catch (error) {
-                control.trigger(exports.ErrorEventName, {
+                control.trigger(ErrorEventName, {
                     error: error instanceof Error
                         ? error
                         : new Error(String(error)),
@@ -43,7 +39,7 @@ function createStore(initialData = {}) {
                     type: "store-pipe",
                     name,
                 });
-                if ((_a = control.get(exports.ErrorEventName)) === null || _a === void 0 ? void 0 : _a.hasListener()) {
+                if ((_a = control.get(ErrorEventName)) === null || _a === void 0 ? void 0 : _a.hasListener()) {
                     return false;
                 }
                 throw error;
@@ -60,7 +56,7 @@ function createStore(initialData = {}) {
                 changes.trigger(name, ...changeArgs);
             }
             catch (error) {
-                control.trigger(exports.ErrorEventName, {
+                control.trigger(ErrorEventName, {
                     error: error instanceof Error
                         ? error
                         : new Error(String(error)),
@@ -68,25 +64,29 @@ function createStore(initialData = {}) {
                     type: "store-change",
                     name,
                 });
-                if ((_b = control.get(exports.ErrorEventName)) === null || _b === void 0 ? void 0 : _b.hasListener()) {
+                if ((_b = control.get(ErrorEventName)) === null || _b === void 0 ? void 0 : _b.hasListener()) {
                     effectKeys = [];
                     return true;
                 }
                 throw error;
             }
-            if ((_c = control.get(exports.EffectEventName)) === null || _c === void 0 ? void 0 : _c.hasListener()) {
+            if ((_c = control.get(EffectEventName)) === null || _c === void 0 ? void 0 : _c.hasListener()) {
                 try {
                     const isIntercepting = control.isIntercepting();
-                    if (!isIntercepting) {
-                        control.intercept(effectInterceptor);
+                    try {
+                        if (!isIntercepting) {
+                            control.intercept(effectInterceptor);
+                        }
+                        control.trigger(EffectEventName, name, value);
                     }
-                    control.trigger(exports.EffectEventName, name, value);
-                    if (!isIntercepting) {
-                        control.stopIntercepting();
+                    finally {
+                        if (!isIntercepting) {
+                            control.stopIntercepting();
+                        }
                     }
                 }
                 catch (error) {
-                    control.trigger(exports.ErrorEventName, {
+                    control.trigger(ErrorEventName, {
                         error: error instanceof Error
                             ? error
                             : new Error(String(error)),
@@ -94,7 +94,7 @@ function createStore(initialData = {}) {
                         type: "store-control",
                         name,
                     });
-                    if ((_d = control.get(exports.ErrorEventName)) === null || _d === void 0 ? void 0 : _d.hasListener()) {
+                    if ((_d = control.get(ErrorEventName)) === null || _d === void 0 ? void 0 : _d.hasListener()) {
                         effectKeys = [];
                         return true;
                     }
@@ -103,13 +103,13 @@ function createStore(initialData = {}) {
             }
             if (triggerChange) {
                 try {
-                    control.trigger(exports.ChangeEventName, [name, ...effectKeys]);
+                    control.trigger(ChangeEventName, [name, ...effectKeys]);
                     if (!control.isIntercepting()) {
                         effectKeys = [];
                     }
                 }
                 catch (error) {
-                    control.trigger(exports.ErrorEventName, {
+                    control.trigger(ErrorEventName, {
                         error: error instanceof Error
                             ? error
                             : new Error(String(error)),
@@ -117,7 +117,7 @@ function createStore(initialData = {}) {
                         type: "store-control",
                         name,
                     });
-                    if ((_e = control.get(exports.ErrorEventName)) === null || _e === void 0 ? void 0 : _e.hasListener()) {
+                    if ((_e = control.get(ErrorEventName)) === null || _e === void 0 ? void 0 : _e.hasListener()) {
                         effectKeys = [];
                         return true;
                     }
@@ -146,37 +146,49 @@ function createStore(initialData = {}) {
         else if (typeof name === "object") {
             const changedKeys = [];
             const isIntercepting = control.isIntercepting();
-            const hasEffectListener = (_a = control.get(exports.EffectEventName)) === null || _a === void 0 ? void 0 : _a.hasListener();
-            if (hasEffectListener && !isIntercepting) {
+            const hasEffectListener = (_a = control.get(EffectEventName)) === null || _a === void 0 ? void 0 : _a.hasListener();
+            const shouldInterceptEffects = hasEffectListener && !isIntercepting;
+            let controlError = null;
+            if (shouldInterceptEffects) {
                 control.intercept(effectInterceptor);
             }
-            Object.entries(name).forEach(([k, v]) => {
-                if (_set(k, v, false)) {
-                    changedKeys.push(k);
-                }
-            });
             try {
-                control.trigger(exports.ChangeEventName, [
+                Object.entries(name).forEach(([k, v]) => {
+                    if (_set(k, v, false)) {
+                        changedKeys.push(k);
+                    }
+                });
+                const allChangedKeys = [
                     ...changedKeys,
                     ...effectKeys,
-                ]);
-                if (hasEffectListener && !isIntercepting) {
+                ];
+                if (allChangedKeys.length > 0) {
+                    try {
+                        control.trigger(ChangeEventName, allChangedKeys);
+                    }
+                    catch (error) {
+                        controlError = error instanceof Error
+                            ? error
+                            : new Error(String(error));
+                    }
+                }
+            }
+            finally {
+                if (shouldInterceptEffects) {
                     effectKeys = [];
                     control.stopIntercepting();
                 }
             }
-            catch (error) {
-                control.trigger(exports.ErrorEventName, {
-                    error: error instanceof Error
-                        ? error
-                        : new Error(String(error)),
+            if (controlError) {
+                control.trigger(ErrorEventName, {
+                    error: controlError,
                     args: [name],
                     type: "store-control",
                 });
-                if ((_b = control.get(exports.ErrorEventName)) === null || _b === void 0 ? void 0 : _b.hasListener()) {
+                if ((_b = control.get(ErrorEventName)) === null || _b === void 0 ? void 0 : _b.hasListener()) {
                     return;
                 }
-                throw error;
+                throw controlError;
             }
         }
         else {
@@ -211,6 +223,7 @@ function createStore(initialData = {}) {
     };
     let batching = false;
     const batch = (fn) => {
+        var _a, _b;
         if (batching) {
             throw new Error("Nested batch() calls are not supported");
         }
@@ -218,7 +231,7 @@ function createStore(initialData = {}) {
         const allChangedKeys = [];
         const log = [];
         const controlInterceptor = function (name, [changedKeys]) {
-            if (name === exports.ChangeEventName) {
+            if (name === ChangeEventName) {
                 allChangedKeys.push(...changedKeys);
                 return false;
             }
@@ -230,9 +243,15 @@ function createStore(initialData = {}) {
         };
         changes.intercept(changeInterceptor);
         control.intercept(controlInterceptor);
+        let callbackError;
+        let hasCallbackError = false;
         try {
             fn();
         }
+        catch (error) {
+            callbackError = error;
+            hasCallbackError = true;
+        }
         finally {
             control.stopIntercepting();
             changes.stopIntercepting();
@@ -243,15 +262,58 @@ function createStore(initialData = {}) {
                 value,
                 prev,
             ];
-            changes.trigger(propName, ...changeArgs);
+            try {
+                changes.trigger(propName, ...changeArgs);
+            }
+            catch (error) {
+                control.trigger(ErrorEventName, {
+                    error: error instanceof Error
+                        ? error
+                        : new Error(String(error)),
+                    args: changeArgs,
+                    type: "store-change",
+                    name: propName,
+                });
+                if ((_a = control.get(ErrorEventName)) === null || _a === void 0 ? void 0 : _a.hasListener()) {
+                    continue;
+                }
+                if (hasCallbackError) {
+                    continue;
+                }
+                throw error;
+            }
         }
         if (allChangedKeys.length > 0) {
-            control.trigger(exports.ChangeEventName, allChangedKeys);
+            try {
+                control.trigger(ChangeEventName, allChangedKeys);
+            }
+            catch (error) {
+                control.trigger(ErrorEventName, {
+                    error: error instanceof Error
+                        ? error
+                        : new Error(String(error)),
+                    args: [allChangedKeys],
+                    type: "store-control",
+                });
+                if ((_b = control.get(ErrorEventName)) === null || _b === void 0 ? void 0 : _b.hasListener()) {
+                    if (hasCallbackError) {
+                        throw callbackError;
+                    }
+                    return;
+                }
+                if (hasCallbackError) {
+                    throw callbackError;
+                }
+                throw error;
+            }
+        }
+        if (hasCallbackError) {
+            throw callbackError;
         }
     };
     const reset = () => {
         data.clear();
-        control.trigger(exports.ResetEventName);
+        control.trigger(ResetEventName);
     };
     const api = {
         set,
@@ -263,6 +325,7 @@ function createStore(initialData = {}) {
         reset,
         onChange: changes.addListener,
         removeOnChange: changes.removeListener,
+        updateOnChangeOptions: changes.updateListenerOptions,
         control: control.addListener,
         removeControl: control.removeListener,
         pipe: pipe.addListener,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kuindji/reactive",
-    "version": "1.0.23",
+    "version": "1.1.0",
     "author": "Ivan Kuindzhi",
     "type": "module",
     "repository": {
@@ -22,6 +22,14 @@
         "typescript": "^5.9.3",
         "typescript-eslint": "^8.48.0"
     },
+    "peerDependencies": {
+        "react": ">=18.0.0"
+    },
+    "peerDependenciesMeta": {
+        "react": {
+            "optional": true
+        }
+    },
     "exports": {
         ".": {
             "types": "./dist/index.d.ts",
@@ -62,11 +70,13 @@
     "license": "ISC",
     "scripts": {
         "build": "tsc -p ./tsconfig-build.json",
+        "prepublishOnly": "bun run build",
         "lint": "bun eslint .",
+        "type-check": "tsc --noEmit",
         "test": "bun test tests/**/*.spec.ts*",
         "test:types": "tsc -p ./tests/types/tsconfig.json",
-        "test:all": "bun run test:types && bun run test"
+        "test:all": "bun run type-check && bun run test:types && bun run test"
     },
     "sideEffects": false,
     "types": "dist/index.d.ts"
-}
+}