@legendapp/state 0.9.1-alpha.9 → 0.9.2-alpha.2

package/index.d.ts

@@ -1,9 +1,8 @@
-export { configureObservable } from './configureObservable';
-export { observable, setter, getter, assigner } from './observable';
-export { prop, shallow, isObservable, isObservableEvent, merge, listen, unlisten } from './observableFns';
-export { disposeListener } from './observableListener';
-export { observableBatcher } from './observableBatcher';
-export { observableComputed } from './observableComputed';
-export { observableEvent } from './observableEvent';
-export { persistObservable } from './persistObservable';
-export * from './observableInterfaces';
+export { configureObservable } from './src/configureObservable';
+export { assigner, getter, observable, setter } from './src/observable';
+export { observableBatcher } from './src/observableBatcher';
+export { observableComputed } from './src/observableComputed';
+export { observableEvent } from './src/observableEvent';
+export { disposeListener, isObservable, isObservableEvent, listen, mergeIntoObservable, prop, shallow, unlisten, } from './src/observableFns';
+export * from './src/observableInterfaces';
+export { persistObservable } from './src/persistObservable';

package/index.js

@@ -14,31 +14,30 @@ 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 });
-exports.persistObservable = exports.observableEvent = exports.observableComputed = exports.observableBatcher = exports.disposeListener = exports.unlisten = exports.listen = exports.merge = exports.isObservableEvent = exports.isObservable = exports.shallow = exports.prop = exports.assigner = exports.getter = exports.setter = exports.observable = exports.configureObservable = void 0;
-var configureObservable_1 = require("./configureObservable");
+exports.persistObservable = exports.unlisten = exports.shallow = exports.prop = exports.mergeIntoObservable = exports.listen = exports.isObservableEvent = exports.isObservable = exports.disposeListener = exports.observableEvent = exports.observableComputed = exports.observableBatcher = exports.setter = exports.observable = exports.getter = exports.assigner = exports.configureObservable = void 0;
+var configureObservable_1 = require("./src/configureObservable");
 Object.defineProperty(exports, "configureObservable", { enumerable: true, get: function () { return configureObservable_1.configureObservable; } });
-var observable_1 = require("./observable");
+var observable_1 = require("./src/observable");
+Object.defineProperty(exports, "assigner", { enumerable: true, get: function () { return observable_1.assigner; } });
+Object.defineProperty(exports, "getter", { enumerable: true, get: function () { return observable_1.getter; } });
 Object.defineProperty(exports, "observable", { enumerable: true, get: function () { return observable_1.observable; } });
 Object.defineProperty(exports, "setter", { enumerable: true, get: function () { return observable_1.setter; } });
-Object.defineProperty(exports, "getter", { enumerable: true, get: function () { return observable_1.getter; } });
-Object.defineProperty(exports, "assigner", { enumerable: true, get: function () { return observable_1.assigner; } });
-var observableFns_1 = require("./observableFns");
-Object.defineProperty(exports, "prop", { enumerable: true, get: function () { return observableFns_1.prop; } });
-Object.defineProperty(exports, "shallow", { enumerable: true, get: function () { return observableFns_1.shallow; } });
+var observableBatcher_1 = require("./src/observableBatcher");
+Object.defineProperty(exports, "observableBatcher", { enumerable: true, get: function () { return observableBatcher_1.observableBatcher; } });
+var observableComputed_1 = require("./src/observableComputed");
+Object.defineProperty(exports, "observableComputed", { enumerable: true, get: function () { return observableComputed_1.observableComputed; } });
+var observableEvent_1 = require("./src/observableEvent");
+Object.defineProperty(exports, "observableEvent", { enumerable: true, get: function () { return observableEvent_1.observableEvent; } });
+var observableFns_1 = require("./src/observableFns");
+Object.defineProperty(exports, "disposeListener", { enumerable: true, get: function () { return observableFns_1.disposeListener; } });
 Object.defineProperty(exports, "isObservable", { enumerable: true, get: function () { return observableFns_1.isObservable; } });
 Object.defineProperty(exports, "isObservableEvent", { enumerable: true, get: function () { return observableFns_1.isObservableEvent; } });
-Object.defineProperty(exports, "merge", { enumerable: true, get: function () { return observableFns_1.merge; } });
 Object.defineProperty(exports, "listen", { enumerable: true, get: function () { return observableFns_1.listen; } });
+Object.defineProperty(exports, "mergeIntoObservable", { enumerable: true, get: function () { return observableFns_1.mergeIntoObservable; } });
+Object.defineProperty(exports, "prop", { enumerable: true, get: function () { return observableFns_1.prop; } });
+Object.defineProperty(exports, "shallow", { enumerable: true, get: function () { return observableFns_1.shallow; } });
 Object.defineProperty(exports, "unlisten", { enumerable: true, get: function () { return observableFns_1.unlisten; } });
-var observableListener_1 = require("./observableListener");
-Object.defineProperty(exports, "disposeListener", { enumerable: true, get: function () { return observableListener_1.disposeListener; } });
-var observableBatcher_1 = require("./observableBatcher");
-Object.defineProperty(exports, "observableBatcher", { enumerable: true, get: function () { return observableBatcher_1.observableBatcher; } });
-var observableComputed_1 = require("./observableComputed");
-Object.defineProperty(exports, "observableComputed", { enumerable: true, get: function () { return observableComputed_1.observableComputed; } });
-var observableEvent_1 = require("./observableEvent");
-Object.defineProperty(exports, "observableEvent", { enumerable: true, get: function () { return observableEvent_1.observableEvent; } });
-var persistObservable_1 = require("./persistObservable");
+__exportStar(require("./src/observableInterfaces"), exports);
+var persistObservable_1 = require("./src/persistObservable");
 Object.defineProperty(exports, "persistObservable", { enumerable: true, get: function () { return persistObservable_1.persistObservable; } });
-__exportStar(require("./observableInterfaces"), exports);
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6DAA4D;AAAnD,0HAAA,mBAAmB,OAAA;AAC5B,2CAAoE;AAA3D,wGAAA,UAAU,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,sGAAA,QAAQ,OAAA;AAC7C,iDAA0G;AAAjG,qGAAA,IAAI,OAAA;AAAE,wGAAA,OAAO,OAAA;AAAE,6GAAA,YAAY,OAAA;AAAE,kHAAA,iBAAiB,OAAA;AAAE,sGAAA,KAAK,OAAA;AAAE,uGAAA,MAAM,OAAA;AAAE,yGAAA,QAAQ,OAAA;AAChF,2DAAuD;AAA9C,qHAAA,eAAe,OAAA;AACxB,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA;AAC3B,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,yDAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iEAAgE;AAAvD,0HAAA,mBAAmB,OAAA;AAC5B,+CAAwE;AAA/D,sGAAA,QAAQ,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,wGAAA,UAAU,OAAA;AAAE,oGAAA,MAAM,OAAA;AAC7C,6DAA4D;AAAnD,sHAAA,iBAAiB,OAAA;AAC1B,+DAA8D;AAArD,wHAAA,kBAAkB,OAAA;AAC3B,yDAAwD;AAA/C,kHAAA,eAAe,OAAA;AACxB,qDAS6B;AARzB,gHAAA,eAAe,OAAA;AACf,6GAAA,YAAY,OAAA;AACZ,kHAAA,iBAAiB,OAAA;AACjB,uGAAA,MAAM,OAAA;AACN,oHAAA,mBAAmB,OAAA;AACnB,qGAAA,IAAI,OAAA;AACJ,wGAAA,OAAO,OAAA;AACP,yGAAA,QAAQ,OAAA;AAEZ,6DAA2C;AAC3C,6DAA4D;AAAnD,sHAAA,iBAAiB,OAAA"}

package/internal.d.ts

@@ -0,0 +1,3 @@
+export { observableConfiguration } from './src/configureObservable';
+export { state } from './src/observableState';
+export { symbolDateModified, symbolShallow, getDateModifiedKey } from './src/globals';

package/{internal/index.js → internal.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDateModifiedKey = exports.symbolShallow = exports.symbolDateModified = exports.state = exports.observableConfiguration = void 0;
-var configureObservable_1 = require("../configureObservable");
+var configureObservable_1 = require("./src/configureObservable");
 Object.defineProperty(exports, "observableConfiguration", { enumerable: true, get: function () { return configureObservable_1.observableConfiguration; } });
-var observableState_1 = require("../observableState");
+var observableState_1 = require("./src/observableState");
 Object.defineProperty(exports, "state", { enumerable: true, get: function () { return observableState_1.state; } });
-var globals_1 = require("../globals");
+var globals_1 = require("./src/globals");
 Object.defineProperty(exports, "symbolDateModified", { enumerable: true, get: function () { return globals_1.symbolDateModified; } });
 Object.defineProperty(exports, "symbolShallow", { enumerable: true, get: function () { return globals_1.symbolShallow; } });
 Object.defineProperty(exports, "getDateModifiedKey", { enumerable: true, get: function () { return globals_1.getDateModifiedKey; } });
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=internal.js.map

package/internal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../internal.ts"],"names":[],"mappings":";;;AAAA,iEAAoE;AAA3D,8HAAA,uBAAuB,OAAA;AAChC,yDAA8C;AAArC,wGAAA,KAAK,OAAA;AACd,yCAAsF;AAA7E,6GAAA,kBAAkB,OAAA;AAAE,wGAAA,aAAa,OAAA;AAAE,6GAAA,kBAAkB,OAAA"}

package/local-storage.d.ts

@@ -0,0 +1 @@
+export * from './src/persist/local-storage';

package/{react/index.js → local-storage.js}

@@ -14,6 +14,5 @@ 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("./useNewObservable"), exports);
-__exportStar(require("./useObservables"), exports);
-//# sourceMappingURL=index.js.map
+__exportStar(require("./src/persist/local-storage"), exports);
+//# sourceMappingURL=local-storage.js.map

package/local-storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"local-storage.js","sourceRoot":"","sources":["../local-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA4C"}

package/mmkv.d.ts

@@ -0,0 +1 @@
+export * from './src/persist/mmkv';

package/mmkv.js

@@ -0,0 +1,18 @@
+"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("./src/persist/mmkv"), exports);
+//# sourceMappingURL=mmkv.js.map

package/mmkv.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mmkv.js","sourceRoot":"","sources":["../mmkv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "0.9.1-alpha.9",
+  "version": "0.9.2-alpha.2",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,
@@ -11,13 +11,13 @@
   ],
   "exports": {
     ".": "./index.js",
-    "./internal": "./internal/index.js",
-    "./local-storage": "./local-storage/index.js",
-    "./mmkv": "./mmkv/index.js",
-    "./react": "./react/index.js"
+    "./internal": "./internal.js",
+    "./local-storage": "./local-storage.js",
+    "./mmkv": "./mmkv.js",
+    "./react": "./react.js"
   },
   "dependencies": {
-    "@legendapp/tools": "^2.0.0-alpha.7"
+    "@legendapp/tools": "2.0.0"
   },
   "peerDependencies": {
     "react": ">=16.8",

package/react.d.ts

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

package/react.js

@@ -0,0 +1,19 @@
+"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("./src/react/useNewObservable"), exports);
+__exportStar(require("./src/react/useObservables"), exports);
+//# sourceMappingURL=react.js.map

package/react.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"react.js","sourceRoot":"","sources":["../react.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,6DAA2C"}

package/{globals.d.ts → src/globals.d.ts}

@@ -1,9 +1,9 @@
 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 jsonEqual(obj1: any, obj2: any): boolean;
 export declare function clone(obj: any): any;

package/{globals.js → src/globals.js}

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clone = exports.jsonEqual = exports.getDateModifiedKey = exports.isCollection = exports.isPrimitive = exports.replaceKeyInObject = exports.removeNullUndefined = exports.symbolShallow = exports.symbolDateModified = void 0;
+exports.clone = exports.getDateModifiedKey = exports.isCollection = exports.isPrimitive = exports.replaceKeyInObject = exports.removeNullUndefined = exports.symbolValue = exports.symbolShallow = exports.symbolDateModified = void 0;
 const tools_1 = require("@legendapp/tools");
 const configureObservable_1 = require("./configureObservable");
 exports.symbolDateModified = Symbol('__dateModified');
 exports.symbolShallow = Symbol('__shallow');
+exports.symbolValue = Symbol('__value');
 function removeNullUndefined(a) {
     if (a === undefined)
         return null;
@@ -57,10 +58,6 @@ function getDateModifiedKey(dateModifiedKey) {
     return dateModifiedKey || configureObservable_1.observableConfiguration.dateModifiedKey || '@';
 }
 exports.getDateModifiedKey = getDateModifiedKey;
-function jsonEqual(obj1, obj2) {
-    return JSON.stringify(obj1) === JSON.stringify(obj2);
-}
-exports.jsonEqual = jsonEqual;
 function clone(obj) {
     return obj === undefined || obj === null ? obj : JSON.parse(JSON.stringify(obj));
 }

package/src/globals.js.map

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

package/src/observable.d.ts

@@ -0,0 +1,8 @@
+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 };

package/{observable.js → src/observable.js}

@@ -51,14 +51,12 @@ function collectionSetter(prop, proxyOwner, ...args) {
 function _get(proxyOwner) {
     const info = infos.get(proxyOwner);
     const target = info.target;
-    return info.primitive ? target._value : target;
+    return info.primitive ? target[globals_1.symbolValue] : target;
 }
 function _set(proxyOwner, _, prop, value) {
     var _a;
     observableState_1.state.inSetFn = Math.max(0, observableState_1.state.inSetFn++);
     const info = infos.get(proxyOwner);
-    if (!info)
-        debugger;
     if (info.readonly) {
         return proxyOwner;
     }
@@ -71,31 +69,34 @@ function _set(proxyOwner, _, prop, value) {
         value = prop;
         prop = undefined;
         const isValuePrimitive = (0, globals_1.isPrimitive)(value);
-        const prevValue = info.primitive ? target._value : Object.assign({}, target);
+        const prevValue = info.primitive ? target[globals_1.symbolValue] : target;
+        const needsNotifyUndefined = !value || isValuePrimitive !== info.primitive;
         // 1. Delete keys that no longer exist
         Object.keys(target).forEach((key) => {
-            if (!value || isValuePrimitive !== info.primitive || value[key] === undefined) {
-                if (info.proxies) {
-                    const child = info.proxies.get(key);
-                    if (child) {
-                        proxyOwner.delete(key);
-                    }
+            if (info.proxies && (needsNotifyUndefined || value[key] === undefined)) {
+                const child = info.proxies.get(key);
+                if (child) {
+                    (0, observableFns_1.notifyChildrenDeleted)(child);
+                    info.proxies.delete(key);
                 }
-                delete target[key];
-                delete targetOriginal[key];
             }
+            // Delete key on original
+            delete targetOriginal[key];
         });
         // To avoid notifying multiple times as props are changed, make sure we don't notify for this proxy until the assign is done
         skipNotifyFor.push(proxyOwner);
         if (isValuePrimitive) {
             info.primitive = true;
-            target._value = value;
+            info.target = { [globals_1.symbolValue]: value };
         }
         else {
             info.primitive = false;
-            // 2. Assign the values onto the target which will update all children proxies, but would leave this
-            // as a shallow copy of the the value
-            proxyOwner.assign(value);
+            if (info.proxies) {
+                // 2. Assign the values onto the target which will update all children proxies, but would leave this
+                // as a shallow copy of the the value
+                _assign(proxyOwner, target, value);
+            }
+            // Make sure keys are set on original
             Object.assign(targetOriginal, value);
             info.target = value;
         }
@@ -106,7 +107,7 @@ function _set(proxyOwner, _, prop, value) {
             parentInfo.target[info.prop] = value;
             parentInfo.targetOriginal[info.prop] = value;
         }
-        if (!(0, globals_1.jsonEqual)(value, prevValue)) {
+        if (value !== prevValue) {
             (0, observableFns_1.notifyObservable)(proxyOwner, value, prevValue, []);
         }
     }
@@ -131,9 +132,12 @@ function _set(proxyOwner, _, prop, value) {
             }
         }
         else {
-            const prevValue = target[prop];
-            if (!(0, globals_1.jsonEqual)(value, prevValue)) {
+            const prevValue = (0, globals_1.clone)(target[prop]);
+            if (value !== prevValue) {
                 target[prop] = targetOriginal[prop] = value;
+                info.primitive = false;
+                delete target[globals_1.symbolValue];
+                delete targetOriginal[globals_1.symbolValue];
                 // Notify listeners of changes.
                 (0, observableFns_1.notifyObservable)(proxyOwner, value, prevValue, [propStr]);
             }
@@ -144,13 +148,24 @@ function _set(proxyOwner, _, prop, value) {
 }
 function _assign(proxyOwner, _, value) {
     observableState_1.state.inAssign = Math.max(0, observableState_1.state.inAssign + 1);
-    // Batch all the changes while assigning
-    observableBatcher_1.observableBatcher.begin();
     Object.assign(proxyOwner, value);
-    observableBatcher_1.observableBatcher.end();
     observableState_1.state.inAssign--;
     return this;
 }
+function __assign(proxyOwner, _, value) {
+    // Batch all the changes while assigning
+    observableBatcher_1.observableBatcher.begin();
+    const ret = _assign(proxyOwner, _, value);
+    observableBatcher_1.observableBatcher.end();
+    return ret;
+}
+function __set(proxyOwner) {
+    // Batch all the changes while assigning
+    observableBatcher_1.observableBatcher.begin();
+    const ret = _set.apply(proxyOwner, arguments);
+    observableBatcher_1.observableBatcher.end();
+    return ret;
+}
 function binder(fn, obs) {
     obs = (0, observableFns_1.prop)(obs);
     return fn.bind(obs, obs, undefined);
@@ -177,12 +192,10 @@ function deleteFn(obs, target, prop) {
             // Then fully delete the keys from the object
             delete target[prop];
             delete targetOriginal[prop];
-            // Remove the child proxy from state
-            const child = info.proxies.get(prop);
-            if (child) {
-                info.proxies.delete(prop);
-                observableState_1.state.infos.delete(child);
-            }
+            // if (info.target[prop]) debugger;
+            // if (Reflect.ownKeys(info.target).length > 0) debugger;
+            // TODO Should find a way to remove from state.infos or there will be a memory leak if deleting
+            // unique keys often. Re-addeding the same prop will reuse the same proxy.
         }
         else {
             // Delete self forwards into parent
@@ -200,8 +213,8 @@ function deleteFn(obs, target, prop) {
 exports.deleteFn = deleteFn;
 const ProxyFunctions = new Map([
     ['get', _get],
-    ['set', _set],
-    ['assign', _assign],
+    ['set', __set],
+    ['assign', __assign],
     ['on', observableFns_1._on],
     ['prop', observableFns_1.observableProp],
     ['delete', deleteFn],
@@ -244,10 +257,10 @@ const proxyHandlerUnsafe = {
             if ((observableState_1.state.inProp || targetValue === undefined || targetValue === null || !(0, globals_1.isPrimitive)(targetValue)) &&
                 !(targetValue instanceof Promise) &&
                 !(0, tools_1.isFunction)(targetValue)) {
-                // Get proxy for prop if it's not a primitive or using prop(key)
+                // Get proxy for prop if it's not a primitive or if using `prop` function
                 observableState_1.state.inProp = false;
                 let proxy = (_a = info.proxies) === null || _a === void 0 ? void 0 : _a.get(prop);
-                // Getting a property creates a proxy for it
+                // Getting a property creates an observable proxy for it
                 if (!proxy && target.hasOwnProperty(prop) !== undefined) {
                     if (!info.proxies) {
                         info.proxies = new Map();
@@ -270,33 +283,54 @@ const proxyHandlerUnsafe = {
             return true;
         }
         else if (observableState_1.state.inSetFn > 0) {
-            // Set function handles notifying
+            // If this assignment comes from within a set function it's allowed.
+            // Notifying listeners will be handled elsewhere
             Reflect.set(target, prop, value);
             return true;
         }
         else {
             const info = infos.get(proxyOwner);
-            // Only allow setting if this proxy is not safe
+            // Only allow setting directly if this proxy is unsafe
             if (!info.safe) {
                 _set(proxyOwner, target, prop, value);
                 return true;
             }
+            if (process.env.NODE_ENV === 'development') {
+                throw new Error('Cannot directly assign to an observable. Use observable.set(...) or observable.assign(...) instead. See https://www.legendapp.com/dev/state/safety/');
+            }
             return false;
         }
     },
+    // ownKeys(target) {
+    //     // this is bound to proxyOwner
+    //     const info = infos.get(this);
+    //     // debugger;
+    //     // if (Reflect.ownKeys(info.target).length !== Reflect.ownKeys(target).length) debugger;
+    //     // return Reflect.ownKeys(info ? info.target : target);
+    //     return Reflect.ownKeys(target);
+    // },
 };
+// Safe observables also don't allow defining or deleting properties
 const proxyHandler = Object.assign({
     deleteProperty() {
+        if (process.env.NODE_ENV === 'development') {
+            throw new Error('Cannot directly delete an observable. Use observable.delete() instead. See https://www.legendapp.com/dev/state/safety/');
+        }
         return false;
     },
     defineProperty() {
+        if (process.env.NODE_ENV === 'development') {
+            throw new Error('Cannot defineProperty on an observable. See https://www.legendapp.com/dev/state/safety/');
+        }
         return false;
     },
 }, proxyHandlerUnsafe);
 function _observable(value, safe, parent, prop) {
     const primitive = (0, globals_1.isPrimitive)(value);
-    const target = primitive ? { _value: value } : value;
-    const proxy = new Proxy(target, safe ? proxyHandler : proxyHandlerUnsafe);
+    const target = primitive ? { [globals_1.symbolValue]: value } : value;
+    const handler = safe ? proxyHandler : proxyHandlerUnsafe;
+    const proxy = new Proxy(target, handler);
+    // handler.ownKeys = handler.ownKeys.bind(proxy);
     // Save proxy to state so it can be accessed later
     infos.set(proxy, { parent, prop, safe, target, primitive, targetOriginal: target });
     return proxy;

package/src/observable.js.map

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

package/{observableBatcher.d.ts → src/observableBatcher.d.ts}

@@ -1,7 +1,7 @@
 import { ListenerFn, ObservableListenerInfo } from './observableInterfaces';
+export declare function observableBatcherNotify(cb: ListenerFn<any>, value: any, info: ObservableListenerInfo): void;
 export declare namespace observableBatcher {
     function batch(fn: () => void): void;
     function begin(): void;
     function end(force?: boolean): void;
-    function notify(cb: ListenerFn<any>, value: any, info: ObservableListenerInfo): void;
 }

package/src/observableBatcher.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.observableBatcher = exports.observableBatcherNotify = void 0;
+const tools_1 = require("@legendapp/tools");
+let numInBatch = 0;
+let _batch = [];
+function onActionTimeout() {
+    if (_batch.length > 0) {
+        if (process.env.NODE_ENV === 'development') {
+            console.error('Forcibly completing observableBatcher because end() was never called. This may be due to an uncaught error between begin() and end().');
+        }
+        observableBatcher.end(/*force*/ true);
+    }
+}
+function observableBatcherNotify(cb, value, info) {
+    if (numInBatch > 0) {
+        for (let i = 0; i < _batch.length; i++) {
+            const n = _batch[i];
+            // If this callback already exists, make sure it has the latest value but do not add it
+            if (n.cb === cb) {
+                n.value = value;
+                n.info = info;
+                return;
+            }
+        }
+        _batch.push({ cb, value, info });
+    }
+    else {
+        cb(value, info);
+    }
+}
+exports.observableBatcherNotify = observableBatcherNotify;
+var observableBatcher;
+(function (observableBatcher) {
+    function batch(fn) {
+        begin();
+        fn();
+        end();
+    }
+    observableBatcher.batch = batch;
+    function begin() {
+        numInBatch++;
+        // Set a timeout to call end() in case end() is never called or there's an uncaught error
+        (0, tools_1.timeoutOnce)('batch_beginAction', onActionTimeout, 0);
+    }
+    observableBatcher.begin = begin;
+    function end(force) {
+        numInBatch--;
+        if (numInBatch <= 0 || force) {
+            (0, tools_1.clearTimeoutOnce)('batch_beginAction');
+            numInBatch = 0;
+            // Save batch locally and reset _batch first because a new batch could begin while looping over callbacks.
+            // This can happen with observableComputed for example.
+            const batch = _batch;
+            _batch = [];
+            batch.forEach(({ cb, value, info }) => cb(value, info));
+        }
+    }
+    observableBatcher.end = end;
+})(observableBatcher = exports.observableBatcher || (exports.observableBatcher = {}));
+//# sourceMappingURL=observableBatcher.js.map

package/src/observableBatcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"observableBatcher.js","sourceRoot":"","sources":["../../src/observableBatcher.ts"],"names":[],"mappings":";;;AAAA,4CAAiE;AAGjE,IAAI,UAAU,GAAG,CAAC,CAAC;AACnB,IAAI,MAAM,GAAwE,EAAE,CAAC;AAErF,SAAS,eAAe;IACpB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;YACxC,OAAO,CAAC,KAAK,CACT,uIAAuI,CAC1I,CAAC;SACL;QACD,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KACzC;AACL,CAAC;AAED,SAAgB,uBAAuB,CAAC,EAAmB,EAAE,KAAU,EAAE,IAA4B;IACjG,IAAI,UAAU,GAAG,CAAC,EAAE;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,uFAAuF;YACvF,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBACb,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC;gBAChB,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;gBACd,OAAO;aACV;SACJ;QACD,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;KACpC;SAAM;QACH,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACnB;AACL,CAAC;AAfD,0DAeC;AAED,IAAiB,iBAAiB,CAuBjC;AAvBD,WAAiB,iBAAiB;IAC9B,SAAgB,KAAK,CAAC,EAAc;QAChC,KAAK,EAAE,CAAC;QACR,EAAE,EAAE,CAAC;QACL,GAAG,EAAE,CAAC;IACV,CAAC;IAJe,uBAAK,QAIpB,CAAA;IACD,SAAgB,KAAK;QACjB,UAAU,EAAE,CAAC;QACb,yFAAyF;QACzF,IAAA,mBAAW,EAAC,mBAAmB,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAJe,uBAAK,QAIpB,CAAA;IACD,SAAgB,GAAG,CAAC,KAAe;QAC/B,UAAU,EAAE,CAAC;QACb,IAAI,UAAU,IAAI,CAAC,IAAI,KAAK,EAAE;YAC1B,IAAA,wBAAgB,EAAC,mBAAmB,CAAC,CAAC;YACtC,UAAU,GAAG,CAAC,CAAC;YACf,0GAA0G;YAC1G,uDAAuD;YACvD,MAAM,KAAK,GAAG,MAAM,CAAC;YACrB,MAAM,GAAG,EAAE,CAAC;YACZ,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;SAC3D;IACL,CAAC;IAXe,qBAAG,MAWlB,CAAA;AACL,CAAC,EAvBgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAuBjC"}

package/{observableComputed.d.ts → src/observableComputed.d.ts}

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

package/{observableComputed.js → src/observableComputed.js}

@@ -5,11 +5,14 @@ const observable_1 = require("./observable");
 const observableState_1 = require("./observableState");
 function onChanged(observable, fn) {
     const info = observableState_1.state.infos.get(observable);
+    const value = fn();
+    // Temporarily disable readonly to set the new value
     info.readonly = false;
-    observable.set(fn());
+    observable.set(value);
     info.readonly = true;
 }
 function observableComputed(fn) {
+    // Set isTracking so that the proxy `get` function will track accessed proxies
     observableState_1.state.isTracking = true;
     // Create an observable for this computed variable
     const obs = (0, observable_1.observable)(fn());

package/src/observableComputed.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"observableComputed.js","sourceRoot":"","sources":["../../src/observableComputed.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,uDAA0C;AAE1C,SAAS,SAAS,CAAI,UAAsB,EAAE,EAAW;IACrD,MAAM,IAAI,GAAG,uBAAK,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAEzC,MAAM,KAAK,GAAG,EAAE,EAAE,CAAC;IAEnB,oDAAoD;IACpD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACtB,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;AACzB,CAAC;AAED,SAAgB,kBAAkB,CAAI,EAAiC;IACnE,8EAA8E;IAC9E,uBAAK,CAAC,UAAU,GAAG,IAAI,CAAC;IAExB,kDAAkD;IAClD,MAAM,GAAG,GAAG,IAAA,uBAAU,EAAI,EAAE,EAAE,CAAC,CAAC;IAChC,uBAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;IAErC,gCAAgC;IAChC,uBAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAC7C,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CACpF,CAAC;IAEF,cAAc;IACd,uBAAK,CAAC,UAAU,GAAG,KAAK,CAAC;IACzB,uBAAK,CAAC,cAAc,GAAG,EAAE,CAAC;IAE1B,OAAO,GAAG,CAAC;AACf,CAAC;AAlBD,gDAkBC"}