@dcupl/cli 1.4.0-beta.2 → 1.4.0-beta.20

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.
Files changed (281) hide show
  1. package/README.md +30 -23
  2. package/dist/cli.d.ts +2 -0
  3. package/dist/cli.js +740 -205
  4. package/dist/cli.js.map +1 -1
  5. package/dist/functions/app/app-id.js +34 -2
  6. package/dist/functions/app/app-id.js.map +1 -1
  7. package/dist/functions/app/client/daemon-client.js.map +1 -1
  8. package/dist/functions/app/commands/cdn-host.d.ts +16 -0
  9. package/dist/functions/app/commands/cdn-host.js +47 -0
  10. package/dist/functions/app/commands/cdn-host.js.map +1 -0
  11. package/dist/functions/app/commands/create.js +50 -34
  12. package/dist/functions/app/commands/create.js.map +1 -1
  13. package/dist/functions/app/commands/data/render.d.ts +3 -1
  14. package/dist/functions/app/commands/data/render.js +9 -1
  15. package/dist/functions/app/commands/data/render.js.map +1 -1
  16. package/dist/functions/app/commands/destroy.js +10 -4
  17. package/dist/functions/app/commands/destroy.js.map +1 -1
  18. package/dist/functions/app/commands/detect-serve.js +17 -6
  19. package/dist/functions/app/commands/detect-serve.js.map +1 -1
  20. package/dist/functions/app/commands/fn/_fn-helpers.js +11 -3
  21. package/dist/functions/app/commands/fn/_fn-helpers.js.map +1 -1
  22. package/dist/functions/app/commands/fn/aggregate.js +4 -1
  23. package/dist/functions/app/commands/fn/aggregate.js.map +1 -1
  24. package/dist/functions/app/commands/fn/group-by.js +4 -2
  25. package/dist/functions/app/commands/fn/group-by.js.map +1 -1
  26. package/dist/functions/app/commands/fn/pivot.js.map +1 -1
  27. package/dist/functions/app/commands/list.js +6 -2
  28. package/dist/functions/app/commands/list.js.map +1 -1
  29. package/dist/functions/app/commands/loader-hash.js.map +1 -1
  30. package/dist/functions/app/commands/loaders/add.js +6 -0
  31. package/dist/functions/app/commands/loaders/add.js.map +1 -1
  32. package/dist/functions/app/commands/loaders/process-flags.js +4 -1
  33. package/dist/functions/app/commands/loaders/process-flags.js.map +1 -1
  34. package/dist/functions/app/commands/loaders/process.js +3 -1
  35. package/dist/functions/app/commands/loaders/process.js.map +1 -1
  36. package/dist/functions/app/commands/loaders/remove.js +2 -0
  37. package/dist/functions/app/commands/loaders/remove.js.map +1 -1
  38. package/dist/functions/app/commands/models/get.js.map +1 -1
  39. package/dist/functions/app/commands/models/keys.js.map +1 -1
  40. package/dist/functions/app/commands/models/remove.js.map +1 -1
  41. package/dist/functions/app/commands/models/set.js +3 -1
  42. package/dist/functions/app/commands/models/set.js.map +1 -1
  43. package/dist/functions/app/commands/query/execute.js +7 -15
  44. package/dist/functions/app/commands/query/execute.js.map +1 -1
  45. package/dist/functions/app/commands/query/one.js +3 -1
  46. package/dist/functions/app/commands/query/one.js.map +1 -1
  47. package/dist/functions/app/commands/query-input.d.ts +1 -0
  48. package/dist/functions/app/commands/query-input.js +15 -2
  49. package/dist/functions/app/commands/query-input.js.map +1 -1
  50. package/dist/functions/app/commands/render.js +10 -4
  51. package/dist/functions/app/commands/render.js.map +1 -1
  52. package/dist/functions/app/commands/resolve-app.js.map +1 -1
  53. package/dist/functions/app/commands/resolve-source.d.ts +1 -0
  54. package/dist/functions/app/commands/resolve-source.js +20 -5
  55. package/dist/functions/app/commands/resolve-source.js.map +1 -1
  56. package/dist/functions/app/commands/sort-input.d.ts +5 -0
  57. package/dist/functions/app/commands/sort-input.js +34 -0
  58. package/dist/functions/app/commands/sort-input.js.map +1 -0
  59. package/dist/functions/app/commands/validate-report.d.ts +31 -0
  60. package/dist/functions/app/commands/validate-report.js +20 -1
  61. package/dist/functions/app/commands/validate-report.js.map +1 -1
  62. package/dist/functions/app/commands/validate.d.ts +1 -0
  63. package/dist/functions/app/commands/validate.js +31 -10
  64. package/dist/functions/app/commands/validate.js.map +1 -1
  65. package/dist/functions/app/daemon/app-server.module.js +6 -1
  66. package/dist/functions/app/daemon/app-server.module.js.map +1 -1
  67. package/dist/functions/app/daemon/controllers/data.controller.d.ts +3 -4
  68. package/dist/functions/app/daemon/controllers/data.controller.js +18 -7
  69. package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
  70. package/dist/functions/app/daemon/controllers/lifecycle.controller.js.map +1 -1
  71. package/dist/functions/app/daemon/controllers/loaders.controller.js +1 -1
  72. package/dist/functions/app/daemon/controllers/loaders.controller.js.map +1 -1
  73. package/dist/functions/app/daemon/controllers/query.controller.js +4 -1
  74. package/dist/functions/app/daemon/controllers/query.controller.js.map +1 -1
  75. package/dist/functions/app/daemon/daemon-args.js +2 -2
  76. package/dist/functions/app/daemon/daemon-args.js.map +1 -1
  77. package/dist/functions/app/daemon/filters/envelope-exception.filter.js +6 -1
  78. package/dist/functions/app/daemon/filters/envelope-exception.filter.js.map +1 -1
  79. package/dist/functions/app/daemon/main.js +14 -7
  80. package/dist/functions/app/daemon/main.js.map +1 -1
  81. package/dist/functions/app/daemon/services/attribute-validation.js +6 -3
  82. package/dist/functions/app/daemon/services/attribute-validation.js.map +1 -1
  83. package/dist/functions/app/daemon/services/csv-delimiter.d.ts +15 -0
  84. package/dist/functions/app/daemon/services/csv-delimiter.js +99 -0
  85. package/dist/functions/app/daemon/services/csv-delimiter.js.map +1 -0
  86. package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +15 -2
  87. package/dist/functions/app/daemon/services/dcupl-host.service.js +132 -24
  88. package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
  89. package/dist/functions/app/daemon/services/group-sort.d.ts +25 -0
  90. package/dist/functions/app/daemon/services/group-sort.js +128 -0
  91. package/dist/functions/app/daemon/services/group-sort.js.map +1 -0
  92. package/dist/functions/app/daemon/services/idle-watchdog.service.js.map +1 -1
  93. package/dist/functions/app/daemon/services/ingest.service.d.ts +1 -0
  94. package/dist/functions/app/daemon/services/ingest.service.js +17 -11
  95. package/dist/functions/app/daemon/services/ingest.service.js.map +1 -1
  96. package/dist/functions/app/daemon/services/init-options.js.map +1 -1
  97. package/dist/functions/app/daemon/services/loaders.service.d.ts +4 -2
  98. package/dist/functions/app/daemon/services/loaders.service.js +29 -7
  99. package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
  100. package/dist/functions/app/daemon/services/normalize-query.d.ts +1 -1
  101. package/dist/functions/app/daemon/services/normalize-query.js +44 -3
  102. package/dist/functions/app/daemon/services/normalize-query.js.map +1 -1
  103. package/dist/functions/app/daemon/services/staged-keys.d.ts +12 -0
  104. package/dist/functions/app/daemon/services/staged-keys.js +72 -0
  105. package/dist/functions/app/daemon/services/staged-keys.js.map +1 -0
  106. package/dist/functions/app/e2e/port-lock.js +23 -9
  107. package/dist/functions/app/e2e/port-lock.js.map +1 -1
  108. package/dist/functions/app/registry/registry.js +11 -10
  109. package/dist/functions/app/registry/registry.js.map +1 -1
  110. package/dist/functions/app/registry/serve-registry.js +13 -9
  111. package/dist/functions/app/registry/serve-registry.js.map +1 -1
  112. package/dist/functions/app/types.d.ts +2 -0
  113. package/dist/functions/config/commands/set.js +4 -4
  114. package/dist/functions/config/commands/set.js.map +1 -1
  115. package/dist/functions/config/io.js +1 -3
  116. package/dist/functions/config/io.js.map +1 -1
  117. package/dist/functions/config/prompts.d.ts +2 -1
  118. package/dist/functions/config/prompts.js +1 -3
  119. package/dist/functions/config/prompts.js.map +1 -1
  120. package/dist/functions/files/commands/pull.d.ts +2 -0
  121. package/dist/functions/files/commands/pull.js +40 -16
  122. package/dist/functions/files/commands/pull.js.map +1 -1
  123. package/dist/functions/files/commands/push.d.ts +1 -0
  124. package/dist/functions/files/commands/push.js +20 -0
  125. package/dist/functions/files/commands/push.js.map +1 -1
  126. package/dist/functions/files/commands/read.js +2 -1
  127. package/dist/functions/files/commands/read.js.map +1 -1
  128. package/dist/functions/files/commands/write.js +12 -2
  129. package/dist/functions/files/commands/write.js.map +1 -1
  130. package/dist/functions/files/files-push.js +1 -1
  131. package/dist/functions/files/files-push.js.map +1 -1
  132. package/dist/functions/files/helper/confirm.js +2 -3
  133. package/dist/functions/files/helper/confirm.js.map +1 -1
  134. package/dist/functions/files/helper/text-policy.d.ts +5 -0
  135. package/dist/functions/files/helper/text-policy.js +31 -0
  136. package/dist/functions/files/helper/text-policy.js.map +1 -0
  137. package/dist/functions/files/sync/large-upload.d.ts +20 -0
  138. package/dist/functions/files/sync/large-upload.js +140 -0
  139. package/dist/functions/files/sync/large-upload.js.map +1 -0
  140. package/dist/functions/files/sync/manifest.js +2 -1
  141. package/dist/functions/files/sync/manifest.js.map +1 -1
  142. package/dist/functions/files/sync/transfer.d.ts +5 -0
  143. package/dist/functions/files/sync/transfer.js +47 -10
  144. package/dist/functions/files/sync/transfer.js.map +1 -1
  145. package/dist/functions/generate/files/generate-code.js +0 -1
  146. package/dist/functions/generate/files/generate-code.js.map +1 -1
  147. package/dist/functions/generate/files/generate-files.d.ts +10 -1
  148. package/dist/functions/generate/files/generate-files.js +154 -43
  149. package/dist/functions/generate/files/generate-files.js.map +1 -1
  150. package/dist/functions/generate/files/generate-schema.js +1 -1
  151. package/dist/functions/generate/files/generate-schema.js.map +1 -1
  152. package/dist/functions/generate/files/generate.helper.d.ts +9 -3
  153. package/dist/functions/generate/files/generate.helper.js +11 -8
  154. package/dist/functions/generate/files/generate.helper.js.map +1 -1
  155. package/dist/functions/generate/files/rest-api-template.d.ts +16 -0
  156. package/dist/functions/generate/files/rest-api-template.js +63 -0
  157. package/dist/functions/generate/files/rest-api-template.js.map +1 -0
  158. package/dist/functions/generate/files/script-starters.d.ts +7 -0
  159. package/dist/functions/generate/files/script-starters.js +75 -0
  160. package/dist/functions/generate/files/script-starters.js.map +1 -0
  161. package/dist/functions/generate/files/workflow-presets.js +2 -1
  162. package/dist/functions/generate/files/workflow-presets.js.map +1 -1
  163. package/dist/functions/generate/model-from-data/generate-model-from-data.d.ts +1 -0
  164. package/dist/functions/generate/model-from-data/generate-model-from-data.js +74 -6
  165. package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
  166. package/dist/functions/generate/model-from-data/infer-key.js +1 -4
  167. package/dist/functions/generate/model-from-data/infer-key.js.map +1 -1
  168. package/dist/functions/generate/model-from-data/infer-to-model.js +1 -2
  169. package/dist/functions/generate/model-from-data/infer-to-model.js.map +1 -1
  170. package/dist/functions/generate/projects/generate-project.js +18 -13
  171. package/dist/functions/generate/projects/generate-project.js.map +1 -1
  172. package/dist/functions/helper/api-client.d.ts +4 -0
  173. package/dist/functions/helper/api-client.js +18 -5
  174. package/dist/functions/helper/api-client.js.map +1 -1
  175. package/dist/functions/helper/config.helper.d.ts +1 -0
  176. package/dist/functions/helper/config.helper.js +1 -1
  177. package/dist/functions/helper/config.helper.js.map +1 -1
  178. package/dist/functions/helper/output.js +3 -1
  179. package/dist/functions/helper/output.js.map +1 -1
  180. package/dist/functions/helper/parse-fail.js +4 -1
  181. package/dist/functions/helper/parse-fail.js.map +1 -1
  182. package/dist/functions/helper/prompt.d.ts +2 -0
  183. package/dist/functions/helper/prompt.js +8 -0
  184. package/dist/functions/helper/prompt.js.map +1 -0
  185. package/dist/functions/schemas/command.js.map +1 -1
  186. package/dist/functions/schemas/examples/AppLoaderConfiguration.example.json +1 -3
  187. package/dist/functions/schemas/examples/DataMapperStepConfig.example.json +6 -1
  188. package/dist/functions/schemas/examples/ModelDefinition.example.json +8 -1
  189. package/dist/functions/schemas/examples/ResponseScriptConfig.example.json +1 -1
  190. package/dist/functions/schemas/examples/RestApiTemplate.example.json +30 -0
  191. package/dist/functions/schemas/examples/ScriptStepConfig.example.json +3 -1
  192. package/dist/functions/schemas/examples/TemplateV3.example.json +5 -1
  193. package/dist/functions/schemas/extract.js +1 -1
  194. package/dist/functions/schemas/extract.js.map +1 -1
  195. package/dist/functions/schemas/format.js +7 -5
  196. package/dist/functions/schemas/format.js.map +1 -1
  197. package/dist/functions/schemas/registry.d.ts +2 -1
  198. package/dist/functions/schemas/registry.js +95 -31
  199. package/dist/functions/schemas/registry.js.map +1 -1
  200. package/dist/functions/schemas/resolve.d.ts +1 -0
  201. package/dist/functions/schemas/resolve.js +31 -1
  202. package/dist/functions/schemas/resolve.js.map +1 -1
  203. package/dist/functions/schemas/validate.js.map +1 -1
  204. package/dist/functions/serve/commands/list.js +2 -1
  205. package/dist/functions/serve/commands/list.js.map +1 -1
  206. package/dist/functions/serve/commands/stop.js +10 -5
  207. package/dist/functions/serve/commands/stop.js.map +1 -1
  208. package/dist/functions/serve/dev-server/dev-server-access.guard.d.ts +11 -0
  209. package/dist/functions/serve/dev-server/dev-server-access.guard.js +41 -0
  210. package/dist/functions/serve/dev-server/dev-server-access.guard.js.map +1 -0
  211. package/dist/functions/serve/dev-server/dev-server.controller.d.ts +3 -0
  212. package/dist/functions/serve/dev-server/dev-server.controller.js +20 -0
  213. package/dist/functions/serve/dev-server/dev-server.controller.js.map +1 -1
  214. package/dist/functions/serve/dev-server/dev-server.module.d.ts +3 -0
  215. package/dist/functions/serve/dev-server/dev-server.module.js +34 -23
  216. package/dist/functions/serve/dev-server/dev-server.module.js.map +1 -1
  217. package/dist/functions/serve/dev-server/dev-server.options.d.ts +8 -0
  218. package/dist/functions/serve/dev-server/dev-server.options.js +5 -0
  219. package/dist/functions/serve/dev-server/dev-server.options.js.map +1 -0
  220. package/dist/functions/serve/dev-server/dev-server.service.d.ts +11 -3
  221. package/dist/functions/serve/dev-server/dev-server.service.js +72 -65
  222. package/dist/functions/serve/dev-server/dev-server.service.js.map +1 -1
  223. package/dist/functions/serve/dev-server/path-scope.d.ts +5 -0
  224. package/dist/functions/serve/dev-server/path-scope.js +88 -0
  225. package/dist/functions/serve/dev-server/path-scope.js.map +1 -0
  226. package/dist/functions/serve/dev-server/request-security.d.ts +34 -0
  227. package/dist/functions/serve/dev-server/request-security.js +146 -0
  228. package/dist/functions/serve/dev-server/request-security.js.map +1 -0
  229. package/dist/functions/serve/main.d.ts +13 -0
  230. package/dist/functions/serve/main.js +84 -12
  231. package/dist/functions/serve/main.js.map +1 -1
  232. package/dist/functions/serve/serve-self-register.js +2 -1
  233. package/dist/functions/serve/serve-self-register.js.map +1 -1
  234. package/dist/functions/version/command.js +1 -6
  235. package/dist/functions/version/command.js.map +1 -1
  236. package/dist/functions/workflow/commands/deploy.d.ts +1 -0
  237. package/dist/functions/workflow/commands/deploy.js +18 -13
  238. package/dist/functions/workflow/commands/deploy.js.map +1 -1
  239. package/dist/functions/workflow/commands/get.js.map +1 -1
  240. package/dist/functions/workflow/commands/history.js.map +1 -1
  241. package/dist/functions/workflow/commands/run.d.ts +2 -8
  242. package/dist/functions/workflow/commands/run.js +29 -22
  243. package/dist/functions/workflow/commands/run.js.map +1 -1
  244. package/dist/functions/workflow/commands/runners-get.js.map +1 -1
  245. package/dist/functions/workflow/commands/status.d.ts +1 -1
  246. package/dist/functions/workflow/commands/status.js +7 -1
  247. package/dist/functions/workflow/commands/status.js.map +1 -1
  248. package/dist/functions/workflow/commands/template.js.map +1 -1
  249. package/dist/functions/workflow/commands/test.d.ts +2 -8
  250. package/dist/functions/workflow/commands/test.js +19 -21
  251. package/dist/functions/workflow/commands/test.js.map +1 -1
  252. package/dist/functions/workflow/commands/trace.js.map +1 -1
  253. package/dist/functions/workflow/commands/undeploy.js +3 -1
  254. package/dist/functions/workflow/commands/undeploy.js.map +1 -1
  255. package/dist/functions/workflow/commands/validate.d.ts +2 -0
  256. package/dist/functions/workflow/commands/validate.js +8 -1
  257. package/dist/functions/workflow/commands/validate.js.map +1 -1
  258. package/dist/functions/workflow/resolve-runner.d.ts +17 -0
  259. package/dist/functions/workflow/resolve-runner.js +41 -0
  260. package/dist/functions/workflow/resolve-runner.js.map +1 -0
  261. package/dist/functions/workflow/run-failure.js +1 -1
  262. package/dist/functions/workflow/run-failure.js.map +1 -1
  263. package/dist/functions/workflow/runner-health.js.map +1 -1
  264. package/dist/functions/workflow/script-lint.js +32 -7
  265. package/dist/functions/workflow/script-lint.js.map +1 -1
  266. package/dist/functions/workflow/trace.js.map +1 -1
  267. package/dist/functions/workflow/types.d.ts +11 -2
  268. package/dist/functions/workflow/types.js +4 -0
  269. package/dist/functions/workflow/types.js.map +1 -1
  270. package/dist/functions/workflow/wait-for-swap.d.ts +24 -1
  271. package/dist/functions/workflow/wait-for-swap.js +58 -0
  272. package/dist/functions/workflow/wait-for-swap.js.map +1 -1
  273. package/dist/functions/workflow/workflow-api.d.ts +7 -7
  274. package/dist/functions/workflow/workflow-api.js +31 -16
  275. package/dist/functions/workflow/workflow-api.js.map +1 -1
  276. package/files/common/_gitignore +2 -1
  277. package/files/dev-server/index.html +2 -1
  278. package/package.json +24 -15
  279. package/dist/functions/serve/guards/apiKey.guard.d.ts +0 -4
  280. package/dist/functions/serve/guards/apiKey.guard.js +0 -23
  281. package/dist/functions/serve/guards/apiKey.guard.js.map +0 -1
@@ -4,6 +4,7 @@ exports.checkRunnerReachable = checkRunnerReachable;
4
4
  exports.deployCommand = deployCommand;
5
5
  const template_io_js_1 = require("../template-io.js");
6
6
  const workflow_api_js_1 = require("../workflow-api.js");
7
+ const resolve_runner_js_1 = require("../resolve-runner.js");
7
8
  const confirm_js_1 = require("../../files/helper/confirm.js");
8
9
  const wait_for_swap_js_1 = require("../wait-for-swap.js");
9
10
  const runner_health_js_1 = require("../runner-health.js");
@@ -16,8 +17,8 @@ async function checkRunnerReachable(client, runnerUid, deps) {
16
17
  return null;
17
18
  const health = await probe(runner.url);
18
19
  if (health.status === 'unreachable') {
19
- return `Runner ${runnerUid} (${runner.runnerKey ?? runner.url}) is unreachable: ${health.reason}. `
20
- + `Check the runner or pick a healthy one via 'dcupl workflow runners list'.`;
20
+ return (`Runner ${runnerUid} (${runner.runnerKey ?? runner.url}) is unreachable: ${health.reason}. ` +
21
+ `Check the runner or pick a healthy one via 'dcupl workflow runners list'.`);
21
22
  }
22
23
  }
23
24
  catch {
@@ -31,23 +32,30 @@ async function deployCommand(output, client, opts, deps = {}) {
31
32
  const confirm = deps.confirm ?? confirm_js_1.confirmDestructive;
32
33
  const wait = deps.waitForSwap ?? wait_for_swap_js_1.waitForSwap;
33
34
  const template = load(opts.file);
34
- const unreachable = await checkRunnerReachable(client, opts.runner, deps);
35
+ const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => (deps.listRunners ?? workflow_api_js_1.listRunners)(client), opts.runner);
36
+ if (!resolved.ok) {
37
+ output.error(resolved.message, resolved.code);
38
+ return;
39
+ }
40
+ const runnerUid = resolved.uid;
41
+ const runnerLabel = resolved.runner ? `${resolved.runner.runnerKey} (${runnerUid})` : runnerUid;
42
+ const unreachable = await checkRunnerReachable(client, runnerUid, deps);
35
43
  if (unreachable) {
36
44
  output.error(unreachable, 'RUNNER_UNREACHABLE');
37
45
  return;
38
46
  }
39
- const result = await validate(client, { runnerUid: opts.runner, template });
47
+ const result = await validate(client, { runnerUid, template });
40
48
  if (!result.valid) {
41
49
  const summary = (result.errors ?? []).map((e) => `✗ ${e.type}: ${e.message}`).join('\n');
42
50
  output.error(summary, 'WORKFLOW_INVALID');
43
51
  return;
44
52
  }
45
- const decision = await confirm(`Deploy workflow "${template.key}" to runner ${opts.runner}? This goes live immediately.`, { yes: !!opts.yes });
53
+ const decision = await confirm(`Deploy workflow "${template.key}" to runner ${runnerLabel}? This goes live immediately.`, { yes: !!opts.yes });
46
54
  if (decision !== 'execute') {
47
55
  output.error('Deploy aborted (not confirmed).', 'WORKFLOW_DEPLOY_ABORTED');
48
56
  return;
49
57
  }
50
- const deployed = await doDeploy(client, [{ runnerUid: opts.runner, template }]);
58
+ const deployed = await doDeploy(client, [{ runnerUid, template }]);
51
59
  const head = deployed[0];
52
60
  if (!head) {
53
61
  output.error('Deploy returned no workflow; check the runner uid.', 'DEPLOY_EMPTY_RESPONSE');
@@ -55,14 +63,11 @@ async function deployCommand(output, client, opts, deps = {}) {
55
63
  }
56
64
  let liveNote = '';
57
65
  if (opts.wait !== false) {
66
+ const timeoutMs = opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS;
58
67
  const swap = await wait(client, head.uid, head.v, {}, { timeoutMs: opts.swapTimeout });
59
- if (swap.outcome === 'error') {
60
- output.error(`runner reported an error during swap: ${swap.message}`, 'WORKFLOW_SWAP_ERROR');
61
- return;
62
- }
63
- if (swap.outcome === 'timeout') {
64
- const secs = (opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS) / 1000;
65
- 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);
66
71
  return;
67
72
  }
68
73
  if (swap.outcome === 'skipped') {
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/deploy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/deploy.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/get.ts"],"names":[],"mappings":";;AAaA,gCAIC;AAdD,wDAAuE;AAUhE,KAAK,UAAU,UAAU,CAAC,MAAc,EAAE,MAAiB,EAAE,IAAgB,EAAE,OAAgB,EAAE;IACtG,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,IAAI,6BAAkB,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/get.ts"],"names":[],"mappings":";;AAaA,gCASC;AAnBD,wDAAuE;AAUhE,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,MAAiB,EACjB,IAAgB,EAChB,OAAgB,EAAE;IAElB,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,IAAI,6BAAkB,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"history.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/history.ts"],"names":[],"mappings":";;AAaA,wCAqBC;AA/BD,wDAAqE;AAU9D,KAAK,UAAU,cAAc,CAAC,MAAc,EAAE,MAAiB,EAAE,IAAoB,EAAE,OAAoB,EAAE;IAClH,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,4BAAiB,CAAC;IACjD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAG3C,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClD,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE;QACjE,UAAU,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;QAC5B,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE;KAC9B,CAAC,CAAC,CAAC;IACJ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC;QACjD,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
1
+ {"version":3,"file":"history.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/history.ts"],"names":[],"mappings":";;AAaA,wCA0BC;AApCD,wDAAqE;AAU9D,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,MAAiB,EACjB,IAAoB,EACpB,OAAoB,EAAE;IAEtB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,4BAAiB,CAAC;IACjD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAG3C,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClD,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE;QACjE,UAAU,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;QAC5B,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE;KAC9B,CAAC,CAAC,CAAC;IACJ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC;QACjD,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,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 { 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
- triggerRun?: (args: {
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>;
@@ -7,6 +7,7 @@ const comment_json_1 = require("comment-json");
7
7
  const workflow_api_js_1 = require("../workflow-api.js");
8
8
  const trace_js_1 = require("../trace.js");
9
9
  const run_failure_js_1 = require("../run-failure.js");
10
+ const resolve_runner_js_1 = require("../resolve-runner.js");
10
11
  function findDeployed(workflows, key, runnerUid, projectId) {
11
12
  const onRunner = workflows.filter((w) => w.runnerUid === runnerUid);
12
13
  return onRunner.find((w) => w.key === key) ?? onRunner.find((w) => w.key === `${projectId}-${key}`);
@@ -16,18 +17,19 @@ async function runCommand(output, client, opts, deps = {}) {
16
17
  const listWorkflows = deps.listWorkflows ?? workflow_api_js_1.listWorkflows;
17
18
  const getWorkflow = deps.getWorkflow ?? workflow_api_js_1.getWorkflow;
18
19
  const doTestNode = deps.testNode ?? workflow_api_js_1.testNode;
19
- const doTrigger = deps.triggerRun ?? workflow_api_js_1.triggerRun;
20
+ const doInvoke = deps.invokeTrigger ?? workflow_api_js_1.invokeTrigger;
20
21
  if (opts.body !== undefined && opts.input !== undefined) {
21
22
  output.error('--body and --input are mutually exclusive; pass the payload inline OR as a file.', 'WORKFLOW_RUN_INPUT_CONFLICT');
22
23
  return;
23
24
  }
24
25
  let payload;
25
26
  try {
26
- payload = opts.body !== undefined
27
- ? (0, comment_json_1.parse)(opts.body)
28
- : opts.input
29
- ? (0, comment_json_1.parse)(fs.readFileSync(opts.input, 'utf-8'))
30
- : undefined;
27
+ payload =
28
+ opts.body !== undefined
29
+ ? (0, comment_json_1.parse)(opts.body)
30
+ : opts.input
31
+ ? (0, comment_json_1.parse)(fs.readFileSync(opts.input, 'utf-8'))
32
+ : undefined;
31
33
  }
32
34
  catch (err) {
33
35
  const source = opts.body !== undefined ? '--body is not valid JSON' : `--input could not be read as JSON (${opts.input})`;
@@ -38,9 +40,24 @@ async function runCommand(output, client, opts, deps = {}) {
38
40
  let reachedRun = false;
39
41
  try {
40
42
  const workflows = await listWorkflows(client);
41
- const deployed = findDeployed(workflows, opts.key, opts.runner, client.projectId);
43
+ let runnerUid = opts.runner;
44
+ let runner;
45
+ let runnerLabel = opts.runner;
46
+ let deployed = findDeployed(workflows, opts.key, runnerUid, client.projectId);
42
47
  if (!deployed) {
43
- output.error(`Workflow "${opts.key}" is not deployed on runner ${opts.runner}. \`dcupl workflow list\` shows what is deployed where.`, 'WORKFLOW_NOT_FOUND');
48
+ const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => listRunners(client), opts.runner);
49
+ if (!resolved.ok) {
50
+ output.error(resolved.message, resolved.code);
51
+ return;
52
+ }
53
+ runnerUid = resolved.uid;
54
+ runner = resolved.runner;
55
+ if (runner)
56
+ runnerLabel = `${runner.runnerKey} (${runnerUid})`;
57
+ deployed = findDeployed(workflows, opts.key, runnerUid, client.projectId);
58
+ }
59
+ if (!deployed) {
60
+ output.error(`Workflow "${opts.key}" is not deployed on runner ${runnerLabel}. \`dcupl workflow list\` shows what is deployed where.`, 'WORKFLOW_NOT_FOUND');
44
61
  return;
45
62
  }
46
63
  template = deployed.template ?? (await getWorkflow(client, deployed.uid)).template;
@@ -50,29 +67,19 @@ async function runCommand(output, client, opts, deps = {}) {
50
67
  raw = await doTestNode(client, deployed.uid, opts.node, { inputData: payload ?? { main: [] } });
51
68
  }
52
69
  else {
53
- const runners = await listRunners(client);
54
- const runner = runners.find((r) => r.uid === opts.runner);
55
- if (!runner) {
56
- output.error(`Runner ${opts.runner} not found for this project.`, 'RUNNER_NOT_FOUND');
57
- return;
58
- }
59
70
  const trigger = (template?.config?.nodes ?? []).find((n) => n.type === 'trigger-request');
60
71
  if (!trigger) {
61
72
  output.error('The deployed workflow has no trigger-request node; cannot run it over HTTP.', 'NO_REQUEST_TRIGGER');
62
73
  return;
63
74
  }
64
75
  const method = (trigger.config.methods?.[0] ?? 'POST');
76
+ if (opts.triggerKey)
77
+ output.warn(workflow_api_js_1.TRIGGER_KEY_IGNORED_WARNING);
65
78
  reachedRun = true;
66
- raw = await doTrigger({
67
- runnerUrl: runner.url,
68
- key: deployed.key,
69
- triggerPath: trigger.config.path,
70
- method,
71
- body: payload,
72
- triggerKey: opts.triggerKey,
73
- });
79
+ raw = await doInvoke(client, deployed.uid, trigger.id, { method, path: trigger.config.path, body: payload });
74
80
  }
75
81
  const trace = (0, trace_js_1.toTrace)(raw);
82
+ trace.workflowKey ??= deployed.key;
76
83
  output.success(trace, () => (0, trace_js_1.renderTrace)(trace));
77
84
  if ((0, trace_js_1.hasErrors)(trace)) {
78
85
  output.error('Workflow run reported node errors (see trace above).', 'WORKFLOW_RUN_ERROR');
@@ -1 +1 @@
1
- {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"runners-get.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/runners-get.ts"],"names":[],"mappings":";;AAaA,4CAIC;AAdD,wDAAmE;AAU5D,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,MAAiB,EAAE,IAAsB,EAAE,OAAsB,EAAE;IACxH,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,CAAC,CAAC;AACzB,CAAC"}
1
+ {"version":3,"file":"runners-get.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/runners-get.ts"],"names":[],"mappings":";;AAaA,4CASC;AAnBD,wDAAmE;AAU5D,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,MAAiB,EACjB,IAAsB,EACtB,OAAsB,EAAE;IAExB,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,CAAC,CAAC;AACzB,CAAC"}
@@ -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 { WorkflowStatusResponse } from '../types.js';
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) => `${s.key}: ${s.status}${s.error ? ` — ${s.error}` : ''}`);
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,sCAIC;AAdD,wDAAmE;AAU5D,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,MAAiB,EAAE,IAAmB,EAAE,OAAmB,EAAE;IAC/G,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,CAAC,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,CAAC;AAC1F,CAAC"}
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 +1 @@
1
- {"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/template.ts"],"names":[],"mappings":";;AAYA,0CAIC;AAdD,wDAAuF;AAUhF,KAAK,UAAU,eAAe,CAAC,MAAc,EAAE,MAAiB,EAAE,IAAqB,EAAE,OAAqB,EAAE;IACrH,MAAM,GAAG,GAAG,IAAI,CAAC,mBAAmB,IAAI,qCAA0B,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC"}
1
+ {"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/template.ts"],"names":[],"mappings":";;AAYA,0CASC;AAnBD,wDAAuF;AAUhF,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,MAAiB,EACjB,IAAqB,EACrB,OAAqB,EAAE;IAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,mBAAmB,IAAI,qCAA0B,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3B,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
- triggerRun?: (args: {
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>;
@@ -11,6 +11,7 @@ const trace_js_1 = require("../trace.js");
11
11
  const run_failure_js_1 = require("../run-failure.js");
12
12
  const wait_for_swap_js_1 = require("../wait-for-swap.js");
13
13
  const deploy_js_1 = require("./deploy.js");
14
+ const resolve_runner_js_1 = require("../resolve-runner.js");
14
15
  function readJson(file) {
15
16
  if (!file)
16
17
  return undefined;
@@ -22,7 +23,7 @@ async function testCommand(output, client, opts, deps = {}) {
22
23
  const listRunners = deps.listRunners ?? workflow_api_js_1.listRunners;
23
24
  const doDeploy = deps.deploy ?? workflow_api_js_1.deploy;
24
25
  const doTestNode = deps.testNode ?? workflow_api_js_1.testNode;
25
- const doTrigger = deps.triggerRun ?? workflow_api_js_1.triggerRun;
26
+ const doInvoke = deps.invokeTrigger ?? workflow_api_js_1.invokeTrigger;
26
27
  const wait = deps.waitForSwap ?? wait_for_swap_js_1.waitForSwap;
27
28
  const template = load(opts.file);
28
29
  const local = validateLocal(template);
@@ -31,28 +32,32 @@ async function testCommand(output, client, opts, deps = {}) {
31
32
  output.error(summary, 'WORKFLOW_INVALID');
32
33
  return;
33
34
  }
34
- const unreachable = await (0, deploy_js_1.checkRunnerReachable)(client, opts.runner, deps);
35
+ const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => listRunners(client), opts.runner);
36
+ if (!resolved.ok) {
37
+ output.error(resolved.message, resolved.code);
38
+ return;
39
+ }
40
+ const runnerUid = resolved.uid;
41
+ const unreachable = await (0, deploy_js_1.checkRunnerReachable)(client, runnerUid, deps);
35
42
  if (unreachable) {
36
43
  output.error(unreachable, 'RUNNER_UNREACHABLE');
37
44
  return;
38
45
  }
39
46
  let reachedRun = false;
40
47
  try {
41
- const deployedList = await doDeploy(client, [{ runnerUid: opts.runner, template }]);
48
+ const deployedList = await doDeploy(client, [{ runnerUid, template }]);
42
49
  const deployed = deployedList[0];
43
50
  if (!deployed) {
44
51
  output.error('Deploy returned no workflow; check the runner uid.', 'DEPLOY_EMPTY_RESPONSE');
45
52
  return;
46
53
  }
47
54
  if (opts.wait !== false) {
55
+ const timeoutMs = opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS;
48
56
  const swap = await wait(client, deployed.uid, deployed.v, {}, { timeoutMs: opts.swapTimeout });
49
- if (swap.outcome === 'error') {
50
- output.error(`runner reported an error during swap: ${swap.message}`, 'WORKFLOW_SWAP_ERROR');
51
- return;
52
- }
53
- if (swap.outcome === 'timeout') {
54
- const secs = (opts.swapTimeout ?? wait_for_swap_js_1.DEFAULT_SWAP_TIMEOUT_MS) / 1000;
55
- 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);
56
61
  return;
57
62
  }
58
63
  if (swap.outcome === 'skipped') {
@@ -68,25 +73,18 @@ async function testCommand(output, client, opts, deps = {}) {
68
73
  raw = await doTestNode(client, deployed.uid, opts.node, body);
69
74
  }
70
75
  else {
71
- const runners = await listRunners(client);
72
- const runner = runners.find((r) => r.uid === opts.runner);
73
- if (!runner) {
74
- output.error(`Runner ${opts.runner} not found for this project.`, 'RUNNER_NOT_FOUND');
75
- return;
76
- }
77
76
  const trigger = template.config.nodes.find((n) => n.type === 'trigger-request');
78
77
  if (!trigger) {
79
78
  output.error('No trigger-request node found; cannot run the full workflow.', 'NO_REQUEST_TRIGGER');
80
79
  return;
81
80
  }
82
81
  const method = (trigger.config.methods?.[0] ?? 'POST');
83
- raw = await doTrigger({
84
- runnerUrl: runner.url,
85
- key: deployed.key,
86
- 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, {
87
85
  method,
86
+ path: trigger.config.path,
88
87
  body: readJson(opts.input),
89
- triggerKey: opts.triggerKey,
90
88
  });
91
89
  }
92
90
  const trace = (0, trace_js_1.toTrace)(raw);
@@ -1 +1 @@
1
- {"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/trace.ts"],"names":[],"mappings":";;AAgBA,oCAgDC;AA7DD,wDAA4G;AAarG,KAAK,UAAU,YAAY,CAAC,MAAc,EAAE,MAAiB,EAAE,IAAkB,EAAE,OAAkB,EAAE;IAC5G,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,IAAI,+BAAoB,CAAC;IAGvD,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAC,kEAAkE,EAAE,oBAAoB,CAAC,CAAC;QACvG,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,gGAAgG,EAAE,oBAAoB,CAAC,CAAC;QACrI,OAAO;IACT,CAAC;IAED,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;IAC3B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,4BAAiB,CAAC;QACrD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,KAAK,CAAC,yDAAyD,EAAE,eAAe,CAAC,CAAC;YACzF,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC;QAG3B,MAAM,CAAC,IAAI,CAAC,0BAA0B,KAAK,KAAK,MAAM,CAAC,MAAM,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACzH,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAGhD,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACnE,MAAM;QACN,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,UAAU,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;QAC5B,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;KACrB,CAAC,CAAC,CAAC;IACJ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,MAAM,mBAAmB,CAAC,CAAC;QACzF,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
1
+ {"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/trace.ts"],"names":[],"mappings":";;AAgBA,oCA0DC;AAvED,wDAA4G;AAarG,KAAK,UAAU,YAAY,CAChC,MAAc,EACd,MAAiB,EACjB,IAAkB,EAClB,OAAkB,EAAE;IAEpB,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,IAAI,+BAAoB,CAAC;IAGvD,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAC,kEAAkE,EAAE,oBAAoB,CAAC,CAAC;QACvG,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAK,CACV,gGAAgG,EAChG,oBAAoB,CACrB,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;IAC3B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,4BAAiB,CAAC;QACrD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,KAAK,CAAC,yDAAyD,EAAE,eAAe,CAAC,CAAC;YACzF,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC;QAG3B,MAAM,CAAC,IAAI,CACT,0BAA0B,KAAK,KAAK,MAAM,CAAC,MAAM,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,GAAG,CAC1G,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAGhD,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACnE,MAAM;QACN,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,UAAU,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;QAC5B,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;KACrB,CAAC,CAAC,CAAC;IACJ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,MAAM,mBAAmB,CAAC,CAAC;QACzF,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
@@ -6,7 +6,9 @@ const confirm_js_1 = require("../../files/helper/confirm.js");
6
6
  async function undeployCommand(output, client, opts, deps = {}) {
7
7
  const doUndeploy = deps.undeploy ?? workflow_api_js_1.undeploy;
8
8
  const confirm = deps.confirm ?? confirm_js_1.confirmDestructive;
9
- const decision = await confirm(`Undeploy workflow ${opts.workflowId}? It stops running immediately.`, { yes: !!opts.yes });
9
+ const decision = await confirm(`Undeploy workflow ${opts.workflowId}? It stops running immediately.`, {
10
+ yes: !!opts.yes,
11
+ });
10
12
  if (decision !== 'execute') {
11
13
  output.error('Undeploy aborted (not confirmed).', 'WORKFLOW_UNDEPLOY_ABORTED');
12
14
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"undeploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/undeploy.ts"],"names":[],"mappings":";;AAeA,0CAWC;AAxBD,wDAAiE;AACjE,8DAAmE;AAY5D,KAAK,UAAU,eAAe,CAAC,MAAc,EAAE,MAAiB,EAAE,IAAqB,EAAE,OAAqB,EAAE;IACrH,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,IAAI,0BAAe,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,+BAAkB,CAAC;IAEnD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,qBAAqB,IAAI,CAAC,UAAU,iCAAiC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3H,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,2BAA2B,CAAC,CAAC;QAC/E,OAAO;IACT,CAAC;IACD,MAAM,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,gBAAgB,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;AAC3F,CAAC"}
1
+ {"version":3,"file":"undeploy.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/undeploy.ts"],"names":[],"mappings":";;AAeA,0CAkBC;AA/BD,wDAAiE;AACjE,8DAAmE;AAY5D,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,MAAiB,EACjB,IAAqB,EACrB,OAAqB,EAAE;IAEvB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,IAAI,0BAAe,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,+BAAkB,CAAC;IAEnD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,qBAAqB,IAAI,CAAC,UAAU,iCAAiC,EAAE;QACpG,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG;KAChB,CAAC,CAAC;IACH,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,2BAA2B,CAAC,CAAC;QAC/E,OAAO;IACT,CAAC;IACD,MAAM,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,gBAAgB,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;AAC3F,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 { TemplateV3, ValidationResult } from '../types.js';
4
+ import type { RunnerInfo } from '../types.js';
4
5
  export interface ValidateOptions {
5
6
  file: string;
6
7
  runner?: string;
@@ -14,5 +15,6 @@ export interface ValidateDeps {
14
15
  runnerUid: string;
15
16
  template: TemplateV3;
16
17
  }) => Promise<ValidationResult>;
18
+ listRunners?: (client: ApiClient) => Promise<RunnerInfo[]>;
17
19
  }
18
20
  export declare function validateCommand(output: Output, opts: ValidateOptions, deps?: ValidateDeps): Promise<void>;
@@ -4,6 +4,7 @@ exports.validateCommand = validateCommand;
4
4
  const template_io_js_1 = require("../template-io.js");
5
5
  const validate_js_1 = require("../validate.js");
6
6
  const workflow_api_js_1 = require("../workflow-api.js");
7
+ const resolve_runner_js_1 = require("../resolve-runner.js");
7
8
  function merge(a, b) {
8
9
  return {
9
10
  valid: a.valid && b.valid,
@@ -18,7 +19,13 @@ async function validateCommand(output, opts, deps = {}) {
18
19
  const template = load(opts.file);
19
20
  let result = local(template);
20
21
  if (!opts.localOnly && opts.runner && deps.client) {
21
- const remote = await remoteFn(deps.client, { runnerUid: opts.runner, template });
22
+ const apiClient = deps.client;
23
+ const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => (deps.listRunners ?? workflow_api_js_1.listRunners)(apiClient), opts.runner);
24
+ if (!resolved.ok) {
25
+ output.error(resolved.message, resolved.code);
26
+ return;
27
+ }
28
+ const remote = await remoteFn(apiClient, { runnerUid: resolved.uid, template });
22
29
  result = merge(result, {
23
30
  valid: remote.valid,
24
31
  errors: remote.errors ?? [],
@@ -1 +1 @@
1
- {"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/validate.ts"],"names":[],"mappings":";;AA4BA,0CA8BC;AAvDD,sDAAgE;AAChE,gDAAuE;AACvE,wDAA6E;AAe7E,SAAS,KAAK,CAAC,CAAmB,EAAE,CAAmB;IACrD,OAAO;QACL,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK;QACzB,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC;QAClC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;KACzD,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,MAAc,EAAE,IAAqB,EAAE,OAAqB,EAAE;IAClG,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,6BAAW,CAAC;IAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,IAAI,2BAAoB,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,IAAI,gCAAqB,CAAC;IAE9D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IAE7B,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjF,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE;YACrB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;YAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE;SAChC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjF,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAC1C,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;QAC3B,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,CAAC,YAAY,QAAQ,CAAC,MAAM,cAAc,CAAC,CAAC;QAC1D,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/validate.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ import type { RunnerInfo } from './types.js';
2
+ export type RunnerResolution = {
3
+ ok: true;
4
+ runner: RunnerInfo;
5
+ } | {
6
+ ok: false;
7
+ code: 'RUNNER_NOT_FOUND' | 'RUNNER_AMBIGUOUS';
8
+ message: string;
9
+ };
10
+ export declare function resolveRunner(runners: RunnerInfo[], ref: string): RunnerResolution;
11
+ export declare function resolveRunnerRef(listRunners: () => Promise<RunnerInfo[]>, ref: string): Promise<{
12
+ ok: true;
13
+ uid: string;
14
+ runner?: RunnerInfo;
15
+ } | Extract<RunnerResolution, {
16
+ ok: false;
17
+ }>>;
@@ -0,0 +1,41 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.resolveRunner = resolveRunner;
4
+ exports.resolveRunnerRef = resolveRunnerRef;
5
+ function resolveRunner(runners, ref) {
6
+ const byUid = runners.find((r) => r.uid === ref);
7
+ if (byUid)
8
+ return { ok: true, runner: byUid };
9
+ const byKey = runners.filter((r) => r.runnerKey === ref);
10
+ if (byKey.length === 1)
11
+ return { ok: true, runner: byKey[0] };
12
+ if (byKey.length > 1) {
13
+ return {
14
+ ok: false,
15
+ code: 'RUNNER_AMBIGUOUS',
16
+ message: `Runner key "${ref}" matches ${byKey.length} runners (${byKey
17
+ .map((r) => r.uid)
18
+ .join(', ')}); pass the uid instead.`,
19
+ };
20
+ }
21
+ const known = runners.map((r) => `${r.runnerKey} (${r.uid})`).join(', ');
22
+ return {
23
+ ok: false,
24
+ code: 'RUNNER_NOT_FOUND',
25
+ message: `Runner "${ref}" not found for this project.${known ? ` Available: ${known}.` : ''} \`dcupl workflow runners\` lists them.`,
26
+ };
27
+ }
28
+ async function resolveRunnerRef(listRunners, ref) {
29
+ let runners;
30
+ try {
31
+ runners = await listRunners();
32
+ }
33
+ catch {
34
+ return { ok: true, uid: ref };
35
+ }
36
+ if (!Array.isArray(runners))
37
+ return { ok: true, uid: ref };
38
+ const res = resolveRunner(runners, ref);
39
+ return res.ok ? { ok: true, uid: res.runner.uid, runner: res.runner } : res;
40
+ }
41
+ //# sourceMappingURL=resolve-runner.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolve-runner.js","sourceRoot":"","sources":["../../../src/functions/workflow/resolve-runner.ts"],"names":[],"mappings":";;AAeA,sCAyBC;AASD,4CAaC;AA/CD,SAAgB,aAAa,CAAC,OAAqB,EAAE,GAAW;IAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;IACjD,IAAI,KAAK;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAE9C,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,CAAC;IACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9D,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO;YACL,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,eAAe,GAAG,aAAa,KAAK,CAAC,MAAM,aAAa,KAAK;iBACnE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;iBACjB,IAAI,CAAC,IAAI,CAAC,0BAA0B;SACxC,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,OAAO;QACL,EAAE,EAAE,KAAK;QACT,IAAI,EAAE,kBAAkB;QACxB,OAAO,EAAE,WAAW,GAAG,gCACrB,KAAK,CAAC,CAAC,CAAC,eAAe,KAAK,GAAG,CAAC,CAAC,CAAC,EACpC,yCAAyC;KAC1C,CAAC;AACJ,CAAC;AASM,KAAK,UAAU,gBAAgB,CACpC,WAAwC,EACxC,GAAW;IAEX,IAAI,OAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,WAAW,EAAE,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAChC,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAC3D,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACxC,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AAC9E,CAAC"}
@@ -32,7 +32,7 @@ function looks403(status, runError) {
32
32
  const hay = `${runError?.message ?? ''} ${runError?.errorType ?? ''} ${runError?.detail ?? ''}`.toLowerCase();
33
33
  return /\b403\b|forbidden|unauthor/.test(hay);
34
34
  }
35
- const FILES_AUTH_HINT = 'dcupl-files auth failed (403) — check auth.apiKey (the project workflow api-key UUID)';
35
+ const FILES_AUTH_HINT = 'dcupl-files auth failed (403) — check auth.apiKey: use {{variables.dcupl_api_key}} or the api-key id from the console, never the key value';
36
36
  function filesAuthHint(template, status, runError, reachedRun) {
37
37
  if (!looks403(status, runError))
38
38
  return undefined;