@solidjs/signals 2.0.0-rc.15 → 2.0.0-rc.16
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.
- package/dist/dev-shared.js +785 -367
- package/dist/dev.attribution.js +75 -52
- package/dist/dev.js +1120 -567
- package/dist/observe/affects-marks.js +86 -0
- package/dist/observe/affects.js +22 -73
- package/dist/observe/boundaries.js +191 -189
- package/dist/observe/core/async.js +175 -131
- package/dist/observe/core/attribution-queries.js +1 -1
- package/dist/observe/core/attribution.js +176 -159
- package/dist/observe/core/constants.js +17 -3
- package/dist/observe/core/context.js +3 -3
- package/dist/observe/core/core.js +503 -363
- package/dist/observe/core/dev.js +66 -38
- package/dist/observe/core/effect.js +48 -48
- package/dist/observe/core/error.js +5 -3
- package/dist/observe/core/external.js +5 -6
- package/dist/observe/core/graph.js +57 -43
- package/dist/observe/core/heap.js +33 -33
- package/dist/observe/core/identities.js +62 -0
- package/dist/observe/core/lanes.js +226 -259
- package/dist/observe/core/owner.js +62 -50
- package/dist/observe/core/scheduler.js +319 -171
- package/dist/observe/core/truth.js +45 -0
- package/dist/observe/core/verdict.js +88 -50
- package/dist/observe/deferred.js +184 -0
- package/dist/observe/index.js +7 -1
- package/dist/observe/map.js +345 -260
- package/dist/observe/reveal.js +76 -76
- package/dist/observe/signals.js +41 -30
- package/dist/observe/store/affects.js +6 -6
- package/dist/observe/store/edges.js +39 -0
- package/dist/observe/store/optimistic.js +41 -36
- package/dist/observe/store/projection.js +68 -55
- package/dist/observe/store/store.js +157 -104
- package/dist/prod/affects-marks.js +86 -0
- package/dist/prod/affects.js +23 -72
- package/dist/prod/boundaries.js +155 -153
- package/dist/prod/core/async.js +171 -127
- package/dist/prod/core/constants.js +17 -3
- package/dist/prod/core/context.js +3 -3
- package/dist/prod/core/core.js +478 -342
- package/dist/prod/core/effect.js +68 -68
- package/dist/prod/core/error.js +5 -3
- package/dist/prod/core/external.js +5 -6
- package/dist/prod/core/graph.js +57 -43
- package/dist/prod/core/heap.js +38 -38
- package/dist/prod/core/identities.js +62 -0
- package/dist/prod/core/lanes.js +217 -250
- package/dist/prod/core/owner.js +62 -51
- package/dist/prod/core/scheduler.js +310 -162
- package/dist/prod/core/truth.js +45 -0
- package/dist/prod/core/verdict.js +87 -49
- package/dist/prod/deferred.js +182 -0
- package/dist/prod/index.js +7 -1
- package/dist/prod/map.js +360 -275
- package/dist/prod/reveal.js +76 -76
- package/dist/prod/signals.js +41 -30
- package/dist/prod/store/affects.js +6 -6
- package/dist/prod/store/edges.js +39 -0
- package/dist/prod/store/optimistic.js +37 -33
- package/dist/prod/store/projection.js +25 -19
- package/dist/prod/store/store.js +142 -96
- package/dist/types/affects-marks.d.ts +14 -0
- package/dist/types/boundaries.d.ts +1 -1
- package/dist/types/core/async.d.ts +10 -0
- package/dist/types/core/constants.d.ts +13 -1
- package/dist/types/core/core.d.ts +44 -2
- package/dist/types/core/dev.d.ts +43 -13
- package/dist/types/core/graph.d.ts +11 -0
- package/dist/types/core/identities.d.ts +17 -0
- package/dist/types/core/index.d.ts +2 -1
- package/dist/types/core/lanes.d.ts +2 -14
- package/dist/types/core/owner.d.ts +5 -3
- package/dist/types/core/scheduler.d.ts +47 -28
- package/dist/types/core/truth.d.ts +16 -0
- package/dist/types/core/types.d.ts +21 -0
- package/dist/types/core/verdict.d.ts +32 -0
- package/dist/types/deferred.d.ts +28 -0
- package/dist/types/index.d.ts +6 -0
- package/dist/types/map.d.ts +2 -2
- package/dist/types/signals.d.ts +28 -7
- package/dist/types/store/edges.d.ts +9 -0
- package/dist/types/store/index.d.ts +10 -3
- package/dist/types/store/optimistic.d.ts +3 -2
- package/dist/types/store/projection.d.ts +4 -3
- package/dist/types/store/store.d.ts +1 -1
- package/dist/types/store/target.d.ts +16 -8
- package/dist/types/store/types.d.ts +14 -0
- package/package.json +1 -1
package/dist/prod/reveal.js
CHANGED
|
@@ -32,124 +32,124 @@ const SEQUENTIAL_ACCESSOR = () => "sequential";
|
|
|
32
32
|
|
|
33
33
|
const isController = t => t instanceof RevealController;
|
|
34
34
|
|
|
35
|
-
const slotReady = t => isController(t) ? t.
|
|
35
|
+
const slotReady = t => isController(t) ? t.St() : ready(t);
|
|
36
36
|
|
|
37
|
-
const slotMinReady = t => isController(t) ? t.
|
|
37
|
+
const slotMinReady = t => isController(t) ? t.Rt() : ready(t);
|
|
38
38
|
|
|
39
39
|
/** Force a slot's state. A boundary re-derives its output when it changes;
|
|
40
40
|
* a nested controller passes the state on to its own slots. Released
|
|
41
41
|
* (`!gated`), a nested controller leaves its parent's ownership and runs its
|
|
42
42
|
* own order; a boundary leaves when it has shown content (boundaries.ts). */ function setSlotState(t, e, s, r) {
|
|
43
43
|
if (isController(t)) {
|
|
44
|
-
t
|
|
45
|
-
t.
|
|
46
|
-
t.
|
|
44
|
+
t.$ = s;
|
|
45
|
+
t.ee = r;
|
|
46
|
+
t._t();
|
|
47
47
|
// Released and ready — every slot of its own has shown — it graduates,
|
|
48
48
|
// as a boundary does when it shows content. Released at the frontier
|
|
49
49
|
// but not ready, it stays the parent's frontier.
|
|
50
|
-
if (!s && t.
|
|
50
|
+
if (!s && t.Ct && t._parent === e) t._parent = null;
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
53
|
-
if (t
|
|
54
|
-
t
|
|
55
|
-
t.
|
|
53
|
+
if (t.$ !== s || t.ee !== r) {
|
|
54
|
+
t.$ = s;
|
|
55
|
+
t.ee = r;
|
|
56
56
|
redraw(t);
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
class RevealController {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
yt;
|
|
62
|
+
Et;
|
|
63
|
+
At=[];
|
|
64
64
|
/** The controller gating this one, until it releases this one. */
|
|
65
65
|
_parent=null;
|
|
66
66
|
/** The state a parent forces on this whole group. */
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
67
|
+
$=false;
|
|
68
|
+
ee=false;
|
|
69
|
+
Ct=true;
|
|
70
|
+
kt=true;
|
|
71
|
+
vt=false;
|
|
72
72
|
constructor(t, e) {
|
|
73
|
-
this.
|
|
74
|
-
this.
|
|
73
|
+
this.yt = t;
|
|
74
|
+
this.Et = e;
|
|
75
75
|
}
|
|
76
76
|
/** A slot that has left this controller's ownership: a boundary that has
|
|
77
77
|
* shown content, a nested group that is ready. Shown is shown — it counts
|
|
78
|
-
* as ready whatever happens to it later (a re-arm gates nobody else). */
|
|
79
|
-
return (isController(t) ? t._parent : t.
|
|
78
|
+
* as ready whatever happens to it later (a re-arm gates nobody else). */ gt(t) {
|
|
79
|
+
return (isController(t) ? t._parent : t.V) !== this;
|
|
80
80
|
}
|
|
81
81
|
/** The slots this controller still owns, in registration order — the
|
|
82
|
-
* ones the order's state is forced on. */
|
|
83
|
-
for (let e = 0; e < this.
|
|
84
|
-
const s = this.
|
|
85
|
-
if (!this.
|
|
82
|
+
* ones the order's state is forced on. */ Lt(t) {
|
|
83
|
+
for (let e = 0; e < this.At.length; e++) {
|
|
84
|
+
const s = this.At[e];
|
|
85
|
+
if (!this.gt(s) && t(s) === false) return false;
|
|
86
86
|
}
|
|
87
87
|
return true;
|
|
88
88
|
}
|
|
89
|
-
/** Readiness is judged over every slot, done ones as ready. */
|
|
90
|
-
for (let t = 0; t < this.
|
|
91
|
-
const e = this.
|
|
92
|
-
if (!this.
|
|
89
|
+
/** Readiness is judged over every slot, done ones as ready. */ St() {
|
|
90
|
+
for (let t = 0; t < this.At.length; t++) {
|
|
91
|
+
const e = this.At[t];
|
|
92
|
+
if (!this.gt(e) && !slotReady(e)) return false;
|
|
93
93
|
}
|
|
94
94
|
return true;
|
|
95
95
|
}
|
|
96
96
|
/** Something visible to show under its own order — what an enclosing
|
|
97
97
|
* `together` waits for: `together` — every slot minimally ready;
|
|
98
|
-
* `sequential` — the first slot; `natural` — any. */
|
|
99
|
-
const t = untrack(this.
|
|
100
|
-
const e = this.
|
|
98
|
+
* `sequential` — the first slot; `natural` — any. */ Rt() {
|
|
99
|
+
const t = untrack(this.yt);
|
|
100
|
+
const e = this.At;
|
|
101
101
|
if (e.length === 0) return true;
|
|
102
|
-
if (t === "sequential") return this.
|
|
102
|
+
if (t === "sequential") return this.gt(e[0]) || slotMinReady(e[0]);
|
|
103
103
|
for (let s = 0; s < e.length; s++) {
|
|
104
|
-
const r = this.
|
|
104
|
+
const r = this.gt(e[s]) || slotMinReady(e[s]);
|
|
105
105
|
if (t === "natural" ? r : !r) return t === "natural";
|
|
106
106
|
}
|
|
107
107
|
return t !== "natural";
|
|
108
108
|
}
|
|
109
|
-
|
|
110
|
-
if (this.
|
|
111
|
-
this.
|
|
109
|
+
oe(t) {
|
|
110
|
+
if (this.At.includes(t)) return;
|
|
111
|
+
this.At.push(t);
|
|
112
112
|
// Gated from the start (collapsed in a collapsed sequential tail); the
|
|
113
113
|
// evaluation releases what the order allows.
|
|
114
|
-
const e = untrack(this.
|
|
114
|
+
const e = untrack(this.yt) === "sequential" && !!untrack(this.Et);
|
|
115
115
|
if (isController(t)) {
|
|
116
116
|
t._parent = this;
|
|
117
|
-
t
|
|
118
|
-
t.
|
|
119
|
-
t.
|
|
117
|
+
t.$ = true;
|
|
118
|
+
t.ee = e;
|
|
119
|
+
t._t();
|
|
120
120
|
} else {
|
|
121
|
-
t.
|
|
122
|
-
t
|
|
123
|
-
t.
|
|
121
|
+
t.V = this;
|
|
122
|
+
t.$ = true;
|
|
123
|
+
t.ee = e;
|
|
124
124
|
}
|
|
125
|
-
untrack(() => this.
|
|
125
|
+
untrack(() => this._t());
|
|
126
126
|
}
|
|
127
|
-
|
|
128
|
-
const e = this.
|
|
129
|
-
if (e >= 0) this.
|
|
130
|
-
untrack(() => this.
|
|
127
|
+
te(t) {
|
|
128
|
+
const e = this.At.indexOf(t);
|
|
129
|
+
if (e >= 0) this.At.splice(e, 1);
|
|
130
|
+
untrack(() => this._t());
|
|
131
131
|
}
|
|
132
132
|
/** Apply the order to the owned slots — or, gated by a parent, its state
|
|
133
|
-
* to all of them. */
|
|
134
|
-
if (this.
|
|
135
|
-
this.
|
|
136
|
-
const t = this.
|
|
137
|
-
const e = this.
|
|
133
|
+
* to all of them. */ _t() {
|
|
134
|
+
if (this.vt) return;
|
|
135
|
+
this.vt = true;
|
|
136
|
+
const t = this.Ct;
|
|
137
|
+
const e = this.kt;
|
|
138
138
|
try {
|
|
139
|
-
const t = untrack(this.
|
|
140
|
-
const e = t === "sequential" && !!untrack(this.
|
|
141
|
-
if (this
|
|
142
|
-
this.
|
|
139
|
+
const t = untrack(this.yt);
|
|
140
|
+
const e = t === "sequential" && !!untrack(this.Et);
|
|
141
|
+
if (this.$) {
|
|
142
|
+
this.Lt(t => setSlotState(t, this, true, this.ee));
|
|
143
143
|
} else if (t === "natural") {
|
|
144
|
-
this.
|
|
144
|
+
this.Lt(t => {
|
|
145
145
|
if (isController(t)) setSlotState(t, this, false, false); else setSlotState(t, this, !ready(t), false);
|
|
146
146
|
});
|
|
147
147
|
} else if (t === "together") {
|
|
148
|
-
const t = this.
|
|
149
|
-
this.
|
|
148
|
+
const t = this.Lt(slotMinReady);
|
|
149
|
+
this.Lt(e => setSlotState(e, this, !t, false));
|
|
150
150
|
} else {
|
|
151
151
|
let t = false;
|
|
152
|
-
this.
|
|
152
|
+
this.Lt(s => {
|
|
153
153
|
if (t) return setSlotState(s, this, true, e);
|
|
154
154
|
if (slotReady(s)) return setSlotState(s, this, false, false);
|
|
155
155
|
t = true;
|
|
@@ -159,11 +159,11 @@ class RevealController {
|
|
|
159
159
|
});
|
|
160
160
|
}
|
|
161
161
|
} finally {
|
|
162
|
-
this.
|
|
163
|
-
this.
|
|
164
|
-
this.
|
|
162
|
+
this.Ct = this.St();
|
|
163
|
+
this.kt = this.Rt();
|
|
164
|
+
this.vt = false;
|
|
165
165
|
}
|
|
166
|
-
if (this._parent !== null && (t !== this.
|
|
166
|
+
if (this._parent !== null && (t !== this.Ct || e !== this.kt)) this._parent._t();
|
|
167
167
|
}
|
|
168
168
|
}
|
|
169
169
|
|
|
@@ -179,23 +179,23 @@ class RevealController {
|
|
|
179
179
|
* slots behind the frontier render nothing instead of their fallbacks
|
|
180
180
|
*/ function createRevealOrder(t, e) {
|
|
181
181
|
const s = createOwner();
|
|
182
|
-
const r = s.
|
|
182
|
+
const r = s.A[REVEAL];
|
|
183
183
|
const i = new RevealController(e?.order || SEQUENTIAL_ACCESSOR, e?.collapsed || FALSE_ACCESSOR);
|
|
184
|
-
s.
|
|
185
|
-
...s.
|
|
184
|
+
s.A = {
|
|
185
|
+
...s.A,
|
|
186
186
|
[REVEAL]: i
|
|
187
187
|
};
|
|
188
188
|
return runWithOwner(s, () => {
|
|
189
189
|
const e = t();
|
|
190
190
|
const s = computed(() => {
|
|
191
|
-
i.
|
|
192
|
-
i.
|
|
193
|
-
i.
|
|
191
|
+
i.yt();
|
|
192
|
+
i.Et();
|
|
193
|
+
i._t();
|
|
194
194
|
});
|
|
195
195
|
if (false) ;
|
|
196
196
|
if (r) {
|
|
197
|
-
r.
|
|
198
|
-
cleanup(() => r.
|
|
197
|
+
r.oe(i);
|
|
198
|
+
cleanup(() => r.te(i));
|
|
199
199
|
}
|
|
200
200
|
return e;
|
|
201
201
|
});
|
|
@@ -204,9 +204,9 @@ class RevealController {
|
|
|
204
204
|
// Installed at module evaluation — present exactly when something imports
|
|
205
205
|
// `createRevealOrder`; a Loading boundary without one pays a null check.
|
|
206
206
|
setRevealHooks({
|
|
207
|
-
ue: (t, e) => t.ue(e),
|
|
208
207
|
oe: (t, e) => t.oe(e),
|
|
209
|
-
|
|
208
|
+
te: (t, e) => t.te(e),
|
|
209
|
+
P: t => t._t()
|
|
210
210
|
});
|
|
211
211
|
|
|
212
212
|
export { createRevealOrder };
|
package/dist/prod/signals.js
CHANGED
|
@@ -10,9 +10,13 @@ import { globalQueue, flushTransaction, dirtyQueue, GlobalQueue, resolveTx, pass
|
|
|
10
10
|
|
|
11
11
|
import { cleanup, createRoot, getOwner, dispose } from "./core/owner.js";
|
|
12
12
|
|
|
13
|
+
import { signalHook } from "./core/identities.js";
|
|
14
|
+
|
|
13
15
|
import { effect, trackedEffect } from "./core/effect.js";
|
|
14
16
|
|
|
15
|
-
import { optimisticWrite
|
|
17
|
+
import { optimisticWrite } from "./core/lanes.js";
|
|
18
|
+
|
|
19
|
+
import { truthRead, truthConfirmed } from "./core/truth.js";
|
|
16
20
|
|
|
17
21
|
/**
|
|
18
22
|
* Low-level reactive-cleanup primitive. Registers a callback that runs when
|
|
@@ -71,17 +75,18 @@ function accessor(e) {
|
|
|
71
75
|
function createSignal(e, t) {
|
|
72
76
|
if (typeof e === "function") {
|
|
73
77
|
const r = computed(e, t);
|
|
74
|
-
r.
|
|
78
|
+
r.l &= ~CONFIG_AUTO_DISPOSE;
|
|
75
79
|
return [ accessor(r), setMemo.bind(null, r) ];
|
|
76
80
|
}
|
|
77
81
|
const r = signal(e, t);
|
|
82
|
+
if (signalHook !== null) signalHook(r);
|
|
78
83
|
return [ accessor(r), setSignal.bind(null, r) ];
|
|
79
84
|
}
|
|
80
85
|
|
|
81
86
|
function createOptimistic(e, t) {
|
|
82
87
|
if (typeof e === "function") {
|
|
83
88
|
const r = computed(e, t);
|
|
84
|
-
r.
|
|
89
|
+
r.l &= ~CONFIG_AUTO_DISPOSE;
|
|
85
90
|
return [ accessor(r), optimisticWrite.bind(null, r) ];
|
|
86
91
|
}
|
|
87
92
|
const r = signal(e, t);
|
|
@@ -158,7 +163,7 @@ function createMemo(e, t) {
|
|
|
158
163
|
* );
|
|
159
164
|
* ```
|
|
160
165
|
*
|
|
161
|
-
* @description https://
|
|
166
|
+
* @description https://v2.solidjs.com/reference/solid-js/reactivity/create-effect
|
|
162
167
|
*/ function createEffect(e, t, r) {
|
|
163
168
|
effect(e, t.effect || t, t.error, {
|
|
164
169
|
user: true,
|
|
@@ -193,7 +198,7 @@ function createMemo(e, t) {
|
|
|
193
198
|
* }
|
|
194
199
|
* ```
|
|
195
200
|
*
|
|
196
|
-
* @description https://
|
|
201
|
+
* @description https://v2.solidjs.com/reference/solid-js/advanced/specialized-reactivity/create-render-effect
|
|
197
202
|
*/ function createRenderEffect(e, t, r) {
|
|
198
203
|
effect(e, t, undefined, r);
|
|
199
204
|
}
|
|
@@ -241,7 +246,7 @@ function createMemo(e, t) {
|
|
|
241
246
|
* });
|
|
242
247
|
* ```
|
|
243
248
|
*
|
|
244
|
-
* @description https://
|
|
249
|
+
* @description https://v2.solidjs.com/reference/solid-js/advanced/specialized-reactivity/create-tracked-effect
|
|
245
250
|
*/ function createTrackedEffect(e, t) {
|
|
246
251
|
trackedEffect(e, t);
|
|
247
252
|
}
|
|
@@ -270,7 +275,7 @@ function createMemo(e, t) {
|
|
|
270
275
|
* setCount(1); // logs once, reaction re-armed for next change
|
|
271
276
|
* ```
|
|
272
277
|
*
|
|
273
|
-
* @description https://
|
|
278
|
+
* @description https://v2.solidjs.com/reference/solid-js/advanced/specialized-reactivity/create-reaction
|
|
274
279
|
*/ function createReaction(e, t) {
|
|
275
280
|
let r = undefined;
|
|
276
281
|
cleanup(() => r?.());
|
|
@@ -321,34 +326,40 @@ function createMemo(e, t) {
|
|
|
321
326
|
* joined it (L2, born held — A29) and delivers at that commit: the
|
|
322
327
|
* committed view, never a foreign hold's unrevealed frame. */ function watch(e, t, r, n = 0, o, c = flushTransaction) {
|
|
323
328
|
if (n & CONFIG_AUTHORITATIVE) {
|
|
324
|
-
GlobalQueue.
|
|
325
|
-
GlobalQueue.
|
|
329
|
+
GlobalQueue.rn = truthRead;
|
|
330
|
+
GlobalQueue.sn = truthConfirmed;
|
|
326
331
|
}
|
|
327
332
|
// `config` is on the node for its first pass too (the pass runs inside
|
|
328
333
|
// `computed()`): `until`'s predicate is authoritative from its first read,
|
|
329
334
|
// or an already-displayed guess would satisfy it in a later slice. (REDERIVE
|
|
330
335
|
// after: the first pass's own error is the promise's rejection.)
|
|
331
336
|
computed(() => {
|
|
332
|
-
let
|
|
337
|
+
let i, u = false;
|
|
333
338
|
try {
|
|
334
|
-
|
|
339
|
+
i = e();
|
|
335
340
|
} catch (e) {
|
|
336
341
|
if (e instanceof NotReadyError) throw e;
|
|
337
|
-
|
|
338
|
-
|
|
342
|
+
// An error is an answer (D-41): delivered by the same frame rule.
|
|
343
|
+
i = unwrapStatusError(e);
|
|
344
|
+
u = true;
|
|
339
345
|
}
|
|
340
|
-
const
|
|
346
|
+
const s = getOwner();
|
|
347
|
+
// A truth reader waits out a `createDeferred` flight its value derives
|
|
348
|
+
// from, which serves everyone else the stale answer (D-40).
|
|
349
|
+
const f = n & CONFIG_AUTHORITATIVE && GlobalQueue.er?.(s);
|
|
350
|
+
if (f) throw new NotReadyError(f);
|
|
341
351
|
// (Outside a flush a mainline pass joins through `passTx`.)
|
|
342
|
-
const
|
|
343
|
-
if (
|
|
344
|
-
staleReader(
|
|
352
|
+
const a = flushTransaction ?? passTx;
|
|
353
|
+
if (s.R & REACTIVE_JOINED && a !== null && (c === null || resolveTx(c) !== resolveTx(a))) {
|
|
354
|
+
staleReader(s, resolveTx(a));
|
|
345
355
|
return;
|
|
346
356
|
}
|
|
347
|
-
|
|
348
|
-
|
|
357
|
+
if (u) return void queueMicrotask(() => r(i));
|
|
358
|
+
o?.(i);
|
|
359
|
+
queueMicrotask(() => t(i));
|
|
349
360
|
}, {
|
|
350
|
-
|
|
351
|
-
}).
|
|
361
|
+
Le: n
|
|
362
|
+
}).l |= CONFIG_REDERIVE;
|
|
352
363
|
}
|
|
353
364
|
|
|
354
365
|
/**
|
|
@@ -447,7 +458,7 @@ function createMemo(e, t) {
|
|
|
447
458
|
// guessed node's own re-ask is not answered by it (#3895): park
|
|
448
459
|
// on that flight, or reject with its error.
|
|
449
460
|
const e = read(t);
|
|
450
|
-
if (t.
|
|
461
|
+
if (t.l & CONFIG_GUESS && t.m & (STATUS_PENDING | STATUS_ERROR)) throw t.T?.F;
|
|
451
462
|
return e;
|
|
452
463
|
}, t => {
|
|
453
464
|
n(typeof e === "function" ? t : e);
|
|
@@ -505,14 +516,14 @@ function createMemo(e, t) {
|
|
|
505
516
|
// (`saving=true` beside the confirmed `version=1` is a tear no timeline
|
|
506
517
|
// contains). Updates that do not flip the predicate reveal freely.
|
|
507
518
|
const c = flushTransaction;
|
|
508
|
-
createRoot(
|
|
509
|
-
let
|
|
519
|
+
createRoot(i => {
|
|
520
|
+
let u;
|
|
510
521
|
let s;
|
|
511
522
|
const settle = e => {
|
|
512
|
-
if (
|
|
523
|
+
if (u !== undefined) clearTimeout(u);
|
|
513
524
|
if (s !== undefined) o.removeEventListener("abort", s);
|
|
514
525
|
e();
|
|
515
|
-
|
|
526
|
+
i();
|
|
516
527
|
};
|
|
517
528
|
// Authoritative: the predicate sees the truth, never the action's own
|
|
518
529
|
// optimistic guess — a guess cannot satisfy the wait for its own
|
|
@@ -525,9 +536,9 @@ function createMemo(e, t) {
|
|
|
525
536
|
// The flip, inside the pass of the flush carrying it: the flush
|
|
526
537
|
// joins the action's transaction, and what it staged is held and
|
|
527
538
|
// revealed with the action.
|
|
528
|
-
if (e && c !== null && globalQueue.
|
|
539
|
+
if (e && c !== null && globalQueue.q && resolveTx(c).tt !== 0) joinFuture(c);
|
|
529
540
|
});
|
|
530
|
-
if (t?.timeout !== undefined)
|
|
541
|
+
if (t?.timeout !== undefined) u = setTimeout(() => settle(() => n(new TimeoutError)), t.timeout);
|
|
531
542
|
if (o !== undefined) {
|
|
532
543
|
s = () => settle(() => n(o.reason));
|
|
533
544
|
o.addEventListener("abort", s, {
|
|
@@ -633,7 +644,7 @@ function createMemo(e, t) {
|
|
|
633
644
|
* on owner disposal
|
|
634
645
|
*/ function onSettled(e) {
|
|
635
646
|
const t = getOwner();
|
|
636
|
-
t && !(t.
|
|
647
|
+
t && !(t.l & CONFIG_CHILDREN_FORBIDDEN) ? trackedEffect(() => untrack(e), undefined) : globalQueue.enqueue(EFFECT_USER, function fire() {
|
|
637
648
|
// Settled means derived. A settle that reverts optimism (or replays
|
|
638
649
|
// gated reads) only enqueues the affected subscribers; the pass after
|
|
639
650
|
// the commit re-derives them. Fired in the commit pass, the callback
|
|
@@ -641,7 +652,7 @@ function createMemo(e, t) {
|
|
|
641
652
|
// still holding the optimistic value — reads do not pull (#3411). Fall
|
|
642
653
|
// to the next pass while the heap has work; `run` swapped the queue,
|
|
643
654
|
// so this lands there, and `enqueue` keeps the drain alive.
|
|
644
|
-
if (dirtyQueue.
|
|
655
|
+
if (dirtyQueue.et >= dirtyQueue.Ge) return globalQueue.enqueue(EFFECT_USER, fire);
|
|
645
656
|
// Unowned, out-of-band fire (no owner, or a children-forbidden one this
|
|
646
657
|
// one-shot must not bind to): a returned cleanup has no lifecycle to
|
|
647
658
|
// attach to. Reject it in dev; in production the return is simply
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GlobalQueue } from "../core/scheduler.js";
|
|
1
|
+
import { GlobalQueue, releaseMarksHook } from "../core/scheduler.js";
|
|
2
2
|
|
|
3
3
|
import { optHooks, installAffectsHooks } from "./hooks.js";
|
|
4
4
|
|
|
@@ -40,7 +40,7 @@ function scopeOf(e, o) {
|
|
|
40
40
|
if (n === undefined) scopes.set(e, n = {
|
|
41
41
|
eo: new Set,
|
|
42
42
|
oo: [],
|
|
43
|
-
|
|
43
|
+
ze: o
|
|
44
44
|
});
|
|
45
45
|
return n;
|
|
46
46
|
}
|
|
@@ -94,7 +94,7 @@ function scopeOf(e, o) {
|
|
|
94
94
|
* backings (§7b): a view's backing is another store's proxy — marks cover
|
|
95
95
|
* the BASE raw, so every identity along the chain is checked. */ function covering(e, o, n) {
|
|
96
96
|
for (const [t, s] of scopes) {
|
|
97
|
-
if (t === n || s.
|
|
97
|
+
if (t === n || s.ze !== undefined && s.ze !== o) continue;
|
|
98
98
|
for (let o = e.v; ;) {
|
|
99
99
|
if (s.eo.has(o)) return t;
|
|
100
100
|
const e = o?.[$TARGET];
|
|
@@ -116,14 +116,14 @@ function scopeOf(e, o) {
|
|
|
116
116
|
if (scopes.size === 0 || n === $AFFECTS) return;
|
|
117
117
|
const t = covering(e, n, o);
|
|
118
118
|
if (!t) return;
|
|
119
|
-
GlobalQueue.
|
|
119
|
+
GlobalQueue.N(o);
|
|
120
120
|
scopes.get(t).oo.push(o);
|
|
121
121
|
},
|
|
122
122
|
// An untracked probe (`isPending(() => s.x)` with no observer) reading a
|
|
123
123
|
// record a live mark covers: no node carries the mark for it — the
|
|
124
124
|
// verdict is told directly.
|
|
125
125
|
ro(e, o) {
|
|
126
|
-
if (e.n?.[$AFFECTS]?.
|
|
126
|
+
if (e.n?.[$AFFECTS]?.T?.I || covering(e, o)) GlobalQueue.rt();
|
|
127
127
|
}
|
|
128
128
|
};
|
|
129
129
|
|
|
@@ -136,7 +136,7 @@ function scopeOf(e, o) {
|
|
|
136
136
|
const o = scopes.get(e);
|
|
137
137
|
if (o === undefined) return;
|
|
138
138
|
scopes.delete(e);
|
|
139
|
-
|
|
139
|
+
releaseMarksHook(o.oo);
|
|
140
140
|
}
|
|
141
141
|
|
|
142
142
|
export { installStoreAffects, releaseMarkScope, storeMarks };
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { CONFIG_SLOT_NODE } from "../core/constants.js";
|
|
2
|
+
|
|
3
|
+
import { signalName } from "../core/identities.js";
|
|
4
|
+
|
|
5
|
+
import { $TARGET } from "./types.js";
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Deferred hydration, dependency edges for stores. Only the frames client
|
|
9
|
+
* imports this module, so nothing here ships without it.
|
|
10
|
+
*
|
|
11
|
+
* A plain store root (`createStore` over an object) is named like a plain
|
|
12
|
+
* signal (core/identities.ts: `<owner id>~<n>`, on the same count), and the
|
|
13
|
+
* whole store goes by that one name: the server records it for any read of
|
|
14
|
+
* the store, at any depth, and a setter call on the store — on its root or
|
|
15
|
+
* on a proxy nested in it — is a write to it. Its readers mount at the
|
|
16
|
+
* setter's entry, before the draft runs, as a plain signal's do.
|
|
17
|
+
*/
|
|
18
|
+
/**
|
|
19
|
+
* @internal The name of the store `x` belongs to — `x` a store proxy (a
|
|
20
|
+
* setter's entry) or one of its property nodes (the setter notifying it) —
|
|
21
|
+
* or undefined when it has none or it cannot be placed: a projection or
|
|
22
|
+
* optimistic family, a store chained over another store's proxy, a root
|
|
23
|
+
* named twice, or a proxy reached through a store other than the one it
|
|
24
|
+
* was named as the root of.
|
|
25
|
+
*/ function storeName(e) {
|
|
26
|
+
if (e === undefined) return undefined;
|
|
27
|
+
let n = e.l & CONFIG_SLOT_NODE ? e.O : e[$TARGET];
|
|
28
|
+
if (n === undefined) return undefined;
|
|
29
|
+
// Up to the root; a target on the way named as a root of its own is one
|
|
30
|
+
// object in two stores.
|
|
31
|
+
while (n.u !== null) {
|
|
32
|
+
if (n.fam !== null || n.ch || signalName(n) !== undefined) return undefined;
|
|
33
|
+
n = n.u;
|
|
34
|
+
}
|
|
35
|
+
if (n.fam !== null || n.ch) return undefined;
|
|
36
|
+
return signalName(n) || undefined;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export { storeName };
|