@solidjs/web 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/README.md +1 -1
- package/dist/server.dev.js +358 -479
- package/dist/server.js +343 -387
- package/dist/server.observe.js +343 -387
- package/dist/web.dev.js +57 -54
- package/dist/web.js +47 -49
- package/dist/web.observe.js +57 -54
- package/frames/dist/client.dev.js +610 -621
- package/frames/dist/client.js +540 -566
- package/frames/dist/client.observe.js +571 -573
- package/frames/dist/regions.js +43 -2
- package/frames/dist/server.dev.js +514 -423
- package/frames/dist/server.js +514 -370
- package/frames/dist/server.observe.js +514 -370
- package/frames/dist/wire.js +371 -6
- package/package.json +11 -11
- package/serialization/dist/decode.js +9 -7
- package/serialization/dist/serialization.js +9 -7
- package/serialization/types/serializer-decode.d.ts +2 -2
- package/server-functions/dist/client.dev.js +3 -1
- package/server-functions/dist/client.js +1 -1
- package/server-functions/dist/client.observe.js +3 -1
- package/server-functions/dist/rich-args.js +33 -1
- package/server-functions/dist/server.dev.js +127 -18
- package/server-functions/dist/server.js +127 -18
- package/server-functions/dist/server.observe.js +127 -18
- package/skills/server-components/SKILL.md +74 -185
- package/types/client.d.ts +15 -5
- package/types/frames/assets-tier.d.ts +2 -2
- package/types/frames/client.d.ts +8 -3
- package/types/frames/frame-client.d.ts +121 -157
- package/types/frames/frame-morph.d.ts +28 -0
- package/types/frames/frame-sink.d.ts +13 -9
- package/types/frames/frame-transport.d.ts +30 -1
- package/types/frames/regions-tier.d.ts +15 -0
- package/types/frames/serializer-decode.d.ts +2 -2
- package/types/frames/server.d.ts +0 -52
- package/types/frames/wire-tier.d.ts +54 -1
- package/types/index.d.ts +2 -2
- package/types/jsx.d.ts +11 -5
- package/types/observe.d.ts +14 -7
- package/types/render.d.ts +3 -1
- package/types/response.d.ts +5 -4
- package/types/serializer-decode.d.ts +2 -2
- package/types/server-functions/argument-codec.d.ts +21 -0
- package/types/server-functions/client.d.ts +14 -5
- package/types/server-functions/server.d.ts +6 -2
- package/types/server-functions/shared.d.ts +19 -0
- package/types/server-observe.d.ts +3 -2
- package/types/server.d.ts +57 -76
- package/frames/dist/bind.dev.js +0 -326
- package/frames/dist/bind.js +0 -295
- package/types/frames/bind-tier.d.ts +0 -60
package/dist/web.observe.js
CHANGED
|
@@ -56,8 +56,10 @@ const transparentOptions = {
|
|
|
56
56
|
sync: true
|
|
57
57
|
};
|
|
58
58
|
let spreadName;
|
|
59
|
-
|
|
59
|
+
let spreadLoc;
|
|
60
|
+
function setSpreadName(name, loc) {
|
|
60
61
|
spreadName = name;
|
|
62
|
+
spreadLoc = loc;
|
|
61
63
|
}
|
|
62
64
|
const syncOptions = {
|
|
63
65
|
sync: true
|
|
@@ -65,7 +67,8 @@ const syncOptions = {
|
|
|
65
67
|
function effect(fn, effectFn, options) {
|
|
66
68
|
if (spreadName !== undefined && (options === undefined || options.name === undefined)) options = {
|
|
67
69
|
...options,
|
|
68
|
-
name: spreadName + ".spread"
|
|
70
|
+
name: spreadName + ".spread",
|
|
71
|
+
loc: spreadLoc
|
|
69
72
|
};
|
|
70
73
|
const nodeOptions = options ? {
|
|
71
74
|
sync: true,
|
|
@@ -79,40 +82,39 @@ function memo(fn) {
|
|
|
79
82
|
}
|
|
80
83
|
|
|
81
84
|
function reconcileArrays(parentNode, a, b, marker) {
|
|
85
|
+
const isLive = n => {
|
|
86
|
+
if (!n) return false;
|
|
87
|
+
const tag = n[$$SLOT];
|
|
88
|
+
return n.parentNode === parentNode && (!tag || tag === marker);
|
|
89
|
+
};
|
|
82
90
|
let bLength = b.length,
|
|
83
91
|
aEnd = a.length,
|
|
84
92
|
bEnd = bLength,
|
|
85
93
|
aStart = 0,
|
|
86
94
|
bStart = 0,
|
|
87
95
|
tail = a[aEnd - 1],
|
|
88
|
-
|
|
89
|
-
after = tail.parentNode === parentNode && (!tailTag || tailTag === marker) ? tail.nextSibling : marker || null,
|
|
96
|
+
after = isLive(tail) ? tail.nextSibling : marker || null,
|
|
90
97
|
map = null,
|
|
91
98
|
anchor,
|
|
92
99
|
anchorTag;
|
|
93
|
-
const isLive = n => {
|
|
94
|
-
if (!n) return false;
|
|
95
|
-
const tag = n[$$SLOT];
|
|
96
|
-
return n.parentNode === parentNode && (!tag || tag === marker);
|
|
97
|
-
};
|
|
98
100
|
while (aStart < aEnd || bStart < bEnd) {
|
|
99
|
-
if (a[aStart] === b[bStart]
|
|
101
|
+
if (a[aStart] === b[bStart]) {
|
|
100
102
|
aStart++;
|
|
101
103
|
bStart++;
|
|
102
104
|
continue;
|
|
103
105
|
}
|
|
104
|
-
while (a[aEnd - 1] === b[bEnd - 1]
|
|
106
|
+
while (aEnd > aStart && bEnd > bStart && a[aEnd - 1] === b[bEnd - 1]) {
|
|
105
107
|
aEnd--;
|
|
106
108
|
bEnd--;
|
|
107
109
|
}
|
|
108
110
|
if (aEnd === aStart) {
|
|
109
111
|
let node;
|
|
110
112
|
if (bEnd < bLength) {
|
|
111
|
-
if (bStart) {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
node =
|
|
115
|
-
}
|
|
113
|
+
if (bStart && isLive(node = b[bStart - 1])) node = node.nextSibling;else {
|
|
114
|
+
let k = bEnd;
|
|
115
|
+
while (k < bLength && !isLive(b[k])) k++;
|
|
116
|
+
node = k < bLength ? b[k] : after;
|
|
117
|
+
}
|
|
116
118
|
} else node = after;
|
|
117
119
|
while (bStart < bEnd) {
|
|
118
120
|
const n = b[bStart++];
|
|
@@ -122,10 +124,7 @@ function reconcileArrays(parentNode, a, b, marker) {
|
|
|
122
124
|
} else if (bEnd === bStart) {
|
|
123
125
|
while (aStart < aEnd) {
|
|
124
126
|
const n = a[aStart++];
|
|
125
|
-
if (!map || !map.has(n))
|
|
126
|
-
const tag = n[$$SLOT];
|
|
127
|
-
if (n.parentNode === parentNode && (!tag || tag === marker)) n.remove();
|
|
128
|
-
}
|
|
127
|
+
if ((!map || !map.has(n)) && isLive(n)) n.remove();
|
|
129
128
|
}
|
|
130
129
|
} else if ((anchor = a[aStart]) === b[bEnd - 1] && b[bStart] === a[aEnd - 1] && anchor.parentNode === parentNode && (!(anchorTag = anchor[$$SLOT]) || anchorTag === marker)) {
|
|
131
130
|
if (marker) {
|
|
@@ -144,6 +143,10 @@ function reconcileArrays(parentNode, a, b, marker) {
|
|
|
144
143
|
} while (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]);
|
|
145
144
|
}
|
|
146
145
|
} else {
|
|
146
|
+
if (!isLive(a[aStart])) {
|
|
147
|
+
aStart++;
|
|
148
|
+
continue;
|
|
149
|
+
}
|
|
147
150
|
if (!map) {
|
|
148
151
|
map = new Map();
|
|
149
152
|
let i = bStart;
|
|
@@ -160,31 +163,19 @@ function reconcileArrays(parentNode, a, b, marker) {
|
|
|
160
163
|
sequence++;
|
|
161
164
|
}
|
|
162
165
|
if (sequence > index - bStart) {
|
|
163
|
-
const
|
|
164
|
-
const headTag = head[$$SLOT];
|
|
165
|
-
const node = head.parentNode === parentNode && (!headTag || headTag === marker) ? head : after;
|
|
166
|
+
const node = a[aStart];
|
|
166
167
|
while (bStart < index) {
|
|
167
168
|
const n = b[bStart++];
|
|
168
169
|
parentNode.insertBefore(n, node);
|
|
169
170
|
if (marker) n[$$SLOT] = marker;
|
|
170
171
|
}
|
|
171
172
|
} else {
|
|
172
|
-
const oldNode = a[aStart++];
|
|
173
173
|
const newNode = b[bStart++];
|
|
174
|
-
|
|
175
|
-
if (oldNode.parentNode === parentNode && (!oldTag || oldTag === marker)) {
|
|
176
|
-
parentNode.replaceChild(newNode, oldNode);
|
|
177
|
-
} else {
|
|
178
|
-
parentNode.insertBefore(newNode, after);
|
|
179
|
-
}
|
|
174
|
+
parentNode.replaceChild(newNode, a[aStart++]);
|
|
180
175
|
if (marker) newNode[$$SLOT] = marker;
|
|
181
176
|
}
|
|
182
177
|
} else aStart++;
|
|
183
|
-
} else
|
|
184
|
-
const n = a[aStart++];
|
|
185
|
-
const nTag = n[$$SLOT];
|
|
186
|
-
if (n.parentNode === parentNode && (!nTag || nTag === marker)) n.remove();
|
|
187
|
-
}
|
|
178
|
+
} else a[aStart++].remove();
|
|
188
179
|
}
|
|
189
180
|
}
|
|
190
181
|
}
|
|
@@ -737,14 +728,15 @@ function setStyleProperty(node, name, value) {
|
|
|
737
728
|
if (isHydrating(node)) return;
|
|
738
729
|
value != null ? node.style.setProperty(name, value) : node.style.removeProperty(name);
|
|
739
730
|
}
|
|
740
|
-
function spread(node, props, skipChildren, skip, name) {
|
|
731
|
+
function spread(node, props, skipChildren, skip, name, loc) {
|
|
741
732
|
if (name !== undefined) {
|
|
742
733
|
const outer = spreadName;
|
|
743
|
-
|
|
734
|
+
const outerLoc = spreadLoc;
|
|
735
|
+
setSpreadName(name, loc);
|
|
744
736
|
try {
|
|
745
737
|
return spread(node, props, skipChildren, skip);
|
|
746
738
|
} finally {
|
|
747
|
-
setSpreadName(outer);
|
|
739
|
+
setSpreadName(outer, outerLoc);
|
|
748
740
|
}
|
|
749
741
|
}
|
|
750
742
|
const prevProps = {};
|
|
@@ -873,6 +865,7 @@ const SCOPE_OPTIONS = {
|
|
|
873
865
|
scope: true
|
|
874
866
|
};
|
|
875
867
|
let hydrationRt = null;
|
|
868
|
+
let selectInsert = null;
|
|
876
869
|
function installHydrationRuntime() {
|
|
877
870
|
hydrationRt = {
|
|
878
871
|
claimInitial(parent, multi, initial) {
|
|
@@ -947,7 +940,8 @@ function isPlaceholderScaffolding(node, t) {
|
|
|
947
940
|
function insert(parent, accessor, marker, initial, options) {
|
|
948
941
|
if (spreadName !== undefined && (options === undefined || options.name === undefined)) options = {
|
|
949
942
|
...options,
|
|
950
|
-
name: spreadName + ".children"
|
|
943
|
+
name: spreadName + ".children",
|
|
944
|
+
loc: spreadLoc
|
|
951
945
|
};
|
|
952
946
|
const multi = marker !== undefined;
|
|
953
947
|
const host = options && options.host;
|
|
@@ -967,11 +961,14 @@ function insert(parent, accessor, marker, initial, options) {
|
|
|
967
961
|
initial = [placeholder];
|
|
968
962
|
}
|
|
969
963
|
let current = initial;
|
|
970
|
-
|
|
964
|
+
let ran = false;
|
|
965
|
+
effect(() => {
|
|
971
966
|
if (hydrationRt !== null) current = hydrationRt.reclaimRegion(current, parent, marker);
|
|
972
967
|
const value = normalize(accessor(), current, multi, true);
|
|
968
|
+
const again = ran;
|
|
969
|
+
ran = true;
|
|
973
970
|
if (typeof value !== "function") return value;
|
|
974
|
-
const innerOptions =
|
|
971
|
+
const innerOptions = again && !(options && options.schedule) ? {
|
|
975
972
|
...options,
|
|
976
973
|
schedule: true
|
|
977
974
|
} : options;
|
|
@@ -1723,14 +1720,13 @@ function eventHandler(e, container, state) {
|
|
|
1723
1720
|
if (prev === true || prev === container || !container.contains(prev)) return;
|
|
1724
1721
|
resumeNode = prev;
|
|
1725
1722
|
}
|
|
1726
|
-
const owner = state
|
|
1727
|
-
if (
|
|
1728
|
-
if (owner
|
|
1729
|
-
e[$$EVENT_OWNER] = owner
|
|
1723
|
+
const owner = state.owners.size === 1 && state.owners.has(container) ? container : findOwner(e.target, state)?.owner;
|
|
1724
|
+
if (!owner) return;
|
|
1725
|
+
if (owner === resumeNode) return;
|
|
1726
|
+
e[$$EVENT_OWNER] = owner;
|
|
1730
1727
|
let node = resumeNode || e.target;
|
|
1731
1728
|
const key = EVENT_KEY + e.type;
|
|
1732
1729
|
const oriTarget = e.target;
|
|
1733
|
-
const boundary = owner || container || e.currentTarget;
|
|
1734
1730
|
const retarget = value => Object.defineProperty(e, "target", {
|
|
1735
1731
|
configurable: true,
|
|
1736
1732
|
value
|
|
@@ -1747,19 +1743,19 @@ function eventHandler(e, container, state) {
|
|
|
1747
1743
|
};
|
|
1748
1744
|
const walkUpTree = () => {
|
|
1749
1745
|
while (node && handleNode()) {
|
|
1750
|
-
if (node ===
|
|
1746
|
+
if (node === owner || node.parentNode === owner) break;
|
|
1751
1747
|
node = node._$host || node.parentNode || node.host;
|
|
1752
1748
|
}
|
|
1753
1749
|
};
|
|
1754
1750
|
Object.defineProperty(e, "currentTarget", {
|
|
1755
1751
|
configurable: true,
|
|
1756
1752
|
get() {
|
|
1757
|
-
return node ||
|
|
1753
|
+
return node || owner;
|
|
1758
1754
|
}
|
|
1759
1755
|
});
|
|
1760
1756
|
if (resumeNode) {
|
|
1761
1757
|
if (resumeNode === e.target) node = resumeNode._$host || resumeNode.parentNode || resumeNode.host;
|
|
1762
|
-
if (node && node !==
|
|
1758
|
+
if (node && node !== owner) walkUpTree();
|
|
1763
1759
|
} else if (e.composedPath) {
|
|
1764
1760
|
const path = e.composedPath();
|
|
1765
1761
|
if (path.length) {
|
|
@@ -1772,7 +1768,7 @@ function eventHandler(e, container, state) {
|
|
|
1772
1768
|
walkUpTree();
|
|
1773
1769
|
break;
|
|
1774
1770
|
}
|
|
1775
|
-
if (node ===
|
|
1771
|
+
if (node === owner || node.parentNode === owner) {
|
|
1776
1772
|
break;
|
|
1777
1773
|
}
|
|
1778
1774
|
}
|
|
@@ -1796,7 +1792,10 @@ function insertExpression(parent, value, current, marker) {
|
|
|
1796
1792
|
return value;
|
|
1797
1793
|
}
|
|
1798
1794
|
if (value === current) return value;
|
|
1799
|
-
if (hydrationRt !== null && sharedConfig.hydrating &&
|
|
1795
|
+
if (hydrationRt !== null && sharedConfig.hydrating && value && value.length !== 0) {
|
|
1796
|
+
const tracked = [].concat(current ?? []);
|
|
1797
|
+
if ([].concat(value).every(n => (n === tracked[0] && tracked.shift(), n?.parentNode === parent)) && !tracked.length) return value;
|
|
1798
|
+
}
|
|
1800
1799
|
const t = typeof value,
|
|
1801
1800
|
multi = marker !== undefined;
|
|
1802
1801
|
if (t === "string" || t === "number") {
|
|
@@ -1849,7 +1848,6 @@ function insertExpression(parent, value, current, marker) {
|
|
|
1849
1848
|
selectInsert && selectInsert(parent);
|
|
1850
1849
|
return value;
|
|
1851
1850
|
}
|
|
1852
|
-
let selectInsert;
|
|
1853
1851
|
function selectChange(e) {
|
|
1854
1852
|
(e = e.currentTarget || e)._$v = null;
|
|
1855
1853
|
e.removeEventListener("change", selectChange, true);
|
|
@@ -1882,7 +1880,7 @@ function normalize(value, current, multi, doNotUnwrap) {
|
|
|
1882
1880
|
});
|
|
1883
1881
|
if (doNotUnwrap && typeof value === "function") return value;
|
|
1884
1882
|
if (multi && !Array.isArray(value)) value = [value != null ? value : ""];
|
|
1885
|
-
if (sharedConfig.hydrating && Array.isArray(value)) {
|
|
1883
|
+
if (hydrationRt !== null && sharedConfig.hydrating && Array.isArray(value)) {
|
|
1886
1884
|
for (let i = 0, len = value.length; i < len; i++) {
|
|
1887
1885
|
const item = value[i],
|
|
1888
1886
|
prev = current && current[i],
|
|
@@ -2136,7 +2134,12 @@ function respond(value, init = {}) {
|
|
|
2136
2134
|
}), value);
|
|
2137
2135
|
}
|
|
2138
2136
|
headers.set("Content-Type", "application/json");
|
|
2139
|
-
return new ResponseEnvelope(new Response(
|
|
2137
|
+
return new ResponseEnvelope(new Response(new ReadableStream({
|
|
2138
|
+
pull(controller) {
|
|
2139
|
+
controller.enqueue(new TextEncoder().encode(JSON.stringify(value)));
|
|
2140
|
+
controller.close();
|
|
2141
|
+
}
|
|
2142
|
+
}), {
|
|
2140
2143
|
...responseInit,
|
|
2141
2144
|
headers
|
|
2142
2145
|
}), value);
|