@legendapp/state 0.23.2 → 1.0.0-rc.2

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 1.0.0-rc.2
+
+- Feature: `batch` has a new `onComplete `batch(callback, onComplete)` parameter to run a function after the batch commits. This can be useful for cleaning up a temporary state while batching.
+- Fix: onChange with `initial` option fires immediately rather than going through batching process
+- Fix: Applying pending changes on load was writing back to local persistence unnecessarily
+- Perf: Improve performance of `mergeIntoObservable` by just doing a `set` if a target property is empty and doesn't need merging logic
+- Perf: Improve persistence overall by using more targeted approaches than `mergeIntoObservable`
+
+## 1.0.0-rc.1
+
+- Fix: Incrementing a value from 0 with a function (`value.set((prev) => prev + 1)`) was not firing a callback the first time
+
+
+## 1.0.0-rc.0
+
+- Breaking: `onChange` function changed to take an options object as a second parameter with a new `initial` option that makes it fire immediately with the current value.
+- Breaking: `onChange` callback receives an object parameter instead of many arguments. This adds more flexibility for callers who care about different values in the change object.
+- Fix: `mergeIntoObservable` was not working correctly in some edge cases.
+- Fix: IndexedDB persistence improved for many edge cases, with some fixes and performance improvements
+- Fix: Persistence layers overall improved with more stability and better performance
+
+## 0.23.1
+
+- Fix: Not notifying on change of dates
+
 ## 0.23.0
 
 - Breaking: Improved the criteria of when to notify up parents for changes on objects to run only when something inside it has changed, so setting/assigning the same object onto itself will not notify. It's unlikely but possible that may be a breaking change for you if you depended on things re-computing/re-rendering even if nothing changed.

package/README.md

@@ -106,6 +106,10 @@ const Component = observer(function Component() {
 
 See [the documentation site](https://www.legendapp.com/open-source/state/).
 
+## Community
+
+Join us on [Slack](https://join.slack.com/t/legendappcommunity/shared_invite/zt-1mfjknpna-vUL2s1qOuNeZL12~t2RruQ) to get involved with the Legend community.
+
 ## Road to 1.0
 
 - [ ] Improve documentation

package/helpers/pageHash.js

@@ -11,7 +11,7 @@ const pageHash = state.observable(hasWindow ? window.location.hash.slice(1) : ''
 if (hasWindow) {
     let isSetting = false;
     // Set the page hash when the observable changes
-    pageHash.onChange((value) => {
+    pageHash.onChange(({ value }) => {
         if (!isSetting) {
             const hash = '#' + value;
             const setter = (_options === null || _options === void 0 ? void 0 : _options.setter) || 'hash';

package/helpers/pageHash.js.map

@@ -1 +1 @@
-{"version":3,"file":"pageHash.js","sources":["../../../../src/helpers/pageHash.ts"],"sourcesContent":[null],"names":["observable"],"mappings":";;;;AAKA,IAAI,QAAQ,GAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAE3C,SAAS,iBAAiB,CAAC,OAAgB,EAAA;IACvC,QAAQ,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAC1C,MAAA,QAAQ,GAAuBA,gBAAU,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE;AAEhG,IAAI,SAAS,EAAE;IACX,IAAI,SAAS,GAAG,KAAK,CAAC;;AAEtB,IAAA,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,KAAI;QACxB,IAAI,CAAC,SAAS,EAAE;AACZ,YAAA,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC;AACzB,YAAA,MAAM,MAAM,GAAG,CAAA,QAAQ,KAAR,IAAA,IAAA,QAAQ,KAAR,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,QAAQ,CAAE,MAAM,KAAI,MAAM,CAAC;YAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvC,aAAA;iBAAM,IAAI,MAAM,KAAK,cAAc,EAAE;gBAClC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1C,aAAA;AAAM,iBAAA;AACH,gBAAA,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACxB,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;;IAEH,MAAM,EAAE,GAAG,MAAK;QACZ,SAAS,GAAG,IAAI,CAAC;AACjB,QAAA,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,SAAS,GAAG,KAAK,CAAC;AACtB,KAAC,CAAC;;AAEF,IAAA,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC7C;;;;;"}
+{"version":3,"file":"pageHash.js","sources":["../../../../src/helpers/pageHash.ts"],"sourcesContent":[null],"names":["observable"],"mappings":";;;;AAKA,IAAI,QAAQ,GAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAE3C,SAAS,iBAAiB,CAAC,OAAgB,EAAA;IACvC,QAAQ,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAC1C,MAAA,QAAQ,GAAuBA,gBAAU,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE;AAEhG,IAAI,SAAS,EAAE;IACX,IAAI,SAAS,GAAG,KAAK,CAAC;;IAEtB,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAI;QAC5B,IAAI,CAAC,SAAS,EAAE;AACZ,YAAA,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC;AACzB,YAAA,MAAM,MAAM,GAAG,CAAA,QAAQ,KAAR,IAAA,IAAA,QAAQ,KAAR,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,QAAQ,CAAE,MAAM,KAAI,MAAM,CAAC;YAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvC,aAAA;iBAAM,IAAI,MAAM,KAAK,cAAc,EAAE;gBAClC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1C,aAAA;AAAM,iBAAA;AACH,gBAAA,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACxB,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;;IAEH,MAAM,EAAE,GAAG,MAAK;QACZ,SAAS,GAAG,IAAI,CAAC;AACjB,QAAA,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,SAAS,GAAG,KAAK,CAAC;AACtB,KAAC,CAAC;;AAEF,IAAA,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC7C;;;;;"}

package/helpers/pageHash.mjs

@@ -9,7 +9,7 @@ const pageHash = observable(hasWindow ? window.location.hash.slice(1) : '');
 if (hasWindow) {
     let isSetting = false;
     // Set the page hash when the observable changes
-    pageHash.onChange((value) => {
+    pageHash.onChange(({ value }) => {
         if (!isSetting) {
             const hash = '#' + value;
             const setter = (_options === null || _options === void 0 ? void 0 : _options.setter) || 'hash';

package/helpers/pageHash.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"pageHash.mjs","sources":["../../../../src/helpers/pageHash.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAKA,IAAI,QAAQ,GAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAE3C,SAAS,iBAAiB,CAAC,OAAgB,EAAA;IACvC,QAAQ,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAC1C,MAAA,QAAQ,GAAuB,UAAU,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE;AAEhG,IAAI,SAAS,EAAE;IACX,IAAI,SAAS,GAAG,KAAK,CAAC;;AAEtB,IAAA,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,KAAI;QACxB,IAAI,CAAC,SAAS,EAAE;AACZ,YAAA,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC;AACzB,YAAA,MAAM,MAAM,GAAG,CAAA,QAAQ,KAAR,IAAA,IAAA,QAAQ,KAAR,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,QAAQ,CAAE,MAAM,KAAI,MAAM,CAAC;YAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvC,aAAA;iBAAM,IAAI,MAAM,KAAK,cAAc,EAAE;gBAClC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1C,aAAA;AAAM,iBAAA;AACH,gBAAA,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACxB,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;;IAEH,MAAM,EAAE,GAAG,MAAK;QACZ,SAAS,GAAG,IAAI,CAAC;AACjB,QAAA,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,SAAS,GAAG,KAAK,CAAC;AACtB,KAAC,CAAC;;AAEF,IAAA,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC7C;;;;"}
+{"version":3,"file":"pageHash.mjs","sources":["../../../../src/helpers/pageHash.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAKA,IAAI,QAAQ,GAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAE3C,SAAS,iBAAiB,CAAC,OAAgB,EAAA;IACvC,QAAQ,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAC1C,MAAA,QAAQ,GAAuB,UAAU,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE;AAEhG,IAAI,SAAS,EAAE;IACX,IAAI,SAAS,GAAG,KAAK,CAAC;;IAEtB,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAI;QAC5B,IAAI,CAAC,SAAS,EAAE;AACZ,YAAA,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC;AACzB,YAAA,MAAM,MAAM,GAAG,CAAA,QAAQ,KAAR,IAAA,IAAA,QAAQ,KAAR,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,QAAQ,CAAE,MAAM,KAAI,MAAM,CAAC;YAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvC,aAAA;iBAAM,IAAI,MAAM,KAAK,cAAc,EAAE;gBAClC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1C,aAAA;AAAM,iBAAA;AACH,gBAAA,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACxB,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;;IAEH,MAAM,EAAE,GAAG,MAAK;QACZ,SAAS,GAAG,IAAI,CAAC;AACjB,QAAA,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,SAAS,GAAG,KAAK,CAAC;AACtB,KAAC,CAAC;;AAEF,IAAA,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC7C;;;;"}

package/helpers/pageHashParams.js

@@ -22,7 +22,7 @@ const pageHashParams = state.observable(hasWindow ? toParams(window.location.has
 if (hasWindow) {
     let isSetting = false;
     // Set the page hash when the observable changes
-    pageHashParams.onChange((value) => {
+    pageHashParams.onChange(({ value }) => {
         if (!isSetting) {
             const hash = '#' + toString(value);
             const setter = (_options === null || _options === void 0 ? void 0 : _options.setter) || 'hash';

package/helpers/pageHashParams.js.map

@@ -1 +1 @@
-{"version":3,"file":"pageHashParams.js","sources":["../../../../src/helpers/pageHashParams.ts"],"sourcesContent":[null],"names":["observable"],"mappings":";;;;AAKA,IAAI,QAAQ,GAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAE3C,SAAS,uBAAuB,CAAC,OAAgB,EAAA;IAC7C,QAAQ,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAA;IACzB,MAAM,GAAG,GAA2B,EAAE,CAAC;AACvC,IAAA,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,YAAY,EAAE;AACrC,QAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACpB,KAAA;AACD,IAAA,OAAO,GAAG,CAAC;AACf,CAAC;AACD,SAAS,QAAQ,CAAC,MAA8B,EAAA;IAC5C,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;AAClD,CAAC;AAED,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAC1C,MAAA,cAAc,GAAuCA,gBAAU,CACjE,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAC1D;AAEF,IAAI,SAAS,EAAE;IACX,IAAI,SAAS,GAAG,KAAK,CAAC;;AAEtB,IAAA,cAAc,CAAC,QAAQ,CAAC,CAAC,KAAK,KAAI;QAC9B,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;AACnC,YAAA,MAAM,MAAM,GAAG,CAAA,QAAQ,KAAR,IAAA,IAAA,QAAQ,KAAR,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,QAAQ,CAAE,MAAM,KAAI,MAAM,CAAC;YAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvC,aAAA;iBAAM,IAAI,MAAM,KAAK,cAAc,EAAE;gBAClC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1C,aAAA;AAAM,iBAAA;AACH,gBAAA,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACxB,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;;IAEH,MAAM,EAAE,GAAG,MAAK;QACZ,SAAS,GAAG,IAAI,CAAC;AACjB,QAAA,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,SAAS,GAAG,KAAK,CAAC;AACtB,KAAC,CAAC;;AAEF,IAAA,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC7C;;;;;"}
+{"version":3,"file":"pageHashParams.js","sources":["../../../../src/helpers/pageHashParams.ts"],"sourcesContent":[null],"names":["observable"],"mappings":";;;;AAKA,IAAI,QAAQ,GAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAE3C,SAAS,uBAAuB,CAAC,OAAgB,EAAA;IAC7C,QAAQ,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAA;IACzB,MAAM,GAAG,GAA2B,EAAE,CAAC;AACvC,IAAA,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,YAAY,EAAE;AACrC,QAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACpB,KAAA;AACD,IAAA,OAAO,GAAG,CAAC;AACf,CAAC;AACD,SAAS,QAAQ,CAAC,MAA8B,EAAA;IAC5C,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;AAClD,CAAC;AAED,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAC1C,MAAA,cAAc,GAAuCA,gBAAU,CACjE,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAC1D;AAEF,IAAI,SAAS,EAAE;IACX,IAAI,SAAS,GAAG,KAAK,CAAC;;IAEtB,cAAc,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAI;QAClC,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;AACnC,YAAA,MAAM,MAAM,GAAG,CAAA,QAAQ,KAAR,IAAA,IAAA,QAAQ,KAAR,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,QAAQ,CAAE,MAAM,KAAI,MAAM,CAAC;YAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvC,aAAA;iBAAM,IAAI,MAAM,KAAK,cAAc,EAAE;gBAClC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1C,aAAA;AAAM,iBAAA;AACH,gBAAA,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACxB,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;;IAEH,MAAM,EAAE,GAAG,MAAK;QACZ,SAAS,GAAG,IAAI,CAAC;AACjB,QAAA,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,SAAS,GAAG,KAAK,CAAC;AACtB,KAAC,CAAC;;AAEF,IAAA,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC7C;;;;;"}

package/helpers/pageHashParams.mjs

@@ -20,7 +20,7 @@ const pageHashParams = observable(hasWindow ? toParams(window.location.hash.slic
 if (hasWindow) {
     let isSetting = false;
     // Set the page hash when the observable changes
-    pageHashParams.onChange((value) => {
+    pageHashParams.onChange(({ value }) => {
         if (!isSetting) {
             const hash = '#' + toString(value);
             const setter = (_options === null || _options === void 0 ? void 0 : _options.setter) || 'hash';

package/helpers/pageHashParams.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"pageHashParams.mjs","sources":["../../../../src/helpers/pageHashParams.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAKA,IAAI,QAAQ,GAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAE3C,SAAS,uBAAuB,CAAC,OAAgB,EAAA;IAC7C,QAAQ,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAA;IACzB,MAAM,GAAG,GAA2B,EAAE,CAAC;AACvC,IAAA,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,YAAY,EAAE;AACrC,QAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACpB,KAAA;AACD,IAAA,OAAO,GAAG,CAAC;AACf,CAAC;AACD,SAAS,QAAQ,CAAC,MAA8B,EAAA;IAC5C,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;AAClD,CAAC;AAED,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAC1C,MAAA,cAAc,GAAuC,UAAU,CACjE,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAC1D;AAEF,IAAI,SAAS,EAAE;IACX,IAAI,SAAS,GAAG,KAAK,CAAC;;AAEtB,IAAA,cAAc,CAAC,QAAQ,CAAC,CAAC,KAAK,KAAI;QAC9B,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;AACnC,YAAA,MAAM,MAAM,GAAG,CAAA,QAAQ,KAAR,IAAA,IAAA,QAAQ,KAAR,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,QAAQ,CAAE,MAAM,KAAI,MAAM,CAAC;YAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvC,aAAA;iBAAM,IAAI,MAAM,KAAK,cAAc,EAAE;gBAClC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1C,aAAA;AAAM,iBAAA;AACH,gBAAA,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACxB,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;;IAEH,MAAM,EAAE,GAAG,MAAK;QACZ,SAAS,GAAG,IAAI,CAAC;AACjB,QAAA,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,SAAS,GAAG,KAAK,CAAC;AACtB,KAAC,CAAC;;AAEF,IAAA,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC7C;;;;"}
+{"version":3,"file":"pageHashParams.mjs","sources":["../../../../src/helpers/pageHashParams.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAKA,IAAI,QAAQ,GAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAE3C,SAAS,uBAAuB,CAAC,OAAgB,EAAA;IAC7C,QAAQ,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAA;IACzB,MAAM,GAAG,GAA2B,EAAE,CAAC;AACvC,IAAA,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,YAAY,EAAE;AACrC,QAAA,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACpB,KAAA;AACD,IAAA,OAAO,GAAG,CAAC;AACf,CAAC;AACD,SAAS,QAAQ,CAAC,MAA8B,EAAA;IAC5C,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;AAClD,CAAC;AAED,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAC1C,MAAA,cAAc,GAAuC,UAAU,CACjE,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAC1D;AAEF,IAAI,SAAS,EAAE;IACX,IAAI,SAAS,GAAG,KAAK,CAAC;;IAEtB,cAAc,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAI;QAClC,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;AACnC,YAAA,MAAM,MAAM,GAAG,CAAA,QAAQ,KAAR,IAAA,IAAA,QAAQ,KAAR,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,QAAQ,CAAE,MAAM,KAAI,MAAM,CAAC;YAC1C,IAAI,MAAM,KAAK,WAAW,EAAE;gBACxB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvC,aAAA;iBAAM,IAAI,MAAM,KAAK,cAAc,EAAE;gBAClC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC1C,aAAA;AAAM,iBAAA;AACH,gBAAA,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;AACxB,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;;IAEH,MAAM,EAAE,GAAG,MAAK;QACZ,SAAS,GAAG,IAAI,CAAC;AACjB,QAAA,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,SAAS,GAAG,KAAK,CAAC;AACtB,KAAC,CAAC;;AAEF,IAAA,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC7C;;;;"}

package/history.js

@@ -4,17 +4,17 @@ var state = require('@legendapp/state');
 
 function trackHistory(obs, targetObservable) {
     const history = targetObservable !== null && targetObservable !== void 0 ? targetObservable : state.observable();
-    obs.onChange((_, __, changes) => {
+    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) {
             const time = Date.now().toString();
             // Save to history observable by date, with the previous value
             for (let i = 0; i < changes.length; i++) {
-                const { path, prevAtPath } = changes[i];
+                const { path, prevAtPath, pathTypes } = changes[i];
                 if (path[path.length - 1] === state.symbolDateModified)
                     continue;
-                const obj = state.constructObject(path, prevAtPath);
+                const obj = state.constructObjectWithPath(path, prevAtPath, pathTypes);
                 state.mergeIntoObservable(history[time], obj);
             }
         }

package/history.js.map

@@ -1 +1 @@
-{"version":3,"file":"history.js","sources":["../../src/history/trackHistory.ts"],"sourcesContent":[null],"names":["observable","tracking","symbolDateModified","constructObject","mergeIntoObservable"],"mappings":";;;;AAagB,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,CAAC,EAAE,EAAE,EAAE,OAAO,KAAI;;;AAG5B,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;gBACrC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBACxC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAMC,wBAA0B;oBAAE,SAAS;gBAEpE,MAAM,GAAG,GAAGC,qBAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAC9CC,yBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AAC3C,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","tracking","symbolDateModified","constructObjectWithPath","mergeIntoObservable"],"mappings":";;;;AAagB,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;gBACnD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAMC,wBAA0B;oBAAE,SAAS;gBAEpE,MAAM,GAAG,GAAGC,6BAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;gBACjEC,yBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AAC3C,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;AAEH,IAAA,OAAO,OAAO,CAAC;AACnB;;;;"}

package/history.mjs

@@ -1,18 +1,18 @@
-import { observable, tracking, symbolDateModified, constructObject, mergeIntoObservable } from '@legendapp/state';
+import { observable, tracking, symbolDateModified, constructObjectWithPath, mergeIntoObservable } from '@legendapp/state';
 
 function trackHistory(obs, targetObservable) {
     const history = targetObservable !== null && targetObservable !== void 0 ? targetObservable : observable();
-    obs.onChange((_, __, changes) => {
+    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) {
             const time = Date.now().toString();
             // Save to history observable by date, with the previous value
             for (let i = 0; i < changes.length; i++) {
-                const { path, prevAtPath } = changes[i];
+                const { path, prevAtPath, pathTypes } = changes[i];
                 if (path[path.length - 1] === symbolDateModified)
                     continue;
-                const obj = constructObject(path, prevAtPath);
+                const obj = constructObjectWithPath(path, prevAtPath, pathTypes);
                 mergeIntoObservable(history[time], obj);
             }
         }

package/history.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"history.mjs","sources":["../../src/history/trackHistory.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAagB,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,CAAC,EAAE,EAAE,EAAE,OAAO,KAAI;;;AAG5B,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;gBACrC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBACxC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAM,kBAA0B;oBAAE,SAAS;gBAEpE,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAC9C,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AAC3C,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":";;AAagB,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;gBACnD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAM,kBAA0B;oBAAE,SAAS;gBAEpE,MAAM,GAAG,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;gBACjE,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AAC3C,aAAA;AACJ,SAAA;AACL,KAAC,CAAC,CAAC;AAEH,IAAA,OAAO,OAAO,CAAC;AACnB;;;;"}

package/index.d.ts

@@ -1,4 +1,4 @@
-export { opaqueObject, isObservable, mergeIntoObservable, getObservableIndex, computeSelector } from './src/helpers';
+export { opaqueObject, isObservable, mergeIntoObservable, getObservableIndex, computeSelector, constructObjectWithPath, deconstructObjectWithPath, setAtPath, setInObservableAtPath } from './src/helpers';
 export { observable, observablePrimitive } from './src/observable';
 export { batch, beginBatch, endBatch } from './src/batching';
 export { computed } from './src/computed';
@@ -6,5 +6,5 @@ export { event } from './src/event';
 export { observe } from './src/observe';
 export { when } from './src/when';
 export * from './src/observableInterfaces';
-export { isEmpty, isArray, isBoolean, isFunction, isObject, isPrimitive, isPromise, isString, isSymbol } from './src/is';
+export { isEmpty, isArray, isBoolean, isFunction, isObject, isPrimitive, isPromise, isString, isSymbol, } from './src/is';
 export { lockObservable } from './src/helpers';

package/index.js

@@ -130,6 +130,7 @@ function getChildNode(node, key) {
     if (isString(key)) {
         const n = +key;
         // Convert to number if it's a string representing a valid number
+        // This is faster than isNaN
         if (n - n < 1)
             key = n;
     }
@@ -197,51 +198,95 @@ function lockObservable(obs, value) {
         root.locked = value;
     }
 }
+function setAtPath(obj, path, pathTypes, value) {
+    let o = obj;
+    for (let i = 0; i < path.length; i++) {
+        const p = path[i];
+        if (i === path.length - 1) {
+            o[p] = value;
+        }
+        else if (o[p] === undefined) {
+            o[p] = pathTypes[i] === 'array' ? [] : {};
+        }
+        o = o[p];
+    }
+}
+function setInObservableAtPath(obs, path, value, mode) {
+    let o = obs;
+    let v = value;
+    for (let i = 0; i < path.length; i++) {
+        const p = path[i];
+        o = obs[p];
+        v = value[p];
+    }
+    if (v === symbolDelete) {
+        o.delete();
+    }
+    // Assign if possible, or set otherwise
+    else if (mode === 'assign' && o.assign) {
+        o.assign(v);
+    }
+    else {
+        o.set(v);
+    }
+}
 function mergeIntoObservable(target, ...sources) {
-    var _a, _b;
+    var _a;
     if (!sources.length)
         return target;
-    const source = sources.shift();
-    const needsSet = isObservable(target);
-    const targetValue = needsSet ? target.peek() : target;
-    const isTargetObj = isObject(targetValue);
-    const isTargetArr = isArray(targetValue);
-    if ((isTargetObj && isObject(source)) || (isTargetArr && isArray(source))) {
-        const keys = isTargetArr ? source : Object.keys(source);
-        if (source[symbolDateModified]) {
-            keys.push(symbolDateModified);
-        }
-        for (let i = 0; i < keys.length; i++) {
-            const key = isTargetArr ? i : keys[i];
-            const sourceValue = source[key];
-            if (isObject(sourceValue)) {
-                if (!needsSet && (!targetValue[key] || !isObject(targetValue[key]))) {
-                    target[key] = {};
+    for (let u = 0; u < sources.length; u++) {
+        const source = sources[u];
+        const needsSet = isObservable(target);
+        let targetValue = needsSet ? target.peek() : target;
+        const isTargetArr = isArray(targetValue);
+        const isTargetObj = !isTargetArr && isObject(targetValue);
+        if ((isTargetObj && isObject(source) && !isEmpty(targetValue)) ||
+            (isTargetArr && isArray(source) && targetValue.length > 0)) {
+            const keys = isTargetArr ? source : Object.keys(source);
+            let dateModified = source[symbolDateModified];
+            for (let i = 0; i < keys.length; i++) {
+                const key = isTargetArr ? i : keys[i];
+                const sourceValue = source[key];
+                if (sourceValue === symbolDelete) {
+                    needsSet && ((_a = target[key]) === null || _a === void 0 ? void 0 : _a.delete)
+                        ? target[key].delete()
+                        : delete target[key];
+                }
+                else {
+                    const isObj = isObject(sourceValue);
+                    const isArr = !isObj && isArray(sourceValue);
+                    const targetValue = target[key];
+                    if ((isObj || isArr) && target[key] && (isObj ? !isEmpty(targetValue) : targetValue.length > 0)) {
+                        if (!needsSet && (!target[key] || (isObj ? !isObject(target[key]) : !isArray(target[key])))) {
+                            target[key] = isObj ? {} : [];
+                        }
+                        mergeIntoObservable(target[key], sourceValue);
+                        dateModified = Math.max(dateModified || 0, sourceValue[symbolDateModified] || 0);
+                    }
+                    else {
+                        needsSet ? target[key].set(sourceValue) : (target[key] = sourceValue);
+                    }
                 }
-                mergeIntoObservable(target[key], sourceValue);
-            }
-            else if (sourceValue === symbolDelete) {
-                needsSet && ((_a = target[key]) === null || _a === void 0 ? void 0 : _a.delete) ? target[key].delete() : delete target[key];
             }
-            else {
-                needsSet && ((_b = target[key]) === null || _b === void 0 ? void 0 : _b.set)
-                    ? target[key].set(sourceValue)
-                    : (target[key] = sourceValue);
+            if (dateModified) {
+                needsSet
+                    ? target[symbolDateModified].set(dateModified)
+                    : (target[symbolDateModified] = dateModified);
             }
         }
+        else {
+            needsSet ? target.set(source) : (target = source);
+        }
     }
-    else if (needsSet && !(isTargetObj && source === undefined)) {
-        target.set(source);
-    }
-    return mergeIntoObservable(target, ...sources);
+    return target;
 }
-function constructObject(path, value) {
+function constructObjectWithPath(path, value, pathTypes) {
     let out;
     if (path.length > 0) {
         let o = (out = {});
         for (let i = 0; i < path.length; i++) {
             const p = path[i];
-            o[p] = i === path.length - 1 ? value : {};
+            o[p] = i === path.length - 1 ? value : pathTypes[i] === 'array' ? [] : {};
             o = o[p];
         }
     }
@@ -250,7 +295,7 @@ function constructObject(path, value) {
     }
     return out;
 }
-function deconstructObject(path, value) {
+function deconstructObjectWithPath(path, value) {
     let o = value;
     for (let i = 0; i < path.length; i++) {
         const p = path[i];
@@ -258,13 +303,11 @@ function deconstructObject(path, value) {
     }
     return o;
 }
-function clone(obj) {
-    return JSON.parse(JSON.stringify(obj));
-}
 
 let timeout;
 let numInBatch = 0;
 let _batch = [];
+let _afterBatch = [];
 // Use a Map of callbacks for fast lookups to update the BatchItem
 let _batchMap = new Map();
 function onActionTimeout() {
@@ -284,8 +327,9 @@ function batchNotify(b) {
         // If this callback already exists, make sure it has the latest value but do not add it
         if (existing) {
             if (!isFunc) {
-                existing.value = b.value;
-                existing.changes.push(...b.changes);
+                const params = existing.params;
+                params.value = b.params.value;
+                params.changes.push(...b.params.changes);
             }
         }
         else {
@@ -294,10 +338,13 @@ function batchNotify(b) {
         }
     }
     else {
-        isFunc ? b() : b.cb(b.value, b.getPrevious, b.changes, b.node);
+        isFunc ? b() : b.cb(b.params);
     }
 }
-function batch(fn) {
+function batch(fn, after) {
+    if (after) {
+        _afterBatch.push(after);
+    }
     beginBatch();
     fn();
     endBatch();
@@ -318,18 +365,23 @@ function endBatch(force) {
         // 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;
+        const after = _afterBatch;
         _batch = [];
         _batchMap = new Map();
+        _afterBatch = [];
         for (let i = 0; i < batch.length; i++) {
             const b = batch[i];
             if (isFunction(b)) {
                 b();
             }
             else {
-                const { cb, value, getPrevious: prev, changes, node } = b;
-                cb(value, prev, changes, node);
+                const { cb } = b;
+                cb(b.params);
             }
         }
+        for (let i = 0; i < after.length; i++) {
+            after[i]();
+        }
     }
 }
 
@@ -351,7 +403,7 @@ function createPreviousHandler(value, path, prevAtPath) {
         return clone;
     };
 }
-function doNotify(node, value, path, valueAtPath, prevAtPath, level, whenOptimizedOnlyIf) {
+function doNotify(node, value, path, pathTypes, valueAtPath, prevAtPath, level, whenOptimizedOnlyIf) {
     const listeners = node.listeners;
     if (listeners) {
         let getPrevious;
@@ -359,7 +411,11 @@ function doNotify(node, value, path, valueAtPath, prevAtPath, level, whenOptimiz
         for (let i = 0; i < arr.length; i++) {
             const listenerFn = arr[i];
             const { track, noArgs } = listenerFn;
-            const ok = track === true ? level <= 0 : track === 'optimize' ? whenOptimizedOnlyIf && level <= 0 : true;
+            const ok = track === true || track === 'shallow'
+                ? level <= 0
+                : track === 'optimize'
+                    ? whenOptimizedOnlyIf && level <= 0
+                    : true;
             // Notify if listener is not shallow or if this is the first level
             if (ok) {
                 // Create a function to get the previous data. Computing a clone of previous data can be expensive if doing
@@ -371,45 +427,62 @@ function doNotify(node, value, path, valueAtPath, prevAtPath, level, whenOptimiz
                     ? listenerFn.listener
                     : {
                         cb: listenerFn.listener,
-                        value,
-                        getPrevious,
-                        changes: [
-                            {
-                                path,
-                                valueAtPath,
-                                prevAtPath,
-                            },
-                        ],
-                        node,
+                        params: {
+                            value,
+                            getPrevious,
+                            changes: [
+                                {
+                                    path,
+                                    pathTypes,
+                                    valueAtPath,
+                                    prevAtPath,
+                                },
+                            ],
+                        },
                     });
             }
         }
     }
 }
-function _notifyParents(node, value, path, valueAtPath, prevAtPath, level, whenOptimizedOnlyIf) {
+function _notifyParents(node, value, path, pathTypes, valueAtPath, prevAtPath, level, whenOptimizedOnlyIf) {
     // Do the notify
-    doNotify(node, value, path, valueAtPath, prevAtPath, level, whenOptimizedOnlyIf);
+    doNotify(node, value, path, pathTypes, valueAtPath, prevAtPath, level, whenOptimizedOnlyIf);
     // If not root notify up through parents
     if (node.parent) {
         const parent = node.parent;
         if (parent) {
             const parentValue = getNodeValue(parent);
-            _notifyParents(parent, parentValue, [node.key].concat(path), valueAtPath, prevAtPath, level + 1, whenOptimizedOnlyIf);
+            _notifyParents(parent, parentValue, [node.key].concat(path), [(isArray(value) ? 'array' : 'object')].concat(pathTypes), valueAtPath, prevAtPath, level + 1, whenOptimizedOnlyIf);
         }
     }
 }
 function notify(node, value, prev, level, whenOptimizedOnlyIf) {
     // Notify self and up through parents
-    _notifyParents(node, value, [], value, prev, level, whenOptimizedOnlyIf);
+    _notifyParents(node, value, [], [], value, prev, level, whenOptimizedOnlyIf);
 }
 
-function onChange(node, callback, track, noArgs) {
+function onChange(node, callback, options, noArgs) {
     let listeners = node.listeners;
     if (!listeners) {
         node.listeners = listeners = new Set();
     }
-    const listener = { listener: callback, track: track, noArgs };
+    const listener = { listener: callback, track: options === null || options === void 0 ? void 0 : options.trackingType, noArgs };
     listeners.add(listener);
+    if (options === null || options === void 0 ? void 0 : options.initial) {
+        const value = getNodeValue(node);
+        callback({
+            value,
+            changes: [
+                {
+                    path: [],
+                    pathTypes: [],
+                    prevAtPath: value,
+                    valueAtPath: value,
+                },
+            ],
+            getPrevious: () => undefined,
+        });
+    }
     return () => listeners.delete(listener);
 }
 
@@ -459,7 +532,7 @@ ObservablePrimitiveClass.prototype.set = function (value) {
     const root = this._node.root;
     const prev = root._;
     root._ = value;
-    doNotify(this._node, value, [], value, prev, 0);
+    doNotify(this._node, value, [], [], value, prev, 0);
     return this;
 };
 ObservablePrimitiveClass.prototype.toggle = function () {
@@ -473,8 +546,8 @@ ObservablePrimitiveClass.prototype.toggle = function () {
     return !value;
 };
 // Listener
-ObservablePrimitiveClass.prototype.onChange = function (cb, track, noArgs) {
-    return onChange(this._node, cb, track, noArgs);
+ObservablePrimitiveClass.prototype.onChange = function (cb, options, noArgs) {
+    return onChange(this._node, cb, options, noArgs);
 };
 
 let inSet = false;
@@ -492,7 +565,6 @@ const ArrayModifiers = new Set([
     'unshift',
 ]);
 const ArrayLoopers = new Set(['every', 'some', 'filter', 'forEach', 'map', 'join']);
-const NotifySpecifically = new Set([symbolDateModified]);
 const objectFns = new Map([
     ['get', get],
     ['set', set],
@@ -519,11 +591,11 @@ function collectionSetter(node, target, prop, ...args) {
     return ret;
 }
 function updateNodes(parent, obj, prevValue) {
-    if (isObject(obj) && obj[symbolOpaque]) {
+    if ((isObject(obj) && obj[symbolOpaque]) || (isObject(prevValue) && prevValue[symbolOpaque])) {
         const isDiff = obj !== prevValue;
         if (isDiff) {
             if (parent.listeners) {
-                doNotify(parent, obj, [], obj, prevValue, 0);
+                doNotify(parent, obj, [], [], obj, prevValue, 0);
             }
         }
         return isDiff;
@@ -573,7 +645,7 @@ function updateNodes(parent, obj, prevValue) {
                     updateNodes(child, undefined, prev);
                 }
                 if (child.listeners) {
-                    doNotify(child, undefined, [], undefined, prev, 0);
+                    doNotify(child, undefined, [], [], undefined, prev, 0);
                 }
             }
         }
@@ -619,10 +691,12 @@ function updateNodes(parent, obj, prevValue) {
                 }
                 if (isDiff) {
                     // Array has a new / modified element
-                    hasADiff = true;
                     // If object iterate through its children
-                    if (!isPrimitive(value)) {
-                        updateNodes(child, value, prev);
+                    if (isPrimitive(value)) {
+                        hasADiff = true;
+                    }
+                    else {
+                        hasADiff = hasADiff || updateNodes(child, value, prev);
                     }
                 }
                 if (isDiff || !isArrDiff) {
@@ -631,7 +705,7 @@ function updateNodes(parent, obj, prevValue) {
                     // But do not notify child if the parent is an array with changing length -
                     // the array's listener will cover it
                     if (child.listeners) {
-                        doNotify(child, value, [], value, prev, 0, !isArrDiff);
+                        doNotify(child, value, [], [], value, prev, 0, !isArrDiff);
                     }
                 }
             }
@@ -683,7 +757,7 @@ const proxyHandler = {
                 return l > 2 ? fn(node, a, b, c) : l > 1 ? fn(node, a, b) : fn(node, a);
             };
         }
-        let value = getNodeValue(node);
+        let value = peek(node);
         const isValuePrimitive = isPrimitive(value);
         if (value === undefined || value === null || isValuePrimitive) {
             if (extraPrimitiveProps.size && (node.isActivatedPrimitive || extraPrimitiveActivators.has(p))) {
@@ -852,11 +926,7 @@ function setKey(node, key, newValue, level) {
             whenOptimizedOnlyIf = (newValue === null || newValue === void 0 ? void 0 : newValue.length) !== (prevValue === null || prevValue === void 0 ? void 0 : prevValue.length);
         }
     }
-    if (NotifySpecifically.has(key)) {
-        // Notify specifically at the child, not through children or parents
-        doNotify(childNode, newValue, [], newValue, prevValue, 0);
-    }
-    else if (isPrim ? newValue !== prevValue : hasADiff) {
+    if (isPrim ? 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);
     }
@@ -924,7 +994,7 @@ function setupTracking(nodes, update, noArgs) {
     if (nodes) {
         for (let tracked of nodes.values()) {
             const { node, track } = tracked;
-            listeners.push(onChange(node, update, track, noArgs));
+            listeners.push(onChange(node, update, { trackingType: track }, noArgs));
         }
     }
     return () => {
@@ -1079,12 +1149,11 @@ exports.ObservablePrimitiveClass = ObservablePrimitiveClass;
 exports.batch = batch;
 exports.beginBatch = beginBatch;
 exports.beginTracking = beginTracking;
-exports.clone = clone;
 exports.computeSelector = computeSelector;
 exports.computed = computed;
-exports.constructObject = constructObject;
+exports.constructObjectWithPath = constructObjectWithPath;
 exports.dateModifiedKey = dateModifiedKey;
-exports.deconstructObject = deconstructObject;
+exports.deconstructObjectWithPath = deconstructObjectWithPath;
 exports.endBatch = endBatch;
 exports.endTracking = endTracking;
 exports.event = event;
@@ -1109,11 +1178,12 @@ exports.observablePrimitive = observablePrimitive;
 exports.observe = observe;
 exports.onChange = onChange;
 exports.opaqueObject = opaqueObject;
+exports.setAtPath = setAtPath;
+exports.setInObservableAtPath = setInObservableAtPath;
 exports.symbolDateModified = symbolDateModified;
 exports.symbolDelete = symbolDelete;
 exports.symbolIsEvent = symbolIsEvent;
 exports.symbolIsObservable = symbolIsObservable;
-exports.symbolUndef = symbolUndef;
 exports.tracking = tracking;
 exports.updateTracking = updateTracking;
 exports.when = when;