wirejs-scripts 3.0.188 → 3.0.189

package/bin.js

@@ -321,6 +321,19 @@ async function compile(watch = false) {
 		}
 	}
 
+	/**
+	 * Resolve output extension for an SSG entrypoint.
+	 *
+	 * Conventions:
+	 * - page.ts => page.html
+	 * - page.ext.ts => page.ext
+	 */
+	function getSsgOutputExtension(ssgFile) {
+		const withoutTs = ssgFile.replace(/\.ts$/, '');
+		const explicitExt = path.extname(withoutTs).replace(/^\./, '');
+		return explicitExt || 'html';
+	}
+
 	/**
 	 * Build SSG files and write the generated HTML to dist/.
 	 * Also produces browser-compatible IIFE bundles at dist/*.js so that
@@ -369,20 +382,23 @@ async function compile(watch = false) {
 		}
 
 		await Promise.all(ssgFiles.map(async ssgFile => {
-			// 3. Run ssg.js on each server-side bundle to produce HTML.
+			// 3. Run ssg.js on each server-side bundle to produce final output.
 			//    Pass CWD/pre-dist as SRC_DIR so ssg.js strips the correct prefix
 			//    when building the hydration <script src="..."> path (e.g. /index.js).
 			const compiledSsgFile = path.join(preSsgDir, path.relative(ssgDir, ssgFile)).replace(/\.[^.]+$/, '.js');
+			const outputExtension = getSsgOutputExtension(ssgFile);
 			try {
-				const relative = path.relative(preSsgDir, compiledSsgFile).replace(/\.js$/, '.html');
+				const relative = outputExtension === 'html'
+					? path.relative(preSsgDir, compiledSsgFile).replace(/\.js$/, '.html')
+					: path.relative(preSsgDir, compiledSsgFile).replace(/\.js$/, '');
 				console.log(`Generating ${relative}`);
-				const html = (await execPromise(
-					`node ${path.join(__dirname, 'ssg.js')} ${preDist} ${compiledSsgFile}`,
+				const output = (await execPromise(
+					`node ${path.join(__dirname, 'ssg.js')} ${preDist} ${compiledSsgFile} ${outputExtension}`,
 					{ stdio: ['pipe', 'pipe', 'pipe'] }
 				)).stdout.toString();
-				const htmlOut = path.join(distDir, relative);
-				await fs.promises.mkdir(path.dirname(htmlOut), { recursive: true });
-				await fs.promises.writeFile(htmlOut, html);
+				const outPath = path.join(distDir, relative);
+				await fs.promises.mkdir(path.dirname(outPath), { recursive: true });
+				await fs.promises.writeFile(outPath, output);
 			} catch (err) {
 				logger.error(`Could not generate SSG page ${compiledSsgFile}`, err);
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-scripts",
-	"version": "3.0.188",
+	"version": "3.0.189",
 	"description": "Basic build and start commands for wirejs apps",
 	"type": "module",
 	"bin": {
@@ -28,7 +28,7 @@
 		"node-cron": "^4.2.1",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-hosting": "^0.1.190",
-		"wirejs-resources": "^0.1.190"
+		"wirejs-hosting": "^0.1.191",
+		"wirejs-resources": "^0.1.191"
 	}
 }

package/ssg.js

@@ -4,15 +4,37 @@ import { useJSDOM } from 'wirejs-dom/v2';
 
 const SRC_DIR = process.argv[2];
 
-async function build(filename) {
+function serializeNonHtml(value, outputExtension) {
+	if (value === undefined || value === null) {
+		return '';
+	}
+	if (Buffer.isBuffer(value)) {
+		return value.toString('utf8');
+	}
+	if (typeof value === 'string') {
+		return value;
+	}
+	if (outputExtension === 'json') {
+		return `${JSON.stringify(value, null, 2)}\n`;
+	}
+	return String(value);
+}
+
+async function build(filename, outputExtension = 'html') {
 	useJSDOM(JSDOM);
 
 	try {
 		const module = await import(filename);
 
 		if (typeof module.generate === 'function') {
-			const doc = await module.generate(filename);
-			const doctype = doc.parentNode.doctype?.name || '';
+			const generated = await module.generate(filename);
+
+			if (outputExtension !== 'html') {
+				return serializeNonHtml(generated, outputExtension);
+			}
+
+			const doc = generated;
+			const doctype = doc?.parentNode?.doctype?.name || '';
 
 			let hydrationsFound = 0;
 			while (globalThis.pendingDehydrations?.length > 0) {
@@ -31,7 +53,7 @@ async function build(filename) {
 				doc.outerHTML
 			].join('');
 		} else {
-			return;
+			return '';
 		}
 	} catch (err) {
 		console.error(`Could not generate page ${filename}`, err);
@@ -39,4 +61,4 @@ async function build(filename) {
 	}
 }
 
-console.log(await build(process.argv[3]));
+console.log(await build(process.argv[3], process.argv[4] || 'html'));