@bakery-framework/core 2.4.2 → 2.5.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakery-framework/core",
-  "version": "2.4.2",
+  "version": "2.5.0-alpha.1",
   "description": "Bakery framework core: handlers, router, config, session, caches, logger, compiler.",
   "keywords": [
     "bakery",
@@ -65,6 +65,6 @@
     "!src/tests"
   ],
   "engines": {
-    "bun": ">=1.4.0"
+    "bun": ">=1.4.4"
   }
 }

package/src/cache/shared-db.ts

@@ -4,7 +4,7 @@ import { Bakery } from '../core/bakery'
 import { checkCacheVersion } from '../core/cache-version'
 import { serveLog } from '../logger/serve-log'
 import { fs } from '../utils'
-import { Try } from '../utils/common/try'
+import { Try } from '../utils/isomorphic/try'
 
 /**
  * The tiered cache's spill-to-disk store: sessions and LRU overflow.
@@ -134,9 +134,8 @@ if (!stored) {
 export function applyJournalMode(db: Database, file: string): string {
   const asked = Try.return(
     () =>
-      db
-        .query<{ journal_mode: string }, []>('PRAGMA journal_mode = WAL;')
-        .get()?.journal_mode ?? '',
+      db.query<{ journal_mode: string }, []>('PRAGMA journal_mode = WAL;').get()
+        ?.journal_mode ?? '',
     (error: Error) => `threw: ${error.message}`,
   )
   if (asked.toLowerCase() === 'wal') return 'wal'

package/src/client/livereload.ts

@@ -362,7 +362,7 @@ function connect() {
   ws.onmessage = e => {
     const data = typeof e.data === 'string' ? e.data : String(e.data)
 
-    // The server sends two frame shapes: legacy plain strings (a
+    // The server sends two frame shapes: plain strings (a
     // watcher-relative filename, or the literal 'force_reload') and JSON
     // objects, currently `{type: 'error', title, body}` from
     // compiler/dev-service.ts's notifyError. A relative path can never begin
@@ -374,7 +374,7 @@ function connect() {
         frame = JSON.parse(data)
       } catch {
         // A '{'-prefixed frame that is not JSON is not a filename either;
-        // frame stays null and the string falls through as a legacy frame.
+        // frame stays null and the string falls through as a plain frame.
       }
       if (frame) {
         if (frame.type === 'error') {

package/src/client/utils.ts

@@ -1,5 +1,3 @@
-/** biome-ignore-all lint/complexity/noExcessiveCognitiveComplexity: '*/
-
 /**
  * Browser runtime: binds the shared utilities onto `globalThis` and adds the
  * DOM-dependent pieces ($fmt, speculation rules, live navigation) on top.

package/src/compiler/dev-service.ts

@@ -29,7 +29,7 @@ export function notifySockets(server: any, filename: string) {
  * `{type: 'error', title, body}`. client/livereload.ts renders it as an
  * overlay and removes it on the next successful reload frame.
  *
- * Legacy reload frames stay plain filename strings: the client distinguishes
+ * Reload frames are plain filename strings: the client distinguishes
  * the two by a leading `{`, so this must always be JSON and filenames must
  * never be. Paths that cannot reach a live socket at all (worker dead, boot
  * failure before `Bun.serve`) are covered client-side by the disconnect

package/src/compiler/prompt-tracker.ts

@@ -1,6 +1,6 @@
 import { unlinkSync } from 'node:fs'
 import { cacheDir } from '../core/context'
-import { Try } from '../utils/common/try'
+import { Try } from '../utils/isomorphic/try'
 
 /**
  * **`cacheDir` comes from `core/context`, not from `Bakery`. Do not change it

package/src/core/cache-version.ts

@@ -64,11 +64,6 @@ export function isCacheStale(
   )
 }
 
-/** Test seam: forget that the check ran, so a fixture can exercise it again. */
-export function __resetCacheVersionCheck(): void {
-  done = null
-}
-
 async function run(): Promise<void> {
   // Workers inherit a directory the master already validated. Re-running here
   // would race the master's own wipe.

package/src/core/jsx.ts

@@ -33,7 +33,7 @@ export const Fragment = ({ children }: { children?: any }) =>
  * like a string everywhere (`.trim()`, concatenation, `String()`), so callers
  * are unaffected.
  */
-export class SafeHtml extends String {}
+class SafeHtml extends String {}
 
 /** Mark a string as trusted HTML, exempting it from escaping. */
 export function raw(value: unknown): string {
@@ -142,8 +142,7 @@ export function html<P = {}>(render: RenderFn<P>) {
     const prefix =
       startsAt < 0 ? '' : rawDom.slice(startsAt, startsAt + 9).toLowerCase()
 
-    if (prefix.startsWith('<html'))
-      return `<!DOCTYPE html>\n${rawDom}`
+    if (prefix.startsWith('<html')) return `<!DOCTYPE html>\n${rawDom}`
     if (prefix.startsWith('<!doctype')) return rawDom
 
     let title = 'Document'

package/src/global.d.ts

@@ -50,8 +50,7 @@ declare global {
    * string) is ignored and the next middleware runs. See `$middleware.ts`.
    */
   type MiddlewareResponse =
-    | Response
-    | import('./utils/common/json').JsonResponseData
+    Response | import('./utils/common/json').JsonResponseData
 
   type HostEntry = {
     root?: string

package/src/handlers/core/$base.ts

@@ -115,7 +115,6 @@ export namespace Route {
 // namespace for its nested classes; `const RouteData = { Info: class {} }`
 // provides only the value, and every one of those type references stops
 // resolving.
-// biome-ignore lint/complexity/noStaticOnlyClass: also a type namespace. See above
 export class RouteData {
   static Info = class Info {
     readonly params: string[]

package/src/handlers/core/$dynamic.ts

@@ -130,7 +130,6 @@ export class DynamicHandler extends Handler {
   // Segment matching with catch-all and specificity precedence. The branches
   // are the precedence rules; splitting them hides the ordering that is the
   // whole point.
-  // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: route-precedence dispatcher
   static findDynamicRoute(path: string): Route.Info | null {
     const root = Bakery.serveRoot
     let deferred: Route.Info[] | null = null

package/src/handlers/core/$registry.ts

@@ -125,7 +125,6 @@ export class HandlerMap<T extends typeof Handler = typeof Handler> extends Map<
    */
   // The `probed` bookkeeping exists because middleware has side effects and
   // must not run twice. That constraint is what the branching encodes.
-  // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: cache-path + side-effect-sensitive probe loop
   async resolve(path: string, req?: Request, ...rest: any[]) {
     // The **resolved** host, not the header. `__hostname` is whatever arrived
     // in `Host`, and `routeCache` is one bounded LRU shared by every tenant, so

package/src/handlers/core/$routing.ts

@@ -174,7 +174,6 @@ async function getCatchAllRoute(
   return info
 }
 
-// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: request-to-route dispatcher
 export async function getRoute(
   pathOrArr: string | string[],
   exts: string[] = [],

package/src/logger/logger.ts

@@ -1,8 +1,8 @@
 import { PromptTracker } from '../compiler/prompt-tracker'
 import type { MapOf } from '../types'
 import { Case } from '../utils/common/case'
-import { match } from '../utils/common/match'
-import { Try } from '../utils/common/try'
+import { match } from '../utils/isomorphic/match'
+import { Try } from '../utils/isomorphic/try'
 
 const logLevels = ['info', 'warn', 'error', 'fatal', 'debug', 'trace'] as const
 const byLength = 15

package/src/router.ts

@@ -289,7 +289,8 @@ export const serveWebSocket: Bun.WebSocketHandler<any> = {
       try {
         const h = prepareWSData(ws)
         if (h) return await h.handler.message(ws, message, h.data)
-        config.websocket.message(ws, message)
+        // Optional since bun-types 1.4.4, like the other three below.
+        await config.websocket.message?.(ws, message)
       } catch (err: any) {
         serveLog.UNHANDLED_ERR({
           error: `WebSocket message error: ${errorMsg(err)}`,

package/src/utils/common/index.ts

@@ -1,5 +1,5 @@
 export * from './case'
 export * from './json'
-export * from './match'
+export * from '../isomorphic/match'
 export * from './misc'
-export * from './try'
+export * from '../isomorphic/try'

package/src/utils/fs.ts

@@ -585,7 +585,10 @@ export namespace FileSystem {
    * of the source before it. That is how an SFC in a dev server kept its old
    * styles beside a new template and script after three quick edits.
    */
-  function versionedName(cacheName: string, sourceMtime: number | null): string {
+  function versionedName(
+    cacheName: string,
+    sourceMtime: number | null,
+  ): string {
     if (!sourceMtime) return cacheName
     const ext = parse(cacheName).ext
     return `${cacheName.slice(0, cacheName.length - ext.length)}@${sourceMtime}${ext}`

package/src/utils/http/dom.ts

@@ -4,7 +4,7 @@ import { Bakery, hostStore } from '../../core/bakery'
 import { hostEntryKey } from '../../core/config'
 import type { MapOf } from '../../types'
 import { is } from '../common/misc'
-import { Try } from '../common/try'
+import { Try } from '../isomorphic/try'
 import { fs } from '../fs'
 import { escapeScriptJson } from '../isomorphic/escape'
 

package/src/utils/http/etag.ts

@@ -135,7 +135,6 @@ export namespace ETag {
     negotiationMemo.clear()
   }
 
-  // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: content negotiation, one branch per encoding outcome
   function negotiateFile(file: Bun.BunFile, req?: Request) {
     const fileName = file.name || 'file'
 

package/src/utils/http/html.ts

@@ -1,6 +1,6 @@
 import { Bakery, hostStore } from '../../core/bakery'
 import type { MapOf } from '../../types'
-import { Try } from '../common/try'
+import { Try } from '../isomorphic/try'
 import { DOMTools, headBodyCache } from './dom'
 import { ETag } from './etag'
 

package/src/utils/http/index.ts

@@ -3,7 +3,7 @@ export * from './body'
 export * from './credential'
 export * from './csrf'
 export * from './dom'
-export * from './escape'
+export * from '../isomorphic/escape'
 export * from './etag'
 export * from './html'
 export * from './ip'

package/src/utils/http/validate.ts

@@ -28,8 +28,7 @@ export interface StandardSchemaLike<T> {
 }
 
 type StandardResult<T> =
-  | { value: T; issues?: undefined }
-  | { issues: readonly StandardIssue[] }
+  { value: T; issues?: undefined } | { issues: readonly StandardIssue[] }
 
 interface StandardIssue {
   message: string
@@ -48,8 +47,7 @@ export interface ValidationIssue {
 }
 
 export type ValidationResult<T> =
-  | { ok: true; value: T }
-  | { ok: false; issues: ValidationIssue[] }
+  { ok: true; value: T } | { ok: false; issues: ValidationIssue[] }
 
 function isStandardSchema<T>(v: Validator<T>): v is StandardSchemaLike<T> {
   return typeof v === 'object' && v !== null && '~standard' in v

package/src/utils/common/match.ts

@@ -1,6 +0,0 @@
-/**
- * Moved to `utils/isomorphic/match` so the browser bundle and the server share
- * one implementation: the prototype-chain fix (`Object.hasOwn` rather than
- * `in`) previously had to be applied to both copies separately.
- */
-export * from '../isomorphic/match'

package/src/utils/common/try.ts

@@ -1,6 +0,0 @@
-/**
- * Moved to `utils/isomorphic/try` so the browser bundle and the server share one
- * implementation. Re-exported here because `@server/utils` and a number of
- * modules import `Try` from this path.
- */
-export * from '../isomorphic/try'

package/src/utils/http/escape.ts

@@ -1,8 +0,0 @@
-/**
- * Server-facing path for the escaping primitives.
- *
- * The implementation lives in `utils/isomorphic/escape` because the browser
- * bundle needs it too; server code imports it from here (or from `@server/utils`)
- * so callers don't have to know which side of that boundary it sits on.
- */
-export { escapeHtml, escapeScriptJson } from '../isomorphic/escape'

package/src/utils/isomorphic/index.ts

@@ -1,15 +0,0 @@
-/**
- * Pure utilities shared by the server and the browser bundle.
- *
- * Rule for this directory: no `Bun.*`, no node builtins, no DOM globals. These
- * modules are compiled into the client bundle as-is, so anything that reaches
- * for a runtime API belongs one layer up in `utils/` or in `client/`.
- */
-export * from './case'
-export * from './escape'
-export * from './is'
-export * from './match'
-export * from './math'
-export * from './misc'
-export * from './stringify'
-export * from './try'