@taujs/server 0.4.5 → 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

@@ -97,101 +97,10 @@ var require_picocolors = __commonJS({
   }
 });
 
-// node_modules/fastify-plugin/lib/getPluginName.js
-var require_getPluginName = __commonJS({
-  "node_modules/fastify-plugin/lib/getPluginName.js"(exports, module) {
-    "use strict";
-    var fpStackTracePattern = /at\s{1}(?:.*\.)?plugin\s{1}.*\n\s*(.*)/;
-    var fileNamePattern = /(\w*(\.\w*)*)\..*/;
-    module.exports = function getPluginName(fn) {
-      if (fn.name.length > 0) return fn.name;
-      const stackTraceLimit = Error.stackTraceLimit;
-      Error.stackTraceLimit = 10;
-      try {
-        throw new Error("anonymous function");
-      } catch (e) {
-        Error.stackTraceLimit = stackTraceLimit;
-        return extractPluginName(e.stack);
-      }
-    };
-    function extractPluginName(stack) {
-      const m = stack.match(fpStackTracePattern);
-      return m ? m[1].split(/[/\\]/).slice(-1)[0].match(fileNamePattern)[1] : "anonymous";
-    }
-    module.exports.extractPluginName = extractPluginName;
-  }
-});
-
-// node_modules/fastify-plugin/lib/toCamelCase.js
-var require_toCamelCase = __commonJS({
-  "node_modules/fastify-plugin/lib/toCamelCase.js"(exports, module) {
-    "use strict";
-    module.exports = function toCamelCase(name) {
-      if (name[0] === "@") {
-        name = name.slice(1).replace("/", "-");
-      }
-      return name.replace(/-(.)/g, function(match2, g1) {
-        return g1.toUpperCase();
-      });
-    };
-  }
-});
-
-// node_modules/fastify-plugin/plugin.js
-var require_plugin = __commonJS({
-  "node_modules/fastify-plugin/plugin.js"(exports, module) {
-    "use strict";
-    var getPluginName = require_getPluginName();
-    var toCamelCase = require_toCamelCase();
-    var count = 0;
-    function plugin(fn, options = {}) {
-      let autoName = false;
-      if (fn.default !== void 0) {
-        fn = fn.default;
-      }
-      if (typeof fn !== "function") {
-        throw new TypeError(
-          `fastify-plugin expects a function, instead got a '${typeof fn}'`
-        );
-      }
-      if (typeof options === "string") {
-        options = {
-          fastify: options
-        };
-      }
-      if (typeof options !== "object" || Array.isArray(options) || options === null) {
-        throw new TypeError("The options object should be an object");
-      }
-      if (options.fastify !== void 0 && typeof options.fastify !== "string") {
-        throw new TypeError(`fastify-plugin expects a version string, instead got '${typeof options.fastify}'`);
-      }
-      if (!options.name) {
-        autoName = true;
-        options.name = getPluginName(fn) + "-auto-" + count++;
-      }
-      fn[Symbol.for("skip-override")] = options.encapsulate !== true;
-      fn[Symbol.for("fastify.display-name")] = options.name;
-      fn[Symbol.for("plugin-meta")] = options;
-      if (!fn.default) {
-        fn.default = fn;
-      }
-      const camelCase = toCamelCase(options.name);
-      if (!autoName && !fn[camelCase]) {
-        fn[camelCase] = fn;
-      }
-      return fn;
-    }
-    module.exports = plugin;
-    module.exports.default = plugin;
-    module.exports.fastifyPlugin = plugin;
-  }
-});
-
 // src/CreateServer.ts
 var import_picocolors4 = __toESM(require_picocolors(), 1);
 import path7 from "path";
 import { performance as performance3 } from "perf_hooks";
-import fastifyStatic from "@fastify/static";
 import Fastify from "fastify";
 
 // src/Setup.ts
@@ -851,8 +760,8 @@ var verifyContracts = (app, routes, contracts, security) => {
 };
 
 // src/SSRServer.ts
-var import_fastify_plugin3 = __toESM(require_plugin(), 1);
 import path6 from "path";
+import fp3 from "fastify-plugin";
 
 // src/logging/utils/index.ts
 var httpStatusFrom = (err, fallback = 500) => err instanceof AppError ? err.httpStatus : fallback;
@@ -1083,7 +992,7 @@ var createAuthHook = (routeMatchers, logger) => {
 };
 
 // src/security/CSP.ts
-var import_fastify_plugin = __toESM(require_plugin(), 1);
+import fp from "fastify-plugin";
 import crypto from "crypto";
 
 // src/utils/System.ts
@@ -1129,7 +1038,7 @@ var findMatchingRoute = (routeMatchers, path9) => {
   const match2 = matchRoute(path9, routeMatchers);
   return match2 ? { route: match2.route, params: match2.params } : null;
 };
-var cspPlugin = (0, import_fastify_plugin.default)(
+var cspPlugin = fp(
   async (fastify, opts) => {
     const { generateCSP = defaultGenerateCSP, routes = [], routeMatchers, debug } = opts;
     const globalDirectives = opts.directives || DEV_CSP_DIRECTIVES;
@@ -1180,7 +1089,7 @@ var cspPlugin = (0, import_fastify_plugin.default)(
 );
 
 // src/security/CSPReporting.ts
-var import_fastify_plugin2 = __toESM(require_plugin(), 1);
+import fp2 from "fastify-plugin";
 function sanitiseContext(ctx) {
   return {
     userAgent: ctx.userAgent,
@@ -1263,7 +1172,7 @@ var processCSPReport = (body, context, logger) => {
     );
   }
 };
-var cspReportPlugin = (0, import_fastify_plugin2.default)(
+var cspReportPlugin = fp2(
   async (fastify, opts) => {
     const { onViolation } = opts;
     if (!opts.path || typeof opts.path !== "string") throw AppError.badRequest("CSP report path is required and must be a string");
@@ -1667,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", {
@@ -1736,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");
@@ -1885,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;
@@ -2018,7 +1933,7 @@ async function registerStaticAssets(app, baseClientRoot, reg, defaults, projectR
 }
 
 // src/SSRServer.ts
-var SSRServer = (0, import_fastify_plugin3.default)(
+var SSRServer = fp3(
   async (app, opts) => {
     const { alias, configs, routes, serviceRegistry = {}, clientRoot: baseClientRoot, security } = opts;
     const logger = createLogger({
@@ -2183,7 +2098,7 @@ var createServer = async (opts) => {
       configs,
       routes,
       serviceRegistry: opts.serviceRegistry,
-      staticAssets: opts.staticAssets !== void 0 ? opts.staticAssets : { plugin: fastifyStatic },
+      staticAssets: opts.staticAssets ?? false,
       debug: opts.debug,
       alias: opts.alias,
       security,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/server",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "τjs [ taujs ]",
   "author": "John Smith | Aoede <taujs@aoede.uk.net> (https://www.aoede.uk.net)",
   "license": "MIT",
@@ -44,36 +44,29 @@
     "dist"
   ],
   "dependencies": {
+    "fastify": "^5.6.1",
+    "fastify-plugin": "^5.1.0",
     "path-to-regexp": "^8.1.0",
-    "vite-plugin-node-polyfills": "^0.24.0"
+    "vite": "^7.1.11"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.4",
     "@babel/preset-typescript": "^7.24.7",
     "@changesets/cli": "^2.27.7",
-    "@fastify/static": "^8.3.0",
     "@types/node": "^20.14.9",
     "@vitest/coverage-v8": "^3.2.4",
     "@vitest/ui": "^3.2.4",
-    "fastify": "^5.6.1",
     "jsdom": "^25.0.0",
     "prettier": "^3.3.3",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
-    "vite": "^7.1.11",
     "vitest": "^3.2.4"
   },
   "peerDependencies": {
-    "@fastify/static": "^8.3.0",
     "fastify": "^5.6.1",
     "typescript": "^5.5.4",
     "vite": "^7.1.11"
   },
-  "peerDependenciesMeta": {
-    "@fastify/static": {
-      "optional": true
-    }
-  },
   "scripts": {
     "build": "tsup",
     "build-local": "tsup && ./move.sh",