@barefootjs/hono 0.5.0 → 0.5.2

package/dist/adapter/hono-adapter.d.ts

@@ -78,7 +78,7 @@ export declare class HonoAdapter extends JsxAdapter implements IRNodeEmitter<Hon
     emitElement(node: IRElement, ctx: HonoRenderCtx, _emit: EmitIRNode<HonoRenderCtx>): string;
     emitText(node: IRText): string;
     emitExpression(node: IRExpression): string;
-    emitConditional(node: IRConditional, _ctx: HonoRenderCtx, _emit: EmitIRNode<HonoRenderCtx>): string;
+    emitConditional(node: IRConditional, ctx: HonoRenderCtx, _emit: EmitIRNode<HonoRenderCtx>): string;
     emitLoop(node: IRLoop, _ctx: HonoRenderCtx, _emit: EmitIRNode<HonoRenderCtx>): string;
     emitComponent(node: IRComponent, ctx: HonoRenderCtx, _emit: EmitIRNode<HonoRenderCtx>): string;
     emitFragment(node: IRFragment, _ctx: HonoRenderCtx, _emit: EmitIRNode<HonoRenderCtx>): string;
@@ -91,7 +91,14 @@ export declare class HonoAdapter extends JsxAdapter implements IRNodeEmitter<Hon
     }): string;
     private renderText;
     renderExpression(expr: IRExpression): string;
-    renderConditional(cond: IRConditional): string;
+    renderConditional(cond: IRConditional, ctx?: HonoRenderCtx): string;
+    /**
+     * Like the base `renderNodeRaw`, but threads a render ctx through to
+     * `renderNode` so a conditional branch can mark its element as a loop item
+     * root (#1665). The `null` / `undefined` expression branch carries no
+     * element, so it short-circuits exactly as the base helper does.
+     */
+    private renderNodeRawCtx;
     private wrapWithCondMarker;
     renderLoop(loop: IRLoop): string;
     private renderChildrenInLoop;

package/dist/adapter/hono-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hono-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/hono-adapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,MAAM,EACX,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,OAAO,EACZ,KAAK,MAAM,EAIX,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAElB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,UAAU,EAEf,UAAU,EAMX,MAAM,iBAAiB,CAAA;AAExB;;;;;GAKG;AACH,KAAK,aAAa,GAAG;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAGD,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAuBD,qBAAa,WAAY,SAAQ,UAAW,YAAW,aAAa,CAAC,aAAa,CAAC;IACjF,IAAI,SAAS;IACb,SAAS,SAAS;IAClB,gBAAgB,SAAiC;IAGjD,kBAAkB,EAAG,WAAW,CAAS;IAmBzC,mBAAmB,QAAO,OAAO,CAAQ;IAEzC,SAAS,CAAC,SAAS,EAAE,gBAAgB,CAA0B;IAE/D,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,sBAAsB,CAAiB;IAC/C,OAAO,CAAC,wBAAwB,CAAiB;IACjD;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB,CAAC,CAAgC;IAC9D,uFAAuF;IACvF,OAAO,CAAC,YAAY,CAAmD;IAEvE,YAAY,OAAO,GAAE,kBAAuB,EAQ3C;IAED,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,aAAa,CAyCzE;IAED,OAAO,CAAC,kCAAkC;IAkB1C,OAAO,CAAC,eAAe;IAyDvB,aAAa,CAAC,EAAE,EAAE,WAAW,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA+EpE;IAED,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,iBAAiB;IAmNzB;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,aAAa,GAAG,MAAM,CAEpD;IAMD,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAEzF;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7B;IAED,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAEzC;IAED,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAElG;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAEpF;IAED,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAE7F;IAED,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAE5F;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9B;IAED,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAKnG;IAED,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAwB5F;IAED,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAEtF;IAED,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,CAwC5E;IAED,OAAO,CAAC,UAAU;IAIlB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAgB3C;IAED,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CA0B7C;IAED,OAAO,CAAC,kBAAkB;IA2B1B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAiF/B;IAED,OAAO,CAAC,oBAAoB;IAI5B;;;OAGG;IACH,iBAAiB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,EAAE;QAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,CA4C5F;IAED,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAIjC;IAED,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE;QAAE,uBAAuB,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,CAiDxI;IAED,OAAO,CAAC,cAAc;IAQtB;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IAY5B;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAmBlC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAepC;IAED,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,oBAAoB;IAyB5B,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,0BAA0B;CAwBnC;AAGD,eAAO,MAAM,WAAW,aAAoB,CAAA"}
+{"version":3,"file":"hono-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/hono-adapter.ts"],"names":[],"mappings":"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"}

package/dist/adapter/index.js

@@ -260,9 +260,13 @@ export default ${this.componentName}` : "";
       }
       fullPropsDestructure = `{ ${parts.join(", ")} }`;
     }
+    const hasRequiredProps = ir.metadata.propsParams.some((p) => !p.optional && p.defaultValue === undefined && !p.isRest);
+    const wantsNoArgDefault = propsObjectName ? !propsTypeName : !hasRequiredProps;
+    const propsTypeExpr = typeAnnotation.replace(/^:\s*/, "");
+    const noArgDefault = wantsNoArgDefault ? ` = {} as ${propsTypeExpr}` : "";
     const lines = [];
     const exportPrefix = ir.metadata.isExported === false ? "" : "export ";
-    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}) {`);
+    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}${noArgDefault}) {`);
     if (propsExtraction) {
       lines.push(propsExtraction);
     }
@@ -313,8 +317,8 @@ export default ${this.componentName}` : "";
   emitExpression(node) {
     return this.renderExpression(node);
   }
-  emitConditional(node, _ctx, _emit) {
-    return this.renderConditional(node);
+  emitConditional(node, ctx, _emit) {
+    return this.renderConditional(node, ctx);
   }
   emitLoop(node, _ctx, _emit) {
     return this.renderLoop(node);
@@ -401,12 +405,13 @@ export default ${this.componentName}` : "";
     }
     return `{${expr.expr}}`;
   }
-  renderConditional(cond) {
+  renderConditional(cond, ctx) {
     if (cond.clientOnly && cond.slotId) {
       return `{bfComment("cond-start:${cond.slotId}")}{bfComment("cond-end:${cond.slotId}")}`;
     }
-    const whenTrue = this.renderNodeRaw(cond.whenTrue);
-    let whenFalse = this.renderNodeRaw(cond.whenFalse);
+    const branchCtx = ctx?.isLoopItemRoot ? { isLoopItemRoot: true } : undefined;
+    const whenTrue = this.renderNodeRawCtx(cond.whenTrue, branchCtx);
+    let whenFalse = this.renderNodeRawCtx(cond.whenFalse, branchCtx);
     if (!whenFalse || whenFalse === "" || whenFalse === "null") {
       whenFalse = "null";
     }
@@ -417,6 +422,14 @@ export default ${this.componentName}` : "";
     }
     return `{${cond.condition} ? ${whenTrue} : ${whenFalse}}`;
   }
+  renderNodeRawCtx(node, ctx) {
+    if (node.type === "expression") {
+      if (node.expr === "null" || node.expr === "undefined")
+        return "null";
+      return node.expr;
+    }
+    return this.renderNode(node, ctx);
+  }
   wrapWithCondMarker(node, content, condId) {
     if (node.type === "component") {
       return `<>{bfComment("cond-start:${condId}")}${content}{bfComment("cond-end:${condId}")}</>`;
@@ -447,6 +460,8 @@ export default ${this.componentName}` : "";
     let safeChildren = children.startsWith("{") ? `<>${children}</>` : children;
     if (loop.bodyIsMultiRoot) {
       safeChildren = `<>{bfComment('bf-loop-i')}${children}</>`;
+    } else if (loop.bodyIsItemConditional && loop.key) {
+      safeChildren = `<>{bfComment('loop-i:' + String(${loop.key}))}${children}</>`;
     }
     let chainedArray = applyHonoLoopChain(loop);
     const iterMethod = loop.method ?? "map";

package/dist/build.js

@@ -260,9 +260,13 @@ export default ${this.componentName}` : "";
       }
       fullPropsDestructure = `{ ${parts.join(", ")} }`;
     }
+    const hasRequiredProps = ir.metadata.propsParams.some((p) => !p.optional && p.defaultValue === undefined && !p.isRest);
+    const wantsNoArgDefault = propsObjectName ? !propsTypeName : !hasRequiredProps;
+    const propsTypeExpr = typeAnnotation.replace(/^:\s*/, "");
+    const noArgDefault = wantsNoArgDefault ? ` = {} as ${propsTypeExpr}` : "";
     const lines = [];
     const exportPrefix = ir.metadata.isExported === false ? "" : "export ";
-    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}) {`);
+    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}${noArgDefault}) {`);
     if (propsExtraction) {
       lines.push(propsExtraction);
     }
@@ -313,8 +317,8 @@ export default ${this.componentName}` : "";
   emitExpression(node) {
     return this.renderExpression(node);
   }
-  emitConditional(node, _ctx, _emit) {
-    return this.renderConditional(node);
+  emitConditional(node, ctx, _emit) {
+    return this.renderConditional(node, ctx);
   }
   emitLoop(node, _ctx, _emit) {
     return this.renderLoop(node);
@@ -401,12 +405,13 @@ export default ${this.componentName}` : "";
     }
     return `{${expr.expr}}`;
   }
-  renderConditional(cond) {
+  renderConditional(cond, ctx) {
     if (cond.clientOnly && cond.slotId) {
       return `{bfComment("cond-start:${cond.slotId}")}{bfComment("cond-end:${cond.slotId}")}`;
     }
-    const whenTrue = this.renderNodeRaw(cond.whenTrue);
-    let whenFalse = this.renderNodeRaw(cond.whenFalse);
+    const branchCtx = ctx?.isLoopItemRoot ? { isLoopItemRoot: true } : undefined;
+    const whenTrue = this.renderNodeRawCtx(cond.whenTrue, branchCtx);
+    let whenFalse = this.renderNodeRawCtx(cond.whenFalse, branchCtx);
     if (!whenFalse || whenFalse === "" || whenFalse === "null") {
       whenFalse = "null";
     }
@@ -417,6 +422,14 @@ export default ${this.componentName}` : "";
     }
     return `{${cond.condition} ? ${whenTrue} : ${whenFalse}}`;
   }
+  renderNodeRawCtx(node, ctx) {
+    if (node.type === "expression") {
+      if (node.expr === "null" || node.expr === "undefined")
+        return "null";
+      return node.expr;
+    }
+    return this.renderNode(node, ctx);
+  }
   wrapWithCondMarker(node, content, condId) {
     if (node.type === "component") {
       return `<>{bfComment("cond-start:${condId}")}${content}{bfComment("cond-end:${condId}")}</>`;
@@ -447,6 +460,8 @@ export default ${this.componentName}` : "";
     let safeChildren = children.startsWith("{") ? `<>${children}</>` : children;
     if (loop.bodyIsMultiRoot) {
       safeChildren = `<>{bfComment('bf-loop-i')}${children}</>`;
+    } else if (loop.bodyIsItemConditional && loop.key) {
+      safeChildren = `<>{bfComment('loop-i:' + String(${loop.key}))}${children}</>`;
     }
     let chainedArray = applyHonoLoopChain(loop);
     const iterMethod = loop.method ?? "map";

package/dist/index.js

@@ -260,9 +260,13 @@ export default ${this.componentName}` : "";
       }
       fullPropsDestructure = `{ ${parts.join(", ")} }`;
     }
+    const hasRequiredProps = ir.metadata.propsParams.some((p) => !p.optional && p.defaultValue === undefined && !p.isRest);
+    const wantsNoArgDefault = propsObjectName ? !propsTypeName : !hasRequiredProps;
+    const propsTypeExpr = typeAnnotation.replace(/^:\s*/, "");
+    const noArgDefault = wantsNoArgDefault ? ` = {} as ${propsTypeExpr}` : "";
     const lines = [];
     const exportPrefix = ir.metadata.isExported === false ? "" : "export ";
-    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}) {`);
+    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}${noArgDefault}) {`);
     if (propsExtraction) {
       lines.push(propsExtraction);
     }
@@ -313,8 +317,8 @@ export default ${this.componentName}` : "";
   emitExpression(node) {
     return this.renderExpression(node);
   }
-  emitConditional(node, _ctx, _emit) {
-    return this.renderConditional(node);
+  emitConditional(node, ctx, _emit) {
+    return this.renderConditional(node, ctx);
   }
   emitLoop(node, _ctx, _emit) {
     return this.renderLoop(node);
@@ -401,12 +405,13 @@ export default ${this.componentName}` : "";
     }
     return `{${expr.expr}}`;
   }
-  renderConditional(cond) {
+  renderConditional(cond, ctx) {
     if (cond.clientOnly && cond.slotId) {
       return `{bfComment("cond-start:${cond.slotId}")}{bfComment("cond-end:${cond.slotId}")}`;
     }
-    const whenTrue = this.renderNodeRaw(cond.whenTrue);
-    let whenFalse = this.renderNodeRaw(cond.whenFalse);
+    const branchCtx = ctx?.isLoopItemRoot ? { isLoopItemRoot: true } : undefined;
+    const whenTrue = this.renderNodeRawCtx(cond.whenTrue, branchCtx);
+    let whenFalse = this.renderNodeRawCtx(cond.whenFalse, branchCtx);
     if (!whenFalse || whenFalse === "" || whenFalse === "null") {
       whenFalse = "null";
     }
@@ -417,6 +422,14 @@ export default ${this.componentName}` : "";
     }
     return `{${cond.condition} ? ${whenTrue} : ${whenFalse}}`;
   }
+  renderNodeRawCtx(node, ctx) {
+    if (node.type === "expression") {
+      if (node.expr === "null" || node.expr === "undefined")
+        return "null";
+      return node.expr;
+    }
+    return this.renderNode(node, ctx);
+  }
   wrapWithCondMarker(node, content, condId) {
     if (node.type === "component") {
       return `<>{bfComment("cond-start:${condId}")}${content}{bfComment("cond-end:${condId}")}</>`;
@@ -447,6 +460,8 @@ export default ${this.componentName}` : "";
     let safeChildren = children.startsWith("{") ? `<>${children}</>` : children;
     if (loop.bodyIsMultiRoot) {
       safeChildren = `<>{bfComment('bf-loop-i')}${children}</>`;
+    } else if (loop.bodyIsItemConditional && loop.key) {
+      safeChildren = `<>{bfComment('loop-i:' + String(${loop.key}))}${children}</>`;
     }
     let chainedArray = applyHonoLoopChain(loop);
     const iterMethod = loop.method ?? "map";

package/dist/test-render.d.ts

@@ -14,6 +14,16 @@ export interface RenderOptions {
     props?: Record<string, unknown>;
     /** Additional component files (filename → source) */
     components?: Record<string, string>;
+    /**
+     * Pre-compiled child component modules (import specifier → absolute
+     * module path) — #1467 Phase 2a. When the parent imports one of these
+     * specifiers, the import is *re-anchored* to the given module path
+     * (kept as a real ESM import) instead of having the child inlined via
+     * `components`. The module is a committed, export-intact marked
+     * template, so SSR loads it through the module system — no export
+     * stripping. Takes precedence over `components` for the same key.
+     */
+    componentModules?: Record<string, string>;
     /**
      * Explicit component to render when the source declares multiple
      * exports. When omitted, the first function-valued export in

package/dist/test-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-render.d.ts","sourceRoot":"","sources":["../src/test-render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAQtD,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,8BAA8B;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CA0GjF"}
+{"version":3,"file":"test-render.d.ts","sourceRoot":"","sources":["../src/test-render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAStD,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,8BAA8B;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AA2BD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CA0KjF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/hono",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Hono integration for BarefootJS",
   "type": "module",
   "main": "./dist/index.js",

package/src/adapter/hono-adapter.ts

@@ -510,11 +510,28 @@ export class HonoAdapter extends JsxAdapter implements IRNodeEmitter<HonoRenderC
       fullPropsDestructure = `{ ${parts.join(', ')} }`
     }
 
+    // Default the props param to `{}` when the component has no required
+    // props, so a bare no-arg call (`Foo()`) doesn't crash on destructuring
+    // `undefined`. This makes a JSX-returning arrow hoisted from an
+    // object-literal value (e.g. `THEME_LOGOS[id]()`) renderable at SSR
+    // (#1663). `hasRequiredProps` ignores props that carry a destructuring
+    // default, but the declared props type may still mark that field
+    // required — so a bare `= {}` would fail `tsc`. Assert the default to the
+    // param's own annotated type (`{} as T`); the destructuring defaults
+    // supply the values at runtime. The SolidJS-style (`propsObjectName`)
+    // branch opts in whenever the annotation is satisfiable by `{} as T`.
+    const hasRequiredProps = ir.metadata.propsParams.some(
+      (p: ParamInfo) => !p.optional && p.defaultValue === undefined && !p.isRest,
+    )
+    const wantsNoArgDefault = propsObjectName ? !propsTypeName : !hasRequiredProps
+    const propsTypeExpr = typeAnnotation.replace(/^:\s*/, '')
+    const noArgDefault = wantsNoArgDefault ? ` = {} as ${propsTypeExpr}` : ''
+
     const lines: string[] = []
     // Module-export keyword belongs to the adapter: it knows the target language
     // and whether the source declared the component as exported.
     const exportPrefix = ir.metadata.isExported === false ? '' : 'export '
-    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}) {`)
+    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}${noArgDefault}) {`)
 
     // Add props extraction for SolidJS-style pattern
     if (propsExtraction) {
@@ -600,8 +617,8 @@ export class HonoAdapter extends JsxAdapter implements IRNodeEmitter<HonoRenderC
     return this.renderExpression(node)
   }
 
-  emitConditional(node: IRConditional, _ctx: HonoRenderCtx, _emit: EmitIRNode<HonoRenderCtx>): string {
-    return this.renderConditional(node)
+  emitConditional(node: IRConditional, ctx: HonoRenderCtx, _emit: EmitIRNode<HonoRenderCtx>): string {
+    return this.renderConditional(node, ctx)
   }
 
   emitLoop(node: IRLoop, _ctx: HonoRenderCtx, _emit: EmitIRNode<HonoRenderCtx>): string {
@@ -721,14 +738,21 @@ export class HonoAdapter extends JsxAdapter implements IRNodeEmitter<HonoRenderC
     return `{${expr.expr}}`
   }
 
-  renderConditional(cond: IRConditional): string {
+  renderConditional(cond: IRConditional, ctx?: HonoRenderCtx): string {
     // Handle @client directive - render comment markers for client-side evaluation
     if (cond.clientOnly && cond.slotId) {
       return `{bfComment("cond-start:${cond.slotId}")}{bfComment("cond-end:${cond.slotId}")}`
     }
 
-    const whenTrue = this.renderNodeRaw(cond.whenTrue)
-    let whenFalse = this.renderNodeRaw(cond.whenFalse)
+    // A conditional that is itself a loop item root (#1665 whole-item
+    // conditional: `arr.map(t => cond && <li/>)`) makes its branch element the
+    // loop item's root, so the `data-key` that reconciliation/hydration expect
+    // belongs on that element — exactly like a non-conditional loop root. Pass
+    // the flag through so `renderElement` emits `data-key`, matching the Go /
+    // CSR adapters' generic `key`→`data-key` rewrite.
+    const branchCtx: HonoRenderCtx | undefined = ctx?.isLoopItemRoot ? { isLoopItemRoot: true } : undefined
+    const whenTrue = this.renderNodeRawCtx(cond.whenTrue, branchCtx)
+    let whenFalse = this.renderNodeRawCtx(cond.whenFalse, branchCtx)
 
     // Handle empty/null whenFalse
     if (!whenFalse || whenFalse === '' || whenFalse === 'null') {
@@ -749,6 +773,20 @@ export class HonoAdapter extends JsxAdapter implements IRNodeEmitter<HonoRenderC
     return `{${cond.condition} ? ${whenTrue} : ${whenFalse}}`
   }
 
+  /**
+   * Like the base `renderNodeRaw`, but threads a render ctx through to
+   * `renderNode` so a conditional branch can mark its element as a loop item
+   * root (#1665). The `null` / `undefined` expression branch carries no
+   * element, so it short-circuits exactly as the base helper does.
+   */
+  private renderNodeRawCtx(node: IRNode, ctx?: HonoRenderCtx): string {
+    if (node.type === 'expression') {
+      if (node.expr === 'null' || node.expr === 'undefined') return 'null'
+      return node.expr
+    }
+    return this.renderNode(node, ctx)
+  }
+
   private wrapWithCondMarker(node: IRNode, content: string, condId: string): string {
     // Components don't reliably forward bf-c to their root element.
     // Use comment markers so insert() can find them via TreeWalker.
@@ -816,6 +854,14 @@ export class HonoAdapter extends JsxAdapter implements IRNodeEmitter<HonoRenderC
       // literal here to match the adapter's existing convention of
       // emitting comment-marker strings directly.
       safeChildren = `<>{bfComment('bf-loop-i')}${children}</>`
+    } else if (loop.bodyIsItemConditional && loop.key) {
+      // Whole-item conditional (#1665): a per-item `<!--bf-loop-i:KEY-->`
+      // anchor that is ALWAYS present (even when the item's conditional
+      // renders nothing), carrying the key so the client's
+      // `mapArrayAnchored` can hydrate every SSR-rendered item by its anchor.
+      // `bfComment(k)` emits `<!--bf-${k}-->`, so the `loop-i:` argument
+      // yields `<!--bf-loop-i:KEY-->`.
+      safeChildren = `<>{bfComment('loop-i:' + String(${loop.key}))}${children}</>`
     }
     // Apply chained `.sort()` / `.filter()` extracted to
     // `loop.sortComparator` / `loop.filterPredicate` (#1448 Tier B).

package/src/test-render.ts

@@ -8,6 +8,7 @@
 import { compileJSX } from '@barefootjs/jsx'
 import type { TemplateAdapter } from '@barefootjs/jsx'
 import { Hono } from 'hono'
+import { readFileSync } from 'node:fs'
 import { mkdir, rm } from 'node:fs/promises'
 import { resolve } from 'node:path'
 
@@ -23,6 +24,16 @@ export interface RenderOptions {
   props?: Record<string, unknown>
   /** Additional component files (filename → source) */
   components?: Record<string, string>
+  /**
+   * Pre-compiled child component modules (import specifier → absolute
+   * module path) — #1467 Phase 2a. When the parent imports one of these
+   * specifiers, the import is *re-anchored* to the given module path
+   * (kept as a real ESM import) instead of having the child inlined via
+   * `components`. The module is a committed, export-intact marked
+   * template, so SSR loads it through the module system — no export
+   * stripping. Takes precedence over `components` for the same key.
+   */
+  componentModules?: Record<string, string>
   /**
    * Explicit component to render when the source declares multiple
    * exports. When omitted, the first function-valued export in
@@ -34,14 +45,46 @@ export interface RenderOptions {
   componentName?: string
 }
 
+/**
+ * Drop module-level exports from a compiled marked template so it can be
+ * inlined as plain declarations alongside other components. Specifier
+ * blocks (`export { … }`, `export type { … }`, with or without a
+ * trailing `from '…'` re-export source) are removed whole; declaration
+ * forms (`export function/const/let/type/interface`, `export default`)
+ * keep their body with only the leading keyword stripped.
+ *
+ * The set of forms is bounded by `generateModuleExports` in
+ * @barefootjs/jsx — see the caller for the enumeration. This stays a
+ * line-oriented text pass (rather than a real parse) because the input
+ * is compiler-generated with a stable, single-line-per-export shape.
+ */
+function stripModuleExports(code: string): string {
+  return code
+    // `export [type] { … } [from '…']` specifier / re-export blocks.
+    .replace(
+      /^[ \t]*export\s+(?:type\s+)?\{[^}]*\}(?:[ \t]*from[ \t]*['"][^'"]*['"])?[ \t]*;?[ \t]*$/gm,
+      '',
+    )
+    // Leading keyword on declaration forms (`export function`,
+    // `export const X = …`, `export default …`, etc.).
+    .replace(/\bexport\s+(default\s+)?/g, '')
+}
+
 export async function renderHonoComponent(options: RenderOptions): Promise<string> {
-  const { source, adapter, props, components, componentName: requestedName } = options
+  const { source, adapter, props, components, componentModules, componentName: requestedName } = options
 
-  // Compile child components first
+  // Child imports re-anchored to a pre-compiled module (#1467 Phase 2a):
+  // import specifier → absolute path. These are NOT inlined; the parent's
+  // matching import is rewritten to the path and loaded as a real module.
+  const moduleMap = new Map<string, string>(Object.entries(componentModules ?? {}))
+
+  // Compile child components first (inline path). Keys also present in
+  // `moduleMap` are skipped here — they load as real modules instead.
   const childCodes: string[] = []
   const componentKeys = new Set<string>()
   if (components) {
     for (const [filename, childSource] of Object.entries(components)) {
+      if (moduleMap.has(filename)) continue
       componentKeys.add(filename)
       const childResult = compileJSX(childSource, filename, { adapter })
       const childErrors = childResult.errors.filter(e => e.severity === 'error')
@@ -50,8 +93,23 @@ export async function renderHonoComponent(options: RenderOptions): Promise<strin
       }
       const childTemplate = childResult.files.find(f => f.type === 'markedTemplate')
       if (!childTemplate) throw new Error(`No marked template for ${filename}`)
-      // Strip export keywords so only the parent component is exported
-      const localCode = childTemplate.content.replace(/\bexport\s+(default\s+)?/g, '')
+      // Strip exports so only the parent component is exported, inlining
+      // the child as plain top-level declarations. The marked template's
+      // export forms are fixed by `generateModuleExports` (+ the
+      // component's own `export function`) in @barefootjs/jsx, each on
+      // its own line:
+      //
+      //   export const/let X = …      export function / async function …
+      //   export type X = …           export interface X { … }
+      //   export { A, B } [from '…']   export type { A } [from '…']
+      //
+      // The `export { … }` / `export type { … }` *specifier* blocks
+      // (with or without a trailing `from '…'`) must be dropped whole —
+      // their bindings are already declared inline, and naively removing
+      // just the `export ` keyword leaves a bare `{ A }` / `type { A }`
+      // (the latter a syntax error). Declaration forms keep their body;
+      // only the leading `export `/`export default ` is removed.
+      const localCode = stripModuleExports(childTemplate.content)
       childCodes.push(localCode)
     }
   }
@@ -67,22 +125,56 @@ export async function renderHonoComponent(options: RenderOptions): Promise<strin
   const templateFile = result.files.find(f => f.type === 'markedTemplate')
   if (!templateFile) throw new Error('No marked template in compile output')
 
+  // Pre-compiled child modules are committed under the adapter-tests
+  // fixtures tree, where `hono/jsx` is NOT resolvable (hono lives in
+  // this package's node_modules — the very reason render temp files go
+  // here). Copy each committed module verbatim into the render temp dir
+  // and re-anchor the parent import there. The committed file stays the
+  // reviewable source of truth; this is a byte copy, not export surgery.
+  const childModuleWrites: Array<{ path: string; content: string }> = []
+  const moduleTempPaths = new Map<string, string>()
+  for (const [key, modPath] of moduleMap) {
+    const safe = key.replace(/[^a-zA-Z0-9]+/g, '_')
+    const tempPath = resolve(
+      RENDER_TEMP_DIR,
+      `child-${safe}-${Date.now()}-${Math.random().toString(36).slice(2)}.tsx`,
+    )
+    moduleTempPaths.set(key, tempPath)
+    childModuleWrites.push({ path: tempPath, content: readFileSync(modPath, 'utf8') })
+  }
+
   let parentCode = templateFile.content
-  // Strip import lines that reference component files
-  if (componentKeys.size > 0) {
+  // Resolve each child import: re-anchor to a pre-compiled module's temp
+  // copy (`moduleTempPaths`), strip it (inlined via `components`), or
+  // leave it. Both maps key on the import specifier; match the parent's
+  // import path with or without a `.tsx` extension (`./badge` ↔
+  // `./badge.tsx`).
+  //
+  // Assumes one import statement per line — the marked-template adapter
+  // emits single-line imports (`import { Slot } from '../slot'`), so the
+  // per-line scan is sufficient. A multi-line import would not match
+  // here; the unrewritten `../slot` then fails loudly at module
+  // resolution rather than rendering wrong output.
+  if (componentKeys.size > 0 || moduleTempPaths.size > 0) {
+    const matchKey = (importPath: string, keys: Iterable<string>): string | undefined => {
+      for (const key of keys) {
+        const keyWithoutExt = key.replace(/\.tsx?$/, '')
+        if (importPath === keyWithoutExt || importPath === key) return key
+      }
+      return undefined
+    }
     parentCode = parentCode
       .split('\n')
-      .filter(line => {
-        const importMatch = line.match(/^\s*import\s+.*from\s+['"](.+?)['"]/)
-        if (!importMatch) return true
-        const importPath = importMatch[1]
-        // Match against component keys: './badge' matches './badge.tsx'
-        for (const key of componentKeys) {
-          const keyWithoutExt = key.replace(/\.tsx?$/, '')
-          if (importPath === keyWithoutExt || importPath === key) return false
-        }
-        return true
+      .map(line => {
+        const importMatch = line.match(/^(\s*import\s+.*from\s+['"])(.+?)(['"].*)$/)
+        if (!importMatch) return line
+        const [, prefix, importPath, suffix] = importMatch
+        const moduleKey = matchKey(importPath, moduleTempPaths.keys())
+        if (moduleKey) return `${prefix}${moduleTempPaths.get(moduleKey)}${suffix}`
+        if (matchKey(importPath, componentKeys)) return null
+        return line
       })
+      .filter((line): line is string => line !== null)
       .join('\n')
   }
 
@@ -95,6 +187,11 @@ export async function renderHonoComponent(options: RenderOptions): Promise<strin
   const code = codeParts.join('\n')
 
   await mkdir(RENDER_TEMP_DIR, { recursive: true })
+  // Materialise the verbatim child-module copies next to the parent so
+  // their `hono/jsx` pragma resolves.
+  for (const { path, content } of childModuleWrites) {
+    await Bun.write(path, content)
+  }
   // Unique filename per render to avoid Bun's process-level module cache
   // (bun#12371: re-importing the same path returns stale module)
   const tempFile = resolve(
@@ -139,5 +236,8 @@ export async function renderHonoComponent(options: RenderOptions): Promise<strin
     return await res.text()
   } finally {
     await rm(tempFile, { force: true }).catch(() => {})
+    for (const { path } of childModuleWrites) {
+      await rm(path, { force: true }).catch(() => {})
+    }
   }
 }