@dcupl/cli 1.4.0-beta.2 → 1.4.0-beta.21
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 +30 -23
- package/dist/cli.d.ts +2 -0
- package/dist/cli.js +748 -213
- 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/data/render.d.ts +3 -1
- package/dist/functions/app/commands/data/render.js +9 -1
- package/dist/functions/app/commands/data/render.js.map +1 -1
- package/dist/functions/app/commands/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/group-by.js +4 -2
- package/dist/functions/app/commands/fn/group-by.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/loaders/remove.js +2 -0
- package/dist/functions/app/commands/loaders/remove.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 +7 -15
- 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/query-input.d.ts +1 -0
- package/dist/functions/app/commands/query-input.js +15 -2
- package/dist/functions/app/commands/query-input.js.map +1 -1
- package/dist/functions/app/commands/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/sort-input.d.ts +5 -0
- package/dist/functions/app/commands/sort-input.js +34 -0
- package/dist/functions/app/commands/sort-input.js.map +1 -0
- package/dist/functions/app/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.d.ts +3 -4
- package/dist/functions/app/daemon/controllers/data.controller.js +18 -7
- 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/loaders.controller.js +1 -1
- package/dist/functions/app/daemon/controllers/loaders.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.js +6 -3
- package/dist/functions/app/daemon/services/attribute-validation.js.map +1 -1
- package/dist/functions/app/daemon/services/csv-delimiter.d.ts +15 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js +99 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js.map +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +15 -2
- package/dist/functions/app/daemon/services/dcupl-host.service.js +137 -27
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/daemon/services/group-sort.d.ts +25 -0
- package/dist/functions/app/daemon/services/group-sort.js +128 -0
- package/dist/functions/app/daemon/services/group-sort.js.map +1 -0
- package/dist/functions/app/daemon/services/idle-watchdog.service.js.map +1 -1
- package/dist/functions/app/daemon/services/ingest.service.d.ts +1 -0
- package/dist/functions/app/daemon/services/ingest.service.js +17 -11
- 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 +4 -2
- package/dist/functions/app/daemon/services/loaders.service.js +29 -7
- package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
- package/dist/functions/app/daemon/services/normalize-query.d.ts +11 -2
- package/dist/functions/app/daemon/services/normalize-query.js +55 -4
- package/dist/functions/app/daemon/services/normalize-query.js.map +1 -1
- package/dist/functions/app/daemon/services/staged-keys.d.ts +12 -0
- package/dist/functions/app/daemon/services/staged-keys.js +72 -0
- package/dist/functions/app/daemon/services/staged-keys.js.map +1 -0
- package/dist/functions/app/e2e/port-lock.js +23 -9
- 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 +4 -4
- 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.d.ts +2 -1
- package/dist/functions/config/prompts.js +1 -3
- package/dist/functions/config/prompts.js.map +1 -1
- package/dist/functions/files/commands/pull.d.ts +2 -0
- package/dist/functions/files/commands/pull.js +40 -16
- 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 +20 -0
- package/dist/functions/files/commands/push.js.map +1 -1
- package/dist/functions/files/commands/read.js +2 -1
- package/dist/functions/files/commands/read.js.map +1 -1
- package/dist/functions/files/commands/write.js +12 -2
- 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/confirm.js +2 -3
- package/dist/functions/files/helper/confirm.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/generate/files/generate-code.js +0 -1
- package/dist/functions/generate/files/generate-code.js.map +1 -1
- package/dist/functions/generate/files/generate-files.d.ts +10 -1
- package/dist/functions/generate/files/generate-files.js +154 -43
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/files/generate-schema.js +1 -1
- package/dist/functions/generate/files/generate-schema.js.map +1 -1
- package/dist/functions/generate/files/generate.helper.d.ts +9 -3
- package/dist/functions/generate/files/generate.helper.js +11 -8
- package/dist/functions/generate/files/generate.helper.js.map +1 -1
- package/dist/functions/generate/files/rest-api-template.d.ts +16 -0
- package/dist/functions/generate/files/rest-api-template.js +63 -0
- package/dist/functions/generate/files/rest-api-template.js.map +1 -0
- package/dist/functions/generate/files/script-starters.d.ts +7 -0
- package/dist/functions/generate/files/script-starters.js +75 -0
- package/dist/functions/generate/files/script-starters.js.map +1 -0
- package/dist/functions/generate/files/workflow-presets.js +2 -1
- package/dist/functions/generate/files/workflow-presets.js.map +1 -1
- package/dist/functions/generate/model-from-data/generate-model-from-data.d.ts +1 -0
- package/dist/functions/generate/model-from-data/generate-model-from-data.js +74 -6
- 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.js +18 -13
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/api-client.d.ts +4 -0
- package/dist/functions/helper/api-client.js +18 -5
- 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 +1 -1
- package/dist/functions/helper/config.helper.js.map +1 -1
- package/dist/functions/helper/output.js +3 -1
- 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/helper/prompt.d.ts +2 -0
- package/dist/functions/helper/prompt.js +8 -0
- package/dist/functions/helper/prompt.js.map +1 -0
- package/dist/functions/schemas/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/ResponseScriptConfig.example.json +1 -1
- package/dist/functions/schemas/examples/RestApiTemplate.example.json +30 -0
- 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 +7 -5
- package/dist/functions/schemas/format.js.map +1 -1
- package/dist/functions/schemas/registry.d.ts +2 -1
- package/dist/functions/schemas/registry.js +95 -31
- package/dist/functions/schemas/registry.js.map +1 -1
- package/dist/functions/schemas/resolve.d.ts +1 -0
- package/dist/functions/schemas/resolve.js +31 -1
- package/dist/functions/schemas/resolve.js.map +1 -1
- package/dist/functions/schemas/validate.js.map +1 -1
- 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 +146 -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 +84 -12
- 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 +1 -0
- package/dist/functions/workflow/commands/deploy.js +18 -13
- 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 +2 -8
- package/dist/functions/workflow/commands/run.js +29 -22
- package/dist/functions/workflow/commands/run.js.map +1 -1
- package/dist/functions/workflow/commands/runners-get.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 +2 -8
- package/dist/functions/workflow/commands/test.js +19 -21
- package/dist/functions/workflow/commands/test.js.map +1 -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 +8 -1
- 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.js +1 -1
- package/dist/functions/workflow/run-failure.js.map +1 -1
- package/dist/functions/workflow/runner-health.js.map +1 -1
- package/dist/functions/workflow/script-lint.js +32 -7
- package/dist/functions/workflow/script-lint.js.map +1 -1
- 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/wait-for-swap.d.ts +24 -1
- package/dist/functions/workflow/wait-for-swap.js +58 -0
- package/dist/functions/workflow/wait-for-swap.js.map +1 -1
- package/dist/functions/workflow/workflow-api.d.ts +7 -7
- package/dist/functions/workflow/workflow-api.js +31 -16
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/files/common/_gitignore +2 -1
- package/files/dev-server/index.html +2 -1
- package/package.json +24 -15
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/create.ts"],"names":[],"mappings":";;AA0CA,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,16 @@ function records(count) {
|
|
|
18
18
|
function hintLine(hint) {
|
|
19
19
|
return hint ? `\n ${yellow('↪')} ${dim(hint)}` : '';
|
|
20
20
|
}
|
|
21
|
+
function skippedLine(v) {
|
|
22
|
+
if (!v.skipped)
|
|
23
|
+
return '';
|
|
24
|
+
const keys = (v.skippedKeys ?? []).slice(0, 5);
|
|
25
|
+
const sample = keys.length > 0 ? ` (e.g. ${keys.join(', ')})` : '';
|
|
26
|
+
return (`\n ${yellow('↪')} ${dim(`skipped ${fmt(v.skipped)} ${records(v.skipped)} with no matching key${sample}`)}` +
|
|
27
|
+
`\n ${yellow('↪')} ${dim("update only changes existing records; use 'dcupl app data upsert' to add new ones")}`);
|
|
28
|
+
}
|
|
21
29
|
function renderUpdate(v) {
|
|
22
|
-
return `${ok('Updated')} ${fmt(v.
|
|
30
|
+
return `${ok('Updated')} ${fmt(v.updated)} ${records(v.updated)} ${dim(v.model)}${skippedLine(v)}${hintLine(v.hint)}\n`;
|
|
23
31
|
}
|
|
24
32
|
function renderUpsert(v) {
|
|
25
33
|
return `${ok('Upserted')} ${fmt(v.upserted)} ${records(v.upserted)} ${dim(v.model)}${hintLine(v.hint)}\n`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/data/render.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/data/render.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,10 @@ async function destroyCommand(output, deps = {}) {
|
|
|
18
18
|
const create = deps.createDaemonClient ?? daemon_client_js_1.createDaemonClient;
|
|
19
19
|
const remove = deps.removeEntry ?? registry_js_1.removeEntry;
|
|
20
20
|
const removeLog = deps.removeLog ?? defaultRemoveLog;
|
|
21
|
-
const kill = deps.kill ??
|
|
21
|
+
const kill = deps.kill ??
|
|
22
|
+
((pid, sig) => {
|
|
23
|
+
process.kill(pid, sig);
|
|
24
|
+
});
|
|
22
25
|
const release = deps.releaseServe ?? serve_registry_js_1.releaseServe;
|
|
23
26
|
const entry = resolve({ appId: deps.appId });
|
|
24
27
|
const client = create(entry);
|
|
@@ -30,7 +33,8 @@ async function destroyCommand(output, deps = {}) {
|
|
|
30
33
|
try {
|
|
31
34
|
kill(entry.pid, 'SIGTERM');
|
|
32
35
|
}
|
|
33
|
-
catch {
|
|
36
|
+
catch {
|
|
37
|
+
}
|
|
34
38
|
}
|
|
35
39
|
}
|
|
36
40
|
remove(entry.appId);
|
|
@@ -38,13 +42,15 @@ async function destroyCommand(output, deps = {}) {
|
|
|
38
42
|
try {
|
|
39
43
|
release(entry.serveKey);
|
|
40
44
|
}
|
|
41
|
-
catch {
|
|
45
|
+
catch {
|
|
46
|
+
}
|
|
42
47
|
}
|
|
43
48
|
if (!deps.keepLogs) {
|
|
44
49
|
try {
|
|
45
50
|
removeLog(entry.appId);
|
|
46
51
|
}
|
|
47
|
-
catch {
|
|
52
|
+
catch {
|
|
53
|
+
}
|
|
48
54
|
}
|
|
49
55
|
if (output.isJson()) {
|
|
50
56
|
output.success({ destroyed: entry.appId });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/destroy.ts"],"names":[],"mappings":";;AAeA,
|
|
1
|
+
{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/destroy.ts"],"names":[],"mappings":";;AAeA,wCAyDC;AAxED,uCAAkD;AAGlD,qDAAmE;AACnE,iEAAqG;AACrG,yDAA4E;AAC5E,qEAAoF;AACpF,6DAAoD;AACpD,2CAA4C;AAE5C,SAAS,gBAAgB,CAAC,KAAa;IACrC,MAAM,CAAC,GAAG,IAAA,uBAAO,EAAC,KAAK,CAAC,CAAC;IACzB,IAAI,IAAA,qBAAU,EAAC,CAAC,CAAC;QAAE,IAAA,qBAAU,EAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,OASI,EAAE;IAEN,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,2BAAiB,CAAC;IACrD,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,IAAI,qCAAmB,CAAC;IAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,IAAI,yBAAkB,CAAC;IACtD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,gBAAgB,CAAC;IACrD,MAAM,IAAI,GACR,IAAI,CAAC,IAAI;QACT,CAAC,CAAC,GAAW,EAAE,GAAmB,EAAQ,EAAE;YAC1C,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,IAAI,gCAAmB,CAAC;IAEzD,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,GAAG,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC7B,CAAC;YAAC,MAAM,CAAC;YAET,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpB,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAA,yBAAa,EAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AACxD,CAAC"}
|
|
@@ -61,7 +61,11 @@ async function defaultProbe(url) {
|
|
|
61
61
|
}
|
|
62
62
|
async function defaultFetchLoaderBytes(url) {
|
|
63
63
|
try {
|
|
64
|
-
const r = await axios_1.default.get(url, {
|
|
64
|
+
const r = await axios_1.default.get(url, {
|
|
65
|
+
timeout: 2000,
|
|
66
|
+
responseType: 'arraybuffer',
|
|
67
|
+
validateStatus: () => true,
|
|
68
|
+
});
|
|
65
69
|
if (r.status < 200 || r.status >= 400)
|
|
66
70
|
return undefined;
|
|
67
71
|
return Buffer.from(r.data);
|
|
@@ -96,12 +100,18 @@ async function ensureServeReachable(loaderFileName, opts, deps = {}) {
|
|
|
96
100
|
const probe = deps.probe ?? defaultProbe;
|
|
97
101
|
const sleep = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
|
|
98
102
|
const registerChild = deps.registerChild ?? defaultRegisterChild;
|
|
99
|
-
const kill = deps.kill ??
|
|
103
|
+
const kill = deps.kill ??
|
|
104
|
+
((pid, sig) => {
|
|
105
|
+
process.kill(pid, sig);
|
|
106
|
+
});
|
|
100
107
|
const serveDir = deps.serveDir ?? serve_registry_js_1.DEFAULT_SERVE_REGISTRY_DIR;
|
|
101
108
|
const fetchLoaderBytes = deps.fetchLoaderBytes ?? defaultFetchLoaderBytes;
|
|
102
109
|
const pickFreePort = deps.pickFreePort ?? defaultPickFreePort;
|
|
103
110
|
const isPortFree = deps.isPortFree ?? defaultIsPortFree;
|
|
104
|
-
const log = deps.log ??
|
|
111
|
+
const log = deps.log ??
|
|
112
|
+
((msg) => {
|
|
113
|
+
console.error(msg);
|
|
114
|
+
});
|
|
105
115
|
const cfg = readConfig(cwd);
|
|
106
116
|
let port;
|
|
107
117
|
if (opts.port === 'auto') {
|
|
@@ -125,7 +135,7 @@ async function ensureServeReachable(loaderFileName, opts, deps = {}) {
|
|
|
125
135
|
return { baseUrl: base, probeUrl: `${base}/${loaderFileName}` };
|
|
126
136
|
};
|
|
127
137
|
let { baseUrl, probeUrl } = urlsFor(port);
|
|
128
|
-
if (await probe(probeUrl) && await verifyWorkspace(port, loaderPath, probeUrl, serveDir, fetchLoaderBytes)) {
|
|
138
|
+
if ((await probe(probeUrl)) && (await verifyWorkspace(port, loaderPath, probeUrl, serveDir, fetchLoaderBytes))) {
|
|
129
139
|
if (opts.appId)
|
|
130
140
|
registerChild(opts.appId, { port, cwd });
|
|
131
141
|
return { baseUrl };
|
|
@@ -155,7 +165,7 @@ async function ensureServeReachable(loaderFileName, opts, deps = {}) {
|
|
|
155
165
|
const deadline = Date.now() + timeoutMs;
|
|
156
166
|
while (Date.now() < deadline) {
|
|
157
167
|
await sleep(pollMs);
|
|
158
|
-
if (await probe(probeUrl) && await verifyWorkspace(port, loaderPath, probeUrl, serveDir, fetchLoaderBytes)) {
|
|
168
|
+
if ((await probe(probeUrl)) && (await verifyWorkspace(port, loaderPath, probeUrl, serveDir, fetchLoaderBytes))) {
|
|
159
169
|
registerChild(opts.appId, { port, cwd });
|
|
160
170
|
return { baseUrl };
|
|
161
171
|
}
|
|
@@ -163,7 +173,8 @@ async function ensureServeReachable(loaderFileName, opts, deps = {}) {
|
|
|
163
173
|
try {
|
|
164
174
|
kill(child.pid, 'SIGTERM');
|
|
165
175
|
}
|
|
166
|
-
catch {
|
|
176
|
+
catch {
|
|
177
|
+
}
|
|
167
178
|
throw new DetectServeError('SERVE_AUTOSPAWN_TIMEOUT', `dcupl serve did not become reachable on ${probeUrl} within ${timeoutMs}ms`);
|
|
168
179
|
}
|
|
169
180
|
//# sourceMappingURL=detect-serve.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect-serve.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/detect-serve.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"detect-serve.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/detect-serve.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,10 @@ function parseAggregateSpecs(specs) {
|
|
|
26
26
|
if (!attr || !typesStr) {
|
|
27
27
|
throw badInput(`Invalid aggregate spec: "${raw}". Expected format: "<attribute>:<type>" (e.g. "price:avg" or "price:avg,sum").`);
|
|
28
28
|
}
|
|
29
|
-
const types = typesStr
|
|
29
|
+
const types = typesStr
|
|
30
|
+
.split(',')
|
|
31
|
+
.map((t) => t.trim())
|
|
32
|
+
.filter(Boolean);
|
|
30
33
|
const existing = byAttr.get(attr) ?? new Set();
|
|
31
34
|
types.forEach((t) => existing.add(t));
|
|
32
35
|
byAttr.set(attr, existing);
|
|
@@ -34,7 +37,11 @@ function parseAggregateSpecs(specs) {
|
|
|
34
37
|
return Array.from(byAttr.entries()).map(([attribute, types]) => ({ attribute, types: Array.from(types) }));
|
|
35
38
|
}
|
|
36
39
|
function parseBins(spec) {
|
|
37
|
-
return spec
|
|
40
|
+
return spec
|
|
41
|
+
.split(',')
|
|
42
|
+
.map((t) => t.trim())
|
|
43
|
+
.filter(Boolean)
|
|
44
|
+
.map((token) => {
|
|
38
45
|
const dashIdx = token.indexOf('-');
|
|
39
46
|
if (dashIdx === -1) {
|
|
40
47
|
throw badInput(`Invalid bin "${token}". Expected a range like "0-100", "200-", or "-100".`);
|
|
@@ -46,7 +53,8 @@ function parseBins(spec) {
|
|
|
46
53
|
range.from = Number(fromStr);
|
|
47
54
|
if (toStr !== '')
|
|
48
55
|
range.to = Number(toStr);
|
|
49
|
-
if ((range.from !== undefined && Number.isNaN(range.from)) ||
|
|
56
|
+
if ((range.from !== undefined && Number.isNaN(range.from)) ||
|
|
57
|
+
(range.to !== undefined && Number.isNaN(range.to))) {
|
|
50
58
|
throw badInput(`Invalid bin "${token}". Bounds must be numbers.`);
|
|
51
59
|
}
|
|
52
60
|
return range;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_fn-helpers.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/fn/_fn-helpers.ts"],"names":[],"mappings":";;AAUA,kCAIC;AAED,4BAEC;AAGD,
|
|
1
|
+
{"version":3,"file":"_fn-helpers.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/fn/_fn-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,10 @@ const query_input_1 = require("../query-input");
|
|
|
6
6
|
const NUMERIC_TYPES = new Set(['avg', 'sum']);
|
|
7
7
|
async function aggregateCommand(output, options) {
|
|
8
8
|
const { client } = (0, _fn_helpers_1.resolveDeps)(options);
|
|
9
|
-
const types = (options.types ?? '')
|
|
9
|
+
const types = (options.types ?? '')
|
|
10
|
+
.split(',')
|
|
11
|
+
.map((t) => t.trim())
|
|
12
|
+
.filter(Boolean);
|
|
10
13
|
const numericRequested = types.filter((t) => NUMERIC_TYPES.has(t));
|
|
11
14
|
if (numericRequested.length > 0) {
|
|
12
15
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/fn/aggregate.ts"],"names":[],"mappings":";;AAsBA,
|
|
1
|
+
{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/fn/aggregate.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.groupByCommand = groupByCommand;
|
|
4
4
|
const _fn_helpers_1 = require("./_fn-helpers");
|
|
5
5
|
const query_input_1 = require("../query-input");
|
|
6
|
+
const sort_input_1 = require("../sort-input");
|
|
6
7
|
async function groupByCommand(output, options) {
|
|
7
8
|
const { client } = (0, _fn_helpers_1.resolveDeps)(options);
|
|
8
9
|
const fnOptions = { attribute: options.attribute };
|
|
@@ -15,8 +16,9 @@ async function groupByCommand(output, options) {
|
|
|
15
16
|
fnOptions.excludeUndefineds = options.excludeUndefineds;
|
|
16
17
|
if (options.excludeUnresolved !== undefined)
|
|
17
18
|
fnOptions.excludeUnresolved = options.excludeUnresolved;
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
const sort = (0, sort_input_1.parseSortSpec)(options.sort);
|
|
20
|
+
if (sort)
|
|
21
|
+
fnOptions.sort = sort;
|
|
20
22
|
if (options.limit !== undefined)
|
|
21
23
|
fnOptions.count = options.limit;
|
|
22
24
|
if (options.start !== undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-by.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/fn/group-by.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"group-by.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/fn/group-by.ts"],"names":[],"mappings":";;AAmBA,wCAkBC;AApCD,+CAAyE;AACzE,gDAA8C;AAC9C,8CAA8C;AAgBvC,KAAK,UAAU,cAAc,CAAC,MAAc,EAAE,OAAuB;IAC1E,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC;IACxC,MAAM,SAAS,GAA4B,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;IAC5E,MAAM,UAAU,GAAG,IAAA,iCAAmB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1D,IAAI,UAAU;QAAE,SAAS,CAAC,UAAU,GAAG,UAAU,CAAC;IAClD,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS;QAAE,SAAS,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IACtF,IAAI,OAAO,CAAC,iBAAiB,KAAK,SAAS;QAAE,SAAS,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IACrG,IAAI,OAAO,CAAC,iBAAiB,KAAK,SAAS;QAAE,SAAS,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAGrG,MAAM,IAAI,GAAG,IAAA,0BAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,IAAI;QAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC;IAChC,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS;QAAE,SAAS,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IACjE,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS;QAAE,SAAS,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IACjE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAU,MAAM,EAAE,aAAa,EAAE;QAChE,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,IAAA,0BAAY,EAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE;KAC7G,CAAC,CAAC;IACH,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pivot.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/fn/pivot.ts"],"names":[],"mappings":";;AA6CA,
|
|
1
|
+
{"version":3,"file":"pivot.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/fn/pivot.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,12 @@ async function listCommand(output, deps = {}) {
|
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
19
|
output.success((0, render_js_1.renderDaemonList)(entries.map((e) => ({
|
|
20
|
-
appId: e.appId,
|
|
21
|
-
|
|
20
|
+
appId: e.appId,
|
|
21
|
+
status: e.status,
|
|
22
|
+
pid: e.pid,
|
|
23
|
+
port: e.port,
|
|
24
|
+
serveKey: e.serveKey,
|
|
25
|
+
startedAt: e.startedAt,
|
|
22
26
|
}))));
|
|
23
27
|
}
|
|
24
28
|
//# sourceMappingURL=list.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/list.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/list.ts"],"names":[],"mappings":";;AAUA,kCAgCC;AAxCD,yDAKiC;AACjC,2CAA+C;AAExC,KAAK,UAAU,WAAW,CAC/B,MAAc,EACd,OAII,EAAE;IAEN,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,IAAI,yBAAkB,CAAC;IACpD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,IAAI,yBAAkB,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,wBAAiB,CAAC;IACrD,IAAI,EAAE,CAAC;IACP,MAAM,OAAO,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjC,GAAG,CAAC;QACJ,MAAM,EAAE,IAAA,sBAAQ,EAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC;KACjC,CAAC,CAAC,CAAC;IACJ,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CACZ,IAAA,4BAAgB,EACd,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClB,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,SAAS,EAAE,CAAC,CAAC,SAAS;KACvB,CAAC,CAAC,CACJ,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader-hash.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/loader-hash.ts"],"names":[],"mappings":";;AAeA,0CAQC;AAED,
|
|
1
|
+
{"version":3,"file":"loader-hash.js","sourceRoot":"","sources":["../../../../src/functions/app/commands/loader-hash.ts"],"names":[],"mappings":";;AAeA,0CAQC;AAED,wCAOC;AAhCD,mCAAoC;AACpC,uCAAoD;AAEpD,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACzD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,GAAG,GAA4B,EAAE,CAAC;QACxC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAgC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACrE,GAAG,CAAC,CAAC,CAAC,GAAG,YAAY,CAAE,KAAiC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,eAAe,CAAC,GAAW;IACzC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;QACvD,OAAO,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,IAAI,CAAC,IAAA,qBAAU,EAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,IAAI,CAAC;QACH,OAAO,eAAe,CAAC,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
@@ -6,6 +6,7 @@ const daemon_client_js_1 = require("../../client/daemon-client.js");
|
|
|
6
6
|
const resolve_source_js_1 = require("../resolve-source.js");
|
|
7
7
|
const detect_serve_js_1 = require("../detect-serve.js");
|
|
8
8
|
const render_js_1 = require("../render.js");
|
|
9
|
+
const cdn_host_js_1 = require("../cdn-host.js");
|
|
9
10
|
async function addLoaderCommand(output, deps) {
|
|
10
11
|
const resolveApp = deps.resolveApp ?? resolve_app_js_1.resolveApp;
|
|
11
12
|
const createClient = deps.createDaemonClient ?? daemon_client_js_1.createDaemonClient;
|
|
@@ -14,6 +15,11 @@ async function addLoaderCommand(output, deps) {
|
|
|
14
15
|
const source = await resolveSource(deps.argv, {
|
|
15
16
|
ensureServe: (file, opts) => (0, detect_serve_js_1.ensureServeReachable)(file, { ...opts, appId: entry.appId }),
|
|
16
17
|
});
|
|
18
|
+
if (source.type === 'cdn' && source.cdnBaseUrl && !(0, cdn_host_js_1.isDcuplCdnHost)(source.cdnBaseUrl)) {
|
|
19
|
+
output.warn(`Warning: cdnBaseUrl ${source.cdnBaseUrl} is not a dcupl CDN host — the SDK will fetch it without the api-key` +
|
|
20
|
+
` and without cache-busting${source.apiKey ? ' (the configured apiKey is ignored)' : ''}.` +
|
|
21
|
+
' Use --source url --header for a protected custom host.');
|
|
22
|
+
}
|
|
17
23
|
const client = createClient(entry);
|
|
18
24
|
const result = await client.request('POST', '/loaders', {
|
|
19
25
|
body: { key: deps.key, source },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/loaders/add.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/loaders/add.ts"],"names":[],"mappings":";;AAkBA,4CA+BC;AA/CD,sDAAoE;AACpE,oEAAwG;AACxG,4DAAsG;AACtG,wDAA0D;AAC1D,4CAA+C;AAC/C,gDAAgD;AAWzC,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,IAAmB;IACxE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,2BAAiB,CAAC;IACxD,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,IAAI,qCAAmB,CAAC;IACpE,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,uCAAoB,CAAC;IAEjE,MAAM,KAAK,GAAG,UAAU,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAEhD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE;QAC5C,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAA,sCAAoB,EAAC,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;KACzF,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,MAAM,CAAC,UAAU,IAAI,CAAC,IAAA,4BAAc,EAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QAGrF,MAAM,CAAC,IAAI,CACT,uBAAuB,MAAM,CAAC,UAAU,sEAAsE;YAC5G,6BAA6B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,EAAE,GAAG;YAC1F,yDAAyD,CAC5D,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,MAAM,EAAE,UAAU,EAAE;QACzE,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE;KAChC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvB,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAA,2BAAe,EAAC,MAAM,CAAC,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -9,7 +9,10 @@ function parseProcessFlags(argv) {
|
|
|
9
9
|
out.environmentKeys = argv.env;
|
|
10
10
|
if (argv.tag?.length) {
|
|
11
11
|
out.resourceTags = argv.tag.map((term) => {
|
|
12
|
-
const parts = term
|
|
12
|
+
const parts = term
|
|
13
|
+
.split(',')
|
|
14
|
+
.map((p) => p.trim())
|
|
15
|
+
.filter((p) => p.length > 0);
|
|
13
16
|
return parts.length === 1 ? parts[0] : parts;
|
|
14
17
|
});
|
|
15
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-flags.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/loaders/process-flags.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"process-flags.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/loaders/process-flags.ts"],"names":[],"mappings":";;AASA,8CAgCC;AAhCD,SAAgB,iBAAiB,CAAC,IAAiB;IACjD,MAAM,GAAG,GAAuB,EAAE,CAAC;IAEnC,IAAI,IAAI,CAAC,MAAM;QAAE,GAAG,CAAC,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC;IAElD,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM;QAAE,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC;IAErD,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;QACrB,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACvC,MAAM,KAAK,GAAG,IAAI;iBACf,KAAK,CAAC,GAAG,CAAC;iBACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;iBACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC/B,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC/C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,GAA2B,EAAE,CAAC;QACxC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;gBACb,MAAM,GAAG,GAAQ,IAAI,KAAK,CAAC,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;gBAChF,GAAG,CAAC,IAAI,GAAG,aAAa,CAAC;gBACzB,MAAM,GAAG,CAAC;YACZ,CAAC;YACD,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC;QACD,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -13,7 +13,9 @@ async function processLoaderCommand(output, deps) {
|
|
|
13
13
|
const client = createClient(entry);
|
|
14
14
|
const key = await (0, resolve_key_js_1.resolveLoaderKey)(client, deps.loader);
|
|
15
15
|
const body = (0, process_flags_js_1.parseProcessFlags)(deps.argv);
|
|
16
|
-
const result = await client.request('POST', `/loaders/${encodeURIComponent(key)}/process`, {
|
|
16
|
+
const result = await client.request('POST', `/loaders/${encodeURIComponent(key)}/process`, {
|
|
17
|
+
body,
|
|
18
|
+
});
|
|
17
19
|
if (output.isJson()) {
|
|
18
20
|
output.success(result);
|
|
19
21
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/loaders/process.ts"],"names":[],"mappings":";;AAgBA,
|
|
1
|
+
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/loaders/process.ts"],"names":[],"mappings":";;AAgBA,oDAiBC;AA/BD,sDAAoE;AACpE,oEAAwG;AACxG,yDAAoE;AACpE,qDAAoD;AACpD,4CAAmD;AAU5C,KAAK,UAAU,oBAAoB,CAAC,MAAc,EAAE,IAAuB;IAChF,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,2BAAiB,CAAC;IACxD,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,IAAI,qCAAmB,CAAC;IAEpE,MAAM,KAAK,GAAG,UAAU,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,MAAM,IAAA,iCAAgB,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,IAAA,oCAAiB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAwB,MAAM,EAAE,YAAY,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE;QAChH,IAAI;KACL,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvB,OAAO;IACT,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAA,+BAAmB,EAAC,MAAM,CAAC,CAAC,CAAC;AAC9C,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.removeLoaderCommand = removeLoaderCommand;
|
|
|
4
4
|
const resolve_app_js_1 = require("../resolve-app.js");
|
|
5
5
|
const daemon_client_js_1 = require("../../client/daemon-client.js");
|
|
6
6
|
const resolve_key_js_1 = require("./resolve-key.js");
|
|
7
|
+
const warn_if_pending_js_1 = require("../warn-if-pending.js");
|
|
7
8
|
async function removeLoaderCommand(output, deps = {}) {
|
|
8
9
|
const resolveApp = deps.resolveApp ?? resolve_app_js_1.resolveApp;
|
|
9
10
|
const createClient = deps.createDaemonClient ?? daemon_client_js_1.createDaemonClient;
|
|
@@ -12,5 +13,6 @@ async function removeLoaderCommand(output, deps = {}) {
|
|
|
12
13
|
const key = await (0, resolve_key_js_1.resolveLoaderKey)(client, deps.loader);
|
|
13
14
|
const result = await client.request('DELETE', `/loaders/${encodeURIComponent(key)}`);
|
|
14
15
|
output.success(result);
|
|
16
|
+
(0, warn_if_pending_js_1.warnIfPending)(output, client);
|
|
15
17
|
}
|
|
16
18
|
//# sourceMappingURL=remove.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/loaders/remove.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/loaders/remove.ts"],"names":[],"mappings":";;AAcA,kDASC;AArBD,sDAAoE;AACpE,oEAAwG;AACxG,qDAAoD;AACpD,8DAAsD;AAS/C,KAAK,UAAU,mBAAmB,CAAC,MAAc,EAAE,OAAyB,EAAE;IACnF,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,2BAAiB,CAAC;IACxD,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,IAAI,qCAAmB,CAAC;IACpE,MAAM,KAAK,GAAG,UAAU,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,MAAM,IAAA,iCAAgB,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAiC,QAAQ,EAAE,YAAY,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACrH,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvB,IAAA,kCAAa,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/models/get.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/models/get.ts"],"names":[],"mappings":";;AAKA,gCAaC;AAhBD,gDAAiE;AACjE,8DAAqG;AAE9F,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,IAKC;IAED,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,wBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,kCAAmB,CAAC,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAU,KAAK,EAAE,WAAW,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/F,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/models/keys.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/models/keys.ts"],"names":[],"mappings":";;AAKA,kCAYC;AAfD,gDAAiE;AACjE,8DAAqG;AAE9F,KAAK,UAAU,WAAW,CAC/B,MAAc,EACd,OAII,EAAE;IAEN,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,wBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,kCAAmB,CAAC,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAW,KAAK,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/models/remove.ts"],"names":[],"mappings":";;AAKA,
|
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/models/remove.ts"],"names":[],"mappings":";;AAKA,sCAaC;AAhBD,gDAAiE;AACjE,8DAAqG;AAE9F,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,IAKC;IAED,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,wBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,kCAAmB,CAAC,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAU,QAAQ,EAAE,WAAW,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -12,7 +12,9 @@ async function setCommand(output, deps) {
|
|
|
12
12
|
const client = (deps.createDaemonClient ?? daemon_client_1.createDaemonClient)(entry);
|
|
13
13
|
const raw = deps.file
|
|
14
14
|
? (0, fs_extra_1.readFileSync)(deps.file, 'utf-8')
|
|
15
|
-
:
|
|
15
|
+
: deps.content === '-'
|
|
16
|
+
? (0, fs_extra_1.readFileSync)(0, 'utf-8')
|
|
17
|
+
: deps.content;
|
|
16
18
|
const model = JSON.parse(raw);
|
|
17
19
|
const data = await client.request('POST', '/models', { body: model });
|
|
18
20
|
if (data.warning && !output.isJson()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/models/set.ts"],"names":[],"mappings":";;AAMA,
|
|
1
|
+
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/models/set.ts"],"names":[],"mappings":";;AAMA,gCA2BC;AAjCD,uCAAwC;AAGxC,gDAAiE;AACjE,8DAAqG;AAE9F,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,IAMC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACjE,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,gDAAgD,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;IAC1G,CAAC;IACD,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,wBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,kCAAmB,CAAC,CAAC,KAAK,CAAC,CAAC;IAEvE,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI;QACnB,CAAC,CAAC,IAAA,uBAAY,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;QAClC,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG;YACtB,CAAC,CAAC,IAAA,uBAAY,EAAC,CAAC,EAAE,OAAO,CAAC;YAC1B,CAAC,CAAC,IAAI,CAAC,OAAQ,CAAC;IAClB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoC,MAAM,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACzG,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC"}
|
|
@@ -3,22 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.parseProjection = parseProjection;
|
|
4
4
|
exports.executeCommand = executeCommand;
|
|
5
5
|
const query_input_1 = require("../query-input");
|
|
6
|
+
const sort_input_1 = require("../sort-input");
|
|
6
7
|
const resolve_app_1 = require("../resolve-app");
|
|
7
8
|
const daemon_client_1 = require("../../client/daemon-client");
|
|
8
9
|
const warn_if_pending_1 = require("../warn-if-pending");
|
|
9
|
-
|
|
10
|
-
if (!spec)
|
|
11
|
-
return undefined;
|
|
12
|
-
const attrs = [];
|
|
13
|
-
const orders = [];
|
|
14
|
-
for (const part of spec.split(',')) {
|
|
15
|
-
const [attr, dir] = part.trim().split(':');
|
|
16
|
-
attrs.push(attr);
|
|
17
|
-
orders.push((dir ?? 'ASC').toUpperCase());
|
|
18
|
-
}
|
|
19
|
-
return { attributes: attrs, order: orders };
|
|
20
|
-
}
|
|
21
|
-
const PROJECTION_HINT = "Use object '{\"key\":true}', array '[\"key\",\"name\"]', or comma list 'key,name'.";
|
|
10
|
+
const PROJECTION_HINT = 'Use object \'{"key":true}\', array \'["key","name"]\', or comma list \'key,name\'.';
|
|
22
11
|
function projectionError(message) {
|
|
23
12
|
const e = new Error(message);
|
|
24
13
|
e.code = 'PROJECTION_INVALID_SHAPE';
|
|
@@ -62,7 +51,10 @@ function parseProjection(spec) {
|
|
|
62
51
|
}
|
|
63
52
|
return fromKeys(parsed);
|
|
64
53
|
}
|
|
65
|
-
const keys = trimmed
|
|
54
|
+
const keys = trimmed
|
|
55
|
+
.split(',')
|
|
56
|
+
.map((s) => s.trim())
|
|
57
|
+
.filter((s) => s.length > 0);
|
|
66
58
|
if (keys.length === 0) {
|
|
67
59
|
throw projectionError(`--projection is empty. ${PROJECTION_HINT}`);
|
|
68
60
|
}
|
|
@@ -76,7 +68,7 @@ async function executeCommand(output, options) {
|
|
|
76
68
|
const body = {
|
|
77
69
|
modelKey: options.model,
|
|
78
70
|
query,
|
|
79
|
-
sort:
|
|
71
|
+
sort: (0, sort_input_1.parseSortSpec)(options.sort),
|
|
80
72
|
count: options.limit,
|
|
81
73
|
start: options.start,
|
|
82
74
|
projection,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/query/execute.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../src/functions/app/commands/query/execute.ts"],"names":[],"mappings":"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"}
|