@dcupl/cli 1.4.0-beta.8 → 1.4.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 +10 -3
- package/dist/cli.d.ts +2 -0
- package/dist/cli.js +71 -51
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/commands/data/render.d.ts +3 -1
- package/dist/functions/app/commands/data/render.js +9 -1
- package/dist/functions/app/commands/data/render.js.map +1 -1
- package/dist/functions/app/commands/fn/group-by.js +4 -2
- package/dist/functions/app/commands/fn/group-by.js.map +1 -1
- package/dist/functions/app/commands/loaders/remove.js +2 -0
- package/dist/functions/app/commands/loaders/remove.js.map +1 -1
- package/dist/functions/app/commands/query/execute.js +2 -13
- package/dist/functions/app/commands/query/execute.js.map +1 -1
- package/dist/functions/app/commands/query-input.d.ts +1 -0
- package/dist/functions/app/commands/query-input.js +15 -2
- package/dist/functions/app/commands/query-input.js.map +1 -1
- package/dist/functions/app/commands/sort-input.d.ts +5 -0
- package/dist/functions/app/commands/sort-input.js +34 -0
- package/dist/functions/app/commands/sort-input.js.map +1 -0
- package/dist/functions/app/daemon/controllers/data.controller.d.ts +3 -4
- package/dist/functions/app/daemon/controllers/data.controller.js +2 -2
- package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/loaders.controller.js +1 -1
- package/dist/functions/app/daemon/controllers/loaders.controller.js.map +1 -1
- package/dist/functions/app/daemon/services/csv-delimiter.d.ts +15 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js +99 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js.map +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +15 -2
- package/dist/functions/app/daemon/services/dcupl-host.service.js +127 -13
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/daemon/services/group-sort.d.ts +25 -0
- package/dist/functions/app/daemon/services/group-sort.js +128 -0
- package/dist/functions/app/daemon/services/group-sort.js.map +1 -0
- package/dist/functions/app/daemon/services/ingest.service.d.ts +1 -0
- package/dist/functions/app/daemon/services/ingest.service.js +9 -7
- package/dist/functions/app/daemon/services/ingest.service.js.map +1 -1
- package/dist/functions/app/daemon/services/loaders.service.d.ts +1 -1
- package/dist/functions/app/daemon/services/loaders.service.js +7 -1
- package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
- package/dist/functions/app/daemon/services/normalize-query.d.ts +11 -2
- package/dist/functions/app/daemon/services/normalize-query.js +55 -4
- package/dist/functions/app/daemon/services/normalize-query.js.map +1 -1
- package/dist/functions/app/daemon/services/staged-keys.d.ts +12 -0
- package/dist/functions/app/daemon/services/staged-keys.js +72 -0
- package/dist/functions/app/daemon/services/staged-keys.js.map +1 -0
- package/dist/functions/config/commands/set.js +2 -2
- package/dist/functions/config/commands/set.js.map +1 -1
- package/dist/functions/config/prompts.d.ts +2 -1
- package/dist/functions/config/prompts.js.map +1 -1
- package/dist/functions/files/commands/pull.js +2 -3
- package/dist/functions/files/commands/pull.js.map +1 -1
- package/dist/functions/files/files-push.js +1 -1
- package/dist/functions/files/files-push.js.map +1 -1
- package/dist/functions/files/helper/confirm.js +2 -3
- package/dist/functions/files/helper/confirm.js.map +1 -1
- package/dist/functions/generate/files/generate-code.js +0 -1
- package/dist/functions/generate/files/generate-code.js.map +1 -1
- package/dist/functions/generate/files/generate-files.d.ts +10 -1
- package/dist/functions/generate/files/generate-files.js +154 -43
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/files/generate-schema.js +1 -1
- package/dist/functions/generate/files/generate-schema.js.map +1 -1
- package/dist/functions/generate/files/generate.helper.d.ts +9 -3
- package/dist/functions/generate/files/generate.helper.js +11 -8
- package/dist/functions/generate/files/generate.helper.js.map +1 -1
- package/dist/functions/generate/files/rest-api-template.d.ts +16 -0
- package/dist/functions/generate/files/rest-api-template.js +63 -0
- package/dist/functions/generate/files/rest-api-template.js.map +1 -0
- package/dist/functions/generate/files/script-starters.d.ts +7 -0
- package/dist/functions/generate/files/script-starters.js +75 -0
- package/dist/functions/generate/files/script-starters.js.map +1 -0
- package/dist/functions/generate/files/workflow-presets.js +2 -1
- package/dist/functions/generate/files/workflow-presets.js.map +1 -1
- package/dist/functions/generate/model-from-data/generate-model-from-data.d.ts +1 -0
- package/dist/functions/generate/model-from-data/generate-model-from-data.js +67 -4
- package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
- package/dist/functions/generate/projects/generate-project.js +9 -11
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/api-client.d.ts +1 -0
- package/dist/functions/helper/api-client.js +8 -2
- package/dist/functions/helper/api-client.js.map +1 -1
- package/dist/functions/helper/config.helper.js +1 -1
- package/dist/functions/helper/config.helper.js.map +1 -1
- package/dist/functions/helper/prompt.d.ts +2 -0
- package/dist/functions/helper/prompt.js +8 -0
- package/dist/functions/helper/prompt.js.map +1 -0
- package/dist/functions/schemas/examples/ResponseScriptConfig.example.json +1 -1
- package/dist/functions/schemas/examples/RestApiTemplate.example.json +30 -0
- package/dist/functions/schemas/format.js +3 -1
- package/dist/functions/schemas/format.js.map +1 -1
- package/dist/functions/schemas/registry.d.ts +2 -1
- package/dist/functions/schemas/registry.js +13 -1
- package/dist/functions/schemas/registry.js.map +1 -1
- package/dist/functions/schemas/resolve.d.ts +1 -0
- package/dist/functions/schemas/resolve.js +32 -1
- package/dist/functions/schemas/resolve.js.map +1 -1
- package/dist/functions/serve/dev-server/request-security.js +1 -0
- package/dist/functions/serve/dev-server/request-security.js.map +1 -1
- package/dist/functions/workflow/commands/deploy.js +4 -7
- package/dist/functions/workflow/commands/deploy.js.map +1 -1
- package/dist/functions/workflow/commands/run.d.ts +2 -8
- package/dist/functions/workflow/commands/run.js +5 -14
- package/dist/functions/workflow/commands/run.js.map +1 -1
- package/dist/functions/workflow/commands/status.d.ts +1 -1
- package/dist/functions/workflow/commands/status.js +7 -1
- package/dist/functions/workflow/commands/status.js.map +1 -1
- package/dist/functions/workflow/commands/test.d.ts +2 -8
- package/dist/functions/workflow/commands/test.js +10 -19
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/run-failure.js +1 -1
- package/dist/functions/workflow/run-failure.js.map +1 -1
- package/dist/functions/workflow/types.d.ts +11 -2
- package/dist/functions/workflow/types.js +4 -0
- package/dist/functions/workflow/types.js.map +1 -1
- package/dist/functions/workflow/wait-for-swap.d.ts +24 -1
- package/dist/functions/workflow/wait-for-swap.js +58 -0
- package/dist/functions/workflow/wait-for-swap.js.map +1 -1
- package/dist/functions/workflow/workflow-api.d.ts +7 -7
- package/dist/functions/workflow/workflow-api.js +28 -15
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/files/common/_gitignore +2 -1
- package/package.json +13 -9
|
@@ -13,6 +13,7 @@ export interface ApiClientRequestOptions {
|
|
|
13
13
|
headers?: Record<string, string>;
|
|
14
14
|
responseType?: string;
|
|
15
15
|
timeoutMs?: number;
|
|
16
|
+
relaysUpstreamAuth?: boolean;
|
|
16
17
|
}
|
|
17
18
|
export interface ApiClient {
|
|
18
19
|
request<T = any>(method: string, path: string, options?: ApiClientRequestOptions): Promise<T>;
|
|
@@ -35,6 +35,10 @@ function networkErrorMessage(code, baseURL) {
|
|
|
35
35
|
return `Could not reach the console API at ${baseURL} (${code}).`;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
+
function stripRouteQuery(message) {
|
|
39
|
+
return typeof message === 'string' ? message.replace(/^(Cannot [A-Z]+ [^?\s]*)\?\S*/, '$1') : message;
|
|
40
|
+
}
|
|
41
|
+
const GUARD_REJECTION_MESSAGES = new Set(['Forbidden resource', 'Unauthorized']);
|
|
38
42
|
function createApiClient(basePath) {
|
|
39
43
|
const currentBasePath = basePath || process.cwd();
|
|
40
44
|
const config = (0, config_helper_1.getConfigFileValue)(currentBasePath, undefined, { quiet: true });
|
|
@@ -72,8 +76,10 @@ function createApiClient(basePath) {
|
|
|
72
76
|
catch (err) {
|
|
73
77
|
if (err instanceof axios_1.AxiosError && err.response) {
|
|
74
78
|
const status = err.response.status;
|
|
75
|
-
const serverMessage = err.response.data?.message || err.message;
|
|
76
|
-
const
|
|
79
|
+
const serverMessage = stripRouteQuery(err.response.data?.message || err.message);
|
|
80
|
+
const cliKeyRejected = (status === 401 || status === 403) &&
|
|
81
|
+
!(options?.relaysUpstreamAuth && !GUARD_REJECTION_MESSAGES.has(String(serverMessage)));
|
|
82
|
+
const message = cliKeyRejected
|
|
77
83
|
? `API key rejected (${serverMessage}). Check your key with \`dcupl config set --api-key <key>\` and that it has access to this project.`
|
|
78
84
|
: serverMessage;
|
|
79
85
|
throw new ApiClientError(message, `HTTP_${status}`, status, err.response.data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../../src/functions/helper/api-client.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../../src/functions/helper/api-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.helper.js","sourceRoot":"","sources":["../../../src/functions/helper/config.helper.ts"],"names":[],"mappings":";;;AAAA,uCAAmE;AACnE,+BAA4B;AAC5B,+CAAgD;AA6BnC,QAAA,qBAAqB,GAAmB;IACnD,SAAS,EAAE,EAAE;IACb,UAAU,EAAE,qBAAqB;IACjC,cAAc,EAAE,cAAc;IAC9B,YAAY,EAAE,YAAY;IAC1B,UAAU,EAAE,OAAO;IACnB,mBAAmB,EAAE,oBAAoB;IACzC,eAAe,EAAE,eAAe;IAChC,gBAAgB,EAAE,iBAAiB;IACnC,aAAa,EAAE,2BAA2B;IAC1C,OAAO,EAAE;QACP,UAAU,EAAE,YAAY;QACxB,WAAW,EAAE,mBAAmB;QAChC,WAAW,EAAE,oBAAoB;KAClC;IACD,WAAW,EAAE;
|
|
1
|
+
{"version":3,"file":"config.helper.js","sourceRoot":"","sources":["../../../src/functions/helper/config.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.prompt = prompt;
|
|
4
|
+
async function prompt(questions) {
|
|
5
|
+
const { default: inquirer } = await import('inquirer');
|
|
6
|
+
return (await inquirer.prompt(questions));
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=prompt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/functions/helper/prompt.ts"],"names":[],"mappings":";;AAgBA,wBAKC;AALM,KAAK,UAAU,MAAM,CAAoB,SAAyC;IACvF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;IAGvD,OAAO,CAAC,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAwC,CAAC,CAAM,CAAC;AAChF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{ "script": "return {
|
|
1
|
+
{ "script": "return { ok: true, count: $items().length };" }
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
{
|
|
2
|
+
"key": "orders-api",
|
|
3
|
+
"name": "Orders API",
|
|
4
|
+
"description": "Scripted endpoints over the orders application. Push with `dcupl files push`, then deploy from the console's REST APIs page.",
|
|
5
|
+
"dcuplConfig": {
|
|
6
|
+
"projectId": "<project id>",
|
|
7
|
+
"apiKey": "<api key the runner loads the project with>",
|
|
8
|
+
"processOptions": { "applicationKey": "default" }
|
|
9
|
+
},
|
|
10
|
+
"vGuardEnabled": false,
|
|
11
|
+
"auth": [{ "type": "api-key", "value": "<key callers send in the api-key header>" }],
|
|
12
|
+
"endpoints": [
|
|
13
|
+
{
|
|
14
|
+
"path": "orders/summary",
|
|
15
|
+
"method": "GET",
|
|
16
|
+
"scriptKey": "orders_summary",
|
|
17
|
+
"description": "Served by scripts/orders_summary.js (an `endpoint` mode script, see `dcupl generate script --mode endpoint`)"
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"path": "orders/:id",
|
|
21
|
+
"method": "GET",
|
|
22
|
+
"scriptKey": "order_detail"
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
"path": "orders/search",
|
|
26
|
+
"method": "POST",
|
|
27
|
+
"scriptKey": "orders_search"
|
|
28
|
+
}
|
|
29
|
+
]
|
|
30
|
+
}
|
|
@@ -9,6 +9,7 @@ function formatList(entries, opts) {
|
|
|
9
9
|
group: e.group,
|
|
10
10
|
kind: e.kind,
|
|
11
11
|
package: e.package,
|
|
12
|
+
...(e.aliases ? { aliases: e.aliases } : {}),
|
|
12
13
|
description: e.description,
|
|
13
14
|
}));
|
|
14
15
|
}
|
|
@@ -17,12 +18,13 @@ function formatList(entries, opts) {
|
|
|
17
18
|
Loader: [],
|
|
18
19
|
Workflows: [],
|
|
19
20
|
'Workflow Nodes': [],
|
|
21
|
+
'REST APIs': [],
|
|
20
22
|
'CLI Config': [],
|
|
21
23
|
};
|
|
22
24
|
for (const e of entries)
|
|
23
25
|
groups[e.group].push(e);
|
|
24
26
|
const lines = [];
|
|
25
|
-
const order = ['Models', 'Loader', 'Workflows', 'Workflow Nodes', 'CLI Config'];
|
|
27
|
+
const order = ['Models', 'Loader', 'Workflows', 'Workflow Nodes', 'REST APIs', 'CLI Config'];
|
|
26
28
|
for (const g of order) {
|
|
27
29
|
if (groups[g].length === 0)
|
|
28
30
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/functions/schemas/format.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/functions/schemas/format.ts"],"names":[],"mappings":";;AAIA,gCAmCC;AAED,8BAkBC;AAvDD,SAAgB,UAAU,CAAC,OAAsB,EAAE,IAA0B;IAC3E,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACzB,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5C,WAAW,EAAE,CAAC,CAAC,WAAW;SAC3B,CAAC,CAAC,CAAC;IACN,CAAC;IAED,MAAM,MAAM,GAAuC;QACjD,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,EAAE;QACb,gBAAgB,EAAE,EAAE;QACpB,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;KACjB,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,OAAO;QAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IAC5G,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACrC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACnE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACrC,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjB,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;AACpC,CAAC;AAED,SAAgB,SAAS,CACvB,KAAkB,EAClB,MAAc,EACd,OAA2B,EAC3B,IAA0B;IAE1B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,MAAM;YACN,OAAO;SACR,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,OAAO;QAAE,OAAO,MAAM,CAAC;IAC5B,OAAO,GAAG,MAAM,oBAAoB,OAAO,EAAE,CAAC;AAChD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type SchemaGroup = 'Models' | 'Loader' | 'Workflows' | 'Workflow Nodes' | 'CLI Config';
|
|
1
|
+
export type SchemaGroup = 'Models' | 'Loader' | 'Workflows' | 'Workflow Nodes' | 'REST APIs' | 'CLI Config';
|
|
2
2
|
export type SchemaKind = 'ts' | 'zod';
|
|
3
3
|
export type SchemaEntry = {
|
|
4
4
|
name: string;
|
|
@@ -8,6 +8,7 @@ export type SchemaEntry = {
|
|
|
8
8
|
file: string;
|
|
9
9
|
exportPath: string;
|
|
10
10
|
exampleFile?: string;
|
|
11
|
+
aliases?: string[];
|
|
11
12
|
description: string;
|
|
12
13
|
};
|
|
13
14
|
export declare const SCHEMA_REGISTRY: SchemaEntry[];
|
|
@@ -92,6 +92,17 @@ exports.SCHEMA_REGISTRY = [
|
|
|
92
92
|
exampleFile: 'TemplateV3.example.json',
|
|
93
93
|
description: 'v3 workflow template — wraps WorkflowConfigV3 with key, name, variables, ui metadata.',
|
|
94
94
|
},
|
|
95
|
+
{
|
|
96
|
+
name: 'RestApiTemplate',
|
|
97
|
+
aliases: ['rest-api-template'],
|
|
98
|
+
group: 'REST APIs',
|
|
99
|
+
kind: 'zod',
|
|
100
|
+
package: '@dcupl/common-internal',
|
|
101
|
+
file: 'dist/esm/rest-api/rest-api.schemas.d.ts',
|
|
102
|
+
exportPath: 'RestApiTemplateSchema',
|
|
103
|
+
exampleFile: 'RestApiTemplate.example.json',
|
|
104
|
+
description: 'REST API template (api/<key>.api.json, alias rest-api-template): dcuplConfig, auth keys and scripted endpoints[] (path, method, scriptKey). Scaffold one with `dcupl generate api`.',
|
|
105
|
+
},
|
|
95
106
|
{
|
|
96
107
|
name: 'WorkflowVariable',
|
|
97
108
|
group: 'Workflows',
|
|
@@ -234,7 +245,7 @@ exports.SCHEMA_REGISTRY = [
|
|
|
234
245
|
},
|
|
235
246
|
];
|
|
236
247
|
function findSchema(name) {
|
|
237
|
-
return exports.SCHEMA_REGISTRY.find((s) => s.name === name);
|
|
248
|
+
return exports.SCHEMA_REGISTRY.find((s) => s.name === name || !!s.aliases?.includes(name));
|
|
238
249
|
}
|
|
239
250
|
function listValidatableSchemas() {
|
|
240
251
|
return exports.SCHEMA_REGISTRY.filter((s) => s.kind === 'zod');
|
|
@@ -261,6 +272,7 @@ function listSchemas() {
|
|
|
261
272
|
Loader: [],
|
|
262
273
|
Workflows: [],
|
|
263
274
|
'Workflow Nodes': [],
|
|
275
|
+
'REST APIs': [],
|
|
264
276
|
'CLI Config': [],
|
|
265
277
|
};
|
|
266
278
|
for (const entry of exports.SCHEMA_REGISTRY) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/functions/schemas/registry.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/functions/schemas/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,32 @@ exports.resolveSchemaSource = resolveSchemaSource;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fs = tslib_1.__importStar(require("fs"));
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
7
|
+
const module_1 = require("module");
|
|
8
|
+
function hoistedPackageRoot(pkg, requireResolve) {
|
|
9
|
+
let main;
|
|
10
|
+
try {
|
|
11
|
+
main = (requireResolve ?? (0, module_1.createRequire)(__filename).resolve)(pkg);
|
|
12
|
+
}
|
|
13
|
+
catch {
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
16
|
+
let dir = path.dirname(main);
|
|
17
|
+
while (true) {
|
|
18
|
+
const manifest = path.join(dir, 'package.json');
|
|
19
|
+
if (fs.existsSync(manifest)) {
|
|
20
|
+
try {
|
|
21
|
+
if (JSON.parse(fs.readFileSync(manifest, 'utf-8')).name === pkg)
|
|
22
|
+
return dir;
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
const parent = path.dirname(dir);
|
|
28
|
+
if (parent === dir)
|
|
29
|
+
return undefined;
|
|
30
|
+
dir = parent;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
7
33
|
function defaultCliRoot() {
|
|
8
34
|
return path.resolve(__dirname, '..', '..', '..');
|
|
9
35
|
}
|
|
@@ -22,6 +48,11 @@ function resolveSchemaSource(entry, opts = {}) {
|
|
|
22
48
|
const cliPath = path.join(cliRoot, 'node_modules', entry.package, entry.file);
|
|
23
49
|
if (fs.existsSync(cliPath))
|
|
24
50
|
return { path: cliPath, source: 'cli' };
|
|
25
|
-
|
|
51
|
+
const hoistedRoot = hoistedPackageRoot(entry.package, opts.requireResolve);
|
|
52
|
+
const hoistedPath = hoistedRoot ? path.join(hoistedRoot, entry.file) : undefined;
|
|
53
|
+
if (hoistedPath && fs.existsSync(hoistedPath))
|
|
54
|
+
return { path: hoistedPath, source: 'cli' };
|
|
55
|
+
throw new Error(`Could not resolve ${entry.name} from ${entry.package}/${entry.file}. ` +
|
|
56
|
+
`Looked in: ${[cwdPath, cliPath, hoistedPath].filter(Boolean).join(', ')}`);
|
|
26
57
|
}
|
|
27
58
|
//# sourceMappingURL=resolve.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/functions/schemas/resolve.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/functions/schemas/resolve.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ exports.DCUPL_CONSOLE_ORIGINS = [
|
|
|
20
20
|
'https://console.dcupl.com',
|
|
21
21
|
'https://next.console.dcupl.com',
|
|
22
22
|
'https://dev.console.dcupl.com',
|
|
23
|
+
'https://v1.console.dcupl.com',
|
|
23
24
|
];
|
|
24
25
|
function resolveServeHost(flag) {
|
|
25
26
|
const value = Array.isArray(flag) ? flag[flag.length - 1] : flag;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-security.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/request-security.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"request-security.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/request-security.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,14 +63,11 @@ async function deployCommand(output, client, opts, deps = {}) {
|
|
|
63
63
|
}
|
|
64
64
|
let liveNote = '';
|
|
65
65
|
if (opts.wait !== false) {
|
|
66
|
+
const timeoutMs = opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS;
|
|
66
67
|
const swap = await wait(client, head.uid, head.v, {}, { timeoutMs: opts.swapTimeout });
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
71
|
-
if (swap.outcome === 'timeout') {
|
|
72
|
-
const secs = (opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS) / 1000;
|
|
73
|
-
output.error(`swap not confirmed after ${secs}s; deployed v=${swap.deployedV}, runner still serving v=${swap.liveV ?? 'unknown'}`, 'WORKFLOW_SWAP_TIMEOUT');
|
|
68
|
+
const failure = (0, wait_for_swap_js_1.describeSwapFailure)(swap, { workflowUid: head.uid, runnerLabel, timeoutMs });
|
|
69
|
+
if (failure) {
|
|
70
|
+
output.error(failure.message, failure.code, failure.extra);
|
|
74
71
|
return;
|
|
75
72
|
}
|
|
76
73
|
if (swap.outcome === 'skipped') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/deploy.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ApiClient } from '../../helper/api-client.js';
|
|
2
2
|
import type { Output } from '../../helper/output.js';
|
|
3
3
|
import type { DeployedWorkflowV3, RunnerInfo } from '../types.js';
|
|
4
|
+
import { type InvokeTriggerRequest } from '../workflow-api.js';
|
|
4
5
|
export interface RunOptions {
|
|
5
6
|
key: string;
|
|
6
7
|
runner: string;
|
|
@@ -14,13 +15,6 @@ export interface RunDeps {
|
|
|
14
15
|
listWorkflows?: (client: ApiClient) => Promise<DeployedWorkflowV3[]>;
|
|
15
16
|
getWorkflow?: (client: ApiClient, id: string) => Promise<DeployedWorkflowV3>;
|
|
16
17
|
testNode?: (client: ApiClient, workflowId: string, nodeId: string, body: unknown) => Promise<unknown>;
|
|
17
|
-
|
|
18
|
-
runnerUrl: string;
|
|
19
|
-
key: string;
|
|
20
|
-
triggerPath: string;
|
|
21
|
-
method: string;
|
|
22
|
-
body?: unknown;
|
|
23
|
-
triggerKey?: string;
|
|
24
|
-
}) => Promise<unknown>;
|
|
18
|
+
invokeTrigger?: (client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest) => Promise<unknown>;
|
|
25
19
|
}
|
|
26
20
|
export declare function runCommand(output: Output, client: ApiClient, opts: RunOptions, deps?: RunDeps): Promise<void>;
|
|
@@ -17,7 +17,7 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
17
17
|
const listWorkflows = deps.listWorkflows ?? workflow_api_js_1.listWorkflows;
|
|
18
18
|
const getWorkflow = deps.getWorkflow ?? workflow_api_js_1.getWorkflow;
|
|
19
19
|
const doTestNode = deps.testNode ?? workflow_api_js_1.testNode;
|
|
20
|
-
const
|
|
20
|
+
const doInvoke = deps.invokeTrigger ?? workflow_api_js_1.invokeTrigger;
|
|
21
21
|
if (opts.body !== undefined && opts.input !== undefined) {
|
|
22
22
|
output.error('--body and --input are mutually exclusive; pass the payload inline OR as a file.', 'WORKFLOW_RUN_INPUT_CONFLICT');
|
|
23
23
|
return;
|
|
@@ -44,7 +44,7 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
44
44
|
let runner;
|
|
45
45
|
let runnerLabel = opts.runner;
|
|
46
46
|
let deployed = findDeployed(workflows, opts.key, runnerUid, client.projectId);
|
|
47
|
-
if (!deployed
|
|
47
|
+
if (!deployed) {
|
|
48
48
|
const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => listRunners(client), opts.runner);
|
|
49
49
|
if (!resolved.ok) {
|
|
50
50
|
output.error(resolved.message, resolved.code);
|
|
@@ -67,25 +67,16 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
67
67
|
raw = await doTestNode(client, deployed.uid, opts.node, { inputData: payload ?? { main: [] } });
|
|
68
68
|
}
|
|
69
69
|
else {
|
|
70
|
-
if (!runner) {
|
|
71
|
-
output.error(`Runner ${opts.runner} not found for this project.`, 'RUNNER_NOT_FOUND');
|
|
72
|
-
return;
|
|
73
|
-
}
|
|
74
70
|
const trigger = (template?.config?.nodes ?? []).find((n) => n.type === 'trigger-request');
|
|
75
71
|
if (!trigger) {
|
|
76
72
|
output.error('The deployed workflow has no trigger-request node; cannot run it over HTTP.', 'NO_REQUEST_TRIGGER');
|
|
77
73
|
return;
|
|
78
74
|
}
|
|
79
75
|
const method = (trigger.config.methods?.[0] ?? 'POST');
|
|
76
|
+
if (opts.triggerKey)
|
|
77
|
+
output.warn(workflow_api_js_1.TRIGGER_KEY_IGNORED_WARNING);
|
|
80
78
|
reachedRun = true;
|
|
81
|
-
raw = await
|
|
82
|
-
runnerUrl: runner.url,
|
|
83
|
-
key: deployed.key,
|
|
84
|
-
triggerPath: trigger.config.path,
|
|
85
|
-
method,
|
|
86
|
-
body: payload,
|
|
87
|
-
triggerKey: opts.triggerKey,
|
|
88
|
-
});
|
|
79
|
+
raw = await doInvoke(client, deployed.uid, trigger.id, { method, path: trigger.config.path, body: payload });
|
|
89
80
|
}
|
|
90
81
|
const trace = (0, trace_js_1.toTrace)(raw);
|
|
91
82
|
trace.workflowKey ??= deployed.key;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":";;AAkEA,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ApiClient } from '../../helper/api-client.js';
|
|
2
2
|
import type { Output } from '../../helper/output.js';
|
|
3
|
-
import type
|
|
3
|
+
import { type WorkflowStatusResponse } from '../types.js';
|
|
4
4
|
export interface StatusOptions {
|
|
5
5
|
id: string;
|
|
6
6
|
}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.statusCommand = statusCommand;
|
|
4
|
+
const types_js_1 = require("../types.js");
|
|
4
5
|
const workflow_api_js_1 = require("../workflow-api.js");
|
|
5
6
|
async function statusCommand(output, client, opts, deps = {}) {
|
|
6
7
|
const get = deps.getStatus ?? workflow_api_js_1.getStatus;
|
|
7
8
|
const status = await get(client, opts.id);
|
|
8
|
-
output.success(status, (s) =>
|
|
9
|
+
output.success(status, (s) => {
|
|
10
|
+
if ((0, types_js_1.isFailedStatus)(s)) {
|
|
11
|
+
return `${s.key}: ${s.status} — ${s.reason}`;
|
|
12
|
+
}
|
|
13
|
+
return `${s.key}: ${s.status}${s.error ? ` — ${s.error}` : ''}`;
|
|
14
|
+
});
|
|
9
15
|
}
|
|
10
16
|
//# sourceMappingURL=status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/status.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/status.ts"],"names":[],"mappings":";;AAaA,sCAeC;AA1BD,0CAA0E;AAC1E,wDAAmE;AAU5D,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,MAAiB,EACjB,IAAmB,EACnB,OAAmB,EAAE;IAErB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,2BAAgB,CAAC;IAC/C,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1C,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;QAE3B,IAAI,IAAA,yBAAc,EAAC,CAAC,CAAC,EAAE,CAAC;YACtB,OAAO,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ApiClient } from '../../helper/api-client.js';
|
|
2
2
|
import type { Output } from '../../helper/output.js';
|
|
3
3
|
import type { DeployedWorkflow, RunnerInfo, TemplateV3, ValidationResult } from '../types.js';
|
|
4
|
+
import { type InvokeTriggerRequest } from '../workflow-api.js';
|
|
4
5
|
import { type SwapResult } from '../wait-for-swap.js';
|
|
5
6
|
import type { RunnerHealth } from '../runner-health.js';
|
|
6
7
|
export interface TestOptions {
|
|
@@ -22,14 +23,7 @@ export interface TestDeps {
|
|
|
22
23
|
template: TemplateV3;
|
|
23
24
|
}[]) => Promise<DeployedWorkflow[]>;
|
|
24
25
|
testNode?: (client: ApiClient, workflowId: string, nodeId: string, body: unknown) => Promise<unknown>;
|
|
25
|
-
|
|
26
|
-
runnerUrl: string;
|
|
27
|
-
key: string;
|
|
28
|
-
triggerPath: string;
|
|
29
|
-
method: string;
|
|
30
|
-
body?: unknown;
|
|
31
|
-
triggerKey?: string;
|
|
32
|
-
}) => Promise<unknown>;
|
|
26
|
+
invokeTrigger?: (client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest) => Promise<unknown>;
|
|
33
27
|
waitForSwap?: (client: ApiClient, id: string, deployedV: string, deps?: object, opts?: {
|
|
34
28
|
timeoutMs?: number;
|
|
35
29
|
}) => Promise<SwapResult>;
|
|
@@ -23,7 +23,7 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
23
23
|
const listRunners = deps.listRunners ?? workflow_api_js_1.listRunners;
|
|
24
24
|
const doDeploy = deps.deploy ?? workflow_api_js_1.deploy;
|
|
25
25
|
const doTestNode = deps.testNode ?? workflow_api_js_1.testNode;
|
|
26
|
-
const
|
|
26
|
+
const doInvoke = deps.invokeTrigger ?? workflow_api_js_1.invokeTrigger;
|
|
27
27
|
const wait = deps.waitForSwap ?? wait_for_swap_js_1.waitForSwap;
|
|
28
28
|
const template = load(opts.file);
|
|
29
29
|
const local = validateLocal(template);
|
|
@@ -52,14 +52,12 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
54
|
if (opts.wait !== false) {
|
|
55
|
+
const timeoutMs = opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS;
|
|
55
56
|
const swap = await wait(client, deployed.uid, deployed.v, {}, { timeoutMs: opts.swapTimeout });
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
if (swap.outcome === 'timeout') {
|
|
61
|
-
const secs = (opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS) / 1000;
|
|
62
|
-
output.error(`swap not confirmed after ${secs}s; deployed v=${swap.deployedV}, runner still serving v=${swap.liveV ?? 'unknown'}`, 'WORKFLOW_SWAP_TIMEOUT');
|
|
57
|
+
const runnerLabel = resolved.runner ? `${resolved.runner.runnerKey} (${runnerUid})` : runnerUid;
|
|
58
|
+
const failure = (0, wait_for_swap_js_1.describeSwapFailure)(swap, { workflowUid: deployed.uid, runnerLabel, timeoutMs });
|
|
59
|
+
if (failure) {
|
|
60
|
+
output.error(failure.message, failure.code, failure.extra);
|
|
63
61
|
return;
|
|
64
62
|
}
|
|
65
63
|
if (swap.outcome === 'skipped') {
|
|
@@ -75,25 +73,18 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
75
73
|
raw = await doTestNode(client, deployed.uid, opts.node, body);
|
|
76
74
|
}
|
|
77
75
|
else {
|
|
78
|
-
const runners = await listRunners(client);
|
|
79
|
-
const runner = runners.find((r) => r.uid === runnerUid);
|
|
80
|
-
if (!runner) {
|
|
81
|
-
output.error(`Runner ${opts.runner} not found for this project.`, 'RUNNER_NOT_FOUND');
|
|
82
|
-
return;
|
|
83
|
-
}
|
|
84
76
|
const trigger = template.config.nodes.find((n) => n.type === 'trigger-request');
|
|
85
77
|
if (!trigger) {
|
|
86
78
|
output.error('No trigger-request node found; cannot run the full workflow.', 'NO_REQUEST_TRIGGER');
|
|
87
79
|
return;
|
|
88
80
|
}
|
|
89
81
|
const method = (trigger.config.methods?.[0] ?? 'POST');
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
triggerPath: trigger.config.path,
|
|
82
|
+
if (opts.triggerKey)
|
|
83
|
+
output.warn(workflow_api_js_1.TRIGGER_KEY_IGNORED_WARNING);
|
|
84
|
+
raw = await doInvoke(client, deployed.uid, trigger.id, {
|
|
94
85
|
method,
|
|
86
|
+
path: trigger.config.path,
|
|
95
87
|
body: readJson(opts.input),
|
|
96
|
-
triggerKey: opts.triggerKey,
|
|
97
88
|
});
|
|
98
89
|
}
|
|
99
90
|
const trace = (0, trace_js_1.toTrace)(raw);
|