@barefootjs/hono 0.31.0 → 0.31.1

package/dist/scripts.d.ts

@@ -1,3 +1,4 @@
+import type { JSX } from 'hono/jsx/jsx-runtime';
 import { type BarefootBuildManifest } from './app.ts';
 export type CollectedScript = {
     src: string;
@@ -51,7 +52,7 @@ export interface BfScriptsProps {
  * will check this flag and output their scripts inline instead of
  * collecting them here.
  */
-export declare function BfScripts(props?: BfScriptsProps): import("hono/jsx/jsx-dev-runtime").JSX.Element | null;
+export declare function BfScripts(props?: BfScriptsProps): JSX.Element | null;
 /**
  * Register `urls` (a component's resolved script URLs for THIS render) into
  * the same request-context collector `BfScripts` reads, and return the
@@ -124,7 +125,7 @@ export declare function registerComponentPreloads(urls: string[]): string[];
  * only ever pass `inlineScripts` (a component with `scriptAssets` but no
  * `preloadAssets`) keep compiling and behaving exactly as before.
  */
-export declare function wrapWithInlineScripts(jsx: unknown, inlineScripts: string[], inlinePreloads?: string[]): unknown;
+export declare function wrapWithInlineScripts(jsx: unknown, inlineScripts: string[], inlinePreloads?: string[]): JSX.Element;
 /**
  * Walk stub-rewrite edges from each manifest entry in `roots`,
  * returning the script URLs for every transitively reachable

package/dist/scripts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scripts.d.ts","sourceRoot":"","sources":["../src/scripts.tsx"],"names":[],"mappings":"AA0CA,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAEhF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,qBAAqB,CAAA;IAChC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CACtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,GAAE,cAAmB,yDAyEnD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAmBjE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAmBlE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,cAAc,GAAE,MAAM,EAAO,WASzG;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,qBAAqB,EAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,EACvB,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GACpB,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CA0B9B"}
+{"version":3,"file":"scripts.d.ts","sourceRoot":"","sources":["../src/scripts.tsx"],"names":[],"mappings":"AA0CA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAEhF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,qBAAqB,CAAA;IAChC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CACtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,GAAE,cAAmB,sBAyEnD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAmBjE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAmBlE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,cAAc,GAAE,MAAM,EAAO,GAAG,GAAG,CAAC,OAAO,CASvH;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,qBAAqB,EAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,EACvB,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GACpB,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CA0B9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/hono",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "description": "Hono integration for BarefootJS",
   "type": "module",
   "main": "./dist/index.js",
@@ -122,7 +122,7 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/vite": "0.31.0",
+    "@barefootjs/vite": "0.31.1",
     "@types/jsdom": "^27.0.0",
     "hono": "^4.6.0",
     "jsdom": "^27.3.0",

package/src/__tests__/consumer-typecheck.test.ts

@@ -0,0 +1,96 @@
+/**
+ * Regression for piconic-ai/barefootjs#2559: type-check a CONSUMER program
+ * that imports a compiled template — the coverage gap that let
+ * `wrapWithInlineScripts`'s `unknown` return ship. Every generated
+ * component returns that call as its body, so an `unknown` return made
+ * every island fail TS2786 ("cannot be used as a JSX component") in any
+ * type-checking consumer (hit by sora's 0.26.2 → 0.31.0 migration), while
+ * nothing in-repo ever ran tsc over a program shaped like a consumer app.
+ *
+ * The test compiles a real `'use client'` component with a non-empty
+ * `scriptAssets` (so the emitted template wraps its return in
+ * `wrapWithInlineScripts`), writes it plus a scaffold-shaped `server.tsx`
+ * that renders the island, and type-checks the pair with the scaffold's
+ * own options (`strict`, `jsxImportSource: '@barefootjs/hono/jsx'`).
+ */
+import { describe, expect, test } from 'bun:test'
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
+import { join, resolve } from 'node:path'
+import ts from 'typescript'
+import { compileJSX } from '@barefootjs/jsx'
+import { HonoAdapter } from '../adapter/index.ts'
+
+const HERE = resolve(import.meta.dir)
+
+const COMPONENT_SOURCE = `"use client"
+
+import { createSignal } from '@barefootjs/client'
+
+export function Counter() {
+  const [count, setCount] = createSignal(0)
+  return <button onClick={() => setCount(count() + 1)}>{count()}</button>
+}
+`
+
+const SERVER_SOURCE = `import { Counter } from './components/Counter.tsx'
+
+export function Page() {
+  return (
+    <div>
+      <Counter />
+    </div>
+  )
+}
+`
+
+describe('consumer program type-check (#2559)', () => {
+  test('a compiled template used as a JSX component type-checks clean', () => {
+    const result = compileJSX(COMPONENT_SOURCE, '/virtual/Counter.tsx', {
+      adapter: new HonoAdapter(),
+      // Non-empty so the emitted template's component body returns
+      // wrapWithInlineScripts(...) — the #2559 shape.
+      scriptAssets: ['/static/components/assets/Counter.js'],
+    })
+    expect(result.errors.filter(e => e.severity === 'error')).toEqual([])
+    const template = result.files.find(f => f.type === 'markedTemplate')?.content
+    expect(template).toContain('wrapWithInlineScripts(')
+
+    // Inside the package so module resolution reaches the workspace's
+    // node_modules (hono, @barefootjs/*) exactly like a scaffolded app's.
+    const tmp = mkdtempSync(join(HERE, '.consumer-typecheck-'))
+    try {
+      mkdirSync(join(tmp, 'components'), { recursive: true })
+      writeFileSync(join(tmp, 'components', 'Counter.tsx'), template!)
+      writeFileSync(join(tmp, 'server.tsx'), SERVER_SOURCE)
+
+      const program = ts.createProgram(
+        [join(tmp, 'server.tsx')],
+        {
+          strict: true,
+          noEmit: true,
+          target: ts.ScriptTarget.ESNext,
+          module: ts.ModuleKind.ESNext,
+          moduleResolution: ts.ModuleResolutionKind.Bundler,
+          jsx: ts.JsxEmit.ReactJSX,
+          jsxImportSource: '@barefootjs/hono/jsx',
+          lib: ['lib.esnext.d.ts', 'lib.dom.d.ts'],
+          allowImportingTsExtensions: true,
+          // Consumer apps skipLibCheck too; TS2786 fires in OUR files
+          // regardless, which is exactly what this test pins.
+          skipLibCheck: true,
+        },
+      )
+      const diagnostics = ts.getPreEmitDiagnostics(program).map(d => ({
+        code: d.code,
+        file: d.file?.fileName ?? '',
+        message: ts.flattenDiagnosticMessageText(d.messageText, ' '),
+      }))
+
+      // TS2786 = "'X' cannot be used as a JSX component." — the #2559
+      // failure. Assert none anywhere in the consumer program.
+      expect(diagnostics.filter(d => d.code === 2786)).toEqual([])
+    } finally {
+      rmSync(tmp, { recursive: true, force: true })
+    }
+  })
+})

package/src/scripts.tsx

@@ -40,6 +40,7 @@
 
 import { useRequestContext } from 'hono/jsx-renderer'
 import { Fragment } from 'hono/jsx'
+import type { JSX } from 'hono/jsx/jsx-runtime'
 import { relPathFromComponentsBase, type BarefootBuildManifest } from './app.ts'
 
 export type CollectedScript = {
@@ -284,8 +285,8 @@ export function registerComponentPreloads(urls: string[]): string[] {
  * only ever pass `inlineScripts` (a component with `scriptAssets` but no
  * `preloadAssets`) keep compiling and behaving exactly as before.
  */
-export function wrapWithInlineScripts(jsx: unknown, inlineScripts: string[], inlinePreloads: string[] = []) {
-  if (inlineScripts.length === 0 && inlinePreloads.length === 0) return jsx
+export function wrapWithInlineScripts(jsx: unknown, inlineScripts: string[], inlinePreloads: string[] = []): JSX.Element {
+  if (inlineScripts.length === 0 && inlinePreloads.length === 0) return jsx as JSX.Element
   return (
     <Fragment>
       {inlinePreloads.map(href => <link rel="modulepreload" crossorigin="" href={href} />)}