@barefootjs/jsx 0.35.6 → 0.35.8
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/analyzer.d.ts.map +1 -1
- package/dist/index.js +59 -20
- package/dist/ir-to-client-js/csr-substitute.d.ts +25 -5
- package/dist/ir-to-client-js/csr-substitute.d.ts.map +1 -1
- package/dist/ir-to-client-js/html-template.d.ts.map +1 -1
- package/dist/ir-to-client-js/imports.d.ts +2 -2
- package/dist/ir-to-client-js/imports.d.ts.map +1 -1
- package/dist/props-binding.d.ts +11 -0
- package/dist/props-binding.d.ts.map +1 -1
- package/dist/ssr-defaults.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/__tests__/body-destructured-prop-default-arrow.test.ts +142 -0
- package/src/__tests__/csr-substitute-bare-getter.test.ts +117 -0
- package/src/__tests__/csr-template-scope-soundness.test.ts +125 -0
- package/src/__tests__/issue-2960-multi-root-cond-same-tag.test.ts +141 -0
- package/src/__tests__/module-helper-scope-2986.test.ts +286 -0
- package/src/__tests__/reactive-factory-cross-file.test.ts +37 -0
- package/src/__tests__/ssr-defaults.test.ts +24 -2
- package/src/analyzer.ts +57 -18
- package/src/ir-to-client-js/csr-substitute.ts +61 -11
- package/src/ir-to-client-js/html-template.ts +65 -9
- package/src/ir-to-client-js/imports.ts +5 -0
- package/src/ir-to-client-js/rewrite-destructured-props.ts +13 -1
- package/src/props-binding.ts +15 -1
- package/src/ssr-defaults.ts +32 -0
package/dist/analyzer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AACA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,YAAY,CAAA;AAG3B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAInE,OAAO,EACL,KAAK,eAAe,EAUrB,MAAM,uBAAuB,CAAA;AAqB9B;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAU/D;AA8BD;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf;IAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC;IAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAA;CAAE,GAAG,IAAI,CA8CpF;AAMD,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,EACpB,mBAAmB,CAAC,EAAE,oBAAoB,EAC1C,eAAe,CAAC,EAAE,OAAO,GACxB,eAAe,CAkKjB;
|
|
1
|
+
{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -3396,9 +3396,12 @@ var EMPTY_SET = new Set;
|
|
|
3396
3396
|
function propReadBase(p) {
|
|
3397
3397
|
return `${PROPS_PARAM}.${p.sourceName ?? p.name}`;
|
|
3398
3398
|
}
|
|
3399
|
+
function coalesceDefaultText(defaultValue, defaultContainsArrow) {
|
|
3400
|
+
return defaultContainsArrow ? `(${defaultValue})` : defaultValue;
|
|
3401
|
+
}
|
|
3399
3402
|
function propReadFallback(p, usage, usedAsCondition) {
|
|
3400
3403
|
if (p.defaultValue)
|
|
3401
|
-
return
|
|
3404
|
+
return coalesceDefaultText(p.defaultValue, p.defaultContainsArrow);
|
|
3402
3405
|
if (usage?.usedAsLoopArray)
|
|
3403
3406
|
return "[]";
|
|
3404
3407
|
if (propHasPropertyAccess(usage) && !usedAsCondition)
|
|
@@ -3472,6 +3475,7 @@ function csrSubstituteOnce(value, env, enclosingScope) {
|
|
|
3472
3475
|
const recordSubstitution = (start, end, sub) => {
|
|
3473
3476
|
splices.push({ start: start - OFFSET, end: end - OFFSET, text: `(${sub.replacement})` });
|
|
3474
3477
|
};
|
|
3478
|
+
const bareReplacementText = (sub) => sub.kind === "call" ? `(() => (${sub.replacement}))` : `(${sub.replacement})`;
|
|
3475
3479
|
const collectBindingNames = (name, out) => {
|
|
3476
3480
|
if (ts8.isIdentifier(name))
|
|
3477
3481
|
out.add(name.text);
|
|
@@ -3520,11 +3524,11 @@ function csrSubstituteOnce(value, env, enclosingScope) {
|
|
|
3520
3524
|
if (ts8.isShorthandPropertyAssignment(node)) {
|
|
3521
3525
|
if (ts8.isIdentifier(node.name) && !isBound(node.name.text)) {
|
|
3522
3526
|
const sub = env.substitutions.get(node.name.text);
|
|
3523
|
-
if (sub
|
|
3527
|
+
if (sub) {
|
|
3524
3528
|
splices.push({
|
|
3525
3529
|
start: node.getStart(sourceFile) - OFFSET,
|
|
3526
3530
|
end: node.getEnd() - OFFSET,
|
|
3527
|
-
text: `${node.name.text}:
|
|
3531
|
+
text: `${node.name.text}: ${bareReplacementText(sub)}`
|
|
3528
3532
|
});
|
|
3529
3533
|
}
|
|
3530
3534
|
}
|
|
@@ -3552,8 +3556,12 @@ function csrSubstituteOnce(value, env, enclosingScope) {
|
|
|
3552
3556
|
if (isBound(node.text))
|
|
3553
3557
|
return;
|
|
3554
3558
|
const sub = env.substitutions.get(node.text);
|
|
3555
|
-
if (sub
|
|
3556
|
-
|
|
3559
|
+
if (sub) {
|
|
3560
|
+
splices.push({
|
|
3561
|
+
start: node.getStart(sourceFile) - OFFSET,
|
|
3562
|
+
end: node.getEnd() - OFFSET,
|
|
3563
|
+
text: bareReplacementText(sub)
|
|
3564
|
+
});
|
|
3557
3565
|
}
|
|
3558
3566
|
return;
|
|
3559
3567
|
}
|
|
@@ -3658,6 +3666,9 @@ function buildSignalMemoEnv(signals, memos, propsObjectName, localConstants = []
|
|
|
3658
3666
|
replacement: normalizeSignalInitial(s, propsObjectName),
|
|
3659
3667
|
freeIdentifiers: s.initialFreeIdentifiers ?? new Set
|
|
3660
3668
|
});
|
|
3669
|
+
if (s.setter) {
|
|
3670
|
+
substitutions.set(s.setter, { kind: "identifier", replacement: "() => {}", freeIdentifiers: new Set });
|
|
3671
|
+
}
|
|
3661
3672
|
}
|
|
3662
3673
|
for (const m of memos) {
|
|
3663
3674
|
substitutions.set(m.name, {
|
|
@@ -4740,14 +4751,30 @@ function addCondAttrToTemplate(html, condId) {
|
|
|
4740
4751
|
return `<!--bf-cond-start:${condId}-->${html}<!--bf-cond-end:${condId}-->`;
|
|
4741
4752
|
}
|
|
4742
4753
|
function isSingleRootElement(html) {
|
|
4743
|
-
const
|
|
4754
|
+
const trimmed = html.trim();
|
|
4755
|
+
const match = trimmed.match(/^<(\w+)[\s>]/);
|
|
4744
4756
|
if (!match)
|
|
4745
4757
|
return false;
|
|
4746
|
-
|
|
4747
|
-
if (/^<\w+[^>]*\/>$/.test(html.trim()))
|
|
4758
|
+
if (/^<\w+[^>]*\/>$/.test(trimmed))
|
|
4748
4759
|
return true;
|
|
4749
|
-
const
|
|
4750
|
-
|
|
4760
|
+
const tagPattern = /<!--[\s\S]*?-->|<\/?[^\s/>]+[^>]*>/g;
|
|
4761
|
+
let depth = 0;
|
|
4762
|
+
let tagMatch;
|
|
4763
|
+
while (tagMatch = tagPattern.exec(trimmed)) {
|
|
4764
|
+
const raw = tagMatch[0];
|
|
4765
|
+
if (raw.startsWith("<!--"))
|
|
4766
|
+
continue;
|
|
4767
|
+
if (raw.endsWith("/>")) {
|
|
4768
|
+
if (depth === 0)
|
|
4769
|
+
return tagPattern.lastIndex === trimmed.length;
|
|
4770
|
+
continue;
|
|
4771
|
+
}
|
|
4772
|
+
depth += raw.startsWith("</") ? -1 : 1;
|
|
4773
|
+
if (depth === 0) {
|
|
4774
|
+
return tagPattern.lastIndex === trimmed.length;
|
|
4775
|
+
}
|
|
4776
|
+
}
|
|
4777
|
+
return false;
|
|
4751
4778
|
}
|
|
4752
4779
|
function irToComponentTemplate(node, inlinableConstants, restSpreadNames, propsObjectName, markupSlotIds, restPropsName) {
|
|
4753
4780
|
return irToComponentTemplateWithOpts(node, { inlinableConstants, restSpreadNames, propsObjectName, loopDepth: -1, markupSlotIds, restPropsName });
|
|
@@ -6875,6 +6902,9 @@ function collectNamedExports(sourceFile) {
|
|
|
6875
6902
|
}
|
|
6876
6903
|
return exported;
|
|
6877
6904
|
}
|
|
6905
|
+
function isFunctionScope(node) {
|
|
6906
|
+
return ts14.isArrowFunction(node) || ts14.isFunctionExpression(node) || ts14.isFunctionDeclaration(node) || ts14.isMethodDeclaration(node) || ts14.isGetAccessorDeclaration(node) || ts14.isSetAccessorDeclaration(node) || ts14.isConstructorDeclaration(node);
|
|
6907
|
+
}
|
|
6878
6908
|
function visit2(node, ctx, targetComponentName, namedExports) {
|
|
6879
6909
|
if (ts14.isExpressionStatement(node) && ts14.isStringLiteral(node.expression)) {
|
|
6880
6910
|
if (node.expression.text === "use client" || node.expression.text === "'use client'") {
|
|
@@ -7000,7 +7030,11 @@ function visit2(node, ctx, targetComponentName, namedExports) {
|
|
|
7000
7030
|
}
|
|
7001
7031
|
}
|
|
7002
7032
|
}
|
|
7003
|
-
ts14.forEachChild(node, (child) =>
|
|
7033
|
+
ts14.forEachChild(node, (child) => {
|
|
7034
|
+
if (isFunctionScope(child) && !ts14.isFunctionDeclaration(child) && child !== ctx.componentNode)
|
|
7035
|
+
return;
|
|
7036
|
+
visit2(child, ctx, targetComponentName, namedExports);
|
|
7037
|
+
});
|
|
7004
7038
|
}
|
|
7005
7039
|
function analyzeComponentBody(node, ctx) {
|
|
7006
7040
|
if (node.parameters.length > 0) {
|
|
@@ -7109,9 +7143,8 @@ function visitComponentBody(node, ctx) {
|
|
|
7109
7143
|
ctx.jsxReturn = unwrapJsxTransparent(node.expression);
|
|
7110
7144
|
}
|
|
7111
7145
|
ts14.forEachChild(node, (child) => {
|
|
7112
|
-
if (
|
|
7146
|
+
if (isFunctionScope(child))
|
|
7113
7147
|
return;
|
|
7114
|
-
}
|
|
7115
7148
|
visitComponentBody(child, ctx);
|
|
7116
7149
|
});
|
|
7117
7150
|
}
|
|
@@ -8504,10 +8537,9 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
|
|
|
8504
8537
|
continue;
|
|
8505
8538
|
const localName = el.name.text;
|
|
8506
8539
|
const sourceKey = el.propertyName && ts14.isIdentifier(el.propertyName) ? el.propertyName.text : localName;
|
|
8507
|
-
const
|
|
8540
|
+
const defaultFields = el.initializer ? bindingElementDefaultFields(el.initializer, ctx) : undefined;
|
|
8508
8541
|
const baseValue = `${propsName}.${sourceKey}`;
|
|
8509
|
-
const value2 =
|
|
8510
|
-
const containsArrow2 = el.initializer ? nodeContainsArrow(el.initializer) : false;
|
|
8542
|
+
const value2 = defaultFields?.defaultValue !== undefined ? `${baseValue} ?? ${coalesceDefaultText(defaultFields.defaultValue, defaultFields.defaultContainsArrow)}` : baseValue;
|
|
8511
8543
|
const freeIdentifiers3 = el.initializer ? extractFreeIdentifiersFromNode(el.initializer) : new Set([propsName]);
|
|
8512
8544
|
const parsed2 = parseExpression(`(${value2.trim()})`);
|
|
8513
8545
|
ctx.localConstants.push({
|
|
@@ -8519,11 +8551,10 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
|
|
|
8519
8551
|
type: null,
|
|
8520
8552
|
loc: getSourceLocation(node, ctx.sourceFile, ctx.filePath),
|
|
8521
8553
|
freeIdentifiers: freeIdentifiers3,
|
|
8522
|
-
containsArrow:
|
|
8554
|
+
containsArrow: defaultFields?.defaultContainsArrow,
|
|
8523
8555
|
origin: { phase: "hydrate", scope: "init", effect: "pure" }
|
|
8524
8556
|
});
|
|
8525
|
-
if (el.initializer) {
|
|
8526
|
-
const defaultFields = bindingElementDefaultFields(el.initializer, ctx);
|
|
8557
|
+
if (el.initializer && defaultFields) {
|
|
8527
8558
|
const existing = ctx.propsParams.find((p) => !p.isRest && p.sourceName === undefined && p.name === sourceKey);
|
|
8528
8559
|
if (localName === sourceKey) {
|
|
8529
8560
|
if (existing) {
|
|
@@ -17208,6 +17239,7 @@ var RUNTIME_IMPORT_CANDIDATES = [
|
|
|
17208
17239
|
"createEffect",
|
|
17209
17240
|
"onCleanup",
|
|
17210
17241
|
"onMount",
|
|
17242
|
+
"batch",
|
|
17211
17243
|
"hydrate",
|
|
17212
17244
|
"insert",
|
|
17213
17245
|
"getLoopChildren",
|
|
@@ -23529,7 +23561,7 @@ function rewriteBodyAliasReads(code, ctx) {
|
|
|
23529
23561
|
located.set(decl.name.text, {
|
|
23530
23562
|
key: alias.key,
|
|
23531
23563
|
defaultValue: parsedInit.fallback?.getText(sourceFile),
|
|
23532
|
-
defaultContainsArrow: alias.defaultContainsArrow
|
|
23564
|
+
defaultContainsArrow: alias.defaultContainsArrow && !(parsedInit.fallback && ts22.isParenthesizedExpression(parsedInit.fallback))
|
|
23533
23565
|
});
|
|
23534
23566
|
spans.push([inner.getFullStart(), inner.getEnd()]);
|
|
23535
23567
|
}
|
|
@@ -24640,6 +24672,9 @@ function extractSsrDefaults(metadata) {
|
|
|
24640
24672
|
out[sig.getter] = { value: resultToJsonable(value) };
|
|
24641
24673
|
}
|
|
24642
24674
|
bindings[sig.getter] = value;
|
|
24675
|
+
if (sig.setter && !(sig.setter in out)) {
|
|
24676
|
+
out[sig.setter] = { value: null };
|
|
24677
|
+
}
|
|
24643
24678
|
}
|
|
24644
24679
|
for (const memo of metadata.memos) {
|
|
24645
24680
|
if (memo.isModule)
|
|
@@ -24656,6 +24691,10 @@ function extractSsrDefaults(metadata) {
|
|
|
24656
24691
|
}
|
|
24657
24692
|
{
|
|
24658
24693
|
const getterNames = collectAliasableGetterNames(metadata.signals, metadata.memos);
|
|
24694
|
+
for (const sig of metadata.signals) {
|
|
24695
|
+
if (sig.setter && !sig.isModule && !sig.envReader)
|
|
24696
|
+
getterNames.add(sig.setter);
|
|
24697
|
+
}
|
|
24659
24698
|
for (const [alias, origin] of resolveGetterAliases(metadata.localConstants ?? [], (n) => getterNames.has(n))) {
|
|
24660
24699
|
if (alias in out)
|
|
24661
24700
|
continue;
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
*
|
|
7
7
|
* - signal getter calls (`count()`) → `(initialValue)`
|
|
8
8
|
* - memo getter calls (`bars()`) → `(computationBody)`
|
|
9
|
+
* - bare signal/memo getter refs (`count`) → `(() => (initialValue))`
|
|
9
10
|
* - bare inlinable-const refs (`label`) → `(csrInlinable.rewrittenValue)`
|
|
10
11
|
* - bare source-level props refs (`props.x`) → `_p.x`
|
|
11
12
|
*
|
|
@@ -51,7 +52,25 @@ export type CsrInlinabilityMap = Map<string, CsrInlinableEntry | null>;
|
|
|
51
52
|
/**
|
|
52
53
|
* A single substitution: when the source expression mentions `name`
|
|
53
54
|
* (either bare or as a zero-arg call, depending on `kind`), the AST
|
|
54
|
-
* walker splices
|
|
55
|
+
* walker splices a replacement in place.
|
|
56
|
+
*
|
|
57
|
+
* `kind` says what `replacement` IS, not just where it matches:
|
|
58
|
+
*
|
|
59
|
+
* - `'call'`: `replacement` is the VALUE the zero-arg accessor `name()`
|
|
60
|
+
* produces (a signal's initial value, a memo's computation body). The
|
|
61
|
+
* call site `name()` substitutes to `(replacement)` directly. A BARE
|
|
62
|
+
* reference to `name` (uncalled — e.g. a getter passed as a component
|
|
63
|
+
* prop, `<Display value={count} />`, #2924) substitutes to
|
|
64
|
+
* `(() => (replacement))` instead: a thunk over the same value, which
|
|
65
|
+
* is the CSR-template mirror of the reference adapter's SSR shim
|
|
66
|
+
* (`const count = () => 5`, `packages/adapter-hono`) — the only
|
|
67
|
+
* reading that lets a bare accessor evaluate identically on SSR and on
|
|
68
|
+
* CSR-fresh-mount. Registered only by `buildSignalMemoEnv` below.
|
|
69
|
+
* - `'identifier'`: `replacement` is already the value a BARE reference
|
|
70
|
+
* to `name` should read as (e.g. an inlinable const's resolved value);
|
|
71
|
+
* there is no corresponding call form. Substitutes to `(replacement)`
|
|
72
|
+
* at both a bare reference and the (non-existent, for this kind) call
|
|
73
|
+
* position.
|
|
55
74
|
*/
|
|
56
75
|
export interface CsrSubstitution {
|
|
57
76
|
kind: 'call' | 'identifier';
|
|
@@ -62,10 +81,11 @@ export interface CsrSubstitution {
|
|
|
62
81
|
}
|
|
63
82
|
export interface CsrEnv {
|
|
64
83
|
/**
|
|
65
|
-
* Map of name → substitution. Call-kind entries match `name()`
|
|
66
|
-
* (zero-arg call with bare-ident callee
|
|
67
|
-
*
|
|
68
|
-
*
|
|
84
|
+
* Map of name → substitution. Call-kind entries match both `name()`
|
|
85
|
+
* (zero-arg call with bare-ident callee — replaced with the accessor's
|
|
86
|
+
* value) and bare uses of `name` (replaced with a thunk over that same
|
|
87
|
+
* value, #2924); identifier-kind entries match bare uses of `name`
|
|
88
|
+
* outside member-access tails.
|
|
69
89
|
*/
|
|
70
90
|
substitutions: Map<string, CsrSubstitution>;
|
|
71
91
|
/** Source-level props object name (`props`); null for destructured-args. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csr-substitute.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/csr-substitute.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"csr-substitute.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/csr-substitute.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAG7D;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAA;IACtB,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACrC;AAED;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC,CAAA;AAEtE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;IAC3B,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAA;IACnB,qFAAqF;IACrF,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,MAAM;IACrB;;;;;;OAMG;IACH,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC3C,4EAA4E;IAC5E,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAC/B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,YAAY,GAC5B;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,CAmB7D;AA8OD,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAaxE;AAED;;;;;;;;GAQG;AACH,wBAAgB,uCAAuC,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUjF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAkBpF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAQ/D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,SAAS,YAAY,EAAE,EACvC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAClC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAarB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,SAAS,UAAU,EAAE,EAC9B,KAAK,EAAE,SAAS,QAAQ,EAAE,GACzB,GAAG,CAAC,MAAM,CAAC,CASb;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,SAAS,UAAU,EAAE,EAC9B,KAAK,EAAE,SAAS,QAAQ,EAAE,EAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,EAC9B,cAAc,GAAE,SAAS,YAAY,EAAO,GAC3C,MAAM,CA6CR"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"html-template.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/html-template.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"html-template.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/html-template.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
* Import detection and DOM import management.
|
|
3
3
|
*/
|
|
4
4
|
import type { ComponentIR } from '../types.ts';
|
|
5
|
-
export declare const RUNTIME_IMPORT_CANDIDATES: readonly ['createSignal', 'createMemo', 'createEffect', 'onCleanup', 'onMount', 'hydrate', 'insert', 'getLoopChildren', 'getLoopNodes', 'mapArray', 'mapArrayAnchored', 'mapArrayLazy', 'patchLeaf', 'createDisposableEffect', 'findCondContainer', 'createComponent', 'renderChild', 'registerComponent', 'registerTemplate', 'initChild', 'upsertChild', 'mountRowRoot', 'withParentScope', 'createPortal', 'provideContext', 'createContext', 'useContext', 'forwardProps', 'applyRestAttrs', 'splitProps', 'spreadAttrs', 'styleToCss', 'escapeAttr', 'escapeText', 'escapeTextOrNode', 'escapeCommentText', 'bfMarkup', 'escapeTextOrMarkup', 'markupOrEmpty', 'qsa', 'qsaItem', 'qsaChildScope', 'qsaChildScopes', 'upsertChildItem', '__slot', '__bfSlot', '__bfText', 'claimSlots', 'lazySlots', 'lazyClaimSlots', 'textOrNode', 'beginTurn', 'endTurn', 'date', 'formatDate', 'ownScopeId'];
|
|
5
|
+
export declare const RUNTIME_IMPORT_CANDIDATES: readonly ['createSignal', 'createMemo', 'createEffect', 'onCleanup', 'onMount', 'batch', 'hydrate', 'insert', 'getLoopChildren', 'getLoopNodes', 'mapArray', 'mapArrayAnchored', 'mapArrayLazy', 'patchLeaf', 'createDisposableEffect', 'findCondContainer', 'createComponent', 'renderChild', 'registerComponent', 'registerTemplate', 'initChild', 'upsertChild', 'mountRowRoot', 'withParentScope', 'createPortal', 'provideContext', 'createContext', 'useContext', 'forwardProps', 'applyRestAttrs', 'splitProps', 'spreadAttrs', 'styleToCss', 'escapeAttr', 'escapeText', 'escapeTextOrNode', 'escapeCommentText', 'bfMarkup', 'escapeTextOrMarkup', 'markupOrEmpty', 'qsa', 'qsaItem', 'qsaChildScope', 'qsaChildScopes', 'upsertChildItem', '__slot', '__bfSlot', '__bfText', 'claimSlots', 'lazySlots', 'lazyClaimSlots', 'textOrNode', 'beginTurn', 'endTurn', 'date', 'formatDate', 'ownScopeId'];
|
|
6
6
|
/** @deprecated Use RUNTIME_IMPORT_CANDIDATES */
|
|
7
|
-
export declare const DOM_IMPORT_CANDIDATES: readonly ["createSignal", "createMemo", "createEffect", "onCleanup", "onMount", "hydrate", "insert", "getLoopChildren", "getLoopNodes", "mapArray", "mapArrayAnchored", "mapArrayLazy", "patchLeaf", "createDisposableEffect", "findCondContainer", "createComponent", "renderChild", "registerComponent", "registerTemplate", "initChild", "upsertChild", "mountRowRoot", "withParentScope", "createPortal", "provideContext", "createContext", "useContext", "forwardProps", "applyRestAttrs", "splitProps", "spreadAttrs", "styleToCss", "escapeAttr", "escapeText", "escapeTextOrNode", "escapeCommentText", "bfMarkup", "escapeTextOrMarkup", "markupOrEmpty", "qsa", "qsaItem", "qsaChildScope", "qsaChildScopes", "upsertChildItem", "__slot", "__bfSlot", "__bfText", "claimSlots", "lazySlots", "lazyClaimSlots", "textOrNode", "beginTurn", "endTurn", "date", "formatDate", "ownScopeId"];
|
|
7
|
+
export declare const DOM_IMPORT_CANDIDATES: readonly ["createSignal", "createMemo", "createEffect", "onCleanup", "onMount", "batch", "hydrate", "insert", "getLoopChildren", "getLoopNodes", "mapArray", "mapArrayAnchored", "mapArrayLazy", "patchLeaf", "createDisposableEffect", "findCondContainer", "createComponent", "renderChild", "registerComponent", "registerTemplate", "initChild", "upsertChild", "mountRowRoot", "withParentScope", "createPortal", "provideContext", "createContext", "useContext", "forwardProps", "applyRestAttrs", "splitProps", "spreadAttrs", "styleToCss", "escapeAttr", "escapeText", "escapeTextOrNode", "escapeCommentText", "bfMarkup", "escapeTextOrMarkup", "markupOrEmpty", "qsa", "qsaItem", "qsaChildScope", "qsaChildScopes", "upsertChildItem", "__slot", "__bfSlot", "__bfText", "claimSlots", "lazySlots", "lazyClaimSlots", "textOrNode", "beginTurn", "endTurn", "date", "formatDate", "ownScopeId"];
|
|
8
8
|
export declare const RUNTIME_MODULE = "@barefootjs/client/runtime";
|
|
9
9
|
export declare const IMPORT_PLACEHOLDER = "/* __BAREFOOTJS_DOM_IMPORTS__ */";
|
|
10
10
|
export declare const MODULE_CONSTANTS_PLACEHOLDER = "/* __MODULE_LEVEL_CONSTANTS__ */";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/imports.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAU,MAAM,aAAa,CAAA;AAMtD,eAAO,MAAM,yBAAyB,YACpC,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/imports.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAU,MAAM,aAAa,CAAA;AAMtD,eAAO,MAAM,yBAAyB,YACpC,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAKpE,OAAO,EACP,SAAS,EAAE,QAAQ,EAAE,iBAAiB,EAAE,cAAc,EAAE,UAAU,EAAE,kBAAkB,EAAE,cAAc,EAAE,WAAW,EAAE,wBAAwB,EAK7I,mBAAmB,EACnB,iBAAiB,EAAE,aAAa,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,EAKrG,cAAc,EAId,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAC/C,cAAc,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,kBAAkB,EAG3H,mBAAmB,EAInB,UAAU,EAAE,oBAAoB,EAGhC,eAAe,EACf,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAUxG,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAEzD,WAAW,EAAE,SAAS,EAItB,MAAM,EAIN,YAAY,EAMZ,YAAY,CACJ,CAAA;AAEV,gDAAgD;AAChD,eAAO,MAAM,qBAAqB,+2BAA4B,CAAA;AAE9D,eAAO,MAAM,cAAc,+BAA+B,CAAA;AAE1D,eAAO,MAAM,kBAAkB,qCAAqC,CAAA;AACpE,eAAO,MAAM,4BAA4B,qCAAqC,CAAA;AAE9E;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAqB3D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM,EAAE,CAoB/D;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAWxF;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,aAAa,EAAE,MAAM,GAAG,IAAI,EAC5B,SAAS,EAAE,MAAM,EAAE,GAClB,MAAM,EAAE,CASV;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAwFxE;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CA6CvH"}
|
package/dist/props-binding.d.ts
CHANGED
|
@@ -155,6 +155,17 @@ export declare function boundPropLocalNames(b: PropsParamBindings): ReadonlySet<
|
|
|
155
155
|
export type LivePropReadInfo = Pick<ParamInfo, 'name' | 'sourceName' | 'defaultValue' | 'defaultContainsArrow'>;
|
|
156
156
|
/** `_p.<callerKey>` — `_p` is always keyed by the caller-facing name (#2524 CSR half). */
|
|
157
157
|
export declare function propReadBase(p: LivePropReadInfo): string;
|
|
158
|
+
/**
|
|
159
|
+
* The text a destructure default contributes as the right operand of a `??`
|
|
160
|
+
* prop read. An arrow (or function-expression) default needs its own
|
|
161
|
+
* parens — `??` binds tighter than an arrow head, so `_p.onInput ?? () =>
|
|
162
|
+
* {}` is a SyntaxError. The one implementation of that decision, shared by
|
|
163
|
+
* `propReadFallback` below (every live `_p.X` read) and `collectConstant`'s
|
|
164
|
+
* body-destructure expansion (`analyzer.ts`, which builds
|
|
165
|
+
* `ConstantInfo.value`) — see #2940, where the analyzer built that value
|
|
166
|
+
* without this check and emitted invalid JS.
|
|
167
|
+
*/
|
|
168
|
+
export declare function coalesceDefaultText(defaultValue: string, defaultContainsArrow: boolean | undefined): string;
|
|
158
169
|
/**
|
|
159
170
|
* The `??` right-hand side for a prop read, or null when the bare read is
|
|
160
171
|
* correct. Precedence:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"props-binding.d.ts","sourceRoot":"","sources":["../src/props-binding.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"props-binding.d.ts","sourceRoot":"","sources":["../src/props-binding.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssr-defaults.d.ts","sourceRoot":"","sources":["../src/ssr-defaults.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAA;IACd;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EACpC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAuBzB;AAkBD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"ssr-defaults.d.ts","sourceRoot":"","sources":["../src/ssr-defaults.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAA;IACd;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EACpC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAuBzB;AAkBD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,SAAS,CA8P/F"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@barefootjs/jsx",
|
|
3
|
-
"version": "0.35.
|
|
3
|
+
"version": "0.35.8",
|
|
4
4
|
"description": "JSX compiler for BarefootJS - transforms JSX to server HTML + client JS",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"directory": "packages/jsx"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@barefootjs/shared": "0.35.
|
|
52
|
+
"@barefootjs/shared": "0.35.8"
|
|
53
53
|
},
|
|
54
54
|
"peerDependencies": {
|
|
55
55
|
"@barefootjs/client": ">=0.2.0",
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Regression for #2940: a BODY-destructured prop's arrow-function default
|
|
3
|
+
* (`const { fmt = (v) => 'v' + v } = props`) used to build
|
|
4
|
+
* `ConstantInfo.value` as a bare `props.fmt ?? (v) => 'v' + v` —
|
|
5
|
+
* `collectConstant`'s body-destructure branch (`analyzer.ts`) never checked
|
|
6
|
+
* whether the default contained an arrow/function expression before
|
|
7
|
+
* splicing it after `??`, unlike the PARAMETER-destructured sibling form,
|
|
8
|
+
* which already parenthesized via `ParamInfo.defaultContainsArrow`
|
|
9
|
+
* (`propReadFallback`, `props-binding.ts`).
|
|
10
|
+
*
|
|
11
|
+
* `a ?? (v) => expr` is not valid JS — an arrow function cannot appear
|
|
12
|
+
* directly as the right operand of `??` without parens — so this was a
|
|
13
|
+
* genuine SyntaxError in three places that all read `ConstantInfo.value`
|
|
14
|
+
* verbatim: the emitted client-JS init body, the Hono SSR component (the
|
|
15
|
+
* reference adapter also splices `value` unchanged), and every downstream
|
|
16
|
+
* pass that re-parses it (which silently gave up and skipped instead of
|
|
17
|
+
* crashing, masking the bug as a missed optimization rather than a syntax
|
|
18
|
+
* error).
|
|
19
|
+
*
|
|
20
|
+
* The fix routes the analyzer's `value`-building through the same
|
|
21
|
+
* `coalesceDefaultText` decision `propReadFallback` already used, so there
|
|
22
|
+
* is one implementation of "how does a `??` default get parenthesized",
|
|
23
|
+
* not two.
|
|
24
|
+
*/
|
|
25
|
+
|
|
26
|
+
import { describe, test, expect } from 'bun:test'
|
|
27
|
+
import ts from 'typescript'
|
|
28
|
+
import { analyzeComponent } from '../analyzer'
|
|
29
|
+
import { compileJSX } from '../index'
|
|
30
|
+
import { HonoAdapter } from '../../../adapter-hono/src/adapter/index'
|
|
31
|
+
|
|
32
|
+
const ARROW_DEFAULT_SOURCE = `
|
|
33
|
+
'use client'
|
|
34
|
+
function Child(props: { fmt?: (v: number) => string }) {
|
|
35
|
+
const { fmt = (v) => 'v' + v } = props
|
|
36
|
+
return <span>{fmt(1)}</span>
|
|
37
|
+
}
|
|
38
|
+
export { Child }
|
|
39
|
+
`
|
|
40
|
+
|
|
41
|
+
const RENAMED_ARROW_DEFAULT_SOURCE = `
|
|
42
|
+
'use client'
|
|
43
|
+
function Child(props: { fmt?: (v: number) => string }) {
|
|
44
|
+
const { fmt: f = (v) => 'v' + v } = props
|
|
45
|
+
return <span>{f(1)}</span>
|
|
46
|
+
}
|
|
47
|
+
export { Child }
|
|
48
|
+
`
|
|
49
|
+
|
|
50
|
+
// A HANDLER-scoped read (as opposed to a top-level reactive text position)
|
|
51
|
+
// goes through `rewriteBodyAliasReads` (`rewrite-destructured-props.ts`),
|
|
52
|
+
// which re-parses the analyzer's already-wrapped `ConstantInfo.value` and
|
|
53
|
+
// used to feed the still-`true` `defaultContainsArrow` flag back into
|
|
54
|
+
// `coalesceDefaultText`, double-wrapping the default a second time
|
|
55
|
+
// (`(_p.fmt ?? (((v) => 'v' + v)))(1)` instead of the minimal
|
|
56
|
+
// `(_p.fmt ?? ((v) => 'v' + v))(1)`) — pullfrog review on #2966.
|
|
57
|
+
const HANDLER_SCOPED_ARROW_DEFAULT_SOURCE = `
|
|
58
|
+
'use client'
|
|
59
|
+
import { createSignal } from '@barefootjs/client'
|
|
60
|
+
function ArrowDefaultFmt(props: { fmt?: (v: number) => string }) {
|
|
61
|
+
const { fmt = (v) => 'v' + v } = props
|
|
62
|
+
const [label, setLabel] = createSignal('none')
|
|
63
|
+
return <button onClick={() => setLabel(fmt(1))}>{label()}</button>
|
|
64
|
+
}
|
|
65
|
+
export { ArrowDefaultFmt }
|
|
66
|
+
`
|
|
67
|
+
|
|
68
|
+
function compile(source: string) {
|
|
69
|
+
return compileJSX(source, 'Child.tsx', { adapter: new HonoAdapter() })
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function parseDiagnosticCount(js: string): number {
|
|
73
|
+
const sourceFile = ts.createSourceFile('generated.js', js, ts.ScriptTarget.Latest, false, ts.ScriptKind.JS)
|
|
74
|
+
// @ts-expect-error - internal, but the established way this repo checks
|
|
75
|
+
// "did the generated code actually parse" (see client-template-escape-
|
|
76
|
+
// soundness.test.ts / map-body-no-silent-divergence.test.ts).
|
|
77
|
+
return sourceFile.parseDiagnostics?.length ?? 0
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
describe('body-destructured prop with an arrow-function default (#2940)', () => {
|
|
81
|
+
test('analyzer: `value` parenthesizes the arrow default', () => {
|
|
82
|
+
const ctx = analyzeComponent(ARROW_DEFAULT_SOURCE, 'Child.tsx')
|
|
83
|
+
const fmt = ctx.localConstants.find(c => c.name === 'fmt')
|
|
84
|
+
expect(fmt).toBeDefined()
|
|
85
|
+
expect(fmt?.value).toBe("props.fmt ?? ((v) => 'v' + v)")
|
|
86
|
+
expect(fmt?.containsArrow).toBe(true)
|
|
87
|
+
})
|
|
88
|
+
|
|
89
|
+
test('emitted client JS parses as valid JS, with no bare `?? (v) =>`', () => {
|
|
90
|
+
const warnings: unknown[][] = []
|
|
91
|
+
const originalWarn = console.warn
|
|
92
|
+
console.warn = (...args: unknown[]) => { warnings.push(args) }
|
|
93
|
+
let result: ReturnType<typeof compile>
|
|
94
|
+
try {
|
|
95
|
+
result = compile(ARROW_DEFAULT_SOURCE)
|
|
96
|
+
} finally {
|
|
97
|
+
console.warn = originalWarn
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
const clientJs = result.files.find(f => f.type === 'clientJs')
|
|
101
|
+
expect(clientJs).toBeDefined()
|
|
102
|
+
const js = clientJs!.content
|
|
103
|
+
|
|
104
|
+
expect(js).not.toMatch(/\?\?\s*\(v\)\s*=>/)
|
|
105
|
+
expect(parseDiagnosticCount(js)).toBe(0)
|
|
106
|
+
|
|
107
|
+
// The two downstream passes that used to silently bail because the
|
|
108
|
+
// generated code didn't parse must now run to completion.
|
|
109
|
+
expect(warnings.some(w => String(w[0]).includes('rewriteDestructuredPropReads'))).toBe(false)
|
|
110
|
+
expect(warnings.some(w => String(w[0]).includes('pruneUnusedPropExtractions'))).toBe(false)
|
|
111
|
+
})
|
|
112
|
+
|
|
113
|
+
test('Hono SSR component also parenthesizes the default (the reference adapter splices `value` verbatim too)', () => {
|
|
114
|
+
const result = compile(ARROW_DEFAULT_SOURCE)
|
|
115
|
+
const ssrComponent = result.files.find(f => f.type === 'markedTemplate')
|
|
116
|
+
expect(ssrComponent).toBeDefined()
|
|
117
|
+
expect(ssrComponent!.content).not.toMatch(/\?\?\s*\(v\)\s*=>/)
|
|
118
|
+
})
|
|
119
|
+
|
|
120
|
+
test('renamed alias (`{ fmt: f = (v) => ... }`) gets the same paren-wrap', () => {
|
|
121
|
+
const ctx = analyzeComponent(RENAMED_ARROW_DEFAULT_SOURCE, 'Child.tsx')
|
|
122
|
+
const f = ctx.localConstants.find(c => c.name === 'f')
|
|
123
|
+
expect(f).toBeDefined()
|
|
124
|
+
expect(f?.value).toBe("props.fmt ?? ((v) => 'v' + v)")
|
|
125
|
+
expect(f?.containsArrow).toBe(true)
|
|
126
|
+
|
|
127
|
+
const result = compile(RENAMED_ARROW_DEFAULT_SOURCE)
|
|
128
|
+
const clientJs = result.files.find(f => f.type === 'clientJs')
|
|
129
|
+
expect(parseDiagnosticCount(clientJs!.content)).toBe(0)
|
|
130
|
+
})
|
|
131
|
+
|
|
132
|
+
test('a handler-scoped read wraps the arrow default exactly once, not twice', () => {
|
|
133
|
+
const result = compile(HANDLER_SCOPED_ARROW_DEFAULT_SOURCE)
|
|
134
|
+
const clientJs = result.files.find(f => f.type === 'clientJs')
|
|
135
|
+
expect(clientJs).toBeDefined()
|
|
136
|
+
const js = clientJs!.content
|
|
137
|
+
|
|
138
|
+
expect(parseDiagnosticCount(js)).toBe(0)
|
|
139
|
+
expect(js).toContain("(_p.fmt ?? ((v) => 'v' + v))(1)")
|
|
140
|
+
expect(js).not.toContain("(_p.fmt ?? (((v) => 'v' + v)))(1)")
|
|
141
|
+
})
|
|
142
|
+
})
|