@kaynooo/cli-env 0.12.0 → 0.13.1
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/README.md +1 -0
- package/dist/ev.js +150 -295
- package/dist/redact.js +126 -276
- package/package.json +2 -2
- package/src/audit.ts +1 -2
- package/src/commands/audit.ts +3 -3
- package/src/commands/edit.ts +18 -10
- package/src/ev.ts +1 -1
- package/src/files.ts +3 -2
- package/src/pins.ts +1 -1
- package/src/redact.ts +1 -1
package/dist/redact.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
#!/usr/bin/env -S bun --no-env-file
|
|
1
|
+
#!/usr/bin/env -S bun --no-env-file --config=/dev/null
|
|
2
2
|
// @bun
|
|
3
3
|
|
|
4
4
|
// src/redact.ts
|
|
@@ -10,6 +10,24 @@ import { parseArgs } from "util";
|
|
|
10
10
|
// ../kit/src/format.ts
|
|
11
11
|
import process7 from "process";
|
|
12
12
|
|
|
13
|
+
// ../../node_modules/.bun/@kaynooo+utils@3.0.0+4c7ddab9986847c5/node_modules/@kaynooo/utils/dist/chunk-rxztfxgv.js
|
|
14
|
+
var N = new Map;
|
|
15
|
+
var Nt = /\s+\S*$/;
|
|
16
|
+
var Y = /\s/;
|
|
17
|
+
function ko(t, e, r = "...") {
|
|
18
|
+
let { suffix: n = "...", includeSuffix: s = false, wordBoundary: o = false } = typeof r === "string" ? { suffix: r } : r;
|
|
19
|
+
if (t.length <= e)
|
|
20
|
+
return t;
|
|
21
|
+
let l = Math.max(0, e), c = t.substring(0, Math.max(0, s ? l - n.length : l));
|
|
22
|
+
if (o && !Y.test(t[c.length] ?? " "))
|
|
23
|
+
c = c.replace(Nt, "") || c;
|
|
24
|
+
if (o)
|
|
25
|
+
c = c.trimEnd();
|
|
26
|
+
return s ? (c + n).slice(0, l) : c + n;
|
|
27
|
+
}
|
|
28
|
+
var be = new Map(["\u20AC", "", "\u201A", "\u0192", "\u201E", "\u2026", "\u2020", "\u2021", "\u02C6", "\u2030", "\u0160", "\u2039", "\u0152", "", "\u017D", "", "", "\u2018", "\u2019", "\u201C", "\u201D", "\u2022", "\u2013", "\u2014", "\u02DC", "\u2122", "\u0161", "\u203A", "\u0153", "", "\u017E", "\u0178"].map((t, e) => [t, 128 + e]).filter(([t]) => t));
|
|
29
|
+
var z = new Map;
|
|
30
|
+
|
|
13
31
|
// ../kit/src/mode.ts
|
|
14
32
|
import process2 from "process";
|
|
15
33
|
var MODES = new Set(["terminal", "ci", "agent", "pipe"]);
|
|
@@ -31,269 +49,63 @@ function outputMode(stream = process2.stdout, env = process2.env) {
|
|
|
31
49
|
// ../kit/src/style.ts
|
|
32
50
|
import process6 from "process";
|
|
33
51
|
|
|
34
|
-
// ../../node_modules/.bun/@kaynooo+utils@
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
52
|
+
// ../../node_modules/.bun/@kaynooo+utils@3.0.0+4c7ddab9986847c5/node_modules/@kaynooo/utils/dist/chunk-x450vn3m.js
|
|
53
|
+
var G2 = /^[a-f0-9]+$/i;
|
|
54
|
+
function b(r) {
|
|
55
|
+
let e = r.startsWith("#") ? r.slice(1) : r;
|
|
56
|
+
if (!G2.test(e))
|
|
38
57
|
return [0, 0, 0];
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
let
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
if (
|
|
54
|
-
return `#${(r << 24 | t << 16 | n << 8 | Math.round((a ?? 1) * 255)).toString(16).padStart(8, "0").toUpperCase()}`;
|
|
55
|
-
return `#${(r << 16 | t << 8 | n).toString(16).padStart(6, "0").toUpperCase()}`;
|
|
56
|
-
}
|
|
57
|
-
function R(s, r, t) {
|
|
58
|
-
s = (s % 360 + 360) % 360, t /= 100;
|
|
59
|
-
let n = r * Math.min(t, 1 - t) / 100, a = (b) => {
|
|
60
|
-
let o = (b + s / 30) % 12, y = t - n * Math.max(Math.min(o - 3, 9 - o, 1), -1);
|
|
61
|
-
return Math.round(255 * y);
|
|
62
|
-
};
|
|
63
|
-
return [a(0), a(8), a(4)];
|
|
64
|
-
}
|
|
65
|
-
function k(s) {
|
|
66
|
-
let [r, t, n] = s;
|
|
67
|
-
r /= 255, t /= 255, n /= 255;
|
|
68
|
-
let a = Math.max(r, t, n), b = Math.min(r, t, n), o = 0, y = 0, c = (a + b) / 2;
|
|
69
|
-
if (a !== b) {
|
|
70
|
-
let u = a - b;
|
|
71
|
-
if (y = c > 0 && c < 1 ? u / (1 - Math.abs(2 * c - 1)) : 0, a === r)
|
|
72
|
-
o = (t - n) / u + (t < n ? 6 : 0);
|
|
73
|
-
else if (a === t)
|
|
74
|
-
o = (n - r) / u + 2;
|
|
75
|
-
else
|
|
76
|
-
o = (r - t) / u + 4;
|
|
77
|
-
o /= 6;
|
|
78
|
-
}
|
|
79
|
-
return [Math.round(o * 360), Math.round(y * 100), Math.round(c * 100)];
|
|
80
|
-
}
|
|
81
|
-
function H(s, r, t) {
|
|
82
|
-
s = (s % 360 + 360) % 360, r /= 100, t /= 100;
|
|
83
|
-
let n = (a) => {
|
|
84
|
-
let b = (a + s / 60) % 6, o = t - t * r * Math.max(Math.min(b, 4 - b, 1), 0);
|
|
85
|
-
return Math.round(255 * o);
|
|
86
|
-
};
|
|
87
|
-
return [n(5), n(3), n(1)];
|
|
88
|
-
}
|
|
89
|
-
function f(s) {
|
|
90
|
-
let [r, t, n] = s;
|
|
91
|
-
r /= 255, t /= 255, n /= 255;
|
|
92
|
-
let a = Math.max(r, t, n), b = Math.min(r, t, n), o = a - b, y = 0, c = a === 0 ? 0 : o / a, u = a;
|
|
93
|
-
if (o !== 0) {
|
|
94
|
-
if (a === r)
|
|
95
|
-
y = (t - n) / o + (t < n ? 6 : 0);
|
|
96
|
-
else if (a === t)
|
|
97
|
-
y = (n - r) / o + 2;
|
|
98
|
-
else
|
|
99
|
-
y = (r - t) / o + 4;
|
|
100
|
-
y /= 6;
|
|
101
|
-
}
|
|
102
|
-
return [Math.round(y * 360), Math.round(c * 100), Math.round(u * 100)];
|
|
103
|
-
}
|
|
104
|
-
function O(s) {
|
|
105
|
-
let r = s[0] / 255, t = s[1] / 255, n = s[2] / 255, a = 1 - Math.max(r, t, n);
|
|
106
|
-
if (a === 1)
|
|
107
|
-
return [0, 0, 0, 100];
|
|
108
|
-
let b = (1 - r - a) / (1 - a), o = (1 - t - a) / (1 - a), y = (1 - n - a) / (1 - a);
|
|
109
|
-
return [Math.round(b * 100), Math.round(o * 100), Math.round(y * 100), Math.round(a * 100)];
|
|
110
|
-
}
|
|
111
|
-
function v(s, r, t, n) {
|
|
112
|
-
return s /= 100, r /= 100, t /= 100, n /= 100, [Math.round(255 * (1 - s) * (1 - n)), Math.round(255 * (1 - r) * (1 - n)), Math.round(255 * (1 - t) * (1 - n))];
|
|
113
|
-
}
|
|
114
|
-
var m = (s) => s <= 0.04045 ? s / 12.92 : ((s + 0.055) / 1.055) ** 2.4;
|
|
115
|
-
var p = (s) => s <= 0.0031308 ? 12.92 * s : 1.055 * s ** 0.4166666666666667 - 0.055;
|
|
116
|
-
var i = (s, r) => Math.round(s * 10 ** r) / 10 ** r;
|
|
117
|
-
function T(s) {
|
|
118
|
-
let r = m(s[0] / 255), t = m(s[1] / 255), n = m(s[2] / 255), a = Math.cbrt(0.4122214708 * r + 0.5363325363 * t + 0.0514459929 * n), b = Math.cbrt(0.2119034982 * r + 0.6806995451 * t + 0.1073969566 * n), o = Math.cbrt(0.0883024619 * r + 0.2817188376 * t + 0.6299787005 * n);
|
|
119
|
-
return [i(0.2104542553 * a + 0.793617785 * b - 0.0040720468 * o, 4), i(1.9779984951 * a - 2.428592205 * b + 0.4505937099 * o, 4), i(0.0259040371 * a + 0.7827717662 * b - 0.808675766 * o, 4)];
|
|
120
|
-
}
|
|
121
|
-
function M(s, r, t) {
|
|
122
|
-
let n = (s + 0.3963377774 * r + 0.2158037573 * t) ** 3, a = (s - 0.1055613458 * r - 0.0638541728 * t) ** 3, b = (s - 0.0894841775 * r - 1.291485548 * t) ** 3, o = p(4.0767416621 * n - 3.3077115913 * a + 0.2309699292 * b), y = p(-1.2684380046 * n + 2.6097574011 * a - 0.3413193965 * b), c = p(-0.0041960863 * n - 0.7034186147 * a + 1.707614701 * b), u = (h) => Math.min(255, Math.max(0, Math.round(h * 255)));
|
|
123
|
-
return [u(o), u(y), u(c)];
|
|
124
|
-
}
|
|
125
|
-
function d(s) {
|
|
126
|
-
let [r, t, n] = T(s), a = Math.sqrt(t * t + n * n), b = (Math.atan2(n, t) * 180 / Math.PI + 360) % 360;
|
|
127
|
-
return [i(r, 4), i(a, 4), i(b, 2)];
|
|
128
|
-
}
|
|
129
|
-
function C(s, r, t) {
|
|
130
|
-
let n = t * Math.PI / 180;
|
|
131
|
-
return M(s, r * Math.cos(n), r * Math.sin(n));
|
|
132
|
-
}
|
|
133
|
-
function l(s) {
|
|
134
|
-
let r = s / 255;
|
|
135
|
-
return r <= 0.03928 ? r / 12.92 : ((r + 0.055) / 1.055) ** 2.4;
|
|
136
|
-
}
|
|
137
|
-
|
|
138
|
-
class e {
|
|
139
|
-
r;
|
|
140
|
-
g;
|
|
141
|
-
b;
|
|
142
|
-
a;
|
|
143
|
-
constructor(s, r, t, n = 1) {
|
|
144
|
-
this.r = s, this.g = r, this.b = t, this.a = n;
|
|
145
|
-
}
|
|
146
|
-
static from(s, r) {
|
|
147
|
-
if (s === "hex") {
|
|
148
|
-
let [t, n, a, b] = x(r);
|
|
149
|
-
return new e(t, n, a, b);
|
|
150
|
-
}
|
|
151
|
-
if (s === "rgb") {
|
|
152
|
-
if (Array.isArray(r)) {
|
|
153
|
-
let [o, y, c, u] = r;
|
|
154
|
-
return new e(o, y, c, u);
|
|
155
|
-
}
|
|
156
|
-
let { r: t, g: n, b: a, a: b } = r;
|
|
157
|
-
return new e(t, n, a, b);
|
|
158
|
-
}
|
|
159
|
-
if (s === "hsl") {
|
|
160
|
-
let t, n, a, b;
|
|
161
|
-
if (Array.isArray(r))
|
|
162
|
-
[t, n, a, b] = r;
|
|
163
|
-
else
|
|
164
|
-
({ h: t, s: n, l: a, a: b } = r);
|
|
165
|
-
let [o, y, c] = R(t, n, a);
|
|
166
|
-
return new e(o, y, c, b);
|
|
167
|
-
}
|
|
168
|
-
if (s === "hsv") {
|
|
169
|
-
let t, n, a, b;
|
|
170
|
-
if (Array.isArray(r))
|
|
171
|
-
[t, n, a, b] = r;
|
|
172
|
-
else
|
|
173
|
-
({ h: t, s: n, v: a, a: b } = r);
|
|
174
|
-
let [o, y, c] = H(t, n, a);
|
|
175
|
-
return new e(o, y, c, b);
|
|
176
|
-
}
|
|
177
|
-
if (s === "cmyk") {
|
|
178
|
-
let t, n, a, b, o;
|
|
179
|
-
if (Array.isArray(r))
|
|
180
|
-
[t, n, a, b, o] = r;
|
|
181
|
-
else
|
|
182
|
-
({ c: t, m: n, y: a, k: b, a: o } = r);
|
|
183
|
-
let [y, c, u] = v(t, n, a, b);
|
|
184
|
-
return new e(y, c, u, o);
|
|
185
|
-
}
|
|
186
|
-
if (s === "oklch") {
|
|
187
|
-
let t, n, a, b;
|
|
188
|
-
if (Array.isArray(r))
|
|
189
|
-
[t, n, a, b] = r;
|
|
190
|
-
else
|
|
191
|
-
({ l: t, c: n, h: a, a: b } = r);
|
|
192
|
-
let [o, y, c] = C(t, n, a);
|
|
193
|
-
return new e(o, y, c, b);
|
|
194
|
-
}
|
|
195
|
-
if (s === "oklab") {
|
|
196
|
-
let t, n, a, b;
|
|
197
|
-
if (Array.isArray(r))
|
|
198
|
-
[t, n, a, b] = r;
|
|
199
|
-
else
|
|
200
|
-
({ l: t, a: n, b: a, alpha: b } = r);
|
|
201
|
-
let [o, y, c] = M(t, n, a);
|
|
202
|
-
return new e(o, y, c, b);
|
|
203
|
-
}
|
|
204
|
-
throw Error("Invalid input");
|
|
205
|
-
}
|
|
206
|
-
to(s) {
|
|
207
|
-
switch (s) {
|
|
208
|
-
case "rgb":
|
|
209
|
-
return [this.r, this.g, this.b];
|
|
210
|
-
case "rgba":
|
|
211
|
-
return [this.r, this.g, this.b, this.a];
|
|
212
|
-
case "hex":
|
|
213
|
-
return A([this.r, this.g, this.b]);
|
|
214
|
-
case "hexa":
|
|
215
|
-
return A([this.r, this.g, this.b, this.a]);
|
|
216
|
-
case "hsl":
|
|
217
|
-
return k([this.r, this.g, this.b]);
|
|
218
|
-
case "hsla":
|
|
219
|
-
return [...k([this.r, this.g, this.b]), this.a];
|
|
220
|
-
case "hsv":
|
|
221
|
-
return f([this.r, this.g, this.b]);
|
|
222
|
-
case "hsva":
|
|
223
|
-
return [...f([this.r, this.g, this.b]), this.a];
|
|
224
|
-
case "cmyk":
|
|
225
|
-
return O([this.r, this.g, this.b]);
|
|
226
|
-
case "cmyka":
|
|
227
|
-
return [...O([this.r, this.g, this.b]), this.a];
|
|
228
|
-
case "oklch":
|
|
229
|
-
return d([this.r, this.g, this.b]);
|
|
230
|
-
case "oklcha":
|
|
231
|
-
return [...d([this.r, this.g, this.b]), this.a];
|
|
232
|
-
case "oklab":
|
|
233
|
-
return T([this.r, this.g, this.b]);
|
|
234
|
-
case "oklaba":
|
|
235
|
-
return [...T([this.r, this.g, this.b]), this.a];
|
|
236
|
-
default:
|
|
237
|
-
return [this.r, this.g, this.b];
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
getLuminance() {
|
|
241
|
-
let s = l(this.r), r = l(this.g), t = l(this.b);
|
|
242
|
-
return 0.2126 * s + 0.7152 * r + 0.0722 * t;
|
|
243
|
-
}
|
|
244
|
-
contrastRatio(s) {
|
|
245
|
-
let r = this.getLuminance(), t = s.getLuminance(), [n, a] = r >= t ? [r, t] : [t, r];
|
|
246
|
-
return (n + 0.05) / (a + 0.05);
|
|
247
|
-
}
|
|
248
|
-
bestContrastForeground() {
|
|
249
|
-
let s = new e(255, 255, 255, 1), r = new e(0, 0, 0, 1), t = this.contrastRatio(s), n = this.contrastRatio(r);
|
|
250
|
-
return t >= n ? s : r;
|
|
251
|
-
}
|
|
252
|
-
}
|
|
253
|
-
|
|
254
|
-
// ../../node_modules/.bun/@kaynooo+utils@2.31.2+d0769e28dc4dad16/node_modules/@kaynooo/utils/dist/chunk-y1msbssb.js
|
|
255
|
-
var r = 39;
|
|
256
|
-
var o = 49;
|
|
257
|
-
var f2 = "\x1B[";
|
|
258
|
-
var C2 = { reset: [0, 0], bold: [1, 22], dim: [2, 22], italic: [3, 23], underline: [4, 24], inverse: [7, 27], hidden: [8, 28], strikethrough: [9, 29], black: [30, r], red: [31, r], green: [32, r], yellow: [33, r], blue: [34, r], magenta: [35, r], cyan: [36, r], white: [37, r], gray: [90, r], grey: [90, r], blackBright: [90, r], redBright: [91, r], greenBright: [92, r], yellowBright: [93, r], blueBright: [94, r], magentaBright: [95, r], cyanBright: [96, r], whiteBright: [97, r], bgBlack: [40, o], bgRed: [41, o], bgGreen: [42, o], bgYellow: [43, o], bgBlue: [44, o], bgMagenta: [45, o], bgCyan: [46, o], bgWhite: [47, o], bgBlackBright: [100, o], bgRedBright: [101, o], bgGreenBright: [102, o], bgYellowBright: [103, o], bgBlueBright: [104, o], bgMagentaBright: [105, o], bgCyanBright: [106, o], bgWhiteBright: [107, o], rgb: (i, n, a, l = "fg") => [`${l === "fg" ? 38 : 48};2;${i};${n};${a}`, l === "fg" ? r : o], hex: (i, n = "fg") => {
|
|
259
|
-
let [a, l, s] = e.from("hex", i).to("rgb");
|
|
260
|
-
return [`${n === "fg" ? 38 : 48};2;${a};${l};${s}`, n === "fg" ? r : o];
|
|
261
|
-
}, ansi256: (i, n = "fg") => [`${n === "fg" ? 38 : 48};5;${i}`, n === "fg" ? r : o] };
|
|
262
|
-
var b = new Set(["", "1", "2", "3", "true"]);
|
|
263
|
-
function h(i, n = globalThis.process?.env ?? {}) {
|
|
264
|
-
if (n.FORCE_COLOR !== undefined)
|
|
265
|
-
return b.has(n.FORCE_COLOR);
|
|
266
|
-
if (n.NO_COLOR !== undefined || n.NODE_DISABLE_COLORS !== undefined || n.TERM === "dumb")
|
|
58
|
+
if (e.length === 3 || e.length === 4)
|
|
59
|
+
return [Number.parseInt(e[0] + e[0], 16), Number.parseInt(e[1] + e[1], 16), Number.parseInt(e[2] + e[2], 16)];
|
|
60
|
+
if (e.length !== 6 && e.length !== 8)
|
|
61
|
+
throw Error(`Invalid hex color length: ${e.length}`);
|
|
62
|
+
return [Number.parseInt(e.slice(0, 2), 16), Number.parseInt(e.slice(2, 4), 16), Number.parseInt(e.slice(4, 6), 16)];
|
|
63
|
+
}
|
|
64
|
+
var B2 = { reset: [0, 0], bold: [1, 22], dim: [2, 22], italic: [3, 23], underline: [4, 24], inverse: [7, 27], hidden: [8, 28], strikethrough: [9, 29], black: [30, 39], red: [31, 39], green: [32, 39], yellow: [33, 39], blue: [34, 39], magenta: [35, 39], cyan: [36, 39], white: [37, 39], gray: [90, 39], grey: [90, 39], blackBright: [90, 39], redBright: [91, 39], greenBright: [92, 39], yellowBright: [93, 39], blueBright: [94, 39], magentaBright: [95, 39], cyanBright: [96, 39], whiteBright: [97, 39], bgBlack: [40, 49], bgRed: [41, 49], bgGreen: [42, 49], bgYellow: [43, 49], bgBlue: [44, 49], bgMagenta: [45, 49], bgCyan: [46, 49], bgWhite: [47, 49], bgBlackBright: [100, 49], bgRedBright: [101, 49], bgGreenBright: [102, 49], bgYellowBright: [103, 49], bgBlueBright: [104, 49], bgMagentaBright: [105, 49], bgCyanBright: [106, 49], bgWhiteBright: [107, 49], rgb: (r, e, l, n = "fg") => [`${n === "fg" ? 38 : 48};2;${r};${e};${l}`, n === "fg" ? 39 : 49], hex: (r, e = "fg") => {
|
|
65
|
+
let [l, n, c] = b(r);
|
|
66
|
+
return [`${e === "fg" ? 38 : 48};2;${l};${n};${c}`, e === "fg" ? 39 : 49];
|
|
67
|
+
}, ansi256: (r, e = "fg") => [`${e === "fg" ? 38 : 48};5;${r}`, e === "fg" ? 39 : 49] };
|
|
68
|
+
var h = new Set(["", "1", "2", "3", "true"]);
|
|
69
|
+
function C(r, e = globalThis.process?.env ?? {}) {
|
|
70
|
+
if (e.FORCE_COLOR !== undefined)
|
|
71
|
+
return h.has(e.FORCE_COLOR);
|
|
72
|
+
if (e.NO_COLOR !== undefined || e.NODE_DISABLE_COLORS !== undefined || e.TERM === "dumb")
|
|
267
73
|
return false;
|
|
268
|
-
return
|
|
269
|
-
}
|
|
270
|
-
function
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
if (
|
|
284
|
-
return
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
74
|
+
return r?.isTTY === true;
|
|
75
|
+
}
|
|
76
|
+
function f(r, e = []) {
|
|
77
|
+
let l = "", n = "";
|
|
78
|
+
for (let t = 0, i = e.length;t < i; t++)
|
|
79
|
+
l += `\x1B[${e[t][0]}m`, n = `\x1B[${e[t][1]}m${n}`;
|
|
80
|
+
let c = (t) => C(r.stream ?? globalThis.process?.stdout, r.env) ? l + t + n : t, g = new Map;
|
|
81
|
+
return new Proxy(c, { get(t, i) {
|
|
82
|
+
let a = B2[i];
|
|
83
|
+
if (Array.isArray(a)) {
|
|
84
|
+
let s = g.get(i);
|
|
85
|
+
if (s === undefined)
|
|
86
|
+
s = f(r, [...e, a]), g.set(i, s);
|
|
87
|
+
return s;
|
|
88
|
+
}
|
|
89
|
+
if (typeof a === "function")
|
|
90
|
+
return (...s) => {
|
|
91
|
+
let y = `${i}:${s.join(",")}`, u = g.get(y);
|
|
92
|
+
if (u === undefined) {
|
|
93
|
+
if (g.size >= 64)
|
|
94
|
+
g.clear();
|
|
95
|
+
u = f(r, [...e, a(...s)]), g.set(y, u);
|
|
96
|
+
}
|
|
97
|
+
return u;
|
|
98
|
+
};
|
|
99
|
+
throw Error(`Unknown style: ${String(i)}`);
|
|
288
100
|
} });
|
|
289
101
|
}
|
|
290
|
-
function
|
|
291
|
-
return
|
|
102
|
+
function Fe(r = {}) {
|
|
103
|
+
return f(r);
|
|
292
104
|
}
|
|
293
|
-
var
|
|
105
|
+
var o = Fe();
|
|
294
106
|
|
|
295
107
|
// ../kit/src/theme.ts
|
|
296
|
-
import { existsSync as
|
|
108
|
+
import { existsSync as existsSync3, readFileSync as readFileSync2, statSync } from "fs";
|
|
297
109
|
import { homedir as homedir2 } from "os";
|
|
298
110
|
import { join as join3, resolve as resolve2 } from "path";
|
|
299
111
|
import process5 from "process";
|
|
@@ -314,6 +126,7 @@ function findUp(names, from = process3.cwd(), stop = () => false) {
|
|
|
314
126
|
}
|
|
315
127
|
|
|
316
128
|
// ../kit/src/user-config.ts
|
|
129
|
+
import { existsSync as existsSync2, readFileSync } from "fs";
|
|
317
130
|
import { homedir } from "os";
|
|
318
131
|
import { join as join2 } from "path";
|
|
319
132
|
import process4 from "process";
|
|
@@ -324,21 +137,41 @@ function configBase(where = {}) {
|
|
|
324
137
|
function userConfigPath(bin, where = {}) {
|
|
325
138
|
return join2(configBase(where), "kaynooo-cli", `${bin}.json`);
|
|
326
139
|
}
|
|
140
|
+
function userConfigReadPath(bin, legacy = [], where = {}) {
|
|
141
|
+
const current = userConfigPath(bin, where);
|
|
142
|
+
if (existsSync2(current))
|
|
143
|
+
return current;
|
|
144
|
+
const base = configBase(where);
|
|
145
|
+
return legacy.map((parts) => join2(base, ...parts)).find((path) => existsSync2(path)) ?? current;
|
|
146
|
+
}
|
|
147
|
+
function readUserConfig(bin, where = {}, legacy = []) {
|
|
148
|
+
const path = userConfigReadPath(bin, legacy, where);
|
|
149
|
+
if (!existsSync2(path))
|
|
150
|
+
return {};
|
|
151
|
+
try {
|
|
152
|
+
const parsed = Bun.JSONC.parse(readFileSync(path, "utf8"));
|
|
153
|
+
return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed : {};
|
|
154
|
+
} catch {
|
|
155
|
+
return {};
|
|
156
|
+
}
|
|
157
|
+
}
|
|
327
158
|
|
|
328
159
|
// ../kit/src/theme.ts
|
|
160
|
+
var ENDS = new Map;
|
|
329
161
|
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" },
|
|
162
|
+
colors: { accent: "cyan", id: "yellow", path: "blue", label: "dim", value: "bold", ok: "green", warn: "yellow", problem: "red", note: "dim", plan: "magenta", passed: "green", failed: "red", running: "cyan", queued: "yellow", skipped: "dim" },
|
|
163
|
+
glyphs: { ok: "\u2713", warn: "\u25B2", problem: "\u2717", note: "\u203A", plan: "\u25C7", passed: "\u2713", failed: "\u2717", running: "\u25CF", queued: "\u25CB", skipped: "-", bar: "\u2501", rule: "\u2500", corner: "\u256D", open: "\u2022", leaf: "\xB7", guide: "\u2502" },
|
|
332
164
|
accents: ["cyan", "magenta", "green", "blue", "yellow", "redBright"],
|
|
333
|
-
bins: {}
|
|
165
|
+
bins: {},
|
|
166
|
+
gradient: ["#c084fc", "#67e8f9"]
|
|
334
167
|
};
|
|
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: "#" };
|
|
168
|
+
var BRIGHT = { accent: "cyanBright", id: "yellowBright", path: "blueBright", label: "white", value: "bold whiteBright", ok: "greenBright", warn: "yellowBright", problem: "redBright", note: "white", plan: "magentaBright", passed: "greenBright", failed: "redBright", running: "cyanBright", queued: "yellowBright", skipped: "white" };
|
|
169
|
+
var MONO = { accent: "bold", id: "bold", path: "underline", label: "dim", value: "bold", ok: "bold", warn: "bold", problem: "bold", note: "dim", plan: "dim", passed: "bold", failed: "bold", running: "bold", queued: "dim", skipped: "dim" };
|
|
170
|
+
var ASCII = { ok: "+", warn: "!", problem: "x", note: ">", plan: "?", passed: "+", failed: "x", running: "*", queued: "o", skipped: "-", bar: "#", rule: "-", corner: "+", open: "*", leaf: "-", guide: "|" };
|
|
338
171
|
var PRESETS = {
|
|
339
172
|
default: {},
|
|
340
|
-
"high-contrast": { colors: BRIGHT, accents: ["cyanBright", "magentaBright", "greenBright", "blueBright", "yellowBright", "redBright"] },
|
|
341
|
-
mono: { colors: MONO, accents: ["bold"] },
|
|
173
|
+
"high-contrast": { colors: BRIGHT, accents: ["cyanBright", "magentaBright", "greenBright", "blueBright", "yellowBright", "redBright"], gradient: ["#d8b4fe", "#a5f3fc"] },
|
|
174
|
+
mono: { colors: MONO, accents: ["bold"], gradient: undefined },
|
|
342
175
|
ascii: { glyphs: ASCII }
|
|
343
176
|
};
|
|
344
177
|
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"]);
|
|
@@ -388,7 +221,7 @@ function readThemeFile(path, warn) {
|
|
|
388
221
|
warn(`${path} is not a regular file under ${MAX_FILE_BYTES / 1024} KiB, theme ignored`);
|
|
389
222
|
return;
|
|
390
223
|
}
|
|
391
|
-
const parsed = JSON.parse(
|
|
224
|
+
const parsed = JSON.parse(readFileSync2(path, "utf8"));
|
|
392
225
|
if (isRecord(parsed))
|
|
393
226
|
return parsed;
|
|
394
227
|
warn(`${path} is not a JSON object, theme ignored`);
|
|
@@ -409,6 +242,8 @@ function applyPreset(theme, name, warn, where) {
|
|
|
409
242
|
Object.assign(theme.glyphs, preset.glyphs);
|
|
410
243
|
if (preset.accents !== undefined)
|
|
411
244
|
theme.accents = [...preset.accents];
|
|
245
|
+
if (Object.hasOwn(preset, "gradient"))
|
|
246
|
+
theme.gradient = preset.gradient;
|
|
412
247
|
return name;
|
|
413
248
|
}
|
|
414
249
|
function applyFile(theme, file, where, warn) {
|
|
@@ -436,6 +271,12 @@ function applyFile(theme, file, where, warn) {
|
|
|
436
271
|
theme.accents = [...file.accents];
|
|
437
272
|
else if (file.accents !== undefined)
|
|
438
273
|
warn(`${where}: accents must be a non-empty list of colours`);
|
|
274
|
+
if (file.gradient === null)
|
|
275
|
+
theme.gradient = undefined;
|
|
276
|
+
else if (Array.isArray(file.gradient) && file.gradient.length === 2 && file.gradient.every((end) => typeof end === "string" && HEX.test(end)))
|
|
277
|
+
theme.gradient = [file.gradient[0], file.gradient[1]];
|
|
278
|
+
else if (file.gradient !== undefined)
|
|
279
|
+
warn(`${where}: gradient must be two \`#rrggbb\` colours, or null for none`);
|
|
439
280
|
if (isRecord(file.bins)) {
|
|
440
281
|
for (const [bin, value] of Object.entries(file.bins)) {
|
|
441
282
|
if (isColorSpec(value))
|
|
@@ -446,7 +287,7 @@ function applyFile(theme, file, where, warn) {
|
|
|
446
287
|
}
|
|
447
288
|
}
|
|
448
289
|
function endsWalk(home) {
|
|
449
|
-
return (dir) => dir === resolve2(home) ||
|
|
290
|
+
return (dir) => dir === resolve2(home) || existsSync3(join3(dir, ".git"));
|
|
450
291
|
}
|
|
451
292
|
var warned = new Set;
|
|
452
293
|
function warnOnce(message) {
|
|
@@ -459,7 +300,7 @@ function isPath(chosen) {
|
|
|
459
300
|
return chosen.includes("/") || chosen.endsWith(".json");
|
|
460
301
|
}
|
|
461
302
|
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) };
|
|
303
|
+
const theme = { colors: { ...DEFAULT.colors }, glyphs: { ...DEFAULT.glyphs }, accents: [...DEFAULT.accents], bins: Object.create(null), gradient: DEFAULT.gradient };
|
|
463
304
|
const sources = [];
|
|
464
305
|
const chosen = env.KIT_THEME ?? "";
|
|
465
306
|
const wanted = chosen === "" ? [userConfigPath("theme", { home, xdg: env.XDG_CONFIG_HOME }), findUp(join3(".kaynooo", "theme.json"), from, endsWalk(home))] : [];
|
|
@@ -497,12 +338,12 @@ function activeTheme() {
|
|
|
497
338
|
}
|
|
498
339
|
|
|
499
340
|
// ../kit/src/style.ts
|
|
500
|
-
var MARK_WORDS = { ok: "ok:", warn: "warning:", problem: "error:", note: "note:" };
|
|
341
|
+
var MARK_WORDS = { ok: "ok:", warn: "warning:", problem: "error:", note: "note:", plan: "would:" };
|
|
501
342
|
function takesControlCodes(stream, env = process6.env) {
|
|
502
343
|
return stream.isTTY === true && env.NO_COLOR === undefined && env.NODE_DISABLE_COLORS === undefined && env.TERM !== "dumb" && outputMode(stream, env) === "terminal";
|
|
503
344
|
}
|
|
504
345
|
function paint(stream, env = process6.env) {
|
|
505
|
-
return
|
|
346
|
+
return Fe({ stream: { isTTY: takesControlCodes(stream, env) }, env });
|
|
506
347
|
}
|
|
507
348
|
function marked(mark, text, stream, detail, env = process6.env) {
|
|
508
349
|
const colors = paint(stream, env);
|
|
@@ -516,6 +357,9 @@ function marked(mark, text, stream, detail, env = process6.env) {
|
|
|
516
357
|
function ok(text, detail) {
|
|
517
358
|
console.log(marked("ok", text, process6.stdout, detail));
|
|
518
359
|
}
|
|
360
|
+
function warn(text, detail) {
|
|
361
|
+
console.error(marked("warn", text, process6.stderr, detail));
|
|
362
|
+
}
|
|
519
363
|
function role(name, stream, env = process6.env) {
|
|
520
364
|
const colors = paint(stream, env);
|
|
521
365
|
return takesControlCodes(stream, env) ? tinted(colors, activeTheme().theme.colors[name], env) : colors;
|
|
@@ -535,7 +379,7 @@ function upTo(text, separator) {
|
|
|
535
379
|
return end === -1 ? text : text.slice(0, end);
|
|
536
380
|
}
|
|
537
381
|
function truncate(text, width) {
|
|
538
|
-
return text
|
|
382
|
+
return ko(text, width, { suffix: "\u2026", includeSuffix: true });
|
|
539
383
|
}
|
|
540
384
|
var LINE_BREAKS = /\s*\n\s*/g;
|
|
541
385
|
var ESCAPE = String.fromCharCode(27);
|
|
@@ -683,7 +527,6 @@ var DASHES = /^-+/;
|
|
|
683
527
|
function jsonOption(holds) {
|
|
684
528
|
return { type: "boolean", description: holds === undefined ? "print JSON" : `print JSON: ${holds}` };
|
|
685
529
|
}
|
|
686
|
-
|
|
687
530
|
class Exit extends Error {
|
|
688
531
|
code;
|
|
689
532
|
hint;
|
|
@@ -902,7 +745,7 @@ var ESCAPE_CODE = new RegExp(`${ESC}(?:\\[[\\x30-\\x3F]*[\\x20-\\x2F]*[\\x40-\\x
|
|
|
902
745
|
var RESET_STYLE = `${ESC}[0m`;
|
|
903
746
|
var CLOSE_LINK = `${ESC}]8;;${ESC}\\`;
|
|
904
747
|
// ../kit/src/cli.ts
|
|
905
|
-
import { readFileSync as
|
|
748
|
+
import { readFileSync as readFileSync3, realpathSync } from "fs";
|
|
906
749
|
import { dirname as dirname3, join as join5 } from "path";
|
|
907
750
|
import process12 from "process";
|
|
908
751
|
|
|
@@ -1203,7 +1046,7 @@ async function printCandidates(found) {
|
|
|
1203
1046
|
function packageVersion(entry = Bun.main) {
|
|
1204
1047
|
for (let dir = dirname3(realpathSync(entry));; dir = dirname3(dir)) {
|
|
1205
1048
|
try {
|
|
1206
|
-
const { version } = JSON.parse(
|
|
1049
|
+
const { version } = JSON.parse(readFileSync3(join5(dir, "package.json"), "utf8"));
|
|
1207
1050
|
if (typeof version === "string")
|
|
1208
1051
|
return version;
|
|
1209
1052
|
} catch {}
|
|
@@ -1261,12 +1104,19 @@ async function runMain({ name, version, run, redact, usage }, argv = process12.a
|
|
|
1261
1104
|
// ../kit/src/compose.ts
|
|
1262
1105
|
async function captureOutput(argv, { cwd, env } = {}) {
|
|
1263
1106
|
const run = Bun.spawn(argv, { ...cwd === undefined ? {} : { cwd }, env: { ...process.env, ...env }, stdin: "ignore", stdout: "pipe", stderr: "pipe" });
|
|
1264
|
-
const [stdout, stderr, code] = await Promise.all([run.stdout.text(), run.stderr.text(), run.exited]);
|
|
1107
|
+
const [stdout, stderr, code] = await Promise.all([new Response(run.stdout).text(), new Response(run.stderr).text(), run.exited]);
|
|
1265
1108
|
return { code, stdout, stderr };
|
|
1266
1109
|
}
|
|
1267
1110
|
async function compose(args, { flags = [], ...options } = {}) {
|
|
1268
1111
|
return captureOutput(["docker", "compose", ...flags, ...args], options);
|
|
1269
1112
|
}
|
|
1113
|
+
// ../kit/src/folders.ts
|
|
1114
|
+
var SKIPPED_FOLDERS = new Set(["node_modules", "vendor", "dist", "build", "target", "coverage", "venv", "__pycache__"]);
|
|
1115
|
+
function ignoredFolders(extra = [], where = {}) {
|
|
1116
|
+
const configured = readUserConfig("config", where).ignore;
|
|
1117
|
+
const names = Array.isArray(configured) ? configured.filter((name) => typeof name === "string" && name !== "") : [];
|
|
1118
|
+
return new Set([...SKIPPED_FOLDERS, ...extra, ...names]);
|
|
1119
|
+
}
|
|
1270
1120
|
// ../kit/src/secrets.ts
|
|
1271
1121
|
var SECRET_PART = /token|secret|passw|credential|private|dsn|apikey|accesskey|key$/i;
|
|
1272
1122
|
var SECRET_WORDS = new Set(["key", "pass", "pwd", "auth", "salt", "cookie", "session", "jwt", "ssn", "iban", "card", "cvv", "otp"]);
|
|
@@ -1576,7 +1426,7 @@ function maskValue(key, value, known) {
|
|
|
1576
1426
|
var ENV_FILE = /^(?:\.env(?:\..+)?|.+\.env|\.envrc)$/;
|
|
1577
1427
|
var TEMPLATE = /\.(?:example|sample|template|dist|defaults)$/;
|
|
1578
1428
|
var KNOWN_DEPTH = 3;
|
|
1579
|
-
var SKIPPED =
|
|
1429
|
+
var SKIPPED = ignoredFolders([".git", ".kay"]);
|
|
1580
1430
|
var LOCK_WAIT_MS = 5000;
|
|
1581
1431
|
var LOCK_STALE_MS = 30000;
|
|
1582
1432
|
var REAP_STALE_MS = 5000;
|
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.13.1",
|
|
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.37.0"
|
|
41
41
|
}
|
|
42
42
|
}
|
package/src/audit.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { readdir, stat } from 'node:fs/promises'
|
|
|
3
3
|
import { dirname, join } from 'node:path'
|
|
4
4
|
import { isSecretName } from '@kaynooo/cli-kit'
|
|
5
5
|
import { $ } from 'bun'
|
|
6
|
-
import { ENV_FILE, isFileEntry, TEMPLATE } from './files'
|
|
6
|
+
import { ENV_FILE, isFileEntry, SKIPPED, TEMPLATE } from './files'
|
|
7
7
|
import { urlPasswords } from './mask'
|
|
8
8
|
|
|
9
9
|
export interface Exposure {
|
|
@@ -18,7 +18,6 @@ export interface Exposure {
|
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
const MAX_DEPTH = 5
|
|
21
|
-
const SKIPPED = new Set(['node_modules', '.git', 'vendor'])
|
|
22
21
|
const COMPOSE_FILE = /^(?:docker-)?compose[\w.-]*\.ya?ml$/
|
|
23
22
|
// An environment entry, `KEY: value` or `- KEY=value`, with its value written out.
|
|
24
23
|
const ENTRY = /^\s*(?:-\s*)?["']?([A-Z0-9_]+)["']?\s*[:=]\s*["']?([^"'\s#]+)/
|
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, role } from '@kaynooo/cli-kit'
|
|
6
|
+
import { fail, jsonOption, parse, printJson, role, warn } 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'
|
|
@@ -90,11 +90,11 @@ export async function audit(args: string[]): Promise<number> {
|
|
|
90
90
|
|
|
91
91
|
// Container data folders owned by another account often run to dozens, so past a few they are only counted.
|
|
92
92
|
if (!json && unread.length > MAX_UNREAD_LISTED) {
|
|
93
|
-
|
|
93
|
+
warn(`could not read ${unread.length} folders, so they were not audited (--json lists them)`)
|
|
94
94
|
}
|
|
95
95
|
else if (!json) {
|
|
96
96
|
for (const dir of unread)
|
|
97
|
-
|
|
97
|
+
warn(`could not read ${dir}, so it was not audited`)
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
if (parsed.values.fix === true && (json || exposed.length > 0)) {
|