@dcupl/cli 1.4.0-beta.0 → 1.4.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +45 -0
- package/dist/cli.js +136 -18
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/commands/fn/_fn-helpers.d.ts +13 -0
- package/dist/functions/app/commands/fn/_fn-helpers.js +56 -0
- package/dist/functions/app/commands/fn/_fn-helpers.js.map +1 -1
- package/dist/functions/app/commands/fn/aggregate.d.ts +8 -1
- package/dist/functions/app/commands/fn/aggregate.js +29 -3
- package/dist/functions/app/commands/fn/aggregate.js.map +1 -1
- package/dist/functions/app/commands/fn/facets.d.ts +1 -0
- package/dist/functions/app/commands/fn/facets.js +2 -0
- package/dist/functions/app/commands/fn/facets.js.map +1 -1
- package/dist/functions/app/commands/fn/group-by.d.ts +6 -0
- package/dist/functions/app/commands/fn/group-by.js +13 -22
- package/dist/functions/app/commands/fn/group-by.js.map +1 -1
- package/dist/functions/app/commands/fn/pivot.d.ts +14 -0
- package/dist/functions/app/commands/fn/pivot.js +72 -0
- package/dist/functions/app/commands/fn/pivot.js.map +1 -0
- package/dist/functions/app/commands/fn/suggest.d.ts +17 -0
- package/dist/functions/app/commands/fn/suggest.js +34 -0
- package/dist/functions/app/commands/fn/suggest.js.map +1 -0
- package/dist/functions/app/commands/resolve-source.js +13 -5
- package/dist/functions/app/commands/resolve-source.js.map +1 -1
- package/dist/functions/app/commands/validate.js +1 -4
- package/dist/functions/app/commands/validate.js.map +1 -1
- package/dist/functions/app/daemon/controllers/fn.controller.d.ts +8 -0
- package/dist/functions/app/daemon/controllers/fn.controller.js +20 -0
- package/dist/functions/app/daemon/controllers/fn.controller.js.map +1 -1
- package/dist/functions/app/daemon/services/attribute-validation.d.ts +21 -0
- package/dist/functions/app/daemon/services/attribute-validation.js +161 -0
- package/dist/functions/app/daemon/services/attribute-validation.js.map +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +7 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.js +87 -6
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/e2e/port-lock.d.ts +8 -0
- package/dist/functions/app/e2e/port-lock.js +50 -0
- package/dist/functions/app/e2e/port-lock.js.map +1 -1
- package/dist/functions/config/commands/get.d.ts +3 -3
- package/dist/functions/config/commands/get.js +34 -16
- package/dist/functions/config/commands/get.js.map +1 -1
- package/dist/functions/config/commands/set.js +7 -2
- package/dist/functions/config/commands/set.js.map +1 -1
- package/dist/functions/config/io.d.ts +4 -1
- package/dist/functions/config/io.js +43 -8
- package/dist/functions/config/io.js.map +1 -1
- package/dist/functions/files/commands/copy.js +1 -1
- package/dist/functions/files/commands/copy.js.map +1 -1
- package/dist/functions/files/commands/delete.js +1 -1
- package/dist/functions/files/commands/delete.js.map +1 -1
- package/dist/functions/files/commands/list.js +6 -3
- package/dist/functions/files/commands/list.js.map +1 -1
- package/dist/functions/files/commands/move.js +1 -1
- package/dist/functions/files/commands/move.js.map +1 -1
- package/dist/functions/files/commands/pull.d.ts +14 -1
- package/dist/functions/files/commands/pull.js +110 -1
- package/dist/functions/files/commands/pull.js.map +1 -1
- package/dist/functions/files/commands/push.js +5 -3
- package/dist/functions/files/commands/push.js.map +1 -1
- package/dist/functions/files/commands/read.js +1 -1
- package/dist/functions/files/commands/read.js.map +1 -1
- package/dist/functions/files/commands/render.d.ts +29 -0
- package/dist/functions/files/commands/render.js +8 -4
- package/dist/functions/files/commands/render.js.map +1 -1
- package/dist/functions/files/commands/status.js +1 -0
- package/dist/functions/files/commands/status.js.map +1 -1
- package/dist/functions/files/commands/versions/copy.js +1 -1
- package/dist/functions/files/commands/versions/copy.js.map +1 -1
- package/dist/functions/files/commands/versions/delete.js +1 -1
- package/dist/functions/files/commands/versions/delete.js.map +1 -1
- package/dist/functions/files/commands/versions/list.js +4 -0
- package/dist/functions/files/commands/versions/list.js.map +1 -1
- package/dist/functions/files/commands/write.js +1 -1
- package/dist/functions/files/commands/write.js.map +1 -1
- package/dist/functions/files/files-pull.js +10 -7
- package/dist/functions/files/files-pull.js.map +1 -1
- package/dist/functions/files/files-push.js +11 -8
- package/dist/functions/files/files-push.js.map +1 -1
- package/dist/functions/files/test-helpers.d.ts +11 -0
- package/dist/functions/files/test-helpers.js +28 -0
- package/dist/functions/files/test-helpers.js.map +1 -1
- package/dist/functions/generate/files/generate-code.d.ts +1 -1
- package/dist/functions/generate/files/generate-files.d.ts +7 -1
- package/dist/functions/generate/files/generate-files.js +63 -15
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/files/workflow-presets.d.ts +6 -0
- package/dist/functions/generate/files/workflow-presets.js +158 -0
- package/dist/functions/generate/files/workflow-presets.js.map +1 -0
- package/dist/functions/generate/model-from-data/generate-model-from-data.js +4 -3
- package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
- package/dist/functions/generate/model-from-data/infer-to-model.js +5 -1
- package/dist/functions/generate/model-from-data/infer-to-model.js.map +1 -1
- package/dist/functions/generate/projects/generate-project.d.ts +5 -0
- package/dist/functions/generate/projects/generate-project.js +20 -6
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/api-client.js +9 -14
- package/dist/functions/helper/api-client.js.map +1 -1
- package/dist/functions/helper/credentials.helper.d.ts +21 -0
- package/dist/functions/helper/credentials.helper.js +39 -0
- package/dist/functions/helper/credentials.helper.js.map +1 -0
- package/dist/functions/helper/load-env.d.ts +1 -0
- package/dist/functions/helper/load-env.js +10 -0
- package/dist/functions/helper/load-env.js.map +1 -0
- package/dist/functions/helper/output.d.ts +1 -1
- package/dist/functions/helper/output.js +7 -11
- package/dist/functions/helper/output.js.map +1 -1
- package/dist/functions/schemas/examples/AttributeQualityConfig.example.json +10 -0
- package/dist/functions/schemas/examples/ModelDefinition.example.json +21 -2
- package/dist/functions/schemas/examples/ScriptStepConfig.example.json +1 -1
- package/dist/functions/schemas/registry.d.ts +14 -0
- package/dist/functions/schemas/registry.js +40 -0
- package/dist/functions/schemas/registry.js.map +1 -1
- package/dist/functions/schemas/validate.d.ts +22 -0
- package/dist/functions/schemas/validate.js +67 -0
- package/dist/functions/schemas/validate.js.map +1 -0
- package/dist/functions/serve/main.js +6 -5
- package/dist/functions/serve/main.js.map +1 -1
- package/dist/functions/version/command.d.ts +12 -1
- package/dist/functions/version/command.js +54 -1
- package/dist/functions/version/command.js.map +1 -1
- package/dist/functions/workflow/commands/deploy.d.ts +8 -1
- package/dist/functions/workflow/commands/deploy.js +24 -0
- package/dist/functions/workflow/commands/deploy.js.map +1 -1
- package/dist/functions/workflow/commands/run.d.ts +26 -0
- package/dist/functions/workflow/commands/run.js +85 -0
- package/dist/functions/workflow/commands/run.js.map +1 -0
- package/dist/functions/workflow/commands/runners.d.ts +2 -0
- package/dist/functions/workflow/commands/runners.js +10 -1
- package/dist/functions/workflow/commands/runners.js.map +1 -1
- package/dist/functions/workflow/commands/test.d.ts +3 -0
- package/dist/functions/workflow/commands/test.js +8 -64
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/commands/trace.d.ts +4 -2
- package/dist/functions/workflow/commands/trace.js +22 -1
- package/dist/functions/workflow/commands/trace.js.map +1 -1
- package/dist/functions/workflow/commands/validate.js +8 -1
- package/dist/functions/workflow/commands/validate.js.map +1 -1
- package/dist/functions/workflow/run-failure.d.ts +11 -0
- package/dist/functions/workflow/run-failure.js +74 -0
- package/dist/functions/workflow/run-failure.js.map +1 -0
- package/dist/functions/workflow/runner-health.d.ts +16 -0
- package/dist/functions/workflow/runner-health.js +36 -0
- package/dist/functions/workflow/runner-health.js.map +1 -0
- package/dist/functions/workflow/script-lint.d.ts +10 -0
- package/dist/functions/workflow/script-lint.js +488 -0
- package/dist/functions/workflow/script-lint.js.map +1 -0
- package/dist/functions/workflow/template-io.js +1 -1
- package/dist/functions/workflow/template-io.js.map +1 -1
- package/dist/functions/workflow/validate.js +4 -1
- package/dist/functions/workflow/validate.js.map +1 -1
- package/dist/index.js +6 -3
- package/dist/index.js.map +1 -1
- package/files/common/.env.example +4 -0
- package/files/common/_gitignore +3 -1
- package/package.json +35 -37
|
@@ -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,54 @@ 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)?.keyProperty;
|
|
62
|
+
for (const column of Array.isArray(fromModel) ? fromModel : fromModel ? [fromModel] : []) {
|
|
63
|
+
if (typeof column === 'string' && column.length > 0)
|
|
64
|
+
columns.add(column);
|
|
65
|
+
}
|
|
66
|
+
for (const column of this._dataKeyProperties.get(modelKey) ?? [])
|
|
67
|
+
columns.add(column);
|
|
68
|
+
return [...columns];
|
|
69
|
+
}
|
|
70
|
+
attributeContext(modelKey) {
|
|
71
|
+
let knownAttributes;
|
|
72
|
+
try {
|
|
73
|
+
const meta = this.d.fn.metadata({ modelKey });
|
|
74
|
+
knownAttributes = (meta?.attributes ?? [])
|
|
75
|
+
.map((a) => a?.key)
|
|
76
|
+
.filter((k) => typeof k === 'string' && k.length > 0);
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
knownAttributes = [];
|
|
80
|
+
}
|
|
81
|
+
return { model: modelKey, knownAttributes, keyPropertyColumns: this.keyPropertyColumns(modelKey) };
|
|
82
|
+
}
|
|
83
|
+
guardAttributes(modelKey, candidates, run) {
|
|
84
|
+
const needsCheck = candidates.some((c) => typeof c === 'string' && c.length > 0);
|
|
85
|
+
if (needsCheck)
|
|
86
|
+
(0, attribute_validation_js_1.assertKnownAttributes)(candidates, this.attributeContext(modelKey));
|
|
87
|
+
try {
|
|
88
|
+
return run();
|
|
89
|
+
}
|
|
90
|
+
catch (err) {
|
|
91
|
+
if ((0, attribute_validation_js_1.isSdkAttributeNotFound)(err))
|
|
92
|
+
throw (0, attribute_validation_js_1.toAttributeNotFound)(candidates, this.attributeContext(modelKey));
|
|
93
|
+
throw err;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
45
96
|
touch() {
|
|
46
97
|
this._lastActivity = Date.now();
|
|
47
98
|
}
|
|
@@ -76,6 +127,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
76
127
|
this.d.models.remove(key);
|
|
77
128
|
this._dirty = true;
|
|
78
129
|
this._initializedModels.delete(key);
|
|
130
|
+
this._dataKeyProperties.delete(key);
|
|
79
131
|
}
|
|
80
132
|
assertRegisteredOrAutoGen(model, override) {
|
|
81
133
|
if (this.d.models.get(model))
|
|
@@ -103,6 +155,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
103
155
|
dataUpdate(data, options) {
|
|
104
156
|
this.touch();
|
|
105
157
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
158
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
106
159
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
107
160
|
this.d.data.apply({
|
|
108
161
|
type: 'update',
|
|
@@ -117,6 +170,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
117
170
|
dataUpsert(data, options) {
|
|
118
171
|
this.touch();
|
|
119
172
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
173
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
120
174
|
const { useSetType, autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
121
175
|
this.d.data.apply({
|
|
122
176
|
type: useSetType ? 'set' : 'upsert',
|
|
@@ -131,6 +185,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
131
185
|
dataSet(data, options) {
|
|
132
186
|
this.touch();
|
|
133
187
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
188
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
134
189
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
135
190
|
this.d.data.apply({
|
|
136
191
|
type: 'set',
|
|
@@ -145,6 +200,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
145
200
|
dataRemove(data, options) {
|
|
146
201
|
this.touch();
|
|
147
202
|
this.requireModel(options.model);
|
|
203
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
148
204
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
149
205
|
this.d.data.apply({
|
|
150
206
|
type: 'remove',
|
|
@@ -177,30 +233,54 @@ let DcuplHostService = class DcuplHostService {
|
|
|
177
233
|
this.requireModel(options.modelKey);
|
|
178
234
|
const { query, ...rest } = options;
|
|
179
235
|
const q = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, query);
|
|
180
|
-
|
|
236
|
+
const candidates = [
|
|
237
|
+
...(0, attribute_validation_js_1.collectQueryAttributes)(q?.queries),
|
|
238
|
+
...(0, attribute_validation_js_1.collectSortAttributes)(options.sort),
|
|
239
|
+
...(0, attribute_validation_js_1.collectProjectionAttributes)(options.projection),
|
|
240
|
+
];
|
|
241
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.query.execute(q ? { ...rest, groupKey: q.groupKey, groupType: q.groupType, queries: q.queries } : rest));
|
|
181
242
|
}
|
|
182
243
|
fnFacets(options) {
|
|
183
244
|
this.touch();
|
|
184
245
|
this.requireModel(options.modelKey);
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
246
|
+
const query = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query);
|
|
247
|
+
const candidates = [options?.options?.attribute, ...(0, attribute_validation_js_1.collectQueryAttributes)(query?.queries)];
|
|
248
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.fn
|
|
249
|
+
.facets({ ...options, query })
|
|
250
|
+
.map((facet) => ({ ...facet, count: facet.size })));
|
|
188
251
|
}
|
|
189
252
|
fnAggregate(options) {
|
|
190
253
|
this.touch();
|
|
191
254
|
this.requireModel(options.modelKey);
|
|
192
|
-
|
|
255
|
+
const query = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query);
|
|
256
|
+
const candidates = [options?.options?.attribute, ...(0, attribute_validation_js_1.collectQueryAttributes)(query?.queries)];
|
|
257
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.fn.aggregate({ ...options, query }));
|
|
193
258
|
}
|
|
194
259
|
fnGroupBy(options) {
|
|
195
260
|
this.touch();
|
|
196
261
|
this.requireModel(options.modelKey);
|
|
197
|
-
|
|
262
|
+
const query = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query);
|
|
263
|
+
const aggregateAttributes = Array.isArray(options?.options?.aggregates)
|
|
264
|
+
? options.options.aggregates.map((a) => a?.attribute)
|
|
265
|
+
: [];
|
|
266
|
+
const candidates = [options?.options?.attribute, ...aggregateAttributes, ...(0, attribute_validation_js_1.collectQueryAttributes)(query?.queries)];
|
|
267
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.fn.groupBy({ ...options, query }));
|
|
198
268
|
}
|
|
199
269
|
fnMetadata(options) {
|
|
200
270
|
this.touch();
|
|
201
271
|
this.requireModel(options.modelKey);
|
|
202
272
|
return this.d.fn.metadata({ ...options, query: (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query) });
|
|
203
273
|
}
|
|
274
|
+
fnPivot(options) {
|
|
275
|
+
this.touch();
|
|
276
|
+
this.requireModel(options.modelKey);
|
|
277
|
+
return this.d.fn.pivot({ ...options, query: (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query) });
|
|
278
|
+
}
|
|
279
|
+
fnSuggest(options) {
|
|
280
|
+
this.touch();
|
|
281
|
+
this.requireModel(options.modelKey);
|
|
282
|
+
return this.d.fn.suggest({ ...options, query: (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query) });
|
|
283
|
+
}
|
|
204
284
|
summary() {
|
|
205
285
|
this.touch();
|
|
206
286
|
const keys = this.d.models.keys();
|
|
@@ -234,6 +314,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
234
314
|
this.dcupl?.destroy();
|
|
235
315
|
this.dcupl = undefined;
|
|
236
316
|
this._initializedModels.clear();
|
|
317
|
+
this._dataKeyProperties.clear();
|
|
237
318
|
}
|
|
238
319
|
attachLoader(loader, key) {
|
|
239
320
|
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,2 +1,10 @@
|
|
|
1
|
+
export declare const DEFAULT_E2E_PORT = 8083;
|
|
2
|
+
export interface PortLockSession {
|
|
3
|
+
port: number;
|
|
4
|
+
externalHolder: boolean;
|
|
5
|
+
}
|
|
6
|
+
export declare function isPortTaken(port: number): Promise<boolean>;
|
|
7
|
+
export declare function pickFreePort(): Promise<number>;
|
|
1
8
|
export declare function acquirePortLock(timeoutMs?: number): Promise<void>;
|
|
9
|
+
export declare function acquirePortLockSession(timeoutMs?: number): Promise<PortLockSession>;
|
|
2
10
|
export declare function releasePortLock(): void;
|
|
@@ -1,11 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_E2E_PORT = void 0;
|
|
4
|
+
exports.isPortTaken = isPortTaken;
|
|
5
|
+
exports.pickFreePort = pickFreePort;
|
|
3
6
|
exports.acquirePortLock = acquirePortLock;
|
|
7
|
+
exports.acquirePortLockSession = acquirePortLockSession;
|
|
4
8
|
exports.releasePortLock = releasePortLock;
|
|
5
9
|
const fs_extra_1 = require("fs-extra");
|
|
10
|
+
const net_1 = require("net");
|
|
6
11
|
const os_1 = require("os");
|
|
7
12
|
const path_1 = require("path");
|
|
8
13
|
const LOCK_PATH = (0, path_1.join)((0, os_1.tmpdir)(), 'dcupl-e2e-port-8083.lock');
|
|
14
|
+
exports.DEFAULT_E2E_PORT = 8083;
|
|
15
|
+
const TEARDOWN_GRACE_MS = 5_000;
|
|
9
16
|
function isPidAlive(pid) {
|
|
10
17
|
try {
|
|
11
18
|
process.kill(pid, 0);
|
|
@@ -15,6 +22,35 @@ function isPidAlive(pid) {
|
|
|
15
22
|
return err.code === 'EPERM';
|
|
16
23
|
}
|
|
17
24
|
}
|
|
25
|
+
function isPortTaken(port) {
|
|
26
|
+
return new Promise((resolveP) => {
|
|
27
|
+
const socket = (0, net_1.createConnection)({ host: '127.0.0.1', port });
|
|
28
|
+
const cleanup = () => { try {
|
|
29
|
+
socket.destroy();
|
|
30
|
+
}
|
|
31
|
+
catch { } };
|
|
32
|
+
socket.setTimeout(500);
|
|
33
|
+
socket.once('connect', () => { cleanup(); resolveP(true); });
|
|
34
|
+
socket.once('error', () => { cleanup(); resolveP(false); });
|
|
35
|
+
socket.once('timeout', () => { cleanup(); resolveP(false); });
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
function pickFreePort() {
|
|
39
|
+
return new Promise((resolveP, rejectP) => {
|
|
40
|
+
const srv = (0, net_1.createServer)();
|
|
41
|
+
srv.on('error', rejectP);
|
|
42
|
+
srv.listen(0, '127.0.0.1', () => {
|
|
43
|
+
const addr = srv.address();
|
|
44
|
+
if (!addr || typeof addr === 'string') {
|
|
45
|
+
srv.close();
|
|
46
|
+
rejectP(new Error('no port'));
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
const p = addr.port;
|
|
50
|
+
srv.close(() => resolveP(p));
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
}
|
|
18
54
|
async function acquirePortLock(timeoutMs = 120_000) {
|
|
19
55
|
const deadline = Date.now() + timeoutMs;
|
|
20
56
|
while (Date.now() < deadline) {
|
|
@@ -40,6 +76,20 @@ async function acquirePortLock(timeoutMs = 120_000) {
|
|
|
40
76
|
}
|
|
41
77
|
throw new Error(`acquirePortLock: could not acquire ${LOCK_PATH} within ${timeoutMs}ms`);
|
|
42
78
|
}
|
|
79
|
+
async function acquirePortLockSession(timeoutMs = 180_000) {
|
|
80
|
+
await acquirePortLock(timeoutMs);
|
|
81
|
+
const graceDeadline = Date.now() + TEARDOWN_GRACE_MS;
|
|
82
|
+
while (await isPortTaken(exports.DEFAULT_E2E_PORT)) {
|
|
83
|
+
if (Date.now() >= graceDeadline) {
|
|
84
|
+
const port = await pickFreePort();
|
|
85
|
+
console.warn(`[e2e port-lock] port ${exports.DEFAULT_E2E_PORT} is held by a process outside this test run ` +
|
|
86
|
+
`(e.g. a dcupl serve from another session); running this suite on free port ${port} instead.`);
|
|
87
|
+
return { port, externalHolder: true };
|
|
88
|
+
}
|
|
89
|
+
await new Promise((r) => setTimeout(r, 250));
|
|
90
|
+
}
|
|
91
|
+
return { port: exports.DEFAULT_E2E_PORT, externalHolder: false };
|
|
92
|
+
}
|
|
43
93
|
function releasePortLock() {
|
|
44
94
|
if (!(0, fs_extra_1.existsSync)(LOCK_PATH))
|
|
45
95
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port-lock.js","sourceRoot":"","sources":["../../../../src/functions/app/e2e/port-lock.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"port-lock.js","sourceRoot":"","sources":["../../../../src/functions/app/e2e/port-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ResolvedCredentials } from '../../helper/credentials.helper';
|
|
2
2
|
export type ConfigGetOptions = {
|
|
3
3
|
showSecrets?: boolean;
|
|
4
4
|
json?: boolean;
|
|
5
5
|
};
|
|
6
6
|
type ConfigSummary = {
|
|
7
|
-
projectId: string;
|
|
7
|
+
projectId: string | undefined;
|
|
8
8
|
consoleApiUrl: string | undefined;
|
|
9
9
|
} | null;
|
|
10
|
-
export declare const renderConfigSummary: (config: ConfigSummary,
|
|
10
|
+
export declare const renderConfigSummary: (config: ConfigSummary, creds: ResolvedCredentials, opts: {
|
|
11
11
|
showSecrets: boolean;
|
|
12
12
|
}) => string;
|
|
13
13
|
export declare const configGetCommand: (options: ConfigGetOptions) => Promise<void>;
|
|
@@ -2,23 +2,36 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configGetCommand = exports.renderConfigSummary = void 0;
|
|
4
4
|
const config_helper_1 = require("../../helper/config.helper");
|
|
5
|
-
const
|
|
6
|
-
|
|
5
|
+
const credentials_helper_1 = require("../../helper/credentials.helper");
|
|
6
|
+
const maskApiKey = (cred, showSecrets) => {
|
|
7
|
+
if (!cred.value)
|
|
7
8
|
return '(unset)';
|
|
8
9
|
if (showSecrets)
|
|
9
|
-
return
|
|
10
|
-
if (
|
|
10
|
+
return cred.value;
|
|
11
|
+
if (cred.value.length <= 4)
|
|
11
12
|
return '****';
|
|
12
|
-
return `***${
|
|
13
|
+
return `***${cred.value.slice(-4)}`;
|
|
13
14
|
};
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
const sourceLabel = (source, fileName) => {
|
|
16
|
+
switch (source) {
|
|
17
|
+
case 'env':
|
|
18
|
+
return 'env';
|
|
19
|
+
case 'flag':
|
|
20
|
+
return 'flag';
|
|
21
|
+
case 'file':
|
|
22
|
+
return fileName;
|
|
23
|
+
default:
|
|
24
|
+
return '—';
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
const renderConfigSummary = (config, creds, opts) => {
|
|
28
|
+
const projectId = creds.projectId.value || '(unset)';
|
|
29
|
+
const apiKey = maskApiKey(creds.apiKey, opts.showSecrets);
|
|
17
30
|
const consoleApiUrl = config?.consoleApiUrl || '(default)';
|
|
18
|
-
const projectIdSource =
|
|
19
|
-
const apiKeySource =
|
|
31
|
+
const projectIdSource = sourceLabel(creds.projectId.source, config_helper_1.CLI_DEFAULTS.configFileName);
|
|
32
|
+
const apiKeySource = sourceLabel(creds.apiKey.source, config_helper_1.CLI_DEFAULTS.secretsFileName);
|
|
20
33
|
const consoleApiUrlSource = config?.consoleApiUrl ? config_helper_1.CLI_DEFAULTS.configFileName : '—';
|
|
21
|
-
const pad = (s, n) => s.length >= n ? s : s + ' '.repeat(n - s.length);
|
|
34
|
+
const pad = (s, n) => (s.length >= n ? s : s + ' '.repeat(n - s.length));
|
|
22
35
|
return [
|
|
23
36
|
`${pad('projectId:', 16)}${pad(projectId, 32)}(${projectIdSource})`,
|
|
24
37
|
`${pad('apiKey:', 16)}${pad(apiKey, 32)}(${apiKeySource})`,
|
|
@@ -29,18 +42,23 @@ exports.renderConfigSummary = renderConfigSummary;
|
|
|
29
42
|
const configGetCommand = async (options) => {
|
|
30
43
|
const cwd = process.cwd();
|
|
31
44
|
const config = (0, config_helper_1.getConfigFileValue)(cwd, undefined, { quiet: true });
|
|
32
|
-
const
|
|
45
|
+
const creds = {
|
|
46
|
+
apiKey: (0, credentials_helper_1.resolveApiKey)(cwd),
|
|
47
|
+
projectId: (0, credentials_helper_1.resolveProjectId)(cwd),
|
|
48
|
+
};
|
|
33
49
|
const summary = config ? { projectId: config.projectId, consoleApiUrl: config.consoleApiUrl } : null;
|
|
34
50
|
if (options.json === true) {
|
|
35
51
|
process.stdout.write(JSON.stringify({
|
|
36
|
-
projectId:
|
|
52
|
+
projectId: creds.projectId.value ?? null,
|
|
53
|
+
projectIdSource: creds.projectId.source ?? null,
|
|
37
54
|
consoleApiUrl: summary?.consoleApiUrl ?? null,
|
|
38
|
-
apiKey:
|
|
39
|
-
apiKeySet:
|
|
55
|
+
apiKey: maskApiKey(creds.apiKey, options.showSecrets === true),
|
|
56
|
+
apiKeySet: creds.apiKey.value !== undefined,
|
|
57
|
+
apiKeySource: creds.apiKey.source ?? null,
|
|
40
58
|
}) + '\n');
|
|
41
59
|
return;
|
|
42
60
|
}
|
|
43
|
-
console.log((0, exports.renderConfigSummary)(summary,
|
|
61
|
+
console.log((0, exports.renderConfigSummary)(summary, creds, { showSecrets: options.showSecrets === true }));
|
|
44
62
|
};
|
|
45
63
|
exports.configGetCommand = configGetCommand;
|
|
46
64
|
//# sourceMappingURL=get.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/functions/config/commands/get.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/functions/config/commands/get.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,9 +54,14 @@ const configSetCommand = async (options) => {
|
|
|
54
54
|
apiKey: apiKey.trim(),
|
|
55
55
|
consoleApiUrl: consoleApiUrl?.trim() || undefined,
|
|
56
56
|
};
|
|
57
|
-
(0, io_1.writeConfigAndSecrets)(cwd, patch);
|
|
57
|
+
const { secretTarget } = (0, io_1.writeConfigAndSecrets)(cwd, patch);
|
|
58
58
|
console.log(`Wrote ${config_helper_1.CLI_DEFAULTS.configFileName} (${(0, path_1.join)(cwd, config_helper_1.CLI_DEFAULTS.configFileName)})`);
|
|
59
|
-
|
|
59
|
+
if (secretTarget === 'secrets-file') {
|
|
60
|
+
console.log(`Wrote ${config_helper_1.CLI_DEFAULTS.secretsFileName} (${(0, path_1.join)(cwd, config_helper_1.CLI_DEFAULTS.secretsFileName)})`);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
console.log(`Wrote .env (${(0, path_1.join)(cwd, '.env')}) — DCUPL_API_KEY`);
|
|
64
|
+
}
|
|
60
65
|
console.log('');
|
|
61
66
|
console.log(`projectId: ${patch.projectId}`);
|
|
62
67
|
console.log(`apiKey: ${renderApiKeyOutput(patch.apiKey)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../src/functions/config/commands/set.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,8DAIoC;AACpC,8BAA2D;AAC3D,wCAA+D;AAS/D,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAU,EAAE;IACpD,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,gBAAgB,GAAG,KAAK,EAAE,OAAyB,EAAiB,EAAE;IACjF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,cAAc,GAAG,IAAA,kCAAkB,EAAC,GAAG,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,MAAM,YAAY,GAAG,IAAA,kCAAkB,EAAC,GAAG,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAkB;QAC7B,SAAS,EAAE,cAAc,EAAE,SAAS,IAAI,EAAE;QAC1C,MAAM,EAAE,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QAC7D,aAAa,EAAE,cAAc,EAAE,aAAa,IAAI,EAAE;KACnD,CAAC;IAEF,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC;IAC3C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC;IAEtD,IAAI,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC;IACvD,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAC9C,IAAI,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAEnE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,OAAO,EAAE;YAC5C,SAAS,EAAE,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YAC7D,MAAM,EAAE,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YACvD,aAAa,EAAE,OAAO,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;SACtE,CAAC,CAAC;QAEH,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACzD,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS;gBAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YACnE,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE;gBAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YACnF,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS;gBAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QACjF,CAAC;IACH,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IACxF,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,KAAK,GAAgB;QACzB,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE;QAC3B,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;QACrB,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,SAAS;KAClD,CAAC;IAEF,IAAA,0BAAqB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"set.js","sourceRoot":"","sources":["../../../../src/functions/config/commands/set.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,7 @@ export type ConfigPatch = {
|
|
|
3
3
|
apiKey: string;
|
|
4
4
|
consoleApiUrl: string | undefined;
|
|
5
5
|
};
|
|
6
|
-
export
|
|
6
|
+
export type SecretTarget = 'secrets-file' | 'env-file';
|
|
7
|
+
export declare const writeConfigAndSecrets: (basePath: string, patch: ConfigPatch) => {
|
|
8
|
+
secretTarget: SecretTarget;
|
|
9
|
+
};
|
|
@@ -7,7 +7,7 @@ const comment_json_1 = require("comment-json");
|
|
|
7
7
|
const config_helper_1 = require("../helper/config.helper");
|
|
8
8
|
const writeConfigAndSecrets = (basePath, patch) => {
|
|
9
9
|
writeConfig(basePath, patch);
|
|
10
|
-
|
|
10
|
+
return { secretTarget: writeSecret(basePath, patch.apiKey) };
|
|
11
11
|
};
|
|
12
12
|
exports.writeConfigAndSecrets = writeConfigAndSecrets;
|
|
13
13
|
const writeConfig = (basePath, patch) => {
|
|
@@ -24,12 +24,47 @@ const writeConfig = (basePath, patch) => {
|
|
|
24
24
|
}
|
|
25
25
|
(0, fs_extra_1.writeFileSync)(path, (0, comment_json_1.stringify)(merged, null, 2), { encoding: 'utf-8' });
|
|
26
26
|
};
|
|
27
|
-
const
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
27
|
+
const writeSecret = (basePath, apiKey) => {
|
|
28
|
+
const secretsPath = (0, path_1.join)(basePath, config_helper_1.CLI_DEFAULTS.secretsFileName);
|
|
29
|
+
if ((0, fs_extra_1.existsSync)(secretsPath)) {
|
|
30
|
+
const existing = JSON.parse((0, fs_extra_1.readFileSync)(secretsPath, 'utf-8'));
|
|
31
|
+
(0, fs_extra_1.writeFileSync)(secretsPath, JSON.stringify({ ...existing, apiKey }, null, 2), { encoding: 'utf-8' });
|
|
32
|
+
return 'secrets-file';
|
|
33
|
+
}
|
|
34
|
+
upsertEnvVar((0, path_1.join)(basePath, '.env'), 'DCUPL_API_KEY', apiKey);
|
|
35
|
+
ensureGitignored(basePath, '.env');
|
|
36
|
+
return 'env-file';
|
|
37
|
+
};
|
|
38
|
+
const upsertEnvVar = (filePath, key, value) => {
|
|
39
|
+
const line = `${key}=${value}`;
|
|
40
|
+
if (!(0, fs_extra_1.existsSync)(filePath)) {
|
|
41
|
+
(0, fs_extra_1.writeFileSync)(filePath, `${line}\n`, { encoding: 'utf-8' });
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
const lines = (0, fs_extra_1.readFileSync)(filePath, 'utf-8').split('\n');
|
|
45
|
+
const idx = lines.findIndex((l) => l.startsWith(`${key}=`));
|
|
46
|
+
if (idx >= 0) {
|
|
47
|
+
lines[idx] = line;
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
if (lines.length > 0 && lines[lines.length - 1] === '')
|
|
51
|
+
lines.splice(lines.length - 1, 1);
|
|
52
|
+
lines.push(line, '');
|
|
53
|
+
}
|
|
54
|
+
(0, fs_extra_1.writeFileSync)(filePath, lines.join('\n'), { encoding: 'utf-8' });
|
|
55
|
+
};
|
|
56
|
+
const ensureGitignored = (basePath, entry) => {
|
|
57
|
+
const gitignorePath = (0, path_1.join)(basePath, '.gitignore');
|
|
58
|
+
if (!(0, fs_extra_1.existsSync)(gitignorePath)) {
|
|
59
|
+
(0, fs_extra_1.writeFileSync)(gitignorePath, `${entry}\n`, { encoding: 'utf-8' });
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
const lines = (0, fs_extra_1.readFileSync)(gitignorePath, 'utf-8').split('\n');
|
|
63
|
+
if (lines.some((l) => l.trim() === entry))
|
|
64
|
+
return;
|
|
65
|
+
if (lines.length > 0 && lines[lines.length - 1] === '')
|
|
66
|
+
lines.splice(lines.length - 1, 1);
|
|
67
|
+
lines.push(entry, '');
|
|
68
|
+
(0, fs_extra_1.writeFileSync)(gitignorePath, lines.join('\n'), { encoding: 'utf-8' });
|
|
34
69
|
};
|
|
35
70
|
//# sourceMappingURL=io.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../src/functions/config/io.ts"],"names":[],"mappings":";;;AAAA,uCAAmE;AACnE,+BAA4B;AAC5B,+CAAgD;AAChD,2DAGiC;
|
|
1
|
+
{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../src/functions/config/io.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ async function copyFileCommand(client, output, options) {
|
|
|
15
15
|
const version = (0, resolve_version_js_1.resolveVersion)({ versionArg: options.version, workspaceRoot: options.workspaceRoot });
|
|
16
16
|
const req = buildCopyFileRequest({ projectId: client.projectId, from: options.from, to: options.to, version });
|
|
17
17
|
await client.request(req.method, req.path, { data: req.data });
|
|
18
|
-
const view = { from: options.from, to: options.to, version };
|
|
18
|
+
const view = { success: true, from: options.from, to: options.to, version };
|
|
19
19
|
output.success(view, (v) => (0, render_js_1.renderCopy)(v, 'done'));
|
|
20
20
|
}
|
|
21
21
|
//# sourceMappingURL=copy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../../../src/functions/files/commands/copy.ts"],"names":[],"mappings":";;AAYA,oDAUC;AAED,0CAUC;AAhCD,qEAA8D;AAC9D,2CAAwD;AASxD,SAAgB,oBAAoB,CAAC,OAAwB;IAK3D,OAAO;QACL,MAAM,EAAE,MAAe;QACvB,IAAI,EAAE,aAAa,OAAO,CAAC,SAAS,mBAAmB,OAAO,CAAC,OAAO,OAAO;QAC7E,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE;KAC7C,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,MAAiB,EACjB,MAAc,EACd,OAA+E;IAE/E,MAAM,OAAO,GAAG,IAAA,mCAAc,EAAC,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IACtG,MAAM,GAAG,GAAG,oBAAoB,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/G,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAa,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../../../src/functions/files/commands/copy.ts"],"names":[],"mappings":";;AAYA,oDAUC;AAED,0CAUC;AAhCD,qEAA8D;AAC9D,2CAAwD;AASxD,SAAgB,oBAAoB,CAAC,OAAwB;IAK3D,OAAO;QACL,MAAM,EAAE,MAAe;QACvB,IAAI,EAAE,aAAa,OAAO,CAAC,SAAS,mBAAmB,OAAO,CAAC,OAAO,OAAO;QAC7E,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE;KAC7C,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,MAAiB,EACjB,MAAc,EACd,OAA+E;IAE/E,MAAM,OAAO,GAAG,IAAA,mCAAc,EAAC,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IACtG,MAAM,GAAG,GAAG,oBAAoB,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/G,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,IAAI,GAAa,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC;IACtF,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,sBAAU,EAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AACrD,CAAC"}
|
|
@@ -14,7 +14,7 @@ function buildDeleteFileRequest(options) {
|
|
|
14
14
|
}
|
|
15
15
|
async function deleteFileCommand(client, output, options) {
|
|
16
16
|
const version = (0, resolve_version_js_1.resolveVersion)({ versionArg: options.version, workspaceRoot: options.workspaceRoot });
|
|
17
|
-
const view = { path: options.path, version };
|
|
17
|
+
const view = { success: true, path: options.path, version };
|
|
18
18
|
if (options.dryRun) {
|
|
19
19
|
output.success(view, (v) => (0, render_js_1.renderDelete)(v, 'dry-run'));
|
|
20
20
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/functions/files/commands/delete.ts"],"names":[],"mappings":";;AAYA,wDAUC;AAED,8CAgCC;AAtDD,qEAA8D;AAC9D,qDAA0D;AAC1D,2CAA4D;AAQ5D,SAAgB,sBAAsB,CAAC,OAA0B;IAK/D,OAAO;QACL,MAAM,EAAE,MAAe;QACvB,IAAI,EAAE,aAAa,OAAO,CAAC,SAAS,mBAAmB,OAAO,CAAC,OAAO,SAAS;QAC/E,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;KAC7B,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,iBAAiB,CACrC,MAAiB,EACjB,MAAc,EACd,OAAkG;IAElG,MAAM,OAAO,GAAG,IAAA,mCAAc,EAAC,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IACtG,MAAM,IAAI,GAAe,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/functions/files/commands/delete.ts"],"names":[],"mappings":";;AAYA,wDAUC;AAED,8CAgCC;AAtDD,qEAA8D;AAC9D,qDAA0D;AAC1D,2CAA4D;AAQ5D,SAAgB,sBAAsB,CAAC,OAA0B;IAK/D,OAAO;QACL,MAAM,EAAE,MAAe;QACvB,IAAI,EAAE,aAAa,OAAO,CAAC,SAAS,mBAAmB,OAAO,CAAC,OAAO,SAAS;QAC/E,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;KAC7B,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,iBAAiB,CACrC,MAAiB,EACjB,MAAc,EACd,OAAkG;IAElG,MAAM,OAAO,GAAG,IAAA,mCAAc,EAAC,EAAE,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IACtG,MAAM,IAAI,GAAe,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;IAExE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,wBAAY,EAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;QACxD,OAAO;IACT,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,kDAAkD,EAAE,qBAAqB,CAAC,CAAC;QACxF,OAAO;IACT,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACjB,MAAM,QAAQ,GAAG,MAAM,IAAA,+BAAkB,EACvC,UAAU,OAAO,CAAC,IAAI,iBAAiB,OAAO,GAAG,EACjD,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CACrB,CAAC;QACF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;YAC3C,OAAO;QACT,CAAC;IACH,CAAC;IAED,MAAM,GAAG,GAAG,sBAAsB,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACjG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,wBAAY,EAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AACvD,CAAC"}
|