@kaynooo/cli-docker 0.5.1 → 0.6.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/cli-docker",
   "type": "module",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "dc, dx, dlog and sf: docker compose on the stack found here, including one only its containers tell of, a compose service's shell, logs, restart, stop or rebuild, every service's health and recent errors in one call, and a Symfony console command picked and run.",
   "author": "Kaynooo <contact@kaynooo.fr>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "sf": "$npm_execpath src/sf-cli.ts"
   },
   "devDependencies": {
-    "@kaynooo/cli-env": "0.9.0",
-    "@kaynooo/cli-kit": "0.21.0"
+    "@kaynooo/cli-env": "0.10.0",
+    "@kaynooo/cli-kit": "0.21.1"
   }
 }

package/src/dx.ts

@@ -4,14 +4,14 @@ import process from 'node:process'
 import { loadKnown } from '@kaynooo/cli-env/files'
 import { Redactor } from '@kaynooo/cli-env/redactor'
 import { closest, fail, jsonOption, paint, parse, printJson, wholeNumber } from '@kaynooo/cli-kit'
-import { byRecency, record, runs } from '@kaynooo/cli-kit/fzf'
+import { byRecency, record, runs } from '@kaynooo/cli-kit/picker'
 import { KEY_LABELS, KEYS, pickService } from './picker'
 import { ACTIONS, allServices, commandFor, defaultAction, key, LOGS_TAIL, logsOf, serviceNamed, stateColor } from './stack'
 
 const usage = `dx [service] [action]
 dx -
 
-Without a terminal or without fzf (a script, a pipe, an agent) \`dx\` lists the services with their state, ports and image: that listing is the form to use there, \`--json\` giving the full record. On a terminal with fzf it picks one instead: enter opens its shell (or brings a stopped service up), ctrl-l follows its logs, ctrl-r restarts, ctrl-x stops and ctrl-b rebuilds it. The services last acted on come first, per folder.
+Without a terminal (a script, a pipe, an agent) \`dx\` lists the services with their state, ports and image: that listing is the form to use there, \`--json\` giving the full record. On a terminal it picks one instead: enter opens its shell (or brings a stopped service up), ctrl-l follows its logs, ctrl-r restarts, ctrl-x stops and ctrl-b rebuilds it. The services last acted on come first, per folder.
 \`dx -\` does the last action again, \`dx <service> [action]\` acts without the picker: \`shell\` (bash when the container has it), \`logs\` (follows the last ${LOGS_TAIL} lines; \`--tail N\` changes the count and \`--no-follow\` prints them once and exits, for a script), \`restart\`, \`up\`, \`stop\` or \`build\` (up with a rebuild).
 The services are the stack of this folder or its nearest parent, the ones of the child folders (keyed \`api/php\`), and stacks found only through their containers (keyed \`<project>:php\`).`
 
@@ -141,12 +141,9 @@ export async function dx(args: string[]): Promise<number> {
   if (named === undefined) {
     const interactive = process.stdin.isTTY && process.stderr.isTTY && parsed.values.json !== true
 
-    if (!interactive || Bun.which('fzf') === null) {
+    if (!interactive) {
       if (emit)
-        fail('the picker needs a terminal and fzf', 1)
-
-      if (interactive)
-        console.error('fzf is not installed, listing the services instead')
+        fail('the picker needs a terminal', 1)
 
       if (parsed.values.json === true)
         printJson(services.map(each => ({ key: key(each), project: each.project, name: each.name, state: each.state, status: each.status, ports: each.ports, image: each.image })))
@@ -156,7 +153,7 @@ export async function dx(args: string[]): Promise<number> {
       return 0
     }
 
-    const picked = pickService(byRecency(services, runs('dx'), key))
+    const picked = await pickService(byRecency(services, runs('dx'), key))
 
     if (picked === undefined)
       return 1

package/src/picker.ts

@@ -1,8 +1,8 @@
-import type { Row } from '@kaynooo/cli-kit/fzf'
+import type { Row } from '@kaynooo/cli-kit/picker'
 import type { Action, Service } from './stack'
 import process from 'node:process'
 import { paint } from '@kaynooo/cli-kit'
-import { fzf, heightFor } from '@kaynooo/cli-kit/fzf'
+import { heightFor, pick } from '@kaynooo/cli-kit/picker'
 import { key, stateColor } from './stack'
 
 export const KEYS: Record<string, Action> = { 'ctrl-l': 'logs', 'ctrl-r': 'restart', 'ctrl-x': 'stop', 'ctrl-b': 'build' }
@@ -21,9 +21,9 @@ function row(service: Service): Row {
   }
 }
 
-// The service picked with fzf and the key that picked it, enter's being empty; undefined on escape.
-export function pickService(services: Service[]): { service: Service, key: string } | undefined {
-  const picked = fzf(services.map(row), {
+// The service picked and the key that picked it, enter's being empty; undefined on escape.
+export async function pickService(services: Service[]): Promise<{ service: Service, key: string } | undefined> {
+  const picked = await pick(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),

package/src/sf.ts

@@ -1,11 +1,11 @@
 import type { ExitRow } from '@kaynooo/cli-kit'
-import type { Arg, Row } from '@kaynooo/cli-kit/fzf'
+import type { Arg, Row } from '@kaynooo/cli-kit/picker'
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import process from 'node:process'
 import { fail, paint, parse, printJson } from '@kaynooo/cli-kit'
-import { byRecency, emit, fzf, list, record, runs, table } from '@kaynooo/cli-kit/fzf'
+import { byRecency, emit, list, pick, record, runs, table } from '@kaynooo/cli-kit/picker'
 import { input } from '@kaynooo/cli-kit/prompt'
 import { children, from, nearestStack, services, up } from './stack'
 
@@ -48,7 +48,7 @@ export interface Entry {
 const usage = `sf [command] [args...]
 sf -
 
-Without a terminal or without fzf (a script, a pipe, an agent) \`sf\` lists the commands, one per line with its description: that listing is the form to use there, and \`sf --list --json\` gives each with its arguments and options. On a terminal with fzf it picks a Symfony console command instead and runs it, asking for each required argument it needs. The commands last run come first, per folder, and the picker opens on the list cached from the last run while the console answers.
+Without a terminal (a script, a pipe, an agent) \`sf\` lists the commands, one per line with its description: that listing is the form to use there, and \`sf --list --json\` gives each with its arguments and options. On a terminal it picks a Symfony console command instead and runs it, asking for each required argument it needs. The commands last run come first, per folder, and the picker opens on the list cached from the last run while the console answers.
 The console is the nearest bin/console up to the repository root, then those of the child folders (keyed \`api/cache:clear\`). It runs in the php service of the nearest compose stack when there is one, else with the local php; the container's working directory is taken to be the app.
 \`sf -\` runs 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 --list --json\` (or \`sf --json\`) prints every command as JSON, each with its console folder, description, signature, arguments and options.
@@ -56,7 +56,7 @@ The hidden flags --list, --names, --rows, --show, --record and --emit are for te
 
 const EXITS: ExitRow[] = [['the code of the console', 'a command it ran'], [0, 'it listed the commands'], [1, 'no bin/console here, or it listed no command'], [2, 'a usage error']]
 
-/** Fzf paints its rows and previews itself, so these keep their colors whatever stream they are written to. */
+/** Fzf paints its rows and previews itself, so these keep their colors whatever stream they are written to; `paint` still honours `NO_COLOR`. */
 const colors = paint({ isTTY: true })
 const MARKUP = /<(info|comment|question|error)>(.*?)<\/\1>/gs
 const TAGS = { info: 'green', comment: 'yellow', question: 'cyan', error: 'red' } as const
@@ -281,7 +281,7 @@ async function hidden(flag: string, rest: string[]): Promise<number | undefined>
     return 0
   }
 
-  // Called back by fzf once the picker is open on the cached list.
+  // Brings the cache of the consoles up to date, which `--list` starts in the background for the next time.
   if (flag === '--rows') {
     console.log(table(rows(await entries(true))).join('\n'))
 
@@ -301,7 +301,7 @@ async function hidden(flag: string, rest: string[]): Promise<number | undefined>
     return 0
   }
 
-  // From the cache, which a list run in the background brings up to date for the next time, as fzf's reload does.
+  // From the cache, which a list run in the background brings up to date for the next time, as the picker's reload does.
   if (refreshed)
     Bun.spawn([process.execPath, process.argv[1]!, '--rows'], { stdio: ['ignore', 'ignore', 'ignore'] }).unref()
 
@@ -375,27 +375,23 @@ export async function sf(args: string[]): Promise<number> {
   if (found.length === 0)
     fail('no bin/console here, or it listed no command', 1)
 
-  if (!interactive() || Bun.which('fzf') === null) {
+  if (!interactive()) {
     if (emitting)
-      fail('the picker needs a terminal and fzf', 1)
-
-    if (interactive())
-      console.error('fzf is not installed, listing the commands instead')
+      fail('the picker needs a terminal', 1)
 
     console.log(listing(found))
 
     return 0
   }
 
-  const self = `${process.execPath} ${process.argv[1]}`
-  const picked = fzf(rows(found), {
+  const picked = await pick(rows(found), {
     prompt: 'sf> ',
     searched: 1,
-    preview: `${self} --show {1} {2}`,
-    // Once the cached list is in, and only once, the reload firing load again.
-    bind: refreshed ? [`load:unbind(load)+reload-sync(${self} --rows)`] : [],
+    preview: `${process.execPath} ${process.argv[1]} --show {1} {2}`,
+    // Opens on the cached list, which the consoles' own answer replaces once it is in.
+    reload: refreshed ? { onOpen: true, run: async () => ({ rows: rows(await entries(true)) }) } : undefined,
   })
-  // Read again, the reload having maybe brought a command the cached list did not hold.
+  // Read again, the reload having maybe brought a command the first list did not hold.
   const entry = picked && (await entries(false)).find(candidate => candidate.app.dir === picked.hidden[0] && candidate.command.name === picked.hidden[1])
 
   return entry === undefined ? 1 : execute(emitting, key(entry), key(entry), commandFor(entry, []))