Skip to content

Commit 461e936

Browse files
feat(universal): spread() with fewer reactive nodes and a sources array; compilers emit it
Port of @solidjs/web's spread (#3388, #3419) to the universal renderer: - `ref` folds into the props effect and is re-applied only when its identity changes. `ref()` runs the callback untracked with no owner, so nothing a ref creates is disposed when the effect reruns. - Children keep their own owned `insert` — that effect owns the child subtree, and merging it would rebuild the children on every prop change. A plain object whose `children` is a data property inserts the value with no effect at all. Three nodes become two with children through the spread, one without. - A lone function source resolves inside each tracking scope; an ARRAY of sources is the union of their keys, later sources winning, only the winning source read, function sources called inline with no merge and no memo. Nullish sources are empty. Keys are still enumerated with for...in so a renderer's proxy props answer through their traps. Both compilers' universal generate follows the dom generate: a lone spread passes straight through (reactive included — the `mergeProps(() => expr)` wrap that existed only because the runtime could not resolve a function is gone), and several sources compile to the array instead of a mergeProps() call. Universal has no hydration ids, so the runtime and compiler halves land together. Co-authored-by: Cursor <[email protected]>
1 parent 7f6332a commit 461e936

14 files changed

Lines changed: 448 additions & 132 deletions

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@solidjs/universal": patch
3+
"@solidjs/babel-plugin": patch
4+
"@solidjs/compiler": patch
5+
---
6+
7+
The universal renderer's `spread()` follows the `@solidjs/web` contract (#3388): `ref` folds into the props effect and is re-applied only when its identity changes (refs run with no owner, so nothing they create is disposed by the fold); children keep their own owned `insert` — that effect owns the child subtree — but a plain object whose `children` is a data property inserts the value with no effect at all. Three reactive nodes become two when children flow through the spread, one when they don't. `spread` also resolves a lone function source inside its own tracking scopes and accepts an array of sources — `spread(node, [a, b], skipChildren)` — the union of their keys with later sources winning, only the winning source read, function sources called inline with no merge and no memo. Both compilers' universal output uses it: a lone spread passes straight through (reactive included, no more `mergeProps(() => …)`), and several sources compile to the array instead of a `mergeProps()` call.

‎packages/babel-plugin/src/universal/element.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ function processSpreads(
399399
const filteredAttributes: JSXAttributePath[] = [];
400400
const spreadArgs: t.Expression[] = [];
401401
let runningObject: Array<t.ObjectProperty | t.ObjectMethod> = [];
402-
let dynamicSpread = false;
403402
let firstSpread = false;
404403
attributes.forEach(attribute => {
405404
const node = attribute.node;
@@ -417,7 +416,7 @@ function processSpreads(
417416
spreadArgs.push(
418417
isDynamic(attribute.get("argument"), {
419418
checkMember: true
420-
}) && (dynamicSpread = true)
419+
})
421420
? t.isCallExpression(node.argument) &&
422421
!node.argument.arguments.length &&
423422
!t.isCallExpression(node.argument.callee) &&
@@ -475,10 +474,13 @@ function processSpreads(
475474
spreadArgs.push(t.objectExpression(runningObject));
476475
}
477476

478-
const props =
479-
spreadArgs.length === 1 && !dynamicSpread
480-
? spreadArgs[0]
481-
: t.callExpression(registerImportMethod(path, "mergeProps"), spreadArgs);
477+
// A lone spread — reactive included — passes straight through: the
478+
// renderer's spread() resolves a function source inside its own tracking
479+
// scopes. Several sources go as an ARRAY, not a mergeProps() call: spread()
480+
// reads the sources directly (later wins per key, only the winner read)
481+
// with no merge proxy to build and walk, and a reactive source is called
482+
// inline with no memo. Same contract as the dom generate.
483+
const props = spreadArgs.length === 1 ? spreadArgs[0] : t.arrayExpression(spreadArgs);
482484

483485
return [
484486
filteredAttributes,

‎packages/babel-plugin/test/__universal_fixtures__/attributeExpressions/output.js‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { ref as _$ref } from "r-custom";
55
import { createElement as _$createElement } from "r-custom";
66
import { setProp as _$setProp } from "r-custom";
77
import { spread as _$spread } from "r-custom";
8-
import { mergeProps as _$mergeProps } from "r-custom";
98
import { binding } from "somewhere";
109
function refFn() {}
1110
const refConst = null;
@@ -21,39 +20,45 @@ _$insertNode(_el$, _el$2);
2120
_$setProp(_el$, "id", "main");
2221
_$spread(
2322
_el$,
24-
_$mergeProps(results, {
25-
style: {
26-
color
23+
[
24+
results,
25+
{
26+
style: {
27+
color
28+
}
2729
}
28-
}),
30+
],
2931
true
3032
);
3133
_$insertNode(_el$2, _el$3);
3234
_$setProp(_el$2, "class", "base");
3335
_$spread(
3436
_el$2,
35-
_$mergeProps(results, {
36-
disabled: true,
37-
readonly: "",
38-
get title() {
39-
return welcoming();
40-
},
41-
get style() {
42-
return {
43-
"background-color": color(),
44-
"margin-right": "40px"
45-
};
46-
},
47-
get ["class"]() {
48-
return [
49-
"base",
50-
{
51-
dynamic: dynamic(),
52-
selected
53-
}
54-
];
37+
[
38+
results,
39+
{
40+
disabled: true,
41+
readonly: "",
42+
get title() {
43+
return welcoming();
44+
},
45+
get style() {
46+
return {
47+
"background-color": color(),
48+
"margin-right": "40px"
49+
};
50+
},
51+
get ["class"]() {
52+
return [
53+
"base",
54+
{
55+
dynamic: dynamic(),
56+
selected
57+
}
58+
];
59+
}
5560
}
56-
}),
61+
],
5762
true
5863
);
5964
_$insertNode(_el$3, _$createTextNode(`Welcome`));
@@ -71,11 +76,7 @@ var _el$5 = _$createElement("div"),
7176
_$insertNode(_el$5, _el$6);
7277
_$insertNode(_el$5, _el$7);
7378
_$insertNode(_el$5, _el$8);
74-
_$spread(
75-
_el$5,
76-
_$mergeProps(() => getProps("test")),
77-
true
78-
);
79+
_$spread(_el$5, () => getProps("test"), true);
7980
_$effect(
8081
() => row.label,
8182
(_v$, _$p) => {
@@ -195,11 +196,11 @@ const template17 = _el$22;
195196
var _el$24 = _$createElement("div");
196197
_$spread(
197198
_el$24,
198-
_$mergeProps(() => ({
199+
() => ({
199200
get [key()]() {
200201
return props.value;
201202
}
202-
})),
203+
}),
203204
false
204205
);
205206
const template18 = _el$24;

‎packages/babel-plugin/test/__universal_fixtures__/insertChildren/output.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,25 +119,28 @@ const foldedChildren = _el$23;
119119
var _el$25 = _$createElement("module");
120120
_$spread(
121121
_el$25,
122-
_$mergeProps(
122+
[
123123
{
124124
get children() {
125125
return fallback();
126126
}
127127
},
128128
props
129-
),
129+
],
130130
false
131131
);
132132
const childrenBeforeSpread = _el$25;
133133
var _el$26 = _$createElement("module");
134134
_$spread(
135135
_el$26,
136-
_$mergeProps(props, {
137-
get children() {
138-
return later();
136+
[
137+
props,
138+
{
139+
get children() {
140+
return later();
141+
}
139142
}
140-
}),
143+
],
141144
false
142145
);
143146
const childrenAfterSpread = _el$26;

‎packages/babel-plugin/test/__universal_fixtures__/jsxAttributeValues/output.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { insert as _$insert } from "r-custom";
22
import { createComponent as _$createComponent } from "r-custom";
33
import { spread as _$spread } from "r-custom";
4-
import { mergeProps as _$mergeProps } from "r-custom";
54
import { ref as _$ref } from "r-custom";
65
import { setProp as _$setProp } from "r-custom";
76
import { effect as _$effect } from "r-custom";
@@ -87,13 +86,16 @@ const refValue = _el$9;
8786
var _el$0 = _$createElement("div");
8887
_$spread(
8988
_el$0,
90-
_$mergeProps(props, {
91-
get data() {
92-
var _el$19 = _$createElement("span");
93-
_$insert(_el$19, () => state.value);
94-
return _el$19;
89+
[
90+
props,
91+
{
92+
get data() {
93+
var _el$19 = _$createElement("span");
94+
_$insert(_el$19, () => state.value);
95+
return _el$19;
96+
}
9597
}
96-
}),
98+
],
9799
false
98100
);
99101
const spreadValue = _el$0;

‎packages/compiler/__tests__/fixtures/dynamic-universal/attributeExpressions/output.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { createTextNode as _$createTextNode } from "r-custom";
22
import { effect as _$effect } from "r-custom";
3-
import { mergeProps as _$mergeProps } from "r-custom";
43
import { spread as _$spread } from "r-custom";
54
import { insertNode as _$insertNode } from "r-custom";
65
import { setProp as _$setProp } from "r-custom";
@@ -19,10 +18,10 @@ var _el$3 = _$createElement("a", {
1918
});
2019
_$insertNode(_el$, _el$2);
2120
_$setProp(_el$, "id", "main");
22-
_$spread(_el$, _$mergeProps(results, { style: { color } }), true);
21+
_$spread(_el$, [results, { style: { color } }], true);
2322
_$insertNode(_el$2, _el$3);
2423
_$setProp(_el$2, "class", "base");
25-
_$spread(_el$2, _$mergeProps(results, {
24+
_$spread(_el$2, [results, {
2625
disabled: true,
2726
readonly: "",
2827
get title() {
@@ -40,7 +39,7 @@ _$spread(_el$2, _$mergeProps(results, {
4039
selected
4140
}];
4241
}
43-
}), true);
42+
}], true);
4443
_$insertNode(_el$3, _$createTextNode("Welcome"));
4544
var _ref$ = link;
4645
typeof _ref$ === "function" || Array.isArray(_ref$) ? _$ref(() => {
@@ -54,9 +53,9 @@ var _el$7 = _$createElement("div", { innerHTML: "<div/>" });
5453
_$insertNode(_el$4, _el$5);
5554
_$insertNode(_el$4, _el$6);
5655
_$insertNode(_el$4, _el$7);
57-
_$spread(_el$4, _$mergeProps(() => {
56+
_$spread(_el$4, () => {
5857
return getProps("test");
59-
}), true);
58+
}, true);
6059
_$effect(() => row.label, (_v$, _$p) => {
6160
_$setProp(_el$6, "textContent", _v$, _$p);
6261
});
@@ -141,11 +140,11 @@ var _el$21 = _$createElement("button", {
141140
_$insertNode(_el$21, _$createTextNode("Hi"));
142141
const template17 = _el$21;
143142
var _el$22 = _$createElement("div");
144-
_$spread(_el$22, _$mergeProps(() => {
143+
_$spread(_el$22, () => {
145144
return { get [key()]() {
146145
return props.value;
147146
} };
148-
}), false);
147+
}, false);
149148
const template18 = _el$22;
150149
var _el$23 = _$createElement("div");
151150
_$effect(() => ({

‎packages/compiler/__tests__/fixtures/dynamic-universal/insertChildren/output.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ var _el$21 = _$createElement("module");
108108
_$insertNode(_el$21, _$createTextNode("hello"));
109109
const foldedChildren = _el$21;
110110
var _el$22 = _$createElement("module");
111-
_$spread(_el$22, _$mergeProps({ get children() {
111+
_$spread(_el$22, [{ get children() {
112112
return fallback();
113-
} }, props), false);
113+
} }, props], false);
114114
const childrenBeforeSpread = _el$22;
115115
var _el$23 = _$createElement("module");
116-
_$spread(_el$23, _$mergeProps(props, { get children() {
116+
_$spread(_el$23, [props, { get children() {
117117
return later();
118-
} }), false);
118+
} }], false);
119119
const childrenAfterSpread = _el$23;

‎packages/compiler/__tests__/fixtures/dynamic-universal/jsxAttributeValues/output.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { createTextNode as _$createTextNode } from "r-custom";
22
import { effect as _$effect } from "r-custom";
33
import { createComponent as _$createComponent } from "r-custom";
4-
import { mergeProps as _$mergeProps } from "r-custom";
54
import { spread as _$spread } from "r-custom";
65
import { insert as _$insert } from "r-custom";
76
import { insertNode as _$insertNode } from "r-custom";
@@ -72,13 +71,13 @@ _$ref(() => {
7271
}, _el$8);
7372
const refValue = _el$8;
7473
var _el$10 = _$createElement("div");
75-
_$spread(_el$10, _$mergeProps(props, { get data() {
74+
_$spread(_el$10, [props, { get data() {
7675
var _el$15 = _$createElement("span");
7776
_$insert(_el$15, () => {
7877
return state.value;
7978
});
8079
return _el$15;
81-
} }), false);
80+
} }], false);
8281
const spreadValue = _el$10;
8382
var _el$11 = _$createElement("div");
8483
_$insert(_el$11, _$createComponent(Comp, { get fallback() {

‎packages/compiler/__tests__/fixtures/universal/attributeExpressions/output.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { createTextNode as _$createTextNode } from "r-custom";
22
import { effect as _$effect } from "r-custom";
3-
import { mergeProps as _$mergeProps } from "r-custom";
43
import { spread as _$spread } from "r-custom";
54
import { insertNode as _$insertNode } from "r-custom";
65
import { setProp as _$setProp } from "r-custom";
@@ -19,10 +18,10 @@ var _el$3 = _$createElement("a", {
1918
});
2019
_$insertNode(_el$, _el$2);
2120
_$setProp(_el$, "id", "main");
22-
_$spread(_el$, _$mergeProps(results, { style: { color } }), true);
21+
_$spread(_el$, [results, { style: { color } }], true);
2322
_$insertNode(_el$2, _el$3);
2423
_$setProp(_el$2, "class", "base");
25-
_$spread(_el$2, _$mergeProps(results, {
24+
_$spread(_el$2, [results, {
2625
disabled: true,
2726
readonly: "",
2827
get title() {
@@ -40,7 +39,7 @@ _$spread(_el$2, _$mergeProps(results, {
4039
selected
4140
}];
4241
}
43-
}), true);
42+
}], true);
4443
_$insertNode(_el$3, _$createTextNode("Welcome"));
4544
var _ref$ = link;
4645
typeof _ref$ === "function" || Array.isArray(_ref$) ? _$ref(() => {
@@ -54,9 +53,9 @@ var _el$7 = _$createElement("div", { innerHTML: "<div/>" });
5453
_$insertNode(_el$4, _el$5);
5554
_$insertNode(_el$4, _el$6);
5655
_$insertNode(_el$4, _el$7);
57-
_$spread(_el$4, _$mergeProps(() => {
56+
_$spread(_el$4, () => {
5857
return getProps("test");
59-
}), true);
58+
}, true);
6059
_$effect(() => row.label, (_v$, _$p) => {
6160
_$setProp(_el$6, "textContent", _v$, _$p);
6261
});
@@ -141,11 +140,11 @@ var _el$21 = _$createElement("button", {
141140
_$insertNode(_el$21, _$createTextNode("Hi"));
142141
const template17 = _el$21;
143142
var _el$22 = _$createElement("div");
144-
_$spread(_el$22, _$mergeProps(() => {
143+
_$spread(_el$22, () => {
145144
return { get [key()]() {
146145
return props.value;
147146
} };
148-
}), false);
147+
}, false);
149148
const template18 = _el$22;
150149
var _el$23 = _$createElement("div");
151150
_$effect(() => ({

‎packages/compiler/__tests__/fixtures/universal/insertChildren/output.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ var _el$21 = _$createElement("module");
108108
_$insertNode(_el$21, _$createTextNode("hello"));
109109
const foldedChildren = _el$21;
110110
var _el$22 = _$createElement("module");
111-
_$spread(_el$22, _$mergeProps({ get children() {
111+
_$spread(_el$22, [{ get children() {
112112
return fallback();
113-
} }, props), false);
113+
} }, props], false);
114114
const childrenBeforeSpread = _el$22;
115115
var _el$23 = _$createElement("module");
116-
_$spread(_el$23, _$mergeProps(props, { get children() {
116+
_$spread(_el$23, [props, { get children() {
117117
return later();
118-
} }), false);
118+
} }], false);
119119
const childrenAfterSpread = _el$23;

0 commit comments

Comments
 (0)