@taujs/server 0.5.0 → 0.5.2

package/dist/index.js

@@ -143,6 +143,7 @@ var REGEX = {
   BENIGN_NET_ERR: /\b(?:ECONNRESET|EPIPE|ECONNABORTED)\b|socket hang up|aborted|premature(?: close)?/i,
   SAFE_TRACE: /^[a-zA-Z0-9-_:.]{1,128}$/
 };
+var ENTRY_EXTENSIONS = [".ts", ".tsx"];
 
 // src/Setup.ts
 var extractBuildConfigs = (config) => {
@@ -256,6 +257,11 @@ function printContractReport(logger, report) {
 var computeScore = (path7) => {
   return path7.split("/").filter(Boolean).reduce((score, segment) => score + (segment.startsWith(":") ? 1 : 10), 0);
 };
+function printVitePluginSummary(logger, appPlugins, merged) {
+  const mergedNames = merged.map((p) => p?.name).filter((n) => typeof n === "string" && n.length > 0);
+  const appsLine = appPlugins.length === 0 ? "no app plugins" : appPlugins.map((a) => `${a.appId}=[${a.plugins.join(", ") || "none"}]`).join(" ");
+  logger.info(void 0, `${CONTENT.TAG} [vite] Plugins ${appsLine} merged=[${mergedNames.join(", ") || "none"}]`);
+}
 
 // src/logging/AppError.ts
 var HTTP_STATUS = {
@@ -1226,6 +1232,7 @@ var cspReportPlugin = fp2(
 );
 
 // src/utils/AssetManager.ts
+import { existsSync } from "fs";
 import { readFile } from "fs/promises";
 import path2 from "path";
 import { pathToFileURL } from "url";
@@ -1337,6 +1344,14 @@ var rebuildTemplate = (parts, headContent, bodyContent) => {
 };
 
 // src/utils/AssetManager.ts
+function resolveEntryFile(clientRoot, stem) {
+  for (const ext of ENTRY_EXTENSIONS) {
+    const filename = `${stem}${ext}`;
+    const absPath = path2.join(clientRoot, filename);
+    if (existsSync(absPath)) return filename;
+  }
+  throw new Error(`Entry file "${stem}" not found in ${clientRoot}. Tried: ${ENTRY_EXTENSIONS.map((e) => stem + e).join(", ")}`);
+}
 var createMaps = () => ({
   bootstrapModules: /* @__PURE__ */ new Map(),
   cssLinks: /* @__PURE__ */ new Map(),
@@ -1349,13 +1364,20 @@ var createMaps = () => ({
 var processConfigs = (configs, baseClientRoot, templateDefaults) => {
   return configs.map((config) => {
     const clientRoot = path2.resolve(baseClientRoot, config.entryPoint);
+    const entryClient = config.entryClient || templateDefaults.defaultEntryClient;
+    const entryServer = config.entryServer || templateDefaults.defaultEntryServer;
+    const entryClientFile = resolveEntryFile(clientRoot, entryClient);
+    const entryServerFile = resolveEntryFile(clientRoot, entryServer);
     return {
       clientRoot,
       entryPoint: config.entryPoint,
-      entryClient: config.entryClient || templateDefaults.defaultEntryClient,
-      entryServer: config.entryServer || templateDefaults.defaultEntryServer,
+      entryClient,
+      entryServer,
       htmlTemplate: config.htmlTemplate || templateDefaults.defaultHtmlTemplate,
-      appId: config.appId
+      appId: config.appId,
+      plugins: config.plugins ?? [],
+      entryClientFile,
+      entryServerFile
     };
   });
 };
@@ -1365,7 +1387,7 @@ var loadAssets = async (processedConfigs, baseClientRoot, bootstrapModules, cssL
     includeContext: true
   });
   for (const config of processedConfigs) {
-    const { clientRoot, entryClient, entryServer, htmlTemplate, entryPoint } = config;
+    const { clientRoot, entryClient, entryServer, htmlTemplate, entryPoint, entryClientFile, entryServerFile } = config;
     try {
       const templateHtmlPath = path2.join(clientRoot, htmlTemplate);
       const templateHtml = await readFile(templateHtmlPath, "utf-8");
@@ -1386,17 +1408,17 @@ var loadAssets = async (processedConfigs, baseClientRoot, bootstrapModules, cssL
           const ssrManifestContent = await readFile(ssrManifestPath, "utf-8");
           const ssrManifest = JSON.parse(ssrManifestContent);
           ssrManifests.set(clientRoot, ssrManifest);
-          const entryClientFile = manifest[`${entryClient}.tsx`]?.file;
-          if (!entryClientFile) {
-            throw AppError.internal(`Entry client file not found in manifest for ${entryClient}.tsx`, {
+          const manifestEntry = manifest[entryClientFile];
+          if (!manifestEntry?.file) {
+            throw AppError.internal(`Entry client file not found in manifest for ${entryClientFile}`, {
               details: {
                 clientRoot,
-                entryClient,
+                entryClientFile,
                 availableKeys: Object.keys(manifest)
               }
             });
           }
-          const bootstrapModule = `/${adjustedRelativePath}/${entryClientFile}`.replace(/\/{2,}/g, "/");
+          const bootstrapModule = `/${adjustedRelativePath}/${manifestEntry.file}`.replace(/\/{2,}/g, "/");
           bootstrapModules.set(clientRoot, bootstrapModule);
           const preloadLink = renderPreloadLinks(ssrManifest, adjustedRelativePath);
           preloadLinks.set(clientRoot, preloadLink);
@@ -1433,7 +1455,7 @@ var loadAssets = async (processedConfigs, baseClientRoot, bootstrapModules, cssL
           }
         }
       } else {
-        const bootstrapModule = `/${adjustedRelativePath}/${entryClient}`.replace(/\/{2,}/g, "/");
+        const bootstrapModule = `/${adjustedRelativePath}/${entryClientFile}`.replace(/\/{2,}/g, "/");
         bootstrapModules.set(clientRoot, bootstrapModule);
       }
     } catch (err) {
@@ -1450,7 +1472,7 @@ var loadAssets = async (processedConfigs, baseClientRoot, bootstrapModules, cssL
 
 // src/utils/DevServer.ts
 import path3 from "path";
-var setupDevServer = async (app, baseClientRoot, alias, debug, devNet) => {
+var setupDevServer = async (app, baseClientRoot, alias, debug, devNet, plugins = []) => {
   const logger = createLogger({
     context: { service: "setupDevServer" },
     debug,
@@ -1470,6 +1492,7 @@ var setupDevServer = async (app, baseClientRoot, alias, debug, devNet) => {
     },
     mode: "development",
     plugins: [
+      ...plugins,
       ...debug ? [
         {
           name: "\u03C4js-development-server-debug-logging",
@@ -1592,7 +1615,7 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
         }
       });
     }
-    const { clientRoot, entryServer } = config;
+    const { clientRoot, entryServerFile } = config;
     let template = ensureNonNull(maps.templates.get(clientRoot), `Template not found for clientRoot: ${clientRoot}`);
     const bootstrapModule = maps.bootstrapModules.get(clientRoot);
     const cssLink = maps.cssLinks.get(clientRoot);
@@ -1604,7 +1627,7 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
       try {
         template = template.replace(/<script type="module" src="\/@vite\/client"><\/script>/g, "");
         template = template.replace(/<style type="text\/css">[\s\S]*?<\/style>/g, "");
-        const entryServerPath = path4.join(clientRoot, `${entryServer}.tsx`);
+        const entryServerPath = path4.join(clientRoot, entryServerFile);
         const executedModule = await viteDevServer.ssrLoadModule(entryServerPath);
         renderModule = executedModule;
         const styles = await collectStyle(viteDevServer, [entryServerPath]);
@@ -1612,7 +1635,7 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
         template = template?.replace("</head>", `<style type="text/css"${styleNonce}>${styles}</style></head>`);
         template = await viteDevServer.transformIndexHtml(url, template);
       } catch (error) {
-        throw AppError.internal("Failed to load dev assets", { cause: error, details: { clientRoot, entryServer, url } });
+        throw AppError.internal("Failed to load dev assets", { cause: error, details: { clientRoot, entryServerFile, url } });
       }
     } else {
       renderModule = maps.renderModules.get(clientRoot);
@@ -1746,8 +1769,8 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
       reply.raw.on("error", (err) => {
         if (!isBenignSocketAbort(err)) logger.error({ error: err }, "HTTP socket error:");
       });
-      writable.pipe(reply.raw, { end: false });
       let finalData = void 0;
+      let pipedToReply = false;
       renderStream(
         writable,
         {
@@ -1755,7 +1778,11 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
             let aggregateHeadContent = headContent;
             if (ssrManifest && preloadLink) aggregateHeadContent += preloadLink;
             if (manifest && cssLink) aggregateHeadContent += cssLink;
-            return reply.raw.write(`${templateParts.beforeHead}${aggregateHeadContent}${templateParts.afterHead}${templateParts.beforeBody}`);
+            reply.raw.write(`${templateParts.beforeHead}${aggregateHeadContent}${templateParts.afterHead}${templateParts.beforeBody}`);
+            if (!pipedToReply) {
+              pipedToReply = true;
+              writable.pipe(reply.raw, { end: false });
+            }
           },
           onShellReady: () => {
           },
@@ -1928,6 +1955,26 @@ async function registerStaticAssets(app, clientRoot, reg, defaults) {
   }
 }
 
+// src/utils/VitePlugins.ts
+function flattenPlugins(input) {
+  if (!input) return [];
+  if (Array.isArray(input)) return input.flatMap(flattenPlugins);
+  return [input];
+}
+function mergePlugins(opts) {
+  const internal = flattenPlugins(opts.internal);
+  const apps = (opts.apps ?? []).flatMap((a) => flattenPlugins(a.plugins));
+  const merged = [...internal, ...apps];
+  const seen = /* @__PURE__ */ new Set();
+  return merged.filter((p) => {
+    const name = typeof p?.name === "string" ? p.name : "";
+    if (!name) return true;
+    if (seen.has(name)) return false;
+    seen.add(name);
+    return true;
+  });
+}
+
 // src/SSRServer.ts
 var SSRServer = fp3(
   async (app, opts) => {
@@ -1977,7 +2024,21 @@ var SSRServer = fp3(
       routeMatchers,
       debug: opts.debug
     });
-    if (isDevelopment) viteDevServer = await setupDevServer(app, clientRoot, alias, opts.debug, opts.devNet);
+    if (isDevelopment) {
+      const plugins = mergePlugins({
+        internal: [],
+        apps: processedConfigs
+      });
+      printVitePluginSummary(
+        logger,
+        processedConfigs.map((c) => ({
+          appId: c.appId,
+          plugins: (c.plugins ?? []).map((p) => Array.isArray(p) ? `array(${p.length})` : p?.name ?? typeof p)
+        })),
+        plugins
+      );
+      viteDevServer = await setupDevServer(app, clientRoot, alias, opts.debug, opts.devNet, plugins);
+    }
     app.addHook("onRequest", createAuthHook(routeMatchers, logger));
     app.get("/__taujs/data", async (req, reply) => {
       const query = req.query;
@@ -2126,7 +2187,7 @@ ${import_picocolors4.default.bgGreen(import_picocolors4.default.black(` ${CONTEN
 };
 
 // src/Build.ts
-import { existsSync } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import path6 from "path";
 import { build } from "vite";
 function resolveInputs(isSSRBuild, mainExists, paths) {
@@ -2319,7 +2380,7 @@ async function taujsBuild({
   }
   if (!isSSRBuild) await deleteDist();
   for (const appConfig of configsToBuild) {
-    const { appId, entryPoint, clientRoot, entryClient, entryServer, htmlTemplate, plugins = [] } = appConfig;
+    const { appId, entryPoint, clientRoot, entryClientFile, entryServerFile, htmlTemplate, plugins = [] } = appConfig;
     const outDir = path6.resolve(projectRoot, isSSRBuild ? `dist/ssr/${entryPoint}` : `dist/client/${entryPoint}`);
     const root = entryPoint ? path6.resolve(clientBaseDir, entryPoint) : clientBaseDir;
     const defaultAlias = {
@@ -2328,10 +2389,10 @@ async function taujsBuild({
       "@shared": path6.resolve(projectRoot, "src/shared")
     };
     const resolvedAlias = { ...defaultAlias, ...userAlias ?? {} };
-    const server = path6.resolve(clientRoot, `${entryServer}.tsx`);
-    const client = path6.resolve(clientRoot, `${entryClient}.tsx`);
+    const server = path6.resolve(clientRoot, entryServerFile);
+    const client = path6.resolve(clientRoot, entryClientFile);
     const main = path6.resolve(clientRoot, htmlTemplate);
-    const inputs = resolveInputs(isSSRBuild, !isSSRBuild && existsSync(main), { server, client, main });
+    const inputs = resolveInputs(isSSRBuild, !isSSRBuild && existsSync2(main), { server, client, main });
     const nodeVersion = process.versions.node.split(".")[0];
     const frameworkConfig = {
       base: entryPoint ? `/${entryPoint}/` : "/",

package/package.json

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