@kaynooo/cli-docker 0.2.0 → 0.4.0

package/dist/dx-cli.js

@@ -349,6 +349,9 @@ function optionRows(options, colors = paint(process3.stdout)) {
 
 // ../kit/src/text.ts
 var ANSI = new RegExp(`${String.fromCharCode(27)}\\[[\\d;?]*[a-z]`, "gi");
+function stripAnsi(text) {
+  return text.replace(ANSI, "");
+}
 function distance(a, b) {
   let previous = Array.from({ length: b.length + 1 }, (_, index) => index);
   for (const [i, left] of [...a].entries()) {
@@ -745,34 +748,86 @@ var {Glob } = globalThis.Bun;
 var SESSION_FILES = new Glob("*.json");
 var ACCOUNT_DIRS = new Glob("*/sessions");
 // package.json
-var version = "0.2.0";
+var version = "0.4.0";
 
 // src/dx.ts
 import process10 from "process";
 
-// src/history.ts
+// ../kit/src/fzf.ts
 import { existsSync, mkdirSync as mkdirSync2, readFileSync, writeFileSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { dirname as dirname2, join as join2 } from "path";
 import process8 from "process";
 var REMEMBERED = 20;
-function historyFile() {
-  return join2(process8.env.XDG_CACHE_HOME ?? join2(homedir2(), ".cache"), "dx", "history.json");
+function table(rows) {
+  const widths = rows[0]?.cells.map((_, index) => Math.max(...rows.map((row) => Bun.stringWidth(row.cells[index])))) ?? [];
+  return rows.map((row) => [
+    ...row.hidden,
+    ...row.cells.map((cell, index) => index === row.cells.length - 1 ? cell.trimEnd() : `${cell}${" ".repeat(widths[index] + 1 - Bun.stringWidth(cell))}`)
+  ].join("\t"));
+}
+function fzf(rows, options) {
+  const hidden = options.hidden ?? rows[0]?.hidden.length ?? 0;
+  const proc = Bun.spawnSync([
+    "fzf",
+    "--prompt",
+    options.prompt,
+    ...options.header === undefined ? [] : ["--header", options.header],
+    ...(options.expect ?? []).length > 0 ? ["--expect", (options.expect ?? []).join(",")] : [],
+    "--ansi",
+    "--reverse",
+    "--height",
+    options.height ?? "100%",
+    "--delimiter",
+    "\t",
+    "--with-nth",
+    `${hidden + 1}..`,
+    "--nth",
+    `1..${options.searched}`,
+    "--tabstop",
+    "1",
+    "--tiebreak",
+    "chunk,index",
+    ...options.preview === undefined ? [] : ["--preview", options.preview, "--preview-window", "down,40%"],
+    ...(options.bind ?? []).flatMap((bind) => ["--bind", bind]),
+    ...options.query === true ? ["--print-query"] : []
+  ], {
+    stdin: new TextEncoder().encode(table(rows).join(`
+`)),
+    stdout: "pipe",
+    stderr: "inherit"
+  });
+  return picked(proc.stdout.toString(), hidden, options);
+}
+function picked(output, hidden, options) {
+  const lines = output.split(`
+`);
+  const query = options.query === true ? lines.shift() : "";
+  const [key, line] = (options.expect ?? []).length > 0 ? [lines[0], lines[1]] : ["", lines[0]];
+  if (line !== undefined && line !== "")
+    return { key, hidden: line.split("\t").slice(0, hidden), query };
+  return options.query === true && key !== "" ? { key, hidden: [], query } : undefined;
+}
+function heightFor(count) {
+  return String(Math.max(15, Math.ceil((count + 4) / 0.6)));
+}
+function historyFile(name) {
+  return join2(process8.env.XDG_CACHE_HOME ?? join2(homedir2(), ".cache"), name, "history.json");
 }
-function history() {
+function history(name) {
   try {
-    const file = historyFile();
+    const file = historyFile(name);
     return existsSync(file) ? JSON.parse(readFileSync(file, "utf-8")) : {};
   } catch {
     return {};
   }
 }
-function runs() {
-  return history()[process8.cwd()] ?? [];
+function runs(name) {
+  return history(name)[process8.cwd()] ?? [];
 }
-function record(run) {
-  const all = history();
-  const file = historyFile();
+function record(name, run) {
+  const all = history(name);
+  const file = historyFile(name);
   all[process8.cwd()] = [run, ...(all[process8.cwd()] ?? []).filter((earlier) => earlier.id !== run.id)].slice(0, REMEMBERED);
   mkdirSync2(dirname2(file), { recursive: true });
   writeFileSync(file, JSON.stringify(all));
@@ -782,6 +837,19 @@ function byRecency(items, previous, idOf) {
   const recent = items.filter((item) => rank.has(idOf(item))).sort((a, b) => rank.get(idOf(a)) - rank.get(idOf(b)));
   return [...recent, ...items.filter((item) => !rank.has(idOf(item)))];
 }
+function word(arg) {
+  if (typeof arg === "string")
+    return `=${arg}`;
+  return "given" in arg ? `+${arg.given}` : `?${arg.ask}`;
+}
+function emit(mode, typed, recorded, command) {
+  const words = command.map(word);
+  console.log([mode, typed, recorded, ...words].join(`
+`));
+}
+function list(rows) {
+  console.log(JSON.stringify(rows));
+}
 
 // src/picker.ts
 import process9 from "process";
@@ -863,9 +931,17 @@ async function recordedNearby() {
   const dirs = new Set([...up("."), ...children()].map((dir) => resolve(dir)));
   return (await labels()).filter((stack) => dirs.has(stack.workdir));
 }
-async function output(stack, args) {
+async function attempt(stack, args) {
   const proc = Bun.spawn([...stack.list.argv, ...args], { cwd: stack.list.cwd, env: stack.list.env, stdout: "pipe", stderr: "pipe" });
-  return await proc.exited === 0 ? new Response(proc.stdout).text() : "";
+  const [text, stderr, code] = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text(), proc.exited]);
+  if (code === 0)
+    return { text, error: undefined };
+  const last = stderr.trim().split(`
+`).at(-1) ?? "";
+  return { text: "", error: last === "" ? `exit ${code}` : last };
+}
+async function output(stack, args) {
+  return (await attempt(stack, args)).text;
 }
 function containers(text) {
   const trimmed = text.trim();
@@ -955,47 +1031,17 @@ function row(service) {
     cells: [dir === "." ? name : `${colors.dim(`${dir}/`)}${name}`, colors[stateColor(service.state)](service.state), colors.cyan(service.ports), colors.dim(service.image)]
   };
 }
-function table(rows) {
-  const widths = rows[0]?.cells.map((_, index) => Math.max(...rows.map((each) => Bun.stringWidth(each.cells[index])))) ?? [];
-  return rows.map((each) => [
-    ...each.hidden,
-    ...each.cells.map((cell, index) => index === each.cells.length - 1 ? cell.trimEnd() : `${cell}${" ".repeat(widths[index] + 1 - Bun.stringWidth(cell))}`)
-  ].join("\t")).join(`
-`);
-}
 function pickService(services) {
-  const proc = Bun.spawnSync([
-    "fzf",
-    "--prompt",
-    "dx> ",
-    "--header",
-    "enter shell or up, ctrl-l logs, ctrl-r restart, ctrl-x stop, ctrl-b rebuild",
-    "--expect",
-    Object.keys(KEYS).join(","),
-    "--ansi",
-    "--reverse",
-    "--height",
-    String(Math.max(15, Math.ceil((services.length + 4) / 0.6))),
-    "--delimiter",
-    "\t",
-    "--with-nth",
-    "5..",
-    "--nth",
-    "1",
-    "--tabstop",
-    "1",
-    "--tiebreak",
-    "chunk,index",
-    "--preview",
-    `${process9.execPath} ${process9.argv[1]} --show {1} {2} {4}`,
-    "--preview-window",
-    "down,40%"
-  ], { stdin: new TextEncoder().encode(table(services.map(row))), stdout: "pipe", stderr: "inherit" });
-  const [pressed = "", line] = proc.stdout.toString().split(`
-`);
-  const keyed = line?.split("\t")[2];
-  const service = services.find((candidate) => key(candidate) === keyed);
-  return service === undefined ? undefined : { service, key: pressed };
+  const picked = fzf(services.map(row), {
+    prompt: "dx> ",
+    header: "enter shell or up, ctrl-l logs, ctrl-r restart, ctrl-x stop, ctrl-b rebuild",
+    expect: Object.keys(KEYS),
+    searched: 1,
+    height: heightFor(services.length),
+    preview: `${process9.execPath} ${process9.argv[1]} --show {1} {2} {4}`
+  });
+  const service = services.find((candidate) => key(candidate) === picked?.hidden[2]);
+  return picked === undefined || service === undefined ? undefined : { service, key: picked.key };
 }
 
 // src/dx.ts
@@ -1031,7 +1077,7 @@ function find(services, named) {
   return fail(`no service named ${named}${nearest === undefined ? "" : `, did you mean ${nearest}?`}`, 1);
 }
 function listed2(services) {
-  return byRecency(services, runs(), key).map((service) => ({
+  return byRecency(services, runs("dx"), key).map((service) => ({
     label: key(service),
     hint: [service.state, service.ports, service.image].filter(Boolean).join(" \xB7 "),
     typed: key(service),
@@ -1091,13 +1137,13 @@ async function dx(args) {
         console.log(table2(services));
       return 0;
     }
-    const picked = pickService(byRecency(services, runs(), key));
+    const picked = pickService(byRecency(services, runs("dx"), key));
     if (picked === undefined)
       return 1;
     service = picked.service;
     action = KEYS[picked.key];
   } else if (named === "-") {
-    const last = runs()[0];
+    const last = runs("dx")[0];
     service = last && services.find((candidate) => key(candidate) === last.id);
     if (service === undefined)
       fail(last ? `${last.id} is gone` : "nothing done here yet", 1);
@@ -1110,7 +1156,7 @@ async function dx(args) {
   }
   const chosen = action ?? defaultAction(service);
   const command = await commandFor(service, chosen);
-  record({ id: key(service), args: [chosen] });
+  record("dx", { id: key(service), args: [chosen] });
   if (emit) {
     console.log(["run", action === undefined ? key(service) : `${key(service)} ${action}`, "", ...command.map((word) => `=${word}`)].join(`
 `));