@barefootjs/jsx 0.40.0 → 0.40.2

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 (249) hide show
  1. package/dist/adapters/ambiguous-nil-arithmetic.d.ts +42 -0
  2. package/dist/adapters/ambiguous-nil-arithmetic.d.ts.map +1 -0
  3. package/dist/adapters/attr-plan.d.ts.map +1 -1
  4. package/dist/adapters/boolean-carrier.d.ts +31 -0
  5. package/dist/adapters/boolean-carrier.d.ts.map +1 -0
  6. package/dist/adapters/boolean-result.d.ts +32 -10
  7. package/dist/adapters/boolean-result.d.ts.map +1 -1
  8. package/dist/adapters/brace-delimiter-text.d.ts +18 -0
  9. package/dist/adapters/brace-delimiter-text.d.ts.map +1 -0
  10. package/dist/adapters/callback-method.d.ts +38 -5
  11. package/dist/adapters/callback-method.d.ts.map +1 -1
  12. package/dist/adapters/component-props.d.ts +22 -7
  13. package/dist/adapters/component-props.d.ts.map +1 -1
  14. package/dist/adapters/computed-const.d.ts +28 -1
  15. package/dist/adapters/computed-const.d.ts.map +1 -1
  16. package/dist/adapters/dsl-template-adapter.d.ts +39 -1
  17. package/dist/adapters/dsl-template-adapter.d.ts.map +1 -1
  18. package/dist/adapters/loop-bound-names.d.ts +9 -1
  19. package/dist/adapters/loop-bound-names.d.ts.map +1 -1
  20. package/dist/adapters/loop-row-type.d.ts +52 -0
  21. package/dist/adapters/loop-row-type.d.ts.map +1 -0
  22. package/dist/adapters/nil-reading.d.ts +68 -0
  23. package/dist/adapters/nil-reading.d.ts.map +1 -0
  24. package/dist/adapters/non-primitive-equality.d.ts +33 -0
  25. package/dist/adapters/non-primitive-equality.d.ts.map +1 -0
  26. package/dist/adapters/number-value.d.ts +45 -0
  27. package/dist/adapters/number-value.d.ts.map +1 -0
  28. package/dist/adapters/operand-typing.d.ts +126 -0
  29. package/dist/adapters/operand-typing.d.ts.map +1 -0
  30. package/dist/adapters/parsed-expr-emitter.d.ts +70 -12
  31. package/dist/adapters/parsed-expr-emitter.d.ts.map +1 -1
  32. package/dist/adapters/primitive-plan.d.ts +291 -0
  33. package/dist/adapters/primitive-plan.d.ts.map +1 -0
  34. package/dist/analyzer-context.d.ts +11 -0
  35. package/dist/analyzer-context.d.ts.map +1 -1
  36. package/dist/analyzer.d.ts +34 -0
  37. package/dist/analyzer.d.ts.map +1 -1
  38. package/dist/augment-inherited-props.d.ts +63 -8
  39. package/dist/augment-inherited-props.d.ts.map +1 -1
  40. package/dist/compiler.d.ts.map +1 -1
  41. package/dist/event-handler-name.d.ts +12 -0
  42. package/dist/event-handler-name.d.ts.map +1 -1
  43. package/dist/expression-parser.d.ts +8 -0
  44. package/dist/expression-parser.d.ts.map +1 -1
  45. package/dist/index.d.ts +24 -11
  46. package/dist/index.d.ts.map +1 -1
  47. package/dist/index.js +5671 -2586
  48. package/dist/ir-to-client-js/build-references.d.ts.map +1 -1
  49. package/dist/ir-to-client-js/child-props-object.d.ts +64 -0
  50. package/dist/ir-to-client-js/child-props-object.d.ts.map +1 -0
  51. package/dist/ir-to-client-js/collect-elements.d.ts.map +1 -1
  52. package/dist/ir-to-client-js/control-flow/plan/build-component-loop.d.ts.map +1 -1
  53. package/dist/ir-to-client-js/control-flow/plan/build-inner-loop.d.ts +29 -0
  54. package/dist/ir-to-client-js/control-flow/plan/build-inner-loop.d.ts.map +1 -1
  55. package/dist/ir-to-client-js/control-flow/plan/build-lazy-row.d.ts +2 -0
  56. package/dist/ir-to-client-js/control-flow/plan/build-lazy-row.d.ts.map +1 -1
  57. package/dist/ir-to-client-js/control-flow/plan/build-loop-child-arm.d.ts.map +1 -1
  58. package/dist/ir-to-client-js/control-flow/plan/build-reactive-effects.d.ts.map +1 -1
  59. package/dist/ir-to-client-js/control-flow/plan/inner-loop.d.ts +5 -4
  60. package/dist/ir-to-client-js/control-flow/plan/inner-loop.d.ts.map +1 -1
  61. package/dist/ir-to-client-js/control-flow/plan/loop-child-arm.d.ts +2 -0
  62. package/dist/ir-to-client-js/control-flow/plan/loop-child-arm.d.ts.map +1 -1
  63. package/dist/ir-to-client-js/control-flow/plan/loop.d.ts +15 -0
  64. package/dist/ir-to-client-js/control-flow/plan/loop.d.ts.map +1 -1
  65. package/dist/ir-to-client-js/control-flow/plan/reactive-effects.d.ts +2 -0
  66. package/dist/ir-to-client-js/control-flow/plan/reactive-effects.d.ts.map +1 -1
  67. package/dist/ir-to-client-js/control-flow/shared.d.ts.map +1 -1
  68. package/dist/ir-to-client-js/control-flow/stringify/claim-plan.d.ts +22 -0
  69. package/dist/ir-to-client-js/control-flow/stringify/claim-plan.d.ts.map +1 -1
  70. package/dist/ir-to-client-js/control-flow/stringify/component-loop.d.ts.map +1 -1
  71. package/dist/ir-to-client-js/control-flow/stringify/event-listener.d.ts +1 -1
  72. package/dist/ir-to-client-js/control-flow/stringify/event-listener.d.ts.map +1 -1
  73. package/dist/ir-to-client-js/control-flow/stringify/lazy-row.d.ts.map +1 -1
  74. package/dist/ir-to-client-js/html-template.d.ts +3 -2
  75. package/dist/ir-to-client-js/html-template.d.ts.map +1 -1
  76. package/dist/ir-to-client-js/imports.d.ts +2 -2
  77. package/dist/ir-to-client-js/imports.d.ts.map +1 -1
  78. package/dist/ir-to-client-js/index.d.ts +2 -6
  79. package/dist/ir-to-client-js/index.d.ts.map +1 -1
  80. package/dist/ir-to-client-js/plan/build-static-array-child-init.d.ts.map +1 -1
  81. package/dist/ir-to-client-js/plan/static-array-child-init.d.ts +37 -19
  82. package/dist/ir-to-client-js/plan/static-array-child-init.d.ts.map +1 -1
  83. package/dist/ir-to-client-js/prop-handling.d.ts.map +1 -1
  84. package/dist/ir-to-client-js/reactivity.d.ts.map +1 -1
  85. package/dist/ir-to-client-js/safe-html.d.ts +9 -3
  86. package/dist/ir-to-client-js/safe-html.d.ts.map +1 -1
  87. package/dist/ir-to-client-js/stringify/static-array-child-init.d.ts +3 -2
  88. package/dist/ir-to-client-js/stringify/static-array-child-init.d.ts.map +1 -1
  89. package/dist/ir-to-client-js/types.d.ts +30 -0
  90. package/dist/ir-to-client-js/types.d.ts.map +1 -1
  91. package/dist/ir-to-client-js/utils.d.ts +8 -0
  92. package/dist/ir-to-client-js/utils.d.ts.map +1 -1
  93. package/dist/jsx-to-ir.d.ts +1 -0
  94. package/dist/jsx-to-ir.d.ts.map +1 -1
  95. package/dist/nullable-signal-attr.d.ts +95 -10
  96. package/dist/nullable-signal-attr.d.ts.map +1 -1
  97. package/dist/prop-rewrite.d.ts +7 -0
  98. package/dist/prop-rewrite.d.ts.map +1 -1
  99. package/dist/props-binding.d.ts +27 -3
  100. package/dist/props-binding.d.ts.map +1 -1
  101. package/dist/props-object-whole-read.d.ts +15 -0
  102. package/dist/props-object-whole-read.d.ts.map +1 -0
  103. package/dist/rich-type-refusal.d.ts.map +1 -1
  104. package/dist/scope/binding-scope.d.ts +100 -4
  105. package/dist/scope/binding-scope.d.ts.map +1 -1
  106. package/dist/scope/lexical-scope-walk.d.ts +3 -2
  107. package/dist/scope/lexical-scope-walk.d.ts.map +1 -1
  108. package/dist/scope/root-prop-alias.d.ts +16 -0
  109. package/dist/scope/root-prop-alias.d.ts.map +1 -1
  110. package/dist/signal-prop-name-collision.d.ts.map +1 -1
  111. package/dist/ssr-defaults.d.ts +4 -2
  112. package/dist/ssr-defaults.d.ts.map +1 -1
  113. package/dist/ssr-seed-plan.d.ts +14 -0
  114. package/dist/ssr-seed-plan.d.ts.map +1 -1
  115. package/dist/strip-types.d.ts +13 -0
  116. package/dist/strip-types.d.ts.map +1 -1
  117. package/dist/template-parts.d.ts.map +1 -1
  118. package/dist/template-position-walk.d.ts +21 -3
  119. package/dist/template-position-walk.d.ts.map +1 -1
  120. package/dist/types.d.ts +120 -0
  121. package/dist/types.d.ts.map +1 -1
  122. package/package.json +2 -2
  123. package/src/__tests__/__snapshots__/doc-examples.test.ts.snap +3 -3
  124. package/src/__tests__/binding-scope-ratchet.test.ts +12 -2
  125. package/src/__tests__/binding-scope.test.ts +89 -1
  126. package/src/__tests__/body-destructure-props-object-alias.test.ts +123 -0
  127. package/src/__tests__/boolean-carrier.test.ts +74 -0
  128. package/src/__tests__/boolean-result.test.ts +22 -5
  129. package/src/__tests__/brace-delimiter-text.test.ts +26 -0
  130. package/src/__tests__/callback-method.test.ts +62 -2
  131. package/src/__tests__/child-components-in-map.test.ts +1 -1
  132. package/src/__tests__/component-props.test.ts +14 -0
  133. package/src/__tests__/computed-const.test.ts +188 -0
  134. package/src/__tests__/emit-to-string-call.test.ts +2 -1
  135. package/src/__tests__/expression-parser.test.ts +24 -0
  136. package/src/__tests__/hydration-payload-analysis.test.ts +166 -0
  137. package/src/__tests__/issue-2724-prop-alias-loop-not-static.test.ts +7 -7
  138. package/src/__tests__/issue-2754-rest-spread-needs-slot.test.ts +5 -2
  139. package/src/__tests__/issue-2798-static-nested-loop-bindings.test.ts +1 -1
  140. package/src/__tests__/issue-2835-props-type-member-name-collision.test.ts +4 -4
  141. package/src/__tests__/issue-3044-nested-prop-object-array-not-static.test.ts +1 -1
  142. package/src/__tests__/issue-3688-props-spread-child-csr.test.ts +143 -0
  143. package/src/__tests__/issue-3713-props-spread-loop-row.test.ts +65 -0
  144. package/src/__tests__/lookup-literal-const.test.ts +9 -3
  145. package/src/__tests__/loop-index-reactivity.test.ts +2 -2
  146. package/src/__tests__/loop-param-accessor-key-member-safety.test.ts +1 -1
  147. package/src/__tests__/loop-plan.test.ts +1 -1
  148. package/src/__tests__/loop-row-const-initializer-shadow.test.ts +146 -0
  149. package/src/__tests__/loop-row-prop-read.test.ts +111 -0
  150. package/src/__tests__/loop-row-type.test.ts +64 -0
  151. package/src/__tests__/lowering-value-position.test.ts +4 -0
  152. package/src/__tests__/memo-body-expr.test.ts +137 -0
  153. package/src/__tests__/module-const-destructure-default.test.ts +156 -0
  154. package/src/__tests__/nested-loop-index-param.test.ts +1 -1
  155. package/src/__tests__/nested-loop-reactive-attrs.test.ts +2 -2
  156. package/src/__tests__/nested-row-shadowing.test.ts +2 -2
  157. package/src/__tests__/nil-reading.test.ts +77 -0
  158. package/src/__tests__/nullable-signal-attr.test.ts +231 -2
  159. package/src/__tests__/primitive-plan.test.ts +416 -0
  160. package/src/__tests__/profile-binding-ids.test.ts +14 -0
  161. package/src/__tests__/profile-loop-binding-ids.test.ts +2 -2
  162. package/src/__tests__/profile-nested-binding-ids.test.ts +2 -2
  163. package/src/__tests__/props-object-whole-read.test.ts +40 -0
  164. package/src/__tests__/reactive-attrs-in-map.test.ts +1 -1
  165. package/src/__tests__/reactive-factory-inlining.test.ts +4 -1
  166. package/src/__tests__/rest-binding-gaps.test.ts +192 -0
  167. package/src/__tests__/root-prop-alias.test.ts +79 -1
  168. package/src/__tests__/signal-prop-name-collision.test.ts +102 -2
  169. package/src/__tests__/source-file-cache.test.ts +105 -0
  170. package/src/__tests__/ssr-seed-plan.test.ts +43 -0
  171. package/src/__tests__/static-loop-csr-materialize.test.ts +2 -2
  172. package/src/__tests__/static-record-literal-array.test.ts +171 -0
  173. package/src/__tests__/string-concat-identifier.test.ts +40 -1
  174. package/src/__tests__/template-parts-literal-boundary.test.ts +19 -0
  175. package/src/adapters/ambiguous-nil-arithmetic.ts +103 -0
  176. package/src/adapters/attr-plan.ts +6 -2
  177. package/src/adapters/boolean-carrier.ts +76 -0
  178. package/src/adapters/boolean-result.ts +72 -66
  179. package/src/adapters/brace-delimiter-text.ts +25 -0
  180. package/src/adapters/callback-method.ts +151 -27
  181. package/src/adapters/component-props.ts +28 -8
  182. package/src/adapters/computed-const.ts +443 -10
  183. package/src/adapters/dsl-template-adapter.ts +79 -2
  184. package/src/adapters/loop-bound-names.ts +9 -1
  185. package/src/adapters/loop-plan.ts +1 -1
  186. package/src/adapters/loop-row-type.ts +139 -0
  187. package/src/adapters/nil-reading.ts +297 -0
  188. package/src/adapters/non-primitive-equality.ts +92 -0
  189. package/src/adapters/number-value.ts +108 -0
  190. package/src/adapters/operand-typing.ts +522 -0
  191. package/src/adapters/parsed-expr-emitter.ts +154 -19
  192. package/src/adapters/primitive-plan.ts +696 -0
  193. package/src/analyzer-context.ts +14 -0
  194. package/src/analyzer.ts +692 -85
  195. package/src/augment-inherited-props.ts +108 -10
  196. package/src/compiler.ts +17 -0
  197. package/src/event-handler-name.ts +15 -0
  198. package/src/expression-parser.ts +74 -2
  199. package/src/index.ts +45 -9
  200. package/src/ir-to-client-js/build-references.ts +69 -0
  201. package/src/ir-to-client-js/child-props-object.ts +106 -0
  202. package/src/ir-to-client-js/collect-elements.ts +100 -67
  203. package/src/ir-to-client-js/compute-inlinability.ts +1 -1
  204. package/src/ir-to-client-js/control-flow/plan/build-component-loop.ts +15 -1
  205. package/src/ir-to-client-js/control-flow/plan/build-inner-loop.ts +85 -5
  206. package/src/ir-to-client-js/control-flow/plan/build-lazy-row.ts +3 -0
  207. package/src/ir-to-client-js/control-flow/plan/build-loop-child-arm.ts +30 -28
  208. package/src/ir-to-client-js/control-flow/plan/build-reactive-effects.ts +1 -0
  209. package/src/ir-to-client-js/control-flow/plan/inner-loop.ts +5 -4
  210. package/src/ir-to-client-js/control-flow/plan/loop-child-arm.ts +2 -0
  211. package/src/ir-to-client-js/control-flow/plan/loop.ts +12 -0
  212. package/src/ir-to-client-js/control-flow/plan/reactive-effects.ts +2 -0
  213. package/src/ir-to-client-js/control-flow/shared.ts +23 -24
  214. package/src/ir-to-client-js/control-flow/stringify/claim-plan.ts +29 -0
  215. package/src/ir-to-client-js/control-flow/stringify/component-loop.ts +8 -2
  216. package/src/ir-to-client-js/control-flow/stringify/event-listener.ts +8 -1
  217. package/src/ir-to-client-js/control-flow/stringify/inner-loop.ts +8 -7
  218. package/src/ir-to-client-js/control-flow/stringify/lazy-row.ts +8 -7
  219. package/src/ir-to-client-js/control-flow/stringify/loop-child-arm.ts +4 -4
  220. package/src/ir-to-client-js/control-flow/stringify/loop.ts +3 -3
  221. package/src/ir-to-client-js/control-flow/stringify/reactive-effects.ts +6 -6
  222. package/src/ir-to-client-js/emit-reactive.ts +1 -1
  223. package/src/ir-to-client-js/html-template.ts +95 -38
  224. package/src/ir-to-client-js/imports.ts +1 -1
  225. package/src/ir-to-client-js/index.ts +53 -11
  226. package/src/ir-to-client-js/plan/build-static-array-child-init.ts +42 -15
  227. package/src/ir-to-client-js/plan/static-array-child-init.ts +34 -19
  228. package/src/ir-to-client-js/prop-handling.ts +22 -3
  229. package/src/ir-to-client-js/reactivity.ts +14 -0
  230. package/src/ir-to-client-js/safe-html.ts +11 -4
  231. package/src/ir-to-client-js/stringify/static-array-child-init.ts +30 -12
  232. package/src/ir-to-client-js/types.ts +23 -0
  233. package/src/ir-to-client-js/utils.ts +15 -1
  234. package/src/jsx-to-ir.ts +510 -58
  235. package/src/nullable-signal-attr.ts +366 -28
  236. package/src/prop-rewrite.ts +30 -6
  237. package/src/props-binding.ts +54 -3
  238. package/src/props-object-whole-read.ts +87 -0
  239. package/src/rich-type-refusal.ts +2 -1
  240. package/src/scope/binding-scope.ts +203 -11
  241. package/src/scope/lexical-scope-walk.ts +4 -3
  242. package/src/scope/root-prop-alias.ts +23 -0
  243. package/src/signal-prop-name-collision.ts +113 -22
  244. package/src/ssr-defaults.ts +10 -4
  245. package/src/ssr-seed-plan.ts +82 -17
  246. package/src/strip-types.ts +31 -3
  247. package/src/template-parts.ts +21 -1
  248. package/src/template-position-walk.ts +57 -28
  249. package/src/types.ts +117 -0
@@ -16,6 +16,8 @@
16
16
  * runtime binds those.
17
17
  */
18
18
 
19
+ import { rewriteNilReadingsDeep } from './nil-reading.ts'
20
+ import type { ScopedOperandTyping } from './operand-typing.ts'
19
21
  import {
20
22
  freeVarsInBody,
21
23
  hasOpaqueCall,
@@ -83,7 +85,113 @@ export interface CallbackEvalPlan {
83
85
  kind: 'eval'
84
86
  helper: CallbackEvalHelper
85
87
  operands: CallbackEvalOperand[]
86
- captured: string[]
88
+ captured: CallbackCapture[]
89
+ }
90
+
91
+ /**
92
+ * A free name of an evaluator body and the expression whose SSR value the
93
+ * env binds it to: the name itself, or, for a lifted `props.X` read (see
94
+ * {@link evalBody}), that read.
95
+ */
96
+ export interface CallbackCapture {
97
+ name: string
98
+ value: ParsedExpr
99
+ }
100
+
101
+ /** A callback body the runtime evaluator can run: its JSON and its env. */
102
+ export interface EvalBody {
103
+ json: string
104
+ captured: CallbackCapture[]
105
+ }
106
+
107
+ /**
108
+ * Serialize a callback body for the runtime evaluator, with the captures its
109
+ * env needs; `null` when the body is outside the evaluator surface. `bound`
110
+ * are the callback's own params. `propsObject` is the component's props
111
+ * object identifier (`BindingScope.propsObject` / `propsObjectIdentifier`):
112
+ * `props`, or the props parameter's own name (`function C(p)`).
113
+ *
114
+ * A template has no props object: the props are its top-level variables,
115
+ * and the adapters spell `props.X` as the variable `X`. So each `props.X` the
116
+ * body reads, where no param binds `props`, becomes a fresh env name bound to
117
+ * the read itself, which the adapter spells as it spells `props.X` anywhere
118
+ * else. Capturing `props` whole would bind it to an undefined template
119
+ * variable, and the predicate would read every `props.X` as `undefined`.
120
+ */
121
+ export function evalBody(body: ParsedExpr, bound: ReadonlySet<string>, propsObject: string, typing?: ScopedOperandTyping): EvalBody | null {
122
+ // The evaluator reads every nil as `null`: with the enclosing scope's
123
+ // typing, an operand whose nil Phase 1 reads is rewritten first (#3824
124
+ // step 4a), for a caller that reaches here without `emitParsedExpr`.
125
+ const read = typing ? rewriteNilReadingsDeep(body, typing.enterCallback([...bound])) : body
126
+ const lifted = liftPropsReads(read, bound, propsObject)
127
+ const json = serializeParsedExpr(lifted.body)
128
+ if (json === null) return null
129
+ const captured = freeVarsInBody(lifted.body, bound).map((name) => ({
130
+ name,
131
+ value: lifted.values.get(name) ?? { kind: 'identifier' as const, name },
132
+ }))
133
+ return { json, captured }
134
+ }
135
+
136
+ /**
137
+ * `body` with each `<propsObject>.X` read that no arrow param shadows
138
+ * replaced by an identifier no other name in `body` uses, and the read each
139
+ * identifier stands for. A bare props object (`props[key]`) is left as it is.
140
+ */
141
+ function liftPropsReads(
142
+ body: ParsedExpr,
143
+ bound: ReadonlySet<string>,
144
+ propsObject: string,
145
+ ): { body: ParsedExpr; values: Map<string, ParsedExpr> } {
146
+ const values = new Map<string, ParsedExpr>()
147
+ if (bound.has(propsObject)) return { body, values }
148
+ const taken = new Set<string>(bound)
149
+ collectNames(body, taken)
150
+ const aliases = new Map<string, string>()
151
+ const aliasFor = (read: Extract<ParsedExpr, { kind: 'member' }>): string => {
152
+ const existing = aliases.get(read.property)
153
+ if (existing !== undefined) return existing
154
+ let alias = `__bf_props_${read.property.replace(/[^A-Za-z0-9_]/g, '_')}`
155
+ while (taken.has(alias)) alias += '_'
156
+ taken.add(alias)
157
+ aliases.set(read.property, alias)
158
+ values.set(alias, read)
159
+ return alias
160
+ }
161
+ const walk = (value: unknown): unknown => {
162
+ if (Array.isArray(value)) return value.map(walk)
163
+ if (value === null || typeof value !== 'object') return value
164
+ const node = value as { kind?: unknown } & Record<string, unknown>
165
+ if (isPropsRead(node, propsObject)) return { kind: 'identifier', name: aliasFor(node) }
166
+ // An arrow that binds the props object name makes it a different value in its body.
167
+ if (node.kind === 'arrow' && (node.params as string[]).includes(propsObject)) return node
168
+ const out: Record<string, unknown> = {}
169
+ for (const [k, v] of Object.entries(node)) out[k] = walk(v)
170
+ return out
171
+ }
172
+ return { body: walk(body) as ParsedExpr, values }
173
+ }
174
+
175
+ function isPropsRead(node: { kind?: unknown }, propsObject: string): node is Extract<ParsedExpr, { kind: 'member' }> {
176
+ const read = node as Partial<Extract<ParsedExpr, { kind: 'member' }>>
177
+ return (
178
+ read.kind === 'member' &&
179
+ read.object?.kind === 'identifier' &&
180
+ read.object.name === propsObject
181
+ )
182
+ }
183
+
184
+ /** Add every identifier and arrow param in `value` to `into`. */
185
+ function collectNames(value: unknown, into: Set<string>): void {
186
+ if (Array.isArray(value)) {
187
+ for (const v of value) collectNames(v, into)
188
+ return
189
+ }
190
+ if (value === null || typeof value !== 'object') return
191
+ const node = value as { kind?: unknown } & Record<string, unknown>
192
+ if (node.kind === 'identifier' && typeof node.name === 'string') into.add(node.name)
193
+ if (node.kind === 'arrow' && Array.isArray(node.params)) for (const p of node.params as string[]) into.add(p)
194
+ for (const v of Object.values(node)) collectNames(v, into)
87
195
  }
88
196
 
89
197
  /**
@@ -117,20 +225,24 @@ export interface CallbackLoweringOptions {
117
225
  nativePredicate?: boolean
118
226
  }
119
227
 
120
- /** Lower `<recv>.<method>(arrow, ...restArgs)`. */
228
+ /**
229
+ * Lower `<recv>.<method>(arrow, ...restArgs)`. `propsObject`: the
230
+ * component's props object identifier (see {@link evalBody}).
231
+ */
121
232
  export function lowerCallbackMethod(
122
233
  method: string,
123
234
  arrow: Arrow,
124
235
  restArgs: readonly ParsedExpr[],
125
236
  options: CallbackLoweringOptions,
237
+ propsObject: string,
126
238
  ): CallbackPlan {
127
239
  const { adapterName } = options
128
240
  const { body, params } = arrow
129
- if (isPredicateMethod(method)) return lowerPredicate(method, arrow, options)
130
- if (method === 'sort' || method === 'toSorted') return lowerSortComparator(method, arrow, adapterName)
241
+ if (isPredicateMethod(method)) return lowerPredicate(method, arrow, options, propsObject)
242
+ if (method === 'sort' || method === 'toSorted') return lowerSortComparator(method, arrow, adapterName, propsObject)
131
243
  if (method === 'reduce' || method === 'reduceRight') {
132
244
  const init = restArgs[0]
133
- const plan = init ? reduceEvalPlan(body, params, init, method === 'reduceRight' ? 'right' : 'left') : null
245
+ const plan = init ? reduceEvalPlan(body, params, init, method === 'reduceRight' ? 'right' : 'left', propsObject) : null
134
246
  return (
135
247
  plan ?? {
136
248
  kind: 'refuse',
@@ -140,7 +252,7 @@ export function lowerCallbackMethod(
140
252
  )
141
253
  }
142
254
  if (method === 'flatMap' || method === 'map') {
143
- const plan = projectionEvalPlan(method === 'map' ? 'map_eval' : 'flat_map_eval', body, params)
255
+ const plan = projectionEvalPlan(method === 'map' ? 'map_eval' : 'flat_map_eval', body, params, propsObject)
144
256
  return (
145
257
  plan ?? {
146
258
  kind: 'refuse',
@@ -152,7 +264,12 @@ export function lowerCallbackMethod(
152
264
  return { kind: 'receiver' }
153
265
  }
154
266
 
155
- function lowerPredicate(method: PredicateMethod, arrow: Arrow, options: CallbackLoweringOptions): CallbackPlan {
267
+ function lowerPredicate(
268
+ method: PredicateMethod,
269
+ arrow: Arrow,
270
+ options: CallbackLoweringOptions,
271
+ propsObject: string,
272
+ ): CallbackPlan {
156
273
  const param = String(arrow.params[0])
157
274
  const native: CallbackPlan = { kind: 'native-predicate', method, param, predicate: arrow.body }
158
275
  // A native form lowers an opaque call to a read of its callee, silently, and
@@ -162,15 +279,15 @@ function lowerPredicate(method: PredicateMethod, arrow: Arrow, options: Callback
162
279
  options.nativePredicate === true && !hasOpaqueCall(arrow.body) && !readsNestedCallbackIndex(arrow.body)
163
280
  const identity = method === 'filter' && arrow.body.kind === 'identifier' && arrow.body.name === param
164
281
  if (nativeOk && identity) return native
165
- const json = serializeParsedExpr(arrow.body)
166
- if (json !== null) {
282
+ const evaluable = evalBody(arrow.body, new Set(arrow.params.slice(0, 1)), propsObject)
283
+ if (evaluable !== null) {
167
284
  const { helper, forward } = PREDICATE_EVAL[method]
168
285
  const operands: CallbackEvalOperand[] = [
169
- { kind: 'string', value: json },
286
+ { kind: 'string', value: evaluable.json },
170
287
  { kind: 'string', value: param },
171
288
  ]
172
289
  if (forward !== undefined) operands.push({ kind: 'boolean', value: forward })
173
- return { kind: 'eval', helper, operands, captured: freeVarsInBody(arrow.body, new Set(arrow.params.slice(0, 1))) }
290
+ return { kind: 'eval', helper, operands, captured: evaluable.captured }
174
291
  }
175
292
  if (nativeOk) return native
176
293
  return {
@@ -185,8 +302,13 @@ function lowerPredicate(method: PredicateMethod, arrow: Arrow, options: Callback
185
302
  * structured `{keys: …}` descriptor, otherwise BF101. A loop source's sort
186
303
  * (`planLoop`) and `.sort(cmp)` at an expression position decide the same.
187
304
  */
188
- export function lowerSortComparator(method: 'sort' | 'toSorted', arrow: Arrow, adapterName: string): SortPlan {
189
- const plan = sortEvalPlan(arrow.body, arrow.params)
305
+ export function lowerSortComparator(
306
+ method: 'sort' | 'toSorted',
307
+ arrow: Arrow,
308
+ adapterName: string,
309
+ propsObject: string,
310
+ ): SortPlan {
311
+ const plan = sortEvalPlan(arrow.body, arrow.params, propsObject)
190
312
  if (plan) return plan
191
313
  const comparator = sortComparatorFromArrow(arrow)
192
314
  if (comparator) return { kind: 'structured-sort', comparator }
@@ -199,18 +321,18 @@ export function lowerSortComparator(method: 'sort' | 'toSorted', arrow: Arrow, a
199
321
  * has fewer than the two params a comparator needs. The loop-source sort
200
322
  * shares this with `.sort(cmp)` at an expression position.
201
323
  */
202
- export function sortEvalPlan(body: ParsedExpr, params: readonly string[]): CallbackEvalPlan | null {
203
- const json = serializeParsedExpr(body)
204
- if (json === null || params.length < 2) return null
324
+ export function sortEvalPlan(body: ParsedExpr, params: readonly string[], propsObject: string): CallbackEvalPlan | null {
325
+ const evaluable = evalBody(body, new Set(params), propsObject)
326
+ if (evaluable === null || params.length < 2) return null
205
327
  return {
206
328
  kind: 'eval',
207
329
  helper: 'sort_eval',
208
330
  operands: [
209
- { kind: 'string', value: json },
331
+ { kind: 'string', value: evaluable.json },
210
332
  { kind: 'string', value: params[0]! },
211
333
  { kind: 'string', value: params[1]! },
212
334
  ],
213
- captured: freeVarsInBody(body, new Set(params)),
335
+ captured: evaluable.captured,
214
336
  }
215
337
  }
216
338
 
@@ -233,9 +355,10 @@ function reduceEvalPlan(
233
355
  params: readonly string[],
234
356
  init: ParsedExpr,
235
357
  direction: 'left' | 'right',
358
+ propsObject: string,
236
359
  ): CallbackEvalPlan | null {
237
- const json = serializeParsedExpr(body)
238
- if (json === null || init.kind !== 'literal' || params.length < 2) return null
360
+ const evaluable = evalBody(body, new Set(params), propsObject)
361
+ if (evaluable === null || init.kind !== 'literal' || params.length < 2) return null
239
362
  let seed: CallbackEvalOperand
240
363
  if (init.literalType === 'string') seed = { kind: 'string', value: String(init.value) }
241
364
  else if (init.literalType === 'number') seed = { kind: 'number', text: String(init.value) }
@@ -244,13 +367,13 @@ function reduceEvalPlan(
244
367
  kind: 'eval',
245
368
  helper: 'reduce_eval',
246
369
  operands: [
247
- { kind: 'string', value: json },
370
+ { kind: 'string', value: evaluable.json },
248
371
  { kind: 'string', value: params[0]! },
249
372
  { kind: 'string', value: params[1]! },
250
373
  seed,
251
374
  { kind: 'string', value: direction },
252
375
  ],
253
- captured: freeVarsInBody(body, new Set(params)),
376
+ captured: evaluable.captured,
254
377
  }
255
378
  }
256
379
 
@@ -258,17 +381,18 @@ function projectionEvalPlan(
258
381
  helper: 'map_eval' | 'flat_map_eval',
259
382
  body: ParsedExpr,
260
383
  params: readonly string[],
384
+ propsObject: string,
261
385
  ): CallbackEvalPlan | null {
262
- const json = serializeParsedExpr(body)
263
- if (json === null) return null
386
+ const evaluable = evalBody(body, new Set(params.slice(0, 1)), propsObject)
387
+ if (evaluable === null) return null
264
388
  return {
265
389
  kind: 'eval',
266
390
  helper,
267
391
  operands: [
268
- { kind: 'string', value: json },
392
+ { kind: 'string', value: evaluable.json },
269
393
  { kind: 'string', value: String(params[0]) },
270
394
  ],
271
- captured: freeVarsInBody(body, new Set(params.slice(0, 1))),
395
+ captured: evaluable.captured,
272
396
  }
273
397
  }
274
398
 
@@ -300,7 +424,7 @@ export function emitCallbackEval(
300
424
  else if (operand.kind === 'number') operands.push(operand.text)
301
425
  else operands.push(spelling.boolean(operand.value))
302
426
  }
303
- const env = plan.captured.map((name) => [name, emit({ kind: 'identifier', name })] as const)
427
+ const env = plan.captured.map(({ name, value }) => [name, emit(value)] as const)
304
428
  operands.push(spelling.env(env))
305
429
  return spelling.call(plan.helper, operands)
306
430
  }
@@ -60,6 +60,13 @@ export interface ComponentPropsOptions {
60
60
  propsObjectName: string | null
61
61
  /** The analyzer-extracted props params, which `{...props}` enumerates. */
62
62
  propsParams: ReadonlyArray<ComponentPropsParam>
63
+ /**
64
+ * Whether the backend's runtime records which keys each component's
65
+ * caller passed, so a template can ask it whether a param was passed
66
+ * rather than whether it is nil (the DSL runtimes' `passed(name,
67
+ * fallback)`). See {@link propsSpreadParam}.
68
+ */
69
+ callerKeys?: boolean
63
70
  }
64
71
 
65
72
  /** What a call has set before a `{...props}` spread, as far as the compiler can see. */
@@ -82,14 +89,25 @@ export interface EarlierComponentProps {
82
89
  * - `'present'`: carried only when the caller passed it, so an absent param
83
90
  * leaves the earlier value alone.
84
91
  *
85
- * A template backend reads an absent prop and an explicit `undefined` or
86
- * `null` one as the same nil, so "passed" is spelled "not nil" there: a
87
- * caller that passes `undefined`/`null` keeps the earlier value, where JS
88
- * would override it with the nil (limitation
92
+ * A template engine reads an absent prop and an explicit `undefined` or
93
+ * `null` one as the same nil, so "passed" can't be spelled "not nil": a
94
+ * caller that passes `null` must still override the earlier value, as JS
95
+ * does. With `callerKeys`, the runtime answers "passed" from the keys the
96
+ * caller actually handed over, and every optional param is `'present'`:
97
+ * an `'entry'` would hand the child the key even when the caller left it
98
+ * out, and the child would then read it as passed (a nil overriding its
99
+ * own earlier prop in a further `{...props}`). Without `callerKeys` (Go,
100
+ * whose Input struct can't tell the two nils apart), "passed" is "not
101
+ * nil", and an explicit nil keeps the earlier value (limitation
89
102
  * `props-spread-explicit-null-override`).
90
103
  */
91
- export function propsSpreadParam(param: ComponentPropsParam, earlier: EarlierComponentProps): 'entry' | 'present' {
104
+ export function propsSpreadParam(
105
+ param: ComponentPropsParam,
106
+ earlier: EarlierComponentProps,
107
+ callerKeys = false,
108
+ ): 'entry' | 'present' {
92
109
  if (param.optional === false) return 'entry'
110
+ if (callerKeys) return 'present'
93
111
  return earlier.spread || earlier.keys.has(param.name) ? 'present' : 'entry'
94
112
  }
95
113
 
@@ -130,7 +148,7 @@ export function planComponentProps(
130
148
  // against the params this same spread has already pushed.
131
149
  const before: EarlierComponentProps = { keys: new Set(earlier.keys), spread: earlier.spread }
132
150
  for (const param of options.propsParams) {
133
- if (propsSpreadParam(param, before) === 'entry') {
151
+ if (propsSpreadParam(param, before, options.callerKeys) === 'entry') {
134
152
  push({ kind: 'props-param', name: param.name })
135
153
  } else {
136
154
  earlier.keys.add(param.name)
@@ -173,8 +191,10 @@ export interface ComponentPropSpelling {
173
191
  spread(value: SpreadAttr): string
174
192
  /**
175
193
  * The expression a `present-param` segment folds in like a spread: a
176
- * one-key hash `{ name: <param> }` when the param is not nil, an empty
177
- * hash when it is.
194
+ * one-key hash `{ name: <param> }` when the caller passed the param, an
195
+ * empty hash when it did not. "Passed" is the runtime's
196
+ * `passed('<name>', <param is not nil>)`: the caller's keys when the
197
+ * runtime recorded them, the nil test otherwise.
178
198
  */
179
199
  presentParam(name: string): string
180
200
  }