@solid-primitives/deep 0.2.7 → 0.2.9

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 (5) hide show
  1. package/dist/index.cjs +31 -22
  2. package/dist/index.d.cts +1 -1
  3. package/dist/index.d.ts +1 -1
  4. package/dist/index.js +33 -24
  5. package/package.json +2 -2
package/dist/index.cjs CHANGED
@@ -23,35 +23,44 @@ exports.deepTrack = trackDeep;
23
23
  var EQUALS_FALSE = { equals: false };
24
24
  var TrackStoreCache = /* @__PURE__ */ new WeakMap();
25
25
  var TrackVersion = 0;
26
- function createLazyMemo(calc) {
27
- let isReading = false, isStale = true, alreadyTracked = false, version = 0;
28
- const [track, trigger] = solidJs.createSignal(void 0, EQUALS_FALSE), memo = solidJs.createMemo(() => isReading ? calc() : isStale = !track(), void 0, {
29
- equals: () => alreadyTracked
30
- });
31
- return () => {
32
- isReading = true;
33
- if (isStale)
34
- isStale = trigger();
35
- alreadyTracked = version === TrackVersion;
36
- version = TrackVersion;
37
- memo();
38
- isReading = false;
39
- };
40
- }
41
26
  function getTrackStoreNode(node) {
42
27
  let track = TrackStoreCache.get(node);
43
28
  if (!track) {
44
29
  solidJs.createRoot(() => {
45
30
  const unwrapped = store.unwrap(node);
46
- track = createLazyMemo(() => {
47
- node[solidJs.$TRACK];
48
- for (const [key, child] of Object.entries(unwrapped)) {
49
- let childNode;
50
- if (child != null && typeof child === "object" && ((childNode = child[solidJs.$PROXY]) || (childNode = solidJs.untrack(() => node[key])) && solidJs.$TRACK in childNode)) {
51
- getTrackStoreNode(childNode)?.();
31
+ let is_reading = false;
32
+ let is_stale = true;
33
+ let version = 0;
34
+ const [signal, trigger] = solidJs.createSignal(void 0, EQUALS_FALSE);
35
+ const memo = solidJs.createMemo(
36
+ () => {
37
+ if (is_reading) {
38
+ node[solidJs.$TRACK];
39
+ for (const [key, child] of Object.entries(unwrapped)) {
40
+ let childNode;
41
+ if (child != null && typeof child === "object" && ((childNode = child[solidJs.$PROXY]) || solidJs.$TRACK in (childNode = solidJs.untrack(() => node[key])))) {
42
+ getTrackStoreNode(childNode)?.();
43
+ }
44
+ }
45
+ } else {
46
+ signal();
47
+ is_stale = true;
52
48
  }
49
+ },
50
+ void 0,
51
+ EQUALS_FALSE
52
+ );
53
+ track = () => {
54
+ is_reading = true;
55
+ if (is_stale) {
56
+ trigger();
57
+ is_stale = false;
53
58
  }
54
- });
59
+ const already_tracked = version === TrackVersion;
60
+ version = TrackVersion;
61
+ already_tracked || memo();
62
+ is_reading = false;
63
+ };
55
64
  TrackStoreCache.set(node, track);
56
65
  });
57
66
  }
package/dist/index.d.cts CHANGED
@@ -77,4 +77,4 @@ type NestedUpdate<T> = {
77
77
  */
78
78
  declare function captureStoreUpdates<T extends Static>(store: T): () => NestedUpdate<T>[];
79
79
 
80
- export { AllNestedObjects, NestedUpdate, captureStoreUpdates, deepTrack, trackDeep, trackStore };
80
+ export { type AllNestedObjects, type NestedUpdate, captureStoreUpdates, deepTrack, trackDeep, trackStore };
package/dist/index.d.ts CHANGED
@@ -77,4 +77,4 @@ type NestedUpdate<T> = {
77
77
  */
78
78
  declare function captureStoreUpdates<T extends Static>(store: T): () => NestedUpdate<T>[];
79
79
 
80
- export { AllNestedObjects, NestedUpdate, captureStoreUpdates, deepTrack, trackDeep, trackStore };
80
+ export { type AllNestedObjects, type NestedUpdate, captureStoreUpdates, deepTrack, trackDeep, trackStore };
package/dist/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { $PROXY, $TRACK, createRoot, createSignal, createMemo, untrack } from 'solid-js';
2
2
  import { unwrap } from 'solid-js/store';
3
- import { createLazyMemo as createLazyMemo$1 } from '@solid-primitives/memo';
3
+ import { createLazyMemo } from '@solid-primitives/memo';
4
4
  import { isServer, isDev } from 'solid-js/web';
5
5
 
6
6
  // src/track-deep.ts
@@ -21,35 +21,44 @@ var deepTrack = trackDeep;
21
21
  var EQUALS_FALSE = { equals: false };
22
22
  var TrackStoreCache = /* @__PURE__ */ new WeakMap();
23
23
  var TrackVersion = 0;
24
- function createLazyMemo(calc) {
25
- let isReading = false, isStale = true, alreadyTracked = false, version = 0;
26
- const [track, trigger] = createSignal(void 0, EQUALS_FALSE), memo = createMemo(() => isReading ? calc() : isStale = !track(), void 0, {
27
- equals: () => alreadyTracked
28
- });
29
- return () => {
30
- isReading = true;
31
- if (isStale)
32
- isStale = trigger();
33
- alreadyTracked = version === TrackVersion;
34
- version = TrackVersion;
35
- memo();
36
- isReading = false;
37
- };
38
- }
39
24
  function getTrackStoreNode(node) {
40
25
  let track = TrackStoreCache.get(node);
41
26
  if (!track) {
42
27
  createRoot(() => {
43
28
  const unwrapped = unwrap(node);
44
- track = createLazyMemo(() => {
45
- node[$TRACK];
46
- for (const [key, child] of Object.entries(unwrapped)) {
47
- let childNode;
48
- if (child != null && typeof child === "object" && ((childNode = child[$PROXY]) || (childNode = untrack(() => node[key])) && $TRACK in childNode)) {
49
- getTrackStoreNode(childNode)?.();
29
+ let is_reading = false;
30
+ let is_stale = true;
31
+ let version = 0;
32
+ const [signal, trigger] = createSignal(void 0, EQUALS_FALSE);
33
+ const memo = createMemo(
34
+ () => {
35
+ if (is_reading) {
36
+ node[$TRACK];
37
+ for (const [key, child] of Object.entries(unwrapped)) {
38
+ let childNode;
39
+ if (child != null && typeof child === "object" && ((childNode = child[$PROXY]) || $TRACK in (childNode = untrack(() => node[key])))) {
40
+ getTrackStoreNode(childNode)?.();
41
+ }
42
+ }
43
+ } else {
44
+ signal();
45
+ is_stale = true;
50
46
  }
47
+ },
48
+ void 0,
49
+ EQUALS_FALSE
50
+ );
51
+ track = () => {
52
+ is_reading = true;
53
+ if (is_stale) {
54
+ trigger();
55
+ is_stale = false;
51
56
  }
52
- });
57
+ const already_tracked = version === TrackVersion;
58
+ version = TrackVersion;
59
+ already_tracked || memo();
60
+ is_reading = false;
61
+ };
53
62
  TrackStoreCache.set(node, track);
54
63
  });
55
64
  }
@@ -75,7 +84,7 @@ function getStoreNodechildren(node) {
75
84
  if (!signal) {
76
85
  const unwrapped = unwrap(node), isArray = Array.isArray(unwrapped);
77
86
  signal = createRoot(
78
- () => createLazyMemo$1(() => {
87
+ () => createLazyMemo(() => {
79
88
  node[$TRACK];
80
89
  const children = isArray ? [] : {};
81
90
  for (const [key, child] of entries(unwrapped)) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@solid-primitives/deep",
3
- "version": "0.2.7",
3
+ "version": "0.2.9",
4
4
  "description": "Primitives for tracking and observing nested reactive objects in Solid.",
5
5
  "author": "Samuel Burbano <me@iosamuel.dev>",
6
6
  "contributors": [
@@ -55,7 +55,7 @@
55
55
  },
56
56
  "typesVersions": {},
57
57
  "dependencies": {
58
- "@solid-primitives/memo": "^1.3.8"
58
+ "@solid-primitives/memo": "^1.3.9"
59
59
  },
60
60
  "peerDependencies": {
61
61
  "solid-js": "^1.6.12"