@kaynooo/cli-docker 0.7.0 → 0.8.1

package/dist/dc-cli.js

@@ -627,7 +627,6 @@ var DASHES = /^-+/;
 function jsonOption(holds) {
   return { type: "boolean", description: holds === undefined ? "print JSON" : `print JSON: ${holds}` };
 }
-
 class Exit extends Error {
   code;
   hint;
@@ -1032,6 +1031,8 @@ function composeError({ code, stderr }) {
 `).at(-1) ?? "";
   return last === "" ? `exit ${code}` : last;
 }
+// ../kit/src/folders.ts
+var SKIPPED_FOLDERS = new Set(["node_modules", "vendor", "dist", "build", "target", "coverage", "venv", "__pycache__"]);
 // ../kit/src/secrets.ts
 var SECRET_PART = /token|secret|passw|credential|private|dsn|apikey|accesskey|key$/i;
 var SECRET_WORDS = new Set(["key", "pass", "pwd", "auth", "salt", "cookie", "session", "jwt", "ssn", "iban", "card", "cvv", "otp"]);
@@ -1404,13 +1405,12 @@ class Redactor {
 var LABEL_FORMAT = ["project", "project.config_files", "project.environment_file", "project.working_dir"].map((label) => `{{.Label "com.docker.compose.${label}"}}`).join("\t");
 var COMPOSE_FILE_VAR = /^\s*(?:export\s+)?COMPOSE_FILE\s*=\s*\S/m;
 var COMPOSE_FILES = ["compose.yaml", "compose.yml", "docker-compose.yaml", "docker-compose.yml"];
-var SKIPPED2 = new Set(["node_modules", "vendor", "dist", "build", "target", "venv", "__pycache__"]);
 var ACTIONS = ["shell", "logs", "restart", "up", "stop", "build"];
 function from(dir, command) {
   return dir === "." ? command : ["env", "-C", dir, ...command];
 }
 function children(dir = ".") {
-  return readdirSync(dir, { withFileTypes: true }).filter((child) => child.isDirectory() && !child.name.startsWith(".") && !SKIPPED2.has(child.name)).map((child) => child.name).sort();
+  return readdirSync(dir, { withFileTypes: true }).filter((child) => child.isDirectory() && !child.name.startsWith(".") && !SKIPPED_FOLDERS.has(child.name)).map((child) => child.name).sort();
 }
 function up(dir) {
   const dirs = [];

package/dist/dlog-cli.js

@@ -627,7 +627,6 @@ var DASHES = /^-+/;
 function jsonOption(holds) {
   return { type: "boolean", description: holds === undefined ? "print JSON" : `print JSON: ${holds}` };
 }
-
 class Exit extends Error {
   code;
   hint;
@@ -1032,6 +1031,8 @@ function composeError({ code, stderr }) {
 `).at(-1) ?? "";
   return last === "" ? `exit ${code}` : last;
 }
+// ../kit/src/folders.ts
+var SKIPPED_FOLDERS = new Set(["node_modules", "vendor", "dist", "build", "target", "coverage", "venv", "__pycache__"]);
 // ../kit/src/secrets.ts
 var SECRET_PART = /token|secret|passw|credential|private|dsn|apikey|accesskey|key$/i;
 var SECRET_WORDS = new Set(["key", "pass", "pwd", "auth", "salt", "cookie", "session", "jwt", "ssn", "iban", "card", "cvv", "otp"]);
@@ -1404,13 +1405,12 @@ class Redactor {
 var LABEL_FORMAT = ["project", "project.config_files", "project.environment_file", "project.working_dir"].map((label) => `{{.Label "com.docker.compose.${label}"}}`).join("\t");
 var COMPOSE_FILE_VAR = /^\s*(?:export\s+)?COMPOSE_FILE\s*=\s*\S/m;
 var COMPOSE_FILES = ["compose.yaml", "compose.yml", "docker-compose.yaml", "docker-compose.yml"];
-var SKIPPED2 = new Set(["node_modules", "vendor", "dist", "build", "target", "venv", "__pycache__"]);
 var ACTIONS = ["shell", "logs", "restart", "up", "stop", "build"];
 function from(dir, command) {
   return dir === "." ? command : ["env", "-C", dir, ...command];
 }
 function children(dir = ".") {
-  return readdirSync(dir, { withFileTypes: true }).filter((child) => child.isDirectory() && !child.name.startsWith(".") && !SKIPPED2.has(child.name)).map((child) => child.name).sort();
+  return readdirSync(dir, { withFileTypes: true }).filter((child) => child.isDirectory() && !child.name.startsWith(".") && !SKIPPED_FOLDERS.has(child.name)).map((child) => child.name).sort();
 }
 function up(dir) {
   const dirs = [];

package/dist/dx-cli.js

@@ -627,7 +627,6 @@ var DASHES = /^-+/;
 function jsonOption(holds) {
   return { type: "boolean", description: holds === undefined ? "print JSON" : `print JSON: ${holds}` };
 }
-
 class Exit extends Error {
   code;
   hint;
@@ -1032,6 +1031,8 @@ function composeError({ code, stderr }) {
 `).at(-1) ?? "";
   return last === "" ? `exit ${code}` : last;
 }
+// ../kit/src/folders.ts
+var SKIPPED_FOLDERS = new Set(["node_modules", "vendor", "dist", "build", "target", "coverage", "venv", "__pycache__"]);
 // ../kit/src/secrets.ts
 var SECRET_PART = /token|secret|passw|credential|private|dsn|apikey|accesskey|key$/i;
 var SECRET_WORDS = new Set(["key", "pass", "pwd", "auth", "salt", "cookie", "session", "jwt", "ssn", "iban", "card", "cvv", "otp"]);
@@ -1503,6 +1504,14 @@ var KEYS = {
   "\x1B[B": "down",
   "\x1BOB": "down",
   "\x0E": "down",
+  "\x1B[5~": "pageup",
+  "\x1B[6~": "pagedown",
+  "\x1B[H": "home",
+  "\x1B[1~": "home",
+  "\x1BOH": "home",
+  "\x1B[F": "end",
+  "\x1B[4~": "end",
+  "\x1BOF": "end",
   "\r": "enter",
   "\n": "enter",
   "\x03": "cancel",
@@ -1511,7 +1520,10 @@ var KEYS = {
   "\b": "erase",
   "\x15": "clear",
   "\x17": "word",
-  "\t": "tab"
+  "\t": "tab",
+  "\x1F": "help",
+  "\x1BOP": "help",
+  "\x1B[11~": "help"
 };
 var CTRL_KEY = /^ctrl-[abd-gkln-z]$/;
 function repeat(value, count) {
@@ -1581,7 +1593,7 @@ function parseKeys(input, paste = { active: false }, ctrls = []) {
   });
 }
 function createState(rows, { multi = false, prompt = "> ", query = "", header = "", expect = [], searched = Number.POSITIVE_INFINITY } = {}) {
-  const state = { rows: [], items: [], styles: [], searchable: [], searched, header, expect, key: "", status: "", query, matches: [], cursor: 0, marked: new Set, multi, prompt, done: undefined };
+  const state = { rows: [], items: [], styles: [], searchable: [], searched, header, expect, key: "", status: "", query, matches: [], cursor: 0, help: false, page: 10, marked: new Set, multi, prompt, done: undefined };
   return withRows(state, rows);
 }
 function withRows(state, rows, header = state.header) {
@@ -1603,6 +1615,8 @@ function highlighted(state) {
 function press(state, key) {
   if (state.done !== undefined)
     return state;
+  if (state.help)
+    return { ...state, help: false };
   if (typeof key === "object") {
     if ("text" in key)
       return withQuery(state, state.query + key.text);
@@ -1613,8 +1627,18 @@ function press(state, key) {
       return move(state, -1);
     case "down":
       return move(state, 1);
+    case "pageup":
+      return move(state, -state.page);
+    case "pagedown":
+      return move(state, state.page);
+    case "home":
+      return move(state, -state.matches.length);
+    case "end":
+      return move(state, state.matches.length);
     case "cancel":
       return { ...state, done: "cancel" };
+    case "help":
+      return { ...state, help: true };
     case "erase":
       return withQuery(state, [...state.query].slice(0, -1).join(""));
     case "clear":
@@ -1794,7 +1818,18 @@ function fitStyled(line, width, plain = identity) {
 function caretColumn(state, layout) {
   return Math.min(layout.listWidth, Bun.stringWidth(state.prompt) + Bun.stringWidth(state.query) + 1);
 }
+function helpLines(state, layout, theme) {
+  const lines = [
+    "type to filter, up, down, ctrl-p, ctrl-n, pgup, pgdn, home, end move",
+    `enter picks${state.multi ? ", tab marks" : ""}, ctrl-u clears the query, ctrl-w a word, esc or ctrl-c cancels`,
+    ...state.expect.length > 0 ? [`${state.expect.join(", ")} end the pick as this command asks`] : []
+  ];
+  const title = "keys, any key closes this help";
+  return [{ text: theme.accent(title), width: title.length }, ...lines.map((line) => fit(`  ${line}`, layout.listWidth, theme.label))];
+}
 function listLines(state, layout, theme) {
+  if (state.help)
+    return helpLines(state, layout, theme);
   const header = state.header === "" ? [] : state.header.split(`
 `).map((line) => fitStyled(line, layout.listWidth, theme.label));
   const rows = Math.max(1, layout.listHeight - 2 - header.length);
@@ -1803,7 +1838,8 @@ function listLines(state, layout, theme) {
   const marks = (state.marked.size > 0 ? ` (${state.marked.size} marked)` : "") + (state.status === "" ? "" : ` ${state.status}`);
   const promptWidth = Bun.stringWidth(state.prompt);
   const query = fit(state.query, Math.max(1, layout.listWidth - promptWidth), identity);
-  const count = fit(`  ${state.matches.length}/${state.items.length}${marks}`, layout.listWidth, theme.label);
+  const place = state.matches.length > rows ? ` (${state.cursor + 1} of ${state.matches.length})` : "";
+  const count = fit(`  ${state.matches.length}/${state.items.length}${place}${marks}`, layout.listWidth, theme.label);
   const lines = [{ text: theme.accent(state.prompt) + query.text, width: promptWidth + query.width }, count, ...header];
   if (state.matches.length === 0)
     lines.push(fit("  no match", layout.listWidth, theme.label));
@@ -1830,6 +1866,7 @@ function render(state, layout, theme, preview = []) {
 
 // ../kit/src/picker/terminal.ts
 var PREVIEW_DELAY_MS = 120;
+var ESCAPE_WAIT_MS = 30;
 var OPEN = { ctrl: "open" };
 var HIDE_CURSOR = "\x1B[?25l";
 var SHOW_CURSOR = "\x1B[?25h";
@@ -1841,14 +1878,24 @@ function up(lines) {
   return lines > 0 ? `\x1B[${lines}A` : "";
 }
 function openTerminal() {
-  let input;
+  let mode;
   try {
-    input = new tty.ReadStream(openSync("/dev/tty", "r"));
+    mode = new tty.ReadStream(openSync("/dev/tty", "r"));
   } catch {
     return fail("no terminal to read keys from (/dev/tty)");
   }
+  const keys = Bun.file("/dev/tty").stream().getReader();
   const out = process14.stderr;
   let resize;
+  async function read(onChunk) {
+    const decoder = new TextDecoder;
+    try {
+      for (let chunk = await keys.read();!chunk.done; chunk = await keys.read())
+        onChunk(decoder.decode(chunk.value, { stream: true }));
+    } catch {
+      onChunk("\x03");
+    }
+  }
   return {
     get columns() {
       return out.columns || 80;
@@ -1860,17 +1907,18 @@ function openTerminal() {
     write: (text) => void out.write(text),
     listen(onChunk, onResize) {
       resize = onResize;
-      input.setRawMode(true);
+      mode.setRawMode(true);
       out.on("resize", onResize);
-      input.on("data", (chunk) => onChunk(chunk.toString()));
+      read(onChunk);
     },
     close() {
       if (resize !== undefined)
         out.off("resize", resize);
       try {
-        input.setRawMode(false);
+        mode.setRawMode(false);
       } finally {
-        input.destroy();
+        mode.destroy();
+        keys.cancel();
       }
     }
   };
@@ -1885,20 +1933,29 @@ async function select(rows, settings, terminal = openTerminal()) {
   let shownLine;
   let finish;
   let restored = false;
+  let escape;
+  let caret;
   function draw(clear = false) {
     if (restored)
       return;
     const layout = layoutFor({ columns: terminal.columns, rows: terminal.rows }, settings.height, settings.preview !== undefined, settings.previewPosition);
     let frame = HIDE_CURSOR;
     if (reserved !== layout.height || clear) {
+      frame += clear && caret !== undefined ? up(Math.floor((caret - 1) / terminal.columns)) : "";
       frame += CLEAR_BELOW + `
 `.repeat(layout.height - 1) + up(layout.height - 1);
       reserved = layout.height;
     }
+    caret = caretColumn(state, layout);
     frame += `\r${render(state, layout, theme, preview).map((line) => `\x1B[2K${line}`).join(`
-`)}${up(layout.height - 1)}\r\x1B[${caretColumn(state, layout)}G${SHOW_CURSOR}`;
+`)}${up(layout.height - 1)}\r\x1B[${caret}G${SHOW_CURSOR}`;
     terminal.write(frame);
   }
+  function pageSize() {
+    const headerLines = state.header === "" ? 0 : state.header.split(`
+`).length;
+    return Math.max(1, layoutFor({ columns: terminal.columns, rows: terminal.rows }, settings.height, settings.preview !== undefined, settings.previewPosition).listHeight - 2 - headerLines);
+  }
   function refreshPreview() {
     const at = highlighted(state);
     if (settings.preview === undefined || at === shownLine)
@@ -1928,6 +1985,7 @@ async function select(rows, settings, terminal = openTerminal()) {
       return;
     restored = true;
     clearTimeout(previewTimer);
+    clearTimeout(escape);
     previewing.abort();
     terminal.write(`${CLEAR_BELOW}${PASTE_OFF}${SHOW_CURSOR}`);
     terminal.close();
@@ -1966,7 +2024,7 @@ async function select(rows, settings, terminal = openTerminal()) {
         if (key === OPEN || typeof key === "object" && "ctrl" in key && key.ctrl === reload?.key)
           await reloadRows();
         else
-          state = press(state, key);
+          state = press({ ...state, page: pageSize() }, key);
       }
     } finally {
       draining = false;
@@ -1979,6 +2037,20 @@ async function select(rows, settings, terminal = openTerminal()) {
     draw();
   }
   function onChunk(chunk) {
+    if (escape !== undefined) {
+      clearTimeout(escape);
+      escape = undefined;
+      chunk = `\x1B${chunk}`;
+    } else if (chunk === "\x1B") {
+      escape = setTimeout(() => {
+        escape = undefined;
+        takeKeys("\x1B");
+      }, ESCAPE_WAIT_MS);
+      return;
+    }
+    takeKeys(chunk);
+  }
+  function takeKeys(chunk) {
     const keys = parseKeys(chunk, paste, [...settings.expect ?? [], ...reload?.key === undefined ? [] : [reload.key]]);
     if (busy && keys.includes("cancel")) {
       stop();
@@ -2092,13 +2164,12 @@ import { dirname as dirname6, join as join8, relative, resolve as resolve3 } fro
 var LABEL_FORMAT = ["project", "project.config_files", "project.environment_file", "project.working_dir"].map((label) => `{{.Label "com.docker.compose.${label}"}}`).join("\t");
 var COMPOSE_FILE_VAR = /^\s*(?:export\s+)?COMPOSE_FILE\s*=\s*\S/m;
 var COMPOSE_FILES = ["compose.yaml", "compose.yml", "docker-compose.yaml", "docker-compose.yml"];
-var SKIPPED2 = new Set(["node_modules", "vendor", "dist", "build", "target", "venv", "__pycache__"]);
 var ACTIONS = ["shell", "logs", "restart", "up", "stop", "build"];
 function from(dir, command) {
   return dir === "." ? command : ["env", "-C", dir, ...command];
 }
 function children(dir = ".") {
-  return readdirSync(dir, { withFileTypes: true }).filter((child) => child.isDirectory() && !child.name.startsWith(".") && !SKIPPED2.has(child.name)).map((child) => child.name).sort();
+  return readdirSync(dir, { withFileTypes: true }).filter((child) => child.isDirectory() && !child.name.startsWith(".") && !SKIPPED_FOLDERS.has(child.name)).map((child) => child.name).sort();
 }
 function up2(dir) {
   const dirs = [];

package/dist/sf-cli.js

@@ -627,7 +627,6 @@ var DASHES = /^-+/;
 function jsonOption(holds) {
   return { type: "boolean", description: holds === undefined ? "print JSON" : `print JSON: ${holds}` };
 }
-
 class Exit extends Error {
   code;
   hint;
@@ -1032,6 +1031,8 @@ function composeError({ code, stderr }) {
 `).at(-1) ?? "";
   return last === "" ? `exit ${code}` : last;
 }
+// ../kit/src/folders.ts
+var SKIPPED_FOLDERS = new Set(["node_modules", "vendor", "dist", "build", "target", "coverage", "venv", "__pycache__"]);
 // ../kit/src/secrets.ts
 var SECRET_PART = /token|secret|passw|credential|private|dsn|apikey|accesskey|key$/i;
 var SECRET_WORDS = new Set(["key", "pass", "pwd", "auth", "salt", "cookie", "session", "jwt", "ssn", "iban", "card", "cvv", "otp"]);
@@ -1156,6 +1157,14 @@ var KEYS = {
   "\x1B[B": "down",
   "\x1BOB": "down",
   "\x0E": "down",
+  "\x1B[5~": "pageup",
+  "\x1B[6~": "pagedown",
+  "\x1B[H": "home",
+  "\x1B[1~": "home",
+  "\x1BOH": "home",
+  "\x1B[F": "end",
+  "\x1B[4~": "end",
+  "\x1BOF": "end",
   "\r": "enter",
   "\n": "enter",
   "\x03": "cancel",
@@ -1164,7 +1173,10 @@ var KEYS = {
   "\b": "erase",
   "\x15": "clear",
   "\x17": "word",
-  "\t": "tab"
+  "\t": "tab",
+  "\x1F": "help",
+  "\x1BOP": "help",
+  "\x1B[11~": "help"
 };
 var CTRL_KEY = /^ctrl-[abd-gkln-z]$/;
 function repeat(value, count) {
@@ -1234,7 +1246,7 @@ function parseKeys(input, paste = { active: false }, ctrls = []) {
   });
 }
 function createState(rows, { multi = false, prompt = "> ", query = "", header = "", expect = [], searched = Number.POSITIVE_INFINITY } = {}) {
-  const state = { rows: [], items: [], styles: [], searchable: [], searched, header, expect, key: "", status: "", query, matches: [], cursor: 0, marked: new Set, multi, prompt, done: undefined };
+  const state = { rows: [], items: [], styles: [], searchable: [], searched, header, expect, key: "", status: "", query, matches: [], cursor: 0, help: false, page: 10, marked: new Set, multi, prompt, done: undefined };
   return withRows(state, rows);
 }
 function withRows(state, rows, header = state.header) {
@@ -1256,6 +1268,8 @@ function highlighted(state) {
 function press(state, key) {
   if (state.done !== undefined)
     return state;
+  if (state.help)
+    return { ...state, help: false };
   if (typeof key === "object") {
     if ("text" in key)
       return withQuery(state, state.query + key.text);
@@ -1266,8 +1280,18 @@ function press(state, key) {
       return move(state, -1);
     case "down":
       return move(state, 1);
+    case "pageup":
+      return move(state, -state.page);
+    case "pagedown":
+      return move(state, state.page);
+    case "home":
+      return move(state, -state.matches.length);
+    case "end":
+      return move(state, state.matches.length);
     case "cancel":
       return { ...state, done: "cancel" };
+    case "help":
+      return { ...state, help: true };
     case "erase":
       return withQuery(state, [...state.query].slice(0, -1).join(""));
     case "clear":
@@ -1447,7 +1471,18 @@ function fitStyled(line, width, plain = identity) {
 function caretColumn(state, layout) {
   return Math.min(layout.listWidth, Bun.stringWidth(state.prompt) + Bun.stringWidth(state.query) + 1);
 }
+function helpLines(state, layout, theme) {
+  const lines = [
+    "type to filter, up, down, ctrl-p, ctrl-n, pgup, pgdn, home, end move",
+    `enter picks${state.multi ? ", tab marks" : ""}, ctrl-u clears the query, ctrl-w a word, esc or ctrl-c cancels`,
+    ...state.expect.length > 0 ? [`${state.expect.join(", ")} end the pick as this command asks`] : []
+  ];
+  const title = "keys, any key closes this help";
+  return [{ text: theme.accent(title), width: title.length }, ...lines.map((line) => fit(`  ${line}`, layout.listWidth, theme.label))];
+}
 function listLines(state, layout, theme) {
+  if (state.help)
+    return helpLines(state, layout, theme);
   const header = state.header === "" ? [] : state.header.split(`
 `).map((line) => fitStyled(line, layout.listWidth, theme.label));
   const rows = Math.max(1, layout.listHeight - 2 - header.length);
@@ -1456,7 +1491,8 @@ function listLines(state, layout, theme) {
   const marks = (state.marked.size > 0 ? ` (${state.marked.size} marked)` : "") + (state.status === "" ? "" : ` ${state.status}`);
   const promptWidth = Bun.stringWidth(state.prompt);
   const query = fit(state.query, Math.max(1, layout.listWidth - promptWidth), identity);
-  const count = fit(`  ${state.matches.length}/${state.items.length}${marks}`, layout.listWidth, theme.label);
+  const place = state.matches.length > rows ? ` (${state.cursor + 1} of ${state.matches.length})` : "";
+  const count = fit(`  ${state.matches.length}/${state.items.length}${place}${marks}`, layout.listWidth, theme.label);
   const lines = [{ text: theme.accent(state.prompt) + query.text, width: promptWidth + query.width }, count, ...header];
   if (state.matches.length === 0)
     lines.push(fit("  no match", layout.listWidth, theme.label));
@@ -1483,6 +1519,7 @@ function render(state, layout, theme, preview = []) {
 
 // ../kit/src/picker/terminal.ts
 var PREVIEW_DELAY_MS = 120;
+var ESCAPE_WAIT_MS = 30;
 var OPEN = { ctrl: "open" };
 var HIDE_CURSOR = "\x1B[?25l";
 var SHOW_CURSOR = "\x1B[?25h";
@@ -1494,14 +1531,24 @@ function up(lines) {
   return lines > 0 ? `\x1B[${lines}A` : "";
 }
 function openTerminal() {
-  let input;
+  let mode;
   try {
-    input = new tty.ReadStream(openSync("/dev/tty", "r"));
+    mode = new tty.ReadStream(openSync("/dev/tty", "r"));
   } catch {
     return fail("no terminal to read keys from (/dev/tty)");
   }
+  const keys = Bun.file("/dev/tty").stream().getReader();
   const out = process14.stderr;
   let resize;
+  async function read(onChunk) {
+    const decoder = new TextDecoder;
+    try {
+      for (let chunk = await keys.read();!chunk.done; chunk = await keys.read())
+        onChunk(decoder.decode(chunk.value, { stream: true }));
+    } catch {
+      onChunk("\x03");
+    }
+  }
   return {
     get columns() {
       return out.columns || 80;
@@ -1513,17 +1560,18 @@ function openTerminal() {
     write: (text) => void out.write(text),
     listen(onChunk, onResize) {
       resize = onResize;
-      input.setRawMode(true);
+      mode.setRawMode(true);
       out.on("resize", onResize);
-      input.on("data", (chunk) => onChunk(chunk.toString()));
+      read(onChunk);
     },
     close() {
       if (resize !== undefined)
         out.off("resize", resize);
       try {
-        input.setRawMode(false);
+        mode.setRawMode(false);
       } finally {
-        input.destroy();
+        mode.destroy();
+        keys.cancel();
       }
     }
   };
@@ -1538,20 +1586,29 @@ async function select(rows, settings, terminal = openTerminal()) {
   let shownLine;
   let finish;
   let restored = false;
+  let escape;
+  let caret;
   function draw(clear = false) {
     if (restored)
       return;
     const layout = layoutFor({ columns: terminal.columns, rows: terminal.rows }, settings.height, settings.preview !== undefined, settings.previewPosition);
     let frame = HIDE_CURSOR;
     if (reserved !== layout.height || clear) {
+      frame += clear && caret !== undefined ? up(Math.floor((caret - 1) / terminal.columns)) : "";
       frame += CLEAR_BELOW + `
 `.repeat(layout.height - 1) + up(layout.height - 1);
       reserved = layout.height;
     }
+    caret = caretColumn(state, layout);
     frame += `\r${render(state, layout, theme, preview).map((line) => `\x1B[2K${line}`).join(`
-`)}${up(layout.height - 1)}\r\x1B[${caretColumn(state, layout)}G${SHOW_CURSOR}`;
+`)}${up(layout.height - 1)}\r\x1B[${caret}G${SHOW_CURSOR}`;
     terminal.write(frame);
   }
+  function pageSize() {
+    const headerLines = state.header === "" ? 0 : state.header.split(`
+`).length;
+    return Math.max(1, layoutFor({ columns: terminal.columns, rows: terminal.rows }, settings.height, settings.preview !== undefined, settings.previewPosition).listHeight - 2 - headerLines);
+  }
   function refreshPreview() {
     const at = highlighted(state);
     if (settings.preview === undefined || at === shownLine)
@@ -1581,6 +1638,7 @@ async function select(rows, settings, terminal = openTerminal()) {
       return;
     restored = true;
     clearTimeout(previewTimer);
+    clearTimeout(escape);
     previewing.abort();
     terminal.write(`${CLEAR_BELOW}${PASTE_OFF}${SHOW_CURSOR}`);
     terminal.close();
@@ -1619,7 +1677,7 @@ async function select(rows, settings, terminal = openTerminal()) {
         if (key === OPEN || typeof key === "object" && "ctrl" in key && key.ctrl === reload?.key)
           await reloadRows();
         else
-          state = press(state, key);
+          state = press({ ...state, page: pageSize() }, key);
       }
     } finally {
       draining = false;
@@ -1632,6 +1690,20 @@ async function select(rows, settings, terminal = openTerminal()) {
     draw();
   }
   function onChunk(chunk) {
+    if (escape !== undefined) {
+      clearTimeout(escape);
+      escape = undefined;
+      chunk = `\x1B${chunk}`;
+    } else if (chunk === "\x1B") {
+      escape = setTimeout(() => {
+        escape = undefined;
+        takeKeys("\x1B");
+      }, ESCAPE_WAIT_MS);
+      return;
+    }
+    takeKeys(chunk);
+  }
+  function takeKeys(chunk) {
     const keys = parseKeys(chunk, paste, [...settings.expect ?? [], ...reload?.key === undefined ? [] : [reload.key]]);
     if (busy && keys.includes("cancel")) {
       stop();
@@ -1738,11 +1810,9 @@ function list(rows) {
 
 // ../kit/src/prompt.ts
 import process16 from "process";
-var KEY_SEQUENCES2 = /\x1B\[[0-9;]*[A-Z~]|\x1BO[A-Z]|[\s\S]/giu;
-var CONTROL3 = /^[\x00-\x1F\x7F]/;
-var KEYS2 = { "\x1B[A": "up", "\x1BOA": "up", "\x1B[B": "down", "\x1BOB": "down", "\r": "enter", "\n": "enter", "\x03": "cancel", "\x1B": "cancel", "\x7F": "erase", "\b": "erase" };
-function readKeys(input) {
-  return (input.match(KEY_SEQUENCES2) ?? []).flatMap((sequence) => KEYS2[sequence] ?? (CONTROL3.test(sequence) ? [] : [{ text: sequence }]));
+var PROMPT_KEYS = new Set(["up", "down", "pageup", "pagedown", "home", "end", "enter", "cancel", "erase"]);
+function readKeys(input, paste = { active: false }) {
+  return parseKeys(input, paste).filter((key) => typeof key === "object" ? "text" in key : PROMPT_KEYS.has(key));
 }
 async function input2(question, { default: fallback, mask = false, validate, ...settings } = {}) {
   let value = "";
@@ -1781,22 +1851,29 @@ async function ask(question, { hint, terminal = process16 }, render, press) {
   if (!isInteractive(terminal))
     fail(`cannot ask "${question}" off a terminal`, 2, hint);
   const colors = paint(stderr);
-  let drawn = 0;
+  let drawn = [];
+  let current = "asking";
   let outcome;
+  const columns = () => stderr.columns || 80;
   const draw = (state) => {
-    const frame = render(colors, state, { columns: stderr.columns || 80, rows: stderr.rows || 24 });
-    stderr.write(`${drawn > 1 ? `\x1B[${drawn - 1}A` : ""}\r\x1B[0J${frame.join(`
+    const frame = render(colors, state, { columns: columns(), rows: stderr.rows || 24 });
+    const rows = drawn.reduce((sum, line) => sum + Math.max(1, Math.ceil(Bun.stringWidth(line) / columns())), 0);
+    stderr.write(`${rows > 1 ? `\x1B[${rows - 1}A` : ""}\r\x1B[0J${frame.join(`
 `)}`);
-    drawn = frame.length;
+    drawn = frame;
+    current = state;
   };
+  const redraw = () => draw(current);
+  const paste = { active: false };
   try {
+    stderr.on?.("resize", redraw);
     stdin.setRawMode(true);
     stdin.resume();
-    stderr.write("\x1B[?25l");
+    stderr.write("\x1B[?25l\x1B[?2004h");
     draw("asking");
     return await new Promise((resolve) => {
       function onData(data) {
-        for (const key of readKeys(data.toString())) {
+        for (const key of readKeys(data.toString(), paste)) {
           const pressed = press(key);
           if (pressed !== undefined) {
             settle(pressed);
@@ -1818,9 +1895,10 @@ async function ask(question, { hint, terminal = process16 }, render, press) {
       stdin.on("end", onEnd);
     });
   } finally {
+    stderr.off?.("resize", redraw);
     draw(outcome ?? "cancel");
     stderr.write(`
-\x1B[?25h`);
+\x1B[?25h\x1B[?2004l`);
     stdin.setRawMode(false);
     stdin.pause();
   }
@@ -2184,13 +2262,12 @@ class Redactor {
 var LABEL_FORMAT = ["project", "project.config_files", "project.environment_file", "project.working_dir"].map((label) => `{{.Label "com.docker.compose.${label}"}}`).join("\t");
 var COMPOSE_FILE_VAR = /^\s*(?:export\s+)?COMPOSE_FILE\s*=\s*\S/m;
 var COMPOSE_FILES = ["compose.yaml", "compose.yml", "docker-compose.yaml", "docker-compose.yml"];
-var SKIPPED2 = new Set(["node_modules", "vendor", "dist", "build", "target", "venv", "__pycache__"]);
 var ACTIONS = ["shell", "logs", "restart", "up", "stop", "build"];
 function from(dir, command) {
   return dir === "." ? command : ["env", "-C", dir, ...command];
 }
 function children(dir = ".") {
-  return readdirSync(dir, { withFileTypes: true }).filter((child) => child.isDirectory() && !child.name.startsWith(".") && !SKIPPED2.has(child.name)).map((child) => child.name).sort();
+  return readdirSync(dir, { withFileTypes: true }).filter((child) => child.isDirectory() && !child.name.startsWith(".") && !SKIPPED_FOLDERS.has(child.name)).map((child) => child.name).sort();
 }
 function up2(dir) {
   const dirs = [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/cli-docker",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "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.11.0",
-    "@kaynooo/cli-kit": "0.22.0"
+    "@kaynooo/cli-env": "0.12.0",
+    "@kaynooo/cli-kit": "0.27.1"
   }
 }

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()
 }