@kuindji/reactive 1.0.21 → 1.0.24

package/dist/react/useStoreState.js

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useStoreState = useStoreState;
-const react_1 = require("react");
-function useStoreState(store, key) {
-    const [value, setValue] = (0, react_1.useState)(store.get(key));
-    const storeRef = (0, react_1.useRef)(store);
-    const keyRef = (0, react_1.useRef)(key);
-    const onChange = (0, react_1.useCallback)((value) => {
+import { useCallback, useEffect, useRef, useState } from "react";
+export function useStoreState(store, key) {
+    const [value, setValue] = useState(store.get(key));
+    const storeRef = useRef(store);
+    const keyRef = useRef(key);
+    const onChange = useCallback((value) => {
         setValue(value);
     }, []);
-    const setter = (0, react_1.useCallback)((value) => {
+    const setter = useCallback((value) => {
         if (typeof value === "function") {
             storeRef.current.set(keyRef.current, value(storeRef.current.get(keyRef.current)));
         }
@@ -17,16 +14,17 @@ function useStoreState(store, key) {
             storeRef.current.set(keyRef.current, value);
         }
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         return () => {
             storeRef.current.removeOnChange(keyRef.current, onChange);
         };
     }, []);
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         storeRef.current.removeOnChange(keyRef.current, onChange);
         storeRef.current = store;
         keyRef.current = key;
         storeRef.current.onChange(keyRef.current, onChange);
+        setValue(store.get(key));
     }, [store, key]);
     return [value, setter];
 }

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";
+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";

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";
+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,7 +21,7 @@ function createStore(initialData = {}) {
         var _a, _b, _c, _d, _e;
         const prev = data.get(name);
         if (prev !== value) {
-            if (control.firstNonEmpty(exports.BeforeChangeEventName, name, value)
+            if (control.firstNonEmpty(BeforeChangeEventName, name, value)
                 === false) {
                 return;
             }
@@ -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,24 +64,25 @@ 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);
                     }
-                    control.trigger(exports.EffectEventName, name, value);
+                    control.trigger(EffectEventName, name, value);
                     if (!isIntercepting) {
                         control.stopIntercepting();
                     }
                 }
                 catch (error) {
-                    control.trigger(exports.ErrorEventName, {
+                    control.trigger(ErrorEventName, {
                         error: error instanceof Error
                             ? error
                             : new Error(String(error)),
@@ -93,7 +90,8 @@ 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;
                     }
                     throw error;
@@ -101,13 +99,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)),
@@ -115,7 +113,8 @@ 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;
                     }
                     throw error;
@@ -143,7 +142,7 @@ 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();
+            const hasEffectListener = (_a = control.get(EffectEventName)) === null || _a === void 0 ? void 0 : _a.hasListener();
             if (hasEffectListener && !isIntercepting) {
                 control.intercept(effectInterceptor);
             }
@@ -153,7 +152,7 @@ function createStore(initialData = {}) {
                 }
             });
             try {
-                control.trigger(exports.ChangeEventName, [
+                control.trigger(ChangeEventName, [
                     ...changedKeys,
                     ...effectKeys,
                 ]);
@@ -163,15 +162,15 @@ function createStore(initialData = {}) {
                 }
             }
             catch (error) {
-                control.trigger(exports.ErrorEventName, {
+                control.trigger(ErrorEventName, {
                     error: error instanceof Error
                         ? error
                         : new Error(String(error)),
                     args: [name],
                     type: "store-control",
                 });
-                if ((_b = control.get(exports.ErrorEventName)) === null || _b === void 0 ? void 0 : _b.hasListener()) {
-                    return true;
+                if ((_b = control.get(ErrorEventName)) === null || _b === void 0 ? void 0 : _b.hasListener()) {
+                    return;
                 }
                 throw error;
             }
@@ -182,14 +181,16 @@ function createStore(initialData = {}) {
     }
     const get = (key) => {
         if (typeof key === "string") {
-            return data.get(key);
+            const value = data.get(key);
+            return value;
         }
         else if (Array.isArray(key)) {
             // return object with given keys
-            return key.reduce((acc, k) => {
-                acc[k] = data.get(k);
-                return acc;
-            }, {});
+            const result = {};
+            for (const k of key) {
+                result[k] = data.get(k);
+            }
+            return result;
         }
         else {
             throw new Error(`Invalid key: ${String(key)}`);
@@ -204,11 +205,16 @@ function createStore(initialData = {}) {
     const getData = () => {
         return Object.fromEntries(data.entries());
     };
+    let batching = false;
     const batch = (fn) => {
+        if (batching) {
+            throw new Error("Nested batch() calls are not supported");
+        }
+        batching = true;
         const allChangedKeys = [];
         const log = [];
         const controlInterceptor = function (name, [changedKeys]) {
-            if (name === exports.ChangeEventName) {
+            if (name === ChangeEventName) {
                 allChangedKeys.push(...changedKeys);
                 return false;
             }
@@ -220,9 +226,14 @@ function createStore(initialData = {}) {
         };
         changes.intercept(changeInterceptor);
         control.intercept(controlInterceptor);
-        fn();
-        control.stopIntercepting();
-        changes.stopIntercepting();
+        try {
+            fn();
+        }
+        finally {
+            control.stopIntercepting();
+            changes.stopIntercepting();
+            batching = false;
+        }
         for (const [propName, value, prev] of log) {
             const changeArgs = [
                 value,
@@ -231,12 +242,12 @@ function createStore(initialData = {}) {
             changes.trigger(propName, ...changeArgs);
         }
         if (allChangedKeys.length > 0) {
-            control.trigger(exports.ChangeEventName, allChangedKeys);
+            control.trigger(ChangeEventName, allChangedKeys);
         }
     };
     const reset = () => {
         data.clear();
-        control.trigger(exports.ResetEventName);
+        control.trigger(ResetEventName);
     };
     const api = {
         set,

package/package.json

@@ -1,34 +1,35 @@
 {
     "name": "@kuindji/reactive",
-    "version": "1.0.21",
+    "version": "1.0.24",
     "author": "Ivan Kuindzhi",
+    "type": "module",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/kuindji/reactive.git"
     },
     "main": "dist/index.js",
     "devDependencies": {
-        "@happy-dom/global-registrator": "^18.0.1",
+        "@happy-dom/global-registrator": "^20.0.11",
         "@testing-library/dom": "^10.4.1",
-        "@testing-library/jest-dom": "^6.6.4",
+        "@testing-library/jest-dom": "^6.9.1",
         "@testing-library/react": "^16.3.0",
-        "@types/bun": "^1.2.19",
-        "@types/react": "^19.1.9",
-        "@typescript-eslint/eslint-plugin": "^8.38.0",
-        "react": "^19.1.1",
-        "typescript": "^5",
-        "typescript-eslint": "^8.38.0"
+        "@types/bun": "^1.3.3",
+        "@types/react": "^19.2.7",
+        "@typescript-eslint/eslint-plugin": "^8.48.0",
+        "globals": "^16.5.0",
+        "react": "^19.2.0",
+        "react-dom": "^19.2.0",
+        "typescript": "^5.9.3",
+        "typescript-eslint": "^8.48.0"
     },
     "exports": {
         ".": {
-            "import": "./dist/index.js",
-            "require": "./dist/index.js",
-            "types": "./dist/index.d.ts"
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js"
         },
         "./react": {
-            "import": "./dist/react.js",
-            "require": "./dist/react.js",
-            "types": "./dist/react.d.ts"
+            "types": "./dist/react.d.ts",
+            "import": "./dist/react.js"
         }
     },
     "bugs": {
@@ -62,9 +63,10 @@
     "scripts": {
         "build": "tsc -p ./tsconfig-build.json",
         "lint": "bun eslint .",
-        "test": "bun test tests/**/*.spec.ts*"
+        "test": "bun test tests/**/*.spec.ts*",
+        "test:types": "tsc -p ./tests/types/tsconfig.json",
+        "test:all": "bun run test:types && bun run test"
     },
     "sideEffects": false,
-    "type": "commonjs",
     "types": "dist/index.d.ts"
 }