react-better-model 0.1.0 → 0.1.1

package/lib/index.d.ts

@@ -1,17 +1,24 @@
 import { Context } from 'react';
-export declare class Model<S, E> {
+declare type Sub<S, K extends keyof S = keyof S> = (v: S[K]) => void;
+export declare class Model<S, E = {}> {
     state: S;
+    events: E;
     private subs;
+    private listeners;
+    private updateSingleSubscriber;
     private updateSubscribers;
-    constructor(state?: S);
-    eventListeners: Map<keyof E, Set<(eventData: E[keyof E]) => void>>;
-    evtDataTypes: E;
-    onStateChange: (k: keyof S, cb: (v: S[keyof S]) => void) => () => void;
-    setState(delta: Partial<S>): void;
-    onEvent: (evt: keyof typeof this.evtDataTypes, cb: (eventData: E[keyof E]) => void) => () => void;
-    emitEvent: (evt: keyof E, data: E[keyof E]) => void;
+    private updateEventListeners;
+    private initialState;
+    constructor(state?: S, events?: E);
+    onStateChange: <K extends keyof S>(k: K, cb: Sub<S>) => () => void;
+    setState: (delta: Partial<S>) => void;
+    setValue: <K extends keyof S>(key: K, value: S[K]) => void;
+    onEvent: <K extends keyof E>(k: K, cb: Sub<E>) => () => void;
+    dispatch: <K extends keyof E>(key: K, data?: (E[K] extends undefined ? never : E[K]) | undefined) => void;
+    reset: () => void;
 }
-export declare function useModelInstanceState<M extends Model<M['state'], M['evtDataTypes']>>(viewModel: M, key: keyof M['state']): (M["state"][keyof M["state"]] | ((v: any) => void))[];
-export declare function useModelCtxState<M extends Model<M['state'], M['evtDataTypes']>>(ctx: Context<M>, key: keyof M['state']): (M["state"][keyof M["state"]] | ((v: any) => void))[];
-export declare function useModelInstanceEvent<M extends Model<M['state'], M['evtDataTypes']>, NS extends keyof M['evtDataTypes']>(viewModel: M, ns: NS, cb?: (eventData: M['evtDataTypes'][NS]) => void): (data: M['evtDataTypes'][NS]) => void;
-export declare function useModelCtxEvent<M extends Model<M['state'], M['evtDataTypes']>, NS extends keyof M['evtDataTypes']>(ctx: Context<M>, ns: NS, cb?: (eventData: M['evtDataTypes'][NS]) => void): (data: M["evtDataTypes"][NS]) => void;
+export declare function useModelInstanceState<K extends keyof M['state'], M extends Model<M['state'], M['events']>>(viewModel: M, key: K): [M['state'][K], (data: M['state'][K]) => void];
+export declare function useModelCtxState<K extends keyof M['state'], M extends Model<M['state'], M['events']>>(ctx: Context<M>, key: K): [M["state"][K], (data: M["state"][K]) => void];
+export declare function useModelInstanceEvent<K extends keyof M['events'], D extends M['events'], M extends Model<M['state'], M['events']>>(viewModel: M, ns: K, cb?: Sub<D, K>): (data?: (D[K] extends undefined ? never : D[K]) | undefined) => void;
+export declare function useModelCtxEvent<K extends keyof M['events'], D extends M['events'], M extends Model<M['state'], M['events']>>(ctx: Context<M>, ns: K, cb?: (eventData: D[K]) => void): (data?: (D[K] extends undefined ? never : D[K]) | undefined) => void;
+export {};

package/lib/index.js

@@ -14,11 +14,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModelCtxEvent = exports.useModelInstanceEvent = exports.useModelCtxState = exports.useModelInstanceState = exports.Model = void 0;
 var react_1 = require("react");
 var Model = /** @class */ (function () {
-    function Model(state) {
+    function Model(state, events) {
         var _this = this;
         if (state === void 0) { state = {}; }
+        if (events === void 0) { events = {}; }
         this.state = state;
+        this.events = events;
         this.subs = new Map();
+        this.listeners = new Map();
+        this.updateSingleSubscriber = function (k, v) {
+            var _a;
+            (_a = _this.subs.get(k)) === null || _a === void 0 ? void 0 : _a.forEach(function (cb) { return cb(v); });
+        };
         this.updateSubscribers = function (delta) {
             var keyVals = Object.entries(delta);
             var _loop_1 = function (key, val) {
@@ -33,8 +40,11 @@ var Model = /** @class */ (function () {
                 _loop_1(key, val);
             }
         };
-        this.eventListeners = new Map();
-        this.evtDataTypes = {};
+        this.updateEventListeners = function (k, data) {
+            var _a;
+            (_a = _this.listeners.get(k)) === null || _a === void 0 ? void 0 : _a.forEach(function (cb) { return cb(data); });
+        };
+        this.initialState = {};
         this.onStateChange = function (k, cb) {
             var keySubs = _this.subs.get(k);
             if (!keySubs) {
@@ -46,29 +56,33 @@ var Model = /** @class */ (function () {
                 keySubs.delete(cb);
             };
         };
-        this.onEvent = function (evt, cb) {
-            var listeners = _this.eventListeners.get(evt);
-            if (!listeners) {
-                listeners = new Set();
-                _this.eventListeners.set(evt, listeners);
+        this.setState = function (delta) {
+            _this.state = __assign(__assign({}, _this.state), delta);
+            _this.updateSubscribers(delta);
+        };
+        this.setValue = function (key, value) {
+            _this.state[key] = value;
+            _this.updateSingleSubscriber(key, value);
+        };
+        this.onEvent = function (k, cb) {
+            var nsListeners = _this.listeners.get(k);
+            if (!nsListeners) {
+                nsListeners = new Set();
+                _this.listeners.set(k, nsListeners);
             }
-            listeners.add(cb);
+            nsListeners.add(cb);
             return function () {
-                listeners.delete(cb);
+                nsListeners.delete(cb);
             };
         };
-        this.emitEvent = function (evt, data) {
-            if (_this.eventListeners.has(evt)) {
-                _this.eventListeners.get(evt).forEach(function (cb) {
-                    cb(data);
-                });
-            }
+        this.dispatch = function (key, data) {
+            _this.updateEventListeners(key, data);
+        };
+        this.reset = function () {
+            _this.setState(_this.initialState);
         };
+        this.initialState = state;
     }
-    Model.prototype.setState = function (delta) {
-        this.state = __assign(__assign({}, this.state), delta);
-        this.updateSubscribers(delta);
-    };
     return Model;
 }());
 exports.Model = Model;
@@ -76,8 +90,7 @@ function useModelInstanceState(viewModel, key) {
     var _a = (0, react_1.useState)(viewModel.state[key]), value = _a[0], setValue = _a[1];
     (0, react_1.useEffect)(function () { return viewModel.onStateChange(key, setValue); }, []);
     var setter = (0, react_1.useCallback)(function (v) {
-        var _a;
-        viewModel.setState((_a = {}, _a[key] = v, _a));
+        viewModel.setValue(key, v);
     }, [key]);
     return [value, setter];
 }
@@ -93,7 +106,7 @@ function useModelInstanceEvent(viewModel, ns, cb) {
             return viewModel.onEvent(ns, cb);
         }
     }, [cb]);
-    return function (data) { return viewModel.emitEvent(ns, data); };
+    return function (data) { return viewModel.dispatch(ns, data); };
 }
 exports.useModelInstanceEvent = useModelInstanceEvent;
 function useModelCtxEvent(ctx, ns, cb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-better-model",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",