@kaynooo/cli-docker 0.6.0 → 0.8.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/cli-docker",
   "type": "module",
-  "version": "0.6.0",
+  "version": "0.8.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.10.0",
-    "@kaynooo/cli-kit": "0.21.1"
+    "@kaynooo/cli-env": "0.12.0",
+    "@kaynooo/cli-kit": "0.26.0"
   }
 }

package/src/dc.ts

@@ -1,6 +1,6 @@
 import type { Labels, Stack } from './stack'
 import process from 'node:process'
-import { paint } from '@kaynooo/cli-kit'
+import { isInteractive, paint } from '@kaynooo/cli-kit'
 import { nearestStack, recordedNearby, stackAt, stackOf } from './stack'
 
 // The words a compose command starts with, which never name a stack, so the containers are not listed to check.
@@ -39,7 +39,7 @@ export async function target(args: string[]): Promise<Target> {
 async function choose(recorded: Labels[]): Promise<Labels | undefined> {
   const picker = Bun.which('pick')
 
-  if (picker === null || !process.stdin.isTTY)
+  if (picker === null || !isInteractive())
     return undefined
 
   const proc = Bun.spawn([picker, '--prompt', 'dc> '], { stdin: new Blob([recorded.map(stack => stack.project).join('\n')]), stdout: 'pipe', stderr: 'inherit' })

package/src/dx.ts

@@ -3,7 +3,7 @@ import type { Action, Service } from './stack'
 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 { closest, fail, isInteractive, jsonOption, paint, parse, printJson, wholeNumber } from '@kaynooo/cli-kit'
 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'
@@ -139,7 +139,7 @@ export async function dx(args: string[]): Promise<number> {
   let action: Action | undefined
 
   if (named === undefined) {
-    const interactive = process.stdin.isTTY && process.stderr.isTTY && parsed.values.json !== true
+    const interactive = isInteractive() && parsed.values.json !== true
 
     if (!interactive) {
       if (emit)

package/src/sf.ts

@@ -4,7 +4,7 @@ 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 { fail, isInteractive, paint, parse, printJson } from '@kaynooo/cli-kit'
 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'
@@ -234,7 +234,7 @@ export async function answered(command: Arg[], ask: (name: string) => Promise<st
 }
 
 function interactive(): boolean {
-  return process.stdin.isTTY && process.stderr.isTTY
+  return isInteractive()
 }
 
 /** What `--emit` prints for tmux, or, standalone, the command run once its prompts are answered. */

package/src/stack.ts

@@ -3,7 +3,7 @@ import { existsSync, readdirSync, readFileSync } from 'node:fs'
 import { dirname, join, relative, resolve } from 'node:path'
 import { loadKnown } from '@kaynooo/cli-env/files'
 import { Redactor } from '@kaynooo/cli-env/redactor'
-import { captureOutput, composeError } from '@kaynooo/cli-kit'
+import { captureOutput, composeError, SKIPPED_FOLDERS } from '@kaynooo/cli-kit'
 
 /** How to reach one compose project: the command a user runs, and the one this package lists it with. */
 export interface Stack {
@@ -54,7 +54,6 @@ export interface Container {
 const LABEL_FORMAT = ['project', 'project.config_files', 'project.environment_file', 'project.working_dir'].map(label => `{{.Label "com.docker.compose.${label}"}}`).join('\t')
 const COMPOSE_FILE_VAR = /^\s*(?:export\s+)?COMPOSE_FILE\s*=\s*\S/m
 const COMPOSE_FILES = ['compose.yaml', 'compose.yml', 'docker-compose.yaml', 'docker-compose.yml']
-const SKIPPED = new Set(['node_modules', 'vendor', 'dist', 'build', 'target', 'venv', '__pycache__'])
 
 export const ACTIONS: Action[] = ['shell', 'logs', 'restart', 'up', 'stop', 'build']
 
@@ -66,7 +65,7 @@ export function from(dir: string, command: string[]): string[] {
 /** The direct child folders, hidden and built ones aside. */
 export function children(dir = '.'): string[] {
   return readdirSync(dir, { withFileTypes: true })
-    .filter(child => child.isDirectory() && !child.name.startsWith('.') && !SKIPPED.has(child.name))
+    .filter(child => child.isDirectory() && !child.name.startsWith('.') && !SKIPPED_FOLDERS.has(child.name))
     .map(child => child.name)
     .sort()
 }