@adminide-stack/core 7.0.3-alpha.10 → 7.0.3-alpha.25
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/lib/constants/routes.js +2 -2
- package/lib/constants/routes.js.map +1 -1
- package/lib/constants/types.js +13 -13
- package/lib/constants/types.js.map +1 -1
- package/lib/constants/urls.d.ts +11 -0
- package/lib/constants/urls.js +13 -1
- package/lib/constants/urls.js.map +1 -1
- package/lib/core/configurations/configuration.js +444 -546
- package/lib/core/configurations/configuration.js.map +1 -1
- package/lib/core/configurations/events/ConfigurationChangeEvent.js +49 -52
- package/lib/core/configurations/events/ConfigurationChangeEvent.js.map +1 -1
- package/lib/core/configurations/helpers/configuration.js +149 -138
- package/lib/core/configurations/helpers/configuration.js.map +1 -1
- package/lib/core/configurations/models/ConfigurationModel.js +190 -186
- package/lib/core/configurations/models/ConfigurationModel.js.map +1 -1
- package/lib/core/disposable.js +67 -66
- package/lib/core/disposable.js.map +1 -1
- package/lib/core/event.js +235 -239
- package/lib/core/event.js.map +1 -1
- package/lib/core/organization/configuration.js +15 -15
- package/lib/core/organization/configuration.js.map +1 -1
- package/lib/core/organization/helpers/organization-helpers.js +14 -7
- package/lib/core/organization/helpers/organization-helpers.js.map +1 -1
- package/lib/core/organization/organization.js +113 -132
- package/lib/core/organization/organization.js.map +1 -1
- package/lib/core/path.js +158 -154
- package/lib/core/path.js.map +1 -1
- package/lib/enums/connection-status.js +4 -4
- package/lib/enums/connection-status.js.map +1 -1
- package/lib/enums/integration-configuration-status.js +3 -3
- package/lib/enums/integration-configuration-status.js.map +1 -1
- package/lib/enums/integrations-configuration-steps.js +6 -6
- package/lib/enums/integrations-configuration-steps.js.map +1 -1
- package/lib/enums/integrations-connection-names.js +10 -10
- package/lib/enums/integrations-connection-names.js.map +1 -1
- package/lib/enums/integrations.js +8 -8
- package/lib/enums/integrations.js.map +1 -1
- package/lib/enums/permissions.js +5 -5
- package/lib/enums/permissions.js.map +1 -1
- package/lib/enums/team-member-status.js +2 -2
- package/lib/enums/team-member-status.js.map +1 -1
- package/lib/errors/auth-error-messages.js +22 -22
- package/lib/errors/auth-error-messages.js.map +1 -1
- package/lib/errors/auth-error.js +5 -9
- package/lib/errors/auth-error.js.map +1 -1
- package/lib/index.js +1 -1
- package/lib/interfaces/configuration/configuration.js +30 -30
- package/lib/interfaces/configuration/configuration.js.map +1 -1
- package/lib/interfaces/generated/generated-models.js +919 -15741
- package/lib/interfaces/generated/generated-models.js.map +1 -1
- package/lib/interfaces/organization/organization-context.js +17 -12
- package/lib/interfaces/organization/organization-context.js.map +1 -1
- package/lib/modules/account-api/enums/index.js +64 -64
- package/lib/modules/account-api/enums/index.js.map +1 -1
- package/lib/modules/billing-api/enums/index.js +18 -18
- package/lib/modules/billing-api/enums/index.js.map +1 -1
- package/lib/modules/inbox/enums/index.js +23 -23
- package/lib/modules/inbox/enums/index.js.map +1 -1
- package/lib/services/abstract-configuration.js +116 -113
- package/lib/services/abstract-configuration.js.map +1 -1
- package/lib/services/abstract-organization-context-service.js +93 -97
- package/lib/services/abstract-organization-context-service.js.map +1 -1
- package/lib/utils/configuration-utils.js +8 -8
- package/lib/utils/configuration-utils.js.map +1 -1
- package/lib/utils/date-utils.js +2 -2
- package/lib/utils/date-utils.js.map +1 -1
- package/lib/utils/flatten-utils.js +39 -35
- package/lib/utils/flatten-utils.js.map +1 -1
- package/lib/utils/generate-uri.js +15 -25
- package/lib/utils/generate-uri.js.map +1 -1
- package/lib/utils/generated-settings-id.js +4 -4
- package/lib/utils/generated-settings-id.js.map +1 -1
- package/lib/utils/omit-deep.js +7 -7
- package/lib/utils/omit-deep.js.map +1 -1
- package/lib/utils/roles-utils.js +2 -6
- package/lib/utils/roles-utils.js.map +1 -1
- package/lib/utils/uri.js +12 -10
- package/lib/utils/uri.js.map +1 -1
- package/lib/utils/utils.js +14 -19
- package/lib/utils/utils.js.map +1 -1
- package/lib/utils/validations.js +2 -2
- package/lib/utils/validations.js.map +1 -1
- package/package.json +2 -2
@@ -1,4 +1,4 @@
|
|
1
|
-
import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri
|
1
|
+
import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri';import {ResourceMap}from'@vscode-alt/monaco-editor/esm/vs/base/common/map';import*as types from'@vscode-alt/monaco-editor/esm/vs/base/common/types';import*as objects from'@vscode-alt/monaco-editor/esm/vs/base/common/objects';import*as arrays from'@vscode-alt/monaco-editor/esm/vs/base/common/arrays';import {ConfigurationModel}from'./models/ConfigurationModel.js';import {getConfigurationValue}from'./helpers/configuration.js';import {OVERRIDE_PROPERTY_PATTERN,OVERRIDE_IDENTIFIER_PATTERN}from'../../constants/configuration.js';import'../../constants/types.js';import'../../constants/urls.js';import'../../constants/routes.js';/**
|
2
2
|
* Configuration that merges all the hierarchial configuration model.
|
3
3
|
*
|
4
4
|
* We using `IOrganizationContext` rather than `OrganizationContext` for abstraction.
|
@@ -7,560 +7,458 @@ import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {Re
|
|
7
7
|
* 09/18/2021: We converted `localUser` -> `application`; `remoteUser` => `machine`
|
8
8
|
*/
|
9
9
|
class Configuration {
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
const keys = [...added, ...updated, ...removed];
|
227
|
-
if (keys.length) {
|
228
|
-
this.updateApplicationConfiguration(application);
|
229
|
-
}
|
230
|
-
return {
|
231
|
-
keys,
|
232
|
-
overrides
|
233
|
-
};
|
234
|
-
}
|
235
|
-
compareAndUpdateUserConfiguration(user) {
|
236
|
-
const {
|
237
|
-
added,
|
238
|
-
updated,
|
239
|
-
removed,
|
240
|
-
overrides
|
241
|
-
} = compare(this.userConfiguration, user);
|
242
|
-
const keys = [...added, ...updated, ...removed];
|
243
|
-
if (keys.length) {
|
244
|
-
this.updateUserConfiguration(user);
|
245
|
-
}
|
246
|
-
return {
|
247
|
-
keys,
|
248
|
-
overrides
|
249
|
-
};
|
250
|
-
}
|
251
|
-
compareAndUpdateMachineConfiguration(machine) {
|
252
|
-
const {
|
253
|
-
added,
|
254
|
-
updated,
|
255
|
-
removed,
|
256
|
-
overrides
|
257
|
-
} = compare(this.machineConfiguration, machine);
|
258
|
-
let keys = [...added, ...updated, ...removed];
|
259
|
-
if (keys.length) {
|
260
|
-
this.updateMachineConfiguration(machine);
|
261
|
-
}
|
262
|
-
return {
|
263
|
-
keys,
|
264
|
-
overrides
|
265
|
-
};
|
266
|
-
}
|
267
|
-
compareAndUpdateOrganizationConfiguration(organizationConfiguration) {
|
268
|
-
const {
|
269
|
-
added,
|
270
|
-
updated,
|
271
|
-
removed,
|
272
|
-
overrides
|
273
|
-
} = compare(this.organizationConfiguration, organizationConfiguration);
|
274
|
-
let keys = [...added, ...updated, ...removed];
|
275
|
-
if (overrides.length) {
|
276
|
-
this.updateOrganizationConfiguration(organizationConfiguration);
|
277
|
-
}
|
278
|
-
return {
|
279
|
-
keys,
|
280
|
-
overrides
|
281
|
-
};
|
282
|
-
}
|
283
|
-
compareAndUpdateResourceConfiguration(resource, resourceConfiguration) {
|
284
|
-
const currentResourceConfiguration = this.resourceConfigurations.get(resource);
|
285
|
-
const {
|
286
|
-
added,
|
287
|
-
updated,
|
288
|
-
removed,
|
289
|
-
overrides
|
290
|
-
} = compare(currentResourceConfiguration, resourceConfiguration);
|
291
|
-
let keys = [...added, ...updated, ...removed];
|
292
|
-
if (keys.length || !currentResourceConfiguration) {
|
293
|
-
this.updateResourceConfiguration(resource, resourceConfiguration);
|
294
|
-
}
|
295
|
-
return {
|
296
|
-
keys,
|
297
|
-
overrides
|
298
|
-
};
|
299
|
-
}
|
300
|
-
compareAndDeleteResourceConfiguration(resource) {
|
301
|
-
const resourceConfig = this.resourceConfigurations.get(resource);
|
302
|
-
if (!resourceConfig) {
|
303
|
-
throw new Error('Unknown resource ' + resource.fsPath);
|
304
|
-
}
|
305
|
-
this.deleteResourceConfiguration(resource);
|
306
|
-
const {
|
307
|
-
added,
|
308
|
-
updated,
|
309
|
-
removed,
|
310
|
-
overrides
|
311
|
-
} = compare(resourceConfig, undefined);
|
312
|
-
return {
|
313
|
-
keys: [...added, ...updated, ...removed],
|
314
|
-
overrides
|
315
|
-
};
|
316
|
-
}
|
317
|
-
get defaults() {
|
318
|
-
return this._defaultConfiguration;
|
319
|
-
}
|
320
|
-
get userConfiguration() {
|
321
|
-
return this._userConfiguration;
|
322
|
-
}
|
323
|
-
get applicationConfiguration() {
|
324
|
-
return this._applicationConfiguration;
|
325
|
-
}
|
326
|
-
get machineConfiguration() {
|
327
|
-
return this._machineConfiguration;
|
328
|
-
}
|
329
|
-
get organizationConfiguration() {
|
330
|
-
return this._organizationConfiguration;
|
331
|
-
}
|
332
|
-
get resourceConfigurations() {
|
333
|
-
return this._resourceConfigurations;
|
334
|
-
}
|
335
|
-
getConsolidateConfigurationModel(section, overrides, organization) {
|
336
|
-
let configurationModel = this.getConsolidatedConfigurationModelForResource(overrides, organization);
|
337
|
-
if (overrides.overrideIdentifier) {
|
338
|
-
configurationModel = configurationModel.override(overrides.overrideIdentifier);
|
339
|
-
}
|
340
|
-
if (!this._policyConfiguration.isEmpty() && this._policyConfiguration.getValue(section) !== undefined) {
|
341
|
-
configurationModel = configurationModel.merge(this._policyConfiguration);
|
342
|
-
}
|
343
|
-
return configurationModel;
|
344
|
-
}
|
345
|
-
getConsolidatedConfigurationModelForResource({
|
346
|
-
resource
|
347
|
-
}, organization) {
|
348
|
-
let consolidateConfiguration = this.getOrganizationConsolidatedConfiguration();
|
349
|
-
if (organization && resource) {
|
350
|
-
const root = organization.getResource(resource);
|
351
|
-
console.log('---root-', root);
|
352
|
-
if (root) {
|
353
|
-
//@sri instead of uri, we use resource.
|
354
|
-
consolidateConfiguration = this.getResourceConsolidatedConfiguration(resource) || consolidateConfiguration;
|
355
|
-
} else {
|
356
|
-
// if not organization resource
|
357
|
-
consolidateConfiguration = this.getResourceConsolidatedConfiguration(resource) || new ConfigurationModel();
|
358
|
-
}
|
359
|
-
const memoryConfigurationForResource = this._memoryConfigurationByResource.get(resource);
|
360
|
-
if (memoryConfigurationForResource) {
|
361
|
-
consolidateConfiguration = consolidateConfiguration.merge(memoryConfigurationForResource);
|
362
|
-
}
|
363
|
-
}
|
364
|
-
return consolidateConfiguration;
|
365
|
-
}
|
366
|
-
getOrganizationConsolidatedConfiguration() {
|
367
|
-
if (!this._organizationConsolidatedConfiguration) {
|
368
|
-
this._organizationConsolidatedConfiguration = this._defaultConfiguration.merge(this._applicationConfiguration, this._userConfiguration, this._organizationConfiguration, this._memoryConfiguration);
|
369
|
-
if (this._freeze) {
|
370
|
-
this._organizationConfiguration = this._organizationConfiguration.freeze();
|
371
|
-
}
|
372
|
-
}
|
373
|
-
return this._organizationConsolidatedConfiguration;
|
374
|
-
}
|
375
|
-
getResourceConsolidatedConfiguration(resource) {
|
376
|
-
let resourceConsolidatedConfiguration = this._resourcesConsolidatedConfigurations.get(resource);
|
377
|
-
if (!resourceConsolidatedConfiguration) {
|
378
|
-
const organizationConsolidateConfiguration = this.getOrganizationConsolidatedConfiguration();
|
379
|
-
const resourceConfiguration = this._resourceConfigurations.get(resource);
|
380
|
-
if (resourceConfiguration) {
|
381
|
-
resourceConsolidatedConfiguration = organizationConsolidateConfiguration.merge(resourceConfiguration);
|
382
|
-
if (this._freeze) {
|
383
|
-
resourceConsolidatedConfiguration = resourceConsolidatedConfiguration.freeze();
|
10
|
+
_defaultConfiguration;
|
11
|
+
_policyConfiguration;
|
12
|
+
_applicationConfiguration;
|
13
|
+
_userConfiguration;
|
14
|
+
_machineConfiguration;
|
15
|
+
_organizationConfiguration;
|
16
|
+
_resourceConfigurations;
|
17
|
+
_memoryConfiguration;
|
18
|
+
_memoryConfigurationByResource;
|
19
|
+
_freeze;
|
20
|
+
_organizationConsolidatedConfiguration = null;
|
21
|
+
_resourcesConsolidatedConfigurations = new ResourceMap();
|
22
|
+
constructor(_defaultConfiguration, _policyConfiguration = new ConfigurationModel(), _applicationConfiguration = new ConfigurationModel(), _userConfiguration = new ConfigurationModel(), _machineConfiguration = new ConfigurationModel(), _organizationConfiguration = new ConfigurationModel(), _resourceConfigurations = new ResourceMap(), _memoryConfiguration = new ConfigurationModel(), _memoryConfigurationByResource = new ResourceMap(), _freeze = true) {
|
23
|
+
this._defaultConfiguration = _defaultConfiguration;
|
24
|
+
this._policyConfiguration = _policyConfiguration;
|
25
|
+
this._applicationConfiguration = _applicationConfiguration;
|
26
|
+
this._userConfiguration = _userConfiguration;
|
27
|
+
this._machineConfiguration = _machineConfiguration;
|
28
|
+
this._organizationConfiguration = _organizationConfiguration;
|
29
|
+
this._resourceConfigurations = _resourceConfigurations;
|
30
|
+
this._memoryConfiguration = _memoryConfiguration;
|
31
|
+
this._memoryConfigurationByResource = _memoryConfigurationByResource;
|
32
|
+
this._freeze = _freeze;
|
33
|
+
}
|
34
|
+
getValue(section, overrides, organization, externalConfiguration) {
|
35
|
+
const consolidateConfigurationModel = this.getConsolidateConfigurationModel(section, overrides, organization);
|
36
|
+
// if (externalConfiguration) {
|
37
|
+
// const { contents, keys } = externalConfiguration;
|
38
|
+
// const externalModel = new ConfigurationModel(contents, keys);
|
39
|
+
// const withExternalModel = consolidateConfigurationModel.merge(externalModel);
|
40
|
+
// return withExternalModel.getValue(section);
|
41
|
+
// }
|
42
|
+
return consolidateConfigurationModel.getValue(section);
|
43
|
+
}
|
44
|
+
updateValue(key, value, overrides = {}) {
|
45
|
+
let memoryConfiguration;
|
46
|
+
if (overrides.resource) {
|
47
|
+
memoryConfiguration = this._memoryConfigurationByResource.get(overrides.resource);
|
48
|
+
if (!memoryConfiguration) {
|
49
|
+
memoryConfiguration = new ConfigurationModel();
|
50
|
+
this._memoryConfigurationByResource.set(overrides.resource, memoryConfiguration);
|
51
|
+
}
|
52
|
+
}
|
53
|
+
else {
|
54
|
+
memoryConfiguration = this._memoryConfiguration;
|
55
|
+
}
|
56
|
+
if (value === undefined) {
|
57
|
+
memoryConfiguration.removeValue(key);
|
58
|
+
}
|
59
|
+
else {
|
60
|
+
memoryConfiguration.setValue(key, value);
|
61
|
+
this._memoryConfigurationByResource.set(overrides.resource, memoryConfiguration);
|
62
|
+
}
|
63
|
+
if (!overrides.resource) {
|
64
|
+
this._organizationConsolidatedConfiguration = null;
|
65
|
+
}
|
66
|
+
}
|
67
|
+
inspect(key, overrides, organization) {
|
68
|
+
const consolidateConfigurationModel = this.getConsolidateConfigurationModel(key, overrides, organization);
|
69
|
+
const resourceConfigurationModel = this.getResourceConfigurationModelForResource(overrides.resource, organization);
|
70
|
+
const memoryConfigurationModel = overrides.resource ? this._memoryConfigurationByResource.get(overrides.resource) || this._memoryConfiguration : this._memoryConfiguration;
|
71
|
+
const defaultValue = overrides.overrideIdentifier ? this._defaultConfiguration.freeze().override(overrides.overrideIdentifier).getValue(key) : this._defaultConfiguration.freeze().getValue(key);
|
72
|
+
const policyValue = this._policyConfiguration.isEmpty() ? undefined : this._policyConfiguration.freeze().getValue(key);
|
73
|
+
const applicationValue = this.applicationConfiguration.isEmpty() ? undefined : this.applicationConfiguration.freeze().getValue(key);
|
74
|
+
const userValue = overrides.overrideIdentifier ? this.userConfiguration.freeze().override(overrides.overrideIdentifier).getValue(key) : this.userConfiguration.freeze().getValue(key);
|
75
|
+
const machineValue = overrides.overrideIdentifier ? this.machineConfiguration.freeze().override(overrides.overrideIdentifier).getValue(key) : this.machineConfiguration.freeze().getValue(key);
|
76
|
+
const organizationValue = organization ? overrides.overrideIdentifier ? this._organizationConfiguration.freeze().override(overrides.overrideIdentifier).getValue(key) : this._organizationConfiguration.freeze().getValue(key) : undefined; //Check on organization exists or not because _organizationConfiguration is never null
|
77
|
+
const organizationResourceValue = resourceConfigurationModel ? overrides.overrideIdentifier ? resourceConfigurationModel.freeze().override(overrides.overrideIdentifier).getValue(key) : resourceConfigurationModel.freeze().getValue(key) : undefined;
|
78
|
+
const memoryValue = overrides.overrideIdentifier ? memoryConfigurationModel.override(overrides.overrideIdentifier).getValue(key) : memoryConfigurationModel.getValue(key);
|
79
|
+
const value = consolidateConfigurationModel.getValue(key);
|
80
|
+
const overrideIdentifiers = arrays.distinct(consolidateConfigurationModel.overrides.map(override => override.identifiers).flat()).filter(overrideIdentifier => consolidateConfigurationModel.getOverrideValue(key, overrideIdentifier) !== undefined);
|
81
|
+
return {
|
82
|
+
defaultValue,
|
83
|
+
policyValue,
|
84
|
+
applicationValue,
|
85
|
+
userValue,
|
86
|
+
machineValue,
|
87
|
+
organizationValue,
|
88
|
+
organizationResourceValue,
|
89
|
+
memoryValue,
|
90
|
+
value,
|
91
|
+
default: defaultValue !== undefined ? { value: this._defaultConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._defaultConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
|
92
|
+
policy: policyValue !== undefined ? { value: policyValue } : undefined,
|
93
|
+
application: applicationValue !== undefined ? { value: applicationValue, override: overrides.overrideIdentifier ? this.applicationConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
|
94
|
+
user: userValue !== undefined ? { value: this.userConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.userConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
|
95
|
+
machine: machineValue !== undefined ? { value: this.machineConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.machineConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
|
96
|
+
organization: organizationValue !== undefined ? { value: this._organizationConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._organizationConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
|
97
|
+
organizationResource: organizationResourceValue !== undefined ? { value: resourceConfigurationModel?.freeze().getValue(key), override: overrides.overrideIdentifier ? resourceConfigurationModel?.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
|
98
|
+
memory: memoryValue !== undefined ? { value: memoryConfigurationModel.getValue(key), override: overrides.overrideIdentifier ? memoryConfigurationModel.getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
|
99
|
+
overrideIdentifiers: overrideIdentifiers.length ? overrideIdentifiers : undefined
|
100
|
+
};
|
101
|
+
}
|
102
|
+
keys(organization) {
|
103
|
+
const resourceConfigurationModel = this.getResourceConfigurationModelForResource(undefined, organization);
|
104
|
+
return {
|
105
|
+
default: this._defaultConfiguration.freeze().keys,
|
106
|
+
user: this.userConfiguration.freeze().keys,
|
107
|
+
organization: this._organizationConfiguration.freeze().keys,
|
108
|
+
organizationResource: resourceConfigurationModel ? resourceConfigurationModel.freeze().keys : []
|
109
|
+
};
|
110
|
+
}
|
111
|
+
updateDefaultConfiguration(defaultConfiguration) {
|
112
|
+
this._defaultConfiguration = defaultConfiguration;
|
113
|
+
this._organizationConsolidatedConfiguration = null;
|
114
|
+
this._resourcesConsolidatedConfigurations.clear();
|
115
|
+
}
|
116
|
+
updatePolicyConfiguration(_policyConfiguration) {
|
117
|
+
this._policyConfiguration = _policyConfiguration;
|
118
|
+
}
|
119
|
+
updateApplicationConfiguration(applicationConfiguration) {
|
120
|
+
this._applicationConfiguration = applicationConfiguration;
|
121
|
+
//this._machineConfiguration = null;
|
122
|
+
this._organizationConsolidatedConfiguration = null;
|
123
|
+
this._resourcesConsolidatedConfigurations.clear();
|
124
|
+
}
|
125
|
+
updateUserConfiguration(userConfiguration) {
|
126
|
+
//this._applicationConfiguration = null;
|
127
|
+
this._userConfiguration = userConfiguration;
|
128
|
+
//this._machineConfiguration = null;
|
129
|
+
this._organizationConsolidatedConfiguration = null;
|
130
|
+
this._resourcesConsolidatedConfigurations.clear();
|
131
|
+
}
|
132
|
+
updateMachineConfiguration(machineConfiguration) {
|
133
|
+
//this._applicationConfiguration = null;
|
134
|
+
//this._userConfiguration = null;
|
135
|
+
this._machineConfiguration = machineConfiguration;
|
136
|
+
this._organizationConsolidatedConfiguration = null;
|
137
|
+
this._resourcesConsolidatedConfigurations.clear();
|
138
|
+
}
|
139
|
+
updateOrganizationConfiguration(organizationConfiguration) {
|
140
|
+
this._organizationConfiguration = organizationConfiguration;
|
141
|
+
this._organizationConsolidatedConfiguration = organizationConfiguration;
|
142
|
+
this._resourcesConsolidatedConfigurations.clear();
|
143
|
+
}
|
144
|
+
updateResourceConfiguration(resource, configuration) {
|
145
|
+
this._resourceConfigurations.set(resource, configuration);
|
146
|
+
this._resourcesConsolidatedConfigurations.delete(resource);
|
147
|
+
}
|
148
|
+
addResourceConfiguration(resource, configuration) {
|
149
|
+
if (this._resourceConfigurations.get(resource)) {
|
150
|
+
console.log('resource already exist', resource);
|
151
|
+
// this.updateResourceConfiguration(resource, configuration);
|
152
|
+
}
|
153
|
+
this._resourceConfigurations.set(resource, configuration);
|
154
|
+
}
|
155
|
+
deleteResourceConfiguration(resource) {
|
156
|
+
this.resourceConfigurations.delete(resource);
|
157
|
+
this._resourcesConsolidatedConfigurations.delete(resource);
|
158
|
+
}
|
159
|
+
compareAndUpdateDefaultConfiguration(defaults, keys) {
|
160
|
+
const overrides = [];
|
161
|
+
if (!keys) {
|
162
|
+
const { added, updated, removed } = compare(this._defaultConfiguration, defaults);
|
163
|
+
keys = [...added, ...updated, ...removed];
|
164
|
+
}
|
165
|
+
for (const key of keys) {
|
166
|
+
for (const overrideIdentifier of overrideIdentifiersFromKey(key)) {
|
167
|
+
const fromKeys = this._defaultConfiguration.getKeysForOverrideIdentifier(overrideIdentifier);
|
168
|
+
const toKeys = defaults.getKeysForOverrideIdentifier(overrideIdentifier);
|
169
|
+
const keys = [
|
170
|
+
...toKeys.filter(key => fromKeys.indexOf(key) === -1),
|
171
|
+
...fromKeys.filter(key => toKeys.indexOf(key) === -1),
|
172
|
+
...fromKeys.filter(key => !objects.equals(this._defaultConfiguration.override(overrideIdentifier).getValue(key), defaults.override(overrideIdentifier).getValue(key)))
|
173
|
+
];
|
174
|
+
overrides.push([overrideIdentifier, keys]);
|
175
|
+
}
|
176
|
+
}
|
177
|
+
this.updateDefaultConfiguration(defaults);
|
178
|
+
return { keys, overrides };
|
179
|
+
}
|
180
|
+
compareAndUpdatePolicyConfiguration(policyConfiguration) {
|
181
|
+
const { added, updated, removed } = compare(this._policyConfiguration, policyConfiguration);
|
182
|
+
const keys = [...added, ...updated, ...removed];
|
183
|
+
if (keys.length) {
|
184
|
+
this.updatePolicyConfiguration(policyConfiguration);
|
185
|
+
}
|
186
|
+
return { keys, overrides: [] };
|
187
|
+
}
|
188
|
+
compareAndUpdateApplicationConfiguration(application) {
|
189
|
+
const { added, updated, removed, overrides } = compare(this.applicationConfiguration, application);
|
190
|
+
const keys = [...added, ...updated, ...removed];
|
191
|
+
if (keys.length) {
|
192
|
+
this.updateApplicationConfiguration(application);
|
193
|
+
}
|
194
|
+
return { keys, overrides };
|
195
|
+
}
|
196
|
+
compareAndUpdateUserConfiguration(user) {
|
197
|
+
const { added, updated, removed, overrides } = compare(this.userConfiguration, user);
|
198
|
+
const keys = [...added, ...updated, ...removed];
|
199
|
+
if (keys.length) {
|
200
|
+
this.updateUserConfiguration(user);
|
201
|
+
}
|
202
|
+
return { keys, overrides };
|
203
|
+
}
|
204
|
+
compareAndUpdateMachineConfiguration(machine) {
|
205
|
+
const { added, updated, removed, overrides } = compare(this.machineConfiguration, machine);
|
206
|
+
let keys = [...added, ...updated, ...removed];
|
207
|
+
if (keys.length) {
|
208
|
+
this.updateMachineConfiguration(machine);
|
209
|
+
}
|
210
|
+
return { keys, overrides };
|
211
|
+
}
|
212
|
+
compareAndUpdateOrganizationConfiguration(organizationConfiguration) {
|
213
|
+
const { added, updated, removed, overrides } = compare(this.organizationConfiguration, organizationConfiguration);
|
214
|
+
let keys = [...added, ...updated, ...removed];
|
215
|
+
if (overrides.length) {
|
216
|
+
this.updateOrganizationConfiguration(organizationConfiguration);
|
217
|
+
}
|
218
|
+
return { keys, overrides };
|
219
|
+
}
|
220
|
+
compareAndUpdateResourceConfiguration(resource, resourceConfiguration) {
|
221
|
+
const currentResourceConfiguration = this.resourceConfigurations.get(resource);
|
222
|
+
const { added, updated, removed, overrides } = compare(currentResourceConfiguration, resourceConfiguration);
|
223
|
+
let keys = [...added, ...updated, ...removed];
|
224
|
+
if (keys.length || !currentResourceConfiguration) {
|
225
|
+
this.updateResourceConfiguration(resource, resourceConfiguration);
|
384
226
|
}
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
}
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
416
|
-
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
|
430
|
-
|
431
|
-
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
227
|
+
return { keys, overrides };
|
228
|
+
}
|
229
|
+
compareAndDeleteResourceConfiguration(resource) {
|
230
|
+
const resourceConfig = this.resourceConfigurations.get(resource);
|
231
|
+
if (!resourceConfig) {
|
232
|
+
throw new Error('Unknown resource ' + resource.fsPath);
|
233
|
+
}
|
234
|
+
this.deleteResourceConfiguration(resource);
|
235
|
+
const { added, updated, removed, overrides } = compare(resourceConfig, undefined);
|
236
|
+
return { keys: [...added, ...updated, ...removed], overrides };
|
237
|
+
}
|
238
|
+
get defaults() {
|
239
|
+
return this._defaultConfiguration;
|
240
|
+
}
|
241
|
+
get userConfiguration() {
|
242
|
+
return this._userConfiguration;
|
243
|
+
}
|
244
|
+
get applicationConfiguration() {
|
245
|
+
return this._applicationConfiguration;
|
246
|
+
}
|
247
|
+
get machineConfiguration() {
|
248
|
+
return this._machineConfiguration;
|
249
|
+
}
|
250
|
+
get organizationConfiguration() {
|
251
|
+
return this._organizationConfiguration;
|
252
|
+
}
|
253
|
+
get resourceConfigurations() {
|
254
|
+
return this._resourceConfigurations;
|
255
|
+
}
|
256
|
+
getConsolidateConfigurationModel(section, overrides, organization) {
|
257
|
+
let configurationModel = this.getConsolidatedConfigurationModelForResource(overrides, organization);
|
258
|
+
if (overrides.overrideIdentifier) {
|
259
|
+
configurationModel = configurationModel.override(overrides.overrideIdentifier);
|
260
|
+
}
|
261
|
+
if (!this._policyConfiguration.isEmpty() && this._policyConfiguration.getValue(section) !== undefined) {
|
262
|
+
configurationModel = configurationModel.merge(this._policyConfiguration);
|
263
|
+
}
|
264
|
+
return configurationModel;
|
265
|
+
}
|
266
|
+
getConsolidatedConfigurationModelForResource({ resource }, organization) {
|
267
|
+
let consolidateConfiguration = this.getOrganizationConsolidatedConfiguration();
|
268
|
+
if (organization && resource) {
|
269
|
+
const root = organization.getResource(resource);
|
270
|
+
console.log('---root-', root);
|
271
|
+
if (root) {
|
272
|
+
//@sri instead of uri, we use resource.
|
273
|
+
consolidateConfiguration = this.getResourceConsolidatedConfiguration(resource) || consolidateConfiguration;
|
274
|
+
}
|
275
|
+
else {
|
276
|
+
// if not organization resource
|
277
|
+
consolidateConfiguration = this.getResourceConsolidatedConfiguration(resource) || new ConfigurationModel();
|
278
|
+
}
|
279
|
+
const memoryConfigurationForResource = this._memoryConfigurationByResource.get(resource);
|
280
|
+
if (memoryConfigurationForResource) {
|
281
|
+
consolidateConfiguration = consolidateConfiguration.merge(memoryConfigurationForResource);
|
282
|
+
}
|
283
|
+
}
|
284
|
+
return consolidateConfiguration;
|
285
|
+
}
|
286
|
+
getOrganizationConsolidatedConfiguration() {
|
287
|
+
if (!this._organizationConsolidatedConfiguration) {
|
288
|
+
this._organizationConsolidatedConfiguration = this._defaultConfiguration.merge(this._applicationConfiguration, this._userConfiguration, this._organizationConfiguration, this._memoryConfiguration);
|
289
|
+
if (this._freeze) {
|
290
|
+
this._organizationConfiguration = this._organizationConfiguration.freeze();
|
291
|
+
}
|
292
|
+
}
|
293
|
+
return this._organizationConsolidatedConfiguration;
|
294
|
+
}
|
295
|
+
getResourceConsolidatedConfiguration(resource) {
|
296
|
+
let resourceConsolidatedConfiguration = this._resourcesConsolidatedConfigurations.get(resource);
|
297
|
+
if (!resourceConsolidatedConfiguration) {
|
298
|
+
const organizationConsolidateConfiguration = this.getOrganizationConsolidatedConfiguration();
|
299
|
+
const resourceConfiguration = this._resourceConfigurations.get(resource);
|
300
|
+
if (resourceConfiguration) {
|
301
|
+
resourceConsolidatedConfiguration = organizationConsolidateConfiguration.merge(resourceConfiguration);
|
302
|
+
if (this._freeze) {
|
303
|
+
resourceConsolidatedConfiguration = resourceConsolidatedConfiguration.freeze();
|
304
|
+
}
|
305
|
+
this._resourcesConsolidatedConfigurations.set(resource, resourceConsolidatedConfiguration);
|
306
|
+
}
|
307
|
+
else {
|
308
|
+
resourceConsolidatedConfiguration = organizationConsolidateConfiguration;
|
309
|
+
}
|
310
|
+
}
|
311
|
+
return resourceConsolidatedConfiguration;
|
312
|
+
}
|
313
|
+
getResourceConfigurationModelForResource(resource, organization) {
|
314
|
+
if (organization && resource) {
|
315
|
+
const root = organization.getResource(resource);
|
316
|
+
if (root) {
|
317
|
+
return types.withUndefinedAsNull(this._resourceConfigurations.get(root.uri));
|
318
|
+
}
|
319
|
+
}
|
320
|
+
return null;
|
321
|
+
}
|
322
|
+
toData() {
|
323
|
+
return {
|
324
|
+
defaults: {
|
325
|
+
contents: this._defaultConfiguration.contents,
|
326
|
+
overrides: this._defaultConfiguration.overrides,
|
327
|
+
keys: this._defaultConfiguration.keys
|
328
|
+
},
|
329
|
+
policy: {
|
330
|
+
contents: this._policyConfiguration.contents,
|
331
|
+
overrides: this._policyConfiguration.overrides,
|
332
|
+
keys: this._policyConfiguration.keys,
|
333
|
+
},
|
334
|
+
application: {
|
335
|
+
contents: this._applicationConfiguration.contents,
|
336
|
+
overrides: this._applicationConfiguration.overrides,
|
337
|
+
keys: this._applicationConfiguration.keys,
|
338
|
+
},
|
339
|
+
user: {
|
340
|
+
contents: this._userConfiguration.contents,
|
341
|
+
overrides: this._userConfiguration.overrides,
|
342
|
+
keys: this._userConfiguration.keys
|
343
|
+
},
|
344
|
+
machine: {
|
345
|
+
contents: this._machineConfiguration.contents,
|
346
|
+
overrides: this._machineConfiguration.overrides,
|
347
|
+
keys: this._machineConfiguration.keys
|
348
|
+
},
|
349
|
+
organization: {
|
350
|
+
contents: this._organizationConfiguration.contents,
|
351
|
+
overrides: this._organizationConfiguration.overrides,
|
352
|
+
keys: this._organizationConfiguration.keys
|
353
|
+
},
|
354
|
+
resources: [...this._resourceConfigurations.keys()].reduce((result, resource) => {
|
355
|
+
const { contents, overrides, keys } = this._resourceConfigurations.get(resource);
|
356
|
+
result[resource.toString()] = { contents, overrides, keys };
|
357
|
+
return result;
|
358
|
+
}, Object.create({}))
|
443
359
|
};
|
444
|
-
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
461
|
-
|
462
|
-
|
463
|
-
|
464
|
-
|
465
|
-
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
472
|
-
|
473
|
-
|
474
|
-
|
475
|
-
|
476
|
-
|
477
|
-
|
478
|
-
|
479
|
-
|
480
|
-
|
481
|
-
|
482
|
-
|
483
|
-
|
484
|
-
static parseConfigurationModel(model) {
|
485
|
-
return new ConfigurationModel(model.contents, model.keys, model.overrides).freeze();
|
486
|
-
}
|
360
|
+
}
|
361
|
+
allKeys() {
|
362
|
+
const keys = new Set();
|
363
|
+
this._defaultConfiguration.freeze().keys.forEach(key => keys.add(key));
|
364
|
+
this.userConfiguration.freeze().keys.forEach(key => keys.add(key));
|
365
|
+
this._organizationConfiguration.freeze().keys.forEach(key => keys.add(key));
|
366
|
+
this._resourceConfigurations.forEach(resourceConfiguraiton => resourceConfiguraiton.freeze().keys.forEach(key => keys.add(key)));
|
367
|
+
return [...keys.values()];
|
368
|
+
}
|
369
|
+
allOverrideIdentifiers() {
|
370
|
+
const keys = new Set();
|
371
|
+
this._defaultConfiguration.freeze().getAllOverrideIdentifiers().forEach(key => keys.add(key));
|
372
|
+
this.userConfiguration.freeze().getAllOverrideIdentifiers().forEach(key => keys.add(key));
|
373
|
+
this._organizationConfiguration.freeze().getAllOverrideIdentifiers().forEach(key => keys.add(key));
|
374
|
+
this._resourceConfigurations.forEach(resourceConfiguraiton => resourceConfiguraiton.freeze().getAllOverrideIdentifiers().forEach(key => keys.add(key)));
|
375
|
+
return [...keys.values()];
|
376
|
+
}
|
377
|
+
getAllKeysForOverrideIdentifier(overrideIdentifier) {
|
378
|
+
const keys = new Set();
|
379
|
+
this._defaultConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key));
|
380
|
+
this.userConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key));
|
381
|
+
this._organizationConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key));
|
382
|
+
this._resourceConfigurations.forEach(resourceConfiguraiton => resourceConfiguraiton.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key)));
|
383
|
+
return [...keys.values()];
|
384
|
+
}
|
385
|
+
static parse(data) {
|
386
|
+
const defaultConfiguration = this.parseConfigurationModel(data.defaults);
|
387
|
+
const policyConfiguration = this.parseConfigurationModel(data.policy);
|
388
|
+
const applicationConfiguration = this.parseConfigurationModel(data.application);
|
389
|
+
const userConfiguration = this.parseConfigurationModel(data.user);
|
390
|
+
const organizationConfiguration = this.parseConfigurationModel(data.organization);
|
391
|
+
const resources = data.resources.reduce((result, value) => {
|
392
|
+
result.set(URI.revive(value[0]), this.parseConfigurationModel(value[1]));
|
393
|
+
return result;
|
394
|
+
}, new ResourceMap());
|
395
|
+
return new Configuration(defaultConfiguration, policyConfiguration, applicationConfiguration, userConfiguration, new ConfigurationModel(), organizationConfiguration, resources, new ConfigurationModel(), new ResourceMap(), false);
|
396
|
+
}
|
397
|
+
static parseConfigurationModel(model) {
|
398
|
+
return new ConfigurationModel(model.contents, model.keys, model.overrides).freeze();
|
399
|
+
}
|
487
400
|
}
|
488
401
|
function compare(from, to) {
|
489
|
-
|
490
|
-
|
491
|
-
|
492
|
-
|
493
|
-
|
494
|
-
|
495
|
-
|
496
|
-
|
497
|
-
|
498
|
-
|
499
|
-
|
500
|
-
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
|
506
|
-
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
514
|
-
keys: from.getKeysForOverrideIdentifier(identifier)
|
515
|
-
}, {
|
516
|
-
contents: to.getOverrideValue(undefined, identifier) || {},
|
517
|
-
keys: to.getKeysForOverrideIdentifier(identifier)
|
518
|
-
});
|
519
|
-
overrides.push([identifier, [...result.added, ...result.removed, ...result.updated]]);
|
520
|
-
}
|
521
|
-
}
|
522
|
-
}
|
523
|
-
return {
|
524
|
-
added,
|
525
|
-
removed,
|
526
|
-
updated,
|
527
|
-
overrides
|
528
|
-
};
|
402
|
+
const { added, removed, updated } = compareConfigurationContents(to, from);
|
403
|
+
const overrides = [];
|
404
|
+
const fromOverrideIdentifiers = from?.getAllOverrideIdentifiers() || [];
|
405
|
+
const toOverrideIdentifiers = to?.getAllOverrideIdentifiers() || [];
|
406
|
+
if (to) {
|
407
|
+
const addedOverrideIdentifiers = toOverrideIdentifiers.filter(key => !fromOverrideIdentifiers.includes(key));
|
408
|
+
for (const identifier of addedOverrideIdentifiers) {
|
409
|
+
overrides.push([identifier, to.getKeysForOverrideIdentifier(identifier)]);
|
410
|
+
}
|
411
|
+
}
|
412
|
+
if (from) {
|
413
|
+
const removedOverrideIdentifiers = fromOverrideIdentifiers.filter(key => !toOverrideIdentifiers.includes(key));
|
414
|
+
for (const identifier of removedOverrideIdentifiers) {
|
415
|
+
overrides.push([identifier, from.getKeysForOverrideIdentifier(identifier)]);
|
416
|
+
}
|
417
|
+
}
|
418
|
+
if (to && from) {
|
419
|
+
for (const identifier of fromOverrideIdentifiers) {
|
420
|
+
if (toOverrideIdentifiers.includes(identifier)) {
|
421
|
+
const result = compareConfigurationContents({ contents: from.getOverrideValue(undefined, identifier) || {}, keys: from.getKeysForOverrideIdentifier(identifier) }, { contents: to.getOverrideValue(undefined, identifier) || {}, keys: to.getKeysForOverrideIdentifier(identifier) });
|
422
|
+
overrides.push([identifier, [...result.added, ...result.removed, ...result.updated]]);
|
423
|
+
}
|
424
|
+
}
|
425
|
+
}
|
426
|
+
return { added, removed, updated, overrides };
|
529
427
|
}
|
530
428
|
function compareConfigurationContents(to, from) {
|
531
|
-
|
532
|
-
|
533
|
-
|
534
|
-
|
535
|
-
|
536
|
-
|
537
|
-
|
538
|
-
|
539
|
-
|
540
|
-
|
429
|
+
const added = to
|
430
|
+
? from ? to.keys.filter(key => from.keys.indexOf(key) === -1) : [...to.keys]
|
431
|
+
: [];
|
432
|
+
const removed = from
|
433
|
+
? to ? from.keys.filter(key => to.keys.indexOf(key) === -1) : [...from.keys]
|
434
|
+
: [];
|
435
|
+
const updated = [];
|
436
|
+
if (to && from) {
|
437
|
+
for (const key of from.keys) {
|
438
|
+
if (to.keys.indexOf(key) !== -1) {
|
439
|
+
const value1 = getConfigurationValue(from.contents, key);
|
440
|
+
const value2 = getConfigurationValue(to.contents, key);
|
441
|
+
if (!objects.equals(value1, value2)) {
|
442
|
+
updated.push(key);
|
443
|
+
}
|
444
|
+
}
|
541
445
|
}
|
542
|
-
|
543
|
-
}
|
544
|
-
}
|
545
|
-
return {
|
546
|
-
added,
|
547
|
-
removed,
|
548
|
-
updated
|
549
|
-
};
|
446
|
+
}
|
447
|
+
return { added, removed, updated };
|
550
448
|
}
|
551
449
|
const OVERRIDE_IDENTIFIER_REGEX = new RegExp(OVERRIDE_IDENTIFIER_PATTERN, 'g');
|
552
450
|
const OVERRIDE_PROPERTY_REGEX = new RegExp(OVERRIDE_PROPERTY_PATTERN);
|
553
451
|
function overrideIdentifiersFromKey(key) {
|
554
|
-
|
555
|
-
|
556
|
-
|
557
|
-
|
558
|
-
|
559
|
-
|
560
|
-
|
561
|
-
|
562
|
-
|
563
|
-
|
564
|
-
|
565
|
-
|
452
|
+
const identifiers = [];
|
453
|
+
if (OVERRIDE_PROPERTY_REGEX.test(key)) {
|
454
|
+
let matches = OVERRIDE_IDENTIFIER_REGEX.exec(key);
|
455
|
+
while (matches?.length) {
|
456
|
+
const identifier = matches[1].trim();
|
457
|
+
if (identifier) {
|
458
|
+
identifiers.push(identifier);
|
459
|
+
}
|
460
|
+
matches = OVERRIDE_IDENTIFIER_REGEX.exec(key);
|
461
|
+
}
|
462
|
+
}
|
463
|
+
return arrays.distinct(identifiers);
|
566
464
|
}export{Configuration,OVERRIDE_PROPERTY_REGEX,compare,overrideIdentifiersFromKey};//# sourceMappingURL=configuration.js.map
|