@legendapp/state 0.10.0-next.3 → 0.10.0-next.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/index.js +70 -47
  2. package/index.js.map +1 -1
  3. package/index.mjs +70 -47
  4. package/index.mjs.map +1 -1
  5. package/package.json +1 -1
  6. package/persist.js +2 -2
  7. package/persist.js.map +1 -1
  8. package/persist.mjs +2 -2
  9. package/persist.mjs.map +1 -1
  10. package/react.js +6 -2
  11. package/react.js.map +1 -1
  12. package/react.mjs +6 -2
  13. package/react.mjs.map +1 -1
  14. package/src/helpers.d.ts +2 -2
  15. package/src/observableInterfaces.d.ts +2 -11
package/index.js CHANGED
@@ -59,39 +59,26 @@ function getNodeValue(node) {
59
59
  return child;
60
60
  }
61
61
  function getChildNode(node, key, id) {
62
- var _a, _b;
62
+ var _a;
63
63
  // Coerce numbers to number so we don't duplicate keys in arrays.
64
64
  // isNaN is slow so make sure it's a string before coercing.
65
65
  if (isString(key) && !isNaN(+key))
66
66
  key = +key;
67
67
  // Get the child by id if included, or by key
68
- let child = id !== undefined ? (_a = node.childrenID) === null || _a === void 0 ? void 0 : _a.get(id) : undefined;
69
- if (!child) {
70
- child = (_b = node.children) === null || _b === void 0 ? void 0 : _b.get(key);
71
- }
68
+ let child = (_a = node.children) === null || _a === void 0 ? void 0 : _a.get(key);
72
69
  // Create the child node if it doesn't already exist
73
70
  if (!child) {
74
71
  child = {
75
72
  root: node.root,
76
73
  parent: node,
77
74
  key,
78
- id,
75
+ // id,
79
76
  };
80
77
  if (!node.children) {
81
78
  node.children = new Map();
82
79
  }
83
80
  node.children.set(key, child);
84
81
  }
85
- // To maintain node stability when moved in arrays, if this is an element in an array,
86
- // add it to the id map, update the childrenID map and update its key
87
- if (id !== undefined) {
88
- if (!node.childrenID) {
89
- node.childrenID = new Map();
90
- }
91
- node.children.set(key, child);
92
- node.childrenID.set(id, child);
93
- child.key = key;
94
- }
95
82
  return child;
96
83
  }
97
84
  function getObservableRawValue(obs) {
@@ -123,20 +110,26 @@ function mergeIntoObservable(target, ...sources) {
123
110
  if (!sources.length)
124
111
  return target;
125
112
  const source = sources.shift();
113
+ const needsSet = isObservable(target);
126
114
  if (isObject(target) && isObject(source)) {
127
115
  if (source[symbolDateModified]) {
128
- target.set(symbolDateModified, source[symbolDateModified]);
116
+ if (needsSet) {
117
+ target.set(symbolDateModified, source[symbolDateModified]);
118
+ }
119
+ else {
120
+ target[symbolDateModified] = source[symbolDateModified];
121
+ }
129
122
  }
130
123
  const value = ((_a = target.get) === null || _a === void 0 ? void 0 : _a.call(target)) || target;
131
124
  for (const key in source) {
132
125
  if (isObject(source[key])) {
133
126
  if (!value[key] || !isObject(value[key])) {
134
- target.set(key, {});
127
+ needsSet ? target.set(key, {}) : (target[key] = {});
135
128
  }
136
129
  mergeIntoObservable(target[key], source[key]);
137
130
  }
138
131
  else {
139
- target.set(key, source[key]);
132
+ needsSet ? target.set(key, source[key]) : (target[key] = source[key]);
140
133
  }
141
134
  }
142
135
  }
@@ -315,50 +308,80 @@ function collectionSetter(node, target, prop, ...args) {
315
308
  return ret;
316
309
  }
317
310
  function updateNodes(parent, obj, prevValue) {
318
- var _a, _b;
319
311
  const isArr = isArray(obj);
320
312
  // If array it's faster to just use the array
321
313
  const keys = isArr ? obj : Object.keys(obj);
322
314
  const length = keys.length;
323
- let hasADiff = false;
315
+ let hasADiff = !isArr || (obj === null || obj === void 0 ? void 0 : obj.length) !== (prevValue === null || prevValue === void 0 ? void 0 : prevValue.length);
316
+ const isArrDiff = hasADiff;
317
+ let keyMap;
318
+ let moved;
319
+ if (isArr && (prevValue === null || prevValue === void 0 ? void 0 : prevValue.length) && isArray(prevValue) && prevValue[0].id !== undefined) {
320
+ keyMap = new Map();
321
+ moved = [];
322
+ for (let i = 0; i < prevValue.length; i++) {
323
+ keyMap.set(prevValue[i].id, i);
324
+ }
325
+ }
324
326
  for (let i = 0; i < length; i++) {
325
327
  const key = isArr ? i : keys[i];
326
328
  const value = obj[key];
327
329
  const prev = prevValue === null || prevValue === void 0 ? void 0 : prevValue[key];
328
330
  let isDiff = prevValue && value !== prev;
329
331
  if (isDiff) {
330
- const isObj = !isPrimitive(value);
331
332
  const id = value === null || value === void 0 ? void 0 : value.id;
332
- // Array optimization step 1: Get the previous key for this id
333
- const prevKey = isArr && id !== undefined ? (_b = (_a = parent.childrenID) === null || _a === void 0 ? void 0 : _a.get(id)) === null || _b === void 0 ? void 0 : _b.key : undefined;
334
- const child = getChildNode(parent, key, id);
335
- // Array optimization step 2: If this id moved from a different place, only notify
336
- // if it's changed from its previous value. If not, notify will be covered by the parent.
337
- if (prevKey !== undefined && child.key !== prevKey) {
338
- const prevOfNode = prevValue[prevKey];
339
- isDiff = prevOfNode !== value;
333
+ let child = getChildNode(parent, key);
334
+ // Detect moves within an array. Need to move the original proxy to the new position to keep
335
+ // the proxy stable, so that listeners to this node will be unaffected by the array shift.
336
+ if (isArr && id !== undefined) {
337
+ // Find the previous position of this element in the array
338
+ const keyChild = id !== undefined ? keyMap === null || keyMap === void 0 ? void 0 : keyMap.get(id) : undefined;
339
+ if (keyChild !== undefined) {
340
+ if (keyChild !== key) {
341
+ // If array length changed then move the original node to the current position
342
+ if (isArrDiff) {
343
+ child = getChildNode(parent, keyChild);
344
+ child.key = key;
345
+ moved.push([key, child]);
346
+ }
347
+ // And check for diff against the previous value in the previous position
348
+ const prevOfNode = prevValue[keyChild];
349
+ isDiff = prevOfNode !== value;
350
+ }
351
+ }
340
352
  }
341
353
  if (isDiff) {
354
+ // Array has a new / modified element
355
+ hasADiff = true;
342
356
  // If object iterate through its children
343
- if (isObj) {
357
+ if (!isPrimitive(value)) {
344
358
  updateNodes(child, value, prev);
345
359
  }
360
+ }
361
+ if (isDiff || !isArrDiff) {
346
362
  // Notify for this child if this element is different and it has listeners
347
- // But do not notify child if the parent is an array - the array's listener will cover it
363
+ // Or if the position changed in an array whose length did not change
364
+ // But do not notify child if the parent is an array with changing length -
365
+ // the array's listener will cover it
348
366
  const doNotify = !!child.listeners;
349
367
  if (doNotify) {
350
- hasADiff = true;
351
368
  _notify(child, value, [], value, prev, 0);
352
369
  }
353
370
  }
354
371
  }
355
372
  }
373
+ if (moved) {
374
+ for (let i = 0; i < moved.length; i++) {
375
+ const [key, child] = moved[i];
376
+ parent.children.set(key, child);
377
+ }
378
+ }
356
379
  return hasADiff;
357
380
  }
358
381
  function getProxy(node, p, id) {
359
382
  // Get the child node if p prop
360
383
  if (p !== undefined)
361
- node = getChildNode(node, p, id);
384
+ node = getChildNode(node, p);
362
385
  // Create a proxy if not already cached and return it
363
386
  let proxy = node.proxy;
364
387
  if (!proxy) {
@@ -432,12 +455,10 @@ const proxyHandler = {
432
455
  }
433
456
  return vProp;
434
457
  }
435
- // If accessing an element in an array, use the element id if available
436
- let id;
437
458
  if (isArray(value) && (vProp === null || vProp === void 0 ? void 0 : vProp.id)) {
438
- id = vProp.id;
459
+ vProp.id;
439
460
  }
440
- return getProxy(target, p, id);
461
+ return getProxy(target, p);
441
462
  },
442
463
  // Forward all proxy properties to the target's value
443
464
  getPrototypeOf(target) {
@@ -447,6 +468,9 @@ const proxyHandler = {
447
468
  ownKeys(target) {
448
469
  const value = getNodeValue(target);
449
470
  const keys = value ? Reflect.ownKeys(value) : [];
471
+ // This is required to fix this error:
472
+ // TypeError: 'getOwnPropertyDescriptor' on proxy: trap reported non-configurability for
473
+ // property 'length' which is either non-existent or configurable in the proxy target
450
474
  if (isArray(value)) {
451
475
  if (keys[keys.length - 1] === 'length') {
452
476
  keys.splice(keys.length - 1, 1);
@@ -510,17 +534,19 @@ function setProp(node, key, newValue, level) {
510
534
  const prevValue = parentValue[key];
511
535
  // Save the new value
512
536
  parentValue[key] = newValue;
537
+ let hasADiff = isPrim;
513
538
  // If new value is an object or array update notify down the tree
514
539
  if (!isPrim) {
515
- if (isArray(parentValue) && (newValue === null || newValue === void 0 ? void 0 : newValue.id) && childNode.id !== newValue.id) {
516
- childNode.id = newValue.id;
517
- node.childrenID.set(childNode.id, childNode);
518
- }
519
- updateNodes(childNode, newValue, prevValue);
540
+ // If this was swapped in an array then update the childNode
541
+ // if (isArray(parentValue) && newValue?.id && childNode.id !== newValue.id) {
542
+ // childNode.id = newValue.id;
543
+ // node.childrenID.set(childNode.id, childNode);
544
+ // }
545
+ hasADiff = updateNodes(childNode, newValue, prevValue);
520
546
  }
521
547
  // Notify for this element if it's an object or it's changed
522
548
  if (!isPrim || newValue !== prevValue) {
523
- notify(node.root.isPrimitive ? node : childNode, newValue, prevValue, (level !== null && level !== void 0 ? level : prevValue === undefined) ? -1 : 0);
549
+ notify(node.root.isPrimitive ? node : childNode, newValue, prevValue, (level !== null && level !== void 0 ? level : prevValue === undefined) ? -1 : hasADiff ? 0 : 1);
524
550
  }
525
551
  inSetFn = false;
526
552
  return getProxy(node, key);
@@ -617,9 +643,6 @@ function observable(obj) {
617
643
  const obs = {
618
644
  _: obj,
619
645
  isPrimitive: isPrim,
620
- listenerMap: new Map(),
621
- proxies: new Map(),
622
- NodeValues: new Map(),
623
646
  };
624
647
  const node = {
625
648
  root: obs,
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":["../../src/state.ts","../../src/is.ts","../../src/globals.ts","../../src/helpers.ts","../../src/observableBatcher.ts","../../src/on.ts","../../src/observable.ts","../../src/observableComputed.ts","../../src/observableEvent.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null],"names":["observableBatcher"],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sources":["../../src/state.ts","../../src/is.ts","../../src/globals.ts","../../src/helpers.ts","../../src/observableBatcher.ts","../../src/on.ts","../../src/observable.ts","../../src/observableComputed.ts","../../src/observableEvent.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null],"names":["observableBatcher"],"mappings":"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"}
package/index.mjs CHANGED
@@ -55,39 +55,26 @@ function getNodeValue(node) {
55
55
  return child;
56
56
  }
57
57
  function getChildNode(node, key, id) {
58
- var _a, _b;
58
+ var _a;
59
59
  // Coerce numbers to number so we don't duplicate keys in arrays.
60
60
  // isNaN is slow so make sure it's a string before coercing.
61
61
  if (isString(key) && !isNaN(+key))
62
62
  key = +key;
63
63
  // Get the child by id if included, or by key
64
- let child = id !== undefined ? (_a = node.childrenID) === null || _a === void 0 ? void 0 : _a.get(id) : undefined;
65
- if (!child) {
66
- child = (_b = node.children) === null || _b === void 0 ? void 0 : _b.get(key);
67
- }
64
+ let child = (_a = node.children) === null || _a === void 0 ? void 0 : _a.get(key);
68
65
  // Create the child node if it doesn't already exist
69
66
  if (!child) {
70
67
  child = {
71
68
  root: node.root,
72
69
  parent: node,
73
70
  key,
74
- id,
71
+ // id,
75
72
  };
76
73
  if (!node.children) {
77
74
  node.children = new Map();
78
75
  }
79
76
  node.children.set(key, child);
80
77
  }
81
- // To maintain node stability when moved in arrays, if this is an element in an array,
82
- // add it to the id map, update the childrenID map and update its key
83
- if (id !== undefined) {
84
- if (!node.childrenID) {
85
- node.childrenID = new Map();
86
- }
87
- node.children.set(key, child);
88
- node.childrenID.set(id, child);
89
- child.key = key;
90
- }
91
78
  return child;
92
79
  }
93
80
  function getObservableRawValue(obs) {
@@ -119,20 +106,26 @@ function mergeIntoObservable(target, ...sources) {
119
106
  if (!sources.length)
120
107
  return target;
121
108
  const source = sources.shift();
109
+ const needsSet = isObservable(target);
122
110
  if (isObject(target) && isObject(source)) {
123
111
  if (source[symbolDateModified]) {
124
- target.set(symbolDateModified, source[symbolDateModified]);
112
+ if (needsSet) {
113
+ target.set(symbolDateModified, source[symbolDateModified]);
114
+ }
115
+ else {
116
+ target[symbolDateModified] = source[symbolDateModified];
117
+ }
125
118
  }
126
119
  const value = ((_a = target.get) === null || _a === void 0 ? void 0 : _a.call(target)) || target;
127
120
  for (const key in source) {
128
121
  if (isObject(source[key])) {
129
122
  if (!value[key] || !isObject(value[key])) {
130
- target.set(key, {});
123
+ needsSet ? target.set(key, {}) : (target[key] = {});
131
124
  }
132
125
  mergeIntoObservable(target[key], source[key]);
133
126
  }
134
127
  else {
135
- target.set(key, source[key]);
128
+ needsSet ? target.set(key, source[key]) : (target[key] = source[key]);
136
129
  }
137
130
  }
138
131
  }
@@ -311,50 +304,80 @@ function collectionSetter(node, target, prop, ...args) {
311
304
  return ret;
312
305
  }
313
306
  function updateNodes(parent, obj, prevValue) {
314
- var _a, _b;
315
307
  const isArr = isArray(obj);
316
308
  // If array it's faster to just use the array
317
309
  const keys = isArr ? obj : Object.keys(obj);
318
310
  const length = keys.length;
319
- let hasADiff = false;
311
+ let hasADiff = !isArr || (obj === null || obj === void 0 ? void 0 : obj.length) !== (prevValue === null || prevValue === void 0 ? void 0 : prevValue.length);
312
+ const isArrDiff = hasADiff;
313
+ let keyMap;
314
+ let moved;
315
+ if (isArr && (prevValue === null || prevValue === void 0 ? void 0 : prevValue.length) && isArray(prevValue) && prevValue[0].id !== undefined) {
316
+ keyMap = new Map();
317
+ moved = [];
318
+ for (let i = 0; i < prevValue.length; i++) {
319
+ keyMap.set(prevValue[i].id, i);
320
+ }
321
+ }
320
322
  for (let i = 0; i < length; i++) {
321
323
  const key = isArr ? i : keys[i];
322
324
  const value = obj[key];
323
325
  const prev = prevValue === null || prevValue === void 0 ? void 0 : prevValue[key];
324
326
  let isDiff = prevValue && value !== prev;
325
327
  if (isDiff) {
326
- const isObj = !isPrimitive(value);
327
328
  const id = value === null || value === void 0 ? void 0 : value.id;
328
- // Array optimization step 1: Get the previous key for this id
329
- const prevKey = isArr && id !== undefined ? (_b = (_a = parent.childrenID) === null || _a === void 0 ? void 0 : _a.get(id)) === null || _b === void 0 ? void 0 : _b.key : undefined;
330
- const child = getChildNode(parent, key, id);
331
- // Array optimization step 2: If this id moved from a different place, only notify
332
- // if it's changed from its previous value. If not, notify will be covered by the parent.
333
- if (prevKey !== undefined && child.key !== prevKey) {
334
- const prevOfNode = prevValue[prevKey];
335
- isDiff = prevOfNode !== value;
329
+ let child = getChildNode(parent, key);
330
+ // Detect moves within an array. Need to move the original proxy to the new position to keep
331
+ // the proxy stable, so that listeners to this node will be unaffected by the array shift.
332
+ if (isArr && id !== undefined) {
333
+ // Find the previous position of this element in the array
334
+ const keyChild = id !== undefined ? keyMap === null || keyMap === void 0 ? void 0 : keyMap.get(id) : undefined;
335
+ if (keyChild !== undefined) {
336
+ if (keyChild !== key) {
337
+ // If array length changed then move the original node to the current position
338
+ if (isArrDiff) {
339
+ child = getChildNode(parent, keyChild);
340
+ child.key = key;
341
+ moved.push([key, child]);
342
+ }
343
+ // And check for diff against the previous value in the previous position
344
+ const prevOfNode = prevValue[keyChild];
345
+ isDiff = prevOfNode !== value;
346
+ }
347
+ }
336
348
  }
337
349
  if (isDiff) {
350
+ // Array has a new / modified element
351
+ hasADiff = true;
338
352
  // If object iterate through its children
339
- if (isObj) {
353
+ if (!isPrimitive(value)) {
340
354
  updateNodes(child, value, prev);
341
355
  }
356
+ }
357
+ if (isDiff || !isArrDiff) {
342
358
  // Notify for this child if this element is different and it has listeners
343
- // But do not notify child if the parent is an array - the array's listener will cover it
359
+ // Or if the position changed in an array whose length did not change
360
+ // But do not notify child if the parent is an array with changing length -
361
+ // the array's listener will cover it
344
362
  const doNotify = !!child.listeners;
345
363
  if (doNotify) {
346
- hasADiff = true;
347
364
  _notify(child, value, [], value, prev, 0);
348
365
  }
349
366
  }
350
367
  }
351
368
  }
369
+ if (moved) {
370
+ for (let i = 0; i < moved.length; i++) {
371
+ const [key, child] = moved[i];
372
+ parent.children.set(key, child);
373
+ }
374
+ }
352
375
  return hasADiff;
353
376
  }
354
377
  function getProxy(node, p, id) {
355
378
  // Get the child node if p prop
356
379
  if (p !== undefined)
357
- node = getChildNode(node, p, id);
380
+ node = getChildNode(node, p);
358
381
  // Create a proxy if not already cached and return it
359
382
  let proxy = node.proxy;
360
383
  if (!proxy) {
@@ -428,12 +451,10 @@ const proxyHandler = {
428
451
  }
429
452
  return vProp;
430
453
  }
431
- // If accessing an element in an array, use the element id if available
432
- let id;
433
454
  if (isArray(value) && (vProp === null || vProp === void 0 ? void 0 : vProp.id)) {
434
- id = vProp.id;
455
+ vProp.id;
435
456
  }
436
- return getProxy(target, p, id);
457
+ return getProxy(target, p);
437
458
  },
438
459
  // Forward all proxy properties to the target's value
439
460
  getPrototypeOf(target) {
@@ -443,6 +464,9 @@ const proxyHandler = {
443
464
  ownKeys(target) {
444
465
  const value = getNodeValue(target);
445
466
  const keys = value ? Reflect.ownKeys(value) : [];
467
+ // This is required to fix this error:
468
+ // TypeError: 'getOwnPropertyDescriptor' on proxy: trap reported non-configurability for
469
+ // property 'length' which is either non-existent or configurable in the proxy target
446
470
  if (isArray(value)) {
447
471
  if (keys[keys.length - 1] === 'length') {
448
472
  keys.splice(keys.length - 1, 1);
@@ -506,17 +530,19 @@ function setProp(node, key, newValue, level) {
506
530
  const prevValue = parentValue[key];
507
531
  // Save the new value
508
532
  parentValue[key] = newValue;
533
+ let hasADiff = isPrim;
509
534
  // If new value is an object or array update notify down the tree
510
535
  if (!isPrim) {
511
- if (isArray(parentValue) && (newValue === null || newValue === void 0 ? void 0 : newValue.id) && childNode.id !== newValue.id) {
512
- childNode.id = newValue.id;
513
- node.childrenID.set(childNode.id, childNode);
514
- }
515
- updateNodes(childNode, newValue, prevValue);
536
+ // If this was swapped in an array then update the childNode
537
+ // if (isArray(parentValue) && newValue?.id && childNode.id !== newValue.id) {
538
+ // childNode.id = newValue.id;
539
+ // node.childrenID.set(childNode.id, childNode);
540
+ // }
541
+ hasADiff = updateNodes(childNode, newValue, prevValue);
516
542
  }
517
543
  // Notify for this element if it's an object or it's changed
518
544
  if (!isPrim || newValue !== prevValue) {
519
- notify(node.root.isPrimitive ? node : childNode, newValue, prevValue, (level !== null && level !== void 0 ? level : prevValue === undefined) ? -1 : 0);
545
+ notify(node.root.isPrimitive ? node : childNode, newValue, prevValue, (level !== null && level !== void 0 ? level : prevValue === undefined) ? -1 : hasADiff ? 0 : 1);
520
546
  }
521
547
  inSetFn = false;
522
548
  return getProxy(node, key);
@@ -613,9 +639,6 @@ function observable(obj) {
613
639
  const obs = {
614
640
  _: obj,
615
641
  isPrimitive: isPrim,
616
- listenerMap: new Map(),
617
- proxies: new Map(),
618
- NodeValues: new Map(),
619
642
  };
620
643
  const node = {
621
644
  root: obs,
package/index.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.mjs","sources":["../../src/state.ts","../../src/is.ts","../../src/globals.ts","../../src/helpers.ts","../../src/observableBatcher.ts","../../src/on.ts","../../src/observable.ts","../../src/observableComputed.ts","../../src/observableEvent.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.mjs","sources":["../../src/state.ts","../../src/is.ts","../../src/globals.ts","../../src/helpers.ts","../../src/observableBatcher.ts","../../src/on.ts","../../src/observable.ts","../../src/observableComputed.ts","../../src/observableEvent.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@legendapp/state",
3
- "version": "0.10.0-next.3",
3
+ "version": "0.10.0-next.7",
4
4
  "description": "legend-state",
5
5
  "sideEffects": false,
6
6
  "private": false,
package/persist.js CHANGED
@@ -84,7 +84,7 @@ const dateModifiedKey = '@';
84
84
  const platformDefaultPersistence = typeof window !== 'undefined' && typeof window.localStorage !== undefined
85
85
  ? ObservablePersistLocalStorage
86
86
  : undefined;
87
- async function onObsChange(obsState, localState, persistOptions, value, info) {
87
+ async function onObsChange(obsState, localState, persistOptions, value, getPrevious, path, valueAtPath, prevAtPath) {
88
88
  const { persistenceLocal, persistenceRemote, tempDisableSaveRemote } = localState;
89
89
  const local = persistOptions.local;
90
90
  const saveRemote = !tempDisableSaveRemote && persistOptions.remote && !persistOptions.remote.readonly;
@@ -104,7 +104,7 @@ async function onObsChange(obsState, localState, persistOptions, value, info) {
104
104
  if (saveRemote) {
105
105
  // Save to remote persistence and get the remote value from it. Some providers (like Firebase) will return a
106
106
  // server value different than the saved value (like Firebase has server timestamps for dateModified)
107
- const saved = await persistenceRemote.save(persistOptions, value, info);
107
+ const saved = await persistenceRemote.save(persistOptions, value, getPrevious, path, valueAtPath, prevAtPath);
108
108
  if (saved) {
109
109
  if (local) {
110
110
  const cur = persistenceLocal.get(local);
package/persist.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"persist.js","sources":["../../src/persist/configureObservablePersistence.ts","../../src/persist/local-storage.ts","../../src/persist/persistHelpers.ts","../../src/persist/persistObservable.ts"],"sourcesContent":[null,null,null,null],"names":["isObject","symbolDateModified","mergeIntoObservable","observableBatcher","observable"],"mappings":"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"}
1
+ {"version":3,"file":"persist.js","sources":["../../src/persist/configureObservablePersistence.ts","../../src/persist/local-storage.ts","../../src/persist/persistHelpers.ts","../../src/persist/persistObservable.ts"],"sourcesContent":[null,null,null,null],"names":["isObject","symbolDateModified","mergeIntoObservable","observableBatcher","observable"],"mappings":"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"}
package/persist.mjs CHANGED
@@ -80,7 +80,7 @@ const dateModifiedKey = '@';
80
80
  const platformDefaultPersistence = typeof window !== 'undefined' && typeof window.localStorage !== undefined
81
81
  ? ObservablePersistLocalStorage
82
82
  : undefined;
83
- async function onObsChange(obsState, localState, persistOptions, value, info) {
83
+ async function onObsChange(obsState, localState, persistOptions, value, getPrevious, path, valueAtPath, prevAtPath) {
84
84
  const { persistenceLocal, persistenceRemote, tempDisableSaveRemote } = localState;
85
85
  const local = persistOptions.local;
86
86
  const saveRemote = !tempDisableSaveRemote && persistOptions.remote && !persistOptions.remote.readonly;
@@ -100,7 +100,7 @@ async function onObsChange(obsState, localState, persistOptions, value, info) {
100
100
  if (saveRemote) {
101
101
  // Save to remote persistence and get the remote value from it. Some providers (like Firebase) will return a
102
102
  // server value different than the saved value (like Firebase has server timestamps for dateModified)
103
- const saved = await persistenceRemote.save(persistOptions, value, info);
103
+ const saved = await persistenceRemote.save(persistOptions, value, getPrevious, path, valueAtPath, prevAtPath);
104
104
  if (saved) {
105
105
  if (local) {
106
106
  const cur = persistenceLocal.get(local);
package/persist.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"persist.mjs","sources":["../../src/persist/configureObservablePersistence.ts","../../src/persist/local-storage.ts","../../src/persist/persistHelpers.ts","../../src/persist/persistObservable.ts"],"sourcesContent":[null,null,null,null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"persist.mjs","sources":["../../src/persist/configureObservablePersistence.ts","../../src/persist/local-storage.ts","../../src/persist/persistHelpers.ts","../../src/persist/persistObservable.ts"],"sourcesContent":[null,null,null,null],"names":[],"mappings":"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"}
package/react.js CHANGED
@@ -25,13 +25,17 @@ function useForceRender() {
25
25
  */
26
26
  function useObservables(fn, deps) {
27
27
  const forceRender = useForceRender();
28
- const ref = react.useRef({ fn, isFirst: true, value: undefined, listeners: new Map() });
28
+ const ref = react.useRef({ fn, isFirst: true, value: undefined, listeners: new Set() });
29
29
  ref.current.fn = fn;
30
30
  react.useMemo(() => setup(ref, forceRender), deps || []);
31
31
  react.useEffect(() => () => ref.current.listeners.forEach((dispose) => dispose()), []);
32
32
  return ref.current.value;
33
33
  }
34
34
  function setup(ref, forceRender) {
35
+ if (ref.current.listeners.size > 0) {
36
+ ref.current.listeners.forEach((dispose) => dispose());
37
+ ref.current.listeners.clear();
38
+ }
35
39
  let previousPrimitives;
36
40
  const updateFromSelector = () => {
37
41
  const args = ref.current.fn();
@@ -49,7 +53,7 @@ function setup(ref, forceRender) {
49
53
  // const path = node.path;
50
54
  // Listen to this path if not already listening
51
55
  if (!((_a = node.listeners) === null || _a === void 0 ? void 0 : _a.has(updateFn))) {
52
- shallow ? state.onChangeShallow(node, updateFn) : state.onChange(node, updateFn);
56
+ ref.current.listeners.add(shallow ? state.onChangeShallow(node, updateFn) : state.onChange(node, updateFn));
53
57
  }
54
58
  }
55
59
  };
package/react.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"react.js","sources":["../../src/react/useObservables.ts","../../src/react/useNewObservable.ts"],"sourcesContent":[null,null],"names":["useReducer","useRef","useMemo","useEffect","onChangeShallow","onChange","tracking","isArray","isPrimitive","getObservableRawValue","symbolIsObservable","symbolShallow","isObject","observable","isFunction","symbolGet"],"mappings":"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"}
1
+ {"version":3,"file":"react.js","sources":["../../src/react/useObservables.ts","../../src/react/useNewObservable.ts"],"sourcesContent":[null,null],"names":["useReducer","useRef","useMemo","useEffect","onChangeShallow","onChange","tracking","isArray","isPrimitive","getObservableRawValue","symbolIsObservable","symbolShallow","isObject","observable","isFunction","symbolGet"],"mappings":"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"}
package/react.mjs CHANGED
@@ -21,13 +21,17 @@ function useForceRender() {
21
21
  */
22
22
  function useObservables(fn, deps) {
23
23
  const forceRender = useForceRender();
24
- const ref = useRef({ fn, isFirst: true, value: undefined, listeners: new Map() });
24
+ const ref = useRef({ fn, isFirst: true, value: undefined, listeners: new Set() });
25
25
  ref.current.fn = fn;
26
26
  useMemo(() => setup(ref, forceRender), deps || []);
27
27
  useEffect(() => () => ref.current.listeners.forEach((dispose) => dispose()), []);
28
28
  return ref.current.value;
29
29
  }
30
30
  function setup(ref, forceRender) {
31
+ if (ref.current.listeners.size > 0) {
32
+ ref.current.listeners.forEach((dispose) => dispose());
33
+ ref.current.listeners.clear();
34
+ }
31
35
  let previousPrimitives;
32
36
  const updateFromSelector = () => {
33
37
  const args = ref.current.fn();
@@ -45,7 +49,7 @@ function setup(ref, forceRender) {
45
49
  // const path = node.path;
46
50
  // Listen to this path if not already listening
47
51
  if (!((_a = node.listeners) === null || _a === void 0 ? void 0 : _a.has(updateFn))) {
48
- shallow ? onChangeShallow(node, updateFn) : onChange(node, updateFn);
52
+ ref.current.listeners.add(shallow ? onChangeShallow(node, updateFn) : onChange(node, updateFn));
49
53
  }
50
54
  }
51
55
  };
package/react.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"react.mjs","sources":["../../src/react/useObservables.ts","../../src/react/useNewObservable.ts"],"sourcesContent":[null,null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"react.mjs","sources":["../../src/react/useObservables.ts","../../src/react/useNewObservable.ts"],"sourcesContent":[null,null],"names":[],"mappings":"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"}
package/src/helpers.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import type { ObservableType, Shallow } from './observableInterfaces';
2
2
  export declare function shallow(obs: ObservableType): Shallow;
3
- export declare function isObservable(obs: any): obs is ObservableType;
4
- export declare function mergeIntoObservable(target: ObservableType, ...sources: any[]): any;
3
+ export declare function isObservable(obs: any): boolean;
4
+ export declare function mergeIntoObservable(target: ObservableType | object, ...sources: any[]): any;
package/src/observableInterfaces.d.ts CHANGED
@@ -42,12 +42,7 @@ export interface ObservableArrayOverride<T> extends Omit<Array<T>, ArrayOverride
42
42
  */
43
43
  map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
44
44
  }
45
- export interface ObservableListenerInfo {
46
- value: any;
47
- prevValue: any;
48
- path: string[];
49
- }
50
- export declare type ListenerFn<T = any> = (value: T, prev: T, path: (string | number)[], valueAtPath: any, prevAtPath: any) => void;
45
+ export declare type ListenerFn<T = any> = (value: T, getPrevious: () => T, path: (string | number)[], valueAtPath: any, prevAtPath: any) => void;
51
46
  export declare type ListenerFnSaved<T = any> = {
52
47
  shallow?: boolean;
53
48
  } & ListenerFn<T>;
@@ -98,7 +93,7 @@ export interface ObservablePersistLocalAsync extends ObservablePersistLocal {
98
93
  preload(path: string): Promise<void>;
99
94
  }
100
95
  export interface ObservablePersistRemote {
101
- save<T>(options: PersistOptions<T>, value: T, info: ObservableListenerInfo): Promise<T>;
96
+ save<T>(options: PersistOptions<T>, value: T, getPrevious: () => T, path: (string | number)[], valueAtPath: any, prevAtPath: any): Promise<T>;
102
97
  listen<T>(obs: Observable<T>, options: PersistOptions<T>, onLoad: () => void, onChange: (obs: Observable<T>, value: any) => void): any;
103
98
  }
104
99
  export interface ObservablePersistState {
@@ -151,8 +146,6 @@ export declare type ObservableListenerDispose = () => void;
151
146
  export interface ObservableWrapper {
152
147
  _: Observable;
153
148
  isPrimitive: boolean;
154
- proxies: Map<string, object>;
155
- NodeValues: Map<string, NodeValue>;
156
149
  }
157
150
  declare type Primitive = boolean | string | number;
158
151
  export declare type ObservableObject<T = any> = ObservableFnsRecursive<T> & ObservableFns<T>;
@@ -170,10 +163,8 @@ export declare type ObservableTypeRender<T = any> = ObservableType<T> | Shallow<
170
163
  export interface NodeValue {
171
164
  parent: NodeValue;
172
165
  children?: Map<string | number, NodeValue>;
173
- childrenID?: Map<string | number, NodeValue>;
174
166
  proxy?: object;
175
167
  key: string | number;
176
- id?: string | number;
177
168
  root: ObservableWrapper;
178
169
  listeners?: Set<ListenerFnSaved>;
179
170
  }