@taujs/server 0.0.5 → 0.0.7

package/dist/SSRServer.d.ts

@@ -21,7 +21,7 @@ type FetchConfig = {
     serviceMethod?: string;
 };
 type SSRServerOptions = {
-    alias: Record<string, string>;
+    alias?: Record<string, string>;
     clientRoot: string;
     clientHtmlTemplate: string;
     clientEntryClient: string;
@@ -56,7 +56,7 @@ type RouteAttributes<Params = {}> = {
     }>;
 };
 type Route<Params = {}> = {
-    attributes: RouteAttributes<Params>;
+    attributes?: RouteAttributes<Params>;
     path: string;
 };
 interface InitialRouteParams extends Record<string, unknown> {

package/dist/SSRServer.js

@@ -117,7 +117,7 @@ var require_plugin = __commonJS({
 
 // src/SSRServer.ts
 var import_fastify_plugin = __toESM(require_plugin(), 1);
-import fs from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { createViteRuntime } from "vite";
 
@@ -171,7 +171,6 @@ function renderPreloadLinks(modules, manifest) {
 }
 function renderPreloadLink(file) {
   const fileType = file.match(/\.(js|css|woff2?|gif|jpe?g|png|svg)$/)?.[1];
-  if (!fileType) return "";
   switch (fileType) {
     case "js":
       return `<link rel="modulepreload" href="${file}">`;
@@ -212,6 +211,23 @@ var fetchData = async ({ url, options }) => {
   }
   throw new Error("URL must be provided to fetch data");
 };
+var fetchInitialData = async (attributes, params, serviceRegistry) => {
+  if (attributes && typeof attributes.fetch === "function") {
+    return attributes.fetch(params, {
+      headers: { "Content-Type": "application/json" },
+      params
+    }).then(async (data) => {
+      if (data.serviceName && data.serviceMethod) {
+        return await callServiceMethod(serviceRegistry, data.serviceName, data.serviceMethod, data.options?.params ?? {});
+      }
+      return await fetchData(data);
+    }).catch((error) => {
+      console.error("Error fetching initial data:", error);
+      throw error;
+    });
+  }
+  return Promise.resolve({});
+};
 var matchRoute = (url, renderRoutes) => {
   for (const route of renderRoutes) {
     const matcher = match(route.path, {
@@ -246,12 +262,12 @@ var SSRServer = (0, import_fastify_plugin.default)(
   async (app, opts) => {
     const { alias, clientRoot, clientHtmlTemplate, clientEntryClient, clientEntryServer, routes, serviceRegistry, isDebug } = opts;
     const templateHtmlPath = path.join(clientRoot, clientHtmlTemplate);
-    const templateHtml = !isDevelopment ? await fs.readFile(templateHtmlPath, "utf-8") : await fs.readFile(path.join(clientRoot, clientHtmlTemplate), "utf-8");
+    const templateHtml = !isDevelopment ? await readFile(templateHtmlPath, "utf-8") : await readFile(path.join(clientRoot, clientHtmlTemplate), "utf-8");
     const ssrManifestPath = path.join(clientRoot, ".vite/ssr-manifest.json");
-    const ssrManifest = !isDevelopment ? JSON.parse(await fs.readFile(ssrManifestPath, "utf-8")) : void 0;
+    const ssrManifest = !isDevelopment ? JSON.parse(await readFile(ssrManifestPath, "utf-8")) : void 0;
     const manifestPath = path.join(clientRoot, ".vite/manifest.json");
-    const manifest = !isDevelopment ? JSON.parse(await fs.readFile(manifestPath, "utf-8")) : void 0;
-    const bootstrapModules = isDevelopment ? `/${clientEntryClient}.tsx` : `/${manifest[`${clientEntryClient}.tsx`].file}`;
+    const manifest = !isDevelopment ? JSON.parse(await readFile(manifestPath, "utf-8")) : void 0;
+    const bootstrapModules = isDevelopment ? `/${clientEntryClient}.tsx` : `/${manifest[`${clientEntryClient}.tsx`]?.file}`;
     const preloadLinks = !isDevelopment ? renderPreloadLinks(Object.keys(ssrManifest), ssrManifest) : void 0;
     const cssLinks = !isDevelopment ? getCssLinks(manifest) : void 0;
     let renderModule;
@@ -267,7 +283,6 @@ var SSRServer = (0, import_fastify_plugin.default)(
         plugins: [
           ...isDebug ? [
             {
-              name: "taujs-ssr-server-debug-logging",
               configureServer(server) {
                 console.log("\u03C4js debug ssr server started.");
                 server.middlewares.use((req, res, next) => {
@@ -277,7 +292,8 @@ var SSRServer = (0, import_fastify_plugin.default)(
                   });
                   next();
                 });
-              }
+              },
+              name: "taujs-ssr-server-debug-logging"
             }
           ] : []
         ],
@@ -335,17 +351,7 @@ var SSRServer = (0, import_fastify_plugin.default)(
         const { attributes } = route;
         const [beforeBody = "", afterBody] = template.split("<!--ssr-html-->");
         const [beforeHead, afterHead] = beforeBody.split("<!--ssr-head-->");
-        const initialDataPromise = attributes && typeof attributes.fetch === "function" ? attributes.fetch(params, {
-          headers: { "Content-Type": "application/json" },
-          params
-        }).then((data) => {
-          if (data.serviceName && data.serviceMethod)
-            return callServiceMethod(serviceRegistry, data.serviceName, data.serviceMethod, data.options.params ?? {});
-          return fetchData(data);
-        }).catch((error) => {
-          console.error("Error fetching initial data:", error);
-          return {};
-        }) : Promise.resolve({});
+        const initialDataPromise = fetchInitialData(attributes, params, serviceRegistry);
         reply.raw.writeHead(200, { "Content-Type": "text/html" });
         reply.raw.write(beforeHead);
         streamRender(
@@ -363,8 +369,7 @@ var SSRServer = (0, import_fastify_plugin.default)(
               reply.raw.end();
             },
             onError: (error) => {
-              console.error("Critical rendering error:", error);
-              if (!reply.raw.headersSent) reply.raw.writeHead(500, { "Content-Type": "text/plain" });
+              console.error("Critical rendering onError:", error);
               reply.raw.end("Internal Server Error");
             }
           },

package/package.json

@@ -20,7 +20,7 @@
     "type": "git",
     "url": "git+https://github.com/aoede3/taujs-server.git"
   },
-  "version": "0.0.5",
+  "version": "0.0.7",
   "exports": {
     ".": {
       "import": "./dist/SSRServer.js",
@@ -60,10 +60,14 @@
     "@arethetypeswrong/cli": "^0.15.4",
     "@babel/preset-typescript": "^7.24.7",
     "@changesets/cli": "^2.27.7",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/react": "^16.0.1",
     "@types/node": "^20.14.9",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
+    "@vitest/coverage-v8": "^2.1.0",
     "fastify": "^4.28.0",
+    "jsdom": "^25.0.0",
     "prettier": "^3.3.3",
     "react-dom": "^18.3.1",
     "tsup": "^8.2.4",
@@ -72,10 +76,8 @@
     "vitest": "^2.0.5"
   },
   "peerDependencies": {
-    "@types/node": "^20.14.9",
-    "@types/react": "^18.3.3",
     "@vitejs/plugin-react": "^4.3.1",
-    "fastify": "^4.28.0",
+    "fastify": "^5.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.5.4",
@@ -86,6 +88,7 @@
     "ci": "npm run build && npm run check-format && npm run check-exports && npm run lint",
     "lint": "tsc",
     "test": "vitest run",
+    "coverage": "vitest run --coverage",
     "format": "prettier --write .",
     "check-format": "prettier --check .",
     "check-exports": "attw --pack . --ignore-rules=cjs-resolves-to-esm",