@barefootjs/jsx 0.23.0 → 0.25.0

package/src/analyzer.ts

@@ -7,7 +7,7 @@
  */
 
 import ts from 'typescript'
-import type { ImportSpecifier, TypeInfo, ParamInfo, ReactiveFactoryInfo, DeclinedReactiveFactory, SourceLocation } from './types.ts'
+import type { ImportSpecifier, TypeInfo, ParamInfo, ReactiveFactoryInfo, DeclinedReactiveFactory, RequiredFactoryImport, FactoryRenameSite, SourceLocation } from './types.ts'
 import { parseExpression, parseBlockBodyTolerant, foldBlockToExpr } from './expression-parser.ts'
 import { rewriteBarePropRefs } from './prop-rewrite.ts'
 import { incrementCounter } from './instrumentation.ts'
@@ -23,7 +23,7 @@ import {
   isArrowComponentFunction,
   collectReactiveGetterNames,
 } from './analyzer-context.ts'
-import { createError, createWarning, ErrorCodes } from './errors.ts'
+import { createError, createWarning, ErrorCodes, type ErrorCode } from './errors.ts'
 import { baseTypeName } from './rich-type-evidence.ts'
 import { CATALOGUED_RICH_TYPE_NAMES } from './date-lowering.ts'
 import path from 'node:path'
@@ -3945,18 +3945,158 @@ function prescanReactiveFactoriesInSource(
   return result
 }
 
+/**
+ * #2332 — portable component-relative import specifier for a resolved
+ * absolute helper-import target. Same `'.'`/`'./'` prefix convention as the
+ * CLI's buildRelativeImportRewriter (packages/cli/src/lib/build.ts); strips
+ * the resolved extension to match the codebase's extensionless-import
+ * style. Unlike `buildRelativeImportRewriter`, this normalizes
+ * `path.relative`'s separators to POSIX (`/`) — a backslash-separated
+ * specifier is not valid ESM syntax, so on win32 `path.relative`'s native
+ * output would inject a broken import rather than merely an unconventional
+ * one (Copilot review, PR #2338).
+ */
+function toComponentRelativeSpecifier(resolvedAbs: string, componentFilePath: string): string {
+  let rel = path.relative(path.dirname(componentFilePath), resolvedAbs).split(path.sep).join('/')
+  rel = rel.replace(/\.(tsx|ts|jsx|js)$/, '')
+  if (rel === '') rel = '.'
+  if (!rel.startsWith('.')) rel = './' + rel
+  return rel
+}
+
+/**
+ * localName -> identity of what the entry file's own top-level named value
+ * imports bind, for the satisfied-import dedupe check (#2332): if the
+ * component file already imports the exact binding a factory needs to
+ * re-provision, injecting it again would be a duplicate declaration rather
+ * than a shadow, so that case is skipped instead of injected. `targetKey` is
+ * the resolved absolute path for relative sources (or `unresolved:<source>`
+ * when probing fails) and the raw specifier for bare sources.
+ */
+function buildEntryImportIndex(
+  sf: ts.SourceFile,
+  filePath: string
+): Map<string, { targetKey: string; exportedName: string }> {
+  const index = new Map<string, { targetKey: string; exportedName: string }>()
+  for (const stmt of sf.statements) {
+    if (!ts.isImportDeclaration(stmt)) continue
+    if (!ts.isStringLiteral(stmt.moduleSpecifier)) continue
+    if (stmt.importClause?.isTypeOnly) continue
+    const src = stmt.moduleSpecifier.text
+    const targetKey = src.startsWith('./') || src.startsWith('../')
+      ? (resolveRelativeImportToFile(src, filePath) ?? 'unresolved:' + src)
+      : src
+    const namedBindings = stmt.importClause?.namedBindings
+    if (namedBindings && ts.isNamedImports(namedBindings)) {
+      for (const el of namedBindings.elements) {
+        if (el.isTypeOnly) continue
+        index.set(el.name.text, { targetKey, exportedName: (el.propertyName ?? el.name).text })
+      }
+    }
+  }
+  return index
+}
+
+/**
+ * Every value-binding name anywhere in the entry file (imports, variable
+ * declarations at any depth, function/class/enum names, function
+ * parameters) — used by the #2332 re-provisioned-import collision check
+ * (BF113). Deliberately over-broad: the inlined factory body lands INSIDE a
+ * component function, where any nested binding (params, destructures,
+ * locals) would silently shadow a top-level import injected by this round.
+ * A scan limited to top-level bindings would miss that, so any hit anywhere
+ * in the file declines re-provisioning with a loud BF113 rather than
+ * risking a silent shadow — matching `moduleCaptureCheck`'s stated failure-
+ * direction philosophy (loud build error over silent runtime break).
+ */
+function collectEntryBindingNames(sf: ts.SourceFile): Set<string> {
+  const names = new Set<string>()
+  function visit(node: ts.Node): void {
+    if (ts.isImportDeclaration(node) && node.importClause) {
+      if (node.importClause.name) names.add(node.importClause.name.text)
+      const namedBindings = node.importClause.namedBindings
+      if (namedBindings && ts.isNamedImports(namedBindings)) {
+        // Type-only specifiers still occupy the identifier at the TS level.
+        for (const el of namedBindings.elements) names.add(el.name.text)
+      }
+      if (namedBindings && ts.isNamespaceImport(namedBindings)) {
+        names.add(namedBindings.name.text)
+      }
+    }
+    if (ts.isVariableDeclaration(node)) {
+      const out: string[] = []
+      addBindingNames(node.name, out)
+      for (const n of out) names.add(n)
+    }
+    if (
+      (ts.isFunctionDeclaration(node) || ts.isClassDeclaration(node) || ts.isEnumDeclaration(node)) &&
+      node.name
+    ) {
+      names.add(node.name.text)
+    }
+    if (ts.isFunctionLike(node)) {
+      for (const p of node.parameters) {
+        const out: string[] = []
+        addBindingNames(p.name, out)
+        for (const n of out) names.add(n)
+      }
+    }
+    ts.forEachChild(node, visit)
+  }
+  visit(sf)
+  return names
+}
+
+// One `export ... from` hop is followed when resolving a re-exported name
+// (#2341 BUG-2) — a visited-set guards against cycles regardless, so
+// raising this later is safe without further changes.
+const MAX_REEXPORT_HOPS = 1
+
+/** A helper file's export surface, cached per absolute path for the
+ *  lifetime of one `prescanImportedReactiveFactories` call (#2341 BUG-2). */
+interface HelperFileInfo {
+  sf: ts.SourceFile
+  /** Module-scope function declarations exported under their external name
+   *  (own `export function`, or a local `export { f as g }`). */
+  exportedFns: Map<string, ts.FunctionDeclaration>
+  /** `export { a as b } from 'src'` re-exports, keyed by the EXTERNAL name
+   *  `b` — a barrel file's whole reason for existing (#2341 BUG-2). */
+  reexports: Map<string, { source: string; innerName: string }>
+  /** Any `export * from '...'` in this file — a named lookup that misses
+   *  `exportedFns`/`reexports` might still resolve through one of these, so
+   *  it can never be classified `'clean'`. (`export * as ns from` is a
+   *  `NamespaceExport` clause and is excluded: a named lookup can never
+   *  come through it.) */
+  hasStarReexport: boolean
+  moduleBindings: HelperModuleBindings
+}
+/** `'clean'` = read, parsed (or gate-skipped), and proven to define no
+ *  reactive factory under any name reachable from it. `null` = unreadable. */
+type LoadedHelper = HelperFileInfo | 'clean' | null
+type ExportLookup =
+  | { kind: 'fn'; fn: ts.FunctionDeclaration; file: HelperFileInfo; definingPath: string }
+  | { kind: 'clean' } // proven non-reactive under this name → cleanFactoryImports
+  | { kind: 'unknown' } // cannot prove → leave unclassified so the BF110 name heuristic still fires
+
 /**
  * Cross-file half of the factory prescan (#2325 round 2): resolve factories
  * defined in a relative-imported helper file so `const { count } =
  * createCounter(0)` inlines the same way whether `createCounter` lives in
- * this file or in `./hooks`. Mutates `result`'s maps in place.
+ * this file or in `./hooks`. Follows one `export ... from` hop so a barrel
+ * `index.ts` re-exporting the real helper resolves to the file that
+ * actually DEFINES it (#2341 BUG-2) — every classification (factory /
+ * declined / reactive-shaped / clean) and every downstream anchor (module-
+ * capture check, helper-import re-provisioning, `sourceFilePath`) is keyed
+ * off that defining file, never the barrel. Mutates `result`'s maps in
+ * place.
  *
  * Perf: gated on a candidate-callee set collected from the ALREADY-parsed
  * entry AST (no regex over source text, per CONTRIBUTING.md's "never parse
  * imports with regex" rule) — files with no tuple/object-destructured call
  * at all skip every filesystem access below. A second cheap gate (does the
- * helper file's raw text contain any `REACTIVE_PRIMITIVES` substring) skips
- * the AST parse of helper files that plainly aren't reactive; this is a
+ * helper file's raw text contain any `REACTIVE_PRIMITIVES` substring, or
+ * any `export ... from` re-export text) skips the AST parse of helper files
+ * that plainly define no factory and re-export nothing; this is a
  * skip-gate over content, not an import parse, so it doesn't run afoul of
  * that same rule.
  *
@@ -4020,45 +4160,49 @@ function prescanImportedReactiveFactories(
   }
   if (importsToCheck.length === 0) return
 
-  for (const { src, specs } of importsToCheck) {
-    const resolved = resolveRelativeImportToFile(src, filePath)
-    // Unresolvable — left alone here; the name-heuristic BF110 branch in
-    // validateReactiveFactoryCalls handles it at validation time.
-    if (!resolved) continue
+  // #2332 — computed once per entry file, shared across all helper files.
+  const entryBindingNames = collectEntryBindingNames(entrySourceFile)
+  const entryImportIndex = buildEntryImportIndex(entrySourceFile, filePath)
+  // localName -> planned injection identity; a later factory requiring the
+  // same name from a DIFFERENT (targetKey, exportedName) is a collision.
+  const plannedInjections = new Map<string, { targetKey: string; exportedName: string }>()
+
+  // #2341 BUG-2 — one read+parse per helper file per entry file, memoized
+  // across every spec/hop that touches it (a barrel is typically visited
+  // once per re-exported name it satisfies).
+  const helperCache = new Map<string, LoadedHelper>()
+
+  function loadHelperFile(abs: string): LoadedHelper {
+    const cached = helperCache.get(abs)
+    if (cached !== undefined) return cached
 
     let content: string
     try {
-      content = fs.readFileSync(resolved, 'utf8')
+      content = fs.readFileSync(abs, 'utf8')
     } catch {
-      continue
+      helperCache.set(abs, null)
+      return null
     }
 
-    const alreadyKnown = (name: string): boolean =>
-      result.factories.has(name) || result.declined.has(name) || result.reactiveShaped.has(name)
-
     // Cheap text-level skip-gate (not an import/JS parse — see docstring):
-    // a helper file with no reactive-primitive substring anywhere cannot
-    // define a reactive factory, so skip parsing it entirely.
+    // a file with no reactive-primitive substring AND no re-export gate
+    // text (`export` ... `from`) can neither define a reactive factory nor
+    // re-export one, so skip parsing it entirely. Substring checks only —
+    // false positives merely cause an AST parse whose outcome is still
+    // correct, they never cause a false 'clean'.
     const hasAnyPrimitiveText = [...REACTIVE_PRIMITIVES].some(p => content.includes(p))
-    if (!hasAnyPrimitiveText) {
-      for (const spec of specs) {
-        if (!alreadyKnown(spec.local)) result.cleanFactoryImports.add(spec.local)
-      }
-      continue
+    const hasReexportText = content.includes('export') && content.includes('from')
+    if (!hasAnyPrimitiveText && !hasReexportText) {
+      helperCache.set(abs, 'clean')
+      return 'clean'
     }
 
-    const helperSf = ts.createSourceFile(
-      resolved + '.prescan',
-      content,
-      ts.ScriptTarget.Latest,
-      true,
-      ts.ScriptKind.TSX
-    )
+    const sf = ts.createSourceFile(abs + '.prescan', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX)
 
     // Map exported name -> module-scope FunctionDeclaration via the AST.
     const localFns = new Map<string, ts.FunctionDeclaration>()
     const exportedFns = new Map<string, ts.FunctionDeclaration>()
-    for (const stmt of helperSf.statements) {
+    for (const stmt of sf.statements) {
       if (ts.isFunctionDeclaration(stmt) && stmt.name && stmt.body) {
         localFns.set(stmt.name.text, stmt)
         const hasExportModifier = stmt.modifiers?.some(m => m.kind === ts.SyntaxKind.ExportKeyword) ?? false
@@ -4068,20 +4212,37 @@ function prescanImportedReactiveFactories(
         }
       }
     }
-    // `export { f }` / `export { f as g }` — keyed by the EXTERNAL export name.
-    for (const stmt of helperSf.statements) {
-      if (
-        ts.isExportDeclaration(stmt) &&
-        stmt.exportClause &&
-        ts.isNamedExports(stmt.exportClause) &&
-        !stmt.moduleSpecifier &&
-        !stmt.isTypeOnly
-      ) {
+
+    const reexports = new Map<string, { source: string; innerName: string }>()
+    let hasStarReexport = false
+    for (const stmt of sf.statements) {
+      if (!ts.isExportDeclaration(stmt) || stmt.isTypeOnly) continue
+      if (!stmt.moduleSpecifier) {
+        // `export { f }` / `export { f as g }` — keyed by the EXTERNAL export name.
+        if (stmt.exportClause && ts.isNamedExports(stmt.exportClause)) {
+          for (const el of stmt.exportClause.elements) {
+            if (el.isTypeOnly) continue
+            const fn = localFns.get((el.propertyName ?? el.name).text)
+            if (fn) exportedFns.set(el.name.text, fn)
+          }
+        }
+        continue
+      }
+      if (!ts.isStringLiteral(stmt.moduleSpecifier)) continue
+      if (stmt.exportClause && ts.isNamedExports(stmt.exportClause)) {
+        // `export { a as b } from 'src'` — keyed by the EXTERNAL name `b`.
         for (const el of stmt.exportClause.elements) {
           if (el.isTypeOnly) continue
-          const fn = localFns.get((el.propertyName ?? el.name).text)
-          if (fn) exportedFns.set(el.name.text, fn)
+          reexports.set(el.name.text, {
+            source: stmt.moduleSpecifier.text,
+            innerName: (el.propertyName ?? el.name).text,
+          })
         }
+      } else if (!stmt.exportClause) {
+        // `export * from 'src'`. (`export * as ns from` carries a
+        // NamespaceExport clause here, not `undefined` — excluded on
+        // purpose: a named lookup can never come through it.)
+        hasStarReexport = true
       }
     }
 
@@ -4089,17 +4250,77 @@ function prescanImportedReactiveFactories(
     // body must not reference any of these (#2325 §4h / BF112), since
     // inlining moves the body into the component file where they don't
     // exist.
-    const moduleBindings = collectHelperModuleValueBindings(helperSf)
+    const moduleBindings = collectHelperModuleValueBindings(sf)
+
+    const info: HelperFileInfo = { sf, exportedFns, reexports, hasStarReexport, moduleBindings }
+    helperCache.set(abs, info)
+    return info
+  }
+
+  /**
+   * Resolve `exportedName` from the file at `abs`, following one
+   * `export ... from` hop through a barrel re-export (#2341 BUG-2).
+   * `visited` guards against self/indirect barrel cycles.
+   */
+  function lookupExportedFactory(
+    abs: string,
+    exportedName: string,
+    visited: Set<string>,
+    hopsLeft: number
+  ): ExportLookup {
+    if (visited.has(abs)) return { kind: 'unknown' }
+    visited.add(abs)
+
+    const file = loadHelperFile(abs)
+    if (file === null) return { kind: 'unknown' }
+    if (file === 'clean') return { kind: 'clean' }
+
+    const fn = file.exportedFns.get(exportedName)
+    if (fn) return { kind: 'fn', fn, file, definingPath: abs }
+
+    const re = file.reexports.get(exportedName)
+    if (re) {
+      if (hopsLeft <= 0) return { kind: 'unknown' }
+      // Non-relative re-export specifiers (`export { x } from 'pkg'`)
+      // resolve through bundler/tsconfig-paths configuration this layer
+      // doesn't consume — same restriction as direct imports.
+      if (!re.source.startsWith('./') && !re.source.startsWith('../')) return { kind: 'unknown' }
+      const target = resolveRelativeImportToFile(re.source, abs)
+      if (!target) return { kind: 'unknown' } // unresolvable re-export target: never mark clean
+      return lookupExportedFactory(target, re.innerName, visited, hopsLeft - 1)
+    }
+
+    // `export * from` might still reach this name through a file this
+    // layer doesn't enumerate — never clean. Otherwise the file was fully
+    // inspected and genuinely doesn't define or re-export this name.
+    if (file.hasStarReexport) return { kind: 'unknown' }
+    return { kind: 'clean' }
+  }
+
+  for (const { src, specs } of importsToCheck) {
+    const resolved = resolveRelativeImportToFile(src, filePath)
+    // Unresolvable — left alone here; the name-heuristic BF110 branch in
+    // validateReactiveFactoryCalls handles it at validation time.
+    if (!resolved) continue
+
+    const alreadyKnown = (name: string): boolean =>
+      result.factories.has(name) || result.declined.has(name) || result.reactiveShaped.has(name)
 
     for (const spec of specs) {
       if (alreadyKnown(spec.local)) continue
 
-      const fn = exportedFns.get(spec.exported)
-      if (!fn) {
+      const found = lookupExportedFactory(resolved, spec.exported, new Set<string>(), MAX_REEXPORT_HOPS)
+      if (found.kind === 'clean') {
         result.cleanFactoryImports.add(spec.local)
         continue
       }
-      const det = detectReactiveFactory(fn, helperSf, resolved)
+      if (found.kind === 'unknown') continue
+
+      const { fn, file, definingPath } = found
+      const helperSf = file.sf
+      const moduleBindings = file.moduleBindings
+
+      const det = detectReactiveFactory(fn, helperSf, definingPath)
       if (!det) {
         result.cleanFactoryImports.add(spec.local)
         continue
@@ -4112,17 +4333,88 @@ function prescanImportedReactiveFactories(
           result.declined.set(spec.local, det.declined)
           break
         case 'factory': {
-          const offending = moduleCaptureCheck(fn, det.info, moduleBindings, fn.name!.text)
-          if (offending.length > 0) {
+          // Module-capture check is anchored to the DEFINING file's own
+          // module bindings, not the barrel's (#2341 BUG-2) — the barrel
+          // itself contributes no bindings the inlined body could reference.
+          const capture = moduleCaptureCheck(fn, det.info, moduleBindings, fn.name!.text)
+          if (capture.captured.length > 0) {
             result.declined.set(spec.local, {
               code: 'BF112',
-              detail: `'${offending.join("', '")}'`,
+              detail: `'${capture.captured.join("', '")}'`,
               loc: det.info.loc,
             })
-          } else {
-            det.info.sourceFilePath = resolved
-            result.factories.set(spec.local, det.info)
+            break
+          }
+          // #2332 — re-provision the helper file's own named value imports
+          // that the factory body references, instead of declining. Each
+          // ref resolves to a component-relative specifier (or passes
+          // through unchanged for bare/npm specifiers); a ref already
+          // satisfied by an identical top-level import in the component
+          // file is dropped rather than injected (would redeclare it). A
+          // ref whose local name collides with a DIFFERENT existing/planned
+          // binding declines with BF113 — `pending` is only merged into
+          // `plannedInjections` on full factory success (§3.4), so a
+          // factory that declines mid-loop reserves nothing.
+          const required: RequiredFactoryImport[] = []
+          const pending: Array<[string, { targetKey: string; exportedName: string }]> = []
+          let declinedEntry: DeclinedReactiveFactory | null = null
+          for (const ref of capture.importedRefs) {
+            let specifier: string
+            let targetKey: string
+            if (ref.source.startsWith('./') || ref.source.startsWith('../')) {
+              // Resolve from the DEFINING file's directory (#2341 BUG-2 —
+              // `definingPath` is the file that actually declares this
+              // import, which may differ from the barrel that was
+              // imported). Unresolvable → same posture as a local
+              // capture: nothing importable to re-provision (BF112).
+              const abs = resolveRelativeImportToFile(ref.source, definingPath)
+              if (!abs) {
+                declinedEntry = {
+                  code: 'BF112',
+                  detail: `'${ref.localName}' (import '${ref.source}' did not resolve from the helper file)`,
+                  loc: det.info.loc,
+                }
+                break
+              }
+              specifier = toComponentRelativeSpecifier(abs, filePath)
+              targetKey = abs
+            } else {
+              specifier = ref.source // bare/npm specifier — unchanged (#2332 test 2)
+              targetKey = ref.source
+            }
+            // Already satisfied by an identical top-level import in the
+            // component file — injecting again would redeclare the binding.
+            const existing = entryImportIndex.get(ref.localName)
+            if (existing && existing.targetKey === targetKey && existing.exportedName === ref.exportedName) {
+              continue
+            }
+            const planned = plannedInjections.get(ref.localName)
+            const collides =
+              (existing !== undefined) ||
+              (planned !== undefined && (planned.targetKey !== targetKey || planned.exportedName !== ref.exportedName)) ||
+              (planned === undefined && entryBindingNames.has(ref.localName))
+            if (collides) {
+              declinedEntry = {
+                code: 'BF113',
+                detail: `'${ref.localName}' from '${specifier}'`,
+                loc: det.info.loc,
+              }
+              break
+            }
+            pending.push([ref.localName, { targetKey, exportedName: ref.exportedName }])
+            required.push({ localName: ref.localName, exportedName: ref.exportedName, specifier })
+          }
+          if (declinedEntry) {
+            result.declined.set(spec.local, declinedEntry)
+            break
           }
+          for (const [name, id] of pending) plannedInjections.set(name, id)
+          // #2341 BUG-2 — anchored to the file that actually defines the
+          // factory, not the (possibly barrel) import path the component
+          // used to reach it.
+          det.info.sourceFilePath = definingPath
+          if (required.length > 0) det.info.requiredImports = required
+          result.factories.set(spec.local, det.info)
           break
         }
       }
@@ -4131,34 +4423,56 @@ function prescanImportedReactiveFactories(
 }
 
 /**
- * Value bindings at the helper file's module scope that an inlined factory
- * body must not capture (#2325 §4h / BF112): top-level const/let/var,
- * function/class/enum names, and value import specifiers — EXCEPT imports
- * from '@barefootjs/client' / '@barefootjs/client/runtime'. Those are
- * re-provisioned from usage by the client-JS emitter regardless of where
- * the call that used them textually came from (`resolveFinalImports` /
- * `detectUsedImports` regex-scan the *generated* code, not the consumer's
- * source imports — see #2325 spec C1), so an inlined body calling
- * `createSignal` is never a capture even though the helper file itself
- * imports it. Type-only imports/declarations carry no runtime binding and
- * are excluded.
+ * Value bindings at the helper file's module scope, split by whether they
+ * have a re-importable module of their own (#2332).
+ *
+ * `local` bindings — top-level const/let/var, function/class/enum names,
+ * plus default-import and namespace-import names — have no module a
+ * component file could re-import them from, so an inlined factory body
+ * referencing one unconditionally declines with BF112 (#2325 §4h): moving
+ * the body into the component file would leave a dangling reference.
+ *
+ * `imported` bindings — the helper file's own named value imports — CAN be
+ * re-provisioned: the component file can import the same binding under the
+ * same specifier (#2332). These are collected here (keyed by the helper
+ * file's local name) but are NOT captures; `moduleCaptureCheck` below
+ * reports them separately from `local` hits so the caller can decide
+ * whether to re-import rather than unconditionally decline.
+ *
+ * EXCEPT in both cases: imports from '@barefootjs/client' /
+ * '@barefootjs/client/runtime'. Those are re-provisioned from usage by the
+ * client-JS emitter regardless of where the call that used them textually
+ * came from (`resolveFinalImports` / `detectUsedImports` regex-scan the
+ * *generated* code, not the consumer's source imports — see #2325 spec C1),
+ * so an inlined body calling `createSignal` is never a capture even though
+ * the helper file itself imports it. Type-only imports/declarations carry
+ * no runtime binding and are excluded.
  */
-function collectHelperModuleValueBindings(sf: ts.SourceFile): Set<string> {
-  const names = new Set<string>()
+interface HelperModuleBindings {
+  /** Declared directly in the helper file — unconditional BF112 capture. */
+  local: Set<string>
+  /** Named value-import specifiers, keyed by helper-file local name —
+   *  re-provisionable into the component file (#2332). */
+  imported: Map<string, { source: string; exportedName: string }>
+}
+
+function collectHelperModuleValueBindings(sf: ts.SourceFile): HelperModuleBindings {
+  const local = new Set<string>()
+  const imported = new Map<string, { source: string; exportedName: string }>()
   for (const stmt of sf.statements) {
     if (ts.isVariableStatement(stmt)) {
       const out: string[] = []
       for (const decl of stmt.declarationList.declarations) {
         addBindingNames(decl.name, out)
       }
-      for (const n of out) names.add(n)
+      for (const n of out) local.add(n)
       continue
     }
     if (
       (ts.isFunctionDeclaration(stmt) || ts.isClassDeclaration(stmt) || ts.isEnumDeclaration(stmt)) &&
       stmt.name
     ) {
-      names.add(stmt.name.text)
+      local.add(stmt.name.text)
       continue
     }
     if (ts.isImportDeclaration(stmt)) {
@@ -4166,42 +4480,62 @@ function collectHelperModuleValueBindings(sf: ts.SourceFile): Set<string> {
       if (!ts.isStringLiteral(stmt.moduleSpecifier)) continue
       const src = stmt.moduleSpecifier.text
       if (src === '@barefootjs/client' || src === '@barefootjs/client/runtime') continue
-      if (stmt.importClause?.name) names.add(stmt.importClause.name.text)
+      // Default/namespace imports stay hard BF112 (#2332 scope decision):
+      // no single named export to re-provision under one local name.
+      if (stmt.importClause?.name) local.add(stmt.importClause.name.text)
       const namedBindings = stmt.importClause?.namedBindings
       if (namedBindings && ts.isNamedImports(namedBindings)) {
         for (const el of namedBindings.elements) {
           if (el.isTypeOnly) continue
-          names.add(el.name.text)
+          imported.set(el.name.text, { source: src, exportedName: (el.propertyName ?? el.name).text })
         }
       }
       if (namedBindings && ts.isNamespaceImport(namedBindings)) {
-        names.add(namedBindings.name.text)
+        local.add(namedBindings.name.text)
       }
     }
   }
-  return names
+  return { local, imported }
+}
+
+/**
+ * Categorized free-identifier references of a reactive-factory body into
+ * its own module scope (#2332): `captured` are unconditional BF112 hits
+ * (helper-local bindings — the body would dangle if inlined verbatim);
+ * `importedRefs` are references to the helper file's own named value
+ * imports, which the caller may re-provision into the component file
+ * instead of declining (§3.4 in the #2332 spec).
+ */
+interface ModuleCaptureResult {
+  /** Free refs resolving to helper-local bindings (BF112), sorted. */
+  captured: string[]
+  /** Free refs resolving to the helper's own named value imports, sorted by localName. */
+  importedRefs: Array<{ localName: string; source: string; exportedName: string }>
 }
 
 /**
  * Free identifiers of a reactive-factory body that resolve to bindings at
- * its own module scope (#2325 §4h / BF112) — references the inlined body
- * would silently lose once spliced into the component file. Returns the
- * offending names sorted, for stable diagnostic text.
+ * its own module scope (#2325 §4h / BF112, #2332) — references the inlined
+ * body would silently lose once spliced into the component file, unless
+ * re-provisioned as an import. Returns `captured` (unconditional BF112) and
+ * `importedRefs` (re-provisionable) separately, each sorted for stable
+ * diagnostic/injection text.
  *
  * Known accepted limitation: `extractFreeIdentifiersFromNode` only scope-
  * tracks arrow-function parameters, not nested `function` declarations'
  * parameters or nested-block declarations — a body-nested binding that
  * happens to shadow a helper-module binding could false-positive into
- * BF112. Acceptable: the failure direction is a loud build error on a rare
- * shape, never a silent runtime break.
+ * BF112 or `importedRefs`. Acceptable: the failure direction is always a
+ * loud build error (BF112/BF113) or a redundant-but-harmless injected
+ * import, never a silent dangling reference.
  */
 function moduleCaptureCheck(
   fn: ts.FunctionDeclaration,
   info: ReactiveFactoryInfo,
-  moduleBindings: Set<string>,
+  moduleBindings: HelperModuleBindings,
   selfName: string
-): string[] {
-  if (!fn.body) return []
+): ModuleCaptureResult {
+  if (!fn.body) return { captured: [], importedRefs: [] }
   const free = extractFreeIdentifiersFromNode(fn.body)
   const exclude = new Set<string>(info.params)
   for (const b of info.localBindings) exclude.add(b)
@@ -4209,12 +4543,20 @@ function moduleCaptureCheck(
   for (const p of REACTIVE_PRIMITIVES) exclude.add(p)
   exclude.add(selfName)
 
-  const offending: string[] = []
+  const captured: string[] = []
+  const importedRefs: ModuleCaptureResult['importedRefs'] = []
   for (const id of free) {
     if (exclude.has(id)) continue
-    if (moduleBindings.has(id)) offending.push(id)
+    if (moduleBindings.local.has(id)) {
+      captured.push(id)
+      continue
+    }
+    const imp = moduleBindings.imported.get(id)
+    if (imp) importedRefs.push({ localName: id, source: imp.source, exportedName: imp.exportedName })
   }
-  return offending.sort()
+  captured.sort()
+  importedRefs.sort((a, b) => (a.localName < b.localName ? -1 : 1))
+  return { captured, importedRefs }
 }
 
 /**
@@ -4256,6 +4598,27 @@ function detectReactiveFactory(
 
   const loc = getSourceLocation(node, sourceFile, filePath)
 
+  // Count `return`s ANYWHERE in the body, stopping at nested function-like
+  // boundaries (ts.isFunctionLike — functions, arrows, methods, accessors,
+  // and constructors; broader than isMultiReturnJsxFunctionBody's #932
+  // three-kind check, which only needs to catch JSX-returning callbacks and
+  // was never exercised against class/object methods) — a return inside a
+  // nested callback OR a class/object method declared in the factory body
+  // belongs to that inner scope, not this factory (Copilot review, PR
+  // #2342: the narrower check would misclassify a factory with, e.g., a
+  // helper class whose method contains a `return` as having multiple
+  // returns, declining it unnecessarily). A return nested in if/try/loop
+  // blocks DOES count, so guard-clause factories are declassified instead
+  // of splicing an early `return` into the component's init function
+  // (#2341 BUG-3).
+  let totalReturnCount = 0
+  function countReturns(n: ts.Node): void {
+    if (ts.isFunctionLike(n)) return
+    if (ts.isReturnStatement(n)) { totalReturnCount++; return }
+    ts.forEachChild(n, countReturns)
+  }
+  ts.forEachChild(node.body, countReturns)
+
   // Require exactly one top-level `return`, whose argument (after unwrapping
   // parens / `as const` / type-assertion) is a tuple (array literal) or a
   // shorthand-object literal.
@@ -4272,7 +4635,12 @@ function detectReactiveFactory(
     if (ts.isTypeAssertionExpression(expr)) expr = expr.expression
     returnExpr = expr
   }
-  if (returnCount !== 1 || !returnExpr) return { kind: 'reactive-shaped' }
+  // `totalReturnCount === 1 && returnCount === 1` jointly guarantee the
+  // single return is a direct child of `node.body` (top-level returns are a
+  // subset of total) — so a guard-clause / try-catch / loop return
+  // declassifies the factory instead of silently producing an inert
+  // component (#2341 BUG-3).
+  if (totalReturnCount !== 1 || returnCount !== 1 || !returnExpr) return { kind: 'reactive-shaped' }
 
   const returnTupleIdentifiers: string[] = []
   let returnKind: 'tuple' | 'object'
@@ -4308,6 +4676,22 @@ function detectReactiveFactory(
     return { kind: 'reactive-shaped' }
   }
 
+  // Collect parameter names first — the rename-site walk below needs them
+  // as part of `relevantNames` and to detect param-shadowing declarations
+  // (BF114). Hoisted above local-binding/body-serialization collection
+  // (#2341 BUG-1); it has no dependency on either.
+  const params: string[] = []
+  for (const p of node.parameters) {
+    if (ts.isIdentifier(p.name)) {
+      params.push(p.name.text)
+      continue
+    }
+    // Destructured params are uncommon for this helper shape and out of
+    // initial scope; the factory still wraps a reactive primitive, so
+    // classify it as reactive-shaped rather than silently ignoring it.
+    return { kind: 'reactive-shaped' }
+  }
+
   // Collect local bindings in the factory body for identifier hygiene at
   // inlining time. Only direct-child declarations of the block are
   // considered — good enough for the typical helper shape.
@@ -4322,24 +4706,146 @@ function detectReactiveFactory(
     }
   }
 
+  // Names that call-site inlining may rename: params (substituted with
+  // arbitrary argument expressions), local bindings (suffix-renamed for
+  // per-call-site hygiene), and return identifiers (renamed to the
+  // caller's destructure names). Every other identifier in the body is
+  // left untouched — the #2341 BUG-1 fix for the old whole-body regex
+  // renames, which corrupted string/template literals, property keys,
+  // and `.prop` tails that merely happened to share a relevant name.
+  const relevantNames = new Set<string>([...params, ...localBindings, ...returnTupleIdentifiers])
+
+  const renameSites: FactoryRenameSite[] = []
+  let shadowedParam: string | null = null
+
+  /**
+   * Recursive AST walk collecting rename sites for one kept statement.
+   * `toBodyOffset` converts a position in `sourceFile` (this statement's
+   * original source) to an offset in the final joined `bodyStatements`
+   * string — see the join loop below for why this must stay a pure
+   * function of `stmtStart`/`base`.
+   */
+  function collectRenameSites(root: ts.Node, toBodyOffset: (pos: number) => number): void {
+    function push(id: ts.Identifier, form: 'plain' | 'shorthand'): void {
+      renameSites.push({
+        name: id.text,
+        start: toBodyOffset(id.getStart(sourceFile)),
+        end: toBodyOffset(id.getEnd()),
+        form,
+      })
+    }
+
+    function classify(id: ts.Identifier): void {
+      if (!relevantNames.has(id.text)) return
+      const p = id.parent
+      // Pure-key / non-reference positions — never rename:
+      if (ts.isPropertyAccessExpression(p) && p.name === id) return        // obj.name tail (incl. ?. chains)
+      if (ts.isPropertyAssignment(p) && p.name === id) return              // { name: v } key
+      if (ts.isBindingElement(p) && p.propertyName === id) return          // { name: local } pattern key
+      if ((ts.isMethodDeclaration(p) || ts.isGetAccessorDeclaration(p) ||
+           ts.isSetAccessorDeclaration(p) || ts.isPropertyDeclaration(p) ||
+           ts.isEnumMember(p)) && p.name === id) return                    // member keys
+      if (ts.isJsxAttribute(p) && p.name === id) return                    // JSX attr name
+      if ((ts.isLabeledStatement(p) && p.label === id) ||
+          ((ts.isBreakStatement(p) || ts.isContinueStatement(p)) && p.label === id)) return
+      if ((ts.isJsxOpeningElement(p) || ts.isJsxSelfClosingElement(p) || ts.isJsxClosingElement(p)) &&
+          p.tagName === id && /^[a-z]/.test(id.text)) return               // intrinsic tag <div>
+
+      // Shorthand dual-role positions → expansion form (renaming must
+      // preserve the implied key): `{ name }` object literal / pattern.
+      if (ts.isShorthandPropertyAssignment(p) && p.name === id) { push(id, 'shorthand'); return }
+      if (ts.isBindingElement(p) && p.name === id && !p.propertyName &&
+          ts.isObjectBindingPattern(p.parent)) {
+        // ArrayBindingPattern trap: a tuple destructure element
+        // (`const [a, b] = ...`) ALSO has propertyName === undefined —
+        // the ts.isObjectBindingPattern(p.parent) check above is what
+        // keeps tuple elements out of the shorthand-expansion path.
+        if (params.includes(id.text)) shadowedParam = id.text            // decl of a param name → BF114
+        push(id, 'shorthand')
+        return
+      }
+
+      // Declaration-name positions → plain rename, but a param name
+      // re-declared here is a shadow: params are substituted with
+      // arbitrary argument expressions, so a shadowing declaration would
+      // receive an invalid left-hand side (BF114 declines instead).
+      const isDecl =
+        (ts.isVariableDeclaration(p) || ts.isParameter(p) || ts.isBindingElement(p) ||
+         ts.isFunctionDeclaration(p) || ts.isFunctionExpression(p) ||
+         ts.isClassDeclaration(p) || ts.isClassExpression(p)) && p.name === id
+      if (isDecl && params.includes(id.text)) shadowedParam = id.text
+
+      push(id, 'plain')                                                   // genuine value reference or decl
+    }
+
+    function visit(n: ts.Node): void {
+      // Never descend into type-land: annotations are stripped downstream,
+      // and splicing an argument EXPRESSION into a type position would be
+      // invalid JS.
+      if (ts.isTypeNode(n) || ts.isTypeParameterDeclaration(n) ||
+          ts.isTypeAliasDeclaration(n) || ts.isInterfaceDeclaration(n)) return
+      if (ts.isIdentifier(n)) { classify(n); return }                      // identifiers have no relevant children
+      ts.forEachChild(n, visit)
+    }
+
+    visit(root)
+  }
+
   // Serialize the body without the outer braces and without the return
   // statement — the return tuple/object is dissolved into caller-named
-  // identifiers.
-  const bodyStatements = node.body.statements
-    .filter(s => !ts.isReturnStatement(s))
-    .map(s => s.getText(sourceFile))
-    .join('\n')
+  // identifiers. `renameSites` is collected in this SAME loop so its
+  // offsets (relative to the joined `bodyStatements` string) can never
+  // drift from the join logic — this invariant is the single most fragile
+  // part of the rename mechanism (#2341 BUG-1): site collection and
+  // `bodyStatements` construction must use the identical statement filter,
+  // identical `getText` slices, and identical '\n' join.
+  const keptStatements = node.body.statements.filter(s => !ts.isReturnStatement(s))
+  const pieces: string[] = []
+  let base = 0
+  for (const stmt of keptStatements) {
+    const text = stmt.getText(sourceFile)
+    const stmtStart = stmt.getStart(sourceFile)
+    collectRenameSites(stmt, (pos) => pos - stmtStart + base)
+    pieces.push(text)
+    base += text.length + 1 // +1 for the '\n' join — MUST match the join below
+  }
+  const bodyStatements = pieces.join('\n')
+
+  if (shadowedParam !== null) {
+    return {
+      kind: 'declined',
+      declined: {
+        code: 'BF114',
+        detail: `parameter '${shadowedParam}' of '${node.name.text}' is shadowed by a nested declaration inside the factory body`,
+        loc,
+      },
+    }
+  }
 
-  const params: string[] = []
-  for (const p of node.parameters) {
-    if (ts.isIdentifier(p.name)) {
-      params.push(p.name.text)
-      continue
+  // Dev invariant: every collected site's [start, end) range must slice
+  // out exactly the identifier text it was collected for, or the
+  // bottom-to-top splice in inlineFactoryCallAtSite would corrupt
+  // unrelated text. Cheap (bounded by body size) — kept as a permanent
+  // guard against the offset math drifting under a future edit. Declines
+  // rather than throwing (Copilot review, PR #2342): compileJSX does not
+  // catch analyzer errors, so a thrown exception here would crash the
+  // whole compilation instead of failing one factory loudly-but-
+  // gracefully as a diagnostic — this should never trigger in practice,
+  // but the failure mode if it ever does must stay "loud decline," not
+  // "hard crash," matching this feature's whole design philosophy.
+  for (const site of renameSites) {
+    if (bodyStatements.slice(site.start, site.end) !== site.name) {
+      return {
+        kind: 'declined',
+        declined: {
+          code: 'BF111',
+          detail:
+            `internal rename-site offset mismatch for '${site.name}' — this is a compiler bug, ` +
+            `please report it`,
+          loc,
+        },
+      }
     }
-    // Destructured params are uncommon for this helper shape and out of
-    // initial scope; the factory still wraps a reactive primitive, so
-    // classify it as reactive-shaped rather than silently ignoring it.
-    return { kind: 'reactive-shaped' }
   }
 
   return {
@@ -4351,6 +4857,7 @@ function detectReactiveFactory(
       returnKind,
       localBindings,
       loc,
+      renameSites,
     },
   }
 }
@@ -4393,6 +4900,12 @@ function rewriteFactoryCallsInSource(
   type Edit = { start: number; end: number; replacement: string }
   const edits: Edit[] = []
   let callSiteIndex = 0
+  // #2332 — factories actually inlined in this walk (not merely present in
+  // `prescan.factories`; `maybeRewriteDecl` bails on arity mismatch/omitted
+  // elements/rename destructures without inlining), so their
+  // `requiredImports` can be re-provisioned without adding a dead import
+  // for a factory that was never actually spliced in.
+  const inlinedFactories = new Set<ReactiveFactoryInfo>()
 
   function visitStmt(node: ts.Node, inComponent: boolean): void {
     if (ts.isVariableStatement(node) && inComponent) {
@@ -4513,30 +5026,49 @@ function rewriteFactoryCallsInSource(
     const thisCallIndex = callSiteIndex++
     const suffix = `_bf${thisCallIndex}`
 
-    // Apply renames to the factory body source.
-    let body = factory.bodySource
-    // 1. Suffix-rename internal bindings.
-    const internalRenames = new Set<string>(factory.localBindings)
-    for (const ex of excludeFromSuffixRename) internalRenames.delete(ex)
-    for (const name of internalRenames) {
-      body = body.replace(new RegExp(`\\b${escapeRegex(name)}\\b`, 'g'), name + suffix)
+    // Merged rename map, one entry per old name → replacement text.
+    // Precedence (matches the pre-#2341 sequential-pass outcome): param
+    // substitution > return→caller rename > internal suffix rename — later
+    // `.set()` calls for the same key overwrite earlier ones below.
+    const renames = new Map<string, string>()
+    // 1. Suffix-rename internal bindings not excluded (tuple params/returns,
+    //    or object-path destructured names — see excludeFromSuffixRename's
+    //    callers).
+    for (const name of factory.localBindings) {
+      if (!excludeFromSuffixRename.has(name)) renames.set(name, name + suffix)
+    }
+    // 2. Return identifiers → caller destructure names (tuple path only).
+    if (renameReturnToCallerNames) {
+      for (const [n, caller] of renameReturnToCallerNames) {
+        if (caller !== n) renames.set(n, caller) // identity rename = no-op, skip
+      }
     }
-    // 2. Parameters → argument expressions. Atomic arguments (bare
+    // 3. Parameters → argument expressions. Atomic arguments (bare
     //    identifiers, numeric literals, string literals) are spliced
     //    directly; anything more complex is wrapped in parens to preserve
-    //    operator precedence at the splice site.
+    //    operator precedence at the splice site. Overwrites any same-name
+    //    return rename above — param substitution wins, as before #2341.
     const atomicArg = /^(?:[\w$.]+|'[^'\\]*'|"[^"\\]*"|-?\d+(?:\.\d+)?)$/
     for (let i = 0; i < factory.params.length; i++) {
       const p = factory.params[i]
-      const a = argTexts[i] ?? 'undefined'
-      const wrapped = atomicArg.test(a.trim()) ? a.trim() : `(${a})`
-      body = body.replace(new RegExp(`\\b${escapeRegex(p)}\\b`, 'g'), wrapped)
+      const a = (argTexts[i] ?? 'undefined').trim()
+      renames.set(p, atomicArg.test(a) ? a : `(${a})`)
     }
-    // 3. Return identifiers → caller destructure names (tuple path only).
-    if (renameReturnToCallerNames) {
-      for (const [n, caller] of renameReturnToCallerNames) {
-        body = body.replace(new RegExp(`\\b${escapeRegex(n)}\\b`, 'g'), caller)
-      }
+
+    // Apply the merged renames as a single bottom-to-top position splice
+    // over `bodySource`, using the sites collected once at detection time
+    // (#2341 BUG-1) — never a text search, so string/template-literal
+    // contents, property keys, `.prop` tails, and JSX intrinsic tags are
+    // never touched, and (unlike the old sequential regex passes) an
+    // argument expression already spliced in for an earlier site can never
+    // be re-scanned and corrupted by a later rename.
+    let body = factory.bodySource
+    for (let i = factory.renameSites.length - 1; i >= 0; i--) {
+      const site = factory.renameSites[i]
+      const repl = renames.get(site.name)
+      if (repl === undefined) continue
+      const text = site.form === 'shorthand' ? `${site.name}: ${repl}` : repl
+      body = body.slice(0, site.start) + text + body.slice(site.end)
     }
 
     edits.push({
@@ -4544,13 +5076,51 @@ function rewriteFactoryCallsInSource(
       end: stmt.getEnd(),
       replacement: body,
     })
+    inlinedFactories.add(factory)
   }
 
   visitStmt(sourceFile, false)
 
   if (edits.length === 0) return source
 
-  // Apply edits from bottom to top so earlier offsets stay valid.
+  // #2332 — one deduped import statement per specifier for every inlined
+  // cross-file factory's re-provisioned imports. Injected as a zero-width
+  // edit so the ordinary bottom-to-top splice below applies it; the result
+  // is indistinguishable from a hand-written import for every downstream
+  // consumer (ctx.imports → SSR templateImports AND client
+  // collectExternalImports both parse this same rewritten string).
+  const importsBySpecifier = new Map<string, Map<string, string>>() // specifier -> localName -> exportedName
+  for (const f of inlinedFactories) {
+    for (const r of f.requiredImports ?? []) {
+      let names = importsBySpecifier.get(r.specifier)
+      if (!names) { names = new Map(); importsBySpecifier.set(r.specifier, names) }
+      names.set(r.localName, r.exportedName) // same-key duplicates are identical by prescan construction
+    }
+  }
+  if (importsBySpecifier.size > 0) {
+    // Sort specifiers and, within each, named-import entries by local name —
+    // `importsBySpecifier`/`inlinedFactories` iterate in incidental AST-
+    // traversal/insertion order, which would otherwise make this generated
+    // text order-unstable across unrelated refactors (Copilot review, PR
+    // #2338).
+    const lines = [...importsBySpecifier]
+      .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))
+      .map(([spec, names]) => {
+        const specifiers = [...names]
+          .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))
+          .map(([local, exported]) => (exported === local ? local : `${exported} as ${local}`))
+        return `import { ${specifiers.join(', ')} } from '${spec}'`
+      })
+    const at = factoryImportInsertionOffset(sourceFile)
+    edits.push({ start: at, end: at, replacement: at === 0 ? lines.join('\n') + '\n' : '\n' + lines.join('\n') })
+  }
+
+  // Apply edits from bottom to top so earlier offsets stay valid. A factory
+  // with `requiredImports` is by definition imported, so the entry file has
+  // at least one import statement and `at` above lands strictly inside the
+  // import prologue — every call-site edit's start is strictly greater
+  // (separated at minimum by the statement break after the last import), so
+  // starts never tie and no sort tiebreak is needed.
   edits.sort((a, b) => b.start - a.start)
   let out = source
   for (const e of edits) {
@@ -4559,6 +5129,24 @@ function rewriteFactoryCallsInSource(
   return out
 }
 
+/**
+ * Offset just after the last top-level import (else after the 'use client'
+ * directive, else 0) in the prescan source file — where re-provisioned
+ * factory imports are injected (#2332).
+ */
+function factoryImportInsertionOffset(sf: ts.SourceFile): number {
+  let lastImportEnd = -1
+  let directiveEnd = -1
+  for (const stmt of sf.statements) {
+    if (ts.isImportDeclaration(stmt)) { lastImportEnd = stmt.getEnd(); continue }
+    if (directiveEnd === -1 && ts.isExpressionStatement(stmt) &&
+        ts.isStringLiteral(stmt.expression) && stmt.expression.text === 'use client') {
+      directiveEnd = stmt.getEnd()
+    }
+  }
+  return lastImportEnd >= 0 ? lastImportEnd : directiveEnd >= 0 ? directiveEnd : 0
+}
+
 function isPascalCaseComponentFn(node: ts.Node): boolean {
   if (ts.isFunctionDeclaration(node) && node.name) {
     return /^[A-Z]/.test(node.name.text)
@@ -4569,10 +5157,6 @@ function isPascalCaseComponentFn(node: ts.Node): boolean {
   return false
 }
 
-function escapeRegex(s: string): string {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
-
 // =============================================================================
 // BF110 diagnostic (#931)
 // =============================================================================
@@ -4580,11 +5164,12 @@ function escapeRegex(s: string): string {
 /**
  * Build the diagnostic for a call site whose callee was recognised but
  * declined for inlining (#2325 — cross-file factories that rename their
- * return properties, or capture their own module scope). BF112's wording is
- * specific to module-scope capture; every other declined reason (currently
- * only BF111 — non-shorthand return properties) shares BF111's generic
- * "cannot be inlined: <detail>" phrasing, matching the wording used for the
- * tuple call-site path.
+ * return properties or capture their own module scope; #2332 — a
+ * re-provisioned helper import collides with an existing binding). BF112
+ * and BF113's wording is specific to their respective failure; every other
+ * declined reason (currently only BF111 — non-shorthand return properties)
+ * shares BF111's generic "cannot be inlined: <detail>" phrasing, matching
+ * the wording used for the tuple call-site path.
  */
 function declinedFactoryMessage(callee: string, d: DeclinedReactiveFactory): string {
   if (d.code === 'BF112') {
@@ -4594,9 +5179,27 @@ function declinedFactoryMessage(callee: string, d: DeclinedReactiveFactory): str
       `pass them as factory arguments, or inline the factory here.`
     )
   }
+  if (d.code === 'BF113') {
+    return (
+      `Reactive factory '${callee}' cannot be inlined: it needs ${d.detail} ` +
+      `imported 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 (import { x as y }).`
+    )
+  }
   return `Reactive factory '${callee}' cannot be inlined: ${d.detail}.`
 }
 
+/** Diagnostic code for a declined reactive-factory call site (#2325 / #2332). */
+function declinedFactoryErrorCode(code: DeclinedReactiveFactory['code']): ErrorCode {
+  switch (code) {
+    case 'BF112': return ErrorCodes.REACTIVE_FACTORY_MODULE_CAPTURE
+    case 'BF113': return ErrorCodes.REACTIVE_FACTORY_IMPORT_COLLISION
+    case 'BF114': return ErrorCodes.REACTIVE_FACTORY_PARAM_SHADOWED
+    default: return ErrorCodes.REACTIVE_FACTORY_RENAME_UNSUPPORTED
+  }
+}
+
 /**
  * Scan a compiled component context for destructures (tuple or object)
  * whose callee is neither `createSignal` / `createMemo` nor an inlinable
@@ -4636,9 +5239,7 @@ export function validateReactiveFactoryCalls(ctx: AnalyzerContext): void {
         const declinedEntry = ctx.declinedReactiveFactories.get(callee)
         if (declinedEntry) {
           ctx.errors.push(createError(
-            declinedEntry.code === 'BF112'
-              ? ErrorCodes.REACTIVE_FACTORY_MODULE_CAPTURE
-              : ErrorCodes.REACTIVE_FACTORY_RENAME_UNSUPPORTED,
+            declinedFactoryErrorCode(declinedEntry.code),
             loc,
             { severity: 'error', message: declinedFactoryMessage(callee, declinedEntry) }
           ))
@@ -4696,8 +5297,8 @@ export function validateReactiveFactoryCalls(ctx: AnalyzerContext): void {
  * covers the previously-silent object-destructure failure modes: an
  * unrecognised callee, a tuple factory destructured as an object, a rename/
  * default/rest destructure of a shorthand-only factory, an unknown
- * property, a declined (BF111/BF112) factory, or an uninspectable import
- * that looks reactive-factory-shaped by name.
+ * property, a declined (BF111/BF112/BF113) factory, or an uninspectable
+ * import that looks reactive-factory-shaped by name.
  */
 function validateObjectFactoryDestructure(
   ctx: AnalyzerContext,
@@ -4759,9 +5360,7 @@ function validateObjectFactoryDestructure(
   const declinedEntry = ctx.declinedReactiveFactories.get(callee)
   if (declinedEntry) {
     ctx.errors.push(createError(
-      declinedEntry.code === 'BF112'
-        ? ErrorCodes.REACTIVE_FACTORY_MODULE_CAPTURE
-        : ErrorCodes.REACTIVE_FACTORY_RENAME_UNSUPPORTED,
+      declinedFactoryErrorCode(declinedEntry.code),
       loc,
       { severity: 'error', message: declinedFactoryMessage(callee, declinedEntry) }
     ))