react-ui-basics 0.0.215 → 0.0.217

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-ui-basics",
-  "version": "0.0.215",
+  "version": "0.0.217",
   "description": "",
   "module": "index.js",
   "_main": "index.cjs.js",

package/src/store/Store.ts

@@ -2,73 +2,70 @@ import {useEffect, useState} from "react";
 import {createProxy} from "./ProxyTools";
 import {isFunction, isObject} from "../Tools";
 
-interface Stores {
-    [index: number]: any
-}
-
-let STORES: Stores = {}
-let COUNTER = 0
+const STORES = new Map<Symbol, Store<any>>()
 
 type Setter<T> = (oldState: T) => T | void;
+type ListenerFn = () => void;
+type UnsubscribeFn = () => void;
 
 abstract class AbstractStore<T> {
     get: () => T;
     set: (setter: T | Partial<T> | (Setter<T>)) => void;
     reset: () => void;
-    subscribe: (fn: () => void) => void;
-    unsubscribe: (fn: () => void) => void;
+    /**
+     * Return unsubscribe function
+     *
+     * @returns unsubscribe function.
+     */
+    subscribe: (fn: ListenerFn) => UnsubscribeFn;
     toString: () => string;
 }
 
+
 export class Store<T> extends AbstractStore<T> {
 
     constructor(initialState: T, name?: string) {
         super()
         let that = this;
-        let listeners: Array<() => void> = []
-        let index = '' + COUNTER++;
+        let listeners: Map<Symbol, ListenerFn> = new Map<Symbol, () => void>()
+        let value = initialState;
         let runListeners = () => {
-            listeners.forEach(fn => fn())
-        };
-
-        STORES[index] = initialState
-
-        that.unsubscribe = (fn: () => void) => {
-            let i = listeners.indexOf(fn)
-            let length = listeners.length;
-            if (i > -1) {
-                listeners[i] = listeners[length - 1]
-                listeners.splice(length - 1, 1)
+            for (let listener of listeners.values()) {
+                listener()
             }
-        }
-        that.get = (): T => STORES[index]
+        };
+        that.get = (): T => value;
         that.set = (setter) => {
             let result;
             if (isFunction(setter)) {
-                const proxy = createProxy(STORES[index]);
+                const proxy = createProxy(value as object);
                 result = (setter as Setter<T>)(proxy);
                 if (!result || result === proxy)
                     result = proxy.bake()
             } else if (isObject(setter)) {
-                result = {...STORES[index], ...setter}
+                result = {...value, ...setter}
             } else {
                 result = setter
             }
 
-            STORES[index] = result
+            value = result
             runListeners();
         }
-
         that.reset = () => {
-            STORES[index] = initialState
+            value = initialState
             runListeners();
         }
 
-        that.subscribe = (fn: () => void) => {
-            listeners.push(fn)
+        that.subscribe = (fn: ListenerFn) => {
+            const key = Symbol();
+            listeners.set(key, fn)
+            return () => {
+                listeners.delete(key)
+            }
         }
 
         that.toString = (): string => name;
+        STORES.set(Symbol(), that)
     }
 }
 
@@ -78,20 +75,12 @@ export function getGlobalState() {
     return STORES
 }
 
-export function resetGlobalState() {
-    STORES = {}
-}
-
-export function replaceGlobalState(state) {
-    STORES = state
-}
-
-
 export type Selector<T, R> = (t: T) => R;
 
 export const defaultSelector = <T>(store: T): T => store;
 
 export function useStore<T, R>(store: Store<T>, selector: Selector<T, R>, selectorDependencies: ReadonlyArray<any>): R
+export function useStore<T, R>(store: Store<T>, selector: Selector<T, R>, selectorDependencies?: undefined): R
 export function useStore<T>(store: Store<T>, selector?: undefined, selectorDependencies?: undefined): T
 export function useStore<T, R>(store: Store<T>, selector?: Selector<T, R>, selectorDependencies: ReadonlyArray<any> = []): R {
     if (!selector)
@@ -104,10 +93,7 @@ export function useStore<T, R>(store: Store<T>, selector?: Selector<T, R>, selec
             setState(selector(store.get()))
         };
         updateState()
-        store.subscribe(updateState)
-        return () => {
-            store.unsubscribe(updateState);
-        }
+        return store.subscribe(updateState)
     }, selectorDependencies)
 
     return state

package/store/Store.d.ts

@@ -1,23 +1,25 @@
-interface Stores {
-    [index: number]: any;
-}
 declare type Setter<T> = (oldState: T) => T | void;
+declare type ListenerFn = () => void;
+declare type UnsubscribeFn = () => void;
 declare abstract class AbstractStore<T> {
     get: () => T;
     set: (setter: T | Partial<T> | (Setter<T>)) => void;
     reset: () => void;
-    subscribe: (fn: () => void) => void;
-    unsubscribe: (fn: () => void) => void;
+    /**
+     * Return unsubscribe function
+     *
+     * @returns unsubscribe function.
+     */
+    subscribe: (fn: ListenerFn) => UnsubscribeFn;
     toString: () => string;
 }
 export declare class Store<T> extends AbstractStore<T> {
     constructor(initialState: T, name?: string);
 }
 export default Store;
-export declare function getGlobalState(): Stores;
-export declare function resetGlobalState(): void;
-export declare function replaceGlobalState(state: any): void;
+export declare function getGlobalState(): Map<Symbol, Store<any>>;
 export declare type Selector<T, R> = (t: T) => R;
 export declare const defaultSelector: <T>(store: T) => T;
 export declare function useStore<T, R>(store: Store<T>, selector: Selector<T, R>, selectorDependencies: ReadonlyArray<any>): R;
+export declare function useStore<T, R>(store: Store<T>, selector: Selector<T, R>, selectorDependencies?: undefined): R;
 export declare function useStore<T>(store: Store<T>, selector?: undefined, selectorDependencies?: undefined): T;

package/store/Store.js

@@ -2,65 +2,56 @@ import ReactConstants from "./../ReactConstants"; import {clientHeight as __clie
 import { createProxy } from './ProxyTools.js';
 import { isFunction, isObject } from '../Tools.js';
 
-let STORES = {};
-let COUNTER = 0;
+const STORES = new Map();
 class AbstractStore {
 }
 class Store extends AbstractStore {
     constructor(initialState, name) {
         super();
         let that = this;
-        let listeners = [];
-        let index = '' + COUNTER++;
+        let listeners = new Map();
+        let value = initialState;
         let runListeners = () => {
-            listeners.forEach(fn => fn());
-        };
-        STORES[index] = initialState;
-        that.unsubscribe = (fn) => {
-            let i = listeners.indexOf(fn);
-            let length = __length(listeners);
-            if (i > -1) {
-                listeners[i] = listeners[length - 1];
-                listeners.splice(length - 1, 1);
+            for (let listener of listeners.values()) {
+                listener();
             }
         };
-        that.get = () => STORES[index];
+        that.get = () => value;
         that.set = (setter) => {
             let result;
             if (isFunction(setter)) {
-                const proxy = createProxy(STORES[index]);
+                const proxy = createProxy(value);
                 result = setter(proxy);
                 if (!result || result === proxy)
                     result = proxy.bake();
             }
             else if (isObject(setter)) {
-                result = __extends(__extends({}, STORES[index]), setter);
+                result = __extends(__extends({}, value), setter);
             }
             else {
                 result = setter;
             }
-            STORES[index] = result;
+            value = result;
             runListeners();
         };
         that.reset = () => {
-            STORES[index] = initialState;
+            value = initialState;
             runListeners();
         };
         that.subscribe = (fn) => {
-            listeners.push(fn);
+            const key = Symbol();
+            listeners.set(key, fn);
+            return () => {
+                listeners.delete(key);
+            };
         };
         that.toString = () => name;
+        STORES.set(Symbol(), that);
     }
 }
 function getGlobalState() {
     return STORES;
 }
-function resetGlobalState() {
-    STORES = {};
-}
-function replaceGlobalState(state) {
-    STORES = state;
-}
 const defaultSelector = (store) => store;
 function useStore(store, selector, selectorDependencies = []) {
     if (!selector)
@@ -71,13 +62,10 @@ function useStore(store, selector, selectorDependencies = []) {
             setState(selector(store.get()));
         };
         updateState();
-        store.subscribe(updateState);
-        return () => {
-            store.unsubscribe(updateState);
-        };
+        return store.subscribe(updateState);
     }, selectorDependencies);
     return state;
 }
 
-export { Store, Store as default, defaultSelector, getGlobalState, replaceGlobalState, resetGlobalState, useStore };
+export { Store, Store as default, defaultSelector, getGlobalState, useStore };
 //# sourceMappingURL=Store.js.map

package/store/Store.js.map

@@ -1 +1 @@
-{"version":3,"file":"Store.js","sources":["../src/store/Store.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"Store.js","sources":["../src/store/Store.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}