diffwiki 0.5.0 → 0.6.0-rc.202607240049.586dcb6

package/dist/bin.js

@@ -3,14 +3,16 @@
 // src/cli.ts
 import { Command } from "commander";
 import {
+  addExternalCollection,
   addTags,
+  collectionGitStatus,
   createArticle,
   createCollection,
   doctor,
   getConfigValue,
   initRepoWiki,
   installPlugin,
-  listCollections,
+  listCollections as listCollections2,
   listAvailablePlugins,
   listPlugins,
   listSearchModes,
@@ -20,6 +22,7 @@ import {
   removeArticle,
   removePlugin,
   removeTags,
+  resolveCwdCollection,
   setConfigValue,
   setTags,
   updateArticleBody
@@ -150,6 +153,44 @@ async function stopUi() {
   return state;
 }
 
+// src/exporter.ts
+import { spawn as spawn2 } from "child_process";
+import fs2 from "fs";
+import path2 from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import { listCollections, resolveCollectionSelection, InvalidExportSelectionError } from "diffwiki-core";
+var splitGlobs = (v) => (v ?? "").split(",").map((s) => s.trim()).filter(Boolean);
+function localAppExporter() {
+  const candidates = [
+    path2.resolve(path2.dirname(fileURLToPath2(import.meta.url)), "../../../apps/wiki/bin/export.mjs"),
+    path2.resolve(process.cwd(), "apps/wiki/bin/export.mjs")
+  ];
+  return candidates.find((p) => fs2.existsSync(p));
+}
+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) {
+    const names = (await listCollections()).map((c) => c.name);
+    const { errors } = resolveCollectionSelection(names, { filter, exclude });
+    if (errors.length > 0) throw new InvalidExportSelectionError(errors);
+  }
+  const local = localAppExporter();
+  const override = process.env.DIFFWIKI_APP_CMD ?? (local ? `node ${local}` : void 0);
+  const [cmd, ...prefix] = override ? override.split(" ") : ["npx", "-y", "diffwiki-app@latest"];
+  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 (override) console.log(`Exporting via ${override}`);
+  await new Promise((resolve, reject) => {
+    const child = spawn2(cmd, args, { stdio: "inherit", env: process.env });
+    child.on("error", reject);
+    child.on("close", (code) => code === 0 ? resolve() : reject(new Error(`export failed (exit ${code})`)));
+  });
+  console.log(`Static site written to ${out}`);
+}
+
 // src/cli.ts
 var icon = (level) => level === "ok" ? "\u2713" : level === "warn" ? "!" : "\u2716";
 function createProgram() {
@@ -160,23 +201,34 @@ function createProgram() {
   });
   program.command("list").description("List all collections").action(
     withErrors(async () => {
-      const collections = await listCollections();
+      const collections = await listCollections2();
       if (collections.length === 0) {
         console.log("No collections yet. Create one with: diffwiki create <name>");
         return;
       }
       for (const c of collections) {
-        console.log(`${c.name}	[${c.type}]	${c.path}`);
+        const status = await collectionGitStatus(c);
+        const branch = status?.branch ? `	(${status.branch})` : "";
+        console.log(`${c.name}	[${c.type}]	${c.path}${branch}`);
       }
     })
   );
+  program.command("add").description("Add the current git repo as an external collection (docs dir, no diffwiki.yaml)").option("-d, --docs <dir>", "content dir relative to repo root", "docs").action(
+    withErrors(async (opts) => {
+      const entry = await addExternalCollection({ cwd: process.cwd(), docsDir: opts.docs });
+      const status = await collectionGitStatus(entry);
+      const branch = status?.branch ? ` (${status.branch})` : "";
+      console.log(`Added "${entry.name}"${branch} \u2192 ${entry.path}`);
+      console.log("Registered globally \u2014 discoverable via: diffwiki list");
+    })
+  );
   program.command("create").description("Create a new global collection").argument("<name>", "collection name").action(
     withErrors(async (name) => {
       const entry = await createCollection(name);
       console.log(`Created collection "${entry.name}" at ${entry.path}`);
     })
   );
-  program.command("add").description("Add an article to a collection").requiredOption("-p, --path <target>", '"[collection:]title"').option("-t, --tag <tag>", "tag (repeatable, comma-separated)", collect, []).argument("[body]", "markdown body").action(
+  program.command("add-article").description("Add an article to a collection").requiredOption("-p, --path <target>", '"[collection:]title"').option("-t, --tag <tag>", "tag (repeatable, comma-separated)", collect, []).argument("[body]", "markdown body").action(
     withErrors(async (body, opts) => {
       const article = await createArticle({
         target: opts.path,
@@ -186,13 +238,13 @@ function createProgram() {
       console.log(article.path);
     })
   );
-  program.command("update").description("Replace an article's body").requiredOption("-p, --path <target>", '"collection:path"').argument("<body>", "new markdown body").action(
+  program.command("update-article").description("Replace an article's body").requiredOption("-p, --path <target>", '"collection:path"').argument("<body>", "new markdown body").action(
     withErrors(async (body, opts) => {
       const article = await updateArticleBody(opts.path, body);
       console.log(`Updated ${article.path}`);
     })
   );
-  program.command("remove").description("Delete an article").requiredOption("-p, --path <target>", '"collection:path"').action(
+  program.command("remove-article").description("Delete an article").requiredOption("-p, --path <target>", '"collection:path"').action(
     withErrors(async (opts) => {
       const removed = await removeArticle(opts.path);
       console.log(`Removed ${removed}`);
@@ -219,7 +271,7 @@ function createProgram() {
         );
         return;
       }
-      const indexed = await provider.reindex(await listCollections(), { embed: !!opts.embed });
+      const indexed = await provider.reindex(await listCollections2(), { embed: !!opts.embed });
       console.log(`Indexed ${indexed} document(s).`);
     })
   );
@@ -240,10 +292,11 @@ function createProgram() {
     })
   );
   const plugin = program.command("plugin").description("Manage search plugins");
-  plugin.command("install").description("Install a search plugin from an npm spec and provision it (setup)").argument("<spec>", "npm package spec (name, name@version, or path)").option("--no-setup", "skip the end-to-end setup after install").option("--prefetch-models", "pre-download models during setup (heavy)").action(
+  plugin.command("install").description("Install a search plugin from an npm spec and provision it (setup)").argument("<spec>", "npm package spec (name, name@version, or path)").option("--no-setup", "skip the end-to-end setup after install").option("--no-default", "do not make this the default search engine").option("--prefetch-models", "pre-download models during setup (heavy)").action(
     withErrors(async (spec, opts) => {
-      const { record, setup } = await installPlugin(spec, {
+      const { record, setup, defaulted } = await installPlugin(spec, {
         setup: opts.setup,
+        setDefault: opts.default,
         prefetchModels: opts.prefetchModels
       });
       console.log(`Installed "${record.name}"${record.version ? ` v${record.version}` : ""}`);
@@ -254,6 +307,11 @@ function createProgram() {
         console.log(`\u26A0 Not ready: ${reason}`);
         console.log("  \u2192 run: diffwiki doctor");
       }
+      if (defaulted) {
+        console.log(
+          `Set "${record.name}" as the default search engine (change: diffwiki config-set defaultSearch <engine[:type]>)`
+        );
+      }
     })
   );
   plugin.command("register").description("Register an existing executable as a search plugin").argument("<name>", "plugin name").requiredOption("--command <cmd...>", "command argv to spawn the plugin (e.g. node /abs/adapter.js)").action(
@@ -303,6 +361,11 @@ 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("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) => {
       await setConfigValue(key, value);
@@ -363,8 +426,10 @@ function createProgram() {
         state = await startUi(Number(opts.port));
         await waitForServer(state.url);
       }
-      openBrowser(state.url);
-      console.log(`Opening ${state.url}`);
+      const coll = await resolveCwdCollection(process.cwd());
+      const target = coll ? `${state.url}/${encodeURIComponent(coll.name)}` : state.url;
+      openBrowser(target);
+      console.log(`Opening ${target}`);
     })
   );
   return program;
@@ -373,14 +438,14 @@ function createProgram() {
 // src/logging.ts
 import { mkdirSync } from "fs";
 import os from "os";
-import path2 from "path";
+import path3 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 : path2.join(os.homedir(), ".diffwiki");
+  return override && override.length > 0 ? override : path3.join(os.homedir(), ".diffwiki");
 }
 function resolveCliLevel(argv) {
   if (argv.includes("-v") || argv.includes("--verbose")) return "debug";
@@ -397,9 +462,9 @@ function configureCliLogging(argv = process.argv) {
   if (configured || getConfig() != null) return;
   configured = true;
   const level = resolveCliLevel(argv);
-  const logsDir = path2.join(diffwikiHome(), "logs");
+  const logsDir = path3.join(diffwikiHome(), "logs");
   mkdirSync(logsDir, { recursive: true });
-  const logFile = path2.join(logsDir, "diffwiki.log");
+  const logFile = path3.join(logsDir, "diffwiki.log");
   const stderrSink = (record) => {
     process.stderr.write(formatLine(record) + "\n");
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffwiki",
-  "version": "0.5.0",
+  "version": "0.6.0-rc.202607240049.586dcb6",
   "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.5.0"
+    "diffwiki-core": "0.6.0-rc.202607240049.586dcb6"
   },
   "devDependencies": {
     "@types/node": "^22.0.0"