@kaynooo/cli-docker 0.2.0 → 0.3.0

package/README.md

@@ -1,6 +1,6 @@
 # docker
 
-Two docker compose helpers: `dc` runs compose on the stack found here, `dx` lists a stack's services and opens a shell in one, follows its logs, restarts, stops or rebuilds it.
+Three helpers: `dc` runs compose on the stack found here, `dx` lists a stack's services and opens a shell in one, follows its logs, restarts, stops or rebuilds it, `sf` picks a Symfony console command and runs it.
 
 ```sh
 bun install -g @kaynooo/cli-docker
@@ -15,6 +15,11 @@ bun install -g @kaynooo/cli-docker
 | `dx` | picks a service with fzf: enter opens its shell (or brings it up), ctrl-l follows its logs, ctrl-r restarts, ctrl-x stops, ctrl-b rebuilds; the ones acted on last come first. Without fzf or a terminal it lists them with their state, ports and image (`--json` for the full record) |
 | `dx -` | the last action again |
 | `dx <service> [action]` | `shell` (the default, `up` for a stopped service), `logs`, `restart`, `up`, `stop` or `build` |
+| `sf` | picks a Symfony console command with fzf and runs it, asking for each required argument; the commands run last come first, and the picker opens on the list cached from the last run. It runs in the php service of the nearest compose stack, else with the local php. Without fzf or a terminal it lists the commands |
+| `sf -` | the last command again, with the arguments it ran with |
+| `sf <command> [args...]` | runs without the picker; a name the list does not hold goes to the console as is, which resolves `c:c` to `cache:clear` itself |
+
+`sf` finds the nearest `bin/console` up to the repository root, then those of the child folders (keyed `api/cache:clear`).
 
 `dc` takes no option of its own, every word reaches compose as typed. With several stacks that only have containers here and no name, it asks with `pick` when that is installed and a terminal is attached, and otherwise lists the projects. When it picked the stack through its containers it prints the compose command it stands for on stderr.
 

package/dist/dc-cli.js

@@ -745,7 +745,7 @@ 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.3.0";
 
 // src/dc.ts
 import process8 from "process";

package/dist/dx-cli.js

@@ -745,34 +745,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.3.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 history() {
+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(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 +834,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";
@@ -955,47 +1020,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 +1066,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 +1126,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 +1145,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(`
 `));