@dcupl/cli 1.4.0-beta.9 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -3
- package/dist/cli.d.ts +2 -0
- package/dist/cli.js +71 -51
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/commands/data/render.d.ts +3 -1
- package/dist/functions/app/commands/data/render.js +9 -1
- package/dist/functions/app/commands/data/render.js.map +1 -1
- package/dist/functions/app/commands/fn/group-by.js +4 -2
- package/dist/functions/app/commands/fn/group-by.js.map +1 -1
- package/dist/functions/app/commands/loaders/remove.js +2 -0
- package/dist/functions/app/commands/loaders/remove.js.map +1 -1
- package/dist/functions/app/commands/query/execute.js +2 -13
- package/dist/functions/app/commands/query/execute.js.map +1 -1
- package/dist/functions/app/commands/query-input.d.ts +1 -0
- package/dist/functions/app/commands/query-input.js +15 -2
- package/dist/functions/app/commands/query-input.js.map +1 -1
- package/dist/functions/app/commands/sort-input.d.ts +5 -0
- package/dist/functions/app/commands/sort-input.js +34 -0
- package/dist/functions/app/commands/sort-input.js.map +1 -0
- package/dist/functions/app/daemon/controllers/data.controller.d.ts +3 -4
- package/dist/functions/app/daemon/controllers/data.controller.js +2 -2
- package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/loaders.controller.js +1 -1
- package/dist/functions/app/daemon/controllers/loaders.controller.js.map +1 -1
- package/dist/functions/app/daemon/services/csv-delimiter.d.ts +15 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js +99 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js.map +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +15 -2
- package/dist/functions/app/daemon/services/dcupl-host.service.js +127 -13
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/daemon/services/group-sort.d.ts +25 -0
- package/dist/functions/app/daemon/services/group-sort.js +128 -0
- package/dist/functions/app/daemon/services/group-sort.js.map +1 -0
- package/dist/functions/app/daemon/services/ingest.service.d.ts +1 -0
- package/dist/functions/app/daemon/services/ingest.service.js +9 -7
- package/dist/functions/app/daemon/services/ingest.service.js.map +1 -1
- package/dist/functions/app/daemon/services/loaders.service.d.ts +1 -1
- package/dist/functions/app/daemon/services/loaders.service.js +7 -1
- package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
- package/dist/functions/app/daemon/services/normalize-query.d.ts +11 -2
- package/dist/functions/app/daemon/services/normalize-query.js +55 -4
- package/dist/functions/app/daemon/services/normalize-query.js.map +1 -1
- package/dist/functions/app/daemon/services/staged-keys.d.ts +12 -0
- package/dist/functions/app/daemon/services/staged-keys.js +72 -0
- package/dist/functions/app/daemon/services/staged-keys.js.map +1 -0
- package/dist/functions/config/commands/set.js +2 -2
- package/dist/functions/config/commands/set.js.map +1 -1
- package/dist/functions/config/prompts.d.ts +2 -1
- package/dist/functions/config/prompts.js.map +1 -1
- package/dist/functions/files/commands/pull.js +2 -3
- package/dist/functions/files/commands/pull.js.map +1 -1
- package/dist/functions/files/helper/confirm.js +2 -3
- package/dist/functions/files/helper/confirm.js.map +1 -1
- package/dist/functions/generate/files/generate-code.js +0 -1
- package/dist/functions/generate/files/generate-code.js.map +1 -1
- package/dist/functions/generate/files/generate-files.d.ts +10 -1
- package/dist/functions/generate/files/generate-files.js +154 -43
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/files/generate-schema.js +1 -1
- package/dist/functions/generate/files/generate-schema.js.map +1 -1
- package/dist/functions/generate/files/generate.helper.d.ts +9 -3
- package/dist/functions/generate/files/generate.helper.js +11 -8
- package/dist/functions/generate/files/generate.helper.js.map +1 -1
- package/dist/functions/generate/files/rest-api-template.d.ts +16 -0
- package/dist/functions/generate/files/rest-api-template.js +63 -0
- package/dist/functions/generate/files/rest-api-template.js.map +1 -0
- package/dist/functions/generate/files/script-starters.d.ts +7 -0
- package/dist/functions/generate/files/script-starters.js +75 -0
- package/dist/functions/generate/files/script-starters.js.map +1 -0
- package/dist/functions/generate/files/workflow-presets.js +2 -1
- package/dist/functions/generate/files/workflow-presets.js.map +1 -1
- package/dist/functions/generate/model-from-data/generate-model-from-data.d.ts +1 -0
- package/dist/functions/generate/model-from-data/generate-model-from-data.js +67 -4
- package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
- package/dist/functions/generate/projects/generate-project.js +9 -11
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/api-client.d.ts +1 -0
- package/dist/functions/helper/api-client.js +8 -2
- package/dist/functions/helper/api-client.js.map +1 -1
- package/dist/functions/helper/config.helper.js +1 -1
- package/dist/functions/helper/config.helper.js.map +1 -1
- package/dist/functions/helper/prompt.d.ts +2 -0
- package/dist/functions/helper/prompt.js +8 -0
- package/dist/functions/helper/prompt.js.map +1 -0
- package/dist/functions/schemas/examples/ResponseScriptConfig.example.json +1 -1
- package/dist/functions/schemas/examples/RestApiTemplate.example.json +30 -0
- package/dist/functions/schemas/format.js +3 -1
- package/dist/functions/schemas/format.js.map +1 -1
- package/dist/functions/schemas/registry.d.ts +2 -1
- package/dist/functions/schemas/registry.js +13 -1
- package/dist/functions/schemas/registry.js.map +1 -1
- package/dist/functions/schemas/resolve.d.ts +1 -0
- package/dist/functions/schemas/resolve.js +32 -1
- package/dist/functions/schemas/resolve.js.map +1 -1
- package/dist/functions/serve/dev-server/request-security.js +1 -0
- package/dist/functions/serve/dev-server/request-security.js.map +1 -1
- package/dist/functions/workflow/commands/run.d.ts +2 -8
- package/dist/functions/workflow/commands/run.js +5 -14
- package/dist/functions/workflow/commands/run.js.map +1 -1
- package/dist/functions/workflow/commands/test.d.ts +2 -8
- package/dist/functions/workflow/commands/test.js +5 -12
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/wait-for-swap.js +1 -1
- package/dist/functions/workflow/wait-for-swap.js.map +1 -1
- package/dist/functions/workflow/workflow-api.d.ts +7 -7
- package/dist/functions/workflow/workflow-api.js +28 -15
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/files/common/_gitignore +2 -1
- package/package.json +13 -9
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GroupSortError = void 0;
|
|
4
|
+
exports.aggregateSortKeys = aggregateSortKeys;
|
|
5
|
+
exports.planGroupSort = planGroupSort;
|
|
6
|
+
exports.sortGroups = sortGroups;
|
|
7
|
+
class GroupSortError extends Error {
|
|
8
|
+
constructor(message) {
|
|
9
|
+
super(message);
|
|
10
|
+
this.code = 'PARSE_ERROR';
|
|
11
|
+
this.name = 'GroupSortError';
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.GroupSortError = GroupSortError;
|
|
15
|
+
const SCALAR_AGGREGATE_TYPES = new Set(['sum', 'avg', 'count', 'min', 'max']);
|
|
16
|
+
function isSortProjection(sort) {
|
|
17
|
+
if (!sort || typeof sort !== 'object' || Array.isArray(sort))
|
|
18
|
+
return false;
|
|
19
|
+
const obj = sort;
|
|
20
|
+
return (Array.isArray(obj.attributes) &&
|
|
21
|
+
obj.attributes.every((a) => typeof a === 'string') &&
|
|
22
|
+
(obj.order === undefined || Array.isArray(obj.order)));
|
|
23
|
+
}
|
|
24
|
+
function aggregateSortKeys(aggregates) {
|
|
25
|
+
if (!Array.isArray(aggregates))
|
|
26
|
+
return [];
|
|
27
|
+
const keys = [];
|
|
28
|
+
for (const agg of aggregates) {
|
|
29
|
+
const attribute = agg?.attribute;
|
|
30
|
+
const types = agg?.types;
|
|
31
|
+
if (typeof attribute !== 'string' || !Array.isArray(types))
|
|
32
|
+
continue;
|
|
33
|
+
for (const type of types) {
|
|
34
|
+
if (typeof type === 'string' && SCALAR_AGGREGATE_TYPES.has(type))
|
|
35
|
+
keys.push(`${attribute}_${type}`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return keys;
|
|
39
|
+
}
|
|
40
|
+
function planGroupSort(input) {
|
|
41
|
+
const { sort } = input;
|
|
42
|
+
if (sort === undefined || sort === null)
|
|
43
|
+
return undefined;
|
|
44
|
+
if (!isSortProjection(sort)) {
|
|
45
|
+
throw new GroupSortError('sort must be a sorting projection { attributes: string[], order: ("ASC"|"DESC")[] }, e.g. { attributes: ["size"], order: ["DESC"] }.');
|
|
46
|
+
}
|
|
47
|
+
const aggKeys = aggregateSortKeys(input.aggregates);
|
|
48
|
+
const groupLevel = new Set(['key', 'size', ...aggKeys]);
|
|
49
|
+
const known = new Set(input.knownAttributes);
|
|
50
|
+
const groupKeys = [];
|
|
51
|
+
const itemAttributes = [];
|
|
52
|
+
const itemOrder = [];
|
|
53
|
+
sort.attributes.forEach((attribute, i) => {
|
|
54
|
+
const rawOrder = sort.order?.[i];
|
|
55
|
+
const order = typeof rawOrder === 'string' && rawOrder.toUpperCase() === 'DESC' ? 'DESC' : 'ASC';
|
|
56
|
+
if (groupLevel.has(attribute)) {
|
|
57
|
+
groupKeys.push({ key: attribute, order });
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
if (known.size === 0 || known.has(attribute.split(/[.[]/)[0])) {
|
|
61
|
+
itemAttributes.push(attribute);
|
|
62
|
+
itemOrder.push(order);
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
const accepted = [
|
|
66
|
+
'"key"',
|
|
67
|
+
'"size"',
|
|
68
|
+
...aggKeys.map((k) => `"${k}"`),
|
|
69
|
+
`<attribute>_<sum|avg|count|min|max> of a requested aggregate (--aggregate <attribute>:<type>)`,
|
|
70
|
+
`or an attribute of "${input.model}" (orders the items inside each group)`,
|
|
71
|
+
];
|
|
72
|
+
throw new GroupSortError(`Unknown sort key "${attribute}" for groupBy on "${input.model}". Accepted: ${accepted.join(', ')}.`);
|
|
73
|
+
});
|
|
74
|
+
if (groupKeys.length > 0 && itemAttributes.length > 0) {
|
|
75
|
+
throw new GroupSortError(`Cannot mix group-level sort keys (${groupKeys
|
|
76
|
+
.map((k) => `"${k.key}"`)
|
|
77
|
+
.join(', ')}) with item attributes (${itemAttributes.map((a) => `"${a}"`).join(', ')}) in one sort.`);
|
|
78
|
+
}
|
|
79
|
+
return {
|
|
80
|
+
groupKeys,
|
|
81
|
+
itemSort: itemAttributes.length > 0 ? { attributes: itemAttributes, order: itemOrder } : undefined,
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
function groupValue(group, key) {
|
|
85
|
+
if (key === 'key')
|
|
86
|
+
return group?.key;
|
|
87
|
+
if (key === 'size')
|
|
88
|
+
return group?._meta?.size;
|
|
89
|
+
const idx = key.lastIndexOf('_');
|
|
90
|
+
const attribute = key.slice(0, idx);
|
|
91
|
+
const type = key.slice(idx + 1);
|
|
92
|
+
const agg = Array.isArray(group?._aggregates)
|
|
93
|
+
? group._aggregates.find((a) => a?.attribute === attribute)
|
|
94
|
+
: undefined;
|
|
95
|
+
return agg?.[type];
|
|
96
|
+
}
|
|
97
|
+
function compareValues(a, b) {
|
|
98
|
+
const aMissing = a === undefined || a === null;
|
|
99
|
+
const bMissing = b === undefined || b === null;
|
|
100
|
+
if (aMissing && bMissing)
|
|
101
|
+
return 0;
|
|
102
|
+
if (aMissing)
|
|
103
|
+
return 1;
|
|
104
|
+
if (bMissing)
|
|
105
|
+
return -1;
|
|
106
|
+
if (typeof a === 'number' && typeof b === 'number')
|
|
107
|
+
return a - b;
|
|
108
|
+
return String(a).localeCompare(String(b));
|
|
109
|
+
}
|
|
110
|
+
function sortGroups(items, keys) {
|
|
111
|
+
if (keys.length === 0)
|
|
112
|
+
return items;
|
|
113
|
+
return items
|
|
114
|
+
.map((item, index) => ({ item, index }))
|
|
115
|
+
.sort((x, y) => {
|
|
116
|
+
for (const { key, order } of keys) {
|
|
117
|
+
const a = groupValue(x.item, key);
|
|
118
|
+
const b = groupValue(y.item, key);
|
|
119
|
+
const missing = a === undefined || a === null || b === undefined || b === null;
|
|
120
|
+
const cmp = compareValues(a, b);
|
|
121
|
+
if (cmp !== 0)
|
|
122
|
+
return missing ? cmp : order === 'DESC' ? -cmp : cmp;
|
|
123
|
+
}
|
|
124
|
+
return x.index - y.index;
|
|
125
|
+
})
|
|
126
|
+
.map((x) => x.item);
|
|
127
|
+
}
|
|
128
|
+
//# sourceMappingURL=group-sort.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"group-sort.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/group-sort.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,21 +6,22 @@ const common_1 = require("@nestjs/common");
|
|
|
6
6
|
const fs_extra_1 = require("fs-extra");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
9
|
+
const csv_delimiter_js_1 = require("./csv-delimiter.js");
|
|
9
10
|
let IngestService = class IngestService {
|
|
10
11
|
async fromFile(path, options = {}) {
|
|
11
12
|
const text = (0, fs_extra_1.readFileSync)(path, 'utf-8');
|
|
12
13
|
const fmt = options.format ?? this.detectFormat(path, text);
|
|
13
|
-
return this.parse(text, fmt);
|
|
14
|
+
return this.parse(text, fmt, options);
|
|
14
15
|
}
|
|
15
16
|
async fromUrl(url, options = {}) {
|
|
16
17
|
const res = await axios_1.default.get(url, { responseType: 'text' });
|
|
17
18
|
const text = typeof res.data === 'string' ? res.data : JSON.stringify(res.data);
|
|
18
19
|
const fmt = options.format ?? this.detectFormatFromContent(text, url);
|
|
19
|
-
return this.parse(text, fmt);
|
|
20
|
+
return this.parse(text, fmt, options);
|
|
20
21
|
}
|
|
21
22
|
async fromString(text, options = {}) {
|
|
22
23
|
const fmt = options.format ?? this.detectFormatFromContent(text, '<inline>');
|
|
23
|
-
return this.parse(text, fmt);
|
|
24
|
+
return this.parse(text, fmt, options);
|
|
24
25
|
}
|
|
25
26
|
detectFormat(path, text) {
|
|
26
27
|
const ext = (0, path_1.extname)(path).toLowerCase();
|
|
@@ -45,7 +46,7 @@ let IngestService = class IngestService {
|
|
|
45
46
|
return 'ndjson';
|
|
46
47
|
}
|
|
47
48
|
}
|
|
48
|
-
parse(text, fmt) {
|
|
49
|
+
parse(text, fmt, options = {}) {
|
|
49
50
|
if (text.charCodeAt(0) === 0xfeff) {
|
|
50
51
|
text = text.slice(1);
|
|
51
52
|
}
|
|
@@ -60,14 +61,15 @@ let IngestService = class IngestService {
|
|
|
60
61
|
.filter((l) => l.length > 0)
|
|
61
62
|
.map((l) => JSON.parse(l));
|
|
62
63
|
}
|
|
63
|
-
return parseCsv(text);
|
|
64
|
+
return parseCsv(text, options.delimiter);
|
|
64
65
|
}
|
|
65
66
|
};
|
|
66
67
|
exports.IngestService = IngestService;
|
|
67
68
|
exports.IngestService = IngestService = tslib_1.__decorate([
|
|
68
69
|
(0, common_1.Injectable)()
|
|
69
70
|
], IngestService);
|
|
70
|
-
function parseCsv(text) {
|
|
71
|
+
function parseCsv(text, delimiter) {
|
|
72
|
+
const separator = delimiter || (0, csv_delimiter_js_1.detectCsvDelimiter)(text).delimiter || ',';
|
|
71
73
|
const rows = [];
|
|
72
74
|
let row = [];
|
|
73
75
|
let field = '';
|
|
@@ -92,7 +94,7 @@ function parseCsv(text) {
|
|
|
92
94
|
if (ch === '"') {
|
|
93
95
|
inQuotes = true;
|
|
94
96
|
}
|
|
95
|
-
else if (ch ===
|
|
97
|
+
else if (ch === separator) {
|
|
96
98
|
row.push(field);
|
|
97
99
|
field = '';
|
|
98
100
|
}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"ingest.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/ingest.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ export declare class LoadersService {
|
|
|
20
20
|
process(key: string, opts: ProcessOptionsWire): Promise<ProcessLoaderResponse>;
|
|
21
21
|
list(): LoaderEntry[];
|
|
22
22
|
get(key: string): LoaderDetail;
|
|
23
|
-
remove(key: string): void
|
|
23
|
+
remove(key: string): Promise<void>;
|
|
24
24
|
private requireSlot;
|
|
25
25
|
private toFetchOptions;
|
|
26
26
|
private attemptedConfigUrl;
|
|
@@ -94,6 +94,9 @@ let LoadersService = class LoadersService {
|
|
|
94
94
|
}
|
|
95
95
|
catch (err) {
|
|
96
96
|
slot.entry.status = 'error';
|
|
97
|
+
if (err?.name === 'SharedModelKeyError') {
|
|
98
|
+
throw new LoaderError_('LOADER_SHARED_MODEL_KEY', err.message, { loader: key });
|
|
99
|
+
}
|
|
97
100
|
throw new LoaderError_('LOADER_PROCESS_FAILED', err?.message ?? 'process() failed');
|
|
98
101
|
}
|
|
99
102
|
const counts = this.countResources(slot.progress);
|
|
@@ -115,11 +118,14 @@ let LoadersService = class LoadersService {
|
|
|
115
118
|
errors: [...slot.errors],
|
|
116
119
|
};
|
|
117
120
|
}
|
|
118
|
-
remove(key) {
|
|
121
|
+
async remove(key) {
|
|
119
122
|
const slot = this.requireSlot(key);
|
|
120
123
|
slot.unsub();
|
|
121
124
|
this.host.detachLoader(key);
|
|
122
125
|
this.map.delete(key);
|
|
126
|
+
this.host.markDirty();
|
|
127
|
+
if (this.host.autoUpdate)
|
|
128
|
+
await this.host.update();
|
|
123
129
|
}
|
|
124
130
|
requireSlot(key) {
|
|
125
131
|
const slot = this.map.get(key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/loaders.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"loaders.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/loaders.service.ts"],"names":[],"mappings":";;;AAuBA,oCAIC;;AA3BD,2CAA8D;AAC9D,0CAA+C;AAE/C,mEAA2D;AAoB3D,SAAgB,YAAY,CAAC,MAAoB;IAC/C,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACxE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;IAC5C,OAAO,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AAC3C,CAAC;AAED,MAAa,YAAa,SAAQ,KAAK;IACrC,YAA4B,IAAY,EAAE,OAAe,EAAkB,OAAiB;QAC1F,KAAK,CAAC,OAAO,CAAC,CAAC;QADW,SAAI,GAAJ,IAAI,CAAQ;QAAmC,YAAO,GAAP,OAAO,CAAU;QAE1F,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;IAC5B,CAAC;CACF;AALD,oCAKC;AAeY,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAGpD,IAAM,cAAc,GAApB,MAAM,cAAc;IAIzB,YACmB,IAAsB,EACG,IAAyB;QADlD,SAAI,GAAJ,IAAI,CAAkB;QAJjC,QAAG,GAAG,IAAI,GAAG,EAAgB,CAAC;QAOpC,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAuB;QAC/B,IAAI,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,YAAY,CAAC,qBAAqB,EAAE,oBAAoB,KAAK,CAAC,GAAG,kBAAkB,CAAC,CAAC;QACjG,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,GAAmB,EAAE,CAAC,IAAI,uBAAc,EAAE,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAEtD,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAIlB,MAAM,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,IAAI,YAAY,CACpB,4BAA4B,EAC5B,6CAA6C,GAAG,KAAK,GAAG,EAAE,OAAO,IAAI,eAAe,EAAE,EAEtF,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAC5C,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,aAAa,GAAG,MAAM,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC;QACrD,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC5E,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAE5E,MAAM,KAAK,GAAgB;YACzB,GAAG;YACH,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACjC,aAAa;YACb,UAAU,EAAE,CAAC;SACd,CAAC;QAEF,MAAM,IAAI,GAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAIvF,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAiC,EAAE,EAAE;YAC5D,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC;YAC3B,IAAI,CAAC,IAAI;gBAAE,OAAO;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACjB,WAAW,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE;gBAC3B,YAAY,EAAG,IAAI,CAAC,IAA2C,IAAI,MAAM;gBACzE,EAAE,EAAE,IAAI,CAAC,OAAO,KAAK,KAAK;gBAC1B,UAAU,EAAE,IAAI,CAAC,MAAM;gBACvB,KAAK,EAAE,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS;aAC3E,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAExB,OAAO;YACL,GAAG;YACH,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC;YAClC,MAAM,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE;SAC5D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,IAAwB;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAE/B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;YAKvD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACtB,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACnD,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,WAAW,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACpD,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAIlB,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC;YAI5B,IAAI,GAAG,EAAE,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACxC,MAAM,IAAI,YAAY,CAAC,yBAAyB,EAAE,GAAG,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAClF,CAAC;YACD,MAAM,IAAI,YAAY,CAAC,uBAAuB,EAAE,GAAG,EAAE,OAAO,IAAI,kBAAkB,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;QACnG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAE3C,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IAC9E,CAAC;IAED,IAAI;QACF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1G,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACnC,OAAO;YACL,GAAG,IAAI,CAAC,KAAK;YACb,MAAM,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;YAChC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC5B,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;SACzB,CAAC;IACJ,CAAC;IASD,KAAK,CAAC,MAAM,CAAC,GAAW;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACrD,CAAC;IAEO,WAAW,CAAC,GAAW;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,YAAY,CAAC,kBAAkB,EAAE,WAAW,GAAG,aAAa,CAAC,CAAC;QACnF,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,cAAc,CAAC,MAAsB,EAAE,MAAoB;QACjE,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAE1B,IAAI,MAAM,CAAC,SAAS;gBAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YACjF,IAAI,MAAM,CAAC,MAAM;gBAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,MAAM,CAAC,OAAO;gBAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAG3E,IAAI,MAAM,CAAC,UAAU;gBAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YACpF,IAAI,MAAM,CAAC,aAAa;gBAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;YAE7F,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC;QAC3D,CAAC;QAED,OAAO;YACL,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,eAAe;YACxD,OAAO,EACL,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO;gBACzC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;gBACzE,CAAC,CAAC,SAAS;SAChB,CAAC;IACJ,CAAC;IAEO,kBAAkB,CAAC,MAAsB;QAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;QAC7D,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,KAAK,IAAI,eAAe,CAAC;QACxF,OAAO,GAAG,OAAO,IAAI,cAAc,EAAE,CAAC;IACxC,CAAC;IAEO,gBAAgB,CAAC,CAAqB;QAC5C,OAAO;YACL,cAAc,EAAE,CAAC,CAAC,cAAc;YAChC,eAAe,EAAE,CAAC,CAAC,eAAe;YAClC,YAAY,EAAE,CAAC,CAAC,YAAmB;YACnC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;YACzG,OAAO,EAAE,CAAC,CAAC,OAAc;SAC1B,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,QAA8B;QACnD,MAAM,MAAM,GAAyB,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACnG,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,CAAC,CAAC,EAAE;gBAAE,SAAS;YACpB,MAAM,CAAC,GAAG,CAAC,CAAC,YAAsB,CAAC;YACnC,IAAI,CAAC,IAAI,MAAM;gBAAG,MAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA1MY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAOR,mBAAA,IAAA,iBAAQ,GAAE,CAAA;IAAE,mBAAA,IAAA,eAAM,EAAC,4BAAoB,CAAC,CAAA;6CADlB,wCAAgB;GAL9B,cAAc,CA0M1B"}
|
|
@@ -5,7 +5,16 @@ export interface NormalizedQuery {
|
|
|
5
5
|
queries: unknown[];
|
|
6
6
|
}
|
|
7
7
|
export declare class BadQueryError extends Error {
|
|
8
|
-
readonly code = "
|
|
9
|
-
|
|
8
|
+
readonly code = "PARSE_ERROR";
|
|
9
|
+
readonly details?: unknown;
|
|
10
|
+
constructor(message: string, details?: unknown);
|
|
10
11
|
}
|
|
12
|
+
export declare function isSdkUnknownOperator(err: unknown): err is Error & {
|
|
13
|
+
operator: string;
|
|
14
|
+
validOperators: string[];
|
|
15
|
+
};
|
|
16
|
+
export declare function toUnknownOperator(err: Error & {
|
|
17
|
+
operator: string;
|
|
18
|
+
validOperators: string[];
|
|
19
|
+
}): BadQueryError;
|
|
11
20
|
export declare function normalizeQuery(modelKey: string, raw: unknown): NormalizedQuery | undefined;
|
|
@@ -1,29 +1,80 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BadQueryError = void 0;
|
|
4
|
+
exports.isSdkUnknownOperator = isSdkUnknownOperator;
|
|
5
|
+
exports.toUnknownOperator = toUnknownOperator;
|
|
4
6
|
exports.normalizeQuery = normalizeQuery;
|
|
7
|
+
const SHAPE = 'Expected a condition { operator, attribute, value } or a group { groupType, queries: [...] } (groupType "and" or "or")';
|
|
5
8
|
class BadQueryError extends Error {
|
|
6
|
-
constructor(message) {
|
|
9
|
+
constructor(message, details) {
|
|
7
10
|
super(message);
|
|
8
|
-
this.code = '
|
|
11
|
+
this.code = 'PARSE_ERROR';
|
|
9
12
|
this.name = 'BadQueryError';
|
|
13
|
+
if (details !== undefined)
|
|
14
|
+
this.details = details;
|
|
10
15
|
}
|
|
11
16
|
}
|
|
12
17
|
exports.BadQueryError = BadQueryError;
|
|
18
|
+
function isSdkUnknownOperator(err) {
|
|
19
|
+
return err instanceof Error && err.name === 'UnknownOperator';
|
|
20
|
+
}
|
|
21
|
+
function toUnknownOperator(err) {
|
|
22
|
+
return new BadQueryError(err.message, { operator: err.operator, validOperators: err.validOperators });
|
|
23
|
+
}
|
|
24
|
+
function isGroup(obj) {
|
|
25
|
+
return 'queries' in obj || 'groupKey' in obj;
|
|
26
|
+
}
|
|
27
|
+
function shapeHints(obj) {
|
|
28
|
+
const hints = [];
|
|
29
|
+
for (const alias of ['filters', 'conditions']) {
|
|
30
|
+
if (alias in obj)
|
|
31
|
+
hints.push(`use "queries" instead of "${alias}"`);
|
|
32
|
+
}
|
|
33
|
+
const op = obj.operator;
|
|
34
|
+
if (op === 'and' || op === 'or') {
|
|
35
|
+
hints.push(`"${op}" belongs in groupType (groupType: "${op}", queries: [...]), not in operator`);
|
|
36
|
+
}
|
|
37
|
+
return hints;
|
|
38
|
+
}
|
|
39
|
+
function fail(path, what, obj) {
|
|
40
|
+
const hints = obj ? shapeHints(obj) : [];
|
|
41
|
+
const where = path ? ` at ${path}` : '';
|
|
42
|
+
throw new BadQueryError(`Invalid query${where}: ${what}. ${SHAPE}.${hints.length ? ` Hint: ${hints.join('; ')}.` : ''}`);
|
|
43
|
+
}
|
|
44
|
+
function assertQueryNode(node, path) {
|
|
45
|
+
if (node === null || typeof node !== 'object' || Array.isArray(node)) {
|
|
46
|
+
fail(path, `${Array.isArray(node) ? 'an array' : JSON.stringify(node)} is not a condition or group`);
|
|
47
|
+
}
|
|
48
|
+
const obj = node;
|
|
49
|
+
if (isGroup(obj)) {
|
|
50
|
+
if (!Array.isArray(obj.queries))
|
|
51
|
+
fail(path, 'a group needs a "queries" array', obj);
|
|
52
|
+
obj.queries.forEach((child, i) => assertQueryNode(child, `${path ? path + '.' : ''}queries[${i}]`));
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
if (typeof obj.attribute !== 'string' || !obj.attribute) {
|
|
56
|
+
fail(path, 'a condition needs a string "attribute"', obj);
|
|
57
|
+
}
|
|
58
|
+
if (typeof obj.operator !== 'string' || !obj.operator) {
|
|
59
|
+
fail(path, 'a condition needs a string "operator"', obj);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
13
62
|
function normalizeQuery(modelKey, raw) {
|
|
14
63
|
if (raw === undefined || raw === null)
|
|
15
64
|
return undefined;
|
|
16
65
|
if (Array.isArray(raw)) {
|
|
66
|
+
raw.forEach((entry, i) => assertQueryNode(entry, `[${i}]`));
|
|
17
67
|
return { modelKey, groupKey: 'root', groupType: 'and', queries: raw };
|
|
18
68
|
}
|
|
19
69
|
if (typeof raw === 'object') {
|
|
70
|
+
assertQueryNode(raw, '');
|
|
20
71
|
const obj = raw;
|
|
21
|
-
if (
|
|
72
|
+
if (isGroup(obj)) {
|
|
22
73
|
const groupType = obj.groupType === 'or' ? 'or' : 'and';
|
|
23
74
|
return { modelKey, groupKey: 'root', groupType, queries: obj.queries };
|
|
24
75
|
}
|
|
25
76
|
return { modelKey, groupKey: 'root', groupType: 'and', queries: [raw] };
|
|
26
77
|
}
|
|
27
|
-
|
|
78
|
+
fail('', `${JSON.stringify(raw)} is not a condition, an array of conditions, or a query group`);
|
|
28
79
|
}
|
|
29
80
|
//# sourceMappingURL=normalize-query.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-query.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/normalize-query.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"normalize-query.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/normalize-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export declare const DEFAULT_KEY_PROPERTY_SEPARATOR = "::";
|
|
2
|
+
export declare function deriveRowKeys(rows: Record<string, unknown>[], keyProperty: string | readonly string[] | undefined, separator?: string): (string | undefined)[];
|
|
3
|
+
export declare class StagedKeys {
|
|
4
|
+
private models;
|
|
5
|
+
private entry;
|
|
6
|
+
set(model: string, keys: (string | undefined)[]): void;
|
|
7
|
+
upsert(model: string, keys: (string | undefined)[]): void;
|
|
8
|
+
remove(model: string, keys: (string | undefined)[]): void;
|
|
9
|
+
has(model: string, key: string): boolean | undefined;
|
|
10
|
+
drop(model: string): void;
|
|
11
|
+
clear(): void;
|
|
12
|
+
}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StagedKeys = exports.DEFAULT_KEY_PROPERTY_SEPARATOR = void 0;
|
|
4
|
+
exports.deriveRowKeys = deriveRowKeys;
|
|
5
|
+
exports.DEFAULT_KEY_PROPERTY_SEPARATOR = '::';
|
|
6
|
+
function deriveRowKeys(rows, keyProperty, separator = exports.DEFAULT_KEY_PROPERTY_SEPARATOR) {
|
|
7
|
+
const named = typeof keyProperty === 'string'
|
|
8
|
+
? keyProperty !== '' && keyProperty !== 'key'
|
|
9
|
+
: Array.isArray(keyProperty) && keyProperty.length > 0;
|
|
10
|
+
return rows.map((row) => {
|
|
11
|
+
if (!row || typeof row !== 'object')
|
|
12
|
+
return undefined;
|
|
13
|
+
if (named) {
|
|
14
|
+
if (typeof keyProperty === 'string')
|
|
15
|
+
return String(row[keyProperty]);
|
|
16
|
+
const parts = keyProperty;
|
|
17
|
+
return parts.length === 1 ? String(row[parts[0]]) : parts.map((p) => String(row[p])).join(separator);
|
|
18
|
+
}
|
|
19
|
+
return row.key === undefined || row.key === null ? undefined : String(row.key);
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
class StagedKeys {
|
|
23
|
+
constructor() {
|
|
24
|
+
this.models = new Map();
|
|
25
|
+
}
|
|
26
|
+
entry(model) {
|
|
27
|
+
let e = this.models.get(model);
|
|
28
|
+
if (!e) {
|
|
29
|
+
e = { replaced: false, present: new Set(), removed: new Set() };
|
|
30
|
+
this.models.set(model, e);
|
|
31
|
+
}
|
|
32
|
+
return e;
|
|
33
|
+
}
|
|
34
|
+
set(model, keys) {
|
|
35
|
+
this.models.set(model, { replaced: true, present: new Set(keys.filter(isKey)), removed: new Set() });
|
|
36
|
+
}
|
|
37
|
+
upsert(model, keys) {
|
|
38
|
+
const e = this.entry(model);
|
|
39
|
+
for (const k of keys.filter(isKey)) {
|
|
40
|
+
e.present.add(k);
|
|
41
|
+
e.removed.delete(k);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
remove(model, keys) {
|
|
45
|
+
const e = this.entry(model);
|
|
46
|
+
for (const k of keys.filter(isKey)) {
|
|
47
|
+
e.present.delete(k);
|
|
48
|
+
e.removed.add(k);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
has(model, key) {
|
|
52
|
+
const e = this.models.get(model);
|
|
53
|
+
if (!e)
|
|
54
|
+
return undefined;
|
|
55
|
+
if (e.present.has(key))
|
|
56
|
+
return true;
|
|
57
|
+
if (e.replaced || e.removed.has(key))
|
|
58
|
+
return false;
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
drop(model) {
|
|
62
|
+
this.models.delete(model);
|
|
63
|
+
}
|
|
64
|
+
clear() {
|
|
65
|
+
this.models.clear();
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
exports.StagedKeys = StagedKeys;
|
|
69
|
+
function isKey(k) {
|
|
70
|
+
return typeof k === 'string';
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=staged-keys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"staged-keys.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/staged-keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.configSetCommand = void 0;
|
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const config_helper_1 = require("../../helper/config.helper");
|
|
6
6
|
const io_1 = require("../io");
|
|
7
|
+
const prompt_1 = require("../../helper/prompt");
|
|
7
8
|
const prompts_1 = require("../prompts");
|
|
8
9
|
const renderApiKeyOutput = (apiKey) => {
|
|
9
10
|
if (!apiKey)
|
|
@@ -27,14 +28,13 @@ const configSetCommand = async (options) => {
|
|
|
27
28
|
let apiKey = options.apiKey ?? current.apiKey;
|
|
28
29
|
let consoleApiUrl = options.consoleApiUrl ?? current.consoleApiUrl;
|
|
29
30
|
if (!nonInteractive) {
|
|
30
|
-
const inquirer = await import('inquirer');
|
|
31
31
|
const questions = (0, prompts_1.buildConfigPrompts)(current, {
|
|
32
32
|
projectId: options.projectId !== undefined ? true : undefined,
|
|
33
33
|
apiKey: options.apiKey !== undefined ? true : undefined,
|
|
34
34
|
consoleApiUrl: options.consoleApiUrl !== undefined ? true : undefined,
|
|
35
35
|
});
|
|
36
36
|
if (questions.length > 0) {
|
|
37
|
-
const answers = await
|
|
37
|
+
const answers = await (0, prompt_1.prompt)(questions);
|
|
38
38
|
if (answers.projectId !== undefined)
|
|
39
39
|
projectId = answers.projectId;
|
|
40
40
|
if (answers.apiKey !== undefined && answers.apiKey !== '')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../src/functions/config/commands/set.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,8DAAkG;AAClG,8BAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../src/functions/config/commands/set.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { DistinctQuestion } from 'inquirer';
|
|
2
|
+
export type ConfigAnswers = Partial<Record<'projectId' | 'apiKey' | 'consoleApiUrl', string>>;
|
|
2
3
|
export type CurrentValues = {
|
|
3
4
|
projectId: string;
|
|
4
5
|
apiKey: string;
|
|
5
6
|
consoleApiUrl: string;
|
|
6
7
|
};
|
|
7
|
-
export declare const buildConfigPrompts: (current: CurrentValues, skip: Partial<Record<"projectId" | "apiKey" | "consoleApiUrl", true>>) => DistinctQuestion[];
|
|
8
|
+
export declare const buildConfigPrompts: (current: CurrentValues, skip: Partial<Record<"projectId" | "apiKey" | "consoleApiUrl", true>>) => DistinctQuestion<ConfigAnswers>[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/functions/config/prompts.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/functions/config/prompts.ts"],"names":[],"mappings":";;;AAUA,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAU,EAAE;IAClD,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC;IACtC,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAClC,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAChC,OAAsB,EACtB,IAAqE,EAClC,EAAE;IACrC,MAAM,SAAS,GAAsC,EAAE,CAAC;IAExD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACpB,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,YAAY;YACrB,OAAO,EAAE,OAAO,CAAC,SAAS,IAAI,SAAS;YACvC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC;SACjG,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,IAAI,wBAAwB,CAAC,CAAC,CAAC,SAAS;YACtF,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;gBAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;oBAAE,OAAO,IAAI,CAAC;gBAClD,IAAI,OAAO,CAAC,MAAM;oBAAE,OAAO,IAAI,CAAC;gBAChC,OAAO,oBAAoB,CAAC;YAC9B,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACxB,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,wFAAwF;YACjG,OAAO,EAAE,OAAO,CAAC,aAAa,IAAI,SAAS;SAC5C,CAAC,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAzCW,QAAA,kBAAkB,sBAyC7B"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.pullCommand = pullCommand;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
const crypto_1 = require("crypto");
|
|
6
5
|
const fs_1 = require("fs");
|
|
7
6
|
const path_1 = require("path");
|
|
8
|
-
const
|
|
7
|
+
const prompt_js_1 = require("../../helper/prompt.js");
|
|
9
8
|
const baseline_derive_js_1 = require("../sync/baseline-derive.js");
|
|
10
9
|
const diff_js_1 = require("../sync/diff.js");
|
|
11
10
|
const manifest_js_1 = require("../sync/manifest.js");
|
|
@@ -14,7 +13,7 @@ const state_js_1 = require("../sync/state.js");
|
|
|
14
13
|
const transfer_js_1 = require("../sync/transfer.js");
|
|
15
14
|
const render_js_1 = require("./render.js");
|
|
16
15
|
const defaultConfirmDeletion = async (paths) => {
|
|
17
|
-
const { confirm } = await
|
|
16
|
+
const { confirm } = await (0, prompt_js_1.prompt)([
|
|
18
17
|
{ type: 'confirm', name: 'confirm', message: `Delete ${paths.length} file(s) locally?`, default: false },
|
|
19
18
|
]);
|
|
20
19
|
return confirm;
|