@kaathewise/ssg 0.2.0 → 0.3.0

package/package.json

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

package/src/build.ts

@@ -1,27 +1,33 @@
 import * as fs from "node:fs/promises"
-import { join } from "node:path"
+import * as path from "node:path"
 import { Glob, write } from "bun"
 import { type Page, renderAll } from "./render"
 
 const glob = new Glob("**/*.{js,jsx,ts,tsx}")
 
 export async function build(pagesDir: string, outDir: string = "dist/") {
-	pagesDir = join(process.cwd(), pagesDir)
-	outDir = join(process.cwd(), outDir)
+	pagesDir = path.join(process.cwd(), pagesDir)
+	outDir = path.join(process.cwd(), outDir)
 
 	const pages: Page[] = []
-	for await (const path of glob.scan(pagesDir)) {
-		const modulePath = join(pagesDir, path)
+	for await (const relPath of glob.scan(pagesDir)) {
+		const modulePath = path.join(pagesDir, relPath)
 		const p = await renderAll(modulePath, pagesDir)
 		pages.push(...p)
 	}
 
 	await fs.rm(outDir, { recursive: true, force: true })
-	// recursive disables errors when the directory already exists
-	await fs.mkdir(outDir, { recursive: true })
+	await fs.mkdir(outDir)
 
 	for (const page of pages) {
-		const file = Bun.file(join(outDir, page.path))
+		const destPath = path.join(outDir, 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.html)
 	}
 }

package/src/render.ts

@@ -1,7 +1,7 @@
 import * as path from "node:path"
 
 interface Params {
-	[name: string]: string | string[]
+	[name: string]: string
 }
 
 export type Page = {
@@ -58,11 +58,11 @@ export async function renderAll(
 function substituteParams(inputPath: string, params: Params): string {
 	let path = inputPath
 	for (const [key, value] of Object.entries(params)) {
-		if (typeof value === "string") {
-			path = path.replace(`[${key}]`, value)
-		} else if (Array.isArray(value)) {
-			path = path.replace(`[[...${key}]]`, value.join("/"))
-		}
+		const single = `[${key}]`
+		const multiple = `[[...${key}]]`
+
+		path = path.replace(single, value)
+		path = path.replace(multiple, value)
 	}
 
 	path = path.replace(/\.tsx?$/, "")

package/src/server.ts

@@ -8,23 +8,28 @@ const EVENT_PATH = "/__ssg_dev_sse"
 
 export class Server {
 	pagesDir: string
-	sourcePath: string
-	router: Bun.FileSystemRouter
+	sourceDir: string
+	assetDir?: string
 	port?: number = 3001
 
+	router: Bun.FileSystemRouter
+
 	constructor(options: {
 		pagesDir: string
-		sourcePath: string
+		sourceDir: string
+		assetDir?: string
 		port?: number
 	}) {
 		this.pagesDir = path.join(process.cwd(), options.pagesDir)
-		this.sourcePath = path.join(process.cwd(), options.sourcePath)
+		this.sourceDir = path.join(process.cwd(), options.sourceDir)
 
 		this.router = new Bun.FileSystemRouter({
 			style: "nextjs",
 			dir: options.pagesDir,
 		})
 
+		this.assetDir ??= options.assetDir
+
 		this.port ??= options?.port
 	}
 
@@ -43,14 +48,32 @@ export class Server {
 				}
 
 				const route = this.router.match(request.url)
-				return createHtml(this.pagesDir, route)
+				if (route) {
+					return createHtml(this.pagesDir, route)
+				}
+
+				if (this.assetDir) {
+					// TODO: .. escapes
+					const assetPath = path.join(
+						this.assetDir,
+						url.pathname.slice(1),
+					)
+
+					return new Response(Bun.file(assetPath))
+				}
+
+				return new Response("Not found", {
+					headers: {
+						"Content-Type": "text/html",
+					},
+				})
 			},
 		})
 
-		const watcher = watch(this.sourcePath, { recursive: true })
+		const watcher = watch(this.sourceDir, { recursive: true })
 		for await (const _ of watcher) {
 			this.router.reload()
-			clearCache(this.sourcePath)
+			clearCache(this.sourceDir)
 			for (const client of clients) {
 				client.enqueue("data: RELOAD\n\n")
 			}
@@ -94,11 +117,10 @@ const RELOAD_SCRIPT = `
 </script>
 `
 
-async function createHtml(pagesDir: string, route: MatchedRoute | null) {
-	if (!route) {
-		throw new Error("TODO not found")
-	}
-
+async function createHtml(
+	pagesDir: string,
+	route: MatchedRoute,
+): Promise<Response> {
 	const page = await render(route.filePath, pagesDir, route.params)
 
 	const response = new Response(page.html, {