@legendapp/state 0.9.2-alpha.9 → 0.10.0-next.2

package/react.cjs

@@ -0,0 +1,124 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var state = require('@legendapp/state');
+var react = require('react');
+
+function useForceRender() {
+    const [, forceRender] = react.useReducer((s) => s + 1, 0);
+    return () => forceRender();
+}
+const pathsSeen = new Set();
+/**
+ * A React hook that listens to observables and returns their values.
+ *
+ * @param fn A function that returns a single observable, an array of observables, or a flat object of observables
+ *
+ * @see https://www.legendapp.com/dev/state/react/#useobservables
+ */
+function useObservables(fn) {
+    const forceRender = useForceRender();
+    const ref = react.useRef();
+    if (!ref.current) {
+        ref.current = {
+            listeners: new Map(),
+        };
+    }
+    // Start tracking to fill trackedNodes with all nodes accessed
+    let ret;
+    state.tracking.is = true;
+    state.trackedNodes.length = 0;
+    const args = fn();
+    if (args !== undefined) {
+        if (args[state.symbolIsObservable]) {
+            ret = state.getObservableRawValue(args);
+        }
+        else if (args) {
+            if (state.isPrimitive(args)) {
+                ret = args;
+            }
+            else if (state.isArray(args)) {
+                ret = [];
+                for (let i = 0; i < args.length; i++) {
+                    ret[i] = state.getObservableRawValue(args[i]);
+                }
+            }
+            else if (state.isObject(args)) {
+                if (args[state.symbolShallow] || args[state.symbolShouldRender]) {
+                    ret = state.getObservableRawValue(args);
+                }
+                else {
+                    ret = {};
+                    const keys = Object.keys(args);
+                    const length = keys.length;
+                    for (let i = 0; i < length; i++) {
+                        const key = keys[i];
+                        ret[key] = state.getObservableRawValue(args[key]);
+                    }
+                }
+            }
+        }
+    }
+    state.tracking.is = false;
+    pathsSeen.clear();
+    const listeners = ref.current.listeners;
+    for (let tracked of state.trackedNodes) {
+        const { node, shouldRender, shallow } = tracked;
+        const path = node.path;
+        // Track the paths seen this frame to dispose of listeners no longer needed
+        pathsSeen.add(path);
+        // Listen to this path if not already listening
+        if (!listeners.has(path)) {
+            let cb = forceRender;
+            // If using shouldRender, only render when the return value of shouldRender changes
+            if (shouldRender) {
+                cb = (v, getPrev) => {
+                    const prev = getPrev();
+                    if (shouldRender(v, prev)) {
+                        forceRender();
+                    }
+                };
+            }
+            listeners.set(path, shallow ? state.onChangeShallow(node, cb) : state.onChange(node, cb));
+        }
+    }
+    // Dispose any listeners not seen in this frame
+    // TODO Faster way to do this than forEach?
+    listeners.forEach((listener, listenerPath) => {
+        if (!pathsSeen.has(listenerPath)) {
+            listener.dispose();
+            listeners.delete(listenerPath);
+        }
+    });
+    // Dispose listeners on unmount
+    react.useEffect(() => () => {
+        const listeners = ref.current.listeners;
+        if (listeners) {
+            listeners.forEach((listener) => listener.dispose());
+        }
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
+    return ret;
+}
+
+/**
+ * A React hook that creates a new observable and can optionally listen or persist its state.
+ *
+ * @param value The initial value of the observable or a function that returns the initial value
+ * @param observe (optional) Listen to the observable for changes
+ * @param persist (optional) PersistOptions for peristing the observable to state
+ *
+ * @see https://www.legendapp.com/dev/state/react/#usenewobservable
+ */
+function useNewObservable(value, observe) {
+    // Create the observable from the default value
+    const obs = react.useMemo(() => state.observable(state.isFunction(value) ? value() : value), []); // eslint-disable-line react-hooks/exhaustive-deps
+    if (observe !== false) {
+        useObservables(() => [obs]);
+    }
+    return [obs, obs[state.symbolGet]];
+}
+
+exports.useNewObservable = useNewObservable;
+exports.useObservables = useObservables;
+//# sourceMappingURL=react.cjs.map

package/react.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"react.cjs","sources":["../../src/react/useObservables.ts","../../src/react/useNewObservable.ts"],"sourcesContent":[null,null],"names":["useReducer","useRef","tracking","trackedNodes","symbolIsObservable","getObservableRawValue","isPrimitive","isArray","isObject","symbolShallow","symbolShouldRender","onChangeShallow","onChange","useEffect","useMemo","observable","isFunction","symbolGet"],"mappings":"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"}

package/react.d.ts

@@ -1,4 +1,2 @@
-export * from './src/react/useNewObservable';
 export * from './src/react/useObservables';
-export * from './src/react/usePrimitiveFunctions';
-export * from './src/react/useComputed';
+export * from './src/react/useNewObservable';

package/react.esm.mjs

@@ -0,0 +1,119 @@
+import { tracking, trackedNodes, symbolIsObservable, getObservableRawValue, isPrimitive, isArray, isObject, symbolShallow, symbolShouldRender, onChangeShallow, onChange, observable, isFunction, symbolGet } from '@legendapp/state';
+import { useRef, useEffect, useReducer, useMemo } from 'react';
+
+function useForceRender() {
+    const [, forceRender] = useReducer((s) => s + 1, 0);
+    return () => forceRender();
+}
+const pathsSeen = new Set();
+/**
+ * A React hook that listens to observables and returns their values.
+ *
+ * @param fn A function that returns a single observable, an array of observables, or a flat object of observables
+ *
+ * @see https://www.legendapp.com/dev/state/react/#useobservables
+ */
+function useObservables(fn) {
+    const forceRender = useForceRender();
+    const ref = useRef();
+    if (!ref.current) {
+        ref.current = {
+            listeners: new Map(),
+        };
+    }
+    // Start tracking to fill trackedNodes with all nodes accessed
+    let ret;
+    tracking.is = true;
+    trackedNodes.length = 0;
+    const args = fn();
+    if (args !== undefined) {
+        if (args[symbolIsObservable]) {
+            ret = getObservableRawValue(args);
+        }
+        else if (args) {
+            if (isPrimitive(args)) {
+                ret = args;
+            }
+            else if (isArray(args)) {
+                ret = [];
+                for (let i = 0; i < args.length; i++) {
+                    ret[i] = getObservableRawValue(args[i]);
+                }
+            }
+            else if (isObject(args)) {
+                if (args[symbolShallow] || args[symbolShouldRender]) {
+                    ret = getObservableRawValue(args);
+                }
+                else {
+                    ret = {};
+                    const keys = Object.keys(args);
+                    const length = keys.length;
+                    for (let i = 0; i < length; i++) {
+                        const key = keys[i];
+                        ret[key] = getObservableRawValue(args[key]);
+                    }
+                }
+            }
+        }
+    }
+    tracking.is = false;
+    pathsSeen.clear();
+    const listeners = ref.current.listeners;
+    for (let tracked of trackedNodes) {
+        const { node, shouldRender, shallow } = tracked;
+        const path = node.path;
+        // Track the paths seen this frame to dispose of listeners no longer needed
+        pathsSeen.add(path);
+        // Listen to this path if not already listening
+        if (!listeners.has(path)) {
+            let cb = forceRender;
+            // If using shouldRender, only render when the return value of shouldRender changes
+            if (shouldRender) {
+                cb = (v, getPrev) => {
+                    const prev = getPrev();
+                    if (shouldRender(v, prev)) {
+                        forceRender();
+                    }
+                };
+            }
+            listeners.set(path, shallow ? onChangeShallow(node, cb) : onChange(node, cb));
+        }
+    }
+    // Dispose any listeners not seen in this frame
+    // TODO Faster way to do this than forEach?
+    listeners.forEach((listener, listenerPath) => {
+        if (!pathsSeen.has(listenerPath)) {
+            listener.dispose();
+            listeners.delete(listenerPath);
+        }
+    });
+    // Dispose listeners on unmount
+    useEffect(() => () => {
+        const listeners = ref.current.listeners;
+        if (listeners) {
+            listeners.forEach((listener) => listener.dispose());
+        }
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
+    return ret;
+}
+
+/**
+ * A React hook that creates a new observable and can optionally listen or persist its state.
+ *
+ * @param value The initial value of the observable or a function that returns the initial value
+ * @param observe (optional) Listen to the observable for changes
+ * @param persist (optional) PersistOptions for peristing the observable to state
+ *
+ * @see https://www.legendapp.com/dev/state/react/#usenewobservable
+ */
+function useNewObservable(value, observe) {
+    // Create the observable from the default value
+    const obs = useMemo(() => observable(isFunction(value) ? value() : value), []); // eslint-disable-line react-hooks/exhaustive-deps
+    if (observe !== false) {
+        useObservables(() => [obs]);
+    }
+    return [obs, obs[symbolGet]];
+}
+
+export { useNewObservable, useObservables };
+//# sourceMappingURL=react.esm.mjs.map

package/react.esm.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"react.esm.mjs","sources":["../../src/react/useObservables.ts","../../src/react/useNewObservable.ts"],"sourcesContent":[null,null],"names":[],"mappings":"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"}

package/react.js

@@ -1,21 +1,124 @@
-"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]; } };
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var state = require('@legendapp/state');
+var react = require('react');
+
+function useForceRender() {
+    const [, forceRender] = react.useReducer((s) => s + 1, 0);
+    return () => forceRender();
+}
+const pathsSeen = new Set();
+/**
+ * A React hook that listens to observables and returns their values.
+ *
+ * @param fn A function that returns a single observable, an array of observables, or a flat object of observables
+ *
+ * @see https://www.legendapp.com/dev/state/react/#useobservables
+ */
+function useObservables(fn) {
+    const forceRender = useForceRender();
+    const ref = react.useRef();
+    if (!ref.current) {
+        ref.current = {
+            listeners: new Map(),
+        };
     }
-    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("./src/react/useNewObservable"), exports);
-__exportStar(require("./src/react/useObservables"), exports);
-__exportStar(require("./src/react/usePrimitiveFunctions"), exports);
-__exportStar(require("./src/react/useComputed"), exports);
-//# sourceMappingURL=react.js.map
+    // Start tracking to fill trackedNodes with all nodes accessed
+    let ret;
+    state.tracking.is = true;
+    state.trackedNodes.length = 0;
+    const args = fn();
+    if (args !== undefined) {
+        if (args[state.symbolIsObservable]) {
+            ret = state.getObservableRawValue(args);
+        }
+        else if (args) {
+            if (state.isPrimitive(args)) {
+                ret = args;
+            }
+            else if (state.isArray(args)) {
+                ret = [];
+                for (let i = 0; i < args.length; i++) {
+                    ret[i] = state.getObservableRawValue(args[i]);
+                }
+            }
+            else if (state.isObject(args)) {
+                if (args[state.symbolShallow] || args[state.symbolShouldRender]) {
+                    ret = state.getObservableRawValue(args);
+                }
+                else {
+                    ret = {};
+                    const keys = Object.keys(args);
+                    const length = keys.length;
+                    for (let i = 0; i < length; i++) {
+                        const key = keys[i];
+                        ret[key] = state.getObservableRawValue(args[key]);
+                    }
+                }
+            }
+        }
+    }
+    state.tracking.is = false;
+    pathsSeen.clear();
+    const listeners = ref.current.listeners;
+    for (let tracked of state.trackedNodes) {
+        const { node, shouldRender, shallow } = tracked;
+        const path = node.path;
+        // Track the paths seen this frame to dispose of listeners no longer needed
+        pathsSeen.add(path);
+        // Listen to this path if not already listening
+        if (!listeners.has(path)) {
+            let cb = forceRender;
+            // If using shouldRender, only render when the return value of shouldRender changes
+            if (shouldRender) {
+                cb = (v, getPrev) => {
+                    const prev = getPrev();
+                    if (shouldRender(v, prev)) {
+                        forceRender();
+                    }
+                };
+            }
+            listeners.set(path, shallow ? state.onChangeShallow(node, cb) : state.onChange(node, cb));
+        }
+    }
+    // Dispose any listeners not seen in this frame
+    // TODO Faster way to do this than forEach?
+    listeners.forEach((listener, listenerPath) => {
+        if (!pathsSeen.has(listenerPath)) {
+            listener.dispose();
+            listeners.delete(listenerPath);
+        }
+    });
+    // Dispose listeners on unmount
+    react.useEffect(() => () => {
+        const listeners = ref.current.listeners;
+        if (listeners) {
+            listeners.forEach((listener) => listener.dispose());
+        }
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
+    return ret;
+}
+
+/**
+ * A React hook that creates a new observable and can optionally listen or persist its state.
+ *
+ * @param value The initial value of the observable or a function that returns the initial value
+ * @param observe (optional) Listen to the observable for changes
+ * @param persist (optional) PersistOptions for peristing the observable to state
+ *
+ * @see https://www.legendapp.com/dev/state/react/#usenewobservable
+ */
+function useNewObservable(value, observe) {
+    // Create the observable from the default value
+    const obs = react.useMemo(() => state.observable(state.isFunction(value) ? value() : value), []); // eslint-disable-line react-hooks/exhaustive-deps
+    if (observe !== false) {
+        useObservables(() => [obs]);
+    }
+    return [obs, obs[state.symbolGet]];
+}
+
+exports.useNewObservable = useNewObservable;
+exports.useObservables = useObservables;
+//# sourceMappingURL=react.js.map

package/react.js.map

@@ -1 +1 @@
-{"version":3,"file":"react.js","sourceRoot":"","sources":["../react.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,6DAA2C;AAC3C,oEAAkD;AAClD,0DAAwC"}
+{"version":3,"file":"react.js","sources":["../../src/react/useObservables.ts","../../src/react/useNewObservable.ts"],"sourcesContent":[null,null],"names":["useReducer","useRef","tracking","trackedNodes","symbolIsObservable","getObservableRawValue","isPrimitive","isArray","isObject","symbolShallow","symbolShouldRender","onChangeShallow","onChange","useEffect","useMemo","observable","isFunction","symbolGet"],"mappings":"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"}

package/src/globals.d.ts

@@ -1,9 +1,14 @@
+import { ObservableCheckerRender, ProxyValue } from './observableInterfaces';
+export declare const delim = "\uFEFF";
 export declare const symbolDateModified: unique symbol;
 export declare const symbolShallow: unique symbol;
-export declare const symbolValue: unique symbol;
-export declare function removeNullUndefined<T extends Record<string, any>>(a: T): any;
-export declare function replaceKeyInObject(obj: object, keySource: any, keyTarget: any, clone: boolean): Record<any, any>;
-export declare function isPrimitive(val: any): boolean;
-export declare function isCollection(obj: any): boolean;
-export declare function getDateModifiedKey(dateModifiedKey: string): string;
-export declare function clone(obj: any): any;
+export declare const symbolShouldRender: unique symbol;
+export declare const symbolGet: unique symbol;
+export declare const symbolIsObservable: unique symbol;
+export declare function getNodeValue(node: ProxyValue): any;
+export declare function getParentNode(node: ProxyValue): {
+    parent: ProxyValue;
+    key: string | number;
+};
+export declare function getChildNode(node: ProxyValue, key: string | number): ProxyValue;
+export declare function getObservableRawValue<T>(obs: ObservableCheckerRender<T>): T;

package/src/helpers.d.ts

@@ -0,0 +1,5 @@
+import type { ShouldRender, Observable, Shallow } from './observableInterfaces';
+export declare function shallow(obs: Observable): Shallow;
+export declare function shouldRender<T>(obs: Observable<T>, fn: (value: T, prev: T) => any): ShouldRender;
+export declare function isObservable(obs: any): boolean;
+export declare function mergeIntoObservable(target: Observable, ...sources: any[]): any;

package/src/is.d.ts

@@ -0,0 +1,7 @@
+export declare function isArray(obj: unknown): obj is Array<any>;
+export declare function isString(obj: unknown): obj is string;
+export declare function isObject(obj: unknown): obj is Record<any, any>;
+export declare function isFunction(obj: unknown): obj is Function;
+export declare function isPrimitive(arg: any): boolean;
+export declare function isObjectEmpty(obj: object): boolean;
+export declare function isSymbol(obj: unknown): obj is symbol;

package/src/observable.d.ts

@@ -1,8 +1,6 @@
-import { Observable, ObservableChecker, ObservableCheckerWriteable, ObservableUnsafe, ValidObservableParam } from './observableInterfaces';
-export declare function setter<T>(obs: ObservableCheckerWriteable<T>): any;
-export declare function getter<T>(obs: ObservableChecker<T>): any;
-export declare function assigner<T>(obs: ObservableCheckerWriteable<T>): any;
-export declare function deleteFn(obs: ObservableCheckerWriteable, target: any, prop?: string | number | symbol): ObservableCheckerWriteable<any>;
-declare function observable<T>(value?: ValidObservableParam<T>): Observable<T>;
-declare function observable<T>(value: ValidObservableParam<T>, unsafe: true): ObservableUnsafe<T>;
-export { observable };
+import { Observable, ObservablePrimitive } from './observableInterfaces';
+export declare function observable<T extends object | Array<any>>(obj: T): Observable<T>;
+export declare function observable<T extends boolean>(prim: T): ObservablePrimitive<boolean>;
+export declare function observable<T extends string>(prim: T): ObservablePrimitive<string>;
+export declare function observable<T extends number>(prim: T): ObservablePrimitive<number>;
+export declare function observable<T extends boolean | string | number>(prim: T): ObservablePrimitive<T>;

package/src/observableBatcher.d.ts

@@ -1,7 +1,16 @@
-import { ListenerFn, ObservableListenerInfo } from './observableInterfaces';
-export declare function observableBatcherNotify(cb: ListenerFn<any>, value: any, info: ObservableListenerInfo): void;
+import { ListenerFn } from './observableInterfaces';
+interface BatchItem {
+    cb: ListenerFn<any>;
+    value: any;
+    getPrevious: () => any;
+    path: (string | number)[];
+    valueAtPath: any;
+    prevAtPath: any;
+}
+export declare function observableBatcherNotify(b: BatchItem): void;
 export declare namespace observableBatcher {
     function batch(fn: () => void): void;
     function begin(): void;
     function end(force?: boolean): void;
 }
+export {};

package/src/observableComputed.d.ts

@@ -1,2 +1,2 @@
-import type { ObservableComputed, ValidObservableParam } from './observableInterfaces';
-export declare function observableComputed<T>(compute: () => ValidObservableParam<T>): ObservableComputed<T>;
+import { ObservableComputed } from './observableInterfaces';
+export declare function observableComputed<T>(compute: () => T): ObservableComputed<T>;