@taujs/server 0.4.6 → 0.4.7

package/dist/{Config-CEhfq8Mm.d.ts → Config-DHz6Lax2.d.ts}

@@ -121,6 +121,47 @@ interface InitialRouteParams extends Record<string, unknown> {
     serviceName?: string;
     serviceMethod?: string;
 }
+type AppId<C extends {
+    apps: readonly {
+        appId: string;
+    }[];
+}> = C['apps'][number]['appId'];
+type AppOf<C extends {
+    apps: readonly any[];
+}, A extends AppId<C>> = Extract<C['apps'][number], {
+    appId: A;
+}>;
+type RoutesOfApp<C extends {
+    apps: readonly any[];
+}, A extends AppId<C>> = AppOf<C, A>['routes'] extends readonly any[] ? AppOf<C, A>['routes'][number] : never;
+type RouteDataOf<R> = R extends {
+    attr?: {
+        data?: (...args: any) => infer Ret;
+    };
+} ? Awaited<Ret> : unknown;
+type RoutePathOf<R> = R extends {
+    path: infer P;
+} ? P : never;
+type SingleRouteContext<C extends {
+    apps: readonly any[];
+}, A extends AppId<C>, R extends RoutesOfApp<C, A>> = R extends any ? {
+    appId: A;
+    path: RoutePathOf<R>;
+    data: RouteDataOf<R>;
+    attr: R extends {
+        attr?: infer Attr;
+    } ? Attr : never;
+} : never;
+type RouteContext<C extends {
+    apps: readonly any[];
+}> = {
+    [A in AppId<C>]: SingleRouteContext<C, A, RoutesOfApp<C, A>>;
+}[AppId<C>];
+type RouteData<C extends {
+    apps: readonly any[];
+}, Path extends string> = Extract<RouteContext<C>, {
+    path: Path;
+}>['data'];
 
 type CSPDirectives = Record<string, string[]>;
 
@@ -194,10 +235,10 @@ type AppConfig = {
     appId: string;
     entryPoint: string;
     plugins?: PluginOption[];
-    routes?: AppRoute[];
+    routes?: readonly AppRoute[];
 };
 type TaujsConfig = {
-    apps: AppConfig[];
+    apps: readonly AppConfig[];
     security?: SecurityConfig;
     server?: {
         host?: string;
@@ -206,6 +247,6 @@ type TaujsConfig = {
     };
 };
 
-declare function defineConfig<T extends TaujsConfig>(config: T): T;
+declare function defineConfig<const C>(config: C & TaujsConfig): C;
 
-export { type AppConfig as A, type BaseLogger as B, type DebugConfig as D, type InitialRouteParams as I, type RegistryCaller as R, type ServiceRegistry as S, type TaujsConfig as T, type SecurityConfig as a, type AppRoute as b, callServiceMethod as c, defineConfig as d, defineService as e, defineServiceRegistry as f, type ServiceContext as g, AppError as h, withDeadline as w };
+export { type AppConfig as A, type BaseLogger as B, type DebugConfig as D, type InitialRouteParams as I, type RegistryCaller as R, type ServiceRegistry as S, type TaujsConfig as T, type SecurityConfig as a, type AppRoute as b, callServiceMethod as c, defineConfig as d, defineService as e, defineServiceRegistry as f, type ServiceContext as g, type RouteContext as h, type RouteData as i, AppError as j, withDeadline as w };

package/dist/Config.d.ts

@@ -1,3 +1,3 @@
 import 'fastify';
 import 'vite';
-export { A as AppConfig, h as AppError, b as AppRoute, R as RegistryCaller, a as SecurityConfig, g as ServiceContext, T as TaujsConfig, c as callServiceMethod, d as defineConfig, e as defineService, f as defineServiceRegistry, w as withDeadline } from './Config-CEhfq8Mm.js';
+export { A as AppConfig, j as AppError, b as AppRoute, R as RegistryCaller, h as RouteContext, i as RouteData, a as SecurityConfig, g as ServiceContext, T as TaujsConfig, c as callServiceMethod, d as defineConfig, e as defineService, f as defineServiceRegistry, w as withDeadline } from './Config-DHz6Lax2.js';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { FastifyPluginCallback, FastifyPluginAsync, FastifyInstance } from 'fastify';
-import { T as TaujsConfig, S as ServiceRegistry, D as DebugConfig, B as BaseLogger, A as AppConfig } from './Config-CEhfq8Mm.js';
-export { I as InitialRouteParams } from './Config-CEhfq8Mm.js';
+import { T as TaujsConfig, S as ServiceRegistry, D as DebugConfig, B as BaseLogger, A as AppConfig } from './Config-DHz6Lax2.js';
+export { I as InitialRouteParams } from './Config-DHz6Lax2.js';
 import { InlineConfig } from 'vite';
 
 type StaticMountEntry = {

package/dist/index.js

@@ -1576,6 +1576,12 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
     }
     const { route, params } = matchedRoute;
     const { attr, appId } = route;
+    const routeContext = {
+      appId,
+      path: route.path,
+      attr,
+      params
+    };
     const config = processedConfigs.find((c) => c.appId === appId);
     if (!config) {
       throw AppError.internal("No configuration found for the request", {
@@ -1645,7 +1651,7 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
       let headContent = "";
       let appHtml = "";
       try {
-        const res = await renderSSR(initialDataResolved, req.url, attr?.meta, ac.signal, { logger: reqLogger });
+        const res = await renderSSR(initialDataResolved, req.url, attr?.meta, ac.signal, { logger: reqLogger, routeContext });
         headContent = res.headContent;
         appHtml = res.appHtml;
         logger.debug?.("ssr", {}, "ssr data resolved");
@@ -1794,7 +1800,7 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
         attr?.meta,
         cspNonce,
         ac.signal,
-        { logger: reqLogger }
+        { logger: reqLogger, routeContext }
       );
       writable.on("finish", () => {
         if (abortedState.aborted || reply.raw.writableEnded) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/server",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "τjs [ taujs ]",
   "author": "John Smith | Aoede <taujs@aoede.uk.net> (https://www.aoede.uk.net)",
   "license": "MIT",