@taujs/server 0.4.8 → 0.5.0

package/dist/index.js

@@ -99,7 +99,7 @@ var require_picocolors = __commonJS({
 
 // src/CreateServer.ts
 var import_picocolors4 = __toESM(require_picocolors(), 1);
-import path7 from "path";
+import path5 from "path";
 import { performance as performance3 } from "perf_hooks";
 import Fastify from "fastify";
 
@@ -168,8 +168,8 @@ var extractRoutes = (taujsConfig) => {
     apps.push({ appId: app.appId, routeCount: appRoutes.length });
     allRoutes.push(...appRoutes);
   }
-  for (const [path9, appIds] of pathTracker.entries()) {
-    if (appIds.length > 1) warnings.push(`Route path "${path9}" is declared in multiple apps: ${appIds.join(", ")}`);
+  for (const [path7, appIds] of pathTracker.entries()) {
+    if (appIds.length > 1) warnings.push(`Route path "${path7}" is declared in multiple apps: ${appIds.join(", ")}`);
   }
   const sortedRoutes = allRoutes.sort((a, b) => computeScore(b.path) - computeScore(a.path));
   const durationMs = performance.now() - t0;
@@ -253,8 +253,8 @@ function printContractReport(logger, report) {
     }
   }
 }
-var computeScore = (path9) => {
-  return path9.split("/").filter(Boolean).reduce((score, segment) => score + (segment.startsWith(":") ? 1 : 10), 0);
+var computeScore = (path7) => {
+  return path7.split("/").filter(Boolean).reduce((score, segment) => score + (segment.startsWith(":") ? 1 : 10), 0);
 };
 
 // src/logging/AppError.ts
@@ -760,7 +760,6 @@ var verifyContracts = (app, routes, contracts, security) => {
 };
 
 // src/SSRServer.ts
-import path6 from "path";
 import fp3 from "fastify-plugin";
 
 // src/logging/utils/index.ts
@@ -858,15 +857,15 @@ var safeDecode = (value) => {
     return value;
   }
 };
-var cleanPath = (path9) => {
-  if (!path9) return "/";
-  const basePart = path9.split("?")[0];
+var cleanPath = (path7) => {
+  if (!path7) return "/";
+  const basePart = path7.split("?")[0];
   const base = basePart ? basePart.split("#")[0] : "/";
   return base || "/";
 };
-var calculateSpecificity = (path9) => {
+var calculateSpecificity = (path7) => {
   let score = 0;
-  const segments = path9.split("/").filter(Boolean);
+  const segments = path7.split("/").filter(Boolean);
   for (const segment of segments) {
     if (segment.startsWith(":")) {
       score += 1;
@@ -891,9 +890,9 @@ var createRouteMatchers = (routes) => {
   });
 };
 var matchRoute = (url, routeMatchers) => {
-  const path9 = cleanPath(url);
+  const path7 = cleanPath(url);
   for (const { route, matcher, keys } of routeMatchers) {
-    const match2 = matcher(path9);
+    const match2 = matcher(path7);
     if (match2) {
       return {
         route,
@@ -1033,9 +1032,9 @@ var mergeDirectives = (base, override) => {
   }
   return merged;
 };
-var findMatchingRoute = (routeMatchers, path9) => {
+var findMatchingRoute = (routeMatchers, path7) => {
   if (!routeMatchers) return null;
-  const match2 = matchRoute(path9, routeMatchers);
+  const match2 = matchRoute(path7, routeMatchers);
   return match2 ? { route: match2.route, params: match2.params } : null;
 };
 var cspPlugin = fp(
@@ -1365,7 +1364,6 @@ var loadAssets = async (processedConfigs, baseClientRoot, bootstrapModules, cssL
     debug: opts.debug,
     includeContext: true
   });
-  const projectRoot = opts.projectRoot ?? path2.resolve(process.cwd());
   for (const config of processedConfigs) {
     const { clientRoot, entryClient, entryServer, htmlTemplate, entryPoint } = config;
     try {
@@ -1376,12 +1374,14 @@ var loadAssets = async (processedConfigs, baseClientRoot, bootstrapModules, cssL
       const adjustedRelativePath = relativeBasePath ? `/${relativeBasePath}` : "";
       if (!isDevelopment) {
         try {
-          const clientDistPath = path2.resolve(projectRoot, "client", entryPoint);
+          const distRoot = path2.dirname(baseClientRoot);
+          const ssrRoot = path2.join(distRoot, "ssr");
+          const clientDistPath = path2.join(baseClientRoot, entryPoint);
           const manifestPath = path2.join(clientDistPath, ".vite/manifest.json");
           const manifestContent = await readFile(manifestPath, "utf-8");
           const manifest = JSON.parse(manifestContent);
           manifests.set(clientRoot, manifest);
-          const ssrDistPath = path2.resolve(projectRoot, "ssr", entryPoint);
+          const ssrDistPath = path2.join(ssrRoot, entryPoint);
           const ssrManifestPath = path2.join(ssrDistPath, ".vite/ssr-manifest.json");
           const ssrManifestContent = await readFile(ssrManifestPath, "utf-8");
           const ssrManifest = JSON.parse(ssrManifestContent);
@@ -1902,7 +1902,6 @@ async function resolveRouteData(url, opts) {
 }
 
 // src/utils/StaticAssets.ts
-import path5 from "path";
 function normaliseStaticAssets(reg) {
   if (!reg) return [];
   return Array.isArray(reg) ? reg : [reg];
@@ -1911,14 +1910,11 @@ function prefixWeight(prefix) {
   if (typeof prefix !== "string" || prefix === "/" || prefix.length === 0) return 0;
   return prefix.split("/").filter(Boolean).length;
 }
-async function registerStaticAssets(app, baseClientRoot, reg, defaults, projectRoot) {
-  const isDevelopment2 = process.env.NODE_ENV === "development";
-  const effectiveProjectRoot = projectRoot ?? path5.resolve(process.cwd());
-  const staticRoot = isDevelopment2 ? baseClientRoot : path5.resolve(effectiveProjectRoot, "client");
+async function registerStaticAssets(app, clientRoot, reg, defaults) {
   const entries = normaliseStaticAssets(reg).map(({ plugin, options }) => ({
     plugin,
     options: {
-      root: staticRoot,
+      root: clientRoot,
       prefix: "/",
       index: false,
       wildcard: false,
@@ -1935,7 +1931,7 @@ async function registerStaticAssets(app, baseClientRoot, reg, defaults, projectR
 // src/SSRServer.ts
 var SSRServer = fp3(
   async (app, opts) => {
-    const { alias, configs, routes, serviceRegistry = {}, clientRoot: baseClientRoot, security } = opts;
+    const { alias, configs, routes, serviceRegistry = {}, clientRoot, security } = opts;
     const logger = createLogger({
       debug: opts.debug,
       context: { component: "ssr-server" },
@@ -1944,13 +1940,12 @@ var SSRServer = fp3(
       singleLine: true
     });
     const maps = createMaps();
-    const processedConfigs = processConfigs(configs, baseClientRoot, TEMPLATE);
+    const processedConfigs = processConfigs(configs, clientRoot, TEMPLATE);
     const routeMatchers = createRouteMatchers(routes);
     let viteDevServer;
-    const projectRoot = path6.resolve(baseClientRoot, "..");
     await loadAssets(
       processedConfigs,
-      baseClientRoot,
+      clientRoot,
       maps.bootstrapModules,
       maps.cssLinks,
       maps.manifests,
@@ -1960,11 +1955,14 @@ var SSRServer = fp3(
       maps.templates,
       {
         debug: opts.debug,
-        logger,
-        projectRoot
+        logger
       }
     );
-    if (opts.staticAssets) await registerStaticAssets(app, baseClientRoot, opts.staticAssets, void 0, projectRoot);
+    if (!isDevelopment && !opts.staticAssets) {
+      const fastifyStatic = await import("@fastify/static");
+      await registerStaticAssets(app, clientRoot, { plugin: fastifyStatic.default });
+    }
+    if (opts.staticAssets) await registerStaticAssets(app, clientRoot, opts.staticAssets);
     if (security?.csp?.reporting) {
       app.register(cspReportPlugin, {
         path: security.csp.reporting.endpoint,
@@ -1979,7 +1977,7 @@ var SSRServer = fp3(
       routeMatchers,
       debug: opts.debug
     });
-    if (isDevelopment) viteDevServer = await setupDevServer(app, baseClientRoot, alias, opts.debug, opts.devNet);
+    if (isDevelopment) viteDevServer = await setupDevServer(app, clientRoot, alias, opts.debug, opts.devNet);
     app.addHook("onRequest", createAuthHook(routeMatchers, logger));
     app.get("/__taujs/data", async (req, reply) => {
       const query = req.query;
@@ -2051,9 +2049,15 @@ var SSRServer = fp3(
 );
 
 // src/CreateServer.ts
+var resolveClientRoot = (userClientRoot) => {
+  if (userClientRoot) return path5.isAbsolute(userClientRoot) ? userClientRoot : path5.resolve(process.cwd(), userClientRoot);
+  const cwd = process.cwd();
+  if (process.env.NODE_ENV === "production") return path5.resolve(cwd, "dist/client");
+  return path5.resolve(cwd, "src/client");
+};
 var createServer = async (opts) => {
   const t0 = performance3.now();
-  const clientRoot = opts.clientRoot ?? path7.resolve(process.cwd(), "client");
+  const clientRoot = resolveClientRoot(opts.clientRoot);
   const app = opts.fastify ?? Fastify({ logger: false });
   const fastifyLogger = app.log && app.log.level && app.log.level !== "silent" ? app.log : void 0;
   const logger = createLogger({
@@ -2123,7 +2127,7 @@ ${import_picocolors4.default.bgGreen(import_picocolors4.default.black(` ${CONTEN
 
 // src/Build.ts
 import { existsSync } from "fs";
-import path8 from "path";
+import path6 from "path";
 import { build } from "vite";
 function resolveInputs(isSSRBuild, mainExists, paths) {
   if (isSSRBuild) return { server: paths.server };
@@ -2295,7 +2299,7 @@ async function taujsBuild({
 }) {
   const deleteDist = async () => {
     const { rm } = await import("fs/promises");
-    const distPath = path8.resolve(projectRoot, "dist");
+    const distPath = path6.resolve(projectRoot, "dist");
     try {
       await rm(distPath, { recursive: true, force: true });
       console.log("Deleted the dist directory\n");
@@ -2316,17 +2320,17 @@ async function taujsBuild({
   if (!isSSRBuild) await deleteDist();
   for (const appConfig of configsToBuild) {
     const { appId, entryPoint, clientRoot, entryClient, entryServer, htmlTemplate, plugins = [] } = appConfig;
-    const outDir = path8.resolve(projectRoot, isSSRBuild ? `dist/ssr/${entryPoint}` : `dist/client/${entryPoint}`);
-    const root = entryPoint ? path8.resolve(clientBaseDir, entryPoint) : clientBaseDir;
+    const outDir = path6.resolve(projectRoot, isSSRBuild ? `dist/ssr/${entryPoint}` : `dist/client/${entryPoint}`);
+    const root = entryPoint ? path6.resolve(clientBaseDir, entryPoint) : clientBaseDir;
     const defaultAlias = {
       "@client": root,
-      "@server": path8.resolve(projectRoot, "src/server"),
-      "@shared": path8.resolve(projectRoot, "src/shared")
+      "@server": path6.resolve(projectRoot, "src/server"),
+      "@shared": path6.resolve(projectRoot, "src/shared")
     };
     const resolvedAlias = { ...defaultAlias, ...userAlias ?? {} };
-    const server = path8.resolve(clientRoot, `${entryServer}.tsx`);
-    const client = path8.resolve(clientRoot, `${entryClient}.tsx`);
-    const main = path8.resolve(clientRoot, htmlTemplate);
+    const server = path6.resolve(clientRoot, `${entryServer}.tsx`);
+    const client = path6.resolve(clientRoot, `${entryClient}.tsx`);
+    const main = path6.resolve(clientRoot, htmlTemplate);
     const inputs = resolveInputs(isSSRBuild, !isSSRBuild && existsSync(main), { server, client, main });
     const nodeVersion = process.versions.node.split(".")[0];
     const frameworkConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/server",
-  "version": "0.4.8",
+  "version": "0.5.0",
   "description": "τjs [ taujs ]",
   "author": "John Smith | Aoede <taujs@aoede.uk.net> (https://www.aoede.uk.net)",
   "license": "MIT",
@@ -44,6 +44,7 @@
     "dist"
   ],
   "dependencies": {
+    "@fastify/static": "^8.3.0",
     "fastify": "^5.6.1",
     "fastify-plugin": "^5.1.0",
     "path-to-regexp": "^8.1.0",