@getstrata/core 2.2.12 → 2.2.13

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @getstrata/core changelog
 
+## 2.2.13
+
+- Improve view rendering and better htmx support
+
 ## 2.2.12
 
 - Require Bun >=1.4.3; align CI, generated/existing example runtime pins and Docker stages to 1.4.3, with bun-types >=1.4.3 behind the official @types/bun shim.

package/dist/core/view/index.d.ts

@@ -1,8 +1,10 @@
-export type { LayoutDataResolver } from "./etaViewEngine";
+export type { LayoutDataResolver, RenderOptions } from "./etaViewEngine";
 export { DEFAULT_VIEWS_DIRECTORY, EtaViewEngine } from "./etaViewEngine";
 export { htmlResponse, isHtmxRequest, redirectResponse, rssResponse, textResponse, xmlResponse, } from "./htmlResponse";
 export type { ViewEngine } from "./viewEngine";
+export type { HtmxViewResponseOptions, ViewResponseOptions } from "./viewRenderer";
+export { CORE_VIEW_RENDERER_TOKEN, ViewRenderer } from "./viewRenderer";
 export type { WebErrorViewInput, WebErrorViewOptions } from "./webErrorView";
 export { configureWebErrorView, errorTemplateName, htmlErrorResponse, notFoundHtmlResponse, renderKernelErrorChrome, renderWebErrorHtml, } from "./webErrorView";
 export type { WebLayoutAuthUser, WebLayoutData, WebLayoutDataOptions, WebLayoutUserKey, } from "./webLayoutData";
-export { configureWebLayoutData, resolveWebLayoutData } from "./webLayoutData";
+export { configureWebLayoutData, createWebLayoutDataResolver, resolveWebLayoutData, } from "./webLayoutData";

package/dist/core/view/viewRenderer.d.ts

@@ -0,0 +1,24 @@
+import type { ViewEngine } from "./viewEngine";
+interface ViewResponseOptions {
+    layout?: string | false;
+    request?: Request;
+    status?: number;
+    statusText?: string;
+    headers?: ConstructorParameters<typeof Headers>[0];
+}
+interface HtmxViewResponseOptions extends ViewResponseOptions {
+    /** Optional fragment template; otherwise render the page template without its layout. */
+    fragment?: string;
+}
+/** App-owned renderer; request data stays in the engine's async resolver. */
+declare class ViewRenderer {
+    private readonly engine;
+    private readonly defaultLayout?;
+    constructor(engine: ViewEngine, defaultLayout?: string | false | undefined);
+    render(name: string, data?: Record<string, unknown>, options?: ViewResponseOptions): Promise<Response>;
+    /** Opt-in representation selection; auth/CSRF/tenancy remain the route's responsibility. */
+    renderHtmx(name: string, data?: Record<string, unknown>, options?: HtmxViewResponseOptions): Promise<Response>;
+}
+declare const CORE_VIEW_RENDERER_TOKEN: import("../contracts/container").ServiceToken<ViewRenderer>;
+export type { HtmxViewResponseOptions, ViewResponseOptions };
+export { CORE_VIEW_RENDERER_TOKEN, ViewRenderer };

package/dist/core/view/webLayoutData.d.ts

@@ -24,5 +24,7 @@ interface WebLayoutDataOptions {
 declare function configureWebLayoutData(options: WebLayoutDataOptions): void;
 declare function resetWebLayoutDataConfigForTests(): void;
 declare function resolveWebLayoutData(container: ServiceContainerLike, request?: Request, options?: WebLayoutDataOptions): Promise<Record<string, unknown>>;
+/** Isolated configuration for one app; does not read legacy global defaults. */
+declare function createWebLayoutDataResolver(container: ServiceContainerLike, options?: WebLayoutDataOptions): (request?: Request) => Promise<Record<string, unknown>>;
 export type { WebLayoutAuthUser, WebLayoutData, WebLayoutDataOptions, WebLayoutUserKey };
-export { configureWebLayoutData, resetWebLayoutDataConfigForTests, resolveWebLayoutData };
+export { configureWebLayoutData, createWebLayoutDataResolver, resetWebLayoutDataConfigForTests, resolveWebLayoutData, };

package/dist/framework/public-api.d.ts

@@ -169,6 +169,7 @@ export type { TracingOptions, TracingRuntime } from "../core/tracing/tracingMidd
 export { acquireTracingRuntime, createTracingMiddleware, createTracingRuntime, getTracingRuntime, } from "../core/tracing/tracingMiddleware.ts";
 export type { ValidationRule, ValidationSchema } from "../core/validation/rules.ts";
 export { emailRule, maxLength, minLength, required, stringRule, validateObject, } from "../core/validation/rules.ts";
-export { configureWebErrorView, configureWebLayoutData, DEFAULT_VIEWS_DIRECTORY, EtaViewEngine, errorTemplateName, htmlErrorResponse, htmlResponse, isHtmxRequest, notFoundHtmlResponse, redirectResponse, renderKernelErrorChrome, renderWebErrorHtml, resolveWebLayoutData, rssResponse, textResponse, xmlResponse, } from "../core/view/index.ts";
+export { CORE_VIEW_RENDERER_TOKEN, configureWebErrorView, configureWebLayoutData, createWebLayoutDataResolver, DEFAULT_VIEWS_DIRECTORY, EtaViewEngine, errorTemplateName, htmlErrorResponse, htmlResponse, isHtmxRequest, notFoundHtmlResponse, redirectResponse, renderKernelErrorChrome, renderWebErrorHtml, resolveWebLayoutData, rssResponse, textResponse, ViewRenderer, xmlResponse, } from "../core/view/index.ts";
 export type { ViewEngine } from "../core/view/viewEngine.ts";
+export type { HtmxViewResponseOptions, ViewResponseOptions } from "../core/view/viewRenderer.ts";
 export type { WebLayoutAuthUser, WebLayoutData, WebLayoutDataOptions, WebLayoutUserKey, } from "../core/view/webLayoutData.ts";

package/dist/index.js

@@ -16118,6 +16118,56 @@ class EtaViewEngine {
     });
   }
 }
+// ../../src/core/view/viewRenderer.ts
+var HTMX_VARY_HEADERS = ["HX-Request", "HX-Boosted", "HX-History-Restore-Request"];
+function varyByHtmx(headers) {
+  const existing = (headers.get("Vary") ?? "").split(",").map((field) => field.trim());
+  if (existing.includes("*"))
+    return;
+  const fields = new Map;
+  for (const field of [...existing, ...HTMX_VARY_HEADERS]) {
+    if (field)
+      fields.set(field.toLowerCase(), field);
+  }
+  headers.set("Vary", [...fields.values()].join(", "));
+}
+
+class ViewRenderer {
+  engine;
+  defaultLayout;
+  constructor(engine, defaultLayout) {
+    this.engine = engine;
+    this.defaultLayout = defaultLayout;
+  }
+  async render(name, data = {}, options = {}) {
+    const html = await this.engine.render(name, data, {
+      request: options.request,
+      layout: options.layout ?? this.defaultLayout
+    });
+    const headers = new Headers(options.headers);
+    headers.set("Content-Type", "text/html; charset=utf-8");
+    return new Response(html, {
+      status: options.status ?? 200,
+      statusText: options.statusText,
+      headers
+    });
+  }
+  async renderHtmx(name, data = {}, options = {}) {
+    const request = options.request ?? currentRequestMeta().request;
+    if (!request)
+      throw new Error("HTMX view rendering requires a request.");
+    const fragment = request.headers.get("HX-Request") === "true" && request.headers.get("HX-Boosted") !== "true" && request.headers.get("HX-History-Restore-Request") !== "true";
+    const headers = new Headers(options.headers);
+    varyByHtmx(headers);
+    return this.render(fragment ? options.fragment ?? name : name, data, {
+      ...options,
+      request,
+      headers,
+      layout: fragment ? false : options.layout
+    });
+  }
+}
+var CORE_VIEW_RENDERER_TOKEN = createServiceToken("core.viewRenderer");
 // ../../src/core/view/webLayoutData.ts
 var configuredLayoutOptions = {};
 function configureWebLayoutData(options) {
@@ -16156,6 +16206,16 @@ async function defaultLoadLayoutUser(container, _request) {
 }
 async function resolveWebLayoutData(container, request, options = {}) {
   const resolved = { ...configuredLayoutOptions, ...options };
+  return loadWebLayoutData(container, request, resolved);
+}
+function createWebLayoutDataResolver(container, options = {}) {
+  const scoped = {
+    ...options,
+    extra: typeof options.extra === "function" ? options.extra : { ...options.extra }
+  };
+  return (request) => loadWebLayoutData(container, request, scoped);
+}
+async function loadWebLayoutData(container, request, resolved) {
   const csrfToken = request ? resolveCsrfTokenForRequest(request) : "";
   const flash = request ? currentRequestMeta().flash ?? pullFlash(request) : null;
   const userKey = layoutUserKey(resolved);
@@ -16183,6 +16243,7 @@ export {
   BelongsToRelationQuery,
   Blueprint,
   CACHE_TAGS,
+  CORE_VIEW_RENDERER_TOKEN,
   repository_default as CacheRepository,
   ColumnDefinition,
   CompositeGuard,
@@ -16256,6 +16317,7 @@ export {
   UnprocessableEntityError,
   UnsupportedSchemaFeatureError,
   ValidationError,
+  ViewRenderer,
   WebFormRequest,
   WhereBuilder,
   absoluteTemporarySignedUrl,
@@ -16374,6 +16436,7 @@ export {
   createTrackedJob,
   createTransactionAcquisitionMetrics,
   createValidateSignatureMiddleware,
+  createWebLayoutDataResolver,
   createdResponse,
   currentAuthUser,
   currentCredentialSource,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getstrata/core",
-  "version": "2.2.12",
+  "version": "2.2.13",
   "description": "Strata Bun framework public API",
   "type": "module",
   "license": "MIT",