@dcupl/cli 1.4.0-beta.1 → 1.4.0-beta.11
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 +34 -0
- package/dist/cli.js +737 -169
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/app-id.js +34 -2
- package/dist/functions/app/app-id.js.map +1 -1
- package/dist/functions/app/client/daemon-client.js.map +1 -1
- package/dist/functions/app/commands/cdn-host.d.ts +16 -0
- package/dist/functions/app/commands/cdn-host.js +47 -0
- package/dist/functions/app/commands/cdn-host.js.map +1 -0
- package/dist/functions/app/commands/create.js +50 -34
- package/dist/functions/app/commands/create.js.map +1 -1
- package/dist/functions/app/commands/destroy.js +10 -4
- package/dist/functions/app/commands/destroy.js.map +1 -1
- package/dist/functions/app/commands/detect-serve.js +17 -6
- package/dist/functions/app/commands/detect-serve.js.map +1 -1
- package/dist/functions/app/commands/fn/_fn-helpers.js +11 -3
- package/dist/functions/app/commands/fn/_fn-helpers.js.map +1 -1
- package/dist/functions/app/commands/fn/aggregate.js +4 -1
- package/dist/functions/app/commands/fn/aggregate.js.map +1 -1
- package/dist/functions/app/commands/fn/pivot.js.map +1 -1
- package/dist/functions/app/commands/list.js +6 -2
- package/dist/functions/app/commands/list.js.map +1 -1
- package/dist/functions/app/commands/loader-hash.js.map +1 -1
- package/dist/functions/app/commands/loaders/add.js +6 -0
- package/dist/functions/app/commands/loaders/add.js.map +1 -1
- package/dist/functions/app/commands/loaders/process-flags.js +4 -1
- package/dist/functions/app/commands/loaders/process-flags.js.map +1 -1
- package/dist/functions/app/commands/loaders/process.js +3 -1
- package/dist/functions/app/commands/loaders/process.js.map +1 -1
- package/dist/functions/app/commands/models/get.js.map +1 -1
- package/dist/functions/app/commands/models/keys.js.map +1 -1
- package/dist/functions/app/commands/models/remove.js.map +1 -1
- package/dist/functions/app/commands/models/set.js +3 -1
- package/dist/functions/app/commands/models/set.js.map +1 -1
- package/dist/functions/app/commands/query/execute.js +5 -2
- package/dist/functions/app/commands/query/execute.js.map +1 -1
- package/dist/functions/app/commands/query/one.js +3 -1
- package/dist/functions/app/commands/query/one.js.map +1 -1
- package/dist/functions/app/commands/render.js +10 -4
- package/dist/functions/app/commands/render.js.map +1 -1
- package/dist/functions/app/commands/resolve-app.js.map +1 -1
- package/dist/functions/app/commands/resolve-source.d.ts +1 -0
- package/dist/functions/app/commands/resolve-source.js +20 -5
- package/dist/functions/app/commands/resolve-source.js.map +1 -1
- package/dist/functions/app/commands/validate-report.d.ts +31 -0
- package/dist/functions/app/commands/validate-report.js +20 -1
- package/dist/functions/app/commands/validate-report.js.map +1 -1
- package/dist/functions/app/commands/validate.d.ts +1 -0
- package/dist/functions/app/commands/validate.js +31 -10
- package/dist/functions/app/commands/validate.js.map +1 -1
- package/dist/functions/app/daemon/app-server.module.js +6 -1
- package/dist/functions/app/daemon/app-server.module.js.map +1 -1
- package/dist/functions/app/daemon/controllers/data.controller.js +17 -6
- package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/lifecycle.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/query.controller.js +4 -1
- package/dist/functions/app/daemon/controllers/query.controller.js.map +1 -1
- package/dist/functions/app/daemon/daemon-args.js +2 -2
- package/dist/functions/app/daemon/daemon-args.js.map +1 -1
- package/dist/functions/app/daemon/filters/envelope-exception.filter.js +6 -1
- package/dist/functions/app/daemon/filters/envelope-exception.filter.js.map +1 -1
- package/dist/functions/app/daemon/main.js +14 -7
- package/dist/functions/app/daemon/main.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 +164 -0
- package/dist/functions/app/daemon/services/attribute-validation.js.map +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +5 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.js +83 -16
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/daemon/services/idle-watchdog.service.js.map +1 -1
- package/dist/functions/app/daemon/services/ingest.service.js +8 -4
- package/dist/functions/app/daemon/services/ingest.service.js.map +1 -1
- package/dist/functions/app/daemon/services/init-options.js.map +1 -1
- package/dist/functions/app/daemon/services/loaders.service.d.ts +3 -1
- package/dist/functions/app/daemon/services/loaders.service.js +22 -6
- package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
- package/dist/functions/app/e2e/port-lock.d.ts +8 -0
- package/dist/functions/app/e2e/port-lock.js +66 -2
- package/dist/functions/app/e2e/port-lock.js.map +1 -1
- package/dist/functions/app/registry/registry.js +11 -10
- package/dist/functions/app/registry/registry.js.map +1 -1
- package/dist/functions/app/registry/serve-registry.js +13 -9
- package/dist/functions/app/registry/serve-registry.js.map +1 -1
- package/dist/functions/app/types.d.ts +2 -0
- package/dist/functions/config/commands/set.js +2 -2
- package/dist/functions/config/commands/set.js.map +1 -1
- package/dist/functions/config/io.js +1 -3
- package/dist/functions/config/io.js.map +1 -1
- package/dist/functions/config/prompts.js +1 -3
- package/dist/functions/config/prompts.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 +16 -1
- package/dist/functions/files/commands/pull.js +135 -1
- package/dist/functions/files/commands/pull.js.map +1 -1
- package/dist/functions/files/commands/push.d.ts +1 -0
- package/dist/functions/files/commands/push.js +25 -3
- package/dist/functions/files/commands/push.js.map +1 -1
- package/dist/functions/files/commands/read.js +3 -2
- 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 +13 -3
- package/dist/functions/files/commands/write.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/text-policy.d.ts +5 -0
- package/dist/functions/files/helper/text-policy.js +31 -0
- package/dist/functions/files/helper/text-policy.js.map +1 -0
- package/dist/functions/files/sync/large-upload.d.ts +20 -0
- package/dist/functions/files/sync/large-upload.js +140 -0
- package/dist/functions/files/sync/large-upload.js.map +1 -0
- package/dist/functions/files/sync/manifest.js +2 -1
- package/dist/functions/files/sync/manifest.js.map +1 -1
- package/dist/functions/files/sync/transfer.d.ts +5 -0
- package/dist/functions/files/sync/transfer.js +47 -10
- package/dist/functions/files/sync/transfer.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 +14 -1
- package/dist/functions/generate/files/generate-files.js +152 -38
- package/dist/functions/generate/files/generate-files.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 +6 -0
- package/dist/functions/generate/files/script-starters.js +74 -0
- package/dist/functions/generate/files/script-starters.js.map +1 -0
- 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 +8 -3
- package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
- package/dist/functions/generate/model-from-data/infer-key.js +1 -4
- package/dist/functions/generate/model-from-data/infer-key.js.map +1 -1
- package/dist/functions/generate/model-from-data/infer-to-model.js +1 -2
- 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 +29 -8
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/api-client.d.ts +3 -0
- package/dist/functions/helper/api-client.js +10 -3
- package/dist/functions/helper/api-client.js.map +1 -1
- package/dist/functions/helper/config.helper.d.ts +1 -0
- package/dist/functions/helper/config.helper.js.map +1 -1
- package/dist/functions/helper/output.d.ts +1 -1
- package/dist/functions/helper/output.js +10 -12
- package/dist/functions/helper/output.js.map +1 -1
- package/dist/functions/helper/parse-fail.js +4 -1
- package/dist/functions/helper/parse-fail.js.map +1 -1
- package/dist/functions/schemas/command.js.map +1 -1
- package/dist/functions/schemas/examples/AppLoaderConfiguration.example.json +1 -3
- package/dist/functions/schemas/examples/DataMapperStepConfig.example.json +6 -1
- package/dist/functions/schemas/examples/ModelDefinition.example.json +8 -1
- package/dist/functions/schemas/examples/ScriptStepConfig.example.json +3 -1
- package/dist/functions/schemas/examples/TemplateV3.example.json +5 -1
- package/dist/functions/schemas/extract.js +1 -1
- package/dist/functions/schemas/extract.js.map +1 -1
- package/dist/functions/schemas/format.js +4 -4
- package/dist/functions/schemas/format.js.map +1 -1
- package/dist/functions/schemas/registry.d.ts +14 -0
- package/dist/functions/schemas/registry.js +103 -30
- package/dist/functions/schemas/registry.js.map +1 -1
- package/dist/functions/schemas/resolve.js +1 -2
- package/dist/functions/schemas/resolve.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/commands/list.js +2 -1
- package/dist/functions/serve/commands/list.js.map +1 -1
- package/dist/functions/serve/commands/stop.js +10 -5
- package/dist/functions/serve/commands/stop.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server-access.guard.d.ts +11 -0
- package/dist/functions/serve/dev-server/dev-server-access.guard.js +41 -0
- package/dist/functions/serve/dev-server/dev-server-access.guard.js.map +1 -0
- package/dist/functions/serve/dev-server/dev-server.controller.d.ts +3 -0
- package/dist/functions/serve/dev-server/dev-server.controller.js +20 -0
- package/dist/functions/serve/dev-server/dev-server.controller.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server.module.d.ts +3 -0
- package/dist/functions/serve/dev-server/dev-server.module.js +34 -23
- package/dist/functions/serve/dev-server/dev-server.module.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server.options.d.ts +8 -0
- package/dist/functions/serve/dev-server/dev-server.options.js +5 -0
- package/dist/functions/serve/dev-server/dev-server.options.js.map +1 -0
- package/dist/functions/serve/dev-server/dev-server.service.d.ts +11 -3
- package/dist/functions/serve/dev-server/dev-server.service.js +72 -65
- package/dist/functions/serve/dev-server/dev-server.service.js.map +1 -1
- package/dist/functions/serve/dev-server/path-scope.d.ts +5 -0
- package/dist/functions/serve/dev-server/path-scope.js +88 -0
- package/dist/functions/serve/dev-server/path-scope.js.map +1 -0
- package/dist/functions/serve/dev-server/request-security.d.ts +34 -0
- package/dist/functions/serve/dev-server/request-security.js +145 -0
- package/dist/functions/serve/dev-server/request-security.js.map +1 -0
- package/dist/functions/serve/main.d.ts +13 -0
- package/dist/functions/serve/main.js +85 -13
- package/dist/functions/serve/main.js.map +1 -1
- package/dist/functions/serve/serve-self-register.js +2 -1
- package/dist/functions/serve/serve-self-register.js.map +1 -1
- package/dist/functions/version/command.js +1 -6
- package/dist/functions/version/command.js.map +1 -1
- package/dist/functions/workflow/commands/deploy.d.ts +9 -1
- package/dist/functions/workflow/commands/deploy.js +39 -10
- package/dist/functions/workflow/commands/deploy.js.map +1 -1
- package/dist/functions/workflow/commands/get.js.map +1 -1
- package/dist/functions/workflow/commands/history.js.map +1 -1
- package/dist/functions/workflow/commands/run.d.ts +26 -0
- package/dist/functions/workflow/commands/run.js +101 -0
- package/dist/functions/workflow/commands/run.js.map +1 -0
- package/dist/functions/workflow/commands/runners-get.js.map +1 -1
- 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/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/template.js.map +1 -1
- package/dist/functions/workflow/commands/test.d.ts +3 -0
- package/dist/functions/workflow/commands/test.js +22 -73
- 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/undeploy.js +3 -1
- package/dist/functions/workflow/commands/undeploy.js.map +1 -1
- package/dist/functions/workflow/commands/validate.d.ts +2 -0
- package/dist/functions/workflow/commands/validate.js +16 -2
- package/dist/functions/workflow/commands/validate.js.map +1 -1
- package/dist/functions/workflow/resolve-runner.d.ts +17 -0
- package/dist/functions/workflow/resolve-runner.js +41 -0
- package/dist/functions/workflow/resolve-runner.js.map +1 -0
- 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 +513 -0
- package/dist/functions/workflow/script-lint.js.map +1 -0
- package/dist/functions/workflow/trace.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/validate.js +4 -1
- package/dist/functions/workflow/validate.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.js +3 -1
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/files/dev-server/index.html +2 -1
- package/package.json +24 -18
- package/dist/functions/serve/guards/apiKey.guard.d.ts +0 -4
- package/dist/functions/serve/guards/apiKey.guard.js +0 -23
- package/dist/functions/serve/guards/apiKey.guard.js.map +0 -1
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AttributeNotFoundError = void 0;
|
|
4
|
+
exports.firstPathSegment = firstPathSegment;
|
|
5
|
+
exports.levenshtein = levenshtein;
|
|
6
|
+
exports.suggestAttribute = suggestAttribute;
|
|
7
|
+
exports.collectQueryAttributes = collectQueryAttributes;
|
|
8
|
+
exports.collectSortAttributes = collectSortAttributes;
|
|
9
|
+
exports.collectProjectionAttributes = collectProjectionAttributes;
|
|
10
|
+
exports.buildAttributeNotFound = buildAttributeNotFound;
|
|
11
|
+
exports.assertKnownAttributes = assertKnownAttributes;
|
|
12
|
+
exports.isSdkAttributeNotFound = isSdkAttributeNotFound;
|
|
13
|
+
exports.toAttributeNotFound = toAttributeNotFound;
|
|
14
|
+
class AttributeNotFoundError extends Error {
|
|
15
|
+
constructor(attribute, model, detail) {
|
|
16
|
+
super(`Attribute "${attribute}" not found on model "${model}"${detail ? `. ${detail}` : ''}`);
|
|
17
|
+
this.attribute = attribute;
|
|
18
|
+
this.model = model;
|
|
19
|
+
this.code = 'ATTRIBUTE_NOT_FOUND';
|
|
20
|
+
this.name = 'AttributeNotFoundError';
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.AttributeNotFoundError = AttributeNotFoundError;
|
|
24
|
+
function isInternalName(name) {
|
|
25
|
+
return name === 'key' || name === 'filterables' || name.startsWith('$');
|
|
26
|
+
}
|
|
27
|
+
function firstPathSegment(attribute) {
|
|
28
|
+
const dot = attribute.indexOf('.');
|
|
29
|
+
const head = dot === -1 ? attribute : attribute.slice(0, dot);
|
|
30
|
+
const bracket = head.indexOf('[');
|
|
31
|
+
return bracket === -1 ? head : head.slice(0, bracket);
|
|
32
|
+
}
|
|
33
|
+
function levenshtein(a, b) {
|
|
34
|
+
if (a === b)
|
|
35
|
+
return 0;
|
|
36
|
+
if (a.length === 0)
|
|
37
|
+
return b.length;
|
|
38
|
+
if (b.length === 0)
|
|
39
|
+
return a.length;
|
|
40
|
+
let previous = Array.from({ length: b.length + 1 }, (_, i) => i);
|
|
41
|
+
for (let i = 1; i <= a.length; i++) {
|
|
42
|
+
const current = [i];
|
|
43
|
+
for (let j = 1; j <= b.length; j++) {
|
|
44
|
+
const substitution = previous[j - 1] + (a[i - 1] === b[j - 1] ? 0 : 1);
|
|
45
|
+
current[j] = Math.min(previous[j] + 1, current[j - 1] + 1, substitution);
|
|
46
|
+
}
|
|
47
|
+
previous = current;
|
|
48
|
+
}
|
|
49
|
+
return previous[b.length];
|
|
50
|
+
}
|
|
51
|
+
function suggestAttribute(input, known) {
|
|
52
|
+
const inputLower = input.toLowerCase();
|
|
53
|
+
let best;
|
|
54
|
+
for (const candidate of known) {
|
|
55
|
+
const candidateLower = candidate.toLowerCase();
|
|
56
|
+
let rank;
|
|
57
|
+
let distance;
|
|
58
|
+
if (candidateLower === inputLower) {
|
|
59
|
+
rank = 0;
|
|
60
|
+
distance = 0;
|
|
61
|
+
}
|
|
62
|
+
else if (inputLower.length >= 2 &&
|
|
63
|
+
(candidateLower.startsWith(inputLower) || inputLower.startsWith(candidateLower))) {
|
|
64
|
+
rank = 1;
|
|
65
|
+
distance = Math.abs(candidate.length - input.length);
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
if (Math.abs(candidate.length - input.length) > 2)
|
|
69
|
+
continue;
|
|
70
|
+
distance = levenshtein(inputLower, candidateLower);
|
|
71
|
+
if (distance > 2)
|
|
72
|
+
continue;
|
|
73
|
+
rank = 2;
|
|
74
|
+
}
|
|
75
|
+
if (!best || rank < best.rank || (rank === best.rank && distance < best.distance)) {
|
|
76
|
+
best = { name: candidate, rank, distance };
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return best?.name;
|
|
80
|
+
}
|
|
81
|
+
const MAX_QUERY_DEPTH = 64;
|
|
82
|
+
function collectQueryAttributes(node, depth = 0, out = []) {
|
|
83
|
+
if (!node || typeof node !== 'object' || depth > MAX_QUERY_DEPTH)
|
|
84
|
+
return out;
|
|
85
|
+
if (Array.isArray(node)) {
|
|
86
|
+
for (const child of node)
|
|
87
|
+
collectQueryAttributes(child, depth + 1, out);
|
|
88
|
+
return out;
|
|
89
|
+
}
|
|
90
|
+
const obj = node;
|
|
91
|
+
if (Array.isArray(obj.queries)) {
|
|
92
|
+
collectQueryAttributes(obj.queries, depth + 1, out);
|
|
93
|
+
return out;
|
|
94
|
+
}
|
|
95
|
+
if (typeof obj.attribute === 'string')
|
|
96
|
+
out.push(obj.attribute);
|
|
97
|
+
return out;
|
|
98
|
+
}
|
|
99
|
+
function collectSortAttributes(sort) {
|
|
100
|
+
if (!sort || typeof sort !== 'object' || Array.isArray(sort))
|
|
101
|
+
return [];
|
|
102
|
+
const obj = sort;
|
|
103
|
+
if (obj.script)
|
|
104
|
+
return [];
|
|
105
|
+
if (!Array.isArray(obj.attributes))
|
|
106
|
+
return [];
|
|
107
|
+
return obj.attributes.filter((a) => typeof a === 'string');
|
|
108
|
+
}
|
|
109
|
+
function collectProjectionAttributes(projection) {
|
|
110
|
+
if (!projection || typeof projection !== 'object' || Array.isArray(projection))
|
|
111
|
+
return [];
|
|
112
|
+
return Object.keys(projection);
|
|
113
|
+
}
|
|
114
|
+
function buildAttributeNotFound(attribute, context) {
|
|
115
|
+
const segment = firstPathSegment(attribute);
|
|
116
|
+
const parts = [];
|
|
117
|
+
if (segment !== attribute && segment.length > 0) {
|
|
118
|
+
parts.push(`The first path segment "${segment}" is not a known attribute or reference`);
|
|
119
|
+
}
|
|
120
|
+
const consumed = (context.keyPropertyColumns ?? []).find((c) => c.toLowerCase() === segment.toLowerCase());
|
|
121
|
+
if (consumed) {
|
|
122
|
+
parts.push(`"${consumed}" was consumed into \`key\` by keyProperty — query \`key\` instead`);
|
|
123
|
+
}
|
|
124
|
+
else if (segment.length > 0) {
|
|
125
|
+
const suggestion = suggestAttribute(segment, context.knownAttributes);
|
|
126
|
+
if (suggestion)
|
|
127
|
+
parts.push(`Did you mean "${suggestion}"?`);
|
|
128
|
+
}
|
|
129
|
+
return new AttributeNotFoundError(attribute, context.model, parts.length ? parts.join('. ') : undefined);
|
|
130
|
+
}
|
|
131
|
+
function assertKnownAttributes(candidates, context) {
|
|
132
|
+
if (context.knownAttributes.length === 0)
|
|
133
|
+
return;
|
|
134
|
+
const known = new Set(context.knownAttributes);
|
|
135
|
+
for (const candidate of candidates) {
|
|
136
|
+
if (typeof candidate !== 'string' || candidate.length === 0)
|
|
137
|
+
continue;
|
|
138
|
+
const segment = firstPathSegment(candidate);
|
|
139
|
+
if (segment.length === 0)
|
|
140
|
+
continue;
|
|
141
|
+
if (isInternalName(segment))
|
|
142
|
+
continue;
|
|
143
|
+
if (known.has(segment))
|
|
144
|
+
continue;
|
|
145
|
+
throw buildAttributeNotFound(candidate, context);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
function isSdkAttributeNotFound(err) {
|
|
149
|
+
return (err instanceof Error && !(err instanceof AttributeNotFoundError) && /^attribute not found/i.test(err.message.trim()));
|
|
150
|
+
}
|
|
151
|
+
function toAttributeNotFound(requested, context) {
|
|
152
|
+
const names = [...new Set(requested.filter((r) => typeof r === 'string' && r.length > 0))];
|
|
153
|
+
if (names.length === 1)
|
|
154
|
+
return buildAttributeNotFound(names[0], context);
|
|
155
|
+
const error = new AttributeNotFoundError(names[0] ?? 'unknown', context.model);
|
|
156
|
+
error.message =
|
|
157
|
+
names.length > 1
|
|
158
|
+
? `Attribute not found on model "${context.model}" — one of the requested attributes (${names
|
|
159
|
+
.map((n) => `"${n}"`)
|
|
160
|
+
.join(', ')}) does not exist`
|
|
161
|
+
: `Attribute not found on model "${context.model}"`;
|
|
162
|
+
return error;
|
|
163
|
+
}
|
|
164
|
+
//# sourceMappingURL=attribute-validation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"attribute-validation.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/attribute-validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,9 +35,14 @@ export declare class DcuplHostService {
|
|
|
35
35
|
private _initializedModels;
|
|
36
36
|
private _autoUpdate;
|
|
37
37
|
private _dirty;
|
|
38
|
+
private _dataKeyProperties;
|
|
38
39
|
init(options?: HostInitOptions): Promise<void>;
|
|
39
40
|
private get d();
|
|
40
41
|
private requireModel;
|
|
42
|
+
private trackKeyProperty;
|
|
43
|
+
private keyPropertyColumns;
|
|
44
|
+
private attributeContext;
|
|
45
|
+
private guardAttributes;
|
|
41
46
|
touch(): void;
|
|
42
47
|
lastActivity(): number;
|
|
43
48
|
get autoUpdate(): boolean;
|
|
@@ -6,6 +6,7 @@ const common_1 = require("@nestjs/common");
|
|
|
6
6
|
const core_1 = require("@dcupl/core");
|
|
7
7
|
const init_options_js_1 = require("./init-options.js");
|
|
8
8
|
const normalize_query_js_1 = require("./normalize-query.js");
|
|
9
|
+
const attribute_validation_js_1 = require("./attribute-validation.js");
|
|
9
10
|
class ModelNotFoundError extends Error {
|
|
10
11
|
constructor(modelKey, hint) {
|
|
11
12
|
super(`Model with key ${modelKey} not found${hint ? `. ${hint}` : ''}`);
|
|
@@ -22,12 +23,14 @@ let DcuplHostService = class DcuplHostService {
|
|
|
22
23
|
this._initializedModels = new Set();
|
|
23
24
|
this._autoUpdate = false;
|
|
24
25
|
this._dirty = false;
|
|
26
|
+
this._dataKeyProperties = new Map();
|
|
25
27
|
}
|
|
26
28
|
async init(options = {}) {
|
|
27
29
|
this.autoGenerateProperties = options.autoGenerateProperties ?? false;
|
|
28
30
|
this._autoUpdate = options.autoUpdate ?? false;
|
|
29
31
|
this._dirty = false;
|
|
30
32
|
this._initializedModels.clear();
|
|
33
|
+
this._dataKeyProperties.clear();
|
|
31
34
|
this.dcupl = new core_1.Dcupl((0, init_options_js_1.buildDcuplInitOptions)(options.dcuplOptions));
|
|
32
35
|
await this.dcupl.init();
|
|
33
36
|
this.touch();
|
|
@@ -42,6 +45,55 @@ let DcuplHostService = class DcuplHostService {
|
|
|
42
45
|
throw new ModelNotFoundError(key);
|
|
43
46
|
}
|
|
44
47
|
}
|
|
48
|
+
trackKeyProperty(model, keyProperty) {
|
|
49
|
+
const columns = Array.isArray(keyProperty) ? keyProperty : keyProperty ? [keyProperty] : [];
|
|
50
|
+
if (columns.length === 0)
|
|
51
|
+
return;
|
|
52
|
+
const existing = this._dataKeyProperties.get(model) ?? new Set();
|
|
53
|
+
for (const column of columns) {
|
|
54
|
+
if (typeof column === 'string' && column.length > 0)
|
|
55
|
+
existing.add(column);
|
|
56
|
+
}
|
|
57
|
+
this._dataKeyProperties.set(model, existing);
|
|
58
|
+
}
|
|
59
|
+
keyPropertyColumns(modelKey) {
|
|
60
|
+
const columns = new Set();
|
|
61
|
+
const fromModel = this.d.models.get(modelKey)
|
|
62
|
+
?.keyProperty;
|
|
63
|
+
for (const column of Array.isArray(fromModel) ? fromModel : fromModel ? [fromModel] : []) {
|
|
64
|
+
if (typeof column === 'string' && column.length > 0)
|
|
65
|
+
columns.add(column);
|
|
66
|
+
}
|
|
67
|
+
for (const column of this._dataKeyProperties.get(modelKey) ?? [])
|
|
68
|
+
columns.add(column);
|
|
69
|
+
return [...columns];
|
|
70
|
+
}
|
|
71
|
+
attributeContext(modelKey) {
|
|
72
|
+
let knownAttributes;
|
|
73
|
+
try {
|
|
74
|
+
const meta = this.d.fn.metadata({ modelKey });
|
|
75
|
+
knownAttributes = (meta?.attributes ?? [])
|
|
76
|
+
.map((a) => a?.key)
|
|
77
|
+
.filter((k) => typeof k === 'string' && k.length > 0);
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
knownAttributes = [];
|
|
81
|
+
}
|
|
82
|
+
return { model: modelKey, knownAttributes, keyPropertyColumns: this.keyPropertyColumns(modelKey) };
|
|
83
|
+
}
|
|
84
|
+
guardAttributes(modelKey, candidates, run) {
|
|
85
|
+
const needsCheck = candidates.some((c) => typeof c === 'string' && c.length > 0);
|
|
86
|
+
if (needsCheck)
|
|
87
|
+
(0, attribute_validation_js_1.assertKnownAttributes)(candidates, this.attributeContext(modelKey));
|
|
88
|
+
try {
|
|
89
|
+
return run();
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
if ((0, attribute_validation_js_1.isSdkAttributeNotFound)(err))
|
|
93
|
+
throw (0, attribute_validation_js_1.toAttributeNotFound)(candidates, this.attributeContext(modelKey));
|
|
94
|
+
throw err;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
45
97
|
touch() {
|
|
46
98
|
this._lastActivity = Date.now();
|
|
47
99
|
}
|
|
@@ -76,6 +128,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
76
128
|
this.d.models.remove(key);
|
|
77
129
|
this._dirty = true;
|
|
78
130
|
this._initializedModels.delete(key);
|
|
131
|
+
this._dataKeyProperties.delete(key);
|
|
79
132
|
}
|
|
80
133
|
assertRegisteredOrAutoGen(model, override) {
|
|
81
134
|
if (this.d.models.get(model))
|
|
@@ -103,6 +156,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
103
156
|
dataUpdate(data, options) {
|
|
104
157
|
this.touch();
|
|
105
158
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
159
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
106
160
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
107
161
|
this.d.data.apply({
|
|
108
162
|
type: 'update',
|
|
@@ -117,6 +171,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
117
171
|
dataUpsert(data, options) {
|
|
118
172
|
this.touch();
|
|
119
173
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
174
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
120
175
|
const { useSetType, autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
121
176
|
this.d.data.apply({
|
|
122
177
|
type: useSetType ? 'set' : 'upsert',
|
|
@@ -131,6 +186,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
131
186
|
dataSet(data, options) {
|
|
132
187
|
this.touch();
|
|
133
188
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
189
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
134
190
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
135
191
|
this.d.data.apply({
|
|
136
192
|
type: 'set',
|
|
@@ -145,6 +201,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
145
201
|
dataRemove(data, options) {
|
|
146
202
|
this.touch();
|
|
147
203
|
this.requireModel(options.model);
|
|
204
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
148
205
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
149
206
|
this.d.data.apply({
|
|
150
207
|
type: 'remove',
|
|
@@ -177,24 +234,36 @@ let DcuplHostService = class DcuplHostService {
|
|
|
177
234
|
this.requireModel(options.modelKey);
|
|
178
235
|
const { query, ...rest } = options;
|
|
179
236
|
const q = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, query);
|
|
180
|
-
|
|
237
|
+
const candidates = [
|
|
238
|
+
...(0, attribute_validation_js_1.collectQueryAttributes)(q?.queries),
|
|
239
|
+
...(0, attribute_validation_js_1.collectSortAttributes)(options.sort),
|
|
240
|
+
...(0, attribute_validation_js_1.collectProjectionAttributes)(options.projection),
|
|
241
|
+
];
|
|
242
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.query.execute(q ? { ...rest, groupKey: q.groupKey, groupType: q.groupType, queries: q.queries } : rest));
|
|
181
243
|
}
|
|
182
244
|
fnFacets(options) {
|
|
183
245
|
this.touch();
|
|
184
246
|
this.requireModel(options.modelKey);
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
247
|
+
const query = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query);
|
|
248
|
+
const candidates = [options?.options?.attribute, ...(0, attribute_validation_js_1.collectQueryAttributes)(query?.queries)];
|
|
249
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.fn.facets({ ...options, query }).map((facet) => ({ ...facet, count: facet.size })));
|
|
188
250
|
}
|
|
189
251
|
fnAggregate(options) {
|
|
190
252
|
this.touch();
|
|
191
253
|
this.requireModel(options.modelKey);
|
|
192
|
-
|
|
254
|
+
const query = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query);
|
|
255
|
+
const candidates = [options?.options?.attribute, ...(0, attribute_validation_js_1.collectQueryAttributes)(query?.queries)];
|
|
256
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.fn.aggregate({ ...options, query }));
|
|
193
257
|
}
|
|
194
258
|
fnGroupBy(options) {
|
|
195
259
|
this.touch();
|
|
196
260
|
this.requireModel(options.modelKey);
|
|
197
|
-
|
|
261
|
+
const query = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query);
|
|
262
|
+
const aggregateAttributes = Array.isArray(options?.options?.aggregates)
|
|
263
|
+
? options.options.aggregates.map((a) => a?.attribute)
|
|
264
|
+
: [];
|
|
265
|
+
const candidates = [options?.options?.attribute, ...aggregateAttributes, ...(0, attribute_validation_js_1.collectQueryAttributes)(query?.queries)];
|
|
266
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.fn.groupBy({ ...options, query }));
|
|
198
267
|
}
|
|
199
268
|
fnMetadata(options) {
|
|
200
269
|
this.touch();
|
|
@@ -228,22 +297,20 @@ let DcuplHostService = class DcuplHostService {
|
|
|
228
297
|
};
|
|
229
298
|
}
|
|
230
299
|
keyPropertyCollisions() {
|
|
231
|
-
const
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
.
|
|
236
|
-
|
|
237
|
-
.
|
|
238
|
-
model: c.model ?? '',
|
|
239
|
-
keyProperty: c.attribute ?? 'key',
|
|
240
|
-
duplicateCount: c.count,
|
|
300
|
+
const summary = this.d.quality?.errors?.summary?.() ?? [];
|
|
301
|
+
return summary
|
|
302
|
+
.filter((g) => g.errorType === 'NonUniqueKey')
|
|
303
|
+
.map((g) => ({
|
|
304
|
+
model: g.model ?? '',
|
|
305
|
+
keyProperty: g.attribute ?? 'key',
|
|
306
|
+
duplicateCount: g.totalCount,
|
|
241
307
|
}));
|
|
242
308
|
}
|
|
243
309
|
destroy() {
|
|
244
310
|
this.dcupl?.destroy();
|
|
245
311
|
this.dcupl = undefined;
|
|
246
312
|
this._initializedModels.clear();
|
|
313
|
+
this._dataKeyProperties.clear();
|
|
247
314
|
}
|
|
248
315
|
attachLoader(loader, key) {
|
|
249
316
|
this.touch();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dcupl-host.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/dcupl-host.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dcupl-host.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/dcupl-host.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"idle-watchdog.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/idle-watchdog.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAUrC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAAzB;QAEG,UAAK,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"idle-watchdog.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/idle-watchdog.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAUrC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAAzB;QAEG,UAAK,GAAG,KAAK,CAAC;IAyBxB,CAAC;IAvBC,KAAK,CAAC,OAAwB;QAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QACxF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;YAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,OAAO,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;gBACpD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClB,IAAI,CAAC;oBACH,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,CAAC;wBAAS,CAAC;oBACT,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC,EAAE,QAAQ,CAAC,CAAC;QACb,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;IACvB,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACzB,CAAC;IACH,CAAC;CACF,CAAA;AA3BY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;GACA,mBAAmB,CA2B/B"}
|
|
@@ -46,7 +46,7 @@ let IngestService = class IngestService {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
parse(text, fmt) {
|
|
49
|
-
if (text.charCodeAt(0) ===
|
|
49
|
+
if (text.charCodeAt(0) === 0xfeff) {
|
|
50
50
|
text = text.slice(1);
|
|
51
51
|
}
|
|
52
52
|
if (fmt === 'json') {
|
|
@@ -54,7 +54,8 @@ let IngestService = class IngestService {
|
|
|
54
54
|
return Array.isArray(parsed) ? parsed : [parsed];
|
|
55
55
|
}
|
|
56
56
|
if (fmt === 'ndjson') {
|
|
57
|
-
return text
|
|
57
|
+
return text
|
|
58
|
+
.split('\n')
|
|
58
59
|
.map((l) => l.trim())
|
|
59
60
|
.filter((l) => l.length > 0)
|
|
60
61
|
.map((l) => JSON.parse(l));
|
|
@@ -115,11 +116,14 @@ function parseCsv(text) {
|
|
|
115
116
|
if (rows.length === 0)
|
|
116
117
|
return [];
|
|
117
118
|
const header = rows[0];
|
|
118
|
-
return rows
|
|
119
|
+
return rows
|
|
120
|
+
.slice(1)
|
|
119
121
|
.filter((r) => !(r.length === 1 && r[0] === ''))
|
|
120
122
|
.map((r) => {
|
|
121
123
|
const obj = {};
|
|
122
|
-
header.forEach((h, i) => {
|
|
124
|
+
header.forEach((h, i) => {
|
|
125
|
+
obj[h] = r[i] ?? '';
|
|
126
|
+
});
|
|
123
127
|
return obj;
|
|
124
128
|
});
|
|
125
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/ingest.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAC5C,uCAAwC;AACxC,+BAA+B;AAC/B,0DAA0B;AASnB,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,UAAyB,EAAE;QACtD,MAAM,IAAI,GAAG,IAAA,uBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,UAAyB,EAAE;QACpD,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY,EAAE,UAAyB,EAAE;QACxD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IAEO,YAAY,CAAC,IAAY,EAAE,IAAY;QAC7C,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QACxC,IAAI,GAAG,KAAK,MAAM;YAAE,OAAO,KAAK,CAAC;QACjC,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC3D,IAAI,GAAG,KAAK,OAAO;YAAE,OAAO,MAAM,CAAC;QACnC,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAEO,uBAAuB,CAAC,IAAY,EAAE,IAAY;QACxD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,iBAAiB,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,MAAM,CAAC;YAEP,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,IAAY,EAAE,GAAiB;QAE3C,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;YAClC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;QACD,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;YACrB,OAAO,IAAI,
|
|
1
|
+
{"version":3,"file":"ingest.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/ingest.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-options.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/init-options.ts"],"names":[],"mappings":";;;AAyCA,sDAuBC;AAOD,
|
|
1
|
+
{"version":3,"file":"init-options.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/init-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { DcuplAppLoader } from '@dcupl/loader';
|
|
2
2
|
import { DcuplHostService } from './dcupl-host.service.js';
|
|
3
|
-
import type { AddLoaderRequest, AddLoaderResponse, LoaderDetail, LoaderEntry, ProcessLoaderResponse, ProcessOptionsWire } from '../../types.js';
|
|
3
|
+
import type { AddLoaderRequest, AddLoaderResponse, LoaderDetail, LoaderEntry, LoaderSource, ProcessLoaderResponse, ProcessOptionsWire } from '../../types.js';
|
|
4
|
+
export declare function redactSource(source: LoaderSource): LoaderSource;
|
|
4
5
|
export declare class LoaderError_ extends Error {
|
|
5
6
|
readonly code: string;
|
|
6
7
|
readonly details?: unknown | undefined;
|
|
@@ -22,6 +23,7 @@ export declare class LoadersService {
|
|
|
22
23
|
remove(key: string): void;
|
|
23
24
|
private requireSlot;
|
|
24
25
|
private toFetchOptions;
|
|
26
|
+
private attemptedConfigUrl;
|
|
25
27
|
private toProcessOptions;
|
|
26
28
|
private countResources;
|
|
27
29
|
}
|
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LoadersService = exports.LOADERS_SERVICE_DEPS = exports.LoaderError_ = void 0;
|
|
4
|
+
exports.redactSource = redactSource;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
const common_1 = require("@nestjs/common");
|
|
6
7
|
const loader_1 = require("@dcupl/loader");
|
|
7
8
|
const dcupl_host_service_js_1 = require("./dcupl-host.service.js");
|
|
9
|
+
function redactSource(source) {
|
|
10
|
+
if (source.type !== 'cdn' || source.apiKey === undefined)
|
|
11
|
+
return source;
|
|
12
|
+
const { apiKey: _apiKey, ...rest } = source;
|
|
13
|
+
return { ...rest, apiKey: '<redacted>' };
|
|
14
|
+
}
|
|
8
15
|
class LoaderError_ extends Error {
|
|
9
16
|
constructor(code, message, details) {
|
|
10
17
|
super(message);
|
|
@@ -32,8 +39,9 @@ let LoadersService = class LoadersService {
|
|
|
32
39
|
await loader.config.fetch(fetchOptions);
|
|
33
40
|
}
|
|
34
41
|
catch (err) {
|
|
42
|
+
const url = this.attemptedConfigUrl(loader);
|
|
35
43
|
this.host.detachLoader(key);
|
|
36
|
-
throw new LoaderError_('LOADER_CONFIG_FETCH_FAILED', err?.message ?? '
|
|
44
|
+
throw new LoaderError_('LOADER_CONFIG_FETCH_FAILED', `Failed to fetch loader configuration from ${url}: ${err?.message ?? 'unknown error'}`, { url, source: redactSource(input.source) });
|
|
37
45
|
}
|
|
38
46
|
const config = loader.config.get();
|
|
39
47
|
const resourceCount = config?.resources?.length ?? 0;
|
|
@@ -66,7 +74,7 @@ let LoadersService = class LoadersService {
|
|
|
66
74
|
return {
|
|
67
75
|
key,
|
|
68
76
|
status: 'added',
|
|
69
|
-
source: input.source,
|
|
77
|
+
source: redactSource(input.source),
|
|
70
78
|
config: { resourceCount, applicationKeys, environmentKeys },
|
|
71
79
|
};
|
|
72
80
|
}
|
|
@@ -94,12 +102,13 @@ let LoadersService = class LoadersService {
|
|
|
94
102
|
return { key, status: 'processed', resources: counts, errors: slot.errors };
|
|
95
103
|
}
|
|
96
104
|
list() {
|
|
97
|
-
return Array.from(this.map.values()).map((s) => s.entry);
|
|
105
|
+
return Array.from(this.map.values()).map((s) => ({ ...s.entry, source: redactSource(s.entry.source) }));
|
|
98
106
|
}
|
|
99
107
|
get(key) {
|
|
100
108
|
const slot = this.requireSlot(key);
|
|
101
109
|
return {
|
|
102
110
|
...slot.entry,
|
|
111
|
+
source: redactSource(slot.entry.source),
|
|
103
112
|
config: slot.loader.config.get(),
|
|
104
113
|
lastProcessOptions: slot.lastProcessOptions,
|
|
105
114
|
progress: [...slot.progress],
|
|
@@ -126,6 +135,10 @@ let LoadersService = class LoadersService {
|
|
|
126
135
|
loader.variables.global.set('apiKey', source.apiKey);
|
|
127
136
|
if (source.version)
|
|
128
137
|
loader.variables.global.set('version', source.version);
|
|
138
|
+
if (source.cdnBaseUrl)
|
|
139
|
+
loader.variables.global.set('cdnBaseUrl', source.cdnBaseUrl);
|
|
140
|
+
if (source.consoleApiUrl)
|
|
141
|
+
loader.variables.global.set('consoleApiUrl', source.consoleApiUrl);
|
|
129
142
|
return { baseUrl: undefined, loaderFileName: undefined };
|
|
130
143
|
}
|
|
131
144
|
return {
|
|
@@ -136,14 +149,17 @@ let LoadersService = class LoadersService {
|
|
|
136
149
|
: undefined,
|
|
137
150
|
};
|
|
138
151
|
}
|
|
152
|
+
attemptedConfigUrl(loader) {
|
|
153
|
+
const baseUrl = loader.variables.get('baseUrl')?.value ?? '';
|
|
154
|
+
const loaderFileName = loader.variables.get('loaderFileName')?.value ?? 'dcupl.lc.json';
|
|
155
|
+
return `${baseUrl}/${loaderFileName}`;
|
|
156
|
+
}
|
|
139
157
|
toProcessOptions(o) {
|
|
140
158
|
return {
|
|
141
159
|
applicationKey: o.applicationKey,
|
|
142
160
|
environmentKeys: o.environmentKeys,
|
|
143
161
|
resourceTags: o.resourceTags,
|
|
144
|
-
variables: o.variables
|
|
145
|
-
? Object.entries(o.variables).map(([k, value]) => ({ key: k, value }))
|
|
146
|
-
: undefined,
|
|
162
|
+
variables: o.variables ? Object.entries(o.variables).map(([k, value]) => ({ key: k, value })) : undefined,
|
|
147
163
|
options: o.options,
|
|
148
164
|
};
|
|
149
165
|
}
|