@taujs/server 0.3.1 → 0.3.3

package/README.md

@@ -85,10 +85,10 @@ Integral to τjs is its internal routing:
 
 In ensuring a particular 'route' receives data for hydration there are two options:
 
-1. An HTTP call syntactically not unlike 'fetch' providing params to a 'fetch' call
-2. Internal service call returning data as per your architecture
+1. Internal service call returning data as per your architecture
+2. An HTTP call from your app passing resolved data to @taujs/server
 
-In supporting Option 2. there is a registry of services. More detail in 'Service Registry'.
+In supporting Option 1. there is a registry of services. More detail in 'Service Registry'.
 
 Each routes 'path' is a simple URL regex as per below examples.
 

package/dist/{SSRServer-C7MMCfVq.d.ts → SSRServer-C9yjcgke.d.ts}

@@ -1,5 +1,5 @@
 import { ServerResponse } from 'node:http';
-import { FastifyRequest, FastifyReply, HookHandlerDoneFunction, FastifyPluginAsync } from 'fastify';
+import { FastifyRequest, FastifyReply, HookHandlerDoneFunction, FastifyPluginAsync, FastifyInstance } from 'fastify';
 import { PluginOption } from 'vite';
 
 type CSPDirectives = Record<string, string[]>;
@@ -69,6 +69,7 @@ type SSRServerOptions = {
             generateCSP?: (directives: CSPDirectives, nonce: string) => string;
         };
     };
+    registerStaticAssets?: false | ((app: FastifyInstance) => Promise<void> | void);
     isDebug?: boolean;
 };
 type ServiceMethod = (params: Record<string, unknown>) => Promise<Record<string, unknown>>;
@@ -79,14 +80,6 @@ type RenderCallbacks = {
     onFinish: (initialDataResolved: unknown) => void;
     onError: (error: unknown) => void;
 };
-type FetchConfig = {
-    url?: string;
-    options: RequestInit & {
-        params?: Record<string, unknown>;
-    };
-    serviceName?: string;
-    serviceMethod?: string;
-};
 type SSRManifest = {
     [key: string]: string[];
 };
@@ -118,22 +111,28 @@ type BaseMiddleware = {
         strategy?: string;
     };
 };
+type ServiceCall = {
+    serviceName: string;
+    serviceMethod: string;
+    args?: Record<string, unknown>;
+};
+type DataResult = Record<string, unknown> | ServiceCall;
+type DataHandler<Params> = (params: Params, ctx: {
+    headers: Record<string, string>;
+    [key: string]: unknown;
+}) => Promise<DataResult>;
 type RouteAttributes<Params = {}, Middleware = BaseMiddleware> = {
     render: 'ssr';
     hydrate?: boolean;
     meta?: Record<string, unknown>;
     middleware?: Middleware;
-    fetch?: (params?: Params, options?: RequestInit & {
-        params?: Record<string, unknown>;
-    }) => Promise<FetchConfig>;
+    data?: DataHandler<Params>;
 } | {
     render: 'streaming';
     hydrate?: never;
     meta: Record<string, unknown>;
     middleware?: Middleware;
-    fetch?: (params?: Params, options?: RequestInit & {
-        params?: Record<string, unknown>;
-    }) => Promise<FetchConfig>;
+    data?: DataHandler<Params>;
 };
 type Route<Params = {}> = {
     attr?: RouteAttributes<Params>;
@@ -147,4 +146,4 @@ interface InitialRouteParams extends Record<string, unknown> {
 type RouteParams = InitialRouteParams & Record<string, unknown>;
 type RoutePathsAndAttributes<Params = {}> = Omit<Route<Params>, 'element'>;
 
-export { type BaseMiddleware as B, type Config as C, type FetchConfig as F, type InitialRouteParams as I, type ManifestEntry as M, type NamedService as N, type ProcessedConfig as P, type Route as R, SSRServer as S, TEMPLATE as T, type RouteParams as a, type RouteAttributes as b, createMaps as c, type SSRServerOptions as d, type ServiceMethod as e, type ServiceRegistry as f, type RenderCallbacks as g, type SSRManifest as h, type Manifest as i, type RenderSSR as j, type RenderStream as k, type RenderModule as l, type RoutePathsAndAttributes as m, type CSPDirectives as n, type CSPOptions as o, processConfigs as p, defaultGenerateCSP as q, generateNonce as r, createCSPHook as s, getRequestNonce as t, applyCSP as u };
+export { type BaseMiddleware as B, type Config as C, type DataResult as D, type InitialRouteParams as I, type ManifestEntry as M, type NamedService as N, type ProcessedConfig as P, type Route as R, SSRServer as S, TEMPLATE as T, type RouteParams as a, type RouteAttributes as b, createMaps as c, type SSRServerOptions as d, type ServiceMethod as e, type ServiceRegistry as f, type RenderCallbacks as g, type SSRManifest as h, type Manifest as i, type RenderSSR as j, type RenderStream as k, type RenderModule as l, type ServiceCall as m, type DataHandler as n, type RoutePathsAndAttributes as o, processConfigs as p, type CSPDirectives as q, type CSPOptions as r, defaultGenerateCSP as s, generateNonce as t, createCSPHook as u, getRequestNonce as v, applyCSP as w };

package/dist/build.d.ts

@@ -1,6 +1,6 @@
 import { AppConfig } from './config.js';
 import 'vite';
-import './SSRServer-C7MMCfVq.js';
+import './SSRServer-C9yjcgke.js';
 import 'node:http';
 import 'fastify';
 

package/dist/build.js

@@ -406,32 +406,25 @@ var callServiceMethod = async (registry, serviceName, methodName, params) => {
     throw new Error(`Expected object response from ${String(serviceName)}.${String(methodName)}, but got ${typeof data}`);
   return data;
 };
-var fetchData = async ({ url, options }) => {
-  if (url) {
-    const response = await fetch(url, options);
-    if (!response.ok) throw new Error(`Failed to fetch data from ${url}`);
-    const data = await response.json();
-    if (typeof data !== "object" || data === null) throw new Error(`Expected object response from ${url}, but got ${typeof data}`);
-    return data;
-  }
-  throw new Error("URL must be provided to fetch data");
+var isServiceDescriptor = (obj) => {
+  if (typeof obj !== "object" || obj === null || Array.isArray(obj)) return false;
+  const maybe = obj;
+  return typeof maybe.serviceName === "string" && typeof maybe.serviceMethod === "string";
 };
-var fetchInitialData = async (attr, params, serviceRegistry) => {
-  if (attr && typeof attr.fetch === "function") {
-    return attr.fetch(params, {
-      headers: { "Content-Type": "application/json" },
-      params
-    }).then(async (data) => {
-      if (data.serviceName && data.serviceMethod && typeof data.serviceName === "string" && typeof data.serviceMethod === "string")
-        return await callServiceMethod(serviceRegistry, data.serviceName, data.serviceMethod, data.options?.params ?? {});
-      if (data.url && typeof data.url === "string") return await fetchData(data);
-      throw new Error("Invalid fetch configuration: must have either serviceName+serviceMethod or url");
-    }).catch((error) => {
-      console.error("Error fetching initial data:", error);
-      throw error;
-    });
+var fetchInitialData = async (attr, params, serviceRegistry, ctx = { headers: {} }, callServiceMethodImpl = callServiceMethod) => {
+  if (!attr?.data || typeof attr.data !== "function") return {};
+  const result = await attr.data(params, ctx);
+  if (isServiceDescriptor(result)) {
+    const { serviceName, serviceMethod, args } = result;
+    if (serviceRegistry[serviceName]?.[serviceMethod]) {
+      return await callServiceMethodImpl(serviceRegistry, serviceName, serviceMethod, args ?? {});
+    }
+    throw new Error(`Invalid service: serviceName=${String(serviceName)}, method=${String(serviceMethod)}`);
+  }
+  if (typeof result === "object" && result !== null) {
+    return result;
   }
-  return Promise.resolve({});
+  throw new Error("Invalid result from attr.data");
 };
 var matchRoute = (url, renderRoutes) => {
   for (const route of renderRoutes) {
@@ -545,12 +538,25 @@ var SSRServer = (0, import_fastify_plugin.default)(
       ],
       opts.isDebug
     );
-    await app.register(import("@fastify/static"), {
-      index: false,
-      prefix: "/",
-      root: baseClientRoot,
-      wildcard: false
-    });
+    if (opts.registerStaticAssets !== false) {
+      if (typeof opts.registerStaticAssets === "function") {
+        await opts.registerStaticAssets(app);
+      } else {
+        try {
+          const fastifyStatic = await import("@fastify/static");
+          await app.register(fastifyStatic.default, {
+            index: false,
+            prefix: "/",
+            root: baseClientRoot,
+            wildcard: false
+          });
+        } catch (err) {
+          throw new Error(
+            "Static asset handling requires @fastify/static to be installed. Either install it or provide your own static asset handler using `registerStaticAssets`."
+          );
+        }
+      }
+    }
     app.addHook(
       "onRequest",
       createCSPHook({

package/dist/config.d.ts

@@ -1,5 +1,5 @@
 import { PluginOption } from 'vite';
-import { R as Route, a as RouteParams, b as RouteAttributes } from './SSRServer-C7MMCfVq.js';
+import { R as Route, a as RouteParams, b as RouteAttributes } from './SSRServer-C9yjcgke.js';
 import 'node:http';
 import 'fastify';
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { FastifyReply } from 'fastify';
-export { B as BaseMiddleware, C as Config, F as FetchConfig, I as InitialRouteParams, i as Manifest, M as ManifestEntry, N as NamedService, P as ProcessedConfig, g as RenderCallbacks, l as RenderModule, j as RenderSSR, k as RenderStream, R as Route, b as RouteAttributes, a as RouteParams, m as RoutePathsAndAttributes, h as SSRManifest, S as SSRServer, d as SSRServerOptions, e as ServiceMethod, f as ServiceRegistry, T as TEMPLATE, c as createMaps, p as processConfigs } from './SSRServer-C7MMCfVq.js';
+export { B as BaseMiddleware, C as Config, n as DataHandler, D as DataResult, I as InitialRouteParams, i as Manifest, M as ManifestEntry, N as NamedService, P as ProcessedConfig, g as RenderCallbacks, l as RenderModule, j as RenderSSR, k as RenderStream, R as Route, b as RouteAttributes, a as RouteParams, o as RoutePathsAndAttributes, h as SSRManifest, S as SSRServer, d as SSRServerOptions, m as ServiceCall, e as ServiceMethod, f as ServiceRegistry, T as TEMPLATE, c as createMaps, p as processConfigs } from './SSRServer-C9yjcgke.js';
 import 'node:http';
 import 'vite';
 
@@ -9,7 +9,7 @@ declare module 'fastify' {
   }
   interface FastifyInstance {
     /**
-     * Optional authentication hook to be used by the TauJS SSRServer.
+     * Optional authentication hook to be used by the taujs SSRServer.
      * This method must be decorated by the user when using auth middleware in `taujs.config.ts`.
      *
      * Example usage:

package/dist/index.js

@@ -404,32 +404,25 @@ var callServiceMethod = async (registry, serviceName, methodName, params) => {
     throw new Error(`Expected object response from ${String(serviceName)}.${String(methodName)}, but got ${typeof data}`);
   return data;
 };
-var fetchData = async ({ url, options }) => {
-  if (url) {
-    const response = await fetch(url, options);
-    if (!response.ok) throw new Error(`Failed to fetch data from ${url}`);
-    const data = await response.json();
-    if (typeof data !== "object" || data === null) throw new Error(`Expected object response from ${url}, but got ${typeof data}`);
-    return data;
-  }
-  throw new Error("URL must be provided to fetch data");
+var isServiceDescriptor = (obj) => {
+  if (typeof obj !== "object" || obj === null || Array.isArray(obj)) return false;
+  const maybe = obj;
+  return typeof maybe.serviceName === "string" && typeof maybe.serviceMethod === "string";
 };
-var fetchInitialData = async (attr, params, serviceRegistry) => {
-  if (attr && typeof attr.fetch === "function") {
-    return attr.fetch(params, {
-      headers: { "Content-Type": "application/json" },
-      params
-    }).then(async (data) => {
-      if (data.serviceName && data.serviceMethod && typeof data.serviceName === "string" && typeof data.serviceMethod === "string")
-        return await callServiceMethod(serviceRegistry, data.serviceName, data.serviceMethod, data.options?.params ?? {});
-      if (data.url && typeof data.url === "string") return await fetchData(data);
-      throw new Error("Invalid fetch configuration: must have either serviceName+serviceMethod or url");
-    }).catch((error) => {
-      console.error("Error fetching initial data:", error);
-      throw error;
-    });
+var fetchInitialData = async (attr, params, serviceRegistry, ctx = { headers: {} }, callServiceMethodImpl = callServiceMethod) => {
+  if (!attr?.data || typeof attr.data !== "function") return {};
+  const result = await attr.data(params, ctx);
+  if (isServiceDescriptor(result)) {
+    const { serviceName, serviceMethod, args } = result;
+    if (serviceRegistry[serviceName]?.[serviceMethod]) {
+      return await callServiceMethodImpl(serviceRegistry, serviceName, serviceMethod, args ?? {});
+    }
+    throw new Error(`Invalid service: serviceName=${String(serviceName)}, method=${String(serviceMethod)}`);
+  }
+  if (typeof result === "object" && result !== null) {
+    return result;
   }
-  return Promise.resolve({});
+  throw new Error("Invalid result from attr.data");
 };
 var matchRoute = (url, renderRoutes) => {
   for (const route of renderRoutes) {
@@ -543,12 +536,25 @@ var SSRServer = (0, import_fastify_plugin.default)(
       ],
       opts.isDebug
     );
-    await app.register(import("@fastify/static"), {
-      index: false,
-      prefix: "/",
-      root: baseClientRoot,
-      wildcard: false
-    });
+    if (opts.registerStaticAssets !== false) {
+      if (typeof opts.registerStaticAssets === "function") {
+        await opts.registerStaticAssets(app);
+      } else {
+        try {
+          const fastifyStatic = await import("@fastify/static");
+          await app.register(fastifyStatic.default, {
+            index: false,
+            prefix: "/",
+            root: baseClientRoot,
+            wildcard: false
+          });
+        } catch (err) {
+          throw new Error(
+            "Static asset handling requires @fastify/static to be installed. Either install it or provide your own static asset handler using `registerStaticAssets`."
+          );
+        }
+      }
+    }
     app.addHook(
       "onRequest",
       createCSPHook({

package/dist/security/csp.d.ts

@@ -1,4 +1,4 @@
 import 'fastify';
-export { n as CSPDirectives, o as CSPOptions, u as applyCSP, s as createCSPHook, q as defaultGenerateCSP, r as generateNonce, t as getRequestNonce } from '../SSRServer-C7MMCfVq.js';
+export { q as CSPDirectives, r as CSPOptions, w as applyCSP, u as createCSPHook, s as defaultGenerateCSP, t as generateNonce, v as getRequestNonce } from '../SSRServer-C9yjcgke.js';
 import 'node:http';
 import 'vite';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/server",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "taujs [ τjs ]",
   "author": "John Smith | Aoede <taujs@aoede.uk.net> (https://www.aoede.uk.net)",
   "license": "MIT",
@@ -47,7 +47,6 @@
     "dist"
   ],
   "dependencies": {
-    "@fastify/static": "^8.0.3",
     "path-to-regexp": "^8.1.0",
     "vite-plugin-node-polyfills": "^0.23.0"
   },
@@ -55,6 +54,7 @@
     "@arethetypeswrong/cli": "^0.15.4",
     "@babel/preset-typescript": "^7.24.7",
     "@changesets/cli": "^2.27.7",
+    "@fastify/static": "^8.0.3",
     "@types/node": "^20.14.9",
     "@vitest/coverage-v8": "^2.1.0",
     "@vitest/ui": "^2.1.9",
@@ -67,10 +67,16 @@
     "vitest": "^2.0.5"
   },
   "peerDependencies": {
+    "@fastify/static": "^8.0.3",
     "fastify": "^5.3.3",
     "typescript": "^5.5.4",
     "vite": "^6.3.5"
   },
+  "peerDependenciesMeta": {
+    "@fastify/static": {
+      "optional": true
+    }
+  },
   "scripts": {
     "build": "tsup",
     "build-local": "tsup && ./move.sh",