@adminide-stack/core 1.1.1-alpha.125 → 1.1.1-alpha.148
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/core/configurations/configuration.d.ts +2 -2
- package/lib/core/configurations/configuration.js +9 -1
- package/lib/core/configurations/configuration.js.map +1 -1
- package/lib/core/organization/configuration.d.ts +2 -1
- package/lib/core/organization/configuration.js +2 -3
- package/lib/core/organization/configuration.js.map +1 -1
- package/lib/interfaces/configuration/configuraton-service.d.ts +2 -1
- package/lib/interfaces/generated/generated-models.d.ts +3 -0
- package/lib/interfaces/generated/generated-models.js.map +1 -1
- package/lib/services/abstract-configuration.d.ts +3 -1
- package/lib/services/abstract-configuration.js +4 -0
- package/lib/services/abstract-configuration.js.map +1 -1
- package/lib/utils/flatten-utils.d.ts +1 -0
- package/lib/utils/flatten-utils.js +20 -0
- package/lib/utils/flatten-utils.js.map +1 -0
- package/lib/utils/generate-uri.d.ts +3 -1
- package/lib/utils/generate-uri.js +3 -1
- package/lib/utils/generate-uri.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
|
|
2
2
|
import { ResourceMap } from '@vscode-alt/monaco-editor/esm/vs/base/common/map';
|
|
3
|
-
import { IConfigurationData, IConfigurationOverrides } from '../../interfaces';
|
|
3
|
+
import { IConfigurationData, IConfigurationOverrides, IConfigurationModel } from '../../interfaces';
|
|
4
4
|
import { ConfigurationModel } from './models';
|
|
5
5
|
import { IOrganizationContext } from '../../interfaces';
|
|
6
6
|
/**
|
|
@@ -23,7 +23,7 @@ export declare class Configuration {
|
|
|
23
23
|
private _organizationConsolidatedConfiguration;
|
|
24
24
|
private _resourcesConsolidatedConfigurations;
|
|
25
25
|
constructor(_defaultConfiguration: ConfigurationModel, _applicationConfiguration: ConfigurationModel, _machineConfiguration?: ConfigurationModel, _organizationConfiguration?: ConfigurationModel, _resourceConfigurations?: ResourceMap<ConfigurationModel>, _memoryConfiguration?: ConfigurationModel, _memoryConfigurationByResource?: ResourceMap<ConfigurationModel>, _freeze?: boolean);
|
|
26
|
-
getValue(section: string | undefined, overrides: IConfigurationOverrides, organization: IOrganizationContext | undefined): any;
|
|
26
|
+
getValue(section: string | undefined, overrides: IConfigurationOverrides, organization: IOrganizationContext | undefined, externalConfiguration?: IConfigurationModel | undefined): any;
|
|
27
27
|
updateValue(key: string, value: any, overrides?: IConfigurationOverrides): void;
|
|
28
28
|
inspect<C>(key: string, overrides: IConfigurationOverrides, organization: IOrganizationContext | undefined): {
|
|
29
29
|
default: C;
|
|
@@ -25,8 +25,14 @@ class Configuration {
|
|
|
25
25
|
this._organizationConsolidatedConfiguration = null;
|
|
26
26
|
this._resourcesConsolidatedConfigurations = new map_1.ResourceMap();
|
|
27
27
|
}
|
|
28
|
-
getValue(section, overrides, organization) {
|
|
28
|
+
getValue(section, overrides, organization, externalConfiguration) {
|
|
29
29
|
const consolidateConfigurationModel = this.getConsolidateConfigurationModel(overrides, organization);
|
|
30
|
+
if (externalConfiguration) {
|
|
31
|
+
const { contents, keys, overrides } = externalConfiguration;
|
|
32
|
+
const externalModel = new models_1.ConfigurationModel(contents, keys, overrides);
|
|
33
|
+
const withExternalModel = consolidateConfigurationModel.merge(externalModel);
|
|
34
|
+
return withExternalModel.getValue(section);
|
|
35
|
+
}
|
|
30
36
|
return consolidateConfigurationModel.getValue(section);
|
|
31
37
|
}
|
|
32
38
|
updateValue(key, value, overrides = {}) {
|
|
@@ -140,7 +146,9 @@ class Configuration {
|
|
|
140
146
|
if (root) {
|
|
141
147
|
//@sri instead of uri, we use resource.
|
|
142
148
|
consolidateConfiguration = this.getResourceConsolidatedConfiguration(resource) || consolidateConfiguration;
|
|
149
|
+
console.log('---CONSOLIDATED --CONfiguraiton ', consolidateConfiguration);
|
|
143
150
|
}
|
|
151
|
+
console.log('--- MEMORYC CONFIGURATION FOR RESOURCE ', this._memoryConfigurationByResource);
|
|
144
152
|
const memoryConfigurationForResource = this._memoryConfigurationByResource.get(resource);
|
|
145
153
|
if (memoryConfigurationForResource) {
|
|
146
154
|
consolidateConfiguration = consolidateConfiguration.merge(memoryConfigurationForResource);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/core/configurations/configuration.ts"],"names":[],"mappings":";;;AACA,0EAA+E;AAC/E,4EAA4E;AAE5E,qCAA8C;AAG9C;;;;;;;GAOG;AACH,MAAa,aAAa;IAKzB,YACS,qBAAyC,EACzC,yBAA6C,EAC7C,wBAA4C,IAAI,2BAAkB,EAAE,EACpE,6BAAiD,IAAI,2BAAkB,EAAE,EACzE,0BAA2D,IAAI,iBAAW,EAAsB,EAChG,uBAA2C,IAAI,2BAAkB,EAAE,EACnE,iCAAkE,IAAI,iBAAW,EAAsB,EACvG,UAAmB,IAAI;QAPvB,0BAAqB,GAArB,qBAAqB,CAAoB;QACzC,8BAAyB,GAAzB,yBAAyB,CAAoB;QAC7C,0BAAqB,GAArB,qBAAqB,CAA+C;QACpE,+BAA0B,GAA1B,0BAA0B,CAA+C;QACzE,4BAAuB,GAAvB,uBAAuB,CAAyE;QAChG,yBAAoB,GAApB,oBAAoB,CAA+C;QACnE,mCAA8B,GAA9B,8BAA8B,CAAyE;QACvG,YAAO,GAAP,OAAO,CAAgB;QAXxB,2CAAsC,GAA8B,IAAI,CAAC;QACzE,yCAAoC,GAAoC,IAAI,iBAAW,EAAsB,CAAC;IAWtH,CAAC;IAED,QAAQ,CAAC,OAA2B,EAAE,SAAkC,EAAE,YAA8C;
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/core/configurations/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,11 @@ import { Configuration as BaseConfiguration, ConfigurationModel, ConfigurationCh
|
|
|
2
2
|
import { ResourceMap } from '@vscode-alt/monaco-editor/esm/vs/base/common/map';
|
|
3
3
|
import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
|
|
4
4
|
import { IConfigurationOverrides, IOrganizationContext } from '../../interfaces';
|
|
5
|
+
import { IConfigurationModel } from '@workbench-stack/core';
|
|
5
6
|
export declare class OrganizationConfiguration extends BaseConfiguration {
|
|
6
7
|
private readonly _organization?;
|
|
7
8
|
constructor(defaults: ConfigurationModel, application: ConfigurationModel, machine: ConfigurationModel, organizationConfiguration: ConfigurationModel, resources: ResourceMap<ConfigurationModel>, memoryConfiguration: ConfigurationModel, memoryConfigurationByResource: ResourceMap<ConfigurationModel>, _organization?: IOrganizationContext);
|
|
8
|
-
getValue(key: string | undefined, overrides?: IConfigurationOverrides): any;
|
|
9
|
+
getValue(key: string | undefined, overrides?: IConfigurationOverrides, undefined?: any, externalConfiguration?: IConfigurationModel): any;
|
|
9
10
|
inspect<C>(key: string, overrides?: IConfigurationOverrides): {
|
|
10
11
|
default: C;
|
|
11
12
|
user: C;
|
|
@@ -8,8 +8,8 @@ class OrganizationConfiguration extends configurations_1.Configuration {
|
|
|
8
8
|
super(defaults, application, machine, organizationConfiguration, resources, memoryConfiguration, memoryConfigurationByResource);
|
|
9
9
|
this._organization = _organization;
|
|
10
10
|
}
|
|
11
|
-
getValue(key, overrides
|
|
12
|
-
return super.getValue(key, overrides, this._organization);
|
|
11
|
+
getValue(key, overrides, undefined, externalConfiguration) {
|
|
12
|
+
return super.getValue(key, overrides, this._organization, externalConfiguration);
|
|
13
13
|
}
|
|
14
14
|
inspect(key, overrides = {}) {
|
|
15
15
|
return super.inspect(key, overrides, this._organization);
|
|
@@ -53,7 +53,6 @@ class OrganizationConfiguration extends configurations_1.Configuration {
|
|
|
53
53
|
}
|
|
54
54
|
else {
|
|
55
55
|
super.updateResourceConfiguration(resource, resourceConfiguration);
|
|
56
|
-
console.log('----UPDATED ', resourceConfiguration.contents);
|
|
57
56
|
return new configurations_1.ConfigurationChangeEvent().change(resourceConfiguration.keys, resource);
|
|
58
57
|
}
|
|
59
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/core/organization/configuration.ts"],"names":[],"mappings":";;;AAAA,sDAA8H;AAE9H,kFAA8E;
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/core/organization/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Event } from '@vscode-alt/monaco-editor/esm/vs/base/common/event';
|
|
2
2
|
import { ConfigurationTarget } from './configuration';
|
|
3
3
|
import { IConfigurationChangeEvent } from './event';
|
|
4
|
-
import { IConfigurationOverrides, IConfigurationData } from '../generated';
|
|
4
|
+
import { IConfigurationOverrides, IConfigurationData, IConfigurationModel } from '../generated';
|
|
5
5
|
import { IDisposable } from '@vscode-alt/monaco-editor/esm/vs/base/common/lifecycle';
|
|
6
6
|
import { IOrganizationContext } from '../organization';
|
|
7
7
|
import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
|
|
@@ -51,6 +51,7 @@ export interface IConfigurationService extends IDisposable {
|
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
53
|
export interface IClientConfigurationService extends IConfigurationService {
|
|
54
|
+
externalConfiguration?(resource: URI): IConfigurationModel;
|
|
54
55
|
extAcceptConfigurationChanged(data: IConfigurationData, event: IConfigurationChangeEvent): void;
|
|
55
56
|
}
|
|
56
57
|
export interface IConfigurationMicroserviceEvent {
|
|
@@ -664,10 +664,12 @@ export declare type IConfigurationOverrides = {
|
|
|
664
664
|
__typename?: 'ConfigurationOverrides';
|
|
665
665
|
resource?: Maybe<Scalars['URI']>;
|
|
666
666
|
overrideIdentifier?: Maybe<Scalars['String']>;
|
|
667
|
+
externalResource?: Maybe<Scalars['URI']>;
|
|
667
668
|
};
|
|
668
669
|
export declare type IConfigurationOverrides_Input = {
|
|
669
670
|
resource?: Maybe<Scalars['URI']>;
|
|
670
671
|
overrideIdentifier?: Maybe<Scalars['String']>;
|
|
672
|
+
externalResource?: Maybe<Scalars['URI']>;
|
|
671
673
|
};
|
|
672
674
|
export declare type IConfigurationPolicy = IDefaultPolicy | IOrganizationPolicy | IResourcePolicy | IApplicationPolicy;
|
|
673
675
|
export { ConfigurationScope };
|
|
@@ -11992,6 +11994,7 @@ export declare type IConfigurationModelResolvers<ContextType = MyContext, Parent
|
|
|
11992
11994
|
export declare type IConfigurationOverridesResolvers<ContextType = MyContext, ParentType extends IResolversParentTypes['ConfigurationOverrides'] = IResolversParentTypes['ConfigurationOverrides']> = {
|
|
11993
11995
|
resource?: Resolver<Maybe<IResolversTypes['URI']>, ParentType, ContextType>;
|
|
11994
11996
|
overrideIdentifier?: Resolver<Maybe<IResolversTypes['String']>, ParentType, ContextType>;
|
|
11997
|
+
externalResource?: Resolver<Maybe<IResolversTypes['URI']>, ParentType, ContextType>;
|
|
11995
11998
|
__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
|
|
11996
11999
|
};
|
|
11997
12000
|
export declare type IConfigurationPolicyResolvers<ContextType = MyContext, ParentType extends IResolversParentTypes['ConfigurationPolicy'] = IResolversParentTypes['ConfigurationPolicy']> = {
|