diffwiki 0.7.0 → 0.8.0-rc.202607252213.c724769

package/dist/bin.js

@@ -171,7 +171,7 @@ async function runExport(opts) {
   const out = path2.resolve(opts.out);
   const filter = splitGlobs(opts.filter);
   const exclude = splitGlobs(opts.exclude);
-  if (filter.length > 0 || exclude.length > 0) {
+  if (!opts.project && (filter.length > 0 || exclude.length > 0)) {
     const names = (await listCollections()).map((c) => c.name);
     const { errors } = resolveCollectionSelection(names, { filter, exclude });
     if (errors.length > 0) throw new InvalidExportSelectionError(errors);
@@ -182,6 +182,10 @@ async function runExport(opts) {
   const args = [...prefix, "export", "--out", out, "--base", opts.base];
   if (opts.filter) args.push("--filter", opts.filter);
   if (opts.exclude) args.push("--exclude", opts.exclude);
+  if (opts.project) {
+    args.push("--project");
+    if (typeof opts.project === "string") args.push(opts.project);
+  }
   if (override) console.log(`Exporting via ${override}`);
   await new Promise((resolve, reject) => {
     const child = spawn2(cmd, args, { stdio: "inherit", env: process.env });
@@ -191,6 +195,79 @@ async function runExport(opts) {
   console.log(`Static site written to ${out}`);
 }
 
+// src/preview.ts
+import { existsSync } from "fs";
+import fs3 from "fs/promises";
+import net from "net";
+import path3 from "path";
+import { spawn as spawn3 } from "child_process";
+import { fileURLToPath as fileURLToPath3 } from "url";
+import { resolveProjectCollections, seedProjectHome } from "diffwiki-core";
+async function findFreePort(start, host = "127.0.0.1") {
+  const isFree = (port) => new Promise((resolve) => {
+    const srv = net.createServer();
+    srv.once("error", () => resolve(false));
+    srv.once("listening", () => srv.close(() => resolve(true)));
+    srv.listen(port, host);
+  });
+  for (let port = start; port < start + 100; port += 1) {
+    if (await isFree(port)) return port;
+  }
+  throw new Error(`No free port available in ${start}..${start + 99}`);
+}
+function launchCommand() {
+  const override = process.env.DIFFWIKI_APP_CMD;
+  if (override) {
+    const [cmd, ...prefix] = override.split(" ");
+    return { cmd, prefix };
+  }
+  const candidates = [
+    path3.resolve(path3.dirname(fileURLToPath3(import.meta.url)), "../../../apps/wiki/bin/wiki-server.mjs"),
+    path3.resolve(process.cwd(), "apps/wiki/bin/wiki-server.mjs")
+  ];
+  const local = candidates.find((p) => existsSync(p));
+  return local ? { cmd: "node", prefix: [local] } : { cmd: "npx", prefix: ["-y", "diffwiki-app@latest"] };
+}
+async function runPreview(opts) {
+  const root = path3.resolve(opts.cwd);
+  const entries = await resolveProjectCollections(root);
+  const home = await seedProjectHome(root);
+  const { cmd, prefix } = launchCommand();
+  const port = await findFreePort(opts.port);
+  const url = `http://127.0.0.1:${port}`;
+  console.log(`Previewing ${entries.length} collection(s) from ${path3.join(root, "diffwiki.yaml")}`);
+  if (port !== opts.port) console.log(`Port ${opts.port} is in use \u2014 using ${port} instead.`);
+  console.log(`Starting UI at ${url} \u2026  (Ctrl-C to stop)`);
+  const child = spawn3(cmd, [...prefix, "--port", String(port)], {
+    env: {
+      ...process.env,
+      DIFFWIKI_HOME: home,
+      DIFFWIKI_PROJECT_DIR: root,
+      PORT: String(port),
+      HOST: "127.0.0.1"
+    },
+    stdio: "inherit"
+  });
+  const stop = () => child.kill("SIGINT");
+  process.on("SIGINT", stop);
+  process.on("SIGTERM", stop);
+  const ready = await waitForServer(url);
+  if (ready) openBrowser(url);
+  await new Promise((resolve) => {
+    const finish = () => {
+      process.off("SIGINT", stop);
+      process.off("SIGTERM", stop);
+      void fs3.rm(home, { recursive: true, force: true });
+      resolve();
+    };
+    child.on("close", finish);
+    child.on("error", (err) => {
+      console.error(`Failed to start preview: ${err.message}`);
+      finish();
+    });
+  });
+}
+
 // src/cli.ts
 var icon = (level) => level === "ok" ? "\u2713" : level === "warn" ? "!" : "\u2716";
 function createProgram() {
@@ -361,10 +438,18 @@ function createProgram() {
       console.log("Registered globally \u2014 discoverable via: diffwiki list");
     })
   );
-  program.command("export").description("Generate a static site (deployable to GitHub Pages)").requiredOption("-o, --out <dir>", "output directory").option("-b, --base <path>", "base URL path (e.g. /my-repo/ for GitHub Pages)", "/").option("-f, --filter <globs>", "only export collections matching these globs (comma-separated)").option("-e, --exclude <globs>", "exclude collections matching these globs (comma-separated)").action(
-    withErrors(async (opts) => {
-      await runExport({ out: opts.out, base: opts.base, filter: opts.filter, exclude: opts.exclude });
-    })
+  program.command("export").description("Generate a static site (deployable to GitHub Pages)").requiredOption("-o, --out <dir>", "output directory").option("-b, --base <path>", "base URL path (e.g. /my-repo/ for GitHub Pages)", "/").option("-f, --filter <globs>", "only export collections matching these globs (comma-separated)").option("-e, --exclude <globs>", "exclude collections matching these globs (comma-separated)").option("--project [dir]", "build only the repo project from its diffwiki.yaml (default: cwd)").action(
+    withErrors(
+      async (opts) => {
+        await runExport({
+          out: opts.out,
+          base: opts.base,
+          filter: opts.filter,
+          exclude: opts.exclude,
+          project: opts.project
+        });
+      }
+    )
   );
   program.command("config-set").description("Set a config value (e.g. defaultCollection, or defaultSearch <engine[:type]>)").argument("<key>", "config key").argument("<value>", "config value").action(
     withErrors(async (key, value) => {
@@ -432,20 +517,25 @@ function createProgram() {
       console.log(`Opening ${target}`);
     })
   );
+  program.command("preview").description("Preview the site from the repo diffwiki.yaml (ignores global collections)").option("-p, --port <port>", "port to serve on", "4321").action(
+    withErrors(async (opts) => {
+      await runPreview({ cwd: process.cwd(), port: Number(opts.port) });
+    })
+  );
   return program;
 }
 
 // src/logging.ts
 import { mkdirSync } from "fs";
 import os from "os";
-import path3 from "path";
+import path4 from "path";
 import { configureSync, getConfig } from "@logtape/logtape";
 import { getRotatingFileSink } from "@logtape/file";
 import { resolveLogLevel } from "diffwiki-core";
 var configured = false;
 function diffwikiHome() {
   const override = process.env.DIFFWIKI_HOME;
-  return override && override.length > 0 ? override : path3.join(os.homedir(), ".diffwiki");
+  return override && override.length > 0 ? override : path4.join(os.homedir(), ".diffwiki");
 }
 function resolveCliLevel(argv) {
   if (argv.includes("-v") || argv.includes("--verbose")) return "debug";
@@ -462,9 +552,9 @@ function configureCliLogging(argv = process.argv) {
   if (configured || getConfig() != null) return;
   configured = true;
   const level = resolveCliLevel(argv);
-  const logsDir = path3.join(diffwikiHome(), "logs");
+  const logsDir = path4.join(diffwikiHome(), "logs");
   mkdirSync(logsDir, { recursive: true });
-  const logFile = path3.join(logsDir, "diffwiki.log");
+  const logFile = path4.join(logsDir, "diffwiki.log");
   const stderrSink = (record) => {
     process.stderr.write(formatLine(record) + "\n");
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffwiki",
-  "version": "0.7.0",
+  "version": "0.8.0-rc.202607252213.c724769",
   "description": "diffwiki command-line interface",
   "license": "MIT",
   "type": "module",
@@ -17,7 +17,7 @@
     "@logtape/logtape": "^2.2.4",
     "@logtape/file": "^2.2.4",
     "commander": "^13.0.0",
-    "diffwiki-core": "0.7.0"
+    "diffwiki-core": "0.8.0-rc.202607252213.c724769"
   },
   "devDependencies": {
     "@types/node": "^22.0.0"