@kaynooo/cli-env 0.10.0 → 0.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ev.js +350 -103
- package/dist/redact.js +304 -73
- package/package.json +2 -2
- package/src/commands/audit.ts +5 -3
- package/src/commands/compare.ts +9 -3
- package/src/commands/read.ts +18 -4
package/dist/redact.js
CHANGED
|
@@ -2,16 +2,34 @@
|
|
|
2
2
|
// @bun
|
|
3
3
|
|
|
4
4
|
// src/redact.ts
|
|
5
|
-
import
|
|
5
|
+
import process15 from "process";
|
|
6
6
|
// ../kit/src/args.ts
|
|
7
|
-
import
|
|
7
|
+
import process10 from "process";
|
|
8
8
|
import { parseArgs } from "util";
|
|
9
9
|
|
|
10
10
|
// ../kit/src/format.ts
|
|
11
|
-
import
|
|
11
|
+
import process7 from "process";
|
|
12
12
|
|
|
13
|
-
// ../kit/src/
|
|
13
|
+
// ../kit/src/mode.ts
|
|
14
14
|
import process2 from "process";
|
|
15
|
+
var MODES = new Set(["terminal", "ci", "agent", "pipe"]);
|
|
16
|
+
var AGENT_VARIABLES = ["CLAUDECODE", "AI_AGENT"];
|
|
17
|
+
function isSet(value) {
|
|
18
|
+
return value !== undefined && value !== "" && value !== "0" && value.toLowerCase() !== "false";
|
|
19
|
+
}
|
|
20
|
+
function outputMode(stream = process2.stdout, env = process2.env) {
|
|
21
|
+
const chosen = env.KIT_MODE;
|
|
22
|
+
if (chosen !== undefined && MODES.has(chosen))
|
|
23
|
+
return chosen;
|
|
24
|
+
if (AGENT_VARIABLES.some((name) => isSet(env[name])))
|
|
25
|
+
return "agent";
|
|
26
|
+
if (stream.isTTY === true)
|
|
27
|
+
return "terminal";
|
|
28
|
+
return isSet(env.CI) ? "ci" : "pipe";
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
// ../kit/src/style.ts
|
|
32
|
+
import process6 from "process";
|
|
15
33
|
|
|
16
34
|
// ../../node_modules/.bun/@kaynooo+utils@2.31.2+d0769e28dc4dad16/node_modules/@kaynooo/utils/dist/chunk-mtetydvc.js
|
|
17
35
|
function x(s) {
|
|
@@ -274,36 +292,242 @@ function le(i = {}) {
|
|
|
274
292
|
}
|
|
275
293
|
var t = le();
|
|
276
294
|
|
|
277
|
-
// ../kit/src/
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
295
|
+
// ../kit/src/theme.ts
|
|
296
|
+
import { existsSync as existsSync2, readFileSync, statSync } from "fs";
|
|
297
|
+
import { homedir as homedir2 } from "os";
|
|
298
|
+
import { join as join3, resolve as resolve2 } from "path";
|
|
299
|
+
import process5 from "process";
|
|
300
|
+
|
|
301
|
+
// ../kit/src/config.ts
|
|
302
|
+
import { existsSync } from "fs";
|
|
303
|
+
import { dirname, join, resolve } from "path";
|
|
304
|
+
import process3 from "process";
|
|
305
|
+
function findUp(names, from = process3.cwd(), stop = () => false) {
|
|
306
|
+
const wanted = typeof names === "string" ? [names] : names;
|
|
307
|
+
for (let dir = resolve(from);; dir = dirname(dir)) {
|
|
308
|
+
const found = wanted.map((name) => join(dir, name)).find((path) => existsSync(path));
|
|
309
|
+
if (found !== undefined)
|
|
310
|
+
return found;
|
|
311
|
+
if (stop(dir) || dirname(dir) === dir)
|
|
312
|
+
return;
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
// ../kit/src/user-config.ts
|
|
317
|
+
import { homedir } from "os";
|
|
318
|
+
import { join as join2 } from "path";
|
|
319
|
+
import process4 from "process";
|
|
320
|
+
function configBase(where = {}) {
|
|
321
|
+
const xdg = where.xdg ?? (where.home === undefined ? process4.env.XDG_CONFIG_HOME : undefined);
|
|
322
|
+
return xdg !== undefined && xdg !== "" ? xdg : join2(where.home ?? homedir(), ".config");
|
|
323
|
+
}
|
|
324
|
+
function userConfigPath(bin, where = {}) {
|
|
325
|
+
return join2(configBase(where), "kaynooo-cli", `${bin}.json`);
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
// ../kit/src/theme.ts
|
|
329
|
+
var DEFAULT = {
|
|
330
|
+
colors: { accent: "cyan", id: "yellow", path: "blue", label: "dim", value: "bold", ok: "green", warn: "yellow", problem: "red", note: "dim", passed: "green", failed: "red", running: "cyan", queued: "yellow", skipped: "dim" },
|
|
331
|
+
glyphs: { ok: "\u2713", warn: "\u25B2", problem: "\u2717", note: "\u203A", passed: "\u2713", failed: "\u2717", running: "\u25CF", queued: "\u25CB", skipped: "-", bar: "\u2501" },
|
|
332
|
+
accents: ["cyan", "magenta", "green", "blue", "yellow", "redBright"],
|
|
333
|
+
bins: {}
|
|
334
|
+
};
|
|
335
|
+
var BRIGHT = { accent: "cyanBright", id: "yellowBright", path: "blueBright", label: "white", value: "bold whiteBright", ok: "greenBright", warn: "yellowBright", problem: "redBright", note: "white", passed: "greenBright", failed: "redBright", running: "cyanBright", queued: "yellowBright", skipped: "white" };
|
|
336
|
+
var MONO = { accent: "bold", id: "bold", path: "underline", label: "dim", value: "bold", ok: "bold", warn: "bold", problem: "bold", note: "dim", passed: "bold", failed: "bold", running: "bold", queued: "dim", skipped: "dim" };
|
|
337
|
+
var ASCII = { ok: "+", warn: "!", problem: "x", note: ">", passed: "+", failed: "x", running: "*", queued: "o", skipped: "-", bar: "#" };
|
|
338
|
+
var PRESETS = {
|
|
339
|
+
default: {},
|
|
340
|
+
"high-contrast": { colors: BRIGHT, accents: ["cyanBright", "magentaBright", "greenBright", "blueBright", "yellowBright", "redBright"] },
|
|
341
|
+
mono: { colors: MONO, accents: ["bold"] },
|
|
342
|
+
ascii: { glyphs: ASCII }
|
|
283
343
|
};
|
|
284
|
-
|
|
285
|
-
|
|
344
|
+
var STYLES = new Set(["bold", "dim", "italic", "underline", "inverse", "strikethrough", "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white", "gray", "grey", "blackBright", "redBright", "greenBright", "yellowBright", "blueBright", "magentaBright", "cyanBright", "whiteBright"]);
|
|
345
|
+
var HEX = /^#[0-9a-f]{6}$/i;
|
|
346
|
+
var CONTROL = /\p{Cc}/u;
|
|
347
|
+
var MAX_FILE_BYTES = 64 * 1024;
|
|
348
|
+
var SPACES = /\s+/;
|
|
349
|
+
function isColorSpec(spec) {
|
|
350
|
+
if (typeof spec === "number")
|
|
351
|
+
return Number.isInteger(spec) && spec >= 0 && spec <= 255;
|
|
352
|
+
return typeof spec === "string" && spec.trim() !== "" && spec.trim().split(SPACES).every((token) => STYLES.has(token) || HEX.test(token));
|
|
353
|
+
}
|
|
354
|
+
var CUBE = [0, 95, 135, 175, 215, 255];
|
|
355
|
+
function cubeLevel(channel) {
|
|
356
|
+
return CUBE.reduce((best, value, level) => Math.abs(value - channel) < Math.abs(CUBE[best] - channel) ? level : best, 0);
|
|
357
|
+
}
|
|
358
|
+
function nearest256(hex) {
|
|
359
|
+
const rgb = [1, 3, 5].map((at) => Number.parseInt(hex.slice(at, at + 2), 16));
|
|
360
|
+
const levels = rgb.map(cubeLevel);
|
|
361
|
+
const cube = levels.map((level) => CUBE[level]);
|
|
362
|
+
const grey = Math.min(23, Math.max(0, Math.round((rgb.reduce((sum, channel) => sum + channel, 0) / 3 - 8) / 10)));
|
|
363
|
+
const greyValue = 8 + grey * 10;
|
|
364
|
+
const distance = (colour) => colour.reduce((sum, channel, at) => sum + (channel - rgb[at]) ** 2, 0);
|
|
365
|
+
return distance([greyValue, greyValue, greyValue]) < distance(cube) ? 232 + grey : 16 + 36 * levels[0] + 6 * levels[1] + levels[2];
|
|
366
|
+
}
|
|
367
|
+
function hasTrueColor(env) {
|
|
368
|
+
return env.COLORTERM === "truecolor" || env.COLORTERM === "24bit";
|
|
369
|
+
}
|
|
370
|
+
function tinted(colors, spec, env = process5.env) {
|
|
371
|
+
if (typeof spec === "number")
|
|
372
|
+
return colors.ansi256(spec);
|
|
373
|
+
return spec.trim().split(SPACES).reduce((chain, token) => {
|
|
374
|
+
if (HEX.test(token))
|
|
375
|
+
return hasTrueColor(env) ? chain.hex(token) : chain.ansi256(nearest256(token));
|
|
376
|
+
return chain[token] ?? chain;
|
|
377
|
+
}, colors);
|
|
378
|
+
}
|
|
379
|
+
function isRecord(value) {
|
|
380
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
381
|
+
}
|
|
382
|
+
function readThemeFile(path, warn) {
|
|
383
|
+
try {
|
|
384
|
+
const stat = statSync(path, { throwIfNoEntry: false });
|
|
385
|
+
if (stat === undefined)
|
|
386
|
+
return;
|
|
387
|
+
if (!stat.isFile() || stat.size > MAX_FILE_BYTES) {
|
|
388
|
+
warn(`${path} is not a regular file under ${MAX_FILE_BYTES / 1024} KiB, theme ignored`);
|
|
389
|
+
return;
|
|
390
|
+
}
|
|
391
|
+
const parsed = JSON.parse(readFileSync(path, "utf8"));
|
|
392
|
+
if (isRecord(parsed))
|
|
393
|
+
return parsed;
|
|
394
|
+
warn(`${path} is not a JSON object, theme ignored`);
|
|
395
|
+
} catch (error) {
|
|
396
|
+
warn(`${path} does not parse (${error instanceof Error ? error.message : String(error)}), theme ignored`);
|
|
397
|
+
}
|
|
398
|
+
return;
|
|
286
399
|
}
|
|
287
|
-
function
|
|
400
|
+
function applyPreset(theme, name, warn, where) {
|
|
401
|
+
if (name === undefined)
|
|
402
|
+
return;
|
|
403
|
+
if (typeof name !== "string" || !Object.hasOwn(PRESETS, name)) {
|
|
404
|
+
warn(`${where}: no preset ${String(name)}, one of ${Object.keys(PRESETS).join(", ")}`);
|
|
405
|
+
return;
|
|
406
|
+
}
|
|
407
|
+
const preset = PRESETS[name];
|
|
408
|
+
Object.assign(theme.colors, preset.colors);
|
|
409
|
+
Object.assign(theme.glyphs, preset.glyphs);
|
|
410
|
+
if (preset.accents !== undefined)
|
|
411
|
+
theme.accents = [...preset.accents];
|
|
412
|
+
return name;
|
|
413
|
+
}
|
|
414
|
+
function applyFile(theme, file, where, warn) {
|
|
415
|
+
if (isRecord(file.colors)) {
|
|
416
|
+
for (const [key, value] of Object.entries(file.colors)) {
|
|
417
|
+
if (!Object.hasOwn(DEFAULT.colors, key))
|
|
418
|
+
warn(`${where}: no colour ${key}, one of ${Object.keys(DEFAULT.colors).join(", ")}`);
|
|
419
|
+
else if (!isColorSpec(value))
|
|
420
|
+
warn(`${where}: colour ${key} is not an ANSI name, \`#rrggbb\` or a number up to 255`);
|
|
421
|
+
else
|
|
422
|
+
theme.colors[key] = value;
|
|
423
|
+
}
|
|
424
|
+
}
|
|
425
|
+
if (isRecord(file.glyphs)) {
|
|
426
|
+
for (const [key, value] of Object.entries(file.glyphs)) {
|
|
427
|
+
if (!Object.hasOwn(DEFAULT.glyphs, key))
|
|
428
|
+
warn(`${where}: no glyph ${key}, one of ${Object.keys(DEFAULT.glyphs).join(", ")}`);
|
|
429
|
+
else if (typeof value !== "string" || CONTROL.test(value) || Bun.stringWidth(value) !== 1)
|
|
430
|
+
warn(`${where}: glyph ${key} must be one visible character wide, with no control character`);
|
|
431
|
+
else
|
|
432
|
+
theme.glyphs[key] = value;
|
|
433
|
+
}
|
|
434
|
+
}
|
|
435
|
+
if (Array.isArray(file.accents) && file.accents.length > 0 && file.accents.every(isColorSpec))
|
|
436
|
+
theme.accents = [...file.accents];
|
|
437
|
+
else if (file.accents !== undefined)
|
|
438
|
+
warn(`${where}: accents must be a non-empty list of colours`);
|
|
439
|
+
if (isRecord(file.bins)) {
|
|
440
|
+
for (const [bin, value] of Object.entries(file.bins)) {
|
|
441
|
+
if (isColorSpec(value))
|
|
442
|
+
theme.bins[bin] = value;
|
|
443
|
+
else
|
|
444
|
+
warn(`${where}: bin ${bin} has no valid colour`);
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
function endsWalk(home) {
|
|
449
|
+
return (dir) => dir === resolve2(home) || existsSync2(join3(dir, ".git"));
|
|
450
|
+
}
|
|
451
|
+
var warned = new Set;
|
|
452
|
+
function warnOnce(message) {
|
|
453
|
+
if (warned.has(message))
|
|
454
|
+
return;
|
|
455
|
+
warned.add(message);
|
|
456
|
+
console.error(`warning: theme ${message}`);
|
|
457
|
+
}
|
|
458
|
+
function isPath(chosen) {
|
|
459
|
+
return chosen.includes("/") || chosen.endsWith(".json");
|
|
460
|
+
}
|
|
461
|
+
function loadTheme({ env = process5.env, from = process5.cwd(), home = homedir2(), warn = warnOnce } = {}) {
|
|
462
|
+
const theme = { colors: { ...DEFAULT.colors }, glyphs: { ...DEFAULT.glyphs }, accents: [...DEFAULT.accents], bins: Object.create(null) };
|
|
463
|
+
const sources = [];
|
|
464
|
+
const chosen = env.KIT_THEME ?? "";
|
|
465
|
+
const wanted = chosen === "" ? [userConfigPath("theme", { home, xdg: env.XDG_CONFIG_HOME }), findUp(join3(".kaynooo", "theme.json"), from, endsWalk(home))] : [];
|
|
466
|
+
if (isPath(chosen))
|
|
467
|
+
wanted.push(resolve2(from, chosen));
|
|
468
|
+
const files = [];
|
|
469
|
+
for (const path of wanted) {
|
|
470
|
+
const file = path === undefined ? undefined : readThemeFile(path, warn);
|
|
471
|
+
if (path !== undefined && file !== undefined)
|
|
472
|
+
files.push({ path, file });
|
|
473
|
+
}
|
|
474
|
+
let preset = "default";
|
|
475
|
+
if (chosen !== "" && !isPath(chosen)) {
|
|
476
|
+
preset = applyPreset(theme, chosen, warn, "KIT_THEME") ?? preset;
|
|
477
|
+
} else {
|
|
478
|
+
const named = files.findLast(({ file }) => file.preset !== undefined);
|
|
479
|
+
if (named !== undefined)
|
|
480
|
+
preset = applyPreset(theme, named.file.preset, warn, named.path) ?? preset;
|
|
481
|
+
}
|
|
482
|
+
for (const { path, file } of files) {
|
|
483
|
+
applyFile(theme, file, path, warn);
|
|
484
|
+
sources.push(path);
|
|
485
|
+
}
|
|
486
|
+
return { theme, sources, preset };
|
|
487
|
+
}
|
|
488
|
+
var current;
|
|
489
|
+
var currentKey = "";
|
|
490
|
+
function activeTheme() {
|
|
491
|
+
const key = `${process5.cwd()}\x00${process5.env.KIT_THEME ?? ""}\x00${process5.env.XDG_CONFIG_HOME ?? ""}`;
|
|
492
|
+
if (current === undefined || key !== currentKey) {
|
|
493
|
+
current = loadTheme();
|
|
494
|
+
currentKey = key;
|
|
495
|
+
}
|
|
496
|
+
return current;
|
|
497
|
+
}
|
|
498
|
+
|
|
499
|
+
// ../kit/src/style.ts
|
|
500
|
+
var MARK_WORDS = { ok: "ok:", warn: "warning:", problem: "error:", note: "note:" };
|
|
501
|
+
function takesControlCodes(stream, env = process6.env) {
|
|
502
|
+
return stream.isTTY === true && env.NO_COLOR === undefined && env.NODE_DISABLE_COLORS === undefined && env.TERM !== "dumb" && outputMode(stream, env) === "terminal";
|
|
503
|
+
}
|
|
504
|
+
function paint(stream, env = process6.env) {
|
|
288
505
|
return le({ stream: { isTTY: takesControlCodes(stream, env) }, env });
|
|
289
506
|
}
|
|
290
|
-
function marked(mark, text, stream, detail, env =
|
|
507
|
+
function marked(mark, text, stream, detail, env = process6.env) {
|
|
291
508
|
const colors = paint(stream, env);
|
|
292
|
-
|
|
293
|
-
|
|
509
|
+
let head = MARK_WORDS[mark];
|
|
510
|
+
if (takesControlCodes(stream, env)) {
|
|
511
|
+
const { theme } = activeTheme();
|
|
512
|
+
head = tinted(colors.bold, theme.colors[mark], env)(theme.glyphs[mark]);
|
|
513
|
+
}
|
|
294
514
|
return `${head} ${text}${detail === undefined ? "" : ` ${colors.dim(detail)}`}`;
|
|
295
515
|
}
|
|
296
516
|
function ok(text, detail) {
|
|
297
|
-
console.log(marked("ok", text,
|
|
298
|
-
}
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
517
|
+
console.log(marked("ok", text, process6.stdout, detail));
|
|
518
|
+
}
|
|
519
|
+
function role(name, stream, env = process6.env) {
|
|
520
|
+
const colors = paint(stream, env);
|
|
521
|
+
return takesControlCodes(stream, env) ? tinted(colors, activeTheme().theme.colors[name], env) : colors;
|
|
522
|
+
}
|
|
523
|
+
var STATUS_WORDS = {
|
|
524
|
+
passed: ["passed", "success", "succeeded", "ok"],
|
|
525
|
+
failed: ["failed", "failure", "error", "errored"],
|
|
526
|
+
running: ["running", "in_progress", "started", "holding"],
|
|
527
|
+
queued: ["queued", "waiting", "pending", "created", "blocked", "scheduled"],
|
|
528
|
+
skipped: ["skipped", "cancelled", "canceled", "manual"]
|
|
305
529
|
};
|
|
306
|
-
var STATUS_OF = new Map(Object.entries(
|
|
530
|
+
var STATUS_OF = new Map(Object.entries(STATUS_WORDS).flatMap(([status, words]) => words.map((word) => [word, status])));
|
|
307
531
|
|
|
308
532
|
// ../kit/src/format.ts
|
|
309
533
|
function upTo(text, separator) {
|
|
@@ -318,15 +542,18 @@ var ESCAPE = String.fromCharCode(27);
|
|
|
318
542
|
function textWidth(text) {
|
|
319
543
|
return Bun.stringWidth(text);
|
|
320
544
|
}
|
|
321
|
-
function table(rows, { cellWidth, header = false, align = [], fit } = {}) {
|
|
545
|
+
function table(rows, { cellWidth, header = false, align = [], fit, stream = process7.stdout, env = process7.env } = {}) {
|
|
322
546
|
const cells = cellWidth === undefined ? rows : rows.map((row) => row.map((cell) => truncate(cell.replaceAll(LINE_BREAKS, " "), cellWidth)));
|
|
547
|
+
if (outputMode(stream, env) === "agent")
|
|
548
|
+
return cells.map((row) => row.map((cell) => Bun.stripANSI(cell).replaceAll(/[\t\r\n]+/g, " ")).join("\t")).join(`
|
|
549
|
+
`);
|
|
323
550
|
const widths = [];
|
|
324
551
|
for (const row of cells) {
|
|
325
552
|
for (const [index, cell] of row.entries())
|
|
326
553
|
widths[index] = Math.max(widths[index] ?? 0, textWidth(cell));
|
|
327
554
|
}
|
|
328
555
|
const shown = fit === undefined ? cells : narrow(cells, widths, fit);
|
|
329
|
-
const colors = paint(
|
|
556
|
+
const colors = paint(stream);
|
|
330
557
|
const lines = shown.map((row) => row.map((cell, index) => {
|
|
331
558
|
const width = widths[index] ?? 0;
|
|
332
559
|
const gap = " ".repeat(Math.max(0, width - textWidth(cell)));
|
|
@@ -334,7 +561,8 @@ function table(rows, { cellWidth, header = false, align = [], fit } = {}) {
|
|
|
334
561
|
return `${gap}${cell}`;
|
|
335
562
|
return index === row.length - 1 ? cell : `${cell}${gap}`;
|
|
336
563
|
}).join(" ").trimEnd());
|
|
337
|
-
|
|
564
|
+
const rule = header && takesControlCodes(stream) && lines.length > 1 ? [colors.dim("\u2500".repeat(Math.max(...lines.map(textWidth))))] : [];
|
|
565
|
+
return lines.flatMap((line, index) => header && index === 0 ? [colors.bold(line), ...rule] : [line]).join(`
|
|
338
566
|
`);
|
|
339
567
|
}
|
|
340
568
|
function narrow(rows, widths, limit) {
|
|
@@ -353,32 +581,35 @@ function narrow(rows, widths, limit) {
|
|
|
353
581
|
}
|
|
354
582
|
return rows.map((row) => row.map((cell, index) => textWidth(cell) > (widths[index] ?? 0) ? truncate(cell, widths[index] ?? 0) : cell));
|
|
355
583
|
}
|
|
584
|
+
function jsonText(value, replacer, { stream = process7.stdout, env = process7.env } = {}) {
|
|
585
|
+
return JSON.stringify(value, replacer, outputMode(stream, env) === "agent" ? undefined : 2);
|
|
586
|
+
}
|
|
356
587
|
function printJson(value) {
|
|
357
|
-
console.log(
|
|
588
|
+
console.log(jsonText(value));
|
|
358
589
|
}
|
|
359
590
|
|
|
360
591
|
// ../kit/src/help.ts
|
|
361
|
-
import
|
|
592
|
+
import process8 from "process";
|
|
362
593
|
var OPTIONAL = /\[[^\]]+\]/g;
|
|
363
594
|
var USAGE_PREFIX = /^usage:\s*/i;
|
|
364
595
|
var FULL_STOP = /\.$/;
|
|
365
|
-
function usageLine(usage, colors = paint(
|
|
596
|
+
function usageLine(usage, colors = paint(process8.stdout)) {
|
|
366
597
|
return `${colors.bold("Usage:")} ${usage.replace(USAGE_PREFIX, "").replaceAll(OPTIONAL, (part) => colors.dim(part))}`;
|
|
367
598
|
}
|
|
368
|
-
function helpText(usage, options, colors = paint(
|
|
599
|
+
function helpText(usage, options, colors = paint(process8.stdout), { examples = [], replaces, exits = [] } = {}) {
|
|
369
600
|
return [usageLine(usage, colors), ...replacesRows(replaces, colors), "", colors.bold("Options:"), ...optionRows(options, colors), ...exitRows(exits, colors), ...exampleRows(examples, colors)].join(`
|
|
370
601
|
`);
|
|
371
602
|
}
|
|
372
|
-
function exitRows(exits, colors = paint(
|
|
603
|
+
function exitRows(exits, colors = paint(process8.stdout)) {
|
|
373
604
|
if (exits.length === 0)
|
|
374
605
|
return [];
|
|
375
606
|
const width = Math.max(...exits.map(([code]) => String(code).length));
|
|
376
607
|
return ["", colors.bold("Exits:"), ...exits.map(([code, meaning]) => ` ${colors.cyan(String(code).padEnd(width))} ${meaning}`)];
|
|
377
608
|
}
|
|
378
|
-
function replacesRows(replaces, colors = paint(
|
|
379
|
-
return replaces === undefined ? [] : ["", `${colors.bold("Instead of:")} ${replaces}`];
|
|
609
|
+
function replacesRows(replaces, colors = paint(process8.stdout)) {
|
|
610
|
+
return replaces === undefined || outputMode() === "agent" ? [] : ["", `${colors.bold("Instead of:")} ${replaces}`];
|
|
380
611
|
}
|
|
381
|
-
function wantsHelpJson(env =
|
|
612
|
+
function wantsHelpJson(env = process8.env) {
|
|
382
613
|
return env.KIT_HELP === "json";
|
|
383
614
|
}
|
|
384
615
|
function description(usage, { examples = [], replaces, exits } = {}, options) {
|
|
@@ -397,12 +628,12 @@ function description(usage, { examples = [], replaces, exits } = {}, options) {
|
|
|
397
628
|
...options === undefined ? {} : { options: Object.entries(options).map(([name, { short, description }]) => ({ name, ...short === undefined ? {} : { short }, ...description === undefined ? {} : { description } })) }
|
|
398
629
|
};
|
|
399
630
|
}
|
|
400
|
-
function exampleRows(examples, colors = paint(
|
|
401
|
-
if (examples.length === 0)
|
|
631
|
+
function exampleRows(examples, colors = paint(process8.stdout)) {
|
|
632
|
+
if (examples.length === 0 || outputMode() === "agent")
|
|
402
633
|
return [];
|
|
403
634
|
return ["", colors.bold("Examples:"), ...examples.map((example) => typeof example === "string" ? ` ${example}` : ` ${example[0]} ${colors.dim(`# ${example[1]}`)}`)];
|
|
404
635
|
}
|
|
405
|
-
function optionRows(options, colors = paint(
|
|
636
|
+
function optionRows(options, colors = paint(process8.stdout)) {
|
|
406
637
|
const rows = Object.entries(options).map(([name, option]) => {
|
|
407
638
|
const short = option.short === undefined ? " " : `${colors.cyan(`-${option.short}`)}, `;
|
|
408
639
|
const named = option.choices === undefined ? "<value>" : `<${option.choices.join("|")}>`;
|
|
@@ -434,10 +665,10 @@ function closest(name, names) {
|
|
|
434
665
|
return best !== undefined && best.far <= (name.length < 4 ? 1 : 2) ? best.known : undefined;
|
|
435
666
|
}
|
|
436
667
|
// ../kit/src/input.ts
|
|
437
|
-
import
|
|
668
|
+
import process9 from "process";
|
|
438
669
|
async function readInput(path, { noStdin = "nothing is piped on stdin" } = {}) {
|
|
439
670
|
if (path === "-") {
|
|
440
|
-
if (
|
|
671
|
+
if (process9.stdin.isTTY)
|
|
441
672
|
fail(noStdin);
|
|
442
673
|
return Bun.stdin.text();
|
|
443
674
|
}
|
|
@@ -496,7 +727,7 @@ var OUTPUT_OPTIONS = {
|
|
|
496
727
|
color: { type: "string", description: "auto (on a terminal alone), always or never" },
|
|
497
728
|
plain: { type: "boolean", description: "plain text, no colour or spinner: --color never" }
|
|
498
729
|
};
|
|
499
|
-
function applyOutput(color, plain, env =
|
|
730
|
+
function applyOutput(color, plain, env = process10.env) {
|
|
500
731
|
const when = plain === true ? "never" : color ?? "auto";
|
|
501
732
|
if (when === "auto")
|
|
502
733
|
return;
|
|
@@ -671,15 +902,15 @@ var ESCAPE_CODE = new RegExp(`${ESC}(?:\\[[\\x30-\\x3F]*[\\x20-\\x2F]*[\\x40-\\x
|
|
|
671
902
|
var RESET_STYLE = `${ESC}[0m`;
|
|
672
903
|
var CLOSE_LINK = `${ESC}]8;;${ESC}\\`;
|
|
673
904
|
// ../kit/src/cli.ts
|
|
674
|
-
import { readFileSync, realpathSync } from "fs";
|
|
675
|
-
import { dirname as
|
|
676
|
-
import
|
|
905
|
+
import { readFileSync as readFileSync2, realpathSync } from "fs";
|
|
906
|
+
import { dirname as dirname3, join as join5 } from "path";
|
|
907
|
+
import process12 from "process";
|
|
677
908
|
|
|
678
909
|
// ../kit/src/usage.ts
|
|
679
910
|
import { appendFileSync, mkdirSync } from "fs";
|
|
680
|
-
import { homedir } from "os";
|
|
681
|
-
import { dirname, isAbsolute, join } from "path";
|
|
682
|
-
import
|
|
911
|
+
import { homedir as homedir3 } from "os";
|
|
912
|
+
import { dirname as dirname2, isAbsolute, join as join4 } from "path";
|
|
913
|
+
import process11 from "process";
|
|
683
914
|
|
|
684
915
|
// ../kit/src/logs.ts
|
|
685
916
|
var DAY_MS = 24 * 60 * 60 * 1000;
|
|
@@ -693,14 +924,14 @@ var usageError;
|
|
|
693
924
|
function noteUsageError(message) {
|
|
694
925
|
usageError = message;
|
|
695
926
|
}
|
|
696
|
-
function stateHome(env =
|
|
927
|
+
function stateHome(env = process11.env) {
|
|
697
928
|
const dir = env.XDG_STATE_HOME;
|
|
698
|
-
return dir !== undefined && isAbsolute(dir) ? dir :
|
|
929
|
+
return dir !== undefined && isAbsolute(dir) ? dir : join4(homedir3(), ".local", "state");
|
|
699
930
|
}
|
|
700
|
-
function usagePath(env =
|
|
701
|
-
return
|
|
931
|
+
function usagePath(env = process11.env) {
|
|
932
|
+
return join4(stateHome(env), CLI_FOLDER, "usage.jsonl");
|
|
702
933
|
}
|
|
703
|
-
function usageRecorded(env =
|
|
934
|
+
function usageRecorded(env = process11.env) {
|
|
704
935
|
const off = env.KAYNOOO_CLI_NO_USAGE;
|
|
705
936
|
return env.NODE_ENV !== "test" && (off === undefined || off === "" || off === "0");
|
|
706
937
|
}
|
|
@@ -714,12 +945,12 @@ function usageEntry(bin, command, argv, code, now = new Date) {
|
|
|
714
945
|
usageError = undefined;
|
|
715
946
|
return { at: now.toISOString(), bin, ...command === undefined ? {} : { command }, flags: flagNames(argv), code, ...unknown === undefined ? {} : { unknown } };
|
|
716
947
|
}
|
|
717
|
-
function recordUsage(entry, env =
|
|
948
|
+
function recordUsage(entry, env = process11.env) {
|
|
718
949
|
if (!usageRecorded(env))
|
|
719
950
|
return;
|
|
720
951
|
try {
|
|
721
952
|
const path = usagePath(env);
|
|
722
|
-
mkdirSync(
|
|
953
|
+
mkdirSync(dirname2(path), { recursive: true, mode: 448 });
|
|
723
954
|
appendFileSync(path, `${JSON.stringify(entry)}
|
|
724
955
|
`, { mode: 384 });
|
|
725
956
|
} catch {}
|
|
@@ -805,8 +1036,8 @@ async function help2({ path, header, summary: lazySummary, commands, defaultComm
|
|
|
805
1036
|
`);
|
|
806
1037
|
}
|
|
807
1038
|
function printError(prefix, message, hint, cause) {
|
|
808
|
-
const colors = paint(
|
|
809
|
-
const styled = takesControlCodes(
|
|
1039
|
+
const colors = paint(process12.stderr);
|
|
1040
|
+
const styled = takesControlCodes(process12.stderr);
|
|
810
1041
|
const head = styled ? `${colors.red.bold("error")} ${colors.dim(`${prefix}:`)}` : `error: ${prefix}:`;
|
|
811
1042
|
const under = (label, text, tint) => text === undefined ? "" : `
|
|
812
1043
|
${styled ? tint(label) : `${label}:`} ${text}`;
|
|
@@ -849,11 +1080,11 @@ async function dispatch(level, typed, { version, redact }) {
|
|
|
849
1080
|
}
|
|
850
1081
|
}
|
|
851
1082
|
if (name === undefined && level.path.length > 1) {
|
|
852
|
-
console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]),
|
|
1083
|
+
console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process12.stderr));
|
|
853
1084
|
return 2;
|
|
854
1085
|
}
|
|
855
1086
|
if (name === undefined || name === "help" || name === "--help" || name === "-h") {
|
|
856
|
-
console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]),
|
|
1087
|
+
console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process12.stdout));
|
|
857
1088
|
return 0;
|
|
858
1089
|
}
|
|
859
1090
|
if (level.path.length === 1 && (name === "--version" || name === "-v")) {
|
|
@@ -970,17 +1201,17 @@ async function printCandidates(found) {
|
|
|
970
1201
|
return 0;
|
|
971
1202
|
}
|
|
972
1203
|
function packageVersion(entry = Bun.main) {
|
|
973
|
-
for (let dir =
|
|
1204
|
+
for (let dir = dirname3(realpathSync(entry));; dir = dirname3(dir)) {
|
|
974
1205
|
try {
|
|
975
|
-
const { version } = JSON.parse(
|
|
1206
|
+
const { version } = JSON.parse(readFileSync2(join5(dir, "package.json"), "utf8"));
|
|
976
1207
|
if (typeof version === "string")
|
|
977
1208
|
return version;
|
|
978
1209
|
} catch {}
|
|
979
|
-
if (
|
|
1210
|
+
if (dirname3(dir) === dir)
|
|
980
1211
|
return "0.0.0";
|
|
981
1212
|
}
|
|
982
1213
|
}
|
|
983
|
-
async function runCli(cli, argv =
|
|
1214
|
+
async function runCli(cli, argv = process12.argv.slice(2)) {
|
|
984
1215
|
const version = cli.version ?? packageVersion();
|
|
985
1216
|
if (argv[0] === COMPLETE)
|
|
986
1217
|
return printCandidates(candidates(scopeOf(cli.commands, cli.extraCommands, cli.aliases), cli.defaultCommand, argv.slice(1)));
|
|
@@ -1007,7 +1238,7 @@ function commandPath(scope, argv) {
|
|
|
1007
1238
|
}
|
|
1008
1239
|
return path.length === 0 ? undefined : path.join(" ");
|
|
1009
1240
|
}
|
|
1010
|
-
async function runMain({ name, version, run, redact, usage }, argv =
|
|
1241
|
+
async function runMain({ name, version, run, redact, usage }, argv = process12.argv.slice(2)) {
|
|
1011
1242
|
if (argv[0] === COMPLETE)
|
|
1012
1243
|
return printCandidates(leafCandidates(run, argv.slice(1)));
|
|
1013
1244
|
if (argv.length === 1 && (argv[0] === "--version" || argv[0] === "-v")) {
|
|
@@ -1048,11 +1279,11 @@ var {Glob } = globalThis.Bun;
|
|
|
1048
1279
|
var SESSION_FILES = new Glob("*.json");
|
|
1049
1280
|
var ACCOUNT_DIRS = new Glob("*/sessions");
|
|
1050
1281
|
// src/commands/redact.ts
|
|
1051
|
-
import
|
|
1282
|
+
import process14 from "process";
|
|
1052
1283
|
|
|
1053
1284
|
// src/files.ts
|
|
1054
1285
|
import { chmod, chown, readdir, realpath, rename, rm, stat, writeFile } from "fs/promises";
|
|
1055
|
-
import { basename, dirname as
|
|
1286
|
+
import { basename, dirname as dirname4, join as join6 } from "path";
|
|
1056
1287
|
|
|
1057
1288
|
// src/dotenv.ts
|
|
1058
1289
|
var ASSIGNMENT = /^\s*(?:export\s+)?([A-Z_][\w.-]*)\s*=(.*)$/i;
|
|
@@ -1364,7 +1595,7 @@ async function envFiles(folder = process.cwd()) {
|
|
|
1364
1595
|
const found = await readdir(folder, { withFileTypes: true });
|
|
1365
1596
|
const names = [];
|
|
1366
1597
|
for (const entry of found) {
|
|
1367
|
-
if (ENV_FILE.test(entry.name) && await isFileEntry(entry,
|
|
1598
|
+
if (ENV_FILE.test(entry.name) && await isFileEntry(entry, join6(folder, entry.name)))
|
|
1368
1599
|
names.push(entry.name);
|
|
1369
1600
|
}
|
|
1370
1601
|
return names.sort();
|
|
@@ -1388,7 +1619,7 @@ async function writeAtomic(path, text) {
|
|
|
1388
1619
|
if (error.code !== "ENOENT")
|
|
1389
1620
|
throw error;
|
|
1390
1621
|
}
|
|
1391
|
-
const temp =
|
|
1622
|
+
const temp = join6(dirname4(target), `.${basename(target)}.${process.pid}.${crypto.randomUUID()}.tmp`);
|
|
1392
1623
|
try {
|
|
1393
1624
|
await writeFile(temp, text, { mode: 384, flag: "wx" });
|
|
1394
1625
|
if (owner !== undefined)
|
|
@@ -1444,7 +1675,7 @@ async function acquire(path) {
|
|
|
1444
1675
|
try {
|
|
1445
1676
|
real = await realpath(path);
|
|
1446
1677
|
} catch {}
|
|
1447
|
-
const lock =
|
|
1678
|
+
const lock = join6(dirname4(real), `.${basename(real)}.lock`);
|
|
1448
1679
|
const deadline = Date.now() + LOCK_WAIT_MS;
|
|
1449
1680
|
while (true) {
|
|
1450
1681
|
try {
|
|
@@ -1479,7 +1710,7 @@ async function envFilesBelow(folder, depth = 0) {
|
|
|
1479
1710
|
return found;
|
|
1480
1711
|
}
|
|
1481
1712
|
for (const entry of children) {
|
|
1482
|
-
const path =
|
|
1713
|
+
const path = join6(folder, entry.name);
|
|
1483
1714
|
if (entry.isDirectory() && depth < KNOWN_DEPTH && !SKIPPED.has(entry.name))
|
|
1484
1715
|
found.push(...await envFilesBelow(path, depth + 1));
|
|
1485
1716
|
else if (ENV_FILE.test(entry.name) && await isFileEntry(entry, path))
|
|
@@ -1635,10 +1866,10 @@ async function redact(args) {
|
|
|
1635
1866
|
const redactor = new Redactor(known);
|
|
1636
1867
|
const decoder = new TextDecoder;
|
|
1637
1868
|
for await (const chunk of Bun.stdin.stream())
|
|
1638
|
-
|
|
1639
|
-
|
|
1869
|
+
process14.stdout.write(redactor.push(decoder.decode(chunk, { stream: true })));
|
|
1870
|
+
process14.stdout.write(redactor.push(decoder.decode()) + redactor.end());
|
|
1640
1871
|
return 0;
|
|
1641
1872
|
}
|
|
1642
1873
|
|
|
1643
1874
|
// src/redact.ts
|
|
1644
|
-
|
|
1875
|
+
process15.exitCode = await runMain({ name: "redact", run: redact });
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kaynooo/cli-env",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.12.0",
|
|
5
5
|
"description": "ev lists and edits .env files with secrets masked, redact masks secrets in any piped output.",
|
|
6
6
|
"author": "Kaynooo <contact@kaynooo.fr>",
|
|
7
7
|
"license": "MIT",
|
|
@@ -37,6 +37,6 @@
|
|
|
37
37
|
"redact": "$npm_execpath src/redact.ts"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@kaynooo/cli-kit": "0.
|
|
40
|
+
"@kaynooo/cli-kit": "0.22.0"
|
|
41
41
|
}
|
|
42
42
|
}
|
package/src/commands/audit.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { ComposeFix } from '../fix'
|
|
|
3
3
|
import { stat } from 'node:fs/promises'
|
|
4
4
|
import { relative, resolve } from 'node:path'
|
|
5
5
|
import process from 'node:process'
|
|
6
|
-
import { fail, jsonOption, parse, printJson } from '@kaynooo/cli-kit'
|
|
6
|
+
import { fail, jsonOption, parse, printJson, role } from '@kaynooo/cli-kit'
|
|
7
7
|
import { shellQuote } from '@kaynooo/cli-kit/shell'
|
|
8
8
|
import { audit as findExposed } from '../audit'
|
|
9
9
|
import { fixCompose, shutOthersOut } from '../fix'
|
|
@@ -46,6 +46,7 @@ function shown(path: string): string {
|
|
|
46
46
|
async function fixAll(exposed: Exposure[], json: boolean): Promise<{ fixed: ComposeFix[], left: boolean }> {
|
|
47
47
|
const fixed: ComposeFix[] = []
|
|
48
48
|
let left = false
|
|
49
|
+
const tint = role('path', process.stdout)
|
|
49
50
|
|
|
50
51
|
for (const { path, readable, group, tracked, secrets } of exposed) {
|
|
51
52
|
const fix = secrets === undefined ? undefined : await fixCompose(path, group === true)
|
|
@@ -68,7 +69,7 @@ async function fixAll(exposed: Exposure[], json: boolean): Promise<{ fixed: Comp
|
|
|
68
69
|
...tracked ? [`tracked by git: git rm --cached ${shellQuote(shown(path))}, then ignore it`] : [],
|
|
69
70
|
]
|
|
70
71
|
|
|
71
|
-
console.log(`${shown(path)}\n ${lines.join('\n ')}`)
|
|
72
|
+
console.log(`${tint(shown(path))}\n ${lines.join('\n ')}`)
|
|
72
73
|
}
|
|
73
74
|
|
|
74
75
|
return { fixed, left }
|
|
@@ -118,6 +119,7 @@ export async function audit(args: string[]): Promise<number> {
|
|
|
118
119
|
}
|
|
119
120
|
|
|
120
121
|
const uid = process.getuid?.()
|
|
122
|
+
const tint = role('path', process.stdout)
|
|
121
123
|
|
|
122
124
|
for (const { path, readable, group, tracked, secrets } of exposed) {
|
|
123
125
|
// Only the owner or root can change a file's mode.
|
|
@@ -128,7 +130,7 @@ export async function audit(args: string[]): Promise<number> {
|
|
|
128
130
|
...tracked ? [`tracked by git: git rm --cached ${shellQuote(shown(path))}, then ignore it`] : [],
|
|
129
131
|
]
|
|
130
132
|
|
|
131
|
-
console.log(`${shown(path)}\n ${problems.join('\n ')}`)
|
|
133
|
+
console.log(`${tint(shown(path))}\n ${problems.join('\n ')}`)
|
|
132
134
|
}
|
|
133
135
|
|
|
134
136
|
return 1
|