@kaathewise/ssg 0.9.2 → 0.11.0

package/dist/build.js

@@ -1,11 +1,11 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import { renderAll } from "./render.js";
+import { makeAllPages, render } from "./render.js";
 import { walk } from "./utils.js";
 export async function build(config) {
     const pages = [];
     for await (const modulePath of walk(config.routesDir)) {
-        const p = await renderAll(modulePath, config);
+        const p = await makeAllPages(modulePath, config);
         pages.push(...p);
     }
     await fs.rm(config.outputDir, { recursive: true, force: true });
@@ -15,7 +15,7 @@ export async function build(config) {
         await fs.mkdir(path.dirname(destPath), {
             recursive: true,
         });
-        await fs.writeFile(destPath, page.src);
+        await fs.writeFile(destPath, render(page));
     }
     if (config.assetDir) {
         await fs.cp(config.assetDir, config.outputDir, {

package/dist/config.d.ts

@@ -13,6 +13,7 @@ export declare class Config {
     loaders: Loader[];
     constructor(options: ConfigOptions);
     getLoader(modulePath: string): Loader | null;
+    get scratchDir(): string;
 }
 export type Loader = {
     matcher: RegExp;

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,aAAa,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,qBAAa,MAAM;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IAEZ,OAAO,EAAE,MAAM,EAAE,CAAA;gBAEL,OAAO,EAAE,aAAa;IAclC,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CAQ5C;AAED,MAAM,MAAM,MAAM,GAAG;IACpB,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CAE3D"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,aAAa,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,qBAAa,MAAM;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IAEZ,OAAO,EAAE,MAAM,EAAE,CAAA;gBAEL,OAAO,EAAE,aAAa;IAclC,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAS5C,IAAI,UAAU,IAAI,MAAM,CAEvB;CACD;AAED,MAAM,MAAM,MAAM,GAAG;IACpB,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CAE3D"}

package/dist/config.js

@@ -1,3 +1,4 @@
+import * as fs from "node:fs";
 import * as path from "node:path";
 const OUTPUT_DIR = "dist/";
 const DEFAULT_PORT = 3001;
@@ -14,6 +15,7 @@ export class Config {
         if (options.assetDir) {
             this.assetDir = path.resolve(options.assetDir);
         }
+        fs.mkdirSync(this.scratchDir, { recursive: true });
         this.loaders = options.loaders ?? [];
     }
     getLoader(modulePath) {
@@ -24,6 +26,9 @@ export class Config {
         }
         return null;
     }
+    get scratchDir() {
+        return path.join(this.outputDir, "scratch");
+    }
 }
 export function defineConfig(options) {
     return new Config(options);

package/dist/render.d.ts

@@ -2,16 +2,19 @@ import type { Config } from "./config.ts";
 import type { Params } from "./router.ts";
 export type Page = {
     path: string;
-    src: string;
+    head: string;
+    body: string;
     contentType: string | null;
 };
 export type ArbitraryModule = {
     getStaticParams?: (() => Params[]) | (() => Promise<Params[]>);
     getContentType?(params: Params): string;
-    default?: ((params: Params) => string) | ((params: Params) => Promise<string>);
+    Body: (params: Params) => Promise<string>;
+    Head: (params: Params, body: string) => Promise<string>;
 };
-export declare function load(modulePath: string): Promise<ArbitraryModule>;
-export declare function render(modulePath: string, params: Params, config: Config): Promise<Page>;
-export declare function renderAll(modulePath: string, config: Config): Promise<Page[]>;
+export declare function load(modulePath: string, config: Config): Promise<ArbitraryModule>;
+export declare function makePage(modulePath: string, params: Params, config: Config): Promise<Page>;
+export declare function makeAllPages(modulePath: string, config: Config): Promise<Page[]>;
 export declare function substituteParams(inputPath: string, params: Params): string;
+export declare function render(page: Page): 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":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,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,MAAM,MAAM,eAAe,GAAG;IAC7B,eAAe,CAAC,EAAE,CAAC,MAAM,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAC9D,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvC,OAAO,CAAC,EACL,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,GAC5B,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;CACxC,CAAA;AAED,wBAAsB,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAGvE;AAED,wBAAsB,MAAM,CAC3B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAkCf;AAED,wBAAsB,SAAS,CAC9B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,EAAE,CAAC,CAgBjB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAgB1E"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,MAAM,IAAI,GAAG;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC7B,eAAe,CAAC,EAAE,CAAC,MAAM,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAC9D,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IACzC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CACvD,CAAA;AAED,wBAAsB,IAAI,CACzB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,CAAC,CAoB1B;AAED,wBAAsB,QAAQ,CAC7B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED,wBAAsB,YAAY,CACjC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,EAAE,CAAC,CAgBjB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAgB1E;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAWzC"}

package/dist/render.js

@@ -1,49 +1,60 @@
+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 { tsImport } from "tsx/esm/api";
-export async function load(modulePath) {
-    const module = tsImport(modulePath, { parentURL: import.meta.url });
+import * as esbuild from "esbuild";
+export async function load(modulePath, config) {
+    const result = await esbuild.build({
+        entryPoints: [modulePath],
+        bundle: true,
+        format: "esm",
+        outdir: config.scratchDir,
+        packages: "external",
+        platform: "node",
+        metafile: true,
+    });
+    if (!result.metafile)
+        throw Error("unreachable");
+    const outputFiles = Object.keys(result.metafile.outputs);
+    if (!outputFiles[0])
+        throw Error("unreachable");
+    const fileName = outputFiles[0].split("/").pop();
+    const outputPath = `${config.scratchDir}/${fileName}?t=${Date.now()}`;
+    const module = await import(__rewriteRelativeImportExtension(outputPath));
     return module;
 }
-export async function render(modulePath, params, config) {
-    const module = await load(modulePath);
+export async function makePage(modulePath, params, config) {
+    const module = await load(modulePath, config);
     let contentType = null;
     if (module.getContentType) {
         contentType = module.getContentType(params);
     }
-    const def = module.default;
-    let src;
-    switch (typeof def) {
-        case "string": {
-            src = def;
-            break;
-        }
-        case "function": {
-            src = await def(params);
-            break;
-        }
-        default: {
-            throw "`default` must be a string or a function";
-        }
-    }
+    const body = await module.Body(params);
+    const head = await module.Head(params, body);
     let pagePath = path.relative(config.routesDir, modulePath);
     pagePath = substituteParams(pagePath, params);
     pagePath = pagePath.replace(/\.tsx?$/, "");
     if (pagePath.endsWith("index")) {
         pagePath += ".html";
     }
-    return { path: pagePath, src, contentType };
+    return { path: pagePath, head, body, contentType };
 }
-export async function renderAll(modulePath, config) {
-    const module = await load(modulePath);
+export async function makeAllPages(modulePath, config) {
+    const module = await load(modulePath, config);
     const out = [];
     if (module.getStaticParams) {
         const paramsList = await module.getStaticParams();
         for (const params of paramsList) {
-            out.push(await render(modulePath, params, config));
+            out.push(await makePage(modulePath, params, config));
         }
     }
     else {
-        out.push(await render(modulePath, {}, config));
+        out.push(await makePage(modulePath, {}, config));
     }
     return out;
 }
@@ -62,3 +73,15 @@ export function substituteParams(inputPath, params) {
     path = path.replace(/\.tsx?$/, "");
     return path;
 }
+export function render(page) {
+    return `<!doctype html>
+<html>
+  <head>
+${page.head}
+  </head>
+  <body>
+${page.body}
+  </body>
+</html>
+`;
+}

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,KAAK,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;AAEtD,qBAAa,MAAM;;gBAIN,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE;WAK1B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAe9C,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;IAe/B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7B;AAED,KAAK,IAAI,GAAG;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,QAAQ,EAAE,CAAA;CACrB,CAAA;AAgED,KAAK,QAAQ,GAAG;IACf,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAA;IACtC,KAAK,EAAE,MAAM,CAAA;CACb,CAAA"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,KAAK,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;AAEtD,qBAAa,MAAM;;gBAIN,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE;WAK1B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAe9C,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;IAY/B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7B;AAED,KAAK,IAAI,GAAG;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,QAAQ,EAAE,CAAA;CACrB,CAAA;AAgED,KAAK,QAAQ,GAAG;IACf,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAA;IACtC,KAAK,EAAE,MAAM,CAAA;CACb,CAAA"}

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAMzC,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCzD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAMzC,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCzD"}

package/dist/server.js

@@ -3,7 +3,7 @@ import { watch } from "node:fs/promises";
 import http from "node:http";
 import * as path from "node:path";
 import url from "node:url";
-import { render } from "./render.js";
+import { makePage, render } from "./render.js";
 import { Router } from "./router.js";
 const EVENT_PATH = "/__ssg_dev_sse";
 export async function serve(config) {
@@ -30,8 +30,7 @@ export async function serve(config) {
     server.listen(config.port);
     console.log(`Listening on :${config.port}`);
     const watcher = watch(process.cwd(), { recursive: true });
-    for await (const e of watcher) {
-        console.log(e);
+    for await (const _e of watcher) {
         await router.reload();
         for (const client of clients) {
             client.write("data: RELOAD\n\n");
@@ -85,14 +84,14 @@ const RELOAD_SCRIPT = `
 `;
 async function serveHtml(response, route, config) {
     try {
-        const page = await render(route.filePath, route.params, config);
+        const page = await makePage(route.filePath, route.params, config);
         if (page.contentType === "text/html" || !page.contentType) {
-            page.src += RELOAD_SCRIPT;
+            page.head += RELOAD_SCRIPT;
         }
         response.writeHead(200, {
             "Content-Type": page.contentType ?? "text/html",
         });
-        response.end(page.src);
+        response.end(render(page));
     }
     catch (err) {
         response.writeHead(500, { "Content-Type": "text/plain" });

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@kaathewise/ssg",
 	"description": "Static site generator with TS and JSX support",
-	"version": "0.9.2",
+	"version": "0.11.0",
 	"license": "MPL-2.0",
 	"author": "Andrej Kolčin",
 	"type": "module",
@@ -22,13 +22,14 @@
 	"files": [
 		"dist"
 	],
-	"dependencies": {
-		"tsx": "^4.21.0"
-	},
 	"devDependencies": {
 		"@biomejs/biome": "^2.2.3",
 		"@types/node": "^24.3.1",
 		"typescript": "^5.9.2",
-		"typescript-language-server": "^4.4.0"
+		"typescript-language-server": "^4.4.0",
+		"zx": "^8.8.5-lite"
+	},
+	"dependencies": {
+		"esbuild": "^0.28.0"
 	}
 }