@scalar/cli 2.12.2 → 2.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +221 -2
- package/chunks/{action-JXCU2JKC.js → action-27BJMHFD.js} +38 -6
- package/chunks/{action-WLPCBFRE.js → action-4EJA6UEB.js} +16 -16
- package/chunks/{action-JDXGQSQN.js → action-5MJTAO5X.js} +36 -23
- package/chunks/{action-H5XQIZKX.js → action-6FPGU5SY.js} +51 -24
- package/chunks/{action-HMPATNVE.js → action-6RQDLMOM.js} +53 -30
- package/chunks/{action-Y7EBKCUU.js → action-ASBFLTOA.js} +1 -1
- package/chunks/{action-HRRNN33O.js → action-AWHBOHGW.js} +68 -89
- package/chunks/{action-UOH5L2JF.js → action-ENN7KFBZ.js} +93 -54
- package/chunks/{action-ZNBXKA7T.js → action-ESVI46KE.js} +4 -4
- package/chunks/{action-LCTTNNFD.js → action-EVNUUWR5.js} +33 -17
- package/chunks/{action-OWWGJ34K.js → action-F6JSCBEU.js} +34 -16
- package/chunks/{action-2RIPHL6V.js → action-FZNFBX6U.js} +23 -6
- package/chunks/{action-DJ6FLPXH.js → action-GNYNOFDK.js} +15 -5
- package/chunks/{action-HOLFCPUY.js → action-JSYHIEYP.js} +12 -12
- package/chunks/action-KTY5ICV5.js +55 -0
- package/chunks/{action-IIQMZVRJ.js → action-LRR52RXL.js} +10 -8
- package/chunks/{action-Z3UXS5KI.js → action-LVYFHK4D.js} +6 -4
- package/chunks/{action-XBTIONQD.js → action-NN7QF6MI.js} +9 -6
- package/chunks/{action-2GIOY3HU.js → action-OD4GNHM3.js} +48 -28
- package/chunks/{action-OY5LI7TW.js → action-OZWRV54F.js} +9 -8
- package/chunks/{action-AZNY2B7G.js → action-QZV6IPK4.js} +26 -11
- package/chunks/action-S7PMEFCE.js +423 -0
- package/chunks/{action-6IL6KE3L.js → action-SZ6SG3RB.js} +16 -16
- package/chunks/{action-PRLW546C.js → action-U3MQZ5ZQ.js} +12 -12
- package/chunks/action-UAGYB4ZS.js +48 -0
- package/chunks/{action-U3R6AXJY.js → action-UVAYACFA.js} +6 -6
- package/chunks/{action-7OJTNQRM.js → action-VXEJNBNR.js} +9 -8
- package/chunks/{action-KE53K5EJ.js → action-W24B4YT5.js} +14 -14
- package/chunks/{action-QA5ATGWB.js → action-WQICTF7K.js} +67 -45
- package/chunks/{action-SFRYHYTZ.js → action-WUWWJGRJ.js} +6 -4
- package/chunks/{action-II3OJSGP.js → action-Y4YLWZHL.js} +12 -12
- package/chunks/{action-2NJJO35T.js → action-YEAOKB6V.js} +13 -11
- package/chunks/{action-LGNWFVEG.js → action-YFTRHKOK.js} +63 -48
- package/chunks/{action-QEYNGQXG.js → action-YQSSXJAX.js} +10 -7
- package/chunks/{action-IYUOT7XX.js → action-ZL2CXRJR.js} +8 -6
- package/chunks/{actions-DKQERAKZ.js → actions-GHHWF4Q2.js} +20 -18
- package/chunks/{agent-KQKNJZKK.js → agent-XAHNA4MB.js} +3 -3
- package/chunks/{asyncapi-MKBEQYBV.js → asyncapi-TICSLZRM.js} +52 -42
- package/chunks/{build.action-EGAOPKSX.js → build.action-AURC6QZ6.js} +37 -20
- package/chunks/{chunk-ZZTCEMCG.js → chunk-2AK5O3NQ.js} +2 -2
- package/chunks/chunk-2I6V7AI3.js +68 -0
- package/chunks/chunk-2XWUFFEZ.js +133 -0
- package/chunks/{chunk-7GOHWSPA.js → chunk-62OOT7FY.js} +5 -2
- package/chunks/{chunk-W2JGSGIQ.js → chunk-7K6I2GUG.js} +15 -9
- package/chunks/{chunk-5VZSFLRO.js → chunk-7O5H2SQP.js} +2 -2
- package/chunks/{chunk-FJREFWEE.js → chunk-7S34K2P3.js} +1 -1
- package/chunks/{chunk-PIWBFJX3.js → chunk-AOZQPCWI.js} +2 -0
- package/chunks/{chunk-EBNFCIKS.js → chunk-APX65SRT.js} +2 -1
- package/chunks/{chunk-GZA7GEZW.js → chunk-B3XOSR6W.js} +2 -2
- package/chunks/{chunk-VJAVNG6U.js → chunk-CSJIKXUD.js} +1 -1
- package/chunks/{chunk-MLBEF6MB.js → chunk-DDDYR2HF.js} +1 -1
- package/chunks/{chunk-TQL55CUG.js → chunk-EXJUFF6G.js} +1 -1
- package/chunks/{chunk-W6FLDNRM.js → chunk-IRA5BW2J.js} +2 -2
- package/chunks/chunk-IRQJDPZE.js +34 -0
- package/chunks/{chunk-ZK76AK3B.js → chunk-KPLWZIOV.js} +22 -3
- package/chunks/chunk-LK2ZIDHH.js +32 -0
- package/chunks/{chunk-3DKOVKCV.js → chunk-M2MMGSLK.js} +5 -5
- package/chunks/{chunk-FD364GM7.js → chunk-NRHHB3YY.js} +1 -1
- package/chunks/{chunk-W3Y5X3X3.js → chunk-OVKTA5CX.js} +12 -5
- package/chunks/chunk-PVDORWEM.js +167 -0
- package/chunks/chunk-RAJM56L7.js +60 -0
- package/chunks/{chunk-UJU2ORWU.js → chunk-RAU5KE6F.js} +1 -1
- package/chunks/{chunk-V6LUKXBV.js → chunk-RE5Z56QD.js} +2 -2
- package/chunks/chunk-SNQFFEYH.js +11 -0
- package/chunks/{chunk-GUF4PKDL.js → chunk-TI4NDKQC.js} +6 -5
- package/chunks/{chunk-VRZRTOZF.js → chunk-TKT5UW3G.js} +2 -2
- package/chunks/{chunk-A27OERJM.js → chunk-TVPVXL73.js} +7 -7
- package/chunks/{chunk-4RF2NKQN.js → chunk-TYNF7ROW.js} +1 -1
- package/chunks/{chunk-HDNCXPCZ.js → chunk-VNF2GRZA.js} +2 -2
- package/chunks/chunk-WDFZ7WYJ.js +16 -0
- package/chunks/{chunk-672Y6REB.js → chunk-WKW5W2ZP.js} +1 -1
- package/chunks/chunk-XUX6JXU5.js +58 -0
- package/chunks/{chunk-6YOXEMMX.js → chunk-Y2OQOAY7.js} +1 -1
- package/chunks/{create.action-UUDVWZ3F.js → create.action-O3HN6GV2.js} +32 -23
- package/chunks/{delete.action-XRP3VU5C.js → delete.action-2L2RWLPI.js} +36 -22
- package/chunks/{delete.action-EUQ4ESLJ.js → delete.action-KEBI2QCS.js} +38 -22
- package/chunks/{get.action-IYA5Q3RI.js → get.action-BUNTDW54.js} +13 -11
- package/chunks/{get.action-UHCFOKUQ.js → get.action-WDMTCZZR.js} +14 -14
- package/chunks/{list.action-3CCWEEAM.js → list.action-JNSEJVHX.js} +14 -14
- package/chunks/{list.action-D3GHA6S5.js → list.action-NSK7OBRH.js} +16 -16
- package/chunks/{publish.action-HIVWJ7QE.js → publish.action-ZRZQUL7S.js} +49 -29
- package/chunks/{update.action-NSKVEZES.js → update.action-7TA46AE6.js} +36 -22
- package/chunks/{update.action-VOZNA7BV.js → update.action-O2R5ODGG.js} +47 -27
- package/index.js +226 -149
- package/package.json +1 -1
- package/skills/scalar-cli/SKILL.md +4 -2
- package/template.md +220 -1
- package/chunks/action-RNVV27ET.js +0 -165
- package/chunks/action-ZHDGAUGG.js +0 -38
- package/chunks/chunk-AC62V47N.js +0 -38
- package/chunks/chunk-EGOXR5FB.js +0 -15
- package/chunks/chunk-JFIXNSPP.js +0 -26
- package/chunks/{action-UHXBY3RD.js → action-3P66ZSL3.js} +1 -1
|
@@ -1,47 +1,53 @@
|
|
|
1
1
|
import { createRequire as $$cR } from "node:module"; const require = $$cR(import.meta.url);
|
|
2
2
|
import {
|
|
3
3
|
getPublishDeploymentUrl
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-7S34K2P3.js";
|
|
5
5
|
import {
|
|
6
6
|
getProjectDeployments
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-B3XOSR6W.js";
|
|
8
8
|
import {
|
|
9
9
|
resolveProject
|
|
10
10
|
} from "./chunk-TSURUX4A.js";
|
|
11
11
|
import {
|
|
12
12
|
formatAbsoluteTime
|
|
13
13
|
} from "./chunk-AEFPCC4U.js";
|
|
14
|
-
import "./chunk-
|
|
15
|
-
import
|
|
16
|
-
|
|
14
|
+
import "./chunk-62OOT7FY.js";
|
|
15
|
+
import {
|
|
16
|
+
writeJson
|
|
17
|
+
} from "./chunk-SNQFFEYH.js";
|
|
18
|
+
import "./chunk-TI4NDKQC.js";
|
|
19
|
+
import "./chunk-OVKTA5CX.js";
|
|
17
20
|
import {
|
|
18
21
|
apiService
|
|
19
|
-
} from "./chunk-
|
|
20
|
-
import "./chunk-
|
|
21
|
-
import "./chunk-
|
|
22
|
+
} from "./chunk-TVPVXL73.js";
|
|
23
|
+
import "./chunk-2AK5O3NQ.js";
|
|
24
|
+
import "./chunk-KPLWZIOV.js";
|
|
22
25
|
import "./chunk-YTTDYTVB.js";
|
|
23
|
-
import "./chunk-
|
|
24
|
-
import "./chunk-
|
|
25
|
-
import "./chunk-
|
|
26
|
-
import "./chunk-
|
|
27
|
-
import "./chunk-V6LUKXBV.js";
|
|
26
|
+
import "./chunk-Y2OQOAY7.js";
|
|
27
|
+
import "./chunk-IRA5BW2J.js";
|
|
28
|
+
import "./chunk-EXJUFF6G.js";
|
|
29
|
+
import "./chunk-RE5Z56QD.js";
|
|
28
30
|
import "./chunk-VUXPDHTQ.js";
|
|
29
31
|
import {
|
|
30
32
|
getAuthData
|
|
31
|
-
} from "./chunk-
|
|
32
|
-
import "./chunk-
|
|
33
|
-
import "./chunk-
|
|
33
|
+
} from "./chunk-DDDYR2HF.js";
|
|
34
|
+
import "./chunk-CSJIKXUD.js";
|
|
35
|
+
import "./chunk-NRHHB3YY.js";
|
|
34
36
|
import "./chunk-F3TQHNSQ.js";
|
|
35
37
|
import "./chunk-VRZSDUZK.js";
|
|
36
38
|
import {
|
|
39
|
+
cancelOperation,
|
|
40
|
+
confirm,
|
|
37
41
|
requireInteractive
|
|
38
|
-
} from "./chunk-
|
|
42
|
+
} from "./chunk-XUX6JXU5.js";
|
|
43
|
+
import "./chunk-IRQJDPZE.js";
|
|
39
44
|
import "./chunk-4ORL4MST.js";
|
|
40
|
-
import "./chunk-
|
|
45
|
+
import "./chunk-TYNF7ROW.js";
|
|
41
46
|
import {
|
|
42
47
|
output
|
|
43
48
|
} from "./chunk-T5HJUAWB.js";
|
|
44
|
-
import "./chunk-
|
|
49
|
+
import "./chunk-5ENKYZA4.js";
|
|
50
|
+
import "./chunk-AOZQPCWI.js";
|
|
45
51
|
import "./chunk-Q26DFKTY.js";
|
|
46
52
|
import {
|
|
47
53
|
external_exports,
|
|
@@ -49,9 +55,6 @@ import {
|
|
|
49
55
|
} from "./chunk-I57ID5K7.js";
|
|
50
56
|
import "./chunk-3MZYUBJ6.js";
|
|
51
57
|
|
|
52
|
-
// src/domains/project/rollback/action.ts
|
|
53
|
-
import { confirm } from "@clack/prompts";
|
|
54
|
-
|
|
55
58
|
// src/domains/project/rollback/select-rollback-target.ts
|
|
56
59
|
function selectRollbackTarget({
|
|
57
60
|
deployments,
|
|
@@ -137,6 +140,15 @@ async function rollbackAction(args) {
|
|
|
137
140
|
});
|
|
138
141
|
if (!targetResult.success) {
|
|
139
142
|
if (targetResult.error.code === "already-live") {
|
|
143
|
+
if (args.json) {
|
|
144
|
+
writeJson({
|
|
145
|
+
uid: targetResult.error.uid,
|
|
146
|
+
projectUid: project.uid,
|
|
147
|
+
slug,
|
|
148
|
+
status: "already-live"
|
|
149
|
+
});
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
140
152
|
output.info().title("Already live").message(
|
|
141
153
|
`Build "${targetResult.error.uid}" is already the live deployment.`
|
|
142
154
|
).print();
|
|
@@ -149,29 +161,40 @@ async function rollbackAction(args) {
|
|
|
149
161
|
(target.deployedAt ?? target.createdAt) * 1e3
|
|
150
162
|
);
|
|
151
163
|
if (!yes) {
|
|
152
|
-
requireInteractive(
|
|
164
|
+
requireInteractive(
|
|
165
|
+
"Pass --yes to confirm a rollback non-interactively.",
|
|
166
|
+
args.json
|
|
167
|
+
);
|
|
153
168
|
const shouldContinue = await confirm({
|
|
154
169
|
message: `Roll back the live deployment of "${slug}" to build ${target.uid} (${deployedLabel})?`,
|
|
155
170
|
initialValue: false
|
|
156
171
|
});
|
|
157
172
|
if (shouldContinue !== true) {
|
|
158
|
-
|
|
159
|
-
return;
|
|
173
|
+
return cancelOperation();
|
|
160
174
|
}
|
|
161
175
|
}
|
|
162
|
-
const logger = output.info({ animate: true }).loader(`Rolling back to build ${target.uid} (${deployedLabel})`);
|
|
176
|
+
const logger = args.json ? void 0 : output.info({ animate: true }).loader(`Rolling back to build ${target.uid} (${deployedLabel})`);
|
|
163
177
|
const redeployResult = await apiClient.publish.redeploy(target.uid);
|
|
164
178
|
if (redeployResult.error) {
|
|
165
|
-
logger
|
|
179
|
+
logger?.update("loader", 0, {
|
|
166
180
|
content: `Rollback to build ${target.uid} failed`
|
|
167
181
|
});
|
|
168
|
-
logger
|
|
182
|
+
logger?.finish();
|
|
169
183
|
return output.error().title("Rollback failed").message(redeployResult.message).exit("error");
|
|
170
184
|
}
|
|
171
|
-
|
|
185
|
+
if (args.json) {
|
|
186
|
+
writeJson({
|
|
187
|
+
uid: target.uid,
|
|
188
|
+
projectUid: project.uid,
|
|
189
|
+
slug,
|
|
190
|
+
status: "redeployed"
|
|
191
|
+
});
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
194
|
+
logger?.update("loader", 0, {
|
|
172
195
|
content: `Rolled back to build ${target.uid} (${deployedLabel})`
|
|
173
196
|
});
|
|
174
|
-
logger
|
|
197
|
+
logger?.finish();
|
|
175
198
|
const deploymentUrl = getPublishDeploymentUrl(target);
|
|
176
199
|
if (deploymentUrl) {
|
|
177
200
|
output.info().line(`Deployment URL: ${deploymentUrl}`).print();
|
|
@@ -1,50 +1,51 @@
|
|
|
1
1
|
import { createRequire as $$cR } from "node:module"; const require = $$cR(import.meta.url);
|
|
2
|
-
import {
|
|
3
|
-
getPublishDeploymentUrl
|
|
4
|
-
} from "./chunk-FJREFWEE.js";
|
|
5
2
|
import {
|
|
6
3
|
readAndParseConfig,
|
|
7
4
|
renderConfigError
|
|
8
5
|
} from "./chunk-4YQVGOHX.js";
|
|
9
|
-
import {
|
|
10
|
-
resolveProject
|
|
11
|
-
} from "./chunk-TSURUX4A.js";
|
|
12
6
|
import {
|
|
13
7
|
DEFAULT_ASSETS_DIR
|
|
14
8
|
} from "./chunk-MQ65WBVF.js";
|
|
15
|
-
import "./chunk-7GOHWSPA.js";
|
|
16
9
|
import {
|
|
17
|
-
|
|
18
|
-
|
|
10
|
+
defaultWaitSeconds,
|
|
11
|
+
finishPublish,
|
|
12
|
+
timeoutSchema
|
|
13
|
+
} from "./chunk-PVDORWEM.js";
|
|
14
|
+
import "./chunk-7S34K2P3.js";
|
|
15
|
+
import {
|
|
16
|
+
resolveProject
|
|
17
|
+
} from "./chunk-TSURUX4A.js";
|
|
18
|
+
import "./chunk-62OOT7FY.js";
|
|
19
|
+
import "./chunk-SNQFFEYH.js";
|
|
20
|
+
import "./chunk-OVKTA5CX.js";
|
|
19
21
|
import {
|
|
20
22
|
apiService
|
|
21
|
-
} from "./chunk-
|
|
22
|
-
import "./chunk-
|
|
23
|
-
import "./chunk-
|
|
23
|
+
} from "./chunk-TVPVXL73.js";
|
|
24
|
+
import "./chunk-2AK5O3NQ.js";
|
|
25
|
+
import "./chunk-KPLWZIOV.js";
|
|
24
26
|
import "./chunk-YTTDYTVB.js";
|
|
25
|
-
import "./chunk-
|
|
26
|
-
import "./chunk-
|
|
27
|
-
import "./chunk-
|
|
28
|
-
import "./chunk-
|
|
29
|
-
import "./chunk-V6LUKXBV.js";
|
|
27
|
+
import "./chunk-Y2OQOAY7.js";
|
|
28
|
+
import "./chunk-IRA5BW2J.js";
|
|
29
|
+
import "./chunk-EXJUFF6G.js";
|
|
30
|
+
import "./chunk-RE5Z56QD.js";
|
|
30
31
|
import "./chunk-VUXPDHTQ.js";
|
|
31
32
|
import {
|
|
32
33
|
getAuthData
|
|
33
|
-
} from "./chunk-
|
|
34
|
-
import "./chunk-
|
|
35
|
-
import "./chunk-
|
|
34
|
+
} from "./chunk-DDDYR2HF.js";
|
|
35
|
+
import "./chunk-CSJIKXUD.js";
|
|
36
|
+
import "./chunk-NRHHB3YY.js";
|
|
36
37
|
import "./chunk-F3TQHNSQ.js";
|
|
37
38
|
import {
|
|
38
39
|
ConfigVersion,
|
|
39
|
-
isGithubBackedDocsProject
|
|
40
|
-
publishRecordSchema
|
|
40
|
+
isGithubBackedDocsProject
|
|
41
41
|
} from "./chunk-VRZSDUZK.js";
|
|
42
42
|
import "./chunk-4ORL4MST.js";
|
|
43
|
-
import "./chunk-
|
|
43
|
+
import "./chunk-TYNF7ROW.js";
|
|
44
44
|
import {
|
|
45
45
|
output
|
|
46
46
|
} from "./chunk-T5HJUAWB.js";
|
|
47
|
-
import "./chunk-
|
|
47
|
+
import "./chunk-5ENKYZA4.js";
|
|
48
|
+
import "./chunk-AOZQPCWI.js";
|
|
48
49
|
import "./chunk-Q26DFKTY.js";
|
|
49
50
|
import {
|
|
50
51
|
slugSchema,
|
|
@@ -332,12 +333,19 @@ async function publishProject({
|
|
|
332
333
|
configPath,
|
|
333
334
|
config,
|
|
334
335
|
slug,
|
|
335
|
-
mode
|
|
336
|
+
mode,
|
|
337
|
+
json = false
|
|
336
338
|
}) {
|
|
337
339
|
try {
|
|
338
340
|
const root = path.join(configDir, config.root ?? "./");
|
|
339
341
|
const missingReferences = findMissingReferences(root, config);
|
|
340
|
-
if (missingReferences.length > 0) {
|
|
342
|
+
if (missingReferences.length > 0 && json) {
|
|
343
|
+
console.error(
|
|
344
|
+
"[WARN] Config references missing files:",
|
|
345
|
+
missingReferences.join(", ")
|
|
346
|
+
);
|
|
347
|
+
}
|
|
348
|
+
if (missingReferences.length > 0 && !json) {
|
|
341
349
|
output.warn().title("Some files referenced by your config were not found").message(
|
|
342
350
|
`The build may fail because these paths do not exist:
|
|
343
351
|
${missingReferences.map((reference) => ` - ${reference}`).join("\n")}`
|
|
@@ -383,20 +391,17 @@ async function publishUnifiedDocsProjectFromGithub({
|
|
|
383
391
|
};
|
|
384
392
|
}
|
|
385
393
|
|
|
386
|
-
// src/helpers/utils.ts
|
|
387
|
-
var sleep = (ms) => {
|
|
388
|
-
return new Promise((resolve) => {
|
|
389
|
-
setTimeout(resolve, ms);
|
|
390
|
-
});
|
|
391
|
-
};
|
|
392
|
-
|
|
393
394
|
// src/domains/project/publish/action.ts
|
|
394
395
|
async function publishAction(args) {
|
|
395
396
|
const argsParseResult = zod_default.object({
|
|
396
397
|
slug: slugSchema,
|
|
397
398
|
config: zod_default.string().optional(),
|
|
398
399
|
preview: zod_default.coerce.boolean().default(false),
|
|
399
|
-
github: zod_default.coerce.boolean().default(false)
|
|
400
|
+
github: zod_default.coerce.boolean().default(false),
|
|
401
|
+
wait: zod_default.boolean().default(true),
|
|
402
|
+
timeout: timeoutSchema.optional()
|
|
403
|
+
}).refine((value) => value.wait || value.timeout === void 0, {
|
|
404
|
+
message: "--timeout cannot be combined with --no-wait."
|
|
400
405
|
}).safeParse(args);
|
|
401
406
|
if (argsParseResult.error)
|
|
402
407
|
return output.error().title("Invalid arguments").message(argsParseResult.error.issues[0].message).exit("error");
|
|
@@ -404,7 +409,9 @@ async function publishAction(args) {
|
|
|
404
409
|
config: configPathOption,
|
|
405
410
|
slug,
|
|
406
411
|
preview,
|
|
407
|
-
github
|
|
412
|
+
github,
|
|
413
|
+
wait,
|
|
414
|
+
timeout = defaultWaitSeconds
|
|
408
415
|
} = argsParseResult.data;
|
|
409
416
|
const apiClient = await apiService();
|
|
410
417
|
const auth = await getAuthData();
|
|
@@ -434,9 +441,13 @@ async function publishAction(args) {
|
|
|
434
441
|
if (!publishResult3.success) {
|
|
435
442
|
return output.error().title("Could not publish from GitHub").message(publishResult3.error).exit("error");
|
|
436
443
|
}
|
|
437
|
-
return await
|
|
444
|
+
return await finishPublish({
|
|
445
|
+
wait,
|
|
446
|
+
timeout,
|
|
438
447
|
teamUid: auth.teamUid,
|
|
439
|
-
|
|
448
|
+
accessToken: auth.accessToken,
|
|
449
|
+
publishUid: publishResult3.publishUid,
|
|
450
|
+
json: args.json
|
|
440
451
|
});
|
|
441
452
|
}
|
|
442
453
|
if (!isGithubBackedDocsProject(resolved.project)) {
|
|
@@ -457,9 +468,13 @@ async function publishAction(args) {
|
|
|
457
468
|
if (!publishResult2.success) {
|
|
458
469
|
return output.error().title("Could not publish from GitHub").message(publishResult2.error).exit("error");
|
|
459
470
|
}
|
|
460
|
-
return await
|
|
471
|
+
return await finishPublish({
|
|
472
|
+
wait,
|
|
473
|
+
timeout,
|
|
461
474
|
teamUid: auth.teamUid,
|
|
462
|
-
|
|
475
|
+
accessToken: auth.accessToken,
|
|
476
|
+
publishUid: publishResult2.publishUid,
|
|
477
|
+
json: args.json
|
|
463
478
|
});
|
|
464
479
|
}
|
|
465
480
|
const configResult = readAndParseConfig(configPathOption ?? "");
|
|
@@ -467,9 +482,16 @@ async function publishAction(args) {
|
|
|
467
482
|
renderConfigError(configResult.error);
|
|
468
483
|
}
|
|
469
484
|
const { config, filePath: configPath } = configResult;
|
|
470
|
-
|
|
485
|
+
if (args.json && config.version === ConfigVersion.V1) {
|
|
486
|
+
console.error(
|
|
487
|
+
"[WARN] The v1 configuration will be upgraded for this build only."
|
|
488
|
+
);
|
|
489
|
+
} else {
|
|
490
|
+
warnIfLegacyConfig(config);
|
|
491
|
+
}
|
|
471
492
|
const publishResult = await publishProject({
|
|
472
493
|
config,
|
|
494
|
+
json: args.json,
|
|
473
495
|
slug,
|
|
474
496
|
configDir: dirname(configPath),
|
|
475
497
|
configPath,
|
|
@@ -480,9 +502,13 @@ async function publishAction(args) {
|
|
|
480
502
|
publishResult.error instanceof Error ? publishResult.error.message : publishResult.error
|
|
481
503
|
).exit("error");
|
|
482
504
|
}
|
|
483
|
-
return await
|
|
505
|
+
return await finishPublish({
|
|
506
|
+
wait,
|
|
507
|
+
timeout,
|
|
484
508
|
teamUid: auth.teamUid,
|
|
485
|
-
|
|
509
|
+
accessToken: auth.accessToken,
|
|
510
|
+
publishUid: publishResult.publishUid,
|
|
511
|
+
json: args.json
|
|
486
512
|
});
|
|
487
513
|
}
|
|
488
514
|
function warnIfLegacyConfig(config) {
|
|
@@ -491,54 +517,7 @@ function warnIfLegacyConfig(config) {
|
|
|
491
517
|
"It will be upgraded to v2 for this build only. Run `scalar project upgrade` to upgrade the config file."
|
|
492
518
|
).print();
|
|
493
519
|
}
|
|
494
|
-
async function waitForPublish({
|
|
495
|
-
teamUid,
|
|
496
|
-
publishUid
|
|
497
|
-
}) {
|
|
498
|
-
const dbClient = await getDatabaseClient();
|
|
499
|
-
const logger = output.info({ animate: true }).loader("Deploying project\u2026");
|
|
500
|
-
while (true) {
|
|
501
|
-
const deployStatus = await getDeployStatus({
|
|
502
|
-
client: dbClient,
|
|
503
|
-
publishUid,
|
|
504
|
-
teamUid
|
|
505
|
-
});
|
|
506
|
-
if (deployStatus.error === true) {
|
|
507
|
-
return output.error().title("Could not load deployment status").exit("error");
|
|
508
|
-
}
|
|
509
|
-
logger.update("loader", 0, { content: deployStatus.data.message });
|
|
510
|
-
if (deployStatus.data.status === "deployed") {
|
|
511
|
-
const deploymentUrl = getPublishDeploymentUrl(deployStatus.data);
|
|
512
|
-
if (deploymentUrl) {
|
|
513
|
-
output.info().line(
|
|
514
|
-
`${deployStatus.data.preview ? "Preview URL" : "Deployment URL"}: ${deploymentUrl}`
|
|
515
|
-
).print();
|
|
516
|
-
}
|
|
517
|
-
if (deployStatus.data.hasWarnings) {
|
|
518
|
-
output.warn().title("The build finished with warnings").line("Check the build log in the Scalar Dashboard for details.").print();
|
|
519
|
-
}
|
|
520
|
-
logger.exit("success");
|
|
521
|
-
return;
|
|
522
|
-
}
|
|
523
|
-
if (deployStatus.data.status === "error" || deployStatus.data.status === "cancelled") {
|
|
524
|
-
return logger.exit("error");
|
|
525
|
-
}
|
|
526
|
-
await sleep(3e3);
|
|
527
|
-
}
|
|
528
|
-
}
|
|
529
|
-
async function getDeployStatus({
|
|
530
|
-
client,
|
|
531
|
-
publishUid,
|
|
532
|
-
teamUid
|
|
533
|
-
}) {
|
|
534
|
-
return client.getOne({
|
|
535
|
-
collectionPath: `team/${teamUid}/publish`,
|
|
536
|
-
schema: publishRecordSchema,
|
|
537
|
-
query: { uid: publishUid }
|
|
538
|
-
});
|
|
539
|
-
}
|
|
540
520
|
export {
|
|
541
521
|
publishAction,
|
|
542
|
-
waitForPublish,
|
|
543
522
|
warnIfLegacyConfig
|
|
544
523
|
};
|
|
@@ -1,35 +1,39 @@
|
|
|
1
1
|
import { createRequire as $$cR } from "node:module"; const require = $$cR(import.meta.url);
|
|
2
|
+
import {
|
|
3
|
+
createServerSession
|
|
4
|
+
} from "./chunk-2I6V7AI3.js";
|
|
2
5
|
import {
|
|
3
6
|
getFileOrUrl,
|
|
4
7
|
isDocument,
|
|
5
8
|
loadOpenApiDocument,
|
|
6
9
|
printSpecificationBanner
|
|
7
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-7K6I2GUG.js";
|
|
8
11
|
import {
|
|
9
12
|
isAsyncApiDocument,
|
|
10
13
|
safeNormalize
|
|
11
|
-
} from "./chunk-
|
|
12
|
-
import
|
|
13
|
-
err,
|
|
14
|
-
ok
|
|
15
|
-
} from "./chunk-5ENKYZA4.js";
|
|
14
|
+
} from "./chunk-WKW5W2ZP.js";
|
|
15
|
+
import "./chunk-2XWUFFEZ.js";
|
|
16
16
|
import {
|
|
17
17
|
watchFile
|
|
18
|
-
} from "./chunk-
|
|
18
|
+
} from "./chunk-RE5Z56QD.js";
|
|
19
19
|
import "./chunk-VUXPDHTQ.js";
|
|
20
|
-
import "./chunk-
|
|
21
|
-
import "./chunk-
|
|
22
|
-
import "./chunk-
|
|
20
|
+
import "./chunk-DDDYR2HF.js";
|
|
21
|
+
import "./chunk-CSJIKXUD.js";
|
|
22
|
+
import "./chunk-NRHHB3YY.js";
|
|
23
23
|
import "./chunk-F3TQHNSQ.js";
|
|
24
24
|
import "./chunk-VRZSDUZK.js";
|
|
25
25
|
import {
|
|
26
26
|
isUrl
|
|
27
27
|
} from "./chunk-4ORL4MST.js";
|
|
28
|
-
import "./chunk-
|
|
28
|
+
import "./chunk-TYNF7ROW.js";
|
|
29
29
|
import {
|
|
30
30
|
output
|
|
31
31
|
} from "./chunk-T5HJUAWB.js";
|
|
32
|
-
import
|
|
32
|
+
import {
|
|
33
|
+
err,
|
|
34
|
+
ok
|
|
35
|
+
} from "./chunk-5ENKYZA4.js";
|
|
36
|
+
import "./chunk-AOZQPCWI.js";
|
|
33
37
|
import "./chunk-Q26DFKTY.js";
|
|
34
38
|
import "./chunk-I57ID5K7.js";
|
|
35
39
|
import "./chunk-3MZYUBJ6.js";
|
|
@@ -123,12 +127,7 @@ var loadServeDocument = async (input) => {
|
|
|
123
127
|
};
|
|
124
128
|
|
|
125
129
|
// src/domains/document/serve/action.ts
|
|
126
|
-
async function serveAction(inputArgument, {
|
|
127
|
-
watch,
|
|
128
|
-
once,
|
|
129
|
-
port,
|
|
130
|
-
config
|
|
131
|
-
}) {
|
|
130
|
+
async function serveAction(inputArgument, { watch, port, config }) {
|
|
132
131
|
if (!inputArgument) {
|
|
133
132
|
return output.error().title("Invalid argument").message("Provide a file path or URL.").exit("error");
|
|
134
133
|
}
|
|
@@ -145,6 +144,7 @@ async function serveAction(inputArgument, {
|
|
|
145
144
|
if (!isAsyncApiDocument(specification) && Object.keys(specification.paths ?? {}).length === 0) {
|
|
146
145
|
output.warn().title("No paths found in the OpenAPI description").print();
|
|
147
146
|
}
|
|
147
|
+
const session = createServerSession();
|
|
148
148
|
const app = new Hono();
|
|
149
149
|
app.get("/", (c) => {
|
|
150
150
|
return c.html(getHtmlDocument(specification, watch, configuration.data));
|
|
@@ -157,46 +157,85 @@ async function serveAction(inputArgument, {
|
|
|
157
157
|
});
|
|
158
158
|
app.get("/__watcher", (c) => {
|
|
159
159
|
return stream(c, async (s) => {
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
if (
|
|
175
|
-
|
|
160
|
+
let stopped = false;
|
|
161
|
+
let subscription;
|
|
162
|
+
let finish = () => void 0;
|
|
163
|
+
const disconnected = new Promise((resolve) => {
|
|
164
|
+
finish = resolve;
|
|
165
|
+
});
|
|
166
|
+
const stop = () => {
|
|
167
|
+
stopped = true;
|
|
168
|
+
finish();
|
|
169
|
+
};
|
|
170
|
+
s.onAbort(stop);
|
|
171
|
+
session.signal.addEventListener("abort", stop, { once: true });
|
|
172
|
+
if (s.aborted || session.signal.aborted) stop();
|
|
173
|
+
try {
|
|
174
|
+
if (watch && !stopped) {
|
|
175
|
+
let reloading = false;
|
|
176
|
+
let pending = false;
|
|
177
|
+
let previous = JSON.stringify(specification);
|
|
178
|
+
subscription = await watchFile(
|
|
179
|
+
inputArgument,
|
|
180
|
+
async function reload() {
|
|
181
|
+
if (stopped) return;
|
|
182
|
+
if (reloading) {
|
|
183
|
+
pending = true;
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
pending = false;
|
|
187
|
+
reloading = true;
|
|
188
|
+
try {
|
|
189
|
+
const newResult = await loadServeDocument(inputArgument);
|
|
190
|
+
if (stopped || !newResult.specification) return;
|
|
191
|
+
const serialized = JSON.stringify(newResult.specification);
|
|
192
|
+
if (previous === serialized) return;
|
|
193
|
+
previous = serialized;
|
|
194
|
+
output.info().title(
|
|
195
|
+
as.grey(
|
|
196
|
+
`${isAsyncApiDocument(newResult.specification) ? "AsyncAPI" : "OpenAPI"} file modified`
|
|
197
|
+
)
|
|
198
|
+
).print();
|
|
199
|
+
printServeBanner(newResult);
|
|
200
|
+
specification = newResult.specification;
|
|
201
|
+
await s.write("data: file modified\n\n");
|
|
202
|
+
} catch (error) {
|
|
203
|
+
if (!stopped) output.warn().title(String(error)).print();
|
|
204
|
+
} finally {
|
|
205
|
+
reloading = false;
|
|
206
|
+
if (pending) await reload();
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
);
|
|
176
210
|
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
211
|
+
await disconnected;
|
|
212
|
+
} finally {
|
|
213
|
+
stopped = true;
|
|
214
|
+
session.signal.removeEventListener("abort", stop);
|
|
215
|
+
await subscription?.unsubscribe();
|
|
180
216
|
}
|
|
181
217
|
});
|
|
182
218
|
});
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
219
|
+
try {
|
|
220
|
+
await session.setServer(
|
|
221
|
+
serve(
|
|
222
|
+
{
|
|
223
|
+
fetch: app.fetch,
|
|
224
|
+
port: port ?? 3e3
|
|
225
|
+
},
|
|
226
|
+
(info) => {
|
|
227
|
+
output.info().line(
|
|
228
|
+
`${as.green.bold("\u279C API Reference server")} ${as.white(
|
|
229
|
+
"listening on"
|
|
230
|
+
)} ${as.cyan(`http://localhost:${info.port}`)}`
|
|
231
|
+
).print();
|
|
232
|
+
}
|
|
233
|
+
)
|
|
234
|
+
);
|
|
235
|
+
return session;
|
|
236
|
+
} catch (error) {
|
|
237
|
+
await session.close();
|
|
238
|
+
throw error;
|
|
200
239
|
}
|
|
201
240
|
}
|
|
202
241
|
var getHtmlDocument = (specification, watch = false, configuration = {}) => {
|
|
@@ -4,11 +4,11 @@ import {
|
|
|
4
4
|
downloadIsolate,
|
|
5
5
|
isDiskWriteError,
|
|
6
6
|
updateIsolate
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-TKT5UW3G.js";
|
|
8
8
|
import "./chunk-ORCUZITN.js";
|
|
9
|
-
import "./chunk-
|
|
10
|
-
import "./chunk-
|
|
11
|
-
import "./chunk-
|
|
9
|
+
import "./chunk-RAU5KE6F.js";
|
|
10
|
+
import "./chunk-CSJIKXUD.js";
|
|
11
|
+
import "./chunk-NRHHB3YY.js";
|
|
12
12
|
import "./chunk-T5HJUAWB.js";
|
|
13
13
|
import "./chunk-3MZYUBJ6.js";
|
|
14
14
|
export {
|