@topik/cli 0.1.0-alpha.3 → 0.1.0-alpha.4

package/dist/cli.mjs

@@ -1,11 +1,23 @@
 #!/usr/bin/env node
 import { boolean, command, positional, run, string } from "@drizzle-team/brocli";
+import { CompileError, compile, isErrorDiagnostic, lint, validateResources, watch } from "@topik/core";
 import { mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
-import { extname, join, resolve } from "node:path";
-import { compile, validateResources, watch } from "@topik/core";
-import { existsSync } from "node:fs";
+import { extname, isAbsolute, join, relative, resolve } from "node:path";
+import { existsSync, realpathSync } from "node:fs";
 import { createServer } from "node:http";
 import { parseAllDocuments } from "yaml";
+//#region src/diagnostics.ts
+function formatDiagnostic(diagnostic) {
+	return `${diagnostic.file ?? "content"}${diagnostic.lines.length > 0 ? `:${diagnostic.lines.join(",")}` : ""} ${diagnostic.level} ${diagnostic.id}: ${diagnostic.message}`;
+}
+function printDiagnostics(diagnostics) {
+	for (const diagnostic of diagnostics) {
+		const output = formatDiagnostic(diagnostic);
+		if (diagnostic.level === "error" || diagnostic.level === "critical") console.error(output);
+		else console.warn(output);
+	}
+}
+//#endregion
 //#region src/errors.ts
 var CliError = class extends Error {
 	constructor(message, options) {
@@ -49,12 +61,18 @@ const compile$1 = command({
 		format: string("format").alias("f").desc("Output format").enum("json", "jsonl", "yaml").default("json"),
 		dryRun: boolean("dry-run").desc("Show what would be compiled without writing files").default(false),
 		clean: boolean("clean").desc("Remove existing output before compiling").default(false),
-		validate: boolean("validate").desc("Validate compiled resources against schemas").default(false)
+		validate: boolean("validate").desc("Validate compiled resources against schemas").default(false),
+		links: string("links").desc("How unresolved wiki links and local guide fragments are handled").enum("error", "warning", "off").default("error")
 	},
 	handler: async (options) => {
 		const dir = resolve(options.dir);
 		const format = options.format;
-		const { resources } = await compile({ dir });
+		const links = options.links;
+		const { diagnostics, resources } = await compile({
+			dir,
+			validation: { links }
+		});
+		printDiagnostics(diagnostics);
 		if (options.validate) {
 			const { valid, errors } = validateResources(resources);
 			if (!valid) throw new CliError(formatValidationFailure(errors, resources.length, "validating compiled output"));
@@ -119,6 +137,62 @@ function handleEvents(watcher, _req, res) {
 		watcher.off("update", onUpdate);
 	});
 }
+function getAsset(watcher, name) {
+	const resource = watcher.resources.get(`Asset/${name}`);
+	return resource?.type === "Asset" ? resource : null;
+}
+function handleAsset(watcher, dir, url, res) {
+	if (!url.pathname.startsWith("/assets/")) return false;
+	let name;
+	try {
+		name = decodeURIComponent(url.pathname.slice(8));
+	} catch {
+		res.writeHead(404, { "Access-Control-Allow-Origin": "*" });
+		res.end();
+		return true;
+	}
+	if (!/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(name)) {
+		res.writeHead(404, { "Access-Control-Allow-Origin": "*" });
+		res.end();
+		return true;
+	}
+	const asset = getAsset(watcher, name);
+	if (!asset) {
+		res.writeHead(404, { "Access-Control-Allow-Origin": "*" });
+		res.end();
+		return true;
+	}
+	let filePath;
+	let realDir;
+	let realFilePath;
+	try {
+		filePath = resolve(join(dir, asset.spec.uri));
+		realDir = realpathSync(dir);
+		realFilePath = realpathSync(filePath);
+	} catch {
+		res.writeHead(404, { "Access-Control-Allow-Origin": "*" });
+		res.end();
+		return true;
+	}
+	const relativeAssetPath = relative(realDir, realFilePath);
+	if (relativeAssetPath !== "" && (relativeAssetPath.startsWith("..") || isAbsolute(relativeAssetPath)) || !existsSync(realFilePath)) {
+		res.writeHead(404, { "Access-Control-Allow-Origin": "*" });
+		res.end();
+		return true;
+	}
+	readFile(filePath).then((data) => {
+		res.writeHead(200, {
+			"Content-Type": asset.spec.mediaType ?? ASSET_EXTENSIONS[extname(filePath)] ?? "application/octet-stream",
+			"Access-Control-Allow-Origin": "*",
+			"Cache-Control": "no-cache"
+		});
+		res.end(data);
+	}).catch(() => {
+		res.writeHead(500, { "Access-Control-Allow-Origin": "*" });
+		res.end();
+	});
+	return true;
+}
 const dev = command({
 	name: "dev",
 	desc: "Start a development server that watches for content changes",
@@ -165,25 +239,7 @@ const dev = command({
 				handleEvents(watcher, req, res);
 				return;
 			}
-			if (req.method === "GET") {
-				const mime = ASSET_EXTENSIONS[extname(url.pathname)];
-				if (mime) {
-					const filePath = resolve(join(dir, url.pathname));
-					if (filePath.startsWith(dir + "/") && existsSync(filePath)) {
-						readFile(filePath).then((data) => {
-							res.writeHead(200, {
-								"Content-Type": mime,
-								"Access-Control-Allow-Origin": "*"
-							});
-							res.end(data);
-						}).catch(() => {
-							res.writeHead(500, { "Access-Control-Allow-Origin": "*" });
-							res.end();
-						});
-						return;
-					}
-				}
-			}
+			if (req.method === "GET" && handleAsset(watcher, dir, url, res)) return;
 			res.writeHead(404, {
 				"Content-Type": "text/plain",
 				"Access-Control-Allow-Origin": "*"
@@ -201,6 +257,28 @@ const dev = command({
 	}
 });
 //#endregion
+//#region src/lint/index.ts
+const lint$1 = command({
+	name: "lint",
+	desc: "Lint Topik source content without writing compiled resources",
+	options: {
+		dir: positional("dir").desc("Path to the content directory").default("."),
+		links: string("links").desc("How unresolved wiki links and local guide fragments are handled").enum("error", "warning", "off").default("error")
+	},
+	handler: async (options) => {
+		const links = options.links;
+		const { diagnostics } = await lint({
+			dir: resolve(options.dir),
+			validation: { links }
+		});
+		printDiagnostics(diagnostics);
+		const errors = diagnostics.filter(isErrorDiagnostic);
+		if (errors.length > 0) throw new CliError(`${errors.length} lint error(s)`);
+		const warnings = diagnostics.filter((diagnostic) => diagnostic.level === "warning").length;
+		console.log(`Lint passed${warnings > 0 ? ` with ${warnings} warning(s)` : ""}`);
+	}
+});
+//#endregion
 //#region src/validate/index.ts
 function parseJson(path, content) {
 	try {
@@ -276,13 +354,14 @@ try {
 	await run([
 		compile$1,
 		dev,
+		lint$1,
 		validate
 	], {
 		name: "topik",
 		description: "Topik CLI"
 	});
 } catch (error) {
-	if (error instanceof CliError) {
+	if (error instanceof CliError || error instanceof CompileError) {
 		console.error(error.message);
 		process.exit(1);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topik/cli",
-  "version": "0.1.0-alpha.3",
+  "version": "0.1.0-alpha.4",
   "description": "Topik CLI",
   "license": "MIT",
   "repository": {
@@ -24,16 +24,16 @@
   },
   "dependencies": {
     "@drizzle-team/brocli": "^0.12.0",
-    "@markdoc/markdoc": "^0.5.7",
-    "yaml": "^2.8.3",
-    "@topik/core": "0.1.0-alpha.3"
+    "yaml": "^2.9.0",
+    "@topik/content-schema": "0.1.0-alpha.4",
+    "@topik/core": "0.1.0-alpha.4"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.13",
-    "@types/node": "^24",
-    "@typescript/native-preview": "7.0.0-dev.20260427.1",
-    "typescript": "^6",
-    "vite-plus": "^0.1.18"
+    "@types/bun": "^1.3.14",
+    "@types/node": "22.20.1",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "typescript": "^6.0.3",
+    "vite-plus": "0.2.4"
   },
   "scripts": {
     "build": "vp pack",