@kaathewise/ssg 0.8.5 → 0.9.0

package/dist/build.js

@@ -4,8 +4,8 @@ import { renderAll } from "./render.js";
 import { walk } from "./utils.js";
 export async function build(config) {
     const pages = [];
-    for await (const filePath of walk(config.pagesDir)) {
-        const p = await renderAll(filePath, config.pagesDir);
+    for await (const modulePath of walk(config.routesDir)) {
+        const p = await renderAll(modulePath, config);
         pages.push(...p);
     }
     await fs.rm(config.outputDir, { recursive: true, force: true });

package/dist/config.d.ts

@@ -1,15 +1,21 @@
-export type Config = {
-    pagesDir: string;
-    sourceDir: string;
+export type ConfigOptions = {
+    routesDir?: string;
+    assetDir?: string;
+    outputDir?: string;
+    port?: number;
+    loaders?: Loader[];
+};
+export declare class Config {
+    routesDir: string;
     assetDir?: string;
     outputDir: string;
     port: number;
+    loaders: Loader[];
+    constructor(options: ConfigOptions);
+    getLoader(modulePath: string): Loader | null;
+}
+export type Loader = {
+    matcher: RegExp;
 };
-export declare function defineConfig(options: {
-    pagesDir: string;
-    sourceDir: string;
-    assetDir?: string;
-    outputDir?: string;
-    port?: number;
-}): Config;
+export declare function defineConfig(options: ConfigOptions): Config;
 //# sourceMappingURL=config.d.ts.map

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,GAAG,MAAM,CAaT"}
+{"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"}

package/dist/config.js

@@ -1,15 +1,30 @@
 import * as path from "node:path";
 const OUTPUT_DIR = "dist/";
 const DEFAULT_PORT = 3001;
-export function defineConfig(options) {
-    const config = {
-        pagesDir: path.resolve(options.pagesDir),
-        sourceDir: path.resolve(options.sourceDir),
-        outputDir: path.resolve(options.outputDir ?? OUTPUT_DIR),
-        port: options.port ?? DEFAULT_PORT,
-    };
-    if (options.assetDir) {
-        config.assetDir = path.resolve(options.assetDir);
+export class Config {
+    routesDir;
+    assetDir;
+    outputDir;
+    port;
+    loaders;
+    constructor(options) {
+        this.routesDir = path.resolve(options.routesDir ?? "src/routes/");
+        this.outputDir = path.resolve(options.outputDir ?? OUTPUT_DIR);
+        this.port = options.port ?? DEFAULT_PORT;
+        if (options.assetDir) {
+            this.assetDir = path.resolve(options.assetDir);
+        }
+        this.loaders = options.loaders ?? [];
+    }
+    getLoader(modulePath) {
+        for (const loader of this.loaders) {
+            if (loader.matcher.test(modulePath)) {
+                return loader;
+            }
+        }
+        return null;
     }
-    return config;
+}
+export function defineConfig(options) {
+    return new Config(options);
 }

package/dist/render.d.ts

@@ -1,10 +1,18 @@
+import type { Config } from "./config.ts";
 import type { Params } from "./router.ts";
 export type Page = {
     path: string;
     src: string;
     contentType: string | null;
 };
-export declare function render(modulePath: string, pagesDir: string, params?: Params): Promise<Page>;
-export declare function renderAll(modulePath: string, pagesDir: string): Promise<Page[]>;
+export type Props = Record<string, string | string[]>;
+export type ArbitraryModule = {
+    getStaticParams?(): Props[];
+    getContentType?(): string;
+    default?: ((props: Props) => string) | ((props: Props) => 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 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":"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,CAmBf;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"}
+{"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,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;AAErD,MAAM,MAAM,eAAe,GAAG;IAC7B,eAAe,CAAC,IAAI,KAAK,EAAE,CAAA;IAC3B,cAAc,CAAC,IAAI,MAAM,CAAA;IACzB,OAAO,CAAC,EACL,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAC,GAC1B,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;CACtC,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"}

package/dist/render.js

@@ -6,34 +6,52 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     }
     return path;
 };
-export async function render(modulePath, pagesDir, params = {}) {
-    const worker = new Worker(new URL("./render_worker.js", import.meta.url), {
-        type: "module",
-    });
-    return new Promise((resolve, reject) => {
-        worker.onmessage = (e) => {
-            worker.terminate();
-            if (e.data.page) {
-                resolve(e.data.page);
-            }
-            else {
-                reject(e.data.error);
-            }
-        };
-        worker.postMessage({ modulePath, pagesDir, params });
-    });
+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 });
+    return module;
 }
-export async function renderAll(modulePath, pagesDir) {
+export async function render(modulePath, params, config) {
+    const module = await load(modulePath);
+    let contentType = null;
+    if (module.getContentType) {
+        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 "`default` must be a string or a function";
+        }
+    }
+    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 };
+}
+export async function renderAll(modulePath, config) {
     const module = await import(__rewriteRelativeImportExtension(modulePath));
     const out = [];
     if ("getStaticParams" in module) {
         const paramsList = await module.getStaticParams();
         for (const params of paramsList) {
-            out.push(await render(modulePath, pagesDir, params));
+            out.push(await render(modulePath, params, config));
         }
     }
     else {
-        out.push(await render(modulePath, pagesDir));
+        out.push(await render(modulePath, {}, config));
     }
     return out;
 }

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,CAqCzD"}
+{"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"}

package/dist/server.js

@@ -8,7 +8,7 @@ import { Router } from "./router.js";
 const EVENT_PATH = "/__ssg_dev_sse";
 export async function serve(config) {
     const clients = new Set();
-    const router = await Router.new(config.pagesDir);
+    const router = await Router.new(config.routesDir);
     const server = http.createServer(async (request, response) => {
         const rUrl = new url.URL(request.url ?? "/", "http://localhost");
         if (rUrl.pathname === EVENT_PATH) {
@@ -17,7 +17,7 @@ export async function serve(config) {
         }
         const route = router.match(rUrl.pathname);
         if (route) {
-            await serveHtml(response, route, config.pagesDir);
+            await serveHtml(response, route, config);
             return;
         }
         if (await fetchStaticFile(response, rUrl, config.assetDir)) {
@@ -29,8 +29,9 @@ export async function serve(config) {
     });
     server.listen(config.port);
     console.log(`Listening on :${config.port}`);
-    const watcher = watch(config.sourceDir, { recursive: true });
-    for await (const _ of watcher) {
+    const watcher = watch(process.cwd(), { recursive: true });
+    for await (const e of watcher) {
+        console.log(e);
         await router.reload();
         for (const client of clients) {
             client.write("data: RELOAD\n\n");
@@ -82,9 +83,9 @@ const RELOAD_SCRIPT = `
 	window.addEventListener("beforeunload", () => sse.close())
 </script>
 `;
-async function serveHtml(response, route, pagesDir) {
+async function serveHtml(response, route, config) {
     try {
-        const page = await render(route.filePath, pagesDir, route.params);
+        const page = await render(route.filePath, route.params, config);
         if (page.contentType === "text/html" || !page.contentType) {
             page.src += RELOAD_SCRIPT;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@kaathewise/ssg",
-	"description": "JSX static site generator",
-	"version": "0.8.5",
+	"description": "Static site generator with TS and JSX support",
+	"version": "0.9.0",
 	"license": "MPL-2.0",
 	"author": "Andrej Kolčin",
 	"type": "module",
@@ -11,6 +11,7 @@
 	},
 	"scripts": {
 		"check": "biome check && tsc --noEmit",
+		"fix": "biome check --fix",
 		"build": "tsc"
 	},
 	"main": "./dist/index.js",
@@ -21,6 +22,9 @@
 	"files": [
 		"dist"
 	],
+	"dependencies": {
+		"tsx": "^4.21.0"
+	},
 	"devDependencies": {
 		"@biomejs/biome": "^2.2.3",
 		"@types/node": "^24.3.1",

package/dist/render_worker.d.ts

@@ -1,4 +0,0 @@
-import { type Page } from "./render.js";
-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

@@ -1 +0,0 @@
-{"version":3,"file":"render_worker.d.ts","sourceRoot":"","sources":["../src/render_worker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,IAAI,EAAoB,MAAM,aAAa,CAAA;AACzD,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,CAkCf"}

package/dist/render_worker.js

@@ -1,49 +0,0 @@
-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.js";
-export async function render(modulePath, pagesDir, params = {}) {
-    const module = await import(__rewriteRelativeImportExtension(modulePath));
-    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 });
-    }
-};