@barefootjs/hono 0.4.0 → 0.5.1

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

@@ -44,6 +44,7 @@ export declare class HonoAdapter extends JsxAdapter implements IRNodeEmitter<Hon
     name: string;
     extension: string;
     clientShimSource: string;
+    importMapInjection: 'component';
     acceptsTemplateCall: () => boolean;
     protected jsxConfig: JsxAdapterConfig;
     private options;
@@ -77,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;
@@ -90,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;IAmBjD,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

@@ -21,6 +21,7 @@ class HonoAdapter extends JsxAdapter {
   name = "hono";
   extension = ".tsx";
   clientShimSource = "@barefootjs/hono/client-shim";
+  importMapInjection = "component";
   acceptsTemplateCall = () => true;
   jsxConfig = { preserveTypes: true };
   options;
@@ -259,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);
     }
@@ -312,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);
@@ -400,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";
     }
@@ -416,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}")}</>`;
@@ -446,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/app.d.ts

@@ -27,6 +27,7 @@
  */
 import type { MiddlewareHandler } from 'hono';
 import type { HtmlEscapedString } from 'hono/utils/html';
+import { type ImportMapManifest } from '@barefootjs/jsx/import-map';
 /**
  * Build manifest shape produced by `bf build`. Each compiled
  * component is keyed by its manifest name; `__barefoot__` is the
@@ -63,22 +64,6 @@ export interface BarefootBuildManifest {
  */
 export declare function manifestToScriptUrls(manifest: BarefootBuildManifest, base: string): string[];
 export declare function relPathFromComponentsBase(p: string): string;
-/**
- * Shape of `barefoot-externals.json`, written by `bf build` when
- * `externals` / `bundleEntries` are configured. Only the fields
- * `BfImportMap` consumes are typed here; the build also emits an
- * `externals` array (the `--external` list) which the importmap
- * doesn't need. Fields are optional so a partial/hand-written
- * manifest still type-checks. See issue #1639.
- */
-export interface BarefootExternalsManifest {
-    /** Entries for the `<script type="importmap">`. */
-    importmap?: {
-        imports?: Record<string, string>;
-    };
-    /** URLs to emit as `<link rel="modulepreload">`. */
-    preloads?: string[];
-}
 export interface BfImportMapProps {
     /** Base URL where the runtime + component bundles are served. */
     base: string;
@@ -89,8 +74,12 @@ export interface BfImportMapProps {
      * configured externals (e.g. `zod`, `@barefootjs/form`) resolve in
      * the browser. When omitted, only the `@barefootjs/client*`
      * mappings are emitted — the pre-#1639 behavior.
+     *
+     * Typed with the shared {@link ImportMapManifest} from `@barefootjs/jsx`,
+     * so the component and the `bf build` snippet path describe the manifest
+     * with one type.
      */
-    externals?: BarefootExternalsManifest;
+    externals?: ImportMapManifest;
     /**
      * Whether to also emit `<link rel="modulepreload">` for the
      * manifest's `preloads`. Defaults to `true`; set `false` to emit
@@ -105,6 +94,15 @@ export interface BfImportMapProps {
  * passed via the `externals` prop. Also emits `<link rel="modulepreload">`
  * for the manifest's `preloads` unless `preload` is `false`. Place in
  * `<head>`.
+ *
+ * The merge of the `@barefootjs/client*` defaults (synthesized from `base`
+ * for prop-less / hand-written manifests) is Hono-specific; the actual HTML
+ * rendering — importmap JSON escaping, `<link rel="modulepreload">`
+ * emission with `crossorigin` (#1648) — is delegated to the shared
+ * `renderImportMapHtml` so this path can never drift from the static
+ * `barefoot-importmap.html` snippet `bf build` emits for template-string
+ * adapters (#1644). Imported from the `@barefootjs/jsx/import-map` subpath,
+ * a zero-dependency module, to keep this runtime file free of the compiler.
  */
 export declare function BfImportMap(props: BfImportMapProps): HtmlEscapedString | Promise<HtmlEscapedString>;
 export interface BfScriptsProps {

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAA;AAE7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAQxD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACpC,CAAC,aAAa,EAAE,MAAM,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CAAA;CAChF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,qBAAqB,EAC/B,IAAI,EAAE,MAAM,GACX,MAAM,EAAE,CAWV;AAED,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE3D;AAID;;;;;;;GAOG;AACH,MAAM,WAAW,yBAAyB;IACxC,mDAAmD;IACnD,SAAS,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAA;IAChD,oDAAoD;IACpD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,iEAAiE;IACjE,IAAI,EAAE,MAAM,CAAA;IACZ;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,yBAAyB,CAAA;IACrC;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAuBnG;AAOD,MAAM,WAAW,cAAc;IAC7B,iEAAiE;IACjE,IAAI,EAAE,MAAM,CAAA;IACZ,6DAA6D;IAC7D,QAAQ,EAAE,qBAAqB,CAAA;CAChC;AAQD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAa/F;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,GAAE,gBAAqB,GAAG,iBAAiB,GAAG,IAAI,CAelF;AAID,MAAM,WAAW,wBAAwB;IACvC,yBAAyB;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAA;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,GAAG,iBAAiB,CAanF"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAA;AAE7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAIxD,OAAO,EAAuB,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAOxF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACpC,CAAC,aAAa,EAAE,MAAM,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CAAA;CAChF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,qBAAqB,EAC/B,IAAI,EAAE,MAAM,GACX,MAAM,EAAE,CAWV;AAED,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE3D;AAID,MAAM,WAAW,gBAAgB;IAC/B,iEAAiE;IACjE,IAAI,EAAE,MAAM,CAAA;IACZ;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,EAAE,iBAAiB,CAAA;IAC7B;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAanG;AAED,MAAM,WAAW,cAAc;IAC7B,iEAAiE;IACjE,IAAI,EAAE,MAAM,CAAA;IACZ,6DAA6D;IAC7D,QAAQ,EAAE,qBAAqB,CAAA;CAChC;AAQD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAa/F;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,GAAE,gBAAqB,GAAG,iBAAiB,GAAG,IAAI,CAelF;AAID,MAAM,WAAW,wBAAwB;IACvC,yBAAyB;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB;;;;;;OAMG;IACH,OAAO,EAAE,OAAO,CAAA;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,GAAG,iBAAiB,CAanF"}

package/dist/app.js

@@ -64,6 +64,7 @@ data: ${BOOT_ID}
 // src/app.ts
 import { html, raw } from "hono/html";
 import { useRequestContext } from "hono/jsx-renderer";
+import { renderImportMapHtml } from "@barefootjs/jsx/import-map";
 var DEV_RELOAD_ENDPOINT_KEY = "bfDevReloadEndpoint";
 function manifestToScriptUrls(manifest, base) {
   const out = [];
@@ -89,13 +90,8 @@ function BfImportMap(props) {
     "@barefootjs/client/runtime": `${base}/barefoot.js`,
     ...props.externals?.importmap?.imports ?? {}
   };
-  const json = JSON.stringify({ imports });
   const preloads = props.preload === false ? [] : props.externals?.preloads ?? [];
-  const links = preloads.map((href) => `<link rel="modulepreload" href="${escapeAttr(href)}" crossorigin>`).join("");
-  return html`<script type="importmap">${raw(json)}</script>${raw(links)}`;
-}
-function escapeAttr(value) {
-  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+  return html`${raw(renderImportMapHtml({ importmap: { imports }, preloads }))}`;
 }
 var __bfEmptyManifestWarned = false;
 function BfScripts(props) {

package/dist/build.js

@@ -21,6 +21,7 @@ class HonoAdapter extends JsxAdapter {
   name = "hono";
   extension = ".tsx";
   clientShimSource = "@barefootjs/hono/client-shim";
+  importMapInjection = "component";
   acceptsTemplateCall = () => true;
   jsxConfig = { preserveTypes: true };
   options;
@@ -259,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);
     }
@@ -312,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);
@@ -400,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";
     }
@@ -416,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}")}</>`;
@@ -446,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

@@ -21,6 +21,7 @@ class HonoAdapter extends JsxAdapter {
   name = "hono";
   extension = ".tsx";
   clientShimSource = "@barefootjs/hono/client-shim";
+  importMapInjection = "component";
   acceptsTemplateCall = () => true;
   jsxConfig = { preserveTypes: true };
   options;
@@ -259,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);
     }
@@ -312,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);
@@ -400,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";
     }
@@ -416,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}")}</>`;
@@ -446,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/scripts.js

@@ -64,6 +64,7 @@ data: ${BOOT_ID}
 // src/app.ts
 import { html, raw } from "hono/html";
 import { useRequestContext } from "hono/jsx-renderer";
+import { renderImportMapHtml } from "@barefootjs/jsx/import-map";
 var DEV_RELOAD_ENDPOINT_KEY = "bfDevReloadEndpoint";
 function manifestToScriptUrls(manifest, base) {
   const out = [];
@@ -89,13 +90,8 @@ function BfImportMap(props) {
     "@barefootjs/client/runtime": `${base}/barefoot.js`,
     ...props.externals?.importmap?.imports ?? {}
   };
-  const json = JSON.stringify({ imports });
   const preloads = props.preload === false ? [] : props.externals?.preloads ?? [];
-  const links = preloads.map((href) => `<link rel="modulepreload" href="${escapeAttr(href)}" crossorigin>`).join("");
-  return html`<script type="importmap">${raw(json)}</script>${raw(links)}`;
-}
-function escapeAttr(value) {
-  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+  return html`${raw(renderImportMapHtml({ importmap: { imports }, preloads }))}`;
 }
 var __bfEmptyManifestWarned = false;
 function BfScripts(props) {

package/package.json

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

package/src/__tests__/import-map.test.ts

@@ -7,7 +7,8 @@
  * when no externals are passed.
  */
 import { describe, test, expect } from 'bun:test'
-import { BfImportMap, type BarefootExternalsManifest } from '../app'
+import { BfImportMap } from '../app'
+import type { ImportMapManifest } from '@barefootjs/jsx'
 
 function parseImportMap(html: string): Record<string, string> {
   const match = html.match(/<script type="importmap">(.*?)<\/script>/s)
@@ -31,7 +32,7 @@ describe('BfImportMap', () => {
   })
 
   test('merges externals importmap on top of the client defaults', () => {
-    const externals: BarefootExternalsManifest = {
+    const externals: ImportMapManifest = {
       importmap: {
         imports: {
           zod: 'https://esm.sh/zod@4.4.3',
@@ -50,7 +51,7 @@ describe('BfImportMap', () => {
   })
 
   test('manifest @barefootjs/client mapping wins over the prop-derived one', () => {
-    const externals: BarefootExternalsManifest = {
+    const externals: ImportMapManifest = {
       importmap: { imports: { '@barefootjs/client': '/vendor/barefoot.js' } },
     }
     const imports = parseImportMap(String(BfImportMap({ base: '/components', externals })))
@@ -58,7 +59,7 @@ describe('BfImportMap', () => {
   })
 
   test('emits modulepreload links for manifest preloads', () => {
-    const externals: BarefootExternalsManifest = {
+    const externals: ImportMapManifest = {
       importmap: { imports: {} },
       preloads: ['/components/form.js', 'https://esm.sh/zod@4.4.3'],
     }
@@ -68,7 +69,7 @@ describe('BfImportMap', () => {
   })
 
   test('emits crossorigin on modulepreload so cross-origin CDN preloads are reused', () => {
-    const externals: BarefootExternalsManifest = {
+    const externals: ImportMapManifest = {
       preloads: ['https://esm.sh/zod@4.4.3'],
     }
     const html = String(BfImportMap({ base: '/components', externals }))
@@ -77,7 +78,7 @@ describe('BfImportMap', () => {
   })
 
   test('preload=false suppresses modulepreload links', () => {
-    const externals: BarefootExternalsManifest = {
+    const externals: ImportMapManifest = {
       preloads: ['/components/form.js'],
     }
     const html = String(BfImportMap({ base: '/components', externals, preload: false }))
@@ -87,7 +88,7 @@ describe('BfImportMap', () => {
   })
 
   test('escapes double quotes in preload hrefs', () => {
-    const externals: BarefootExternalsManifest = {
+    const externals: ImportMapManifest = {
       preloads: ['/components/"onerror=alert(1).js'],
     }
     const html = String(BfImportMap({ base: '/components', externals }))

package/src/adapter/hono-adapter.ts

@@ -103,6 +103,9 @@ export class HonoAdapter extends JsxAdapter implements IRNodeEmitter<HonoRenderC
   name = 'hono'
   extension = '.tsx'
   clientShimSource = '@barefootjs/hono/client-shim'
+  // Importmap is injected at render time by the `BfImportMap` component
+  // (reads `barefoot-externals.json`), so `bf build` emits no static snippet.
+  importMapInjection = 'component' as const
 
   // The Hono SSR runtime is JavaScript (Node / Bun / CF Workers), so any
   // synchronous JS call the user writes can be rendered as-is at template
@@ -507,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) {
@@ -597,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 {
@@ -718,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') {
@@ -746,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.
@@ -813,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/app.ts

@@ -30,6 +30,9 @@ import type { MiddlewareHandler } from 'hono'
 import { html, raw } from 'hono/html'
 import type { HtmlEscapedString } from 'hono/utils/html'
 import { useRequestContext } from 'hono/jsx-renderer'
+// Zero-dependency subpath — keeps the compiler (and its `typescript` dep) out
+// of this runtime/Workers-bundled module while sharing one importmap renderer.
+import { renderImportMapHtml, type ImportMapManifest } from '@barefootjs/jsx/import-map'
 import { createDevReloader } from './dev-worker'
 
 const DEV_RELOAD_ENDPOINT_KEY = 'bfDevReloadEndpoint'
@@ -88,21 +91,6 @@ export function relPathFromComponentsBase(p: string): string {
 
 // ── JSX components ─────────────────────────────────────────────────────────
 
-/**
- * Shape of `barefoot-externals.json`, written by `bf build` when
- * `externals` / `bundleEntries` are configured. Only the fields
- * `BfImportMap` consumes are typed here; the build also emits an
- * `externals` array (the `--external` list) which the importmap
- * doesn't need. Fields are optional so a partial/hand-written
- * manifest still type-checks. See issue #1639.
- */
-export interface BarefootExternalsManifest {
-  /** Entries for the `<script type="importmap">`. */
-  importmap?: { imports?: Record<string, string> }
-  /** URLs to emit as `<link rel="modulepreload">`. */
-  preloads?: string[]
-}
-
 export interface BfImportMapProps {
   /** Base URL where the runtime + component bundles are served. */
   base: string
@@ -113,8 +101,12 @@ export interface BfImportMapProps {
    * configured externals (e.g. `zod`, `@barefootjs/form`) resolve in
    * the browser. When omitted, only the `@barefootjs/client*`
    * mappings are emitted — the pre-#1639 behavior.
+   *
+   * Typed with the shared {@link ImportMapManifest} from `@barefootjs/jsx`,
+   * so the component and the `bf build` snippet path describe the manifest
+   * with one type.
    */
-  externals?: BarefootExternalsManifest
+  externals?: ImportMapManifest
   /**
    * Whether to also emit `<link rel="modulepreload">` for the
    * manifest's `preloads`. Defaults to `true`; set `false` to emit
@@ -130,6 +122,15 @@ export interface BfImportMapProps {
  * passed via the `externals` prop. Also emits `<link rel="modulepreload">`
  * for the manifest's `preloads` unless `preload` is `false`. Place in
  * `<head>`.
+ *
+ * The merge of the `@barefootjs/client*` defaults (synthesized from `base`
+ * for prop-less / hand-written manifests) is Hono-specific; the actual HTML
+ * rendering — importmap JSON escaping, `<link rel="modulepreload">`
+ * emission with `crossorigin` (#1648) — is delegated to the shared
+ * `renderImportMapHtml` so this path can never drift from the static
+ * `barefoot-importmap.html` snippet `bf build` emits for template-string
+ * adapters (#1644). Imported from the `@barefootjs/jsx/import-map` subpath,
+ * a zero-dependency module, to keep this runtime file free of the compiler.
  */
 export function BfImportMap(props: BfImportMapProps): HtmlEscapedString | Promise<HtmlEscapedString> {
   const base = props.base.replace(/\/$/, '')
@@ -141,24 +142,9 @@ export function BfImportMap(props: BfImportMapProps): HtmlEscapedString | Promis
     '@barefootjs/client/runtime': `${base}/barefoot.js`,
     ...(props.externals?.importmap?.imports ?? {}),
   }
-  const json = JSON.stringify({ imports })
-
   const preloads = props.preload === false ? [] : props.externals?.preloads ?? []
-  // `crossorigin` is required so a cross-origin (CDN) preload's request
-  // matches the actual module `import` (always a CORS fetch); without it
-  // the browser discards the preload and re-fetches. It's harmless for
-  // same-origin module preloads, which use the same credentials mode
-  // whether or not the attribute is present. See issue #1648.
-  const links = preloads
-    .map((href) => `<link rel="modulepreload" href="${escapeAttr(href)}" crossorigin>`)
-    .join('')
-
-  return html`<script type="importmap">${raw(json)}</script>${raw(links)}`
-}
 
-/** Minimal double-quoted-attribute escaping for config-derived URLs. */
-function escapeAttr(value: string): string {
-  return value.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;')
+  return html`${raw(renderImportMapHtml({ importmap: { imports }, preloads }))}`
 }
 
 export interface BfScriptsProps {