@legendapp/state 1.9.0 → 2.0.0-next.1

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.9.0
+- Feat: Nested computeds set their value on the raw object so that `get()` on the parent will include the values of child computeds
+
 ## 1.8.1
 - Feat: Added findIDKey and optimized to internal
 - Fix: Added more safety around dev-only assertions because they were throwing errors in some build systems

package/config/enableReactDirectRender.js

@@ -8,6 +8,9 @@ let isEnabled = false;
 // Extracting the forwardRef inspired by https://github.com/mobxjs/mobx/blob/main/packages/mobx-react-lite/src/observer.ts
 const hasSymbol =  typeof Symbol === 'function' && Symbol.for;
 function enableReactDirectRender() {
+    if (process.env.NODE_ENV === 'development') {
+        console.warn('[legend-state] enableReactDirectRender is deprecated and will be removed in version 2.0. Please convert it from {value} to <Memo>{value}</Memo>. See https://legendapp.com/open-source/state/migrating for more details.');
+    }
     if (!isEnabled) {
         isEnabled = true;
         // Rendering observables directly inspired by Preact Signals: https://github.com/preactjs/signals/blob/main/packages/react/src/index.ts

package/config/enableReactDirectRender.js.map

@@ -1 +1 @@
-{"version":3,"file":"enableReactDirectRender.js","sources":["../../../../src/config/enableReactDirectRender.ts"],"sourcesContent":[null],"names":["memo","useSelector","createElement","extraPrimitiveProps","extraPrimitiveActivators","ObservablePrimitiveClass"],"mappings":";;;;;;AAQA,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB;AACO,MAAM,SAAS,GAAkB,CAAC,OAAO,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI;SAEpE,uBAAuB,GAAA;IACnC,IAAI,CAAC,SAAS,EAAE;QACZ,SAAS,GAAG,IAAI,CAAC;;;;QAKjB,MAAM,IAAI,GAAGA,UAAI,CAAC,SAAS,IAAI,CAAC,EAAE,IAAI,EAAgC,EAAA;AAClE,YAAA,OAAOC,mBAAW,CAAC,IAAI,CAAC,CAAC;AAC7B,SAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,GAAIC,mBAAa,CAAC,GAAG,CAAS,CAAC,QAAQ,CAAC;QAEzG,MAAM,CAAC,GAAGC,yBAAmB,CAAC;QAC9B,MAAM,KAAK,GAAG,EAAkC,CAAC;;AAEjD,QAAAC,8BAAwB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC/CA,8BAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;AAGvD,QAAA,SAAS,GAAG,CAAC,GAAW,EAAE,KAAU,EAAA;AAChC,YAAA,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAClB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;SAC9C;AACD,QAAA,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AACnC,QAAA,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAClB,GAAG,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACnC,QAAA,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACjB,QAAA,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACjB,QAAA,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACvB,QAAA,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACpB,QAAA,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;;AAGrB,QAAA,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAM,EAAE,KAAU,KAAK,KAAK,CAAC,CAAC;AACzD,QAAA,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;;AAE9C,QAAA,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG;AACxB,YAAA,YAAY,EAAE,IAAI;YAClB,GAAG,GAAA;AACC,gBAAA,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;aACtB;SACJ,CAAC;QACF,KAAK,CAAC,KAAK,GAAG;AACV,YAAA,YAAY,EAAE,IAAI;YAClB,GAAG,GAAA;AACC,gBAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aACzB;SACJ,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAACC,8BAAwB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AACtE,KAAA;AACL;;;;;"}
+{"version":3,"file":"enableReactDirectRender.js","sources":["../../../../src/config/enableReactDirectRender.ts"],"sourcesContent":[null],"names":["memo","useSelector","createElement","extraPrimitiveProps","extraPrimitiveActivators","ObservablePrimitiveClass"],"mappings":";;;;;;AAQA,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB;AACO,MAAM,SAAS,GAAkB,CAAC,OAAO,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI;SAEpE,uBAAuB,GAAA;AACnC,IAAA,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;AACxC,QAAA,OAAO,CAAC,IAAI,CACR,0NAA0N,CAC7N,CAAC;AACL,KAAA;IACD,IAAI,CAAC,SAAS,EAAE;QACZ,SAAS,GAAG,IAAI,CAAC;;;;QAKjB,MAAM,IAAI,GAAGA,UAAI,CAAC,SAAS,IAAI,CAAC,EAAE,IAAI,EAAgC,EAAA;AAClE,YAAA,OAAOC,mBAAW,CAAC,IAAI,CAAC,CAAC;AAC7B,SAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,GAAIC,mBAAa,CAAC,GAAG,CAAS,CAAC,QAAQ,CAAC;QAEzG,MAAM,CAAC,GAAGC,yBAAmB,CAAC;QAC9B,MAAM,KAAK,GAAG,EAAkC,CAAC;;AAEjD,QAAAC,8BAAwB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC/CA,8BAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;AAGvD,QAAA,SAAS,GAAG,CAAC,GAAW,EAAE,KAAU,EAAA;AAChC,YAAA,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAClB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;SAC9C;AACD,QAAA,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AACnC,QAAA,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAClB,GAAG,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACnC,QAAA,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACjB,QAAA,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACjB,QAAA,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACvB,QAAA,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACpB,QAAA,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;;AAGrB,QAAA,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAM,EAAE,KAAU,KAAK,KAAK,CAAC,CAAC;AACzD,QAAA,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;;AAE9C,QAAA,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG;AACxB,YAAA,YAAY,EAAE,IAAI;YAClB,GAAG,GAAA;AACC,gBAAA,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;aACtB;SACJ,CAAC;QACF,KAAK,CAAC,KAAK,GAAG;AACV,YAAA,YAAY,EAAE,IAAI;YAClB,GAAG,GAAA;AACC,gBAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aACzB;SACJ,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAACC,8BAAwB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AACtE,KAAA;AACL;;;;;"}

package/config/enableReactDirectRender.mjs

@@ -6,6 +6,9 @@ let isEnabled = false;
 // Extracting the forwardRef inspired by https://github.com/mobxjs/mobx/blob/main/packages/mobx-react-lite/src/observer.ts
 const hasSymbol =  typeof Symbol === 'function' && Symbol.for;
 function enableReactDirectRender() {
+    if (process.env.NODE_ENV === 'development') {
+        console.warn('[legend-state] enableReactDirectRender is deprecated and will be removed in version 2.0. Please convert it from {value} to <Memo>{value}</Memo>. See https://legendapp.com/open-source/state/migrating for more details.');
+    }
     if (!isEnabled) {
         isEnabled = true;
         // Rendering observables directly inspired by Preact Signals: https://github.com/preactjs/signals/blob/main/packages/react/src/index.ts

package/config/enableReactDirectRender.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"enableReactDirectRender.mjs","sources":["../../../../src/config/enableReactDirectRender.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAQA,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB;AACO,MAAM,SAAS,GAAkB,CAAC,OAAO,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI;SAEpE,uBAAuB,GAAA;IACnC,IAAI,CAAC,SAAS,EAAE;QACZ,SAAS,GAAG,IAAI,CAAC;;;;QAKjB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,EAAE,IAAI,EAAgC,EAAA;AAClE,YAAA,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;AAC7B,SAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,GAAI,aAAa,CAAC,GAAG,CAAS,CAAC,QAAQ,CAAC;QAEzG,MAAM,CAAC,GAAG,mBAAmB,CAAC;QAC9B,MAAM,KAAK,GAAG,EAAkC,CAAC;;AAEjD,QAAA,wBAAwB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC/C,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;AAGvD,QAAA,SAAS,GAAG,CAAC,GAAW,EAAE,KAAU,EAAA;AAChC,YAAA,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAClB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;SAC9C;AACD,QAAA,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AACnC,QAAA,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAClB,GAAG,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACnC,QAAA,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACjB,QAAA,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACjB,QAAA,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACvB,QAAA,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACpB,QAAA,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;;AAGrB,QAAA,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAM,EAAE,KAAU,KAAK,KAAK,CAAC,CAAC;AACzD,QAAA,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;;AAE9C,QAAA,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG;AACxB,YAAA,YAAY,EAAE,IAAI;YAClB,GAAG,GAAA;AACC,gBAAA,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;aACtB;SACJ,CAAC;QACF,KAAK,CAAC,KAAK,GAAG;AACV,YAAA,YAAY,EAAE,IAAI;YAClB,GAAG,GAAA;AACC,gBAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aACzB;SACJ,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AACtE,KAAA;AACL;;;;"}
+{"version":3,"file":"enableReactDirectRender.mjs","sources":["../../../../src/config/enableReactDirectRender.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAQA,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB;AACO,MAAM,SAAS,GAAkB,CAAC,OAAO,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI;SAEpE,uBAAuB,GAAA;AACnC,IAAA,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;AACxC,QAAA,OAAO,CAAC,IAAI,CACR,0NAA0N,CAC7N,CAAC;AACL,KAAA;IACD,IAAI,CAAC,SAAS,EAAE;QACZ,SAAS,GAAG,IAAI,CAAC;;;;QAKjB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,EAAE,IAAI,EAAgC,EAAA;AAClE,YAAA,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;AAC7B,SAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,GAAI,aAAa,CAAC,GAAG,CAAS,CAAC,QAAQ,CAAC;QAEzG,MAAM,CAAC,GAAG,mBAAmB,CAAC;QAC9B,MAAM,KAAK,GAAG,EAAkC,CAAC;;AAEjD,QAAA,wBAAwB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC/C,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;AAGvD,QAAA,SAAS,GAAG,CAAC,GAAW,EAAE,KAAU,EAAA;AAChC,YAAA,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAClB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;SAC9C;AACD,QAAA,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AACnC,QAAA,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAClB,GAAG,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACnC,QAAA,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACjB,QAAA,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACjB,QAAA,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACvB,QAAA,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACpB,QAAA,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;;AAGrB,QAAA,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAM,EAAE,KAAU,KAAK,KAAK,CAAC,CAAC;AACzD,QAAA,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;;AAE9C,QAAA,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG;AACxB,YAAA,YAAY,EAAE,IAAI;YAClB,GAAG,GAAA;AACC,gBAAA,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;aACtB;SACJ,CAAC;QACF,KAAK,CAAC,KAAK,GAAG;AACV,YAAA,YAAY,EAAE,IAAI;YAClB,GAAG,GAAA;AACC,gBAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aACzB;SACJ,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AACtE,KAAA;AACL;;;;"}

package/history.js

@@ -7,7 +7,7 @@ function trackHistory(obs, targetObservable) {
     obs.onChange(({ changes }) => {
         // Don't save history if this is a remote change.
         // History will be saved remotely by the client making the local change.
-        if (!state.tracking.inRemoteChange) {
+        if (!state.internal.globalState.isLoadingRemote && !state.internal.globalState.isLoadingLocal) {
             const time = Date.now().toString();
             // Save to history observable by date, with the previous value
             for (let i = 0; i < changes.length; i++) {

package/history.js.map

@@ -1 +1 @@
-{"version":3,"file":"history.js","sources":["../../src/history/trackHistory.ts"],"sourcesContent":[null],"names":["observable","tracking","constructObjectWithPath","mergeIntoObservable"],"mappings":";;;;AAYgB,SAAA,YAAY,CACxB,GAA0B,EAC1B,gBAA6E,EAAA;IAE7E,MAAM,OAAO,GAAG,gBAAgB,KAAhB,IAAA,IAAA,gBAAgB,cAAhB,gBAAgB,GAAIA,gBAAU,EAAyC,CAAC;IAExF,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,KAAI;;;AAGzB,QAAA,IAAI,CAACC,cAAQ,CAAC,cAAc,EAAE;YAC1B,MAAM,IAAI,GAAsB,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;;AAGtD,YAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACrC,gBAAA,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAEnD,MAAM,GAAG,GAAGC,6BAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;gBACjEC,yBAAmB,CAAE,OAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AACpD,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;AAEH,IAAA,OAAO,OAAO,CAAC;AACnB;;;;"}
+{"version":3,"file":"history.js","sources":["../../src/history/trackHistory.ts"],"sourcesContent":[null],"names":["observable","internal","constructObjectWithPath","mergeIntoObservable"],"mappings":";;;;AAYgB,SAAA,YAAY,CACxB,GAA0B,EAC1B,gBAA6E,EAAA;IAE7E,MAAM,OAAO,GAAG,gBAAgB,KAAhB,IAAA,IAAA,gBAAgB,cAAhB,gBAAgB,GAAIA,gBAAU,EAAyC,CAAC;IAExF,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,KAAI;;;AAGzB,QAAA,IAAI,CAACC,cAAQ,CAAC,WAAW,CAAC,eAAe,IAAI,CAACA,cAAQ,CAAC,WAAW,CAAC,cAAc,EAAE;YAC/E,MAAM,IAAI,GAAsB,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;;AAGtD,YAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACrC,gBAAA,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAEnD,MAAM,GAAG,GAAGC,6BAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;gBACjEC,yBAAmB,CAAE,OAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AACpD,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;AAEH,IAAA,OAAO,OAAO,CAAC;AACnB;;;;"}

package/history.mjs

@@ -1,11 +1,11 @@
-import { observable, tracking, constructObjectWithPath, mergeIntoObservable } from '@legendapp/state';
+import { observable, internal, constructObjectWithPath, mergeIntoObservable } from '@legendapp/state';
 
 function trackHistory(obs, targetObservable) {
     const history = targetObservable !== null && targetObservable !== void 0 ? targetObservable : observable();
     obs.onChange(({ changes }) => {
         // Don't save history if this is a remote change.
         // History will be saved remotely by the client making the local change.
-        if (!tracking.inRemoteChange) {
+        if (!internal.globalState.isLoadingRemote && !internal.globalState.isLoadingLocal) {
             const time = Date.now().toString();
             // Save to history observable by date, with the previous value
             for (let i = 0; i < changes.length; i++) {

package/history.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"history.mjs","sources":["../../src/history/trackHistory.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAYgB,SAAA,YAAY,CACxB,GAA0B,EAC1B,gBAA6E,EAAA;IAE7E,MAAM,OAAO,GAAG,gBAAgB,KAAhB,IAAA,IAAA,gBAAgB,cAAhB,gBAAgB,GAAI,UAAU,EAAyC,CAAC;IAExF,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,KAAI;;;AAGzB,QAAA,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;YAC1B,MAAM,IAAI,GAAsB,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;;AAGtD,YAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACrC,gBAAA,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAEnD,MAAM,GAAG,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;gBACjE,mBAAmB,CAAE,OAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AACpD,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;AAEH,IAAA,OAAO,OAAO,CAAC;AACnB;;;;"}
+{"version":3,"file":"history.mjs","sources":["../../src/history/trackHistory.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAYgB,SAAA,YAAY,CACxB,GAA0B,EAC1B,gBAA6E,EAAA;IAE7E,MAAM,OAAO,GAAG,gBAAgB,KAAhB,IAAA,IAAA,gBAAgB,cAAhB,gBAAgB,GAAI,UAAU,EAAyC,CAAC;IAExF,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,KAAI;;;AAGzB,QAAA,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,cAAc,EAAE;YAC/E,MAAM,IAAI,GAAsB,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;;AAGtD,YAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACrC,gBAAA,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAEnD,MAAM,GAAG,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;gBACjE,mBAAmB,CAAE,OAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AACpD,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;AAEH,IAAA,OAAO,OAAO,CAAC;AACnB;;;;"}

package/index.d.ts

@@ -1,7 +1,7 @@
 export { computeSelector, constructObjectWithPath, deconstructObjectWithPath, getObservableIndex, isObservable, isObservableValueReady, lockObservable, mergeIntoObservable, opaqueObject, setAtPath, setInObservableAtPath, setSilently } from './src/helpers';
 export { trackSelector, } from './src/trackSelector';
 export { observable, observablePrimitive } from './src/observable';
-export { batch, beginBatch, endBatch, afterBatch } from './src/batching';
+export { batch, beginBatch, endBatch } from './src/batching';
 export { computed } from './src/computed';
 export { event } from './src/event';
 export { observe } from './src/observe';
@@ -19,6 +19,11 @@ export declare const internal: {
     get: typeof get;
     getNode: typeof getNode;
     getProxy: typeof getProxy;
+    globalState: {
+        isLoadingLocal: boolean;
+        isLoadingRemote: boolean;
+        isMerging: boolean;
+    };
     optimized: symbol;
     peek: typeof peek;
     set: typeof set;

package/index.js

@@ -54,7 +54,6 @@ let trackCount = 0;
 const trackingQueue = [];
 const tracking = {
     current: undefined,
-    inRemoteChange: false,
     inRender: false,
 };
 function beginTracking(inRender) {
@@ -102,8 +101,9 @@ const symbolOpaque = Symbol('opaque');
 const optimized = Symbol('optimized');
 const extraPrimitiveActivators = new Map();
 const extraPrimitiveProps = new Map();
-const __devExtractFunctionsAndComputedsNodes = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test' ? new Set() : undefined;
 const globalState = {
+    isLoadingLocal: false,
+    isLoadingRemote: false,
     isMerging: false,
 };
 function checkActivate(node) {
@@ -244,37 +244,13 @@ function extractFunction(node, key, fnOrComputed, computedChildNode) {
         node.root.computedChildrenNeedingActivation.push(computedChildNode);
     }
 }
-function extractFunctionsAndComputeds(obj, node) {
-    if ((process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') &&
-        typeof __devExtractFunctionsAndComputedsNodes !== 'undefined') {
-        if (__devExtractFunctionsAndComputedsNodes.has(obj)) {
-            console.error('[legend-state] Circular reference detected in object. You may want to use opaqueObject to stop traversing child nodes.', obj);
-            return false;
-        }
-        __devExtractFunctionsAndComputedsNodes.add(obj);
-    }
-    for (const k in obj) {
-        const v = obj[k];
-        if (typeof v === 'function') {
-            extractFunction(node, k, v);
-        }
-        else if (typeof v == 'object' && v !== null && v !== undefined) {
-            const childNode = getNode(v);
-            if (childNode === null || childNode === void 0 ? void 0 : childNode.isComputed) {
-                extractFunction(node, k, v, childNode);
-            }
-            else if (!v[symbolOpaque]) {
-                extractFunctionsAndComputeds(obj[k], getChildNode(node, k));
-            }
-        }
-    }
-}
 
 let timeout;
 let numInBatch = 0;
 let isRunningBatch = false;
 let didDelayEndBatch = false;
 let _afterBatch = [];
+let _queuedBatches = [];
 let _batchMap = new Map();
 function onActionTimeout() {
     if (_batchMap.size > 0) {
@@ -411,6 +387,8 @@ function batchNotifyChanges(changesInBatch, immediate) {
     });
 }
 function runBatch() {
+    // Save batch locally and reset _batchMap first because a new batch could begin while looping over callbacks.
+    // This can happen with observableComputed for example.
     const map = _batchMap;
     _batchMap = new Map();
     const changesInBatch = new Map();
@@ -425,7 +403,15 @@ function runBatch() {
 }
 function batch(fn, onComplete) {
     if (onComplete) {
-        _afterBatch.push(onComplete);
+        // If there's an onComplete we need a batch that's fully isolated from others to ensure it wraps only the given changes.
+        // So if already batching, push this batch onto a queue and run it after the current batch is fully done.
+        if (isRunningBatch) {
+            _queuedBatches.push([fn, onComplete]);
+            return;
+        }
+        else {
+            _afterBatch.push(onComplete);
+        }
     }
     beginBatch();
     try {
@@ -475,17 +461,17 @@ function endBatch(force) {
                 didDelayEndBatch = false;
                 endBatch(true);
             }
+            const queued = _queuedBatches;
+            if (queued.length) {
+                _queuedBatches = [];
+                for (let i = 0; i < queued.length; i++) {
+                    const [fn, onComplete] = queued[i];
+                    batch(fn, onComplete);
+                }
+            }
         }
     }
 }
-function afterBatch(fn) {
-    if (numInBatch > 0) {
-        _afterBatch.push(fn);
-    }
-    else {
-        fn();
-    }
-}
 
 function isObservable(obs) {
     return obs && !!obs[symbolGetNode];
@@ -1020,14 +1006,6 @@ const proxyHandler = {
         if (p === symbolGetNode) {
             return node;
         }
-        if (node.isComputed) {
-            if (node.proxyFn) {
-                return node.proxyFn(p);
-            }
-            else {
-                checkActivate(node);
-            }
-        }
         // If this node is linked to another observable then forward to the target's handler.
         // The exception is onChange because it needs to listen to this node for changes.
         if (node.linkedToNode && p !== 'onChange') {
@@ -1060,6 +1038,14 @@ const proxyHandler = {
                 }
             };
         }
+        if (node.isComputed) {
+            if (node.proxyFn && !fn) {
+                return node.proxyFn(p);
+            }
+            else {
+                checkActivate(node);
+            }
+        }
         const property = observableProperties.get(p);
         if (property) {
             return property.get(node);
@@ -1365,12 +1351,21 @@ function updateNodesAndNotify(node, newValue, prevValue, childNode, isPrim, isRo
             whenOptimizedOnlyIf = (newValue === null || newValue === void 0 ? void 0 : newValue.length) !== (prevValue === null || prevValue === void 0 ? void 0 : prevValue.length);
         }
     }
-    if (isPrim || !newValue || isEmpty(newValue) ? newValue !== prevValue : hasADiff) {
+    if (isPrim || !newValue || (isEmpty(newValue) && !isEmpty(prevValue)) ? newValue !== prevValue : hasADiff) {
         // Notify for this element if something inside it has changed
         notify(isPrim && isRoot ? node : childNode, newValue, prevValue, (level !== null && level !== void 0 ? level : prevValue === undefined) ? -1 : hasADiff ? 0 : 1, whenOptimizedOnlyIf);
     }
     endBatch();
 }
+function extractPromise(node, value) {
+    value.status = 'pending';
+    value.catch((error) => {
+        set(node, { error, status: 'rejected' });
+    });
+    value.then((value) => {
+        set(node, value);
+    });
+}
 
 const fns = ['get', 'set', 'peek', 'onChange', 'toggle'];
 function ObservablePrimitiveClass(node) {
@@ -1413,10 +1408,39 @@ ObservablePrimitiveClass.prototype.delete = function () {
     return this;
 };
 
+const __devExtractFunctionsAndComputedsNodes = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test' ? new Set() : undefined;
+function extractFunctionsAndComputeds(node, obj) {
+    if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
+        if (__devExtractFunctionsAndComputedsNodes.has(obj)) {
+            console.error('[legend-state] Circular reference detected in object. You may want to use opaqueObject to stop traversing child nodes.', obj);
+            return false;
+        }
+        __devExtractFunctionsAndComputedsNodes.add(obj);
+    }
+    for (const k in obj) {
+        const v = obj[k];
+        if (isPromise(v)) {
+            extractPromise(getChildNode(node, k), v);
+        }
+        else if (typeof v === 'function') {
+            extractFunction(node, k, v);
+        }
+        else if (typeof v == 'object' && v !== null && v !== undefined) {
+            const childNode = getNode(v);
+            if (childNode === null || childNode === void 0 ? void 0 : childNode.isComputed) {
+                extractFunction(node, k, v, childNode);
+                delete obj[k];
+            }
+            else if (!v[symbolOpaque]) {
+                extractFunctionsAndComputeds(getChildNode(node, k), obj[k]);
+            }
+        }
+    }
+}
 function createObservable(value, makePrimitive) {
     const valueIsPromise = isPromise(value);
     const root = {
-        _: valueIsPromise ? undefined : value,
+        _: value,
     };
     const node = {
         root,
@@ -1426,19 +1450,14 @@ function createObservable(value, makePrimitive) {
         ? new ObservablePrimitiveClass(node)
         : getProxy(node);
     if (valueIsPromise) {
-        value.catch((error) => {
-            obs.set({ error });
-        });
-        value.then((value) => {
-            obs.set(value);
-        });
+        extractPromise(node, value);
     }
     else if (!prim) {
         if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
             __devExtractFunctionsAndComputedsNodes.clear();
         }
         if (value) {
-            extractFunctionsAndComputeds(value, node);
+            extractFunctionsAndComputeds(node, value);
         }
     }
     return obs;
@@ -1516,6 +1535,7 @@ function computed(compute, set$1) {
             prevNode.linkedFromNodes.delete(node);
             node.linkedToNode = undefined;
         }
+        const childNode = node.computedChildOfNode;
         if (isObservable(val)) {
             // If the computed is a proxy to another observable
             // link it to the target observable
@@ -1544,14 +1564,22 @@ function computed(compute, set$1) {
             // Update the computed value
             setter(node, val);
             // If the computed is a child of an observable set the value on it
-            if (node.computedChildOfNode) {
-                setter(node.computedChildOfNode, val);
+            if (childNode) {
+                let didUnlock = false;
+                if (childNode.root.locked) {
+                    childNode.root.locked = false;
+                    didUnlock = true;
+                }
+                setter(childNode, val);
+                if (didUnlock) {
+                    childNode.root.locked = true;
+                }
             }
             // Re-lock the computed node
             lockObservable(obs, true);
         }
-        else if (node.computedChildOfNode) {
-            setNodeValue(node.computedChildOfNode, val);
+        else if (childNode) {
+            setNodeValue(childNode, val);
         }
         isSetAfterActivated = true;
     };
@@ -1598,9 +1626,9 @@ function event() {
     };
 }
 
-function proxy(get) {
+function proxy(get, set) {
     // Create an observable for this computed variable
-    const obs = observable();
+    const obs = observable({});
     lockObservable(obs, true);
     const mapTargets = new Map();
     const node = getNode(obs);
@@ -1608,8 +1636,19 @@ function proxy(get) {
     node.proxyFn = (key) => {
         let target = mapTargets.get(key);
         if (!target) {
-            target = computed(() => get(key));
+            // Note: Coercing typescript to allow undefined for set in computed because we don't want the public interface to allow undefined
+            target = computed(() => get(key), (set ? (value) => set(key, value) : undefined));
             mapTargets.set(key, target);
+            extractFunction(node, key, target, getNode(target));
+            if (node.computedChildOfNode) {
+                onChange(getNode(target), ({ value, getPrevious }) => {
+                    const previous = getPrevious();
+                    // Set the raw value on the proxy's parent
+                    setNodeValue(node.computedChildOfNode, node.root._);
+                    // Notify the proxy
+                    notify(getChildNode(node, key), value, previous, 0);
+                });
+            }
         }
         return target;
     };
@@ -1621,7 +1660,7 @@ function _when(predicate, effect, checkReady) {
     // Create a wrapping fn that calls the effect if predicate returns true
     function run(e) {
         const ret = computeSelector(predicate);
-        if (checkReady ? isObservableValueReady(ret) : ret) {
+        if (!isPromise(ret) && (checkReady ? isObservableValueReady(ret) : ret)) {
             value = ret;
             // If value is truthy then run the effect
             effect === null || effect === void 0 ? void 0 : effect(ret);
@@ -1633,7 +1672,10 @@ function _when(predicate, effect, checkReady) {
     observe(run);
     // If first run resulted in a truthy value just return it.
     // It will have set e.cancel so no need to dispose
-    if (value !== undefined) {
+    if (isPromise(value)) {
+        return effect ? value.then(effect) : value;
+    }
+    else if (value !== undefined) {
         return Promise.resolve(value);
     }
     else {
@@ -1693,6 +1735,7 @@ const internal = {
     get,
     getNode,
     getProxy,
+    globalState,
     optimized,
     peek,
     set,
@@ -1702,7 +1745,6 @@ const internal = {
 };
 
 exports.ObservablePrimitiveClass = ObservablePrimitiveClass;
-exports.afterBatch = afterBatch;
 exports.batch = batch;
 exports.beginBatch = beginBatch;
 exports.beginTracking = beginTracking;