@dcupl/cli 1.4.0-beta.0 → 1.4.0-beta.2
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 +45 -0
- package/dist/cli.js +136 -18
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/commands/fn/_fn-helpers.d.ts +13 -0
- package/dist/functions/app/commands/fn/_fn-helpers.js +56 -0
- package/dist/functions/app/commands/fn/_fn-helpers.js.map +1 -1
- package/dist/functions/app/commands/fn/aggregate.d.ts +8 -1
- package/dist/functions/app/commands/fn/aggregate.js +29 -3
- package/dist/functions/app/commands/fn/aggregate.js.map +1 -1
- package/dist/functions/app/commands/fn/facets.d.ts +1 -0
- package/dist/functions/app/commands/fn/facets.js +2 -0
- package/dist/functions/app/commands/fn/facets.js.map +1 -1
- package/dist/functions/app/commands/fn/group-by.d.ts +6 -0
- package/dist/functions/app/commands/fn/group-by.js +13 -22
- package/dist/functions/app/commands/fn/group-by.js.map +1 -1
- package/dist/functions/app/commands/fn/pivot.d.ts +14 -0
- package/dist/functions/app/commands/fn/pivot.js +72 -0
- package/dist/functions/app/commands/fn/pivot.js.map +1 -0
- package/dist/functions/app/commands/fn/suggest.d.ts +17 -0
- package/dist/functions/app/commands/fn/suggest.js +34 -0
- package/dist/functions/app/commands/fn/suggest.js.map +1 -0
- package/dist/functions/app/commands/resolve-source.js +13 -5
- package/dist/functions/app/commands/resolve-source.js.map +1 -1
- package/dist/functions/app/commands/validate.js +1 -4
- package/dist/functions/app/commands/validate.js.map +1 -1
- package/dist/functions/app/daemon/controllers/fn.controller.d.ts +8 -0
- package/dist/functions/app/daemon/controllers/fn.controller.js +20 -0
- package/dist/functions/app/daemon/controllers/fn.controller.js.map +1 -1
- package/dist/functions/app/daemon/services/attribute-validation.d.ts +21 -0
- package/dist/functions/app/daemon/services/attribute-validation.js +161 -0
- package/dist/functions/app/daemon/services/attribute-validation.js.map +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +7 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.js +87 -6
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/e2e/port-lock.d.ts +8 -0
- package/dist/functions/app/e2e/port-lock.js +50 -0
- package/dist/functions/app/e2e/port-lock.js.map +1 -1
- package/dist/functions/config/commands/get.d.ts +3 -3
- package/dist/functions/config/commands/get.js +34 -16
- package/dist/functions/config/commands/get.js.map +1 -1
- package/dist/functions/config/commands/set.js +7 -2
- package/dist/functions/config/commands/set.js.map +1 -1
- package/dist/functions/config/io.d.ts +4 -1
- package/dist/functions/config/io.js +43 -8
- package/dist/functions/config/io.js.map +1 -1
- package/dist/functions/files/commands/copy.js +1 -1
- package/dist/functions/files/commands/copy.js.map +1 -1
- package/dist/functions/files/commands/delete.js +1 -1
- package/dist/functions/files/commands/delete.js.map +1 -1
- package/dist/functions/files/commands/list.js +6 -3
- package/dist/functions/files/commands/list.js.map +1 -1
- package/dist/functions/files/commands/move.js +1 -1
- package/dist/functions/files/commands/move.js.map +1 -1
- package/dist/functions/files/commands/pull.d.ts +14 -1
- package/dist/functions/files/commands/pull.js +110 -1
- package/dist/functions/files/commands/pull.js.map +1 -1
- package/dist/functions/files/commands/push.js +5 -3
- package/dist/functions/files/commands/push.js.map +1 -1
- package/dist/functions/files/commands/read.js +1 -1
- package/dist/functions/files/commands/read.js.map +1 -1
- package/dist/functions/files/commands/render.d.ts +29 -0
- package/dist/functions/files/commands/render.js +8 -4
- package/dist/functions/files/commands/render.js.map +1 -1
- package/dist/functions/files/commands/status.js +1 -0
- package/dist/functions/files/commands/status.js.map +1 -1
- package/dist/functions/files/commands/versions/copy.js +1 -1
- package/dist/functions/files/commands/versions/copy.js.map +1 -1
- package/dist/functions/files/commands/versions/delete.js +1 -1
- package/dist/functions/files/commands/versions/delete.js.map +1 -1
- package/dist/functions/files/commands/versions/list.js +4 -0
- package/dist/functions/files/commands/versions/list.js.map +1 -1
- package/dist/functions/files/commands/write.js +1 -1
- package/dist/functions/files/commands/write.js.map +1 -1
- package/dist/functions/files/files-pull.js +10 -7
- package/dist/functions/files/files-pull.js.map +1 -1
- package/dist/functions/files/files-push.js +11 -8
- package/dist/functions/files/files-push.js.map +1 -1
- package/dist/functions/files/test-helpers.d.ts +11 -0
- package/dist/functions/files/test-helpers.js +28 -0
- package/dist/functions/files/test-helpers.js.map +1 -1
- package/dist/functions/generate/files/generate-code.d.ts +1 -1
- package/dist/functions/generate/files/generate-files.d.ts +7 -1
- package/dist/functions/generate/files/generate-files.js +63 -15
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/files/workflow-presets.d.ts +6 -0
- package/dist/functions/generate/files/workflow-presets.js +158 -0
- package/dist/functions/generate/files/workflow-presets.js.map +1 -0
- package/dist/functions/generate/model-from-data/generate-model-from-data.js +4 -3
- package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
- package/dist/functions/generate/model-from-data/infer-to-model.js +5 -1
- package/dist/functions/generate/model-from-data/infer-to-model.js.map +1 -1
- package/dist/functions/generate/projects/generate-project.d.ts +5 -0
- package/dist/functions/generate/projects/generate-project.js +20 -6
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/api-client.js +9 -14
- package/dist/functions/helper/api-client.js.map +1 -1
- package/dist/functions/helper/credentials.helper.d.ts +21 -0
- package/dist/functions/helper/credentials.helper.js +39 -0
- package/dist/functions/helper/credentials.helper.js.map +1 -0
- package/dist/functions/helper/load-env.d.ts +1 -0
- package/dist/functions/helper/load-env.js +10 -0
- package/dist/functions/helper/load-env.js.map +1 -0
- package/dist/functions/helper/output.d.ts +1 -1
- package/dist/functions/helper/output.js +7 -11
- package/dist/functions/helper/output.js.map +1 -1
- package/dist/functions/schemas/examples/AttributeQualityConfig.example.json +10 -0
- package/dist/functions/schemas/examples/ModelDefinition.example.json +21 -2
- package/dist/functions/schemas/examples/ScriptStepConfig.example.json +1 -1
- package/dist/functions/schemas/registry.d.ts +14 -0
- package/dist/functions/schemas/registry.js +40 -0
- package/dist/functions/schemas/registry.js.map +1 -1
- package/dist/functions/schemas/validate.d.ts +22 -0
- package/dist/functions/schemas/validate.js +67 -0
- package/dist/functions/schemas/validate.js.map +1 -0
- package/dist/functions/serve/main.js +6 -5
- package/dist/functions/serve/main.js.map +1 -1
- package/dist/functions/version/command.d.ts +12 -1
- package/dist/functions/version/command.js +54 -1
- package/dist/functions/version/command.js.map +1 -1
- package/dist/functions/workflow/commands/deploy.d.ts +8 -1
- package/dist/functions/workflow/commands/deploy.js +24 -0
- package/dist/functions/workflow/commands/deploy.js.map +1 -1
- package/dist/functions/workflow/commands/run.d.ts +26 -0
- package/dist/functions/workflow/commands/run.js +85 -0
- package/dist/functions/workflow/commands/run.js.map +1 -0
- package/dist/functions/workflow/commands/runners.d.ts +2 -0
- package/dist/functions/workflow/commands/runners.js +10 -1
- package/dist/functions/workflow/commands/runners.js.map +1 -1
- package/dist/functions/workflow/commands/test.d.ts +3 -0
- package/dist/functions/workflow/commands/test.js +8 -64
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/commands/trace.d.ts +4 -2
- package/dist/functions/workflow/commands/trace.js +22 -1
- package/dist/functions/workflow/commands/trace.js.map +1 -1
- package/dist/functions/workflow/commands/validate.js +8 -1
- package/dist/functions/workflow/commands/validate.js.map +1 -1
- package/dist/functions/workflow/run-failure.d.ts +11 -0
- package/dist/functions/workflow/run-failure.js +74 -0
- package/dist/functions/workflow/run-failure.js.map +1 -0
- package/dist/functions/workflow/runner-health.d.ts +16 -0
- package/dist/functions/workflow/runner-health.js +36 -0
- package/dist/functions/workflow/runner-health.js.map +1 -0
- package/dist/functions/workflow/script-lint.d.ts +10 -0
- package/dist/functions/workflow/script-lint.js +488 -0
- package/dist/functions/workflow/script-lint.js.map +1 -0
- package/dist/functions/workflow/template-io.js +1 -1
- package/dist/functions/workflow/template-io.js.map +1 -1
- package/dist/functions/workflow/validate.js +4 -1
- package/dist/functions/workflow/validate.js.map +1 -1
- package/dist/index.js +6 -3
- package/dist/index.js.map +1 -1
- package/files/common/.env.example +4 -0
- package/files/common/_gitignore +3 -1
- package/package.json +35 -37
|
@@ -1,9 +1,28 @@
|
|
|
1
1
|
{
|
|
2
2
|
"key": "Product",
|
|
3
|
+
"quality": {
|
|
4
|
+
"enabled": true,
|
|
5
|
+
"attributes": { "nullable": true }
|
|
6
|
+
},
|
|
3
7
|
"properties": [
|
|
4
8
|
{ "key": "id", "type": "string" },
|
|
5
|
-
{
|
|
6
|
-
|
|
9
|
+
{
|
|
10
|
+
"key": "name",
|
|
11
|
+
"type": "string",
|
|
12
|
+
"quality": {
|
|
13
|
+
"required": true,
|
|
14
|
+
"nullable": false,
|
|
15
|
+
"validators": { "minLength": { "value": 2 } }
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
"key": "price",
|
|
20
|
+
"type": "float",
|
|
21
|
+
"quality": {
|
|
22
|
+
"validators": { "min": { "value": 0 } },
|
|
23
|
+
"validatorHandling": "loose"
|
|
24
|
+
}
|
|
25
|
+
},
|
|
7
26
|
{ "key": "tags", "type": "Array<string>" },
|
|
8
27
|
{ "key": "createdAt", "type": "date" }
|
|
9
28
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{ "script": "// $items():
|
|
1
|
+
{ "script": "// dcupl script sandbox -- injected globals:\n// $json(), $items() read data (.first() / .last() / .at(i) / .fromPort(name))\n// $input, $context, $state port metadata, execution info, cross-node state\n// $ports(), _output multi-port routing\n// _csv, _json, _array, _string, _object, _datetime, _xml data helpers\n// console (captured in trace runs) + standard JS: Math, Date, JSON\n// Not injected: fetch / _http -- do HTTP calls in a request step instead.\n\n// $json.first() -> plain JSON of the first incoming item ($json() -> all of them).\nconst payload = $json.first();\n\n// CSV helpers are namespaced under _csv (there is no bare csvToJson):\nconst rows = _csv.toJSON(payload.csv, { hasHeaders: true });\n\n// throw -> the run continues on this node's error port.\nif (rows.length === 0) throw new Error(`no rows in ${$items().length} incoming payload(s)`);\n\nconst priced = rows.map((row) => ({ ...row, price: Number(row.price) }));\nconst valid = priced.filter((row) => row.price > 0);\nconst rejected = priced.filter((row) => !(row.price > 0));\n\n// return <value> -> hands the result to the next node (its 'main' port).\nif (rejected.length === 0) return valid;\n\n// _output.route(...) -> fan out over several output ports;\n// _csv.fromJSON(...) turns JSON rows back into CSV text.\nreturn _output.route({\n main: valid,\n rejected: [{ report: _csv.fromJSON(rejected), count: rejected.length }],\n});" }
|
|
@@ -12,4 +12,18 @@ export type SchemaEntry = {
|
|
|
12
12
|
};
|
|
13
13
|
export declare const SCHEMA_REGISTRY: SchemaEntry[];
|
|
14
14
|
export declare function findSchema(name: string): SchemaEntry | undefined;
|
|
15
|
+
export declare function listValidatableSchemas(): SchemaEntry[];
|
|
16
|
+
export type RuntimeZodIssue = {
|
|
17
|
+
path: Array<string | number>;
|
|
18
|
+
message: string;
|
|
19
|
+
};
|
|
20
|
+
export type RuntimeZodSchema = {
|
|
21
|
+
safeParse: (data: unknown) => {
|
|
22
|
+
success: boolean;
|
|
23
|
+
error?: {
|
|
24
|
+
issues: RuntimeZodIssue[];
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
export declare function loadZodSchema(entry: SchemaEntry): Promise<RuntimeZodSchema>;
|
|
15
29
|
export declare function listSchemas(): Record<SchemaGroup, SchemaEntry[]>;
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SCHEMA_REGISTRY = void 0;
|
|
4
4
|
exports.findSchema = findSchema;
|
|
5
|
+
exports.listValidatableSchemas = listValidatableSchemas;
|
|
6
|
+
exports.loadZodSchema = loadZodSchema;
|
|
5
7
|
exports.listSchemas = listSchemas;
|
|
6
8
|
exports.SCHEMA_REGISTRY = [
|
|
7
9
|
{
|
|
@@ -41,6 +43,25 @@ exports.SCHEMA_REGISTRY = [
|
|
|
41
43
|
exportPath: 'Reference',
|
|
42
44
|
description: 'Reference type union: ResolvedReference, DerivedReference, GroupedReference, QueryReference.',
|
|
43
45
|
},
|
|
46
|
+
{
|
|
47
|
+
name: 'ModelQualityConfig',
|
|
48
|
+
group: 'Models',
|
|
49
|
+
kind: 'ts',
|
|
50
|
+
package: '@dcupl/common',
|
|
51
|
+
file: 'dist/esm/types/model.types.d.ts',
|
|
52
|
+
exportPath: 'ModelQualityConfig',
|
|
53
|
+
description: 'Model-level quality: enabled (default true) plus flag defaults for all attributes. Validators are per-attribute — see AttributeQualityConfig.',
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
name: 'AttributeQualityConfig',
|
|
57
|
+
group: 'Models',
|
|
58
|
+
kind: 'ts',
|
|
59
|
+
package: '@dcupl/common',
|
|
60
|
+
file: 'dist/esm/types/model.types.d.ts',
|
|
61
|
+
exportPath: 'AttributeQualityConfig',
|
|
62
|
+
exampleFile: 'AttributeQualityConfig.example.json',
|
|
63
|
+
description: 'Per-attribute quality: required/nullable/forceStrictDataType, validators (email, enum, pattern, min/max, minLength/maxLength, startsWith/endsWith, includes, unique), validatorHandling loose (report) vs strict (drop value).',
|
|
64
|
+
},
|
|
44
65
|
{
|
|
45
66
|
name: 'AppLoaderConfiguration',
|
|
46
67
|
group: 'Loader',
|
|
@@ -163,6 +184,25 @@ exports.SCHEMA_REGISTRY = [
|
|
|
163
184
|
function findSchema(name) {
|
|
164
185
|
return exports.SCHEMA_REGISTRY.find(s => s.name === name);
|
|
165
186
|
}
|
|
187
|
+
function listValidatableSchemas() {
|
|
188
|
+
return exports.SCHEMA_REGISTRY.filter(s => s.kind === 'zod');
|
|
189
|
+
}
|
|
190
|
+
async function loadZodSchema(entry) {
|
|
191
|
+
if (entry.kind !== 'zod') {
|
|
192
|
+
throw new Error(`Schema '${entry.name}' is a TypeScript type without a runtime (Zod) schema.`);
|
|
193
|
+
}
|
|
194
|
+
const mod = (await import(entry.package));
|
|
195
|
+
for (const root of [mod, mod.default]) {
|
|
196
|
+
let value = root;
|
|
197
|
+
for (const part of entry.exportPath.split('.')) {
|
|
198
|
+
value = value && typeof value === 'object' ? value[part] : undefined;
|
|
199
|
+
}
|
|
200
|
+
if (value && typeof value.safeParse === 'function') {
|
|
201
|
+
return value;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
throw new Error(`Could not load Zod schema '${entry.exportPath}' from ${entry.package}.`);
|
|
205
|
+
}
|
|
166
206
|
function listSchemas() {
|
|
167
207
|
const out = {
|
|
168
208
|
'Models': [],
|
|
@@ -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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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { Output } from '../helper/output.js';
|
|
2
|
+
import type { RuntimeZodSchema, SchemaEntry } from './registry.js';
|
|
3
|
+
export type SchemasValidateArgv = {
|
|
4
|
+
file: string;
|
|
5
|
+
against: string;
|
|
6
|
+
json?: boolean;
|
|
7
|
+
};
|
|
8
|
+
export type ValidationIssue = {
|
|
9
|
+
path: string;
|
|
10
|
+
message: string;
|
|
11
|
+
};
|
|
12
|
+
export type SchemasValidateResult = {
|
|
13
|
+
valid: boolean;
|
|
14
|
+
errors: ValidationIssue[];
|
|
15
|
+
};
|
|
16
|
+
export type SchemasValidateDeps = {
|
|
17
|
+
findEntry?: (name: string) => SchemaEntry | undefined;
|
|
18
|
+
listValidatable?: () => SchemaEntry[];
|
|
19
|
+
loadSchema?: (entry: SchemaEntry) => Promise<RuntimeZodSchema>;
|
|
20
|
+
readFile?: (filePath: string) => string;
|
|
21
|
+
};
|
|
22
|
+
export declare function schemasValidateCommand(argv: SchemasValidateArgv, output: Output, deps?: SchemasValidateDeps): Promise<boolean>;
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.schemasValidateCommand = schemasValidateCommand;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const fs = tslib_1.__importStar(require("fs"));
|
|
6
|
+
const registry_js_1 = require("./registry.js");
|
|
7
|
+
function renderResult(result, schemaName) {
|
|
8
|
+
if (result.valid)
|
|
9
|
+
return `✓ valid against ${schemaName}`;
|
|
10
|
+
const lines = result.errors.map((e) => `✗ ${e.path} → ${e.message}`);
|
|
11
|
+
lines.push('');
|
|
12
|
+
lines.push(`✗ invalid — ${result.errors.length} error(s) against ${schemaName}`);
|
|
13
|
+
return lines.join('\n');
|
|
14
|
+
}
|
|
15
|
+
async function schemasValidateCommand(argv, output, deps = {}) {
|
|
16
|
+
const find = deps.findEntry ?? registry_js_1.findSchema;
|
|
17
|
+
const listValidatable = deps.listValidatable ?? registry_js_1.listValidatableSchemas;
|
|
18
|
+
const load = deps.loadSchema ?? registry_js_1.loadZodSchema;
|
|
19
|
+
const read = deps.readFile ?? ((filePath) => fs.readFileSync(filePath, 'utf-8'));
|
|
20
|
+
const validatableNames = () => listValidatable()
|
|
21
|
+
.map((e) => e.name)
|
|
22
|
+
.join(', ');
|
|
23
|
+
const entry = find(argv.against);
|
|
24
|
+
if (!entry) {
|
|
25
|
+
output.error(`Schema '${argv.against}' is not registered. Validatable schemas: ${validatableNames()}`, 'SCHEMA_NOT_FOUND');
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
if (entry.kind !== 'zod') {
|
|
29
|
+
output.error(`Schema '${argv.against}' is a TypeScript type without a runtime validator, so it cannot be used with 'schemas validate'. Validatable schemas: ${validatableNames()}`, 'SCHEMA_NOT_VALIDATABLE');
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
let raw;
|
|
33
|
+
try {
|
|
34
|
+
raw = read(argv.file);
|
|
35
|
+
}
|
|
36
|
+
catch (err) {
|
|
37
|
+
output.error(`Could not read file '${argv.file}': ${err?.message ?? err}`, 'FILE_NOT_READABLE');
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
let data;
|
|
41
|
+
try {
|
|
42
|
+
data = JSON.parse(raw);
|
|
43
|
+
}
|
|
44
|
+
catch (err) {
|
|
45
|
+
output.error(`File '${argv.file}' is not valid JSON: ${err?.message ?? err}`, 'INVALID_JSON');
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
let schema;
|
|
49
|
+
try {
|
|
50
|
+
schema = await load(entry);
|
|
51
|
+
}
|
|
52
|
+
catch (err) {
|
|
53
|
+
output.error(err?.message ?? String(err), 'SCHEMA_LOAD_FAILED');
|
|
54
|
+
return false;
|
|
55
|
+
}
|
|
56
|
+
const parsed = schema.safeParse(data);
|
|
57
|
+
const errors = parsed.success
|
|
58
|
+
? []
|
|
59
|
+
: (parsed.error?.issues ?? []).map((issue) => ({
|
|
60
|
+
path: issue.path.length > 0 ? issue.path.map((p) => String(p)).join('.') : '(root)',
|
|
61
|
+
message: issue.message,
|
|
62
|
+
}));
|
|
63
|
+
const result = { valid: parsed.success, errors };
|
|
64
|
+
output.success(result, (r) => renderResult(r, entry.name));
|
|
65
|
+
return result.valid;
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=validate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/functions/schemas/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const express_1 = require("express");
|
|
|
11
11
|
const serve_favicon_1 = tslib_1.__importDefault(require("serve-favicon"));
|
|
12
12
|
const compression_1 = tslib_1.__importDefault(require("compression"));
|
|
13
13
|
const config_helper_1 = require("../helper/config.helper");
|
|
14
|
+
const credentials_helper_1 = require("../helper/credentials.helper");
|
|
14
15
|
const fs_extra_1 = require("fs-extra");
|
|
15
16
|
async function openBrowser(url) {
|
|
16
17
|
try {
|
|
@@ -26,7 +27,7 @@ function initStartScreen(app) {
|
|
|
26
27
|
app.getHttpAdapter().get('', (req, res) => {
|
|
27
28
|
const codeBasePath = (0, path_1.resolve)(__dirname, '../../..');
|
|
28
29
|
const filesBasePath = (0, path_1.join)(codeBasePath, 'files');
|
|
29
|
-
return res.sendFile((0, path_1.join)(
|
|
30
|
+
return res.sendFile((0, path_1.join)('dev-server', 'index.html'), { root: filesBasePath });
|
|
30
31
|
});
|
|
31
32
|
}
|
|
32
33
|
async function bootstrap(argv) {
|
|
@@ -34,15 +35,15 @@ async function bootstrap(argv) {
|
|
|
34
35
|
const servePath = argv.path;
|
|
35
36
|
global.servePath = servePath;
|
|
36
37
|
const currentBasePath = (0, path_1.join)(process.cwd());
|
|
37
|
-
const cliConfig = (0, config_helper_1.getConfigFileValue)(currentBasePath);
|
|
38
|
-
const
|
|
38
|
+
const cliConfig = (0, config_helper_1.getConfigFileValue)(currentBasePath, undefined, { quiet: true });
|
|
39
|
+
const { apiKey, projectId } = (0, credentials_helper_1.resolveCredentials)(currentBasePath);
|
|
39
40
|
if (!cliConfig) {
|
|
40
41
|
console.log('');
|
|
41
42
|
console.log(`Make sure to have a valid ${(0, kleur_1.bold)((0, kleur_1.blue)('dcupl.config.json'))} file present in your local workspace.`);
|
|
42
43
|
console.log('');
|
|
43
44
|
return;
|
|
44
45
|
}
|
|
45
|
-
if (!
|
|
46
|
+
if (!projectId.value || !apiKey.value) {
|
|
46
47
|
console.log('');
|
|
47
48
|
console.log((0, kleur_1.gray)('ℹ️ Running locally without a configured projectId/apiKey — that is expected.'));
|
|
48
49
|
console.log((0, kleur_1.gray)(' They are only needed for cloud sync via `dcupl files`.'));
|
|
@@ -77,7 +78,7 @@ async function bootstrap(argv) {
|
|
|
77
78
|
port: actualPort,
|
|
78
79
|
cwd: currentBasePath,
|
|
79
80
|
loaderPath: loaderAbs,
|
|
80
|
-
projectId:
|
|
81
|
+
projectId: projectId.value,
|
|
81
82
|
});
|
|
82
83
|
const onExit = () => { cleanup(); process.exit(0); };
|
|
83
84
|
process.on('SIGTERM', onExit);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/functions/serve/main.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/functions/serve/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,26 @@ export declare const DCUPL_PACKAGES: readonly ["@dcupl/core", "@dcupl/common", "
|
|
|
3
3
|
export type VersionInfo = {
|
|
4
4
|
version: string;
|
|
5
5
|
dcupl: Record<string, string>;
|
|
6
|
+
latestVersion?: string;
|
|
7
|
+
updateAvailable?: boolean;
|
|
8
|
+
updateCommand?: string;
|
|
6
9
|
};
|
|
7
10
|
export type CliPackage = {
|
|
8
11
|
version?: string;
|
|
9
12
|
dependencies?: Record<string, string>;
|
|
10
13
|
};
|
|
14
|
+
export type DistTags = Record<string, string>;
|
|
15
|
+
export type UpdateCheck = {
|
|
16
|
+
latestVersion?: string;
|
|
17
|
+
updateAvailable: boolean;
|
|
18
|
+
updateCommand?: string;
|
|
19
|
+
};
|
|
11
20
|
export type VersionDeps = {
|
|
12
21
|
readCliPackage?: () => CliPackage;
|
|
13
22
|
resolvePackageVersion?: (pkg: string) => string | undefined;
|
|
23
|
+
fetchDistTags?: () => Promise<DistTags | undefined>;
|
|
14
24
|
};
|
|
25
|
+
export declare function computeUpdate(installed: string, distTags: DistTags | undefined): UpdateCheck;
|
|
15
26
|
export declare function collectVersionInfo(deps?: VersionDeps): VersionInfo;
|
|
16
27
|
export declare function formatVersion(info: VersionInfo): string;
|
|
17
|
-
export declare function versionCommand(output: Output, deps?: VersionDeps): void
|
|
28
|
+
export declare function versionCommand(output: Output, deps?: VersionDeps): Promise<void>;
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DCUPL_PACKAGES = void 0;
|
|
4
|
+
exports.computeUpdate = computeUpdate;
|
|
4
5
|
exports.collectVersionInfo = collectVersionInfo;
|
|
5
6
|
exports.formatVersion = formatVersion;
|
|
6
7
|
exports.versionCommand = versionCommand;
|
|
7
8
|
const tslib_1 = require("tslib");
|
|
8
9
|
const fs = tslib_1.__importStar(require("fs"));
|
|
9
10
|
const path = tslib_1.__importStar(require("path"));
|
|
11
|
+
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
12
|
+
const CLI_PACKAGE = '@dcupl/cli';
|
|
13
|
+
const REGISTRY_TIMEOUT_MS = 1500;
|
|
10
14
|
exports.DCUPL_PACKAGES = [
|
|
11
15
|
'@dcupl/core',
|
|
12
16
|
'@dcupl/common',
|
|
@@ -28,6 +32,44 @@ function defaultResolvePackageVersion(pkg) {
|
|
|
28
32
|
return undefined;
|
|
29
33
|
}
|
|
30
34
|
}
|
|
35
|
+
async function defaultFetchDistTags() {
|
|
36
|
+
const controller = new AbortController();
|
|
37
|
+
const timer = setTimeout(() => controller.abort(), REGISTRY_TIMEOUT_MS);
|
|
38
|
+
try {
|
|
39
|
+
const res = await fetch(`https://registry.npmjs.org/${CLI_PACKAGE}`, {
|
|
40
|
+
signal: controller.signal,
|
|
41
|
+
headers: { accept: 'application/json' },
|
|
42
|
+
});
|
|
43
|
+
if (!res.ok)
|
|
44
|
+
return undefined;
|
|
45
|
+
const body = (await res.json());
|
|
46
|
+
return body['dist-tags'];
|
|
47
|
+
}
|
|
48
|
+
catch {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
finally {
|
|
52
|
+
clearTimeout(timer);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
function computeUpdate(installed, distTags) {
|
|
56
|
+
if (!distTags || !semver_1.default.valid(installed))
|
|
57
|
+
return { updateAvailable: false };
|
|
58
|
+
const prerelease = semver_1.default.prerelease(installed);
|
|
59
|
+
const channelId = prerelease && typeof prerelease[0] === 'string' ? prerelease[0] : undefined;
|
|
60
|
+
const tag = channelId && distTags[channelId] ? channelId : 'latest';
|
|
61
|
+
const target = distTags[tag];
|
|
62
|
+
if (!target || !semver_1.default.valid(target))
|
|
63
|
+
return { updateAvailable: false };
|
|
64
|
+
if (!semver_1.default.gt(target, installed)) {
|
|
65
|
+
return { latestVersion: target, updateAvailable: false };
|
|
66
|
+
}
|
|
67
|
+
return {
|
|
68
|
+
latestVersion: target,
|
|
69
|
+
updateAvailable: true,
|
|
70
|
+
updateCommand: `npm i -g ${CLI_PACKAGE}@${tag}`,
|
|
71
|
+
};
|
|
72
|
+
}
|
|
31
73
|
function collectVersionInfo(deps = {}) {
|
|
32
74
|
const readCliPackage = deps.readCliPackage ?? defaultReadCliPackage;
|
|
33
75
|
const resolvePackageVersion = deps.resolvePackageVersion ?? defaultResolvePackageVersion;
|
|
@@ -45,10 +87,21 @@ function formatVersion(info) {
|
|
|
45
87
|
for (const [name, version] of Object.entries(info.dcupl)) {
|
|
46
88
|
lines.push(` ${name} ${version}`);
|
|
47
89
|
}
|
|
90
|
+
if (info.updateAvailable && info.latestVersion) {
|
|
91
|
+
lines.push('');
|
|
92
|
+
lines.push(`Update available: ${info.version} → ${info.latestVersion}`);
|
|
93
|
+
if (info.updateCommand)
|
|
94
|
+
lines.push(`Run \`${info.updateCommand}\` to upgrade.`);
|
|
95
|
+
}
|
|
48
96
|
return lines.join('\n') + '\n';
|
|
49
97
|
}
|
|
50
|
-
function versionCommand(output, deps = {}) {
|
|
98
|
+
async function versionCommand(output, deps = {}) {
|
|
51
99
|
const info = collectVersionInfo(deps);
|
|
100
|
+
const fetchDistTags = deps.fetchDistTags ?? defaultFetchDistTags;
|
|
101
|
+
const update = computeUpdate(info.version, await fetchDistTags());
|
|
102
|
+
info.latestVersion = update.latestVersion;
|
|
103
|
+
info.updateAvailable = update.updateAvailable;
|
|
104
|
+
info.updateCommand = update.updateCommand;
|
|
52
105
|
output.success(output.isJson() ? info : formatVersion(info));
|
|
53
106
|
}
|
|
54
107
|
//# sourceMappingURL=command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/functions/version/command.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/functions/version/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import type { ApiClient } from '../../helper/api-client.js';
|
|
2
2
|
import type { Output } from '../../helper/output.js';
|
|
3
|
-
import type { DeployedWorkflow, TemplateV3, ValidationResult } from '../types.js';
|
|
3
|
+
import type { DeployedWorkflow, RunnerInfo, TemplateV3, ValidationResult } from '../types.js';
|
|
4
4
|
import { type SwapResult } from '../wait-for-swap.js';
|
|
5
|
+
import { type RunnerHealth } from '../runner-health.js';
|
|
6
|
+
export declare function checkRunnerReachable(client: ApiClient, runnerUid: string, deps: {
|
|
7
|
+
getRunner?: (client: ApiClient, uid: string) => Promise<RunnerInfo>;
|
|
8
|
+
probeHealth?: (url: string) => Promise<RunnerHealth>;
|
|
9
|
+
}): Promise<string | null>;
|
|
5
10
|
export interface DeployOptions {
|
|
6
11
|
file: string;
|
|
7
12
|
runner: string;
|
|
@@ -25,5 +30,7 @@ export interface DeployDeps {
|
|
|
25
30
|
waitForSwap?: (client: ApiClient, id: string, deployedV: string, deps?: object, opts?: {
|
|
26
31
|
timeoutMs?: number;
|
|
27
32
|
}) => Promise<SwapResult>;
|
|
33
|
+
getRunner?: (client: ApiClient, uid: string) => Promise<RunnerInfo>;
|
|
34
|
+
probeHealth?: (url: string) => Promise<RunnerHealth>;
|
|
28
35
|
}
|
|
29
36
|
export declare function deployCommand(output: Output, client: ApiClient, opts: DeployOptions, deps?: DeployDeps): Promise<void>;
|
|
@@ -1,10 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.checkRunnerReachable = checkRunnerReachable;
|
|
3
4
|
exports.deployCommand = deployCommand;
|
|
4
5
|
const template_io_js_1 = require("../template-io.js");
|
|
5
6
|
const workflow_api_js_1 = require("../workflow-api.js");
|
|
6
7
|
const confirm_js_1 = require("../../files/helper/confirm.js");
|
|
7
8
|
const wait_for_swap_js_1 = require("../wait-for-swap.js");
|
|
9
|
+
const runner_health_js_1 = require("../runner-health.js");
|
|
10
|
+
async function checkRunnerReachable(client, runnerUid, deps) {
|
|
11
|
+
const get = deps.getRunner ?? workflow_api_js_1.getRunner;
|
|
12
|
+
const probe = deps.probeHealth ?? runner_health_js_1.probeRunnerHealth;
|
|
13
|
+
try {
|
|
14
|
+
const runner = await get(client, runnerUid);
|
|
15
|
+
if (!runner?.url)
|
|
16
|
+
return null;
|
|
17
|
+
const health = await probe(runner.url);
|
|
18
|
+
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'.`;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
}
|
|
25
|
+
return null;
|
|
26
|
+
}
|
|
8
27
|
async function deployCommand(output, client, opts, deps = {}) {
|
|
9
28
|
const load = deps.loadTemplate ?? template_io_js_1.loadTemplate;
|
|
10
29
|
const validate = deps.validateRemote ?? workflow_api_js_1.validateRemote;
|
|
@@ -12,6 +31,11 @@ async function deployCommand(output, client, opts, deps = {}) {
|
|
|
12
31
|
const confirm = deps.confirm ?? confirm_js_1.confirmDestructive;
|
|
13
32
|
const wait = deps.waitForSwap ?? wait_for_swap_js_1.waitForSwap;
|
|
14
33
|
const template = load(opts.file);
|
|
34
|
+
const unreachable = await checkRunnerReachable(client, opts.runner, deps);
|
|
35
|
+
if (unreachable) {
|
|
36
|
+
output.error(unreachable, 'RUNNER_UNREACHABLE');
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
15
39
|
const result = await validate(client, { runnerUid: opts.runner, template });
|
|
16
40
|
if (!result.valid) {
|
|
17
41
|
const summary = (result.errors ?? []).map((e) => `✗ ${e.type}: ${e.message}`).join('\n');
|
|
@@ -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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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { ApiClient } from '../../helper/api-client.js';
|
|
2
|
+
import type { Output } from '../../helper/output.js';
|
|
3
|
+
import type { DeployedWorkflowV3, RunnerInfo } from '../types.js';
|
|
4
|
+
export interface RunOptions {
|
|
5
|
+
key: string;
|
|
6
|
+
runner: string;
|
|
7
|
+
body?: string;
|
|
8
|
+
input?: string;
|
|
9
|
+
node?: string;
|
|
10
|
+
triggerKey?: string;
|
|
11
|
+
}
|
|
12
|
+
export interface RunDeps {
|
|
13
|
+
listRunners?: (client: ApiClient) => Promise<RunnerInfo[]>;
|
|
14
|
+
listWorkflows?: (client: ApiClient) => Promise<DeployedWorkflowV3[]>;
|
|
15
|
+
getWorkflow?: (client: ApiClient, id: string) => Promise<DeployedWorkflowV3>;
|
|
16
|
+
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>;
|
|
25
|
+
}
|
|
26
|
+
export declare function runCommand(output: Output, client: ApiClient, opts: RunOptions, deps?: RunDeps): Promise<void>;
|