@kaathewise/ssg 0.6.0 → 0.7.0

package/dist/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAKzC,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,iBA4BzC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAIzC,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBzD"}

package/dist/build.js

@@ -1,13 +1,11 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import { Glob, write } from "bun";
 import { renderAll } from "./render.js";
-const glob = new Glob("**/*.{js,jsx,ts,tsx}");
+import { walk } from "./utils.js";
 export async function build(config) {
     const pages = [];
-    for await (const relPath of glob.scan(config.pagesDir)) {
-        const modulePath = path.join(config.pagesDir, relPath);
-        const p = await renderAll(modulePath, config.pagesDir);
+    for await (const filePath of walk(config.pagesDir)) {
+        const p = await renderAll(filePath, config.pagesDir);
         pages.push(...p);
     }
     await fs.rm(config.outputDir, { recursive: true, force: true });
@@ -15,13 +13,10 @@ export async function build(config) {
     for (const page of pages) {
         const destPath = path.join(config.outputDir, page.path);
         const dir = path.dirname(destPath);
-        if (!(await fs.exists(dir))) {
-            await fs.mkdir(path.dirname(destPath), {
-                recursive: true,
-            });
-        }
-        const file = Bun.file(destPath);
-        await write(file, page.src);
+        await fs.mkdir(path.dirname(destPath), {
+            recursive: true,
+        });
+        await fs.writeFile(destPath, page.src);
     }
     if (config.assetDir) {
         await fs.cp(config.assetDir, config.outputDir, {

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,MAAM,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE;IACrC,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;CACb,UAaA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,MAAM,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE;IACrC,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;CACb,GAAG,MAAM,CAaT"}

package/dist/render.d.ts

@@ -1,6 +1,4 @@
-interface Params {
-    [name: string]: string;
-}
+import type { Params } from "./router.ts";
 export type Page = {
     path: string;
     src: string;
@@ -8,5 +6,4 @@ 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 {};
 //# 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,UAAU,MAAM;IACf,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CACtB;AAED,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":"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"}

package/dist/render.js

@@ -53,10 +53,14 @@ export async function renderAll(modulePath, pagesDir) {
 function substituteParams(inputPath, params) {
     let path = inputPath;
     for (const [key, value] of Object.entries(params)) {
-        const single = `[${key}]`;
-        const multiple = `[[...${key}]]`;
-        path = path.replace(single, value);
-        path = path.replace(multiple, value);
+        const single = `:${key}`;
+        const multiple = `*${key}`;
+        if (typeof value === "string") {
+            path = path.replace(single, value);
+        }
+        else {
+            path = path.replace(multiple, value.join("/"));
+        }
     }
     path = path.replace(/\.tsx?$/, "");
     return path;

package/dist/router.d.ts

@@ -0,0 +1,22 @@
+export type Match = {
+    filePath: string;
+    params: Params;
+};
+export type Params = Record<string, string | string[]>;
+export declare class Router {
+    #private;
+    constructor(root: string, paths: Path[]);
+    static new(dir: string): Promise<Router>;
+    match(pathname: string): Match | null;
+    reload(): Promise<void>;
+}
+type Path = {
+    filePath: string;
+    fragments: Fragment[];
+};
+type Fragment = {
+    kind: "literal" | "segment" | "repeat";
+    value: string;
+};
+export {};
+//# sourceMappingURL=router.d.ts.map

package/dist/router.d.ts.map

@@ -0,0 +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;IAW9C,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;AA+CD,KAAK,QAAQ,GAAG;IACf,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAA;IACtC,KAAK,EAAE,MAAM,CAAA;CACb,CAAA"}

package/dist/router.js

@@ -0,0 +1,90 @@
+import path from "node:path";
+import { walk } from "./utils.js";
+export class Router {
+    #root;
+    #paths;
+    constructor(root, paths) {
+        this.#root = root;
+        this.#paths = paths;
+    }
+    static async new(dir) {
+        const paths = [];
+        for await (const pagePath of walk(dir)) {
+            const rel = path.relative(dir, pagePath);
+            paths.push(toPath(rel));
+        }
+        return new Router(dir, paths);
+    }
+    match(pathname) {
+        for (const pagePath of this.#paths) {
+            const match = matchPath(pagePath, pathname);
+            if (match) {
+                match.filePath = path.join(this.#root, match.filePath);
+                return match;
+            }
+        }
+        return null;
+    }
+    async reload() {
+        const replacement = await Router.new(this.#root);
+        this.#paths = replacement.#paths;
+    }
+}
+function toPath(pagePath) {
+    return {
+        filePath: pagePath,
+        fragments: toFragments(pagePath),
+    };
+}
+function matchPath(pagePath, pathname) {
+    const params = {};
+    const parts = pathname.split("/").slice(1);
+    for (const [i, fragment] of pagePath.fragments.entries()) {
+        const part = parts[i];
+        if (!part) {
+            if (fragment.value === "index") {
+                break;
+            }
+            else {
+                return null;
+            }
+        }
+        switch (fragment.kind) {
+            case "literal": {
+                if (fragment.value !== part) {
+                    return null;
+                }
+                break;
+            }
+            case "segment": {
+                params[fragment.value] = part;
+                break;
+            }
+            case "repeat": {
+                params[fragment.value] = parts.slice(i);
+                break;
+            }
+        }
+    }
+    return {
+        filePath: pagePath.filePath,
+        params,
+    };
+}
+function toFragments(pagePath) {
+    const barePath = pagePath.replace(/\.tsx?/, "");
+    const pieces = barePath.split("/");
+    const out = [];
+    for (const piece of pieces) {
+        if (piece.startsWith(":")) {
+            out.push({ kind: "segment", value: piece.slice(1) });
+        }
+        else if (piece.startsWith("*")) {
+            out.push({ kind: "repeat", value: piece.slice(1) });
+        }
+        else {
+            out.push({ kind: "literal", value: piece });
+        }
+    }
+    return out;
+}

package/dist/run.d.ts

@@ -1,3 +1,3 @@
-#!/usr/bin/env bun
+#!/usr/bin/env node
 export {};
 //# sourceMappingURL=run.d.ts.map

package/dist/run.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env bun
+#!/usr/bin/env node
 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) {
@@ -7,8 +7,10 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     }
     return path;
 };
+import console from "node:console";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import process from "node:process";
 import { build, serve } from "./index.js";
 const CONFIG_PATH = "ssg.config.ts";
 const HELP = `Usage: ssg <command>
@@ -19,7 +21,10 @@ Commands:
 `;
 const args = process.argv.slice(2);
 const configPath = path.resolve(CONFIG_PATH);
-if (!(await fs.exists(configPath))) {
+try {
+    fs.access(configPath);
+}
+catch {
     console.warn("Configuration file not found");
     process.exit(10);
 }

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;AAKzC,wBAAsB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+CzD"}
+{"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

@@ -1,82 +1,75 @@
 import * as fs from "node:fs/promises";
 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 { Router } from "./router.js";
 const EVENT_PATH = "/__ssg_dev_sse";
 export async function serve(config) {
     const clients = new Set();
-    const router = new Bun.FileSystemRouter({
-        style: "nextjs",
-        dir: config.pagesDir,
-    });
-    Bun.serve({
-        port: config.port,
-        // for SSE
-        idleTimeout: 0,
-        fetch: async (request) => {
-            const url = new URL(request.url);
-            if (url.pathname === EVENT_PATH) {
-                return createStream(request, clients);
-            }
-            const route = router.match(url.href);
-            if (route) {
-                return createHtml(config.pagesDir, route);
-            }
-            const asset = await fetchStaticFile(url, config.assetDir);
-            if (asset) {
-                return asset;
-            }
-            console.warn(`Path '${url.pathname}' not found`);
-            return new Response("Page or file not found", {
-                status: 404,
-            });
-        },
+    const router = await Router.new(config.pagesDir);
+    const server = http.createServer(async (request, response) => {
+        const rUrl = new url.URL(request.url ?? "/", "http://localhost");
+        if (rUrl.pathname === EVENT_PATH) {
+            createStream(response, clients);
+            return;
+        }
+        const route = router.match(rUrl.pathname);
+        if (route) {
+            await serveHtml(response, route, config.pagesDir);
+            return;
+        }
+        if (await fetchStaticFile(response, rUrl, config.assetDir)) {
+            return;
+        }
+        console.warn(`Path '${rUrl.pathname}' not found`);
+        response.writeHead(404);
+        response.end("Page or file not found");
     });
+    server.listen(config.port);
     console.log(`Listening on :${config.port}`);
     const watcher = watch(config.sourceDir, { recursive: true });
     for await (const _ of watcher) {
-        router.reload();
-        clearCache(config.sourceDir);
+        await router.reload();
         for (const client of clients) {
-            client.enqueue("data: RELOAD\n\n");
+            client.write("data: RELOAD\n\n");
         }
     }
 }
-function createStream(request, clients) {
-    const stream = new ReadableStream({
-        start(controller) {
-            clients.add(controller);
-            // workaround because @ts-expect-error doesn't fail for
-            // aspartik/website for some reason, breaking the check.
-            // biome-ignore lint/suspicious/noExplicitAny: above
-            const signal = request.signal;
-            signal.addEventListener("abort", () => {
-                controller.close();
-                clients.delete(controller);
-            });
-        },
+function createStream(response, clients) {
+    response.writeHead(200, {
+        "Content-Type": "text/event-stream",
+        "Cache-Control": "no-cache",
+        Connection: "keep-alive",
     });
-    return new Response(stream, {
-        headers: {
-            "Content-Type": "text/event-stream",
-            "Cache-Control": "no-cache",
-        },
+    clients.add(response);
+    response.on("close", () => {
+        clients.delete(response);
+        response.end();
     });
 }
-async function fetchStaticFile(url, assetDir) {
+async function fetchStaticFile(response, url, assetDir) {
     if (!assetDir) {
-        return null;
+        return false;
     }
     let assetPath = path.join(assetDir, url.pathname.slice(1));
     assetPath = path.resolve(assetPath);
     if (!assetPath.startsWith(assetDir)) {
-        return new Response("Tried to get a file outside of the asset directory", { status: 403 });
+        response.writeHead(403);
+        response.end("Tried to get a file outside of the asset directory");
+        return true;
+    }
+    try {
+        const contents = await fs.readFile(assetPath);
+        response.writeHead(200);
+        response.end(contents);
+        return true;
     }
-    const exists = await fs.exists(assetPath);
-    if (!exists) {
-        return null;
+    catch {
+        // the file doesn't exist
+        return false;
     }
-    return new Response(Bun.file(assetPath));
 }
 const RELOAD_SCRIPT = `
 <script type="module">
@@ -89,25 +82,13 @@ const RELOAD_SCRIPT = `
 	window.addEventListener("beforeunload", () => sse.close())
 </script>
 `;
-async function createHtml(pagesDir, route) {
+async function serveHtml(response, route, pagesDir) {
     const page = await render(route.filePath, pagesDir, route.params);
-    const response = new Response(page.src, {
-        headers: {
-            "Content-Type": page.contentType ?? "text/html",
-        },
-    });
-    return new HTMLRewriter()
-        .onDocument({
-        end: (el) => {
-            el.append(RELOAD_SCRIPT, { html: true });
-        },
-    })
-        .transform(response);
-}
-function clearCache(prefix) {
-    for (const path in import.meta.require.cache) {
-        if (path.startsWith(prefix)) {
-            delete import.meta.require.cache[path];
-        }
+    if (page.contentType === "text/html" || !page.contentType) {
+        page.src += RELOAD_SCRIPT;
     }
+    response.writeHead(200, {
+        "Content-Type": page.contentType ?? "text/html",
+    });
+    response.end(page.src);
 }

package/dist/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function walk(dir: string): AsyncGenerator<string>;
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,wBAAuB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAS/D"}

package/dist/utils.js

@@ -0,0 +1,13 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+export async function* walk(dir) {
+    for await (const d of await fs.opendir(dir)) {
+        const entry = path.join(dir, d.name);
+        if (d.isDirectory()) {
+            yield* walk(entry);
+        }
+        else if (d.isFile()) {
+            yield entry;
+        }
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@kaathewise/ssg",
 	"description": "JSX static site generator",
-	"version": "0.6.0",
+	"version": "0.7.0",
 	"license": "MPL-2.0",
 	"author": "Andrej Kolčin",
 	"type": "module",
@@ -11,18 +11,17 @@
 	},
 	"scripts": {
 		"check": "biome check && tsc --noEmit",
-		"build": "tsc --project tsconfig.build.json"
+		"build": "tsc"
 	},
 	"main": "dist/index.ts",
 	"bin": {
-		"ssg": "src/run.ts"
+		"ssg": "dist/run.js"
 	},
 	"files": [
 		"dist"
 	],
 	"devDependencies": {
 		"@biomejs/biome": "^2.2.3",
-		"@types/bun": "^1.2.21",
 		"@types/node": "^24.3.1",
 		"typescript": "^5.9.2",
 		"typescript-language-server": "^4.4.0"

package/src/run.ts

@@ -1,45 +0,0 @@
-#!/usr/bin/env bun
-
-import * as fs from "node:fs/promises"
-import * as path from "node:path"
-import { build, type Config, serve } from "./index.ts"
-
-const CONFIG_PATH = "ssg.config.ts"
-const HELP = `Usage: ssg <command>
-
-Commands:
-    build:              build the website
-    dev:                start a hot-reloading development server
-`
-
-const args = process.argv.slice(2)
-
-const configPath = path.resolve(CONFIG_PATH)
-if (!(await fs.exists(configPath))) {
-	console.warn("Configuration file not found")
-	process.exit(10)
-}
-
-const configModule = await import(configPath)
-const config = configModule.default as Config
-
-switch (args[0]) {
-	case "build": {
-		await build(config)
-		break
-	}
-	case "dev": {
-		await serve(config)
-		break
-	}
-	case undefined: {
-		console.log(HELP)
-		break
-	}
-	default: {
-		console.log(
-			`The command must be either 'build' or 'dev', got ${args[0]}`,
-		)
-		process.exit(11)
-	}
-}