@barefootjs/jsx 0.9.1 → 0.9.3

package/src/adapters/ir-node-emitter.ts

@@ -41,7 +41,7 @@ import type {
   IRIfStatement,
   IRProvider,
   IRAsync,
-} from '../types'
+} from '../types.ts'
 
 /**
  * Recursive emit callback handed to each visitor method. Adapters

package/src/adapters/jsx-adapter.ts

@@ -9,10 +9,10 @@ import type {
   ComponentIR,
   IRNode,
   ImportSpecifier,
-} from '../types'
+} from '../types.ts'
 import { BF_SCOPE, BF_SLOT, BF_COND } from '@barefootjs/shared'
-import { BaseAdapter } from './interface'
-import { formatParamWithType, findReachableNames } from '../module-exports'
+import { BaseAdapter } from './interface.ts'
+import { formatParamWithType, findReachableNames } from '../module-exports.ts'
 
 export interface JsxAdapterConfig {
   /** Use typed versions (typedInitialValue, etc.) for type-safe .tsx output */

package/src/adapters/parsed-expr-emitter.ts

@@ -33,7 +33,7 @@
  *     be added in one place.
  */
 
-import type { ParsedExpr, SortComparator, ReduceOp, FlatDepth, FlatMapOp, TemplatePart } from '../expression-parser'
+import type { ParsedExpr, SortComparator, ReduceOp, FlatDepth, FlatMapOp, TemplatePart } from '../expression-parser.ts'
 
 export type HigherOrderMethod = 'filter' | 'every' | 'some' | 'find' | 'findIndex' | 'findLast' | 'findLastIndex'
 

package/src/adapters/template-imports.ts

@@ -16,7 +16,7 @@
  * Adapters are responsible for calling this themselves before emitting any
  * import block. The compiler hands them `metadata.imports` unchanged.
  */
-import type { ImportInfo, ImportSpecifier } from '../types'
+import type { ImportInfo, ImportSpecifier } from '../types.ts'
 
 const CLIENT_PACKAGE_SOURCES = new Set([
   '@barefootjs/client',

package/src/adapters/test-adapter.ts

@@ -16,10 +16,10 @@ import type {
   IRComponent,
   IRFragment,
   ParamInfo,
-} from '../types'
-import type { AdapterOutput, TemplateSections } from './interface'
-import { type JsxAdapterConfig, JsxAdapter } from './jsx-adapter'
-import { rewriteImportsForTemplate } from './template-imports'
+} from '../types.ts'
+import type { AdapterOutput, TemplateSections } from './interface.ts'
+import { type JsxAdapterConfig, JsxAdapter } from './jsx-adapter.ts'
+import { rewriteImportsForTemplate } from './template-imports.ts'
 
 export class TestAdapter extends JsxAdapter {
   name = 'test'
@@ -314,7 +314,7 @@ export class TestAdapter extends JsxAdapter {
   private flattenTemplate(value: { kind: string }): string {
     // Simple stringifier for `template`-kind values; tests only need a
     // recognisable JSX shape, not byte-exact reproduction.
-    const v = value as { kind: 'template'; parts: import('../types').IRTemplatePart[] }
+    const v = value as { kind: 'template'; parts: import('../types.ts').IRTemplatePart[] }
     return '`' + v.parts.map(p => {
       if (p.type === 'string') return p.value
       if (p.type === 'ternary') return `\${${p.condition} ? '${p.whenTrue}' : '${p.whenFalse}'}`

package/src/analyzer-context.ts

@@ -22,8 +22,8 @@ import type {
   ParamInfo,
   PropertyInfo,
   ReactiveFactoryInfo,
-} from './types'
-import { type ExcludeRange, collectAllTypeRanges, reconstructWithoutTypes } from './strip-types'
+} from './types.ts'
+import { type ExcludeRange, collectAllTypeRanges, reconstructWithoutTypes } from './strip-types.ts'
 
 /**
  * Deferred info for BF043 (props destructuring warning).

package/src/analyzer.ts

@@ -7,9 +7,9 @@
  */
 
 import ts from 'typescript'
-import type { ImportSpecifier, TypeInfo, ParamInfo, ReactiveFactoryInfo } from './types'
-import { rewriteBarePropRefs } from './prop-rewrite'
-import { incrementCounter } from './instrumentation'
+import type { ImportSpecifier, TypeInfo, ParamInfo, ReactiveFactoryInfo } from './types.ts'
+import { rewriteBarePropRefs } from './prop-rewrite.ts'
+import { incrementCounter } from './instrumentation.ts'
 import {
   type AnalyzerContext,
   type ConditionalReturn,
@@ -19,10 +19,10 @@ import {
   membersToProperties,
   isComponentFunction,
   isArrowComponentFunction,
-} from './analyzer-context'
-import { createError, createWarning, ErrorCodes } from './errors'
-import path from 'path'
-import fs from 'fs'
+} from './analyzer-context.ts'
+import { createError, createWarning, ErrorCodes } from './errors.ts'
+import path from 'node:path'
+import fs from 'node:fs'
 
 // =============================================================================
 // TypeScript Program Creation
@@ -3849,4 +3849,4 @@ export function validateReactiveFactoryCalls(ctx: AnalyzerContext): void {
 // Export
 // =============================================================================
 
-export { type AnalyzerContext } from './analyzer-context'
+export { type AnalyzerContext } from './analyzer-context.ts'

package/src/augment-inherited-props.ts

@@ -12,8 +12,8 @@
 
 import ts from 'typescript'
 
-import type { ComponentIR, IRMetadata, IRNode, IRElement, TypeInfo } from './types'
-import { isBooleanAttr } from './html-constants'
+import type { ComponentIR, IRMetadata, IRNode, IRElement, TypeInfo } from './types.ts'
+import { isBooleanAttr } from './html-constants.ts'
 
 /**
  * A `const x = useContext(SomeContext)` consumer in a component body. SSR

package/src/compiler.ts

@@ -10,18 +10,18 @@ import type {
   CompileOptions,
   CompileResult,
   FileOutput,
-} from './types'
-import type { TemplateAdapter } from './adapters/interface'
-import { analyzeComponent, listComponentFunctions, createProgramForFile, needsTypeBasedDetection } from './analyzer'
-import { jsxToIR } from './jsx-to-ir'
-import { generateClientJs, generateClientJsWithSourceMap, analyzeClientNeeds } from './ir-to-client-js'
-import { emitModuleLevelDeclarations } from './ir-to-client-js/emit-module-level'
-import { RUNTIME_MODULE, detectUsedImports as detectUsedImportsFromCode } from './ir-to-client-js/imports'
-import { setActiveComponentScope, computeFileScope } from './ir-to-client-js/component-scope'
-import { generateModuleExports, collectInlineExportedNames } from './module-exports'
-import { applyCssLayerPrefix } from './css-layer-prefixer'
-import { preprocessInlineJsxCallbacks } from './preprocess-inline-jsx-callbacks'
-import { extractSsrDefaults } from './ssr-defaults'
+} from './types.ts'
+import type { TemplateAdapter } from './adapters/interface.ts'
+import { analyzeComponent, listComponentFunctions, createProgramForFile, needsTypeBasedDetection } from './analyzer.ts'
+import { jsxToIR } from './jsx-to-ir.ts'
+import { generateClientJs, generateClientJsWithSourceMap, analyzeClientNeeds } from './ir-to-client-js/index.ts'
+import { emitModuleLevelDeclarations } from './ir-to-client-js/emit-module-level.ts'
+import { RUNTIME_MODULE, detectUsedImports as detectUsedImportsFromCode } from './ir-to-client-js/imports.ts'
+import { setActiveComponentScope, computeFileScope } from './ir-to-client-js/component-scope.ts'
+import { generateModuleExports, collectInlineExportedNames } from './module-exports.ts'
+import { applyCssLayerPrefix } from './css-layer-prefixer.ts'
+import { preprocessInlineJsxCallbacks } from './preprocess-inline-jsx-callbacks.ts'
+import { extractSsrDefaults } from './ssr-defaults.ts'
 
 /**
  * Extended compile options with required adapter

package/src/css-layer-prefixer.ts

@@ -5,7 +5,7 @@
  * for CSS cascade ordering. Un-layered user classes always beat layered component classes.
  */
 
-import type { ComponentIR, IRNode, IRTemplatePart } from './types'
+import type { ComponentIR, IRNode, IRTemplatePart } from './types.ts'
 
 /**
  * Prefix a single CSS class token with a layer variant.

package/src/debug.ts

@@ -20,13 +20,13 @@ import type {
   MemoInfo,
   EffectInfo,
   SourceLocation,
-} from './types'
-import { analyzeComponent, listComponentFunctions } from './analyzer'
-import { jsxToIR } from './jsx-to-ir'
-import { buildMetadata } from './compiler'
-import { analyzeClientNeeds } from './ir-to-client-js'
-import type { WrapReason } from './ir-to-client-js/reactivity'
-import { decideWrapFromAstFlags } from './ir-to-client-js/reactivity'
+} from './types.ts'
+import { analyzeComponent, listComponentFunctions } from './analyzer.ts'
+import { jsxToIR } from './jsx-to-ir.ts'
+import { buildMetadata } from './compiler.ts'
+import { analyzeClientNeeds } from './ir-to-client-js/index.ts'
+import type { WrapReason } from './ir-to-client-js/reactivity.ts'
+import { decideWrapFromAstFlags } from './ir-to-client-js/reactivity.ts'
 
 // =============================================================================
 // Types

package/src/errors.ts

@@ -2,13 +2,13 @@
  * BarefootJS Compiler - Error Definitions
  */
 
-import path from 'path'
+import path from 'node:path'
 import type {
   CompilerError,
   ErrorSeverity,
   ErrorSuggestion,
   SourceLocation,
-} from './types'
+} from './types.ts'
 
 // =============================================================================
 // Error Codes

package/src/expression-parser.ts

@@ -449,6 +449,33 @@ const LOWERED_ARRAY_METHODS = new Set([
 // Expression Parser
 // =============================================================================
 
+/**
+ * Extract the single-expression body of an arrow-function source
+ * (`() => EXPR` → `EXPR`), using the TypeScript parser rather than a regex so
+ * any parameter shape (destructure / defaults / parens) or nested arrow is
+ * handled robustly.
+ *
+ * Returns `null` for a block-bodied arrow (`() => { … }`) or a source that
+ * isn't a bare arrow function — callers (e.g. the SSR memo-seeding path) treat
+ * those as "not a single lowerable expression". This is the AST-backed
+ * replacement for ad-hoc `^\(...\)\s*=>` stripping.
+ */
+export function extractArrowBodyExpression(source: string): string | null {
+  const sf = ts.createSourceFile(
+    '__arrow__.ts',
+    source,
+    ts.ScriptTarget.Latest,
+    /* setParentNodes */ true,
+  )
+  const stmt = sf.statements[0]
+  if (!stmt || !ts.isExpressionStatement(stmt) || sf.statements.length !== 1) return null
+  let expr: ts.Expression = stmt.expression
+  while (ts.isParenthesizedExpression(expr)) expr = expr.expression
+  if (!ts.isArrowFunction(expr)) return null
+  if (ts.isBlock(expr.body)) return null
+  return expr.body.getText(sf).trim()
+}
+
 /**
  * Parse a JavaScript expression string into a ParsedExpr tree.
  */

package/src/free-refs.ts

@@ -22,9 +22,9 @@ import type {
   ParamInfo,
   ConstantInfo,
   FunctionInfo,
-} from './types'
-import { isReactiveType } from './reactivity-checker'
-import { incrementCounter } from './instrumentation'
+} from './types.ts'
+import { isReactiveType } from './reactivity-checker.ts'
+import { incrementCounter } from './instrumentation.ts'
 
 /**
  * Subset of `AnalyzerContext` / `TransformContext` that this resolver reads.
@@ -251,7 +251,7 @@ function collectReactiveBrandRefs(
  * recorded `value`.
  */
 function resolveConstantInitializerRefs(
-  c: import('./types').ConstantInfo,
+  c: import('./types.ts').ConstantInfo,
   env: BindingEnvironment,
   visited: Set<string>
 ): FreeReference[] {

package/src/index.ts

@@ -5,12 +5,12 @@
  */
 
 // Main compiler API
-export { compileJSX, buildMetadata } from './compiler'
-export type { CompileResult, CompileOptions, CompileOptionsWithAdapter, FileOutput } from './compiler'
+export { compileJSX, buildMetadata } from './compiler.ts'
+export type { CompileResult, CompileOptions, CompileOptionsWithAdapter, FileOutput } from './compiler.ts'
 
 // SSR template-variable defaults (manifest seeds for stash-based adapters)
-export { extractSsrDefaults } from './ssr-defaults'
-export type { SsrDefault } from './ssr-defaults'
+export { extractSsrDefaults } from './ssr-defaults.ts'
+export type { SsrDefault } from './ssr-defaults.ts'
 
 // Pure IR types
 export type {
@@ -45,20 +45,20 @@ export type {
   TypeDefinition,
   SourceLocation,
   CompilerError,
-} from './types'
+} from './types.ts'
 
 // Analyzer
-export { analyzeComponent, listComponentFunctions, listComponentFunctions as listExportedComponents, createProgramForFile, needsTypeBasedDetection, REACTIVE_PRIMITIVES, BROWSER_ONLY_CLIENT_APIS, type AnalyzerContext } from './analyzer'
-export { createProgramForCorpus, type SharedProgramOptions } from './shared-program'
+export { analyzeComponent, listComponentFunctions, listComponentFunctions as listExportedComponents, createProgramForFile, needsTypeBasedDetection, REACTIVE_PRIMITIVES, BROWSER_ONLY_CLIENT_APIS, type AnalyzerContext } from './analyzer.ts'
+export { createProgramForCorpus, type SharedProgramOptions } from './shared-program.ts'
 
 // JSX to IR transformer
-export { jsxToIR } from './jsx-to-ir'
+export { jsxToIR } from './jsx-to-ir.ts'
 
 // Module exports generation (compiler layer)
-export { generateModuleExports, extractFunctionParams, formatParamWithType, findReachableNames } from './module-exports'
+export { generateModuleExports, extractFunctionParams, formatParamWithType, findReachableNames } from './module-exports.ts'
 
 // Adapters
-export { BaseAdapter } from './adapters/interface'
+export { BaseAdapter } from './adapters/interface.ts'
 export type {
   TemplateAdapter,
   AdapterOutput,
@@ -67,31 +67,31 @@ export type {
   TemplatePrimitiveEmit,
   TemplatePrimitiveRegistry,
   TemplateCallAcceptor,
-} from './adapters/interface'
-export { JsxAdapter } from './adapters/jsx-adapter'
-export type { JsxAdapterConfig } from './adapters/jsx-adapter'
-export { rewriteImportsForTemplate } from './adapters/template-imports'
-export { emitParsedExpr } from './adapters/parsed-expr-emitter'
-export type { ParsedExprEmitter, HigherOrderMethod, ArrayMethod, SortMethod, LiteralType } from './adapters/parsed-expr-emitter'
-export { emitIRNode } from './adapters/ir-node-emitter'
-export type { IRNodeEmitter, EmitIRNode } from './adapters/ir-node-emitter'
-export { emitAttrValue } from './adapters/attr-value-emitter'
-export type { AttrValueEmitter } from './adapters/attr-value-emitter'
+} from './adapters/interface.ts'
+export { JsxAdapter } from './adapters/jsx-adapter.ts'
+export type { JsxAdapterConfig } from './adapters/jsx-adapter.ts'
+export { rewriteImportsForTemplate } from './adapters/template-imports.ts'
+export { emitParsedExpr } from './adapters/parsed-expr-emitter.ts'
+export type { ParsedExprEmitter, HigherOrderMethod, ArrayMethod, SortMethod, LiteralType } from './adapters/parsed-expr-emitter.ts'
+export { emitIRNode } from './adapters/ir-node-emitter.ts'
+export type { IRNodeEmitter, EmitIRNode } from './adapters/ir-node-emitter.ts'
+export { emitAttrValue } from './adapters/attr-value-emitter.ts'
+export type { AttrValueEmitter } from './adapters/attr-value-emitter.ts'
 
 // Client JS Generator
-export { generateClientJs, generateClientJsWithSourceMap, analyzeClientNeeds } from './ir-to-client-js'
-export type { ClientJsResult } from './ir-to-client-js'
+export { generateClientJs, generateClientJsWithSourceMap, analyzeClientNeeds } from './ir-to-client-js/index.ts'
+export type { ClientJsResult } from './ir-to-client-js/index.ts'
 
 // Source Map
-export { SourceMapGenerator, buildSourceMapFromIR } from './ir-to-client-js/source-map'
-export type { SourceMapV3 } from './ir-to-client-js/source-map'
+export { SourceMapGenerator, buildSourceMapFromIR } from './ir-to-client-js/source-map.ts'
+export type { SourceMapV3 } from './ir-to-client-js/source-map.ts'
 
 // Client JS Combiner (for build scripts)
-export { combineParentChildClientJs } from './combine-client-js'
+export { combineParentChildClientJs } from './combine-client-js.ts'
 
 // Externals manifest + importmap snippet renderer (shared by adapters and CLI)
-export { renderImportMapHtml } from './import-map'
-export type { ExternalsManifest, ImportMapManifest } from './import-map'
+export { renderImportMapHtml } from './import-map.ts'
+export type { ExternalsManifest, ImportMapManifest } from './import-map.ts'
 
 // Build options (shared by adapters and CLI)
 export interface OutputLayout {
@@ -226,10 +226,10 @@ export interface BuildOptions {
 }
 
 // AttrValue constructors
-export { AttrValueOf } from './types'
+export { AttrValueOf } from './types.ts'
 
 // CSS Layer Prefixer
-export { applyCssLayerPrefix } from './css-layer-prefixer'
+export { applyCssLayerPrefix } from './css-layer-prefixer.ts'
 
 // Compiler instrumentation (bench + perf debugging)
 export {
@@ -238,16 +238,16 @@ export {
   resetCompilerCounters,
   getCompilerCounters,
   type CompilerCounters,
-} from './instrumentation'
+} from './instrumentation.ts'
 
 // Errors
-export { ErrorCodes, createError, formatError, generateCodeFrame } from './errors'
+export { ErrorCodes, createError, formatError, generateCodeFrame } from './errors.ts'
 
 // Expression Parser
-export { parseExpression, isSupported, exprToString, stringifyParsedExpr, identifierPath, parseBlockBody, containsHigherOrder } from './expression-parser'
-export type { ParsedExpr, ParsedStatement, SortComparator, SortKey, ReduceOp, FlatDepth, FlatMapOp, FlatMapLeaf, SupportLevel, SupportResult, TemplatePart } from './expression-parser'
-export { buildLoopChainExpr } from './loop-chain'
-export type { LoopChainInputs } from './loop-chain'
+export { parseExpression, isSupported, exprToString, stringifyParsedExpr, identifierPath, parseBlockBody, containsHigherOrder, extractArrowBodyExpression } from './expression-parser.ts'
+export type { ParsedExpr, ParsedStatement, SortComparator, SortKey, ReduceOp, FlatDepth, FlatMapOp, FlatMapLeaf, SupportLevel, SupportResult, TemplatePart } from './expression-parser.ts'
+export { buildLoopChainExpr } from './loop-chain.ts'
+export type { LoopChainInputs } from './loop-chain.ts'
 
 // Debug analysis
 export {
@@ -273,16 +273,16 @@ export {
   resolveSetters,
   buildLocalFunctionSetterMap,
   makeIdCallRegex,
-} from './debug'
-export type { ComponentGraph, ComponentAnalysis, SignalNode, MemoNode, EffectNode, DomBinding, UpdatePath, SignalTrace, EventBinding, SetterRef, FnSetterResolution, EventSummary, LoopInfo, LoopChildBinding, LoopSummary, WhyUpdateResult, WhyUpdateDep, WhyUpdateSource, FallbackExplanation, ComponentSummary } from './debug'
-export type { WrapReason } from './ir-to-client-js/reactivity'
+} from './debug.ts'
+export type { ComponentGraph, ComponentAnalysis, SignalNode, MemoNode, EffectNode, DomBinding, UpdatePath, SignalTrace, EventBinding, SetterRef, FnSetterResolution, EventSummary, LoopInfo, LoopChildBinding, LoopSummary, WhyUpdateResult, WhyUpdateDep, WhyUpdateSource, FallbackExplanation, ComponentSummary } from './debug.ts'
+export type { WrapReason } from './ir-to-client-js/reactivity.ts'
 
 // HTML constants
-export { BOOLEAN_ATTRS, isBooleanAttr } from './html-constants'
+export { BOOLEAN_ATTRS, isBooleanAttr } from './html-constants.ts'
 
 // Shared props-object-pattern helpers for the Go / Mojo template adapters
-export { augmentInheritedPropAccesses, parseRecordIndexAccess, evalStringArrayJoin, collectContextConsumers } from './augment-inherited-props'
-export type { RecordIndexAccess, RecordIndexEntry, ContextConsumer } from './augment-inherited-props'
+export { augmentInheritedPropAccesses, parseRecordIndexAccess, evalStringArrayJoin, collectContextConsumers } from './augment-inherited-props.ts'
+export type { RecordIndexAccess, RecordIndexEntry, ContextConsumer } from './augment-inherited-props.ts'
 
 // HTML element attribute types
 export type {
@@ -319,4 +319,4 @@ export type {
   ImgHTMLAttributes,
   LabelHTMLAttributes,
   OptionHTMLAttributes,
-} from './html-types'
+} from './html-types.ts'

package/src/ir-to-client-js/build-references.ts

@@ -34,12 +34,12 @@ import type {
   ReferenceEdge,
   ReferenceSource,
   ReferencesGraph,
-} from '../types'
-import type { IRVisitor as WalkerVisitor } from './walker'
-import { attrValueToString } from './utils'
-import type { ClientJsContext } from './types'
-import { extractIdentifiers, extractTemplateIdentifiers } from './identifiers'
-import { walkIR } from './walker'
+} from '../types.ts'
+import type { IRVisitor as WalkerVisitor } from './walker.ts'
+import { attrValueToString } from './utils.ts'
+import type { ClientJsContext } from './types.ts'
+import { extractIdentifiers, extractTemplateIdentifiers } from './identifiers.ts'
+import { walkIR } from './walker.ts'
 
 // All non-declaration edge origins share a single null source — no
 // query on the graph distinguishes them on read today. Stage E

package/src/ir-to-client-js/child-components.ts

@@ -8,8 +8,8 @@
  * skipped — they are declared in the same file and already resolve.
  */
 
-import type { IRNode } from '../types'
-import type { ClientJsContext, ConditionalElement } from './types'
+import type { IRNode } from '../types.ts'
+import type { ClientJsContext, ConditionalElement } from './types.ts'
 
 /** Emit child-component import marker lines for every component name
  *  reachable from the current component's IR (minus siblings). */

package/src/ir-to-client-js/collect-elements.ts

@@ -2,14 +2,14 @@
  * IR tree traversal → collect elements into ClientJsContext.
  */
 
-import { type IRNode, type IRElement, type IRComponent, type IRLoop, type IRProp, pickAttrMetaFromIR } from '../types'
-import type { ClientJsContext, ConditionalBranchChildComponent, ConditionalBranchReactiveAttr, BranchLoop, ConditionalBranchTextEffect, ConditionalElement, LoopChildBindings, LoopChildBranchSummary, LoopChildConditional, LoopOffset, NestedLoop } from './types'
-import { attrValueToString, freeIdsFromRefs, quotePropName, PROPS_PARAM } from './utils'
-import { classifyReactivity, decideWrapForAttr, decideWrapForChildProp, decideWrapFromAstFlags, collectEventHandlersFromIR, collectConditionalBranchEvents, collectConditionalBranchRefs, collectConditionalBranchChildComponents, collectLoopChildEventsWithNesting, collectLoopChildReactiveAttrs, collectLoopChildReactiveTexts, collectLoopChildRefs, emptyLoopChildBindings } from './reactivity'
-import { irToHtmlTemplate, irToPlaceholderTemplate, irChildrenToJsExpr } from './html-template'
-import { expandDynamicPropValue, expandConstantForReactivity } from './prop-handling'
-import { walkIR, stopAt } from './walker'
-import { buildLoopChainExpr } from '../loop-chain'
+import { type IRNode, type IRElement, type IRComponent, type IRLoop, type IRProp, pickAttrMetaFromIR } from '../types.ts'
+import type { ClientJsContext, ConditionalBranchChildComponent, ConditionalBranchReactiveAttr, BranchLoop, ConditionalBranchTextEffect, ConditionalElement, LoopChildBindings, LoopChildBranchSummary, LoopChildConditional, LoopOffset, NestedLoop } from './types.ts'
+import { attrValueToString, freeIdsFromRefs, quotePropName, PROPS_PARAM } from './utils.ts'
+import { classifyReactivity, decideWrapForAttr, decideWrapForChildProp, decideWrapFromAstFlags, collectEventHandlersFromIR, collectConditionalBranchEvents, collectConditionalBranchRefs, collectConditionalBranchChildComponents, collectLoopChildEventsWithNesting, collectLoopChildReactiveAttrs, collectLoopChildReactiveTexts, collectLoopChildRefs, emptyLoopChildBindings } from './reactivity.ts'
+import { irToHtmlTemplate, irToPlaceholderTemplate, irChildrenToJsExpr } from './html-template.ts'
+import { expandDynamicPropValue, expandConstantForReactivity } from './prop-handling.ts'
+import { walkIR, stopAt } from './walker.ts'
+import { buildLoopChainExpr } from '../loop-chain.ts'
 
 /** Expressions that render nothing (0 DOM nodes) — `&&` / `?:` empty branches. */
 const EMPTY_RENDER_EXPRS = new Set(['null', 'undefined', 'false', "''", '""', '``'])
@@ -340,12 +340,12 @@ export function collectInnerLoops(
         // Per-item bindings for branch-mode callers (child components,
         // events, nested conditionals) — matches the pre-Phase 2
         // `collectBranchInnerLoops` behaviour.
-        let childComponents: import('../types').IRLoopChildComponent[] | undefined
+        let childComponents: import('../types.ts').IRLoopChildComponent[] | undefined
         if (collectBindings) {
           // skipConditionals=true: components inside conditional branches
           // are collected separately via `childConditionals[i].whenTrue.childComponents`
           // (below). Including them here would double-init event handlers.
-          const rawComps: Array<{ name: string; slotId: string | null; props: import('../types').IRProp[]; children: IRNode[] }> = []
+          const rawComps: Array<{ name: string; slotId: string | null; props: import('../types.ts').IRProp[]; children: IRNode[] }> = []
           for (const child of n.children) {
             rawComps.push(...collectConditionalBranchChildComponents(child, true))
           }
@@ -1145,7 +1145,7 @@ function summarizeBranch(
   node: IRNode,
   ctx: ClientJsContext,
   siblingOffsets: Map<IRLoop, IRNode[]>,
-): import('./types').BranchSummary {
+): import('./types.ts').BranchSummary {
   return {
     events: collectConditionalBranchEvents(node),
     refs: collectConditionalBranchRefs(node),
@@ -1214,7 +1214,7 @@ export function collectLoopChildBindings(
   ctx: ClientJsContext,
   siblingOffsets: Map<IRLoop, IRNode[]>,
   loopParam: string,
-  loopParamBindings: readonly import('../types').LoopParamBinding[] | undefined,
+  loopParamBindings: readonly import('../types.ts').LoopParamBinding[] | undefined,
 ): LoopChildBindings {
   const bindings = emptyLoopChildBindings()
   for (const child of children) {
@@ -1232,7 +1232,7 @@ export function collectLoopChildConditionals(
   ctx: ClientJsContext,
   siblingOffsets: Map<IRLoop, IRNode[]>,
   loopParam?: string,
-  loopParamBindings?: readonly import('../types').LoopParamBinding[],
+  loopParamBindings?: readonly import('../types.ts').LoopParamBinding[],
 ): LoopChildConditional[] {
   const conditionals: LoopChildConditional[] = []
 
@@ -1307,7 +1307,7 @@ function summarizeLoopChildBranch(
   ctx: ClientJsContext,
   siblingOffsets: Map<IRLoop, IRNode[]>,
   loopParam?: string,
-  loopParamBindings?: readonly import('../types').LoopParamBinding[],
+  loopParamBindings?: readonly import('../types.ts').LoopParamBinding[],
 ): LoopChildBranchSummary {
   const inner = collectInnerLoops([node], siblingOffsets, loopParam, ctx, branchInnerLoopOptions)
   return {

package/src/ir-to-client-js/compute-inlinability.ts

@@ -23,16 +23,16 @@
  * Stage E.4 of issue #1021.
  */
 
-import type { ConstantInfo, IRNode, ReferencesGraph } from '../types'
-import type { ClientJsContext } from './types'
-import { graphFunctionReferences } from './build-references'
-import { extractIdentifiers, extractTemplateIdentifiers } from './identifiers'
-import { isInlinableInTemplate, buildRelocateEnvFromIR } from '../relocate'
-import type { RelocateEnv, RelocateDecision } from '../relocate'
-import { createError, ErrorCodes } from '../errors'
-import { attrValueToString } from './utils'
-import { walkIR, type IRVisitor } from './walker'
-import { buildSignalMemoEnv, csrSubstitute, type CsrEnv, type CsrSubstitution } from './csr-substitute'
+import type { ConstantInfo, IRNode, ReferencesGraph } from '../types.ts'
+import type { ClientJsContext } from './types.ts'
+import { graphFunctionReferences } from './build-references.ts'
+import { extractIdentifiers, extractTemplateIdentifiers } from './identifiers.ts'
+import { isInlinableInTemplate, buildRelocateEnvFromIR } from '../relocate.ts'
+import type { RelocateEnv, RelocateDecision } from '../relocate.ts'
+import { createError, ErrorCodes } from '../errors.ts'
+import { attrValueToString } from './utils.ts'
+import { walkIR, type IRVisitor } from './walker.ts'
+import { buildSignalMemoEnv, csrSubstitute, type CsrEnv, type CsrSubstitution } from './csr-substitute.ts'
 
 /**
  * Build a `RelocateEnv` from a live `ClientJsContext`. The IR-keyed env

package/src/ir-to-client-js/compute-prop-usage.ts

@@ -12,9 +12,9 @@
  * case.
  */
 
-import type { ConstantInfo, PropUsage } from '../types'
-import type { ClientJsContext } from './types'
-import { collectPropAccesses, type PropAccessKindMap } from './walk-prop-accesses'
+import type { ConstantInfo, PropUsage } from '../types.ts'
+import type { ClientJsContext } from './types.ts'
+import { collectPropAccesses, type PropAccessKindMap } from './walk-prop-accesses.ts'
 
 export function computePropUsage(
   ctx: ClientJsContext,

package/src/ir-to-client-js/compute-scope.ts

@@ -14,13 +14,13 @@ import type {
   DeclarationScope,
   FunctionInfo,
   ReferencesGraph,
-} from '../types'
-import type { ClientJsContext } from './types'
+} from '../types.ts'
+import type { ClientJsContext } from './types.ts'
 import {
   graphAssignedIdentifiers,
   graphFunctionReferences,
   graphUsedIdentifiers,
-} from './build-references'
+} from './build-references.ts'
 
 export interface DeclarationScopes {
   constantScope: Map<string, DeclarationScope>

package/src/ir-to-client-js/control-flow/plan/branch-loop.ts

@@ -15,9 +15,9 @@
  * pair.
  */
 
-import type { CompositeLoopPlan, LoopChildRefBinding } from './loop'
-import type { EventDelegationPlan } from './event-delegation'
-import type { ReactiveEffectsPlan } from './reactive-effects'
+import type { CompositeLoopPlan, LoopChildRefBinding } from './loop.ts'
+import type { EventDelegationPlan } from './event-delegation.ts'
+import type { ReactiveEffectsPlan } from './reactive-effects.ts'
 
 export interface BranchPlainLoopPlan {
   kind: 'plain'

package/src/ir-to-client-js/control-flow/plan/build-branch-loop.ts

@@ -10,17 +10,17 @@
  *     event-delegation plan.
  */
 
-import type { BranchLoop } from '../../types'
-import { buildChainedArrayExpr, varSlotId, wrapLoopParamAsAccessor } from '../../utils'
-import { buildBranchCompositePlan } from './build-composite-loop'
-import { buildBranchLoopDelegationPlan } from './build-event-delegation'
-import { buildReactiveEffectsPlan } from './build-reactive-effects'
-import { destructureLoopParam, loopKeyFn, buildChildRefBindings } from '../shared'
+import type { BranchLoop } from '../../types.ts'
+import { buildChainedArrayExpr, varSlotId, wrapLoopParamAsAccessor } from '../../utils.ts'
+import { buildBranchCompositePlan } from './build-composite-loop.ts'
+import { buildBranchLoopDelegationPlan } from './build-event-delegation.ts'
+import { buildReactiveEffectsPlan } from './build-reactive-effects.ts'
+import { destructureLoopParam, loopKeyFn, buildChildRefBindings } from '../shared.ts'
 import type {
   BranchCompositeLoopPlan,
   BranchLoopPlan,
   BranchPlainLoopPlan,
-} from './branch-loop'
+} from './branch-loop.ts'
 
 export function buildBranchLoopPlan(loop: BranchLoop): BranchLoopPlan {
   const containerSlotId = loop.containerSlotId