@barefootjs/jsx 0.23.0 → 0.25.0

package/src/errors.ts

@@ -89,6 +89,8 @@ export const ErrorCodes = {
   UNRECOGNIZED_REACTIVE_FACTORY: 'BF110',
   REACTIVE_FACTORY_RENAME_UNSUPPORTED: 'BF111',
   REACTIVE_FACTORY_MODULE_CAPTURE: 'BF112',
+  REACTIVE_FACTORY_IMPORT_COLLISION: 'BF113',
+  REACTIVE_FACTORY_PARAM_SHADOWED: 'BF114',
 } as const
 
 export type ErrorCode = (typeof ErrorCodes)[keyof typeof ErrorCodes]
@@ -178,6 +180,14 @@ const errorMessages: Record<ErrorCode, string> = {
     'body cannot be inlined into the component file. Move those helpers into the ' +
     'component file, pass them to the factory as parameters, or define the factory ' +
     'in the component file.',
+
+  [ErrorCodes.REACTIVE_FACTORY_IMPORT_COLLISION]:
+    'Inlining an imported reactive factory requires re-importing one of its helper ' +
+    'imports into this file, but that name is already bound here to something else. ' +
+    "Rename the conflicting binding in this file, or alias the import in the factory's own file.",
+
+  [ErrorCodes.REACTIVE_FACTORY_PARAM_SHADOWED]:
+    'Reactive factory parameter is shadowed by a nested declaration inside the factory body, so argument substitution at the inline site would be ambiguous. Rename the inner binding so it does not collide with the parameter.',
 }
 
 // =============================================================================

package/src/format-date-lowering.ts

@@ -21,11 +21,15 @@ import type { LoweringNode, LoweringPlugin } from './lowering-registry.ts'
 import { formatDateLocalNames } from './adapters/env-signal.ts'
 
 const UTC_LITERAL: ParsedExpr = { kind: 'literal', value: 'UTC', literalType: 'string' }
+const EMPTY_NAMES: ParsedExpr = { kind: 'array-literal', elements: [], raw: '[]' } as ParsedExpr
 
 /**
- * Recognise `formatDate(date, pattern[, timeZone])` against the component's
- * local import bindings, or decline (null): a non-identifier callee, a name
- * not bound to the `@barefootjs/client` import, or an arity outside 2–3.
+ * Recognise `formatDate(date, pattern[, timeZone[, names]])` against the
+ * component's local import bindings, or decline (null): a non-identifier
+ * callee, a name not bound to the `@barefootjs/client` import, or an arity
+ * outside 2–4. The canonical helper arity is 4 (#2334): omitted `timeZone` /
+ * `names` normalize to the `'UTC'` literal and the empty table the client
+ * function defaults to, so backend helpers stay fixed-arity.
  */
 export function matchFormatDateCall(
   callee: ParsedExpr,
@@ -33,11 +37,11 @@ export function matchFormatDateCall(
   locals: ReadonlySet<string>,
 ): LoweringNode | null {
   if (callee.kind !== 'identifier' || !locals.has(callee.name)) return null
-  if (args.length < 2 || args.length > 3) return null
+  if (args.length < 2 || args.length > 4) return null
   return {
     kind: 'helper-call',
     helper: 'format_date',
-    args: [args[0], args[1], args[2] ?? UTC_LITERAL],
+    args: [args[0], args[1], args[2] ?? UTC_LITERAL, args[3] ?? EMPTY_NAMES],
   }
 }
 

package/src/ir-to-client-js/emit-reactive.ts

@@ -11,7 +11,7 @@ import type { ClientJsContext } from './types.ts'
 import { toHtmlAttrName, varSlotId, PROPS_PARAM } from './utils.ts'
 import { createTemplateAwareStringProtector } from './html-template.ts'
 import { datePlugin, DATE_METHODS } from '../date-lowering.ts'
-import { toLocaleDatePlugin } from '../to-locale-date-lowering.ts'
+import { toLocaleDatePlugin, foldedArgToClientJs } from '../to-locale-date-lowering.ts'
 import { tsNodeToParsedExpr } from '../expression-parser.ts'
 import type { LoweringMatcher } from '../lowering-registry.ts'
 
@@ -181,8 +181,17 @@ function lowerToLocaleCallsInReactiveExpr(expr: string, matcher: LoweringMatcher
       call.arguments.map((a) => tsNodeToParsedExpr(a)),
     )
     if (!node || node.kind !== 'helper-call' || node.helper !== 'format_date') continue
-    const [, patternArg, tzArg] = node.args
-    if (patternArg?.kind !== 'literal' || tzArg?.kind !== 'literal') continue
+    const [, patternArg, tzArg, namesArg] = node.args
+    if (!patternArg || tzArg?.kind !== 'literal') continue
+    const localeText = call.arguments[0].getText(sourceFile)
+    const patternJs = foldedArgToClientJs(patternArg, localeText)
+    if (patternJs === null) continue
+    // The names table (#2334) — omitted when empty, same as the static path.
+    let namesJs: string | null = null
+    if (namesArg && !(namesArg.kind === 'array-literal' && namesArg.elements.length === 0)) {
+      namesJs = foldedArgToClientJs(namesArg, localeText)
+      if (namesJs === null) continue
+    }
     const receiverText = propAccess.expression.getText(sourceFile)
     const matchText = call.getText(sourceFile)
     // The call text contains string literals (placeholders in the protected
@@ -191,7 +200,8 @@ function lowerToLocaleCallsInReactiveExpr(expr: string, matcher: LoweringMatcher
     result = replaceProtectedCall(
       result,
       matchText,
-      () => `formatDate(${receiverText}, ${JSON.stringify(patternArg.value)}, ${JSON.stringify(tzArg.value)})`,
+      () =>
+        `formatDate(${receiverText}, ${patternJs}, ${JSON.stringify(tzArg.value)}${namesJs !== null ? `, ${namesJs}` : ''})`,
     )
   }
   return restore(result)

package/src/jsx-to-ir.ts

@@ -49,7 +49,7 @@ import { resolveFreeRefs, isNameBound as isNameBoundInEnv, type BindingEnvironme
 import { computeFileScope } from './ir-to-client-js/component-scope.ts'
 import { createTemplateAwareStringProtector } from './ir-to-client-js/html-template.ts'
 import { datePlugin, DATE_METHODS } from './date-lowering.ts'
-import { toLocaleDatePlugin } from './to-locale-date-lowering.ts'
+import { toLocaleDatePlugin, foldedArgToClientJs } from './to-locale-date-lowering.ts'
 import type { LoweringMatcher } from './lowering-registry.ts'
 import { extractFreeIdentifiersFromNode, initializerShapeContainsJsx } from './analyzer.ts'
 import { iterateJsTokens, replaceInExprContexts } from './scanner/js-scanner.ts'
@@ -462,8 +462,18 @@ function lowerToLocaleDateCalls(text: string, expr: ts.Node, ctx: TransformConte
       call.arguments.map((a) => tsNodeToParsedExpr(a)),
     )
     if (!node || node.kind !== 'helper-call' || node.helper !== 'format_date') continue
-    const [, patternArg, tzArg] = node.args
-    if (patternArg?.kind !== 'literal' || tzArg?.kind !== 'literal') continue
+    const [, patternArg, tzArg, namesArg] = node.args
+    if (!patternArg || tzArg?.kind !== 'literal') continue
+    const localeText = ctx.getJS(call.arguments[0])
+    const patternJs = foldedArgToClientJs(patternArg, localeText)
+    if (patternJs === null) continue
+    // The names table (#2334) — omitted from the client call when empty
+    // (the client function defaults to []).
+    let namesJs: string | null = null
+    if (namesArg && !(namesArg.kind === 'array-literal' && namesArg.elements.length === 0)) {
+      namesJs = foldedArgToClientJs(namesArg, localeText)
+      if (namesJs === null) continue
+    }
     const receiverText = ctx.getJS(propAccess.expression)
     const matchText = ctx.getJS(call)
     // Unlike `lowerDateCalls`' zero-arg needle, this call text CONTAINS
@@ -473,7 +483,8 @@ function lowerToLocaleDateCalls(text: string, expr: ts.Node, ctx: TransformConte
     result = replaceProtectedCall(
       result,
       matchText,
-      () => `formatDate(${receiverText}, ${JSON.stringify(patternArg.value)}, ${JSON.stringify(tzArg.value)})`,
+      () =>
+        `formatDate(${receiverText}, ${patternJs}, ${JSON.stringify(tzArg.value)}${namesJs !== null ? `, ${namesJs}` : ''})`,
     )
   }
   return restore(result)