npm - brustjs - Versions diffs - 0.1.49-alpha → 0.1.51-alpha - Mend

brustjs 0.1.49-alpha → 0.1.51-alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (93) hide show

package/package.json +39 -15
package/runtime/cache-sync.ts +291 -0
package/runtime/cache.ts +4 -0
package/runtime/cli/build.ts +7 -0
package/runtime/cli/dev.ts +7 -0
package/runtime/cli/native-routes-emit.ts +147 -1
package/runtime/cli/ssg.ts +94 -23
package/runtime/config.ts +42 -0
package/runtime/index.d.ts +63 -0
package/runtime/index.js +57 -52
package/runtime/index.ts +114 -9
package/runtime/islands/page-cache.ts +32 -2
package/runtime/native/runtime.ts +220 -7
package/runtime/render/fragment.ts +87 -0
package/runtime/routes.ts +482 -95
package/runtime/templates.ts +47 -0
package/runtime/treaty.ts +24 -1
package/types/action-error.d.ts +18 -0
package/types/cache-sync.d.ts +42 -0
package/types/cache.d.ts +20 -0
package/types/cli/help.d.ts +28 -0
package/types/cli/jinja-staleness.d.ts +14 -0
package/types/cli/native-routes-emit.d.ts +217 -0
package/types/cli/new.d.ts +30 -0
package/types/cli/templates.d.ts +39 -0
package/types/client/index.d.ts +14 -0
package/types/config.d.ts +42 -0
package/types/cookies.d.ts +25 -0
package/types/create.d.ts +1 -0
package/types/css/build.d.ts +11 -0
package/types/css/component-build.d.ts +17 -0
package/types/css/component-loader.d.ts +8 -0
package/types/css/manifest.d.ts +21 -0
package/types/css/process-modules.d.ts +31 -0
package/types/css/route-deps.d.ts +20 -0
package/types/css/scan-imports.d.ts +13 -0
package/types/css.d.ts +16 -0
package/types/define-actions.d.ts +133 -0
package/types/dev/client.d.ts +8 -0
package/types/dev/coordinator.d.ts +33 -0
package/types/dev/inject.d.ts +6 -0
package/types/dev/jinja-reload.d.ts +7 -0
package/types/dev/tui.d.ts +35 -0
package/types/dev/watcher.d.ts +34 -0
package/types/dev/worker-registry.d.ts +17 -0
package/types/dev/ws-channel.d.ts +39 -0
package/types/generator.d.ts +23 -0
package/types/index.d.ts +222 -0
package/types/islands/brust-page.d.ts +74 -0
package/types/islands/build.d.ts +49 -0
package/types/islands/chunk-id.d.ts +10 -0
package/types/islands/importmap.d.ts +2 -0
package/types/islands/island.d.ts +65 -0
package/types/islands/isr-jsx.d.ts +31 -0
package/types/islands/native-render.d.ts +89 -0
package/types/loader-cache.d.ts +18 -0
package/types/mcp/extractor.d.ts +14 -0
package/types/mcp/manifest.d.ts +23 -0
package/types/mcp/schema.d.ts +19 -0
package/types/mcp/server.d.ts +15 -0
package/types/md/emit.d.ts +72 -0
package/types/md/render.d.ts +80 -0
package/types/md/routes.d.ts +119 -0
package/types/md/scan.d.ts +34 -0
package/types/md/slug.d.ts +1 -0
package/types/native/build.d.ts +30 -0
package/types/native/index.d.ts +2 -0
package/types/native/runtime.d.ts +52 -0
package/types/navigation/active-nav.d.ts +2 -0
package/types/navigation/index.d.ts +5 -0
package/types/navigation/navigate.d.ts +14 -0
package/types/navigation/react.d.ts +15 -0
package/types/navigation/store.d.ts +44 -0
package/types/render/fragment.d.ts +20 -0
package/types/render/inject-action-prefix.d.ts +9 -0
package/types/render/inject-css-link.d.ts +8 -0
package/types/render/inject-dev-client.d.ts +6 -0
package/types/render/inject-generator.d.ts +7 -0
package/types/render/inject-store.d.ts +9 -0
package/types/render/stream.d.ts +45 -0
package/types/request-context.d.ts +16 -0
package/types/routes.d.ts +506 -0
package/types/sse/handler.d.ts +22 -0
package/types/standard-schema.d.ts +31 -0
package/types/store/define-store.d.ts +31 -0
package/types/store/index.d.ts +5 -0
package/types/store/react.d.ts +2 -0
package/types/store/serialize.d.ts +5 -0
package/types/store/server-context.d.ts +4 -0
package/types/store/signal.d.ts +18 -0
package/types/templates.d.ts +18 -0
package/types/treaty.d.ts +70 -0
package/types/ws/handler.d.ts +26 -0

package/runtime/cli/ssg.ts CHANGED Viewed

@@ -147,6 +147,14 @@ export function collectStaticPaths(flatRoutes: FlatRouteLike[]): SsgRouteDecisio
 /** Reserved sentinel param value (Phase B fallback shell crawl). */
 export const SSG_FALLBACK_SENTINEL = '__brust_fallback__'
+/** Definitely-unmatched URL path used to crawl the GLOBAL catch-all into
+ * 404.html: the dist server's NotFound tier renders the global catch-all at
+ * status 404 for any path no real route matches. Deliberately bogus — a
+ * double-underscore-namespaced segment no app route declares. NOT `/_brust/`-
+ * prefixed: those resolve to brust-internal handlers BEFORE route matching, so
+ * the catch-all tier would never see them. */
+export const SSG_NOT_FOUND_SENTINEL_PATH = '/__brust_not_found_sentinel__'
 /** Structural view of the leaf's ssg config (mirrors RouteSsgConfig). */
 export interface RouteSsgLike {
   params?: () => Array<Record<string, string>> | Promise<Array<Record<string, string>>>
@@ -263,24 +271,24 @@ export function hasClientLoaderExport(source: string): boolean {
   return /export\s*\{[^}]*\bclientLoader\b[^}]*\}/.test(code)
 }
-/** Static-host 404 document for `fallback: 'client'` routes: inlines the
- * [{pattern, doc}] manifest pairs; a path matching a fallback pattern stashes
- * the REAL url in sessionStorage (the takeover runtime restores it via
- * history.replaceState) and redirects to the prerendered fallback shell.
- * No match → plain 404 text. Pure string fn so the script/inline-JSON
- * contract is unit-testable. Escapes for the <script> context: `<`/`>` (no
- * `</script>`/`<!--`/`-->` sequences) and U+2028/U+2029 (legal in JSON,
- * illegal in pre-ES2019-parsed JS string literals). Patterns are
- * author-controlled — belt-and-braces, not a trust boundary. */
-export function fallback404Html(pairs: Array<{ pattern: string; doc: string }>): string {
+/** The redirect-only `<script>` for `fallback: 'client'` routes (no surrounding
+ * document): inlines the [{pattern, doc}] manifest pairs; a path matching a
+ * fallback pattern stashes the REAL url in sessionStorage (the takeover runtime
+ * restores it via history.replaceState) and redirects to the prerendered
+ * fallback shell. No match → no-op (the surrounding document is the 404 body).
+ * Extracted so it can be wrapped in the minimal `fallback404Html` shell OR
+ * injected into a crawled global-404 page (compose404Html). Pure string fn so
+ * the script/inline-JSON contract is unit-testable. Escapes for the <script>
+ * context: `<`/`>` (no `</script>`/`<!--`/`-->` sequences) and U+2028/U+2029
+ * (legal in JSON, illegal in pre-ES2019-parsed JS string literals). Patterns
+ * are author-controlled — belt-and-braces, not a trust boundary. */
+export function fallback404Script(pairs: Array<{ pattern: string; doc: string }>): string {
   const inlineJson = JSON.stringify(pairs)
     .replace(/</g, '\\u003c')
     .replace(/>/g, '\\u003e')
     .replace(/\u2028/g, '\\u2028')
     .replace(/\u2029/g, '\\u2029')
-  return `<!doctype html><html><head><meta charset="utf-8"><title>404</title></head><body>
-<p>Not found.</p>
-<script>
+  return `<script>
 (function () {
   var MANIFEST = ${inlineJson};
   function match(pattern, path) {
@@ -300,10 +308,43 @@ export function fallback404Html(pairs: Array<{ pattern: string; doc: string }>):
     }
   }
 })()
-</script></body></html>
+</script>`
+}
+/** Static-host 404 document for `fallback: 'client'` routes when NO global
+ * catch-all page exists: the minimal shell (`<p>Not found.</p>`) wrapping the
+ * redirect `<script>` from `fallback404Script`. When a global catch-all DOES
+ * exist its crawled page is the document and the script is injected instead
+ * (compose404Html) — this shell is unused in that case. */
+export function fallback404Html(pairs: Array<{ pattern: string; doc: string }>): string {
+  return `<!doctype html><html><head><meta charset="utf-8"><title>404</title></head><body>
+<p>Not found.</p>
+${fallback404Script(pairs)}</body></html>
 `
 }
+/** Inject `<script>…</script>` into `html` just before the closing `</body>`
+ * (last occurrence, case-insensitive). If the document has no `</body>` the
+ * script is appended — a static host still parses a trailing script. Used to
+ * compose the fallback redirect into a crawled global-404 page. */
+export function injectBeforeBodyClose(html: string, script: string): string {
+  const idx = html.toLowerCase().lastIndexOf('</body>')
+  if (idx === -1) return `${html}\n${script}`
+  return `${html.slice(0, idx)}${script}\n${html.slice(idx)}`
+}
+/** Compose the final SSG `404.html` from a crawled global-catch-all page and,
+ * when `fallback: 'client'` routes also exist, the fallback redirect `<script>`
+ * injected before `</body>`. With no fallback pairs the crawled page is
+ * returned verbatim (pure rendered 404 page). */
+export function compose404Html(
+  crawled: string,
+  fallbackPairs: Array<{ pattern: string; doc: string }>,
+): string {
+  if (fallbackPairs.length === 0) return crawled
+  return injectBeforeBodyClose(crawled, fallback404Script(fallbackPairs))
+}
 // ----- static export -----
 const READY_LINE = '[brust] listening on' // println! in brust-core server/mod.rs
@@ -415,13 +456,19 @@ export async function exportStatic(opts: {
   routes: SsgRouteDecision[]
   /** `fallback: 'client'` routes (pattern + built chunk URL) to emit shells for. */
   fallbacks?: Array<{ pattern: string; chunk: string }>
+  /** True when the app declares a GLOBAL catch-all (notFoundPrefix === ''). The
+   * crawler fetches an unmatched sentinel path (→ NotFound tier renders the
+   * catch-all at 404) and writes its HTML to staticOut/404.html, composing the
+   * fallback redirect script when fallbacks also exist. An app public/404.html
+   * still wins. */
+  globalNotFound?: boolean
 }): Promise<{
   written: string[]
   navWritten: string[]
   fallbackWritten: string[]
   skipped: SsgRouteDecision[]
 }> {
-  const { distDir, entryDir, staticOut, routes, fallbacks = [] } = opts
+  const { distDir, entryDir, staticOut, routes, fallbacks = [], globalNotFound = false } = opts
   const included = routes.filter((r) => r.include)
   const skipped = routes.filter((r) => !r.include)
@@ -431,7 +478,7 @@ export async function exportStatic(opts: {
   const written: string[] = []
   const navWritten: string[] = []
   const fallbackWritten: string[] = []
-  if (included.length > 0 || fallbacks.length > 0) {
+  if (included.length > 0 || fallbacks.length > 0 || globalNotFound) {
     const port = await freePort()
     const proc = Bun.spawn(['bun', join(distDir, 'index.js')], {
       env: { ...process.env, BRUST_PORT: String(port), BRUST_WORKERS: '1' },
@@ -541,6 +588,13 @@ export async function exportStatic(opts: {
         fallbackWritten.push(payloadFile)
       }
+      // Fallback {pattern, doc} pairs for the 404.html redirect script — also
+      // inlined in the routes.json manifest. Empty when no fallback routes.
+      const fallbackPairs = fallbacks.map((f) => ({
+        pattern: f.pattern,
+        doc: `/_brust/fallback/${fallbackDiskPath(f.pattern)}/`,
+      }))
       if (fallbacks.length > 0) {
         // Manifest the client takeover runtime fetches to map a 404'd path to
         // its fallback shell. doc/payload are directory-index URLs (trailing
@@ -557,19 +611,36 @@ export async function exportStatic(opts: {
         const manifestPath = join(staticOut, '_brust', 'routes.json')
         await mkdir(dirname(manifestPath), { recursive: true })
         await Bun.write(manifestPath, JSON.stringify(manifest))
+      }
-        // 404.html redirects non-prerendered fallback paths to their shell.
-        // An app-authored public/404.html wins — it lands via the public/
-        // copy below, and the author owns the redirect contract.
+      // 404.html, single static-host slot. Resolution:
+      //  - app public/404.html present → author owns it (lands via the public/
+      //    copy below); never overwrite, warn only when it would have mattered.
+      //  - GLOBAL catch-all → crawl an unmatched sentinel (NotFound tier renders
+      //    the catch-all at 404), use its HTML as the document; inject the
+      //    fallback redirect <script> when fallbacks ALSO exist (compose404Html).
+      //  - fallbacks only → the minimal fallback404Html shell (unchanged).
+      //  - neither → no framework 404.html (byte-identical-today).
+      if (globalNotFound || fallbacks.length > 0) {
         if (existsSync(join(entryDir, 'public', '404.html'))) {
           console.warn(
             '[brust build] ssg: public/404.html exists — NOT overwriting; your 404 page must redirect fallback routes itself (see docs)',
           )
+        } else if (globalNotFound) {
+          // Crawl the global catch-all via an unmatched path: the dist server's
+          // NotFound tier renders it at status 404. A non-404 here means the
+          // catch-all isn't wired — fail the export rather than ship a wrong
+          // (or 200) page as the 404.
+          const resp = await fetch(`http://127.0.0.1:${port}${SSG_NOT_FOUND_SENTINEL_PATH}`)
+          const body = await resp.text()
+          if (resp.status !== 404) {
+            throw new Error(
+              `global catch-all crawl GET ${SSG_NOT_FOUND_SENTINEL_PATH} → ${resp.status} (expected 404)\n${body.slice(0, 500)}`,
+            )
+          }
+          await Bun.write(join(staticOut, '404.html'), compose404Html(body, fallbackPairs))
         } else {
-          await Bun.write(
-            join(staticOut, '404.html'),
-            fallback404Html(manifest.fallbacks.map(({ pattern, doc }) => ({ pattern, doc }))),
-          )
+          await Bun.write(join(staticOut, '404.html'), fallback404Html(fallbackPairs))
         }
       }
     } catch (err) {

package/runtime/config.ts CHANGED Viewed

@@ -14,6 +14,12 @@ export interface BrustConfig {
   cacheMaxEntries?: number
   /** L2 page-cache capacity (entries). Undefined → Rust default of 1000. */
   cachePageMaxEntries?: number
+  /** R9 cross-process cache invalidation: redis/dragonfly URL. Absent →
+   * feature disabled (current single-process behavior). */
+  cacheSyncUrl?: string
+  /** Pub/sub channel for cache invalidation. Undefined → module default
+   * (`brust:cache:invalidate`). */
+  cacheSyncChannel?: string
 }
 /** Caller-supplied fallbacks (e.g. `brust.run({ address, port })`) applied
@@ -85,6 +91,8 @@ export async function loadConfig(
     workers,
     cacheMaxEntries: fromToml.cacheMaxEntries,
     cachePageMaxEntries: fromToml.cachePageMaxEntries,
+    cacheSyncUrl: fromEnv.cacheSyncUrl ?? fromToml.cacheSyncUrl,
+    cacheSyncChannel: fromEnv.cacheSyncChannel ?? fromToml.cacheSyncChannel,
   }
 }
@@ -168,6 +176,26 @@ function extractFromToml(parsed: unknown, file: string): Partial<BrustConfig> {
       }
       out.cachePageMaxEntries = pageMaxEntries
     }
+    const syncUrl = (cache as Record<string, unknown>).sync_url
+    if (syncUrl !== undefined) {
+      if (typeof syncUrl !== 'string' || syncUrl.trim() === '') {
+        throw new BrustConfigError(
+          `${file}: cache.sync_url must be a non-empty string (got ${JSON.stringify(syncUrl)})`,
+          file,
+        )
+      }
+      out.cacheSyncUrl = syncUrl.trim()
+    }
+    const syncChannel = (cache as Record<string, unknown>).sync_channel
+    if (syncChannel !== undefined) {
+      if (typeof syncChannel !== 'string' || syncChannel.trim() === '') {
+        throw new BrustConfigError(
+          `${file}: cache.sync_channel must be a non-empty string (got ${JSON.stringify(syncChannel)})`,
+          file,
+        )
+      }
+      out.cacheSyncChannel = syncChannel.trim()
+    }
   }
   return out
@@ -202,5 +230,19 @@ function extractFromEnv(): Partial<BrustConfig> {
     }
     out.workers = n
   }
+  if (process.env.BRUST_CACHE_SYNC_URL) {
+    const url = process.env.BRUST_CACHE_SYNC_URL.trim()
+    if (url === '') {
+      throw new BrustConfigError('BRUST_CACHE_SYNC_URL must be a non-empty string', null)
+    }
+    out.cacheSyncUrl = url
+  }
+  if (process.env.BRUST_CACHE_SYNC_CHANNEL) {
+    const channel = process.env.BRUST_CACHE_SYNC_CHANNEL.trim()
+    if (channel === '') {
+      throw new BrustConfigError('BRUST_CACHE_SYNC_CHANNEL must be a non-empty string', null)
+    }
+    out.cacheSyncChannel = channel
+  }
   return out
 }

package/runtime/index.d.ts CHANGED Viewed

@@ -75,6 +75,38 @@ export interface NapiCompiledJsx {
   warnings: Array<string>
 }
+/**
+ * Global CORS policy (maps onto `brust_core::CorsConfig`). napi-rs camelCases
+ * the fields, so the TS runtime sends `origins`, `methods`, `headers`,
+ * `exposeHeaders`, `credentials`, `maxAgeSeconds`.
+ */
+export interface NapiCorsOptions {
+  /**
+   * Allowed origins (exact scheme+host+port match). `['*']` — or any list
+   * CONTAINING `'*'` — allows every origin (echoed as the literal `*`).
+   */
+  origins: Array<string>
+  /**
+   * Preflight `Access-Control-Allow-Methods`. Omit for the default
+   * `GET,POST,PUT,PATCH,DELETE,OPTIONS`.
+   */
+  methods?: Array<string>
+  /**
+   * Preflight `Access-Control-Allow-Headers`. Omit to echo the request's
+   * `Access-Control-Request-Headers`.
+   */
+  headers?: Array<string>
+  /** `Access-Control-Expose-Headers` on actual responses. Omit for none. */
+  exposeHeaders?: Array<string>
+  /**
+   * Emit `Access-Control-Allow-Credentials: true`. INVALID with a wildcard
+   * origin — serve() throws at boot.
+   */
+  credentials?: boolean
+  /** Preflight `Access-Control-Max-Age` seconds. Omit for 600. */
+  maxAgeSeconds?: number
+}
 /**
  * Dev-mode: broadcast one JSON control frame (building / reload / css-update /
  * error / ok) to every connected `/_brust/dev` client. Called from the main
@@ -87,6 +119,12 @@ export interface NapiCompiledJsx {
  */
 export declare function napiDevBroadcast(json: string): void
+/** R1 — true when `name` resolves in either tier (dynamic first, then boot). */
+export declare function napiHasTemplate(name: string): boolean
+/** R1 — names of runtime-registered templates (dynamic tier only). */
+export declare function napiListDynamicTemplates(): Array<string>
 /**
  * Sub-project J — boot-time listing of registered minijinja templates.
  * JS dispatcher uses this to validate every `native: true` route's
@@ -110,6 +148,13 @@ export declare function napiLoadJinjaTemplates(dir: string): Array<string>
  */
 export declare function napiRegisterSsePaths(paths: Array<string>): NapiResult<undefined>
+/**
+ * R1 dynamic template registry — register (or replace) a runtime template.
+ * Errors (name validation / jinja syntax) surface as a thrown JS Error with
+ * the minijinja message (includes line info).
+ */
+export declare function napiRegisterTemplate(name: string, source: string): NapiResult<undefined>
 /**
  * Boot-time registry of literal WS paths. Mirror of napi_register_sse_paths.
  * Call once before begin_serve; exact-match only (parameterized routes are a
@@ -117,6 +162,12 @@ export declare function napiRegisterSsePaths(paths: Array<string>): NapiResult<u
  */
 export declare function napiRegisterWsPaths(paths: Array<string>): NapiResult<undefined>
+/**
+ * R1 — remove a runtime-registered template. Returns whether it existed.
+ * Boot-tier (directory-loaded) templates are not removable.
+ */
+export declare function napiRemoveTemplate(name: string): boolean
 /**
  * Worker-driven render chunk delivery. Worker calls this once per chunk
  * it wants to emit; final call uses `len = 0` to close the channel.
@@ -177,6 +228,13 @@ export declare function napiRenderChunkFinal(workerId: number, slot: number, len
  */
 export declare function napiRenderJinja(workerId: number, slot: number, dataLen: number, templateName: string, status?: number | undefined | null): NapiResult<number>
+/**
+ * R1 — render a template (either tier) to an HTML string. NOT the request
+ * hot path (allocates a JS string per call; the fast lane is
+ * napi_render_jinja via SAB) — intended for handlers/loaders/tooling.
+ */
+export declare function napiRenderTemplate(name: string, dataJson: string): NapiResult<string>
 /**
  * Drop the connection's sender, which signals the per-conn task to exit
  * and close the TCP socket. Idempotent — a missing conn is a no-op.
@@ -300,6 +358,11 @@ export interface ServeOptions {
    * configured (cert + key present). An unrecognized value is rejected.
    */
   tlsMinVersion?: string
+  /**
+   * Optional global CORS policy. Omit to keep CORS disabled (byte-identical
+   * default behavior: no `Access-Control-*` headers, OPTIONS still 405).
+   */
+  cors?: NapiCorsOptions
 }
 /**