@sitepong/cli 0.1.37 → 0.1.38
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/auth/login.js +189 -95
- package/dist/auth/login.js.map +1 -1
- package/dist/client/hosting.js +3 -2
- package/dist/client/hosting.js.map +1 -1
- package/dist/commands/account/tokens.js +32 -46
- package/dist/commands/account/tokens.js.map +1 -1
- package/dist/commands/alerts/index.js +16 -7
- package/dist/commands/alerts/index.js.map +1 -1
- package/dist/commands/auth/logout.js +2 -1
- package/dist/commands/auth/logout.js.map +1 -1
- package/dist/commands/auth/switch.js +8 -5
- package/dist/commands/auth/switch.js.map +1 -1
- package/dist/commands/auth/whoami.js +2 -1
- package/dist/commands/auth/whoami.js.map +1 -1
- package/dist/commands/builds/builds-extra.test.js +1 -1
- package/dist/commands/builds/index.js +7 -6
- package/dist/commands/builds/index.js.map +1 -1
- package/dist/commands/deploy/index.js +10 -9
- package/dist/commands/deploy/index.js.map +1 -1
- package/dist/commands/errors/index.js +2 -2
- package/dist/commands/errors/index.js.map +1 -1
- package/dist/commands/experiments/index.js +2 -1
- package/dist/commands/experiments/index.js.map +1 -1
- package/dist/commands/flags/index.js +8 -4
- package/dist/commands/flags/index.js.map +1 -1
- package/dist/commands/hosting/auth-users.js +4 -2
- package/dist/commands/hosting/auth-users.js.map +1 -1
- package/dist/commands/hosting/backups.js +2 -2
- package/dist/commands/hosting/backups.js.map +1 -1
- package/dist/commands/hosting/config.js +2 -1
- package/dist/commands/hosting/config.js.map +1 -1
- package/dist/commands/hosting/db.js +2 -1
- package/dist/commands/hosting/db.js.map +1 -1
- package/dist/commands/hosting/functions.js +4 -5
- package/dist/commands/hosting/functions.js.map +1 -1
- package/dist/commands/hosting/instances.js +26 -20
- package/dist/commands/hosting/instances.js.map +1 -1
- package/dist/commands/hosting/keys.js +1 -1
- package/dist/commands/hosting/keys.js.map +1 -1
- package/dist/commands/hosting/secrets.js +2 -1
- package/dist/commands/hosting/secrets.js.map +1 -1
- package/dist/commands/hosting/storage.js +4 -3
- package/dist/commands/hosting/storage.js.map +1 -1
- package/dist/commands/init/index.js +30 -30
- package/dist/commands/init/index.js.map +1 -1
- package/dist/commands/monitoring/index.js +4 -3
- package/dist/commands/monitoring/index.js.map +1 -1
- package/dist/commands/open/index.js +2 -2
- package/dist/commands/open/index.js.map +1 -1
- package/dist/commands/orgs/index.js +3 -2
- package/dist/commands/orgs/index.js.map +1 -1
- package/dist/commands/ota/index.js +3 -3
- package/dist/commands/ota/index.js.map +1 -1
- package/dist/commands/patrol/index.js +12 -10
- package/dist/commands/patrol/index.js.map +1 -1
- package/dist/commands/projects/index.js +3 -2
- package/dist/commands/projects/index.js.map +1 -1
- package/dist/commands/serve/index.js +20 -16
- package/dist/commands/serve/index.js.map +1 -1
- package/dist/commands/servernet/index.js +10 -8
- package/dist/commands/servernet/index.js.map +1 -1
- package/dist/commands/team/index.js +5 -3
- package/dist/commands/team/index.js.map +1 -1
- package/dist/commands/workflows/index.js +3 -2
- package/dist/commands/workflows/index.js.map +1 -1
- package/dist/config/context.js +3 -2
- package/dist/config/context.js.map +1 -1
- package/dist/index.js +9 -4
- package/dist/index.js.map +1 -1
- package/dist/output/__tests__/colors.test.js +77 -31
- package/dist/output/__tests__/colors.test.js.map +1 -1
- package/dist/output/__tests__/errors.test.js +55 -0
- package/dist/output/__tests__/errors.test.js.map +1 -0
- package/dist/output/__tests__/tokens-sync.test.js +17 -0
- package/dist/output/__tests__/tokens-sync.test.js.map +1 -0
- package/dist/output/colors.js +77 -13
- package/dist/output/colors.js.map +1 -1
- package/dist/output/errors.js +65 -0
- package/dist/output/errors.js.map +1 -0
- package/dist/output/format.js +129 -21
- package/dist/output/format.js.map +1 -1
- package/dist/output/format.test.js +34 -0
- package/dist/output/format.test.js.map +1 -1
- package/dist/output/log.js +87 -7
- package/dist/output/log.js.map +1 -1
- package/dist/output/log.test.js +37 -5
- package/dist/output/log.test.js.map +1 -1
- package/dist/output/spinner.js +90 -4
- package/dist/output/spinner.js.map +1 -1
- package/dist/output/spinner.test.js +10 -2
- package/dist/output/spinner.test.js.map +1 -1
- package/dist/output/term.js +75 -0
- package/dist/output/term.js.map +1 -0
- package/dist/output/tokens.js +63 -0
- package/dist/output/tokens.js.map +1 -0
- package/dist/util/prompt.js +27 -7
- package/dist/util/prompt.js.map +1 -1
- package/dist/util/update-check.js +9 -13
- package/dist/util/update-check.js.map +1 -1
- package/dist/util/update-check.test.js +1 -1
- package/package.json +4 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/config/context.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/config/context.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -9,6 +9,8 @@ program
|
|
|
9
9
|
.description('SitePong CLI — manage your entire SitePong platform')
|
|
10
10
|
.version(version)
|
|
11
11
|
.option('--format <format>', 'Output format (table|json|compact)')
|
|
12
|
+
.option('--json', 'Output JSON (same as --format json); messages move to stderr')
|
|
13
|
+
.option('--no-color', 'Turn off colour (NO_COLOR is also respected)')
|
|
12
14
|
.option('--verbose', 'Show detailed request/response info');
|
|
13
15
|
// Auth (top-level)
|
|
14
16
|
program
|
|
@@ -25,8 +27,9 @@ program
|
|
|
25
27
|
.description('Log out of SitePong')
|
|
26
28
|
.action(async () => {
|
|
27
29
|
const { logout } = await import('./auth/token.js');
|
|
30
|
+
const { success } = await import('./output/log.js');
|
|
28
31
|
logout();
|
|
29
|
-
|
|
32
|
+
success('Logged out. Your saved credentials were removed.');
|
|
30
33
|
});
|
|
31
34
|
program
|
|
32
35
|
.command('whoami')
|
|
@@ -37,7 +40,8 @@ program
|
|
|
37
40
|
const { outputDetail } = await import('./output/format.js');
|
|
38
41
|
const auth = readAuth();
|
|
39
42
|
if (!auth) {
|
|
40
|
-
|
|
43
|
+
const { error } = await import('./output/log.js');
|
|
44
|
+
error('Not logged in.', 'Run `sitepong login` to log in.');
|
|
41
45
|
process.exit(1);
|
|
42
46
|
}
|
|
43
47
|
const ctx = resolveContext({});
|
|
@@ -108,8 +112,9 @@ registerAll().then(async () => {
|
|
|
108
112
|
if (result)
|
|
109
113
|
printUpdateNotice(result);
|
|
110
114
|
await program.parseAsync(process.argv);
|
|
111
|
-
}).catch((err) => {
|
|
112
|
-
|
|
115
|
+
}).catch(async (err) => {
|
|
116
|
+
const { reportError } = await import('./output/errors.js');
|
|
117
|
+
reportError(err);
|
|
113
118
|
process.exit(1);
|
|
114
119
|
});
|
|
115
120
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE/C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAC9B,OAAO;KACJ,IAAI,CAAC,UAAU,CAAC;KAChB,WAAW,CAAC,qDAAqD,CAAC;KAClE,OAAO,CAAC,OAAO,CAAC;KAChB,MAAM,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;KACjE,MAAM,CAAC,WAAW,EAAE,qCAAqC,CAAC,CAAC;AAE9D,mBAAmB;AACnB,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,oBAAoB,CAAC;KACjC,MAAM,CAAC,iBAAiB,EAAE,mCAAmC,CAAC;KAC9D,MAAM,CAAC,mBAAmB,EAAE,iCAAiC,EAAE,SAAS,CAAC;KACzE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACrB,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC7D,MAAM,gBAAgB,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AACrE,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,qBAAqB,CAAC;KAClC,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACnD,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,39 +1,85 @@
|
|
|
1
1
|
import { describe, it, expect } from 'vitest';
|
|
2
|
-
import { c } from '../colors';
|
|
2
|
+
import { c, ce, createPainter } from '../colors';
|
|
3
|
+
import { roles } from '../tokens';
|
|
4
|
+
import { colorLevel, supportsUnicode, wantsJson, isCI } from '../term';
|
|
5
|
+
const ESC = '\x1b[';
|
|
3
6
|
describe('colors', () => {
|
|
4
|
-
it('
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
expect(
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
expect(
|
|
28
|
-
|
|
7
|
+
it('exposes the token roles plus weight', () => {
|
|
8
|
+
for (const p of [c, ce]) {
|
|
9
|
+
for (const k of ['ink', 'muted', 'faint', 'accent', 'ok', 'warn', 'danger', 'bold', 'underline']) {
|
|
10
|
+
expect(typeof p[k]).toBe('function');
|
|
11
|
+
expect(typeof p[k]('x')).toBe('string');
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
});
|
|
15
|
+
it('level 0 never emits escape codes', () => {
|
|
16
|
+
const p = createPainter(0);
|
|
17
|
+
expect(p.danger('bad')).toBe('bad');
|
|
18
|
+
expect(p.bold(p.accent('x'))).toBe('x');
|
|
19
|
+
});
|
|
20
|
+
it('level 3 renders the role hex as truecolor', () => {
|
|
21
|
+
const p = createPainter(3);
|
|
22
|
+
const hex = roles.accent.hex.replace('#', '');
|
|
23
|
+
const rgb = [0, 2, 4].map((i) => parseInt(hex.slice(i, i + 2), 16)).join(';');
|
|
24
|
+
expect(p.accent('go')).toBe(`${ESC}38;2;${rgb}mgo${ESC}39m`);
|
|
25
|
+
});
|
|
26
|
+
it('level 2 renders the role ANSI-256 code', () => {
|
|
27
|
+
expect(createPainter(2).ok('done')).toBe(`${ESC}38;5;${roles.ok.ansi256}mdone${ESC}39m`);
|
|
28
|
+
});
|
|
29
|
+
it('level 1 renders the basic ANSI colour', () => {
|
|
30
|
+
expect(createPainter(1).danger('x')).toBe(`${ESC}31mx${ESC}39m`);
|
|
31
|
+
});
|
|
32
|
+
it('ink is the terminal foreground at every level', () => {
|
|
33
|
+
expect(createPainter(3).ink('text')).toBe('text');
|
|
34
|
+
});
|
|
35
|
+
it('a nested span does not end the outer colour', () => {
|
|
36
|
+
const p = createPainter(1);
|
|
37
|
+
const s = p.muted(`a ${p.accent('b')} c`);
|
|
38
|
+
// after the inner close, the outer colour is reopened before " c"
|
|
39
|
+
expect(s).toContain(`${ESC}39m${ESC}90m c`);
|
|
29
40
|
});
|
|
30
41
|
it('handles empty strings', () => {
|
|
31
|
-
expect(
|
|
32
|
-
|
|
42
|
+
expect(createPainter(3).bold('')).toBe('');
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
describe('term', () => {
|
|
46
|
+
const tty = { isTTY: true };
|
|
47
|
+
it('NO_COLOR wins over everything', () => {
|
|
48
|
+
expect(colorLevel(tty, { NO_COLOR: '1', FORCE_COLOR: '3', COLORTERM: 'truecolor' }, [])).toBe(0);
|
|
49
|
+
});
|
|
50
|
+
it('--no-color turns colour off', () => {
|
|
51
|
+
expect(colorLevel(tty, { COLORTERM: 'truecolor' }, ['--no-color'])).toBe(0);
|
|
52
|
+
});
|
|
53
|
+
it('no colour when the stream is not a terminal', () => {
|
|
54
|
+
expect(colorLevel({ isTTY: false }, { COLORTERM: 'truecolor' }, [])).toBe(0);
|
|
55
|
+
});
|
|
56
|
+
it('FORCE_COLOR colours a pipe', () => {
|
|
57
|
+
expect(colorLevel({ isTTY: false }, { FORCE_COLOR: '1' }, [])).toBe(1);
|
|
58
|
+
expect(colorLevel({ isTTY: false }, { FORCE_COLOR: '3' }, [])).toBe(3);
|
|
59
|
+
});
|
|
60
|
+
it('TERM=dumb has no colour', () => {
|
|
61
|
+
expect(colorLevel(tty, { TERM: 'dumb' }, [])).toBe(0);
|
|
62
|
+
});
|
|
63
|
+
it('picks truecolor, 256 or basic from what the terminal advertises', () => {
|
|
64
|
+
expect(colorLevel(tty, { COLORTERM: 'truecolor' }, [])).toBe(3);
|
|
65
|
+
expect(colorLevel(tty, { TERM: 'xterm-256color' }, [])).toBe(2);
|
|
66
|
+
expect(colorLevel(tty, { TERM: 'xterm' }, [])).toBe(1);
|
|
67
|
+
});
|
|
68
|
+
it('detects --json and --format json', () => {
|
|
69
|
+
expect(wantsJson(['node', 'x', '--json'])).toBe(true);
|
|
70
|
+
expect(wantsJson(['node', 'x', '--format', 'json'])).toBe(true);
|
|
71
|
+
expect(wantsJson(['node', 'x', '--format', 'table'])).toBe(false);
|
|
72
|
+
});
|
|
73
|
+
it('detects CI', () => {
|
|
74
|
+
expect(isCI({ CI: 'true' })).toBe(true);
|
|
75
|
+
expect(isCI({ CI: 'false' })).toBe(false);
|
|
76
|
+
expect(isCI({ GITHUB_ACTIONS: 'true' })).toBe(true);
|
|
77
|
+
expect(isCI({})).toBe(false);
|
|
33
78
|
});
|
|
34
|
-
it('
|
|
35
|
-
expect(
|
|
36
|
-
expect(
|
|
79
|
+
it('falls back to ASCII glyphs where Unicode is unsafe', () => {
|
|
80
|
+
expect(supportsUnicode({ TERM: 'linux' }, 'linux')).toBe(false);
|
|
81
|
+
expect(supportsUnicode({ SITEPONG_ASCII: '1' }, 'darwin')).toBe(false);
|
|
82
|
+
expect(supportsUnicode({}, 'darwin')).toBe(true);
|
|
37
83
|
});
|
|
38
84
|
});
|
|
39
85
|
//# sourceMappingURL=colors.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"colors.test.js","sourceRoot":"","sources":["../../../src/output/__tests__/colors.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,CAAC,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"colors.test.js","sourceRoot":"","sources":["../../../src/output/__tests__/colors.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { describe, it, expect, vi, afterEach } from 'vitest';
|
|
2
|
+
import { explain, reportError } from '../errors';
|
|
3
|
+
import { ApiError } from '../../client/base';
|
|
4
|
+
describe('explain', () => {
|
|
5
|
+
it('moves a "Run `…`" instruction into the next step', () => {
|
|
6
|
+
const ex = explain(new Error('Not logged in. Run `sitepong login` first.'));
|
|
7
|
+
expect(ex.message).toBe('Not logged in.');
|
|
8
|
+
expect(ex.next).toEqual(['Run `sitepong login` first.']);
|
|
9
|
+
});
|
|
10
|
+
it('suggests signing in again on 401', () => {
|
|
11
|
+
const ex = explain(new ApiError(401, 'GET /api/x: Invalid token (401)'));
|
|
12
|
+
expect(ex.next.join(' ')).toContain('sitepong login');
|
|
13
|
+
expect(ex.status).toBe(401);
|
|
14
|
+
});
|
|
15
|
+
it('explains network failures', () => {
|
|
16
|
+
const err = Object.assign(new TypeError('fetch failed'), { cause: { code: 'ECONNREFUSED' } });
|
|
17
|
+
const ex = explain(err);
|
|
18
|
+
expect(ex.message).toContain("Couldn't reach SitePong");
|
|
19
|
+
expect(ex.next.length).toBe(1);
|
|
20
|
+
});
|
|
21
|
+
it('gives a next step for server errors', () => {
|
|
22
|
+
expect(explain(new ApiError(503, 'boom')).next.length).toBe(1);
|
|
23
|
+
});
|
|
24
|
+
it('leaves unknown errors alone', () => {
|
|
25
|
+
expect(explain(new Error('Slug must be at least 3 characters.'))).toEqual({
|
|
26
|
+
message: 'Slug must be at least 3 characters.', next: [], status: undefined,
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
describe('reportError', () => {
|
|
31
|
+
const origArgv = process.argv;
|
|
32
|
+
afterEach(() => { process.argv = origArgv; process.exitCode = 0; vi.restoreAllMocks(); });
|
|
33
|
+
it('prints the message and next step on stderr and fails the exit code', () => {
|
|
34
|
+
const err = vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
35
|
+
reportError(new Error('Not logged in. Run `sitepong login` first.'));
|
|
36
|
+
const text = err.mock.calls.map((c) => String(c[0])).join('\n');
|
|
37
|
+
expect(text).toContain('Not logged in.');
|
|
38
|
+
expect(text).toContain('sitepong login');
|
|
39
|
+
expect(process.exitCode).toBe(1);
|
|
40
|
+
});
|
|
41
|
+
it('writes JSON to stderr with --json', () => {
|
|
42
|
+
process.argv = ['node', 'sitepong', 'builds', 'list', '--json'];
|
|
43
|
+
const err = vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
44
|
+
reportError(new ApiError(404, 'GET /x: Not found (404)'));
|
|
45
|
+
const parsed = JSON.parse(String(err.mock.calls[0][0]));
|
|
46
|
+
expect(parsed.error.status).toBe(404);
|
|
47
|
+
expect(parsed.error.message).toContain('Not found');
|
|
48
|
+
});
|
|
49
|
+
it('does not repeat a message a spinner already showed', () => {
|
|
50
|
+
const err = vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
51
|
+
reportError(Object.assign(new Error('Upload failed'), { reported: true }));
|
|
52
|
+
expect(err.mock.calls.map((c) => String(c[0])).join('\n')).not.toContain('Upload failed');
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
//# sourceMappingURL=errors.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.test.js","sourceRoot":"","sources":["../../../src/output/__tests__/errors.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { fileURLToPath } from 'node:url';
|
|
5
|
+
// src/output/tokens.ts is a vendored copy of packages/tokens/dist/terminal.ts
|
|
6
|
+
// (the CLI is published to npm and can't depend on the private workspace).
|
|
7
|
+
// When the source is present, the copy must match it.
|
|
8
|
+
const here = path.dirname(fileURLToPath(import.meta.url));
|
|
9
|
+
const source = path.resolve(here, '../../../../tokens/dist/terminal.ts');
|
|
10
|
+
const vendored = path.resolve(here, '../tokens.ts');
|
|
11
|
+
describe('vendored terminal tokens', () => {
|
|
12
|
+
it.skipIf(!fs.existsSync(source))('match packages/tokens (run `npm run sync-tokens -w @sitepong/cli`)', () => {
|
|
13
|
+
const strip = (s) => s.split('\n').filter((l) => !l.startsWith('// Generated by') && !l.startsWith('// Vendored from')).join('\n').trim();
|
|
14
|
+
expect(strip(fs.readFileSync(vendored, 'utf8'))).toBe(strip(fs.readFileSync(source, 'utf8')));
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
//# sourceMappingURL=tokens-sync.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tokens-sync.test.js","sourceRoot":"","sources":["../../../src/output/__tests__/tokens-sync.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,8EAA8E;AAC9E,2EAA2E;AAC3E,sDAAsD;AACtD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,qCAAqC,CAAC,CAAC;AACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AAEpD,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC3G,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAClJ,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/output/colors.js
CHANGED
|
@@ -1,15 +1,79 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
1
|
+
// The CLI's only source of colour. Every colour comes from a role in the
|
|
2
|
+
// shared design tokens (src/output/tokens.ts, vendored from packages/tokens),
|
|
3
|
+
// rendered as truecolor, ANSI-256 or basic ANSI depending on the terminal,
|
|
4
|
+
// or not at all under NO_COLOR, non-TTY output and TERM=dumb.
|
|
5
|
+
//
|
|
6
|
+
// Roles:
|
|
7
|
+
// ink primary text. Rendered in the terminal's own foreground, which is
|
|
8
|
+
// already the highest-contrast colour on both light and dark
|
|
9
|
+
// backgrounds; the token's hex is tuned for a dark canvas.
|
|
10
|
+
// muted secondary text: labels, keys, explanations
|
|
11
|
+
// faint tertiary text: separators, empty values, timestamps
|
|
12
|
+
// accent things to act on: commands, links, codes, the spinner
|
|
13
|
+
// ok completion
|
|
14
|
+
// warn warnings and in-flight states
|
|
15
|
+
// danger errors and failed states
|
|
16
|
+
import { roles, glyph as glyphTokens } from './tokens.js';
|
|
17
|
+
import { colorLevel, supportsUnicode } from './term.js';
|
|
18
|
+
const BASIC = {
|
|
19
|
+
black: 30, red: 31, green: 32, yellow: 33, blue: 34, magenta: 35, cyan: 36, white: 37, gray: 90, grey: 90,
|
|
14
20
|
};
|
|
21
|
+
function hexToRgb(hex) {
|
|
22
|
+
const n = parseInt(hex.replace('#', ''), 16);
|
|
23
|
+
return [(n >> 16) & 255, (n >> 8) & 255, n & 255];
|
|
24
|
+
}
|
|
25
|
+
function sgr(open, close) {
|
|
26
|
+
const o = `\x1b[${open}m`;
|
|
27
|
+
const cl = `\x1b[${close}m`;
|
|
28
|
+
return (text) => {
|
|
29
|
+
const s = String(text);
|
|
30
|
+
if (s === '')
|
|
31
|
+
return s;
|
|
32
|
+
// Re-open after any nested close so an inner span doesn't end the outer one.
|
|
33
|
+
return o + s.split(cl).join(cl + o) + cl;
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
function roleOpen(role, level) {
|
|
37
|
+
const r = roles[role];
|
|
38
|
+
if (level === 3)
|
|
39
|
+
return `38;2;${hexToRgb(r.hex).join(';')}`;
|
|
40
|
+
if (level === 2)
|
|
41
|
+
return `38;5;${r.ansi256}`;
|
|
42
|
+
return String(BASIC[r.basic] ?? 39);
|
|
43
|
+
}
|
|
44
|
+
const plain = (t) => String(t);
|
|
45
|
+
export function createPainter(level) {
|
|
46
|
+
if (level === 0) {
|
|
47
|
+
return {
|
|
48
|
+
level, ink: plain, muted: plain, faint: plain, accent: plain, ok: plain, warn: plain, danger: plain,
|
|
49
|
+
bold: plain, underline: plain, role: (_r, t) => String(t),
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
const paint = (role) => sgr(roleOpen(role, level), '39');
|
|
53
|
+
const p = {
|
|
54
|
+
level,
|
|
55
|
+
ink: plain,
|
|
56
|
+
muted: paint('muted'),
|
|
57
|
+
faint: paint('faint'),
|
|
58
|
+
accent: paint('accent'),
|
|
59
|
+
ok: paint('ok'),
|
|
60
|
+
warn: paint('warn'),
|
|
61
|
+
danger: paint('danger'),
|
|
62
|
+
bold: sgr('1', '22'),
|
|
63
|
+
underline: sgr('4', '24'),
|
|
64
|
+
};
|
|
65
|
+
return { ...p, role: (role, t) => (role === 'ink' ? String(t) : p[role](t)) };
|
|
66
|
+
}
|
|
67
|
+
/** Colours for text written to stdout. */
|
|
68
|
+
export const c = createPainter(colorLevel(process.stdout));
|
|
69
|
+
/** Colours for text written to stderr (status, spinners, errors). */
|
|
70
|
+
export const ce = createPainter(colorLevel(process.stderr));
|
|
71
|
+
const ASCII = {
|
|
72
|
+
ok: '+', fail: 'x', warn: '!', info: 'i', arrow: '>', bullet: '*', pending: 'o', active: '*',
|
|
73
|
+
spinner: ['-', '\\', '|', '/'], spinnerInterval: 120,
|
|
74
|
+
};
|
|
75
|
+
/** Status glyphs and spinner frames from the tokens, with ASCII stand-ins. */
|
|
76
|
+
export const glyph = supportsUnicode() ? glyphTokens : ASCII;
|
|
77
|
+
/** Ellipsis for in-progress text. */
|
|
78
|
+
export const ellipsis = supportsUnicode() ? '…' : '...';
|
|
15
79
|
//# sourceMappingURL=colors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"colors.js","sourceRoot":"","sources":["../../src/output/colors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"colors.js","sourceRoot":"","sources":["../../src/output/colors.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
// Turns any error that reaches the top of the CLI into one line that says what
|
|
2
|
+
// went wrong, and, where we can tell, a next step. With --json the error is
|
|
3
|
+
// also written to stderr as JSON so scripts can read it.
|
|
4
|
+
import { error as printError, hint, splitInstruction } from './log.js';
|
|
5
|
+
import { wantsJson } from './term.js';
|
|
6
|
+
const NETWORK_CODES = new Set(['ECONNREFUSED', 'ENOTFOUND', 'EAI_AGAIN', 'ETIMEDOUT', 'ECONNRESET', 'UND_ERR_CONNECT_TIMEOUT']);
|
|
7
|
+
function apiHost() {
|
|
8
|
+
return process.env.SITEPONG_API_URL || 'https://api.sitepong.com';
|
|
9
|
+
}
|
|
10
|
+
/** Work out what to tell the person about an error. Exported for tests. */
|
|
11
|
+
export function explain(err) {
|
|
12
|
+
const e = (err ?? {});
|
|
13
|
+
let message = (e.message || String(err)).trim();
|
|
14
|
+
const next = [];
|
|
15
|
+
// "Not logged in. Run `sitepong login` first." -> the instruction becomes the next step.
|
|
16
|
+
const split = splitInstruction(message);
|
|
17
|
+
if (split) {
|
|
18
|
+
message = split[0];
|
|
19
|
+
return { message, next: [split[1]], status: typeof e.status === 'number' ? e.status : undefined };
|
|
20
|
+
}
|
|
21
|
+
const status = typeof e.status === 'number' ? e.status : undefined;
|
|
22
|
+
const code = e.cause?.code || e.code;
|
|
23
|
+
if ((code && NETWORK_CODES.has(code)) || /fetch failed/i.test(message)) {
|
|
24
|
+
return {
|
|
25
|
+
message: `Couldn't reach SitePong at ${apiHost()}.`,
|
|
26
|
+
next: ['Check your connection and try again. If you set SITEPONG_API_URL, check that it is right.'],
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
if (/Not logged in|Session expired/i.test(message) || status === 401) {
|
|
30
|
+
next.push('Run `sitepong login` to log in.');
|
|
31
|
+
}
|
|
32
|
+
else if (status === 403) {
|
|
33
|
+
next.push('Your account can\'t do this in the selected organization. Check which one is active with `sitepong whoami`.');
|
|
34
|
+
}
|
|
35
|
+
else if (status === 404) {
|
|
36
|
+
next.push('Check the ID. `sitepong whoami` shows the active organization and project.');
|
|
37
|
+
}
|
|
38
|
+
else if (status === 402) {
|
|
39
|
+
next.push('This needs a paid plan. See `sitepong billing` for your plan.');
|
|
40
|
+
}
|
|
41
|
+
else if (status === 429) {
|
|
42
|
+
next.push('Too many requests. Wait a moment and try again.');
|
|
43
|
+
}
|
|
44
|
+
else if (status !== undefined && status >= 500) {
|
|
45
|
+
next.push('SitePong had a problem with that request. Try again; if it keeps happening, run it with --verbose and share the output.');
|
|
46
|
+
}
|
|
47
|
+
return { message, next, status };
|
|
48
|
+
}
|
|
49
|
+
/** Print an error that reached the top level and set a failing exit code. */
|
|
50
|
+
export function reportError(err) {
|
|
51
|
+
const ex = explain(err);
|
|
52
|
+
process.exitCode = 1;
|
|
53
|
+
if (wantsJson()) {
|
|
54
|
+
console.error(JSON.stringify({ error: { message: ex.message, status: ex.status ?? null, next: ex.next } }));
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
if (err?.reported) {
|
|
58
|
+
// A spinner already showed the message; only add the next step.
|
|
59
|
+
if (ex.next.length)
|
|
60
|
+
hint(ex.next, true);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
printError(ex.message, ex.next.length ? ex.next : undefined);
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/output/errors.ts"],"names":[],"mappings":"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"}
|