@sitepong/cli 0.1.29 → 0.1.31
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/client/base.js +6 -2
- package/dist/client/base.js.map +1 -1
- package/dist/client/hosting.js +3 -2
- package/dist/client/hosting.js.map +1 -1
- package/dist/commands/alerts/alerts.test.js +55 -0
- package/dist/commands/alerts/alerts.test.js.map +1 -0
- package/dist/commands/analytics/analytics.test.js +29 -33
- package/dist/commands/analytics/analytics.test.js.map +1 -1
- package/dist/commands/analytics/index.js +33 -7
- package/dist/commands/analytics/index.js.map +1 -1
- package/dist/commands/billing/billing.test.js +49 -9
- package/dist/commands/billing/billing.test.js.map +1 -1
- package/dist/commands/billing/index.js +29 -8
- package/dist/commands/billing/index.js.map +1 -1
- package/dist/commands/builds/builds.test.js +111 -28
- package/dist/commands/builds/builds.test.js.map +1 -1
- package/dist/commands/builds/index.js +113 -47
- package/dist/commands/builds/index.js.map +1 -1
- package/dist/commands/errors/errors.test.js +88 -47
- package/dist/commands/errors/errors.test.js.map +1 -1
- package/dist/commands/errors/index.js +112 -60
- package/dist/commands/errors/index.js.map +1 -1
- package/dist/commands/experiments/experiments.test.js +67 -16
- package/dist/commands/experiments/experiments.test.js.map +1 -1
- package/dist/commands/experiments/index.js +127 -30
- package/dist/commands/experiments/index.js.map +1 -1
- package/dist/commands/flags/flags.test.js +47 -14
- package/dist/commands/flags/flags.test.js.map +1 -1
- package/dist/commands/flags/index.js +69 -18
- package/dist/commands/flags/index.js.map +1 -1
- package/dist/commands/hosting/auth-users.js +23 -6
- package/dist/commands/hosting/auth-users.js.map +1 -1
- package/dist/commands/hosting/backups.js +33 -10
- package/dist/commands/hosting/backups.js.map +1 -1
- package/dist/commands/hosting/config.js +22 -8
- package/dist/commands/hosting/config.js.map +1 -1
- package/dist/commands/hosting/db.js +23 -4
- package/dist/commands/hosting/db.js.map +1 -1
- package/dist/commands/hosting/db.test.js +14 -6
- package/dist/commands/hosting/db.test.js.map +1 -1
- package/dist/commands/hosting/functions.js +15 -5
- package/dist/commands/hosting/functions.js.map +1 -1
- package/dist/commands/hosting/functions.test.js +17 -4
- package/dist/commands/hosting/functions.test.js.map +1 -1
- package/dist/commands/hosting/hosting-extra.test.js +23 -2
- package/dist/commands/hosting/hosting-extra.test.js.map +1 -1
- package/dist/commands/hosting/instances.js +102 -15
- package/dist/commands/hosting/instances.js.map +1 -1
- package/dist/commands/hosting/instances.test.js +33 -8
- package/dist/commands/hosting/instances.test.js.map +1 -1
- package/dist/commands/hosting/keys.js +10 -3
- package/dist/commands/hosting/keys.js.map +1 -1
- package/dist/commands/hosting/logs.js +64 -27
- package/dist/commands/hosting/logs.js.map +1 -1
- package/dist/commands/hosting/migrate.js +47 -22
- package/dist/commands/hosting/migrate.js.map +1 -1
- package/dist/commands/hosting/migrate.test.js +58 -0
- package/dist/commands/hosting/migrate.test.js.map +1 -0
- package/dist/commands/hosting/remaining.test.js +41 -8
- package/dist/commands/hosting/remaining.test.js.map +1 -1
- package/dist/commands/hosting/storage.js +62 -15
- package/dist/commands/hosting/storage.js.map +1 -1
- package/dist/commands/hosting/storage.test.js +38 -8
- package/dist/commands/hosting/storage.test.js.map +1 -1
- package/dist/commands/monitoring/index.js +215 -71
- package/dist/commands/monitoring/index.js.map +1 -1
- package/dist/commands/monitoring/monitoring.test.js +140 -60
- package/dist/commands/monitoring/monitoring.test.js.map +1 -1
- package/dist/commands/ota/index.js +101 -42
- package/dist/commands/ota/index.js.map +1 -1
- package/dist/commands/ota/ota.test.js +58 -18
- package/dist/commands/ota/ota.test.js.map +1 -1
- package/dist/commands/ota/publish.js +22 -0
- package/dist/commands/ota/publish.js.map +1 -1
- package/dist/commands/ota/publish.test.js +23 -1
- package/dist/commands/ota/publish.test.js.map +1 -1
- package/dist/commands/patrol/index.js +70 -18
- package/dist/commands/patrol/index.js.map +1 -1
- package/dist/commands/patrol/patrol.test.js +68 -10
- package/dist/commands/patrol/patrol.test.js.map +1 -1
- package/dist/commands/push/index.js +54 -19
- package/dist/commands/push/index.js.map +1 -1
- package/dist/commands/push/push.test.js +55 -11
- package/dist/commands/push/push.test.js.map +1 -1
- package/dist/commands/replays/index.js +34 -18
- package/dist/commands/replays/index.js.map +1 -1
- package/dist/commands/replays/replays.test.js +43 -13
- package/dist/commands/replays/replays.test.js.map +1 -1
- package/dist/commands/serve/index.js +72 -31
- package/dist/commands/serve/index.js.map +1 -1
- package/dist/commands/serve/serve.test.js +135 -0
- package/dist/commands/serve/serve.test.js.map +1 -0
- package/dist/commands/team/index.js +15 -10
- package/dist/commands/team/index.js.map +1 -1
- package/dist/commands/team/team.test.js +16 -8
- package/dist/commands/team/team.test.js.map +1 -1
- package/dist/commands/workflows/index.js +190 -50
- package/dist/commands/workflows/index.js.map +1 -1
- package/dist/commands/workflows/workflows.test.js +149 -39
- package/dist/commands/workflows/workflows.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,16 +6,17 @@ export function registerServe(parent) {
|
|
|
6
6
|
.command('sites')
|
|
7
7
|
.description('List sites')
|
|
8
8
|
.option('--org <id>', 'Organization ID')
|
|
9
|
+
.option('--project <id>', 'Only sites in this project')
|
|
9
10
|
.action(async (opts) => {
|
|
10
11
|
const { serveClient } = await import('../../client/serve.js');
|
|
11
12
|
const { requireOrg } = await import('../../config/context.js');
|
|
12
13
|
const { output } = await import('../../output/format.js');
|
|
13
14
|
const ctx = requireOrg(opts);
|
|
14
15
|
const data = await serveClient().get('/api/sites', {
|
|
15
|
-
query: { organization_id: ctx.org_id },
|
|
16
|
+
query: { organization_id: ctx.org_id, project_id: opts.project },
|
|
16
17
|
});
|
|
17
|
-
const
|
|
18
|
-
output(
|
|
18
|
+
const { listFrom } = await import('../../client/envelope.js');
|
|
19
|
+
output(listFrom(data), ['id', 'name', 'url', 'project_id', 'spa_mode', 'current_deployment_id', 'created_at']);
|
|
19
20
|
});
|
|
20
21
|
serve
|
|
21
22
|
.command('create')
|
|
@@ -27,10 +28,11 @@ export function registerServe(parent) {
|
|
|
27
28
|
.option('--project <id>', 'Project ID')
|
|
28
29
|
.action(async (opts) => {
|
|
29
30
|
const { serveClient } = await import('../../client/serve.js');
|
|
30
|
-
const {
|
|
31
|
+
const { requireContext } = await import('../../config/context.js');
|
|
31
32
|
const { outputDetail } = await import('../../output/format.js');
|
|
32
33
|
const { success } = await import('../../output/log.js');
|
|
33
|
-
|
|
34
|
+
// The serve API refuses a site without project_id (400 "project_id is required").
|
|
35
|
+
const ctx = requireContext(opts);
|
|
34
36
|
const data = await serveClient().post('/api/sites', {
|
|
35
37
|
query: { organization_id: ctx.org_id },
|
|
36
38
|
body: {
|
|
@@ -40,7 +42,7 @@ export function registerServe(parent) {
|
|
|
40
42
|
project_id: ctx.project_id,
|
|
41
43
|
},
|
|
42
44
|
});
|
|
43
|
-
success(`Site created:
|
|
45
|
+
success(`Site created: ${data.url || `https://${data.slug}.serve.sitepong.com`}`);
|
|
44
46
|
outputDetail(data);
|
|
45
47
|
});
|
|
46
48
|
serve
|
|
@@ -106,18 +108,20 @@ export function registerServe(parent) {
|
|
|
106
108
|
.option('--project <id>', 'Project ID')
|
|
107
109
|
.action(async (directory, opts) => {
|
|
108
110
|
const { serveClient } = await import('../../client/serve.js');
|
|
109
|
-
const { requireOrg } = await import('../../config/context.js');
|
|
111
|
+
const { requireOrg, requireContext } = await import('../../config/context.js');
|
|
110
112
|
const { withSpinner } = await import('../../output/spinner.js');
|
|
111
113
|
const { success } = await import('../../output/log.js');
|
|
112
114
|
const { c } = await import('../../output/colors.js');
|
|
113
|
-
|
|
115
|
+
// Creating a site needs a project (the serve API refuses one without);
|
|
116
|
+
// deploying to an existing --site does not.
|
|
117
|
+
const ctx = opts.site ? requireOrg(opts) : requireContext(opts);
|
|
114
118
|
const dir = path.resolve(directory || findBuildDir());
|
|
115
119
|
if (!fs.existsSync(dir)) {
|
|
116
120
|
console.error(`Directory not found: ${dir}`);
|
|
117
121
|
process.exit(1);
|
|
118
122
|
}
|
|
119
123
|
let siteId = opts.site;
|
|
120
|
-
let
|
|
124
|
+
let siteUrl;
|
|
121
125
|
if (!siteId) {
|
|
122
126
|
const siteName = opts.name || path.basename(process.cwd());
|
|
123
127
|
const site = await withSpinner('Creating site...', () => serveClient().post('/api/sites', {
|
|
@@ -129,18 +133,16 @@ export function registerServe(parent) {
|
|
|
129
133
|
project_id: ctx.project_id,
|
|
130
134
|
},
|
|
131
135
|
}));
|
|
132
|
-
siteId = site.id
|
|
133
|
-
|
|
136
|
+
siteId = site.id;
|
|
137
|
+
siteUrl = site.url;
|
|
134
138
|
}
|
|
135
139
|
const deployment = await withSpinner('Creating deployment...', () => serveClient().post(`/api/sites/${siteId}/deployments`, {
|
|
136
140
|
query: { organization_id: ctx.org_id },
|
|
137
141
|
}));
|
|
138
|
-
const deploymentId = deployment.id
|
|
142
|
+
const deploymentId = deployment.id;
|
|
139
143
|
const files = collectFiles(dir);
|
|
140
144
|
console.log(` ${c.dim(`Uploading ${files.length} files...`)}`);
|
|
141
|
-
const
|
|
142
|
-
for (let i = 0; i < files.length; i += BATCH_SIZE) {
|
|
143
|
-
const batch = files.slice(i, i + BATCH_SIZE);
|
|
145
|
+
for (const batch of uploadBatches(files)) {
|
|
144
146
|
const payload = batch.map(f => ({
|
|
145
147
|
path: f.relativePath,
|
|
146
148
|
content: fs.readFileSync(f.absolutePath).toString('base64'),
|
|
@@ -151,19 +153,11 @@ export function registerServe(parent) {
|
|
|
151
153
|
body: { files: payload },
|
|
152
154
|
});
|
|
153
155
|
}
|
|
154
|
-
await withSpinner('Finalizing...', () => serveClient().post(`/api/sites/${siteId}/deployments/${deploymentId}/finalize`, {
|
|
156
|
+
const finalized = await withSpinner('Finalizing...', () => serveClient().post(`/api/sites/${siteId}/deployments/${deploymentId}/finalize`, {
|
|
155
157
|
query: { organization_id: ctx.org_id },
|
|
156
158
|
}));
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
const site = await serveClient().get(`/api/sites/${siteId}`, {
|
|
160
|
-
query: { organization_id: ctx.org_id },
|
|
161
|
-
});
|
|
162
|
-
siteSlug = site.slug || site.data?.slug;
|
|
163
|
-
}
|
|
164
|
-
catch { }
|
|
165
|
-
}
|
|
166
|
-
const url = siteSlug ? `https://${siteSlug}.serve.sitepong.com` : siteId;
|
|
159
|
+
// finalize answers { deployment_id, status: 'live', url }.
|
|
160
|
+
const url = finalized?.url || siteUrl || siteId;
|
|
167
161
|
success(`Deployed ${files.length} files → ${url}`);
|
|
168
162
|
});
|
|
169
163
|
serve
|
|
@@ -178,8 +172,8 @@ export function registerServe(parent) {
|
|
|
178
172
|
const data = await serveClient().get(`/api/sites/${siteId}/deployments`, {
|
|
179
173
|
query: { organization_id: ctx.org_id },
|
|
180
174
|
});
|
|
181
|
-
const
|
|
182
|
-
output(
|
|
175
|
+
const { listFrom } = await import('../../client/envelope.js');
|
|
176
|
+
output(listFrom(data), ['id', 'status', 'file_count', 'total_size_bytes', 'git_branch', 'created_at', 'promoted_at']);
|
|
183
177
|
});
|
|
184
178
|
serve
|
|
185
179
|
.command('rollback <site-id> <deployment-id>')
|
|
@@ -220,6 +214,21 @@ export function registerServe(parent) {
|
|
|
220
214
|
}
|
|
221
215
|
success(`Set ${pairs.length} env var(s).`);
|
|
222
216
|
});
|
|
217
|
+
env
|
|
218
|
+
.command('list <site-id>')
|
|
219
|
+
.description('List environment variable names (values are write-only)')
|
|
220
|
+
.option('--org <id>', 'Organization ID')
|
|
221
|
+
.action(async (siteId, opts) => {
|
|
222
|
+
const { serveClient } = await import('../../client/serve.js');
|
|
223
|
+
const { requireOrg } = await import('../../config/context.js');
|
|
224
|
+
const { output } = await import('../../output/format.js');
|
|
225
|
+
const { listFrom } = await import('../../client/envelope.js');
|
|
226
|
+
const ctx = requireOrg(opts);
|
|
227
|
+
const vars = await serveClient().get(`/api/sites/${siteId}/env`, {
|
|
228
|
+
query: { organization_id: ctx.org_id },
|
|
229
|
+
});
|
|
230
|
+
output(listFrom(vars), ['id', 'key', 'created_at']);
|
|
231
|
+
});
|
|
223
232
|
env
|
|
224
233
|
.command('delete <site-id> <key>')
|
|
225
234
|
.description('Delete an environment variable')
|
|
@@ -231,8 +240,8 @@ export function registerServe(parent) {
|
|
|
231
240
|
const vars = await serveClient().get(`/api/sites/${siteId}/env`, {
|
|
232
241
|
query: { organization_id: ctx.org_id },
|
|
233
242
|
});
|
|
234
|
-
const
|
|
235
|
-
const match =
|
|
243
|
+
const { listFrom } = await import('../../client/envelope.js');
|
|
244
|
+
const match = listFrom(vars).find((v) => v.key === key);
|
|
236
245
|
if (!match) {
|
|
237
246
|
console.error(`Env var "${key}" not found.`);
|
|
238
247
|
process.exit(1);
|
|
@@ -250,6 +259,36 @@ function findBuildDir() {
|
|
|
250
259
|
}
|
|
251
260
|
return '.';
|
|
252
261
|
}
|
|
262
|
+
/**
|
|
263
|
+
* The serve API reads each upload as one JSON body capped at 50 MB
|
|
264
|
+
* (FILE_UPLOAD_BODY_LIMIT in servers/serve/src/routes/deployments.ts) and
|
|
265
|
+
* answers "Invalid or oversized request body" past it. Base64 grows a file by
|
|
266
|
+
* 4/3, so batches are cut by encoded size (40 MB, leaving room for the JSON),
|
|
267
|
+
* not by a fixed file count, which broke on any site with large assets.
|
|
268
|
+
*/
|
|
269
|
+
export const UPLOAD_BATCH_BYTES = 40 * 1024 * 1024;
|
|
270
|
+
const UPLOAD_BATCH_FILES = 50;
|
|
271
|
+
export function uploadBatches(files) {
|
|
272
|
+
const batches = [];
|
|
273
|
+
let current = [];
|
|
274
|
+
let bytes = 0;
|
|
275
|
+
for (const f of files) {
|
|
276
|
+
const encoded = Math.ceil(f.size / 3) * 4;
|
|
277
|
+
if (encoded > UPLOAD_BATCH_BYTES) {
|
|
278
|
+
throw new Error(`${f.relativePath} is ${(f.size / 1048576).toFixed(1)} MB; the serve API takes at most ~30 MB per file.`);
|
|
279
|
+
}
|
|
280
|
+
if (current.length > 0 && (bytes + encoded > UPLOAD_BATCH_BYTES || current.length >= UPLOAD_BATCH_FILES)) {
|
|
281
|
+
batches.push(current);
|
|
282
|
+
current = [];
|
|
283
|
+
bytes = 0;
|
|
284
|
+
}
|
|
285
|
+
current.push(f);
|
|
286
|
+
bytes += encoded;
|
|
287
|
+
}
|
|
288
|
+
if (current.length > 0)
|
|
289
|
+
batches.push(current);
|
|
290
|
+
return batches;
|
|
291
|
+
}
|
|
253
292
|
function collectFiles(dir, base) {
|
|
254
293
|
const result = [];
|
|
255
294
|
const baseDir = base || dir;
|
|
@@ -262,8 +301,10 @@ function collectFiles(dir, base) {
|
|
|
262
301
|
}
|
|
263
302
|
else {
|
|
264
303
|
result.push({
|
|
265
|
-
|
|
304
|
+
// The path becomes the S3 key and the URL path, so always '/'.
|
|
305
|
+
relativePath: path.relative(baseDir, full).split(path.sep).join('/'),
|
|
266
306
|
absolutePath: full,
|
|
307
|
+
size: fs.statSync(full).size,
|
|
267
308
|
});
|
|
268
309
|
}
|
|
269
310
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/serve/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/serve/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import { Command } from 'commander';
|
|
3
|
+
import fs from 'node:fs';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { setupTestEnv, cleanupTestEnv, mockFetch, mockFetchSequence, captureConsole } from '../../__tests__/helpers.js';
|
|
6
|
+
import { registerServe, uploadBatches, UPLOAD_BATCH_BYTES } from './index.js';
|
|
7
|
+
function createProgram() {
|
|
8
|
+
const program = new Command();
|
|
9
|
+
program.exitOverride();
|
|
10
|
+
registerServe(program);
|
|
11
|
+
return program;
|
|
12
|
+
}
|
|
13
|
+
const SITE_ID = 'e116a320-962a-4d8e-bce5-b6f07c385fc5';
|
|
14
|
+
const DEPLOY_ID = '1e6ad43c-4740-445e-bb93-34996dd34386';
|
|
15
|
+
describe('serve', () => {
|
|
16
|
+
let dir;
|
|
17
|
+
const origProjectEnv = process.env.SITEPONG_PROJECT_ID;
|
|
18
|
+
beforeEach(() => { dir = setupTestEnv(); });
|
|
19
|
+
afterEach(() => {
|
|
20
|
+
cleanupTestEnv();
|
|
21
|
+
vi.restoreAllMocks();
|
|
22
|
+
if (origProjectEnv === undefined)
|
|
23
|
+
delete process.env.SITEPONG_PROJECT_ID;
|
|
24
|
+
else
|
|
25
|
+
process.env.SITEPONG_PROJECT_ID = origProjectEnv;
|
|
26
|
+
});
|
|
27
|
+
it('lists sites (the API answers a bare array with url)', async () => {
|
|
28
|
+
const fetchMock = mockFetch([
|
|
29
|
+
{
|
|
30
|
+
id: SITE_ID, organization_id: 'org-123', name: 'Jupiter', slug: 'jupiter-rentals', spa_mode: false,
|
|
31
|
+
current_deployment_id: DEPLOY_ID, project_id: 'proj-456', created_at: '2026-10-26T03:50:14Z',
|
|
32
|
+
serve_github_links: null, url: 'https://jupiter-rentals.serve.sitepong.com',
|
|
33
|
+
},
|
|
34
|
+
]);
|
|
35
|
+
const con = captureConsole();
|
|
36
|
+
await createProgram().parseAsync(['node', 'test', 'serve', 'sites', '--project', 'proj-456']);
|
|
37
|
+
const url = fetchMock.mock.calls[0][0];
|
|
38
|
+
expect(url).toContain('/api/sites?organization_id=org-123&project_id=proj-456');
|
|
39
|
+
expect(JSON.parse(con.logs.join('\n'))[0].url).toBe('https://jupiter-rentals.serve.sitepong.com');
|
|
40
|
+
con.restore();
|
|
41
|
+
});
|
|
42
|
+
it('creates a site with the project the API requires', async () => {
|
|
43
|
+
const fetchMock = mockFetch({ id: SITE_ID, slug: 'my-site', url: 'https://my-site.serve.sitepong.com' }, true, 201);
|
|
44
|
+
const con = captureConsole();
|
|
45
|
+
await createProgram().parseAsync(['node', 'test', 'serve', 'create', '--name', 'My Site']);
|
|
46
|
+
const body = JSON.parse(fetchMock.mock.calls[0][1].body);
|
|
47
|
+
expect(body).toMatchObject({ name: 'My Site', project_id: 'proj-456', spa_mode: false });
|
|
48
|
+
con.restore();
|
|
49
|
+
});
|
|
50
|
+
it('refuses to create a site with no project in context', async () => {
|
|
51
|
+
// Drop the project from the stored context.
|
|
52
|
+
const ctxFile = path.join(process.env.SITEPONG_HOME, 'contexts', 'org-123.json');
|
|
53
|
+
const ctx = JSON.parse(fs.readFileSync(ctxFile, 'utf-8'));
|
|
54
|
+
delete ctx.project_id;
|
|
55
|
+
fs.writeFileSync(ctxFile, JSON.stringify(ctx));
|
|
56
|
+
delete process.env.SITEPONG_PROJECT_ID;
|
|
57
|
+
const fetchMock = mockFetch({});
|
|
58
|
+
const exit = vi.spyOn(process, 'exit').mockImplementation(() => { throw new Error('exit'); });
|
|
59
|
+
const con = captureConsole();
|
|
60
|
+
const cwd = process.cwd();
|
|
61
|
+
process.chdir(dir); // away from any .sitepong.json in the repo
|
|
62
|
+
try {
|
|
63
|
+
await expect(createProgram().parseAsync(['node', 'test', 'serve', 'create', '--name', 'x'])).rejects.toThrow('exit');
|
|
64
|
+
}
|
|
65
|
+
finally {
|
|
66
|
+
process.chdir(cwd);
|
|
67
|
+
}
|
|
68
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
69
|
+
expect(con.errors.join('\n')).toContain('No project selected');
|
|
70
|
+
con.restore();
|
|
71
|
+
exit.mockRestore();
|
|
72
|
+
});
|
|
73
|
+
it('deploys: create deployment, upload files as base64 with posix paths, finalize, print the live url', async () => {
|
|
74
|
+
const site = path.join(dir, 'dist');
|
|
75
|
+
fs.mkdirSync(path.join(site, 'assets'), { recursive: true });
|
|
76
|
+
fs.writeFileSync(path.join(site, 'index.html'), '<h1>hi</h1>');
|
|
77
|
+
fs.writeFileSync(path.join(site, 'assets', 'app.js'), 'console.log(1)');
|
|
78
|
+
const fetchMock = mockFetchSequence([
|
|
79
|
+
{ data: { id: DEPLOY_ID, s3_key_prefix: `sites/${SITE_ID}/deployments/${DEPLOY_ID}/`, status: 'uploading' } },
|
|
80
|
+
{ data: { uploaded: 2, total_size_bytes: 25 } },
|
|
81
|
+
{ data: { deployment_id: DEPLOY_ID, status: 'live', url: 'https://jupiter-rentals.serve.sitepong.com' } },
|
|
82
|
+
]);
|
|
83
|
+
const con = captureConsole();
|
|
84
|
+
await createProgram().parseAsync(['node', 'test', 'serve', 'deploy', site, '--site', SITE_ID]);
|
|
85
|
+
const calls = fetchMock.mock.calls.map((c) => [c[1].method, c[0]]);
|
|
86
|
+
expect(calls[0]).toEqual(['POST', expect.stringContaining(`/api/sites/${SITE_ID}/deployments?`)]);
|
|
87
|
+
expect(calls[1]).toEqual(['POST', expect.stringContaining(`/deployments/${DEPLOY_ID}/files`)]);
|
|
88
|
+
expect(calls[2]).toEqual(['POST', expect.stringContaining(`/deployments/${DEPLOY_ID}/finalize`)]);
|
|
89
|
+
const files = JSON.parse(fetchMock.mock.calls[1][1].body).files;
|
|
90
|
+
const byPath = Object.fromEntries(files.map((f) => [f.path, f]));
|
|
91
|
+
expect(Object.keys(byPath).sort()).toEqual(['assets/app.js', 'index.html']);
|
|
92
|
+
expect(Buffer.from(byPath['index.html'].content, 'base64').toString()).toBe('<h1>hi</h1>');
|
|
93
|
+
expect(byPath['index.html'].content_type).toBe('text/html');
|
|
94
|
+
con.restore();
|
|
95
|
+
});
|
|
96
|
+
it('lists env var names', async () => {
|
|
97
|
+
const fetchMock = mockFetch([{ id: 'v1', key: 'API_URL', created_at: '2026-10-01' }]);
|
|
98
|
+
const con = captureConsole();
|
|
99
|
+
await createProgram().parseAsync(['node', 'test', 'serve', 'env', 'list', SITE_ID]);
|
|
100
|
+
expect(fetchMock.mock.calls[0][0]).toContain(`/api/sites/${SITE_ID}/env`);
|
|
101
|
+
expect(JSON.parse(con.logs.join('\n'))).toEqual([{ id: 'v1', key: 'API_URL', created_at: '2026-10-01' }]);
|
|
102
|
+
con.restore();
|
|
103
|
+
});
|
|
104
|
+
it('deletes an env var by key (list is a bare array)', async () => {
|
|
105
|
+
const fetchMock = mockFetchSequence([
|
|
106
|
+
{ data: [{ id: 'a0b1c2d3-0000-4000-8000-000000000001', key: 'API_URL', created_at: '2026-10-01' }] },
|
|
107
|
+
{ data: { deleted: true } },
|
|
108
|
+
]);
|
|
109
|
+
const con = captureConsole();
|
|
110
|
+
await createProgram().parseAsync(['node', 'test', 'serve', 'env', 'delete', SITE_ID, 'API_URL']);
|
|
111
|
+
expect(fetchMock.mock.calls[1][1].method).toBe('DELETE');
|
|
112
|
+
expect(fetchMock.mock.calls[1][0]).toContain('/env/a0b1c2d3-0000-4000-8000-000000000001');
|
|
113
|
+
con.restore();
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
describe('uploadBatches', () => {
|
|
117
|
+
const f = (name, size) => ({ relativePath: name, size });
|
|
118
|
+
it('cuts batches by encoded size so no body passes the 50 MB server cap', () => {
|
|
119
|
+
const big = 20 * 1024 * 1024; // 26.7 MB base64
|
|
120
|
+
const batches = uploadBatches([f('a', big), f('b', big), f('c', 10)]);
|
|
121
|
+
expect(batches.map((b) => b.map((x) => x.relativePath))).toEqual([['a'], ['b', 'c']]);
|
|
122
|
+
for (const b of batches) {
|
|
123
|
+
const encoded = b.reduce((n, x) => n + Math.ceil(x.size / 3) * 4, 0);
|
|
124
|
+
expect(encoded).toBeLessThanOrEqual(UPLOAD_BATCH_BYTES);
|
|
125
|
+
}
|
|
126
|
+
});
|
|
127
|
+
it('still caps a batch at 50 files', () => {
|
|
128
|
+
const files = Array.from({ length: 120 }, (_, i) => f(`f${i}`, 10));
|
|
129
|
+
expect(uploadBatches(files).map((b) => b.length)).toEqual([50, 50, 20]);
|
|
130
|
+
});
|
|
131
|
+
it('rejects a single file the API cannot take', () => {
|
|
132
|
+
expect(() => uploadBatches([f('huge.mp4', 40 * 1024 * 1024)])).toThrow(/huge\.mp4/);
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
//# sourceMappingURL=serve.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serve.test.js","sourceRoot":"","sources":["../../../src/commands/serve/serve.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,10 +9,14 @@ export function registerTeam(parent) {
|
|
|
9
9
|
const { requireOrg } = await import('../../config/context.js');
|
|
10
10
|
const { output } = await import('../../output/format.js');
|
|
11
11
|
const ctx = requireOrg(opts);
|
|
12
|
-
const
|
|
12
|
+
const { listFrom } = await import('../../client/envelope.js');
|
|
13
|
+
// { data: [{ id, user_id, role, created_at, email }], callerRole }.
|
|
14
|
+
// user_id is what `team update` / `team remove` take; there is no
|
|
15
|
+
// joined_at column, the membership row's created_at is when they joined.
|
|
16
|
+
const res = await apiClient().get('/api/dashboard/team', {
|
|
13
17
|
query: { organization_id: ctx.org_id },
|
|
14
18
|
});
|
|
15
|
-
output(
|
|
19
|
+
output(listFrom(res), ['user_id', 'email', 'role', 'created_at']);
|
|
16
20
|
});
|
|
17
21
|
team
|
|
18
22
|
.command('invite')
|
|
@@ -39,13 +43,14 @@ export function registerTeam(parent) {
|
|
|
39
43
|
const { requireOrg } = await import('../../config/context.js');
|
|
40
44
|
const { output } = await import('../../output/format.js');
|
|
41
45
|
const ctx = requireOrg(opts);
|
|
42
|
-
const
|
|
46
|
+
const { listFrom } = await import('../../client/envelope.js');
|
|
47
|
+
const res = await apiClient().get('/api/dashboard/team/invitations', {
|
|
43
48
|
query: { organization_id: ctx.org_id },
|
|
44
49
|
});
|
|
45
|
-
output(
|
|
50
|
+
output(listFrom(res), ['id', 'email', 'role', 'status', 'created_at', 'expires_at']);
|
|
46
51
|
});
|
|
47
52
|
team
|
|
48
|
-
.command('update <user-id>')
|
|
53
|
+
.command('update <user-id-or-email>')
|
|
49
54
|
.description("Update a team member's role")
|
|
50
55
|
.requiredOption('--role <role>', 'Role (admin|member)')
|
|
51
56
|
.option('--org <id>', 'Organization ID')
|
|
@@ -57,8 +62,8 @@ export function registerTeam(parent) {
|
|
|
57
62
|
const members = await apiClient().get('/api/dashboard/team', {
|
|
58
63
|
query: { organization_id: ctx.org_id },
|
|
59
64
|
});
|
|
60
|
-
const
|
|
61
|
-
const member =
|
|
65
|
+
const { listFrom } = await import('../../client/envelope.js');
|
|
66
|
+
const member = listFrom(members).find((m) => m.user_id === userId || m.email === userId);
|
|
62
67
|
if (!member) {
|
|
63
68
|
console.error(`Member ${userId} not found in this organization.`);
|
|
64
69
|
process.exit(1);
|
|
@@ -69,7 +74,7 @@ export function registerTeam(parent) {
|
|
|
69
74
|
success(`Role updated to ${opts.role}.`);
|
|
70
75
|
});
|
|
71
76
|
team
|
|
72
|
-
.command('remove <user-id>')
|
|
77
|
+
.command('remove <user-id-or-email>')
|
|
73
78
|
.description('Remove a team member')
|
|
74
79
|
.option('--org <id>', 'Organization ID')
|
|
75
80
|
.action(async (userId, opts) => {
|
|
@@ -79,8 +84,8 @@ export function registerTeam(parent) {
|
|
|
79
84
|
const members = await apiClient().get('/api/dashboard/team', {
|
|
80
85
|
query: { organization_id: ctx.org_id },
|
|
81
86
|
});
|
|
82
|
-
const
|
|
83
|
-
const member =
|
|
87
|
+
const { listFrom } = await import('../../client/envelope.js');
|
|
88
|
+
const member = listFrom(members).find((m) => m.user_id === userId || m.email === userId);
|
|
84
89
|
if (!member) {
|
|
85
90
|
console.error(`Member ${userId} not found in this organization.`);
|
|
86
91
|
process.exit(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/team/index.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,YAAY,CAAC,MAAe;IAC1C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAEvE,IAAI;SACD,OAAO,CAAC,SAAS,CAAC;SAClB,WAAW,CAAC,mBAAmB,CAAC;SAChC,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC;SACvC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC1D,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAC/D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/team/index.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,YAAY,CAAC,MAAe;IAC1C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAEvE,IAAI;SACD,OAAO,CAAC,SAAS,CAAC;SAClB,WAAW,CAAC,mBAAmB,CAAC;SAChC,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC;SACvC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC1D,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAC/D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAC9D,oEAAoE;QACpE,kEAAkE;QAClE,yEAAyE;QACzE,MAAM,GAAG,GAAG,MAAM,SAAS,EAAE,CAAC,GAAG,CAAC,qBAAqB,EAAE;YACvD,KAAK,EAAE,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;SACvC,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,sBAAsB,CAAC;SACnC,cAAc,CAAC,iBAAiB,EAAE,eAAe,CAAC;SAClD,MAAM,CAAC,eAAe,EAAE,qBAAqB,EAAE,QAAQ,CAAC;SACxD,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC;SACvC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC1D,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAC/D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACxD,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,SAAS,EAAE,CAAC,IAAI,CAAC,iCAAiC,EAAE;YACxD,IAAI,EAAE,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;SAC1E,CAAC,CAAC;QACH,OAAO,CAAC,sBAAsB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,aAAa,CAAC;SACtB,WAAW,CAAC,0BAA0B,CAAC;SACvC,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC;SACvC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC1D,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAC/D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,GAAG,GAAG,MAAM,SAAS,EAAE,CAAC,GAAG,CAAC,iCAAiC,EAAE;YACnE,KAAK,EAAE,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;SACvC,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,2BAA2B,CAAC;SACpC,WAAW,CAAC,6BAA6B,CAAC;SAC1C,cAAc,CAAC,eAAe,EAAE,qBAAqB,CAAC;SACtD,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC;SACvC,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,IAAI,EAAE,EAAE;QACrC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC1D,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAC/D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACxD,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,SAAS,EAAE,CAAC,GAAG,CAAC,qBAAqB,EAAE;YAC3D,KAAK,EAAE,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;SACvC,CAAC,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM,IAAI,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;QACzF,IAAI,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,UAAU,MAAM,kCAAkC,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QACpG,MAAM,SAAS,EAAE,CAAC,KAAK,CAAC,qBAAqB,EAAE;YAC7C,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAY,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;SACnD,CAAC,CAAC;QACH,OAAO,CAAC,mBAAmB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEL,IAAI;SACD,OAAO,CAAC,2BAA2B,CAAC;SACpC,WAAW,CAAC,sBAAsB,CAAC;SACnC,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC;SACvC,MAAM,CAAC,KAAK,EAAE,MAAc,EAAE,IAAI,EAAE,EAAE;QACrC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC1D,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,SAAS,EAAE,CAAC,GAAG,CAAC,qBAAqB,EAAE;YAC3D,KAAK,EAAE,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;SACvC,CAAC,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM,IAAI,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;QACzF,IAAI,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,UAAU,MAAM,kCAAkC,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QACpG,MAAM,SAAS,EAAE,CAAC,MAAM,CAAC,qBAAqB,EAAE;YAC9C,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAY,EAAE;SACnC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -12,32 +12,40 @@ describe('team', () => {
|
|
|
12
12
|
beforeEach(() => { setupTestEnv(); });
|
|
13
13
|
afterEach(() => { cleanupTestEnv(); vi.restoreAllMocks(); });
|
|
14
14
|
it('lists members', async () => {
|
|
15
|
-
|
|
15
|
+
// Real shape: { data: [{ id, user_id, role, created_at, email }], callerRole }.
|
|
16
|
+
const fetchMock = mockFetch({
|
|
17
|
+
data: [{ id: 'm1', user_id: 'u1', role: 'owner', created_at: '2026-01-19T21:49:07Z', email: 'a@b.com' }],
|
|
18
|
+
callerRole: 'owner',
|
|
19
|
+
});
|
|
16
20
|
const con = captureConsole();
|
|
17
21
|
await createProgram().parseAsync(['node', 'test', 'team', 'members']);
|
|
18
|
-
expect(fetchMock.mock.calls[0][0]).toContain('/team');
|
|
22
|
+
expect(fetchMock.mock.calls[0][0]).toContain('/team?organization_id=');
|
|
23
|
+
const out = JSON.parse(con.logs.join('\n'));
|
|
24
|
+
expect(out).toEqual([{ id: 'm1', user_id: 'u1', role: 'owner', created_at: '2026-01-19T21:49:07Z', email: 'a@b.com' }]);
|
|
19
25
|
con.restore();
|
|
20
26
|
});
|
|
21
27
|
it('invites a member', async () => {
|
|
22
|
-
const fetchMock = mockFetch({});
|
|
28
|
+
const fetchMock = mockFetch({ data: { id: 'inv1', email: 'new@test.com', role: 'member', status: 'pending' } }, true, 201);
|
|
23
29
|
const con = captureConsole();
|
|
24
30
|
await createProgram().parseAsync(['node', 'test', 'team', 'invite', '--email', 'new@test.com', '--role', 'member']);
|
|
31
|
+
expect(fetchMock.mock.calls[0][0]).toContain('/api/dashboard/team/invitations');
|
|
25
32
|
const body = JSON.parse(fetchMock.mock.calls[0][1].body);
|
|
26
33
|
expect(body.email).toBe('new@test.com');
|
|
27
34
|
expect(body.role).toBe('member');
|
|
28
35
|
con.restore();
|
|
29
36
|
});
|
|
30
37
|
it('lists invitations', async () => {
|
|
31
|
-
const fetchMock = mockFetch([{ id: 'inv1', email: 'new@test.com', status: 'pending' }]);
|
|
38
|
+
const fetchMock = mockFetch({ data: [{ id: 'inv1', email: 'new@test.com', role: 'member', status: 'pending', created_at: '2026-10-30', expires_at: '2026-11-06', invited_by: 'u1' }] });
|
|
32
39
|
const con = captureConsole();
|
|
33
40
|
await createProgram().parseAsync(['node', 'test', 'team', 'invitations']);
|
|
34
41
|
expect(fetchMock.mock.calls[0][0]).toContain('/invitations');
|
|
42
|
+
expect(JSON.parse(con.logs.join('\n'))[0].email).toBe('new@test.com');
|
|
35
43
|
con.restore();
|
|
36
44
|
});
|
|
37
45
|
it("updates a member's role", async () => {
|
|
38
46
|
const fetchMock = mockFetchSequence([
|
|
39
|
-
{ data: [{ id: 'm1', user_id: 'u1', role: 'member' }] },
|
|
40
|
-
{ data: { id: 'm1', role: 'admin' } },
|
|
47
|
+
{ data: { data: [{ id: 'm1', user_id: 'u1', role: 'member', email: 'a@b.com' }], callerRole: 'owner' } },
|
|
48
|
+
{ data: { data: { id: 'm1', role: 'admin' } } },
|
|
41
49
|
]);
|
|
42
50
|
const con = captureConsole();
|
|
43
51
|
await createProgram().parseAsync(['node', 'test', 'team', 'update', 'u1', '--role', 'admin']);
|
|
@@ -48,11 +56,11 @@ describe('team', () => {
|
|
|
48
56
|
});
|
|
49
57
|
it('removes a member', async () => {
|
|
50
58
|
const fetchMock = mockFetchSequence([
|
|
51
|
-
{ data: [{ id: 'm1', user_id: 'u1', role: 'member' }] },
|
|
59
|
+
{ data: { data: [{ id: 'm1', user_id: 'u1', role: 'member', email: 'a@b.com' }], callerRole: 'owner' } },
|
|
52
60
|
{ data: { success: true } },
|
|
53
61
|
]);
|
|
54
62
|
const con = captureConsole();
|
|
55
|
-
await createProgram().parseAsync(['node', 'test', 'team', 'remove', '
|
|
63
|
+
await createProgram().parseAsync(['node', 'test', 'team', 'remove', 'a@b.com']);
|
|
56
64
|
expect(fetchMock.mock.calls[0][0]).toContain('/team');
|
|
57
65
|
expect(fetchMock.mock.calls[1][1].method).toBe('DELETE');
|
|
58
66
|
expect(fetchMock.mock.calls[1][0]).toContain('id=m1');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"team.test.js","sourceRoot":"","sources":["../../../src/commands/team/team.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACxH,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,SAAS,aAAa;IACpB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,OAAO,CAAC,YAAY,EAAE,CAAC;IACvB,YAAY,CAAC,OAAO,CAAC,CAAC;IACtB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,UAAU,CAAC,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,SAAS,CAAC,GAAG,EAAE,GAAG,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7D,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;QAC7B,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"team.test.js","sourceRoot":"","sources":["../../../src/commands/team/team.test.ts"],"names":[],"mappings":"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"}
|