@kaathewise/ssg 0.8.3 → 0.8.4

package/dist/render.d.ts

@@ -6,4 +6,5 @@ export type Page = {
 };
 export declare function render(modulePath: string, pagesDir: string, params?: Params): Promise<Page>;
 export declare function renderAll(modulePath: string, pagesDir: string): Promise<Page[]>;
+export declare function substituteParams(inputPath: string, params: Params): string;
 //# sourceMappingURL=render.d.ts.map

package/dist/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,MAAM,IAAI,GAAG;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B,CAAA;AAED,wBAAsB,MAAM,CAC3B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,MAAW,GACjB,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED,wBAAsB,SAAS,CAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,EAAE,CAAC,CAgBjB"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,MAAM,IAAI,GAAG;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B,CAAA;AAED,wBAAsB,MAAM,CAC3B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,MAAW,GACjB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,wBAAsB,SAAS,CAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,EAAE,CAAC,CAgBjB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAgB1E"}

package/dist/render.js

@@ -6,35 +6,23 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     }
     return path;
 };
-import * as path from "node:path";
 export async function render(modulePath, pagesDir, params = {}) {
-    const module = await import(__rewriteRelativeImportExtension(`${modulePath}?update=${Date.now()}`));
-    let contentType = null;
-    if ("getContentType" in module) {
-        contentType = module.getContentType();
-    }
-    const def = module.default;
-    let src;
-    switch (typeof def) {
-        case "string": {
-            src = def;
-            break;
-        }
-        case "function": {
-            src = await def(params);
-            break;
-        }
-        default: {
-            throw "Not implemented";
-        }
-    }
-    let pagePath = path.relative(pagesDir, modulePath);
-    pagePath = substituteParams(pagePath, params);
-    pagePath = pagePath.replace(/\.tsx?$/, "");
-    if (pagePath.endsWith("index")) {
-        pagePath += ".html";
-    }
-    return { path: pagePath, src, contentType };
+    const worker = new Worker(new URL("./render_worker.ts", import.meta.url), {
+        type: "module",
+    });
+    return new Promise((resolve, reject) => {
+        worker.onmessage = (e) => {
+            console.log("e:", e);
+            worker.terminate();
+            if (e.data.page) {
+                resolve(e.data.page);
+            }
+            else {
+                reject(e.data.error);
+            }
+        };
+        worker.postMessage({ modulePath, pagesDir, params });
+    });
 }
 export async function renderAll(modulePath, pagesDir) {
     const module = await import(__rewriteRelativeImportExtension(modulePath));
@@ -50,7 +38,7 @@ export async function renderAll(modulePath, pagesDir) {
     }
     return out;
 }
-function substituteParams(inputPath, params) {
+export function substituteParams(inputPath, params) {
     let path = inputPath;
     for (const [key, value] of Object.entries(params)) {
         const single = `[${key}]`;

package/dist/render_worker.d.ts

@@ -0,0 +1,4 @@
+import { type Page } from "./render";
+import type { Params } from "./router.ts";
+export declare function render(modulePath: string, pagesDir: string, params?: Params): Promise<Page>;
+//# sourceMappingURL=render_worker.d.ts.map

package/dist/render_worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render_worker.d.ts","sourceRoot":"","sources":["../src/render_worker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,IAAI,EAAoB,MAAM,UAAU,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,wBAAsB,MAAM,CAC3B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,MAAW,GACjB,OAAO,CAAC,IAAI,CAAC,CAmCf"}

package/dist/render_worker.js

@@ -0,0 +1,50 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
+import * as path from "node:path";
+import { substituteParams } from "./render";
+export async function render(modulePath, pagesDir, params = {}) {
+    const module = await import(__rewriteRelativeImportExtension(modulePath));
+    console.log(module);
+    let contentType = null;
+    if ("getContentType" in module) {
+        contentType = module.getContentType();
+    }
+    const def = module.default;
+    let src;
+    switch (typeof def) {
+        case "string": {
+            src = def;
+            break;
+        }
+        case "function": {
+            src = await def(params);
+            break;
+        }
+        default: {
+            throw "Not implemented";
+        }
+    }
+    let pagePath = path.relative(pagesDir, modulePath);
+    pagePath = substituteParams(pagePath, params);
+    pagePath = pagePath.replace(/\.tsx?$/, "");
+    if (pagePath.endsWith("index")) {
+        pagePath += ".html";
+    }
+    return { path: pagePath, src, contentType };
+}
+self.onmessage = async (e) => {
+    const { modulePath, pagesDir, params } = e.data;
+    try {
+        const page = await render(modulePath, pagesDir, params);
+        self.postMessage({ page });
+    }
+    catch (err) {
+        self.postMessage({ error: err });
+    }
+};

package/dist/server.js

@@ -83,12 +83,18 @@ const RELOAD_SCRIPT = `
 </script>
 `;
 async function serveHtml(response, route, pagesDir) {
-    const page = await render(route.filePath, pagesDir, route.params);
-    if (page.contentType === "text/html" || !page.contentType) {
-        page.src += RELOAD_SCRIPT;
+    try {
+        const page = await render(route.filePath, pagesDir, route.params);
+        if (page.contentType === "text/html" || !page.contentType) {
+            page.src += RELOAD_SCRIPT;
+        }
+        response.writeHead(200, {
+            "Content-Type": page.contentType ?? "text/html",
+        });
+        response.end(page.src);
+    }
+    catch (err) {
+        response.writeHead(500, { "Content-Type": "text/plain" });
+        response.end(`Error: ${err}`);
     }
-    response.writeHead(200, {
-        "Content-Type": page.contentType ?? "text/html",
-    });
-    response.end(page.src);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@kaathewise/ssg",
 	"description": "JSX static site generator",
-	"version": "0.8.3",
+	"version": "0.8.4",
 	"license": "MPL-2.0",
 	"author": "Andrej Kolčin",
 	"type": "module",