@adminide-stack/core 3.1.2-alpha.13 → 3.1.2-alpha.136

package/lib/core/configurations/configuration.test.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("reflect-metadata");
+const configuration_1 = require("./configuration");
+const models_1 = require("./models");
+// use this tests in the server side
+// /Users/veeramarni/Documents/development/workspace/projects/IDEx/adminIde-stack/packages/adminide-platform/server/src/core/configuration/models/Configuration.test.ts
+describe('Configuration ', () => {
+    test('Test inspect for overrideIdentifiers', () => {
+        const defaultConfigurationModel = new models_1.ConfigurationModel({ '[l1]': { 'a': 1 }, '[l2]': { 'b': 1 } });
+        const userConfigurationModel = new models_1.ConfigurationModel({ '[l3]': { 'a': 2 } });
+        const orgConfigurationModel = new models_1.ConfigurationModel({ '[l1]': { 'a': 3 }, '[l4]': { 'a': 3 } });
+        const testObject = new configuration_1.Configuration(defaultConfigurationModel, new models_1.ConfigurationModel(), userConfigurationModel, orgConfigurationModel);
+        console.log('---JSON---', JSON.stringify((testObject)));
+        const { overrideIdentifiers } = testObject.inspect('a', {}, undefined);
+        console.log('---overrider', overrideIdentifiers);
+        //assert.deepStrictEqual(overrideIdentifiers, ['l1', 'l3', 'l4']);
+    });
+});
+//# sourceMappingURL=configuration.test.js.map

package/lib/core/configurations/configuration.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configuration.test.js","sourceRoot":"","sources":["../../../src/core/configurations/configuration.test.ts"],"names":[],"mappings":";;AAAA,4BAA0B;AAC1B,mDAAgD;AAChD,qCAA8C;AAE9C,oCAAoC;AACpC,uKAAuK;AACvK,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAChD,MAAM,yBAAyB,GAAG,IAAI,2BAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAC,CAAC,CAAC;QACnG,MAAM,sBAAsB,GAAG,IAAI,2BAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAC,CAAC,CAAC;QAC7E,MAAM,qBAAqB,GAAG,IAAI,2BAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAC,CAAC,CAAC;QAChG,MAAM,UAAU,GAAkB,IAAI,6BAAa,CAAC,yBAAyB,EAAE,IAAI,2BAAkB,EAAE,EAAE,sBAAsB,EAAE,qBAAqB,CAAC,CAAC;QAGxJ,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QACvD,MAAM,EAAE,mBAAmB,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;QACvE,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAA;QAChD,kEAAkE;IACpE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAC"}

package/lib/core/configurations/events/AbstractConfigurationChangEvent.js

@@ -0,0 +1,25 @@
+// import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
+// import { ConfigurationModel } from '../models/ConfigurationModel';
+// import { toValuesTree } from '../helpers';
+// //src/vs/platform/configuration/common/configurationModels.ts
+// export class AbstractConfigurationChangEvent {
+//     protected doesConfigurationContains(configuration: ConfigurationModel, config: string): boolean {
+//         let changedKeysTree = configuration.contents;
+//         let requestedTree = toValuesTree({ [config]: true }, () => { });
+//         let key;
+//         while (typeof requestedTree === 'object' && (key = Object.keys(requestedTree)[0])) { // Only one key should present, since we added only one property
+//             changedKeysTree = changedKeysTree[key];
+//             if (!changedKeysTree) {
+//                 return false; // Requested tree is not found
+//             }
+//             requestedTree = requestedTree[key];
+//         }
+//         return true;
+//     }
+//     protected updateKeys(configuration: ConfigurationModel, keys: string[], resource?: URI): void {
+//         for (const key of keys) {
+//             configuration.setValue(key, {});
+//         }
+//     }
+// }
+//# sourceMappingURL=AbstractConfigurationChangEvent.js.map

package/lib/core/configurations/events/AbstractConfigurationChangEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractConfigurationChangEvent.js","sourceRoot":"","sources":["../../../../src/core/configurations/events/AbstractConfigurationChangEvent.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,qEAAqE;AACrE,6CAA6C;AAE7C,gEAAgE;AAChE,iDAAiD;AAEjD,wGAAwG;AACxG,wDAAwD;AACxD,2EAA2E;AAE3E,mBAAmB;AACnB,gKAAgK;AAChK,sDAAsD;AACtD,sCAAsC;AACtC,+DAA+D;AAC/D,gBAAgB;AAChB,kDAAkD;AAClD,YAAY;AACZ,uBAAuB;AACvB,QAAQ;AAER,sGAAsG;AACtG,oCAAoC;AACpC,+CAA+C;AAC/C,YAAY;AACZ,QAAQ;AACR,IAAI"}

package/lib/core/configurations/events/AllKeysConfigurationChangeEvent.js

@@ -0,0 +1,27 @@
+// import { ResourceMap } from '@vscode-alt/monaco-editor/esm/vs/base/common/map';
+// import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
+// import { AbstractConfigurationChangEvent } from './AbstractConfigurationChangEvent';
+// import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationModel } from '../../../interfaces';
+// import { ConfigurationModel } from '../models';
+// import { OrganizationConfiguration as Configuration } from '../../organization';
+// export class AllKeysConfigurationChangeEvent extends AbstractConfigurationChangEvent implements IConfigurationChangeEvent {
+//     private _changedConfiguration: ConfigurationModel | null = null;
+//     constructor(private _configuration: Configuration, readonly source: ConfigurationTarget, readonly sourceConfig: any) { super(); }
+//     get changedConfiguration(): ConfigurationModel {
+//         if (!this._changedConfiguration) {
+//             this._changedConfiguration = new ConfigurationModel();
+//             this.updateKeys(this._changedConfiguration, this.affectedKeys);
+//         }
+//         return this._changedConfiguration;
+//     }
+//     get changedConfigurationByResource(): ResourceMap<IConfigurationModel> {
+//         return new ResourceMap();
+//     }
+//     get affectedKeys(): string[] {
+//         return this._configuration.allKeys();
+//     }
+//     affectsConfiguration(config: string, resource?: URI): boolean {
+//         return this.doesConfigurationContains(this.changedConfiguration, config);
+//     }
+// }
+//# sourceMappingURL=AllKeysConfigurationChangeEvent.js.map

package/lib/core/configurations/events/AllKeysConfigurationChangeEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AllKeysConfigurationChangeEvent.js","sourceRoot":"","sources":["../../../../src/core/configurations/events/AllKeysConfigurationChangeEvent.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,0EAA0E;AAC1E,uFAAuF;AACvF,6GAA6G;AAC7G,kDAAkD;AAClD,mFAAmF;AAGnF,8HAA8H;AAE9H,uEAAuE;AAEvE,wIAAwI;AAExI,uDAAuD;AACvD,6CAA6C;AAC7C,qEAAqE;AACrE,8EAA8E;AAC9E,YAAY;AACZ,6CAA6C;AAC7C,QAAQ;AAER,+EAA+E;AAC/E,oCAAoC;AACpC,QAAQ;AAER,qCAAqC;AACrC,gDAAgD;AAChD,QAAQ;AAER,sEAAsE;AACtE,oFAAoF;AACpF,QAAQ;AACR,IAAI"}

package/lib/core/configurations/events/ConfigurationChangeEvent.d.ts

@@ -0,0 +1,21 @@
+import { IConfigurationChange, IConfigurationChangeEvent, IConfigurationData, IConfigurationOverrides, IOrganizationContext } from '../../../interfaces';
+import { ConfigurationTarget } from '../../../interfaces';
+import { Configuration } from '../configuration';
+export declare class ConfigurationChangeEvent implements IConfigurationChangeEvent {
+    readonly change: IConfigurationChange;
+    private readonly previous;
+    private readonly currentConfiguraiton;
+    private readonly currentOrganization?;
+    private readonly affectedKeysTree;
+    readonly affectedKeys: string[];
+    source: ConfigurationTarget;
+    sourceConfig: any;
+    constructor(change: IConfigurationChange, previous: {
+        organization?: IOrganizationContext;
+        data: IConfigurationData;
+    } | undefined, currentConfiguraiton: Configuration, currentOrganization?: IOrganizationContext);
+    private _previousConfiguration;
+    get previousConfiguration(): Configuration | undefined;
+    affectsConfiguration(section: string, overrides?: IConfigurationOverrides): boolean;
+    private doesAffectedKeysTreeContains;
+}

package/lib/core/configurations/events/ConfigurationChangeEvent.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfigurationChangeEvent = void 0;
+/* tslint:disable */
+const objects = require("@vscode-alt/monaco-editor/esm/vs/base/common/objects");
+const interfaces_1 = require("../../../interfaces");
+const configuration_1 = require("../configuration");
+const helpers_1 = require("../helpers");
+const models_1 = require("../models");
+organization: interfaces_1.IOrganizationContext;
+// https://github.com/microsoft/vscode/blob/1562a35c863c312eec35c161b9ceac9921afa50e/src/vs/platform/configuration/common/configurationModels.ts
+class ConfigurationChangeEvent {
+    constructor(change, previous, currentConfiguraiton, currentOrganization) {
+        this.change = change;
+        this.previous = previous;
+        this.currentConfiguraiton = currentConfiguraiton;
+        this.currentOrganization = currentOrganization;
+        this._previousConfiguration = undefined;
+        const keysSet = new Set();
+        change.keys.forEach(key => keysSet.add(key));
+        change.overrides.forEach(([, keys]) => keys.forEach(key => keysSet.add(key)));
+        this.affectedKeys = [...keysSet.values()];
+        const configurationModel = new models_1.ConfigurationModel();
+        this.affectedKeys.forEach(key => configurationModel.setValue(key, {}));
+        this.affectedKeysTree = configurationModel.contents;
+    }
+    get previousConfiguration() {
+        if (!this._previousConfiguration && this.previous) {
+            this._previousConfiguration = configuration_1.Configuration.parse(this.previous.data);
+        }
+        return this._previousConfiguration;
+    }
+    affectsConfiguration(section, overrides) {
+        var _a;
+        if (this.doesAffectedKeysTreeContains(this.affectedKeysTree, section)) {
+            if (overrides) {
+                const value1 = this.previousConfiguration ? this.previousConfiguration.getValue(section, overrides, (_a = this.previous) === null || _a === void 0 ? void 0 : _a.organization) : undefined;
+                const value2 = this.currentConfiguraiton.getValue(section, overrides, this.currentOrganization);
+                return !objects.equals(value1, value2);
+            }
+            return true;
+        }
+        return false;
+    }
+    doesAffectedKeysTreeContains(affectedKeysTree, section) {
+        let requestedTree = (0, helpers_1.toValuesTree)({ [section]: true }, () => { });
+        let key;
+        while (typeof requestedTree === 'object' && (key = Object.keys(requestedTree)[0])) { // Only one key should present, since we added only one property
+            affectedKeysTree = affectedKeysTree[key];
+            if (!affectedKeysTree) {
+                return false; // Requested tree is not found
+            }
+            requestedTree = requestedTree[key];
+        }
+        return true;
+    }
+}
+exports.ConfigurationChangeEvent = ConfigurationChangeEvent;
+//# sourceMappingURL=ConfigurationChangeEvent.js.map

package/lib/core/configurations/events/ConfigurationChangeEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConfigurationChangeEvent.js","sourceRoot":"","sources":["../../../../src/core/configurations/events/ConfigurationChangeEvent.ts"],"names":[],"mappings":"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"}

package/lib/core/configurations/events/OrganizationConfigurationChangeEvent.js

@@ -0,0 +1,37 @@
+// /* tslint:disable */
+// import { IConfigurationChangeEvent } from '../../../interfaces';
+// import { IConfigurationModel, ConfigurationTarget, IOrganizationContext  } from '../../../interfaces';
+// import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
+// import { ResourceMap } from '@vscode-alt/monaco-editor/esm/vs/base/common/map';
+// // src/vs/workbench/services/configuration/common/configurationModels.ts
+// export class OrganizationConfigurationChangeEvent implements IConfigurationChangeEvent {
+// 	constructor(private configurationChangeEvent: IConfigurationChangeEvent, private organization: IOrganizationContext | undefined) { }
+// 	get changedConfiguration(): IConfigurationModel {
+// 		return this.configurationChangeEvent.changedConfiguration;
+// 	}
+// 	get changedConfigurationByResource(): ResourceMap<IConfigurationModel> {
+// 		return this.configurationChangeEvent.changedConfigurationByResource;
+// 	}
+// 	get affectedKeys(): string[] {
+// 		return this.configurationChangeEvent.affectedKeys;
+// 	}
+// 	get source(): ConfigurationTarget {
+// 		return this.configurationChangeEvent.source;
+// 	}
+// 	get sourceConfig(): any {
+// 		return this.configurationChangeEvent.sourceConfig;
+// 	}
+// 	affectsConfiguration(config: string, resource?: URI): boolean {
+// 		if (this.configurationChangeEvent.affectsConfiguration(config, resource)) {
+// 			return true;
+// 		}
+// 		if (resource && this.organization) {
+// 			let organizationResource = this.organization.getResource(resource);
+// 			if (organizationResource) {
+// 				return this.configurationChangeEvent.affectsConfiguration(config, organizationResource.uri);
+// 			}
+// 		}
+// 		return false;
+// 	}
+// }
+//# sourceMappingURL=OrganizationConfigurationChangeEvent.js.map

package/lib/core/configurations/events/OrganizationConfigurationChangeEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OrganizationConfigurationChangeEvent.js","sourceRoot":"","sources":["../../../../src/core/configurations/events/OrganizationConfigurationChangeEvent.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,mEAAmE;AACnE,yGAAyG;AACzG,0EAA0E;AAC1E,kFAAkF;AAElF,2EAA2E;AAE3E,2FAA2F;AAE3F,wIAAwI;AAExI,qDAAqD;AACrD,+DAA+D;AAC/D,KAAK;AAEL,4EAA4E;AAC5E,yEAAyE;AACzE,KAAK;AAEL,kCAAkC;AAClC,uDAAuD;AACvD,KAAK;AAEL,uCAAuC;AACvC,iDAAiD;AACjD,KAAK;AAEL,6BAA6B;AAC7B,uDAAuD;AACvD,KAAK;AAEL,mEAAmE;AACnE,gFAAgF;AAChF,kBAAkB;AAClB,MAAM;AAEN,yCAAyC;AACzC,yEAAyE;AACzE,iCAAiC;AACjC,mGAAmG;AACnG,OAAO;AACP,MAAM;AAEN,kBAAkB;AAClB,KAAK;AACL,IAAI"}

package/lib/core/configurations/events/index.d.ts

@@ -1,4 +1 @@
-export * from './abstract-configuration-change-event';
-export * from './configuration-change-event';
-export * from './organization-configuration-change-event';
-export * from './all-keys-configuration-change-event';
+export * from './ConfigurationChangeEvent';

package/lib/core/configurations/events/index.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./abstract-configuration-change-event"), exports);
-__exportStar(require("./configuration-change-event"), exports);
-__exportStar(require("./organization-configuration-change-event"), exports);
-__exportStar(require("./all-keys-configuration-change-event"), exports);
+// export * from './AbstractConfigurationChangEvent';
+__exportStar(require("./ConfigurationChangeEvent"), exports);
+// export * from './OrganizationConfigurationChangeEvent';
+// export * from './AllKeysConfigurationChangeEvent';
 //# sourceMappingURL=index.js.map

package/lib/core/configurations/events/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/configurations/events/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wEAAsD;AACtD,+DAA6C;AAC7C,4EAA0D;AAC1D,wEAAsD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/configurations/events/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAqD;AACrD,6DAA2C;AAC3C,0DAA0D;AAC1D,qDAAqD"}

package/lib/core/configurations/helpers/configuration.d.ts

@@ -1,16 +1,10 @@
-import { IConfigurationModel, ConfigurationTarget, IConfigurationService, IConfigurationOverrides, IOverrides, ISettingsSubject } from '../../../interfaces';
+import { ConfigurationTarget, IConfigurationService, IConfigurationOverrides, ISettingsSubject } from '../../../interfaces';
 export declare function isConfigurationOverrides(thing: any): thing is IConfigurationOverrides;
 /**
  * @SRI modified to match to the union type of graphql type Settings
  */
 export declare function ConfigurationTargetToString(configurationTarget: ConfigurationTarget): ISettingsSubject['__typename'];
-export declare function SettingsTypeToConfiguraitonTarget(settings: ISettingsSubject['__typename']): ConfigurationTarget;
-export declare function compare(from: IConfigurationModel, to: IConfigurationModel): {
-    added: string[];
-    removed: string[];
-    updated: string[];
-};
-export declare function toOverrides(raw: any, configurationProperties: any, conflictReporter: (message: string) => void): IOverrides[];
+export declare function SettingsTypeToConfiguraitonTarget(settings: ISettingsSubject['__typename']): ConfigurationTarget.USER | ConfigurationTarget.APPLICATION | ConfigurationTarget.MACHINE | ConfigurationTarget.ORGANIZATION | ConfigurationTarget.ORGANIZATION_RESOURCE | ConfigurationTarget.DEFAULT | ConfigurationTarget.MEMORY;
 export declare function toValuesTree(properties: {
     [qualifiedKey: string]: any;
 }, conflictReporter: (message: string) => void): any;

package/lib/core/configurations/helpers/configuration.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMigratedSettingValue = exports.keyFromOverrideIdentifier = exports.overrideIdentifierFromKey = exports.merge = exports.getConfigurationValue = exports.removeFromValueTree = exports.addToValueTree = exports.toValuesTree = exports.toOverrides = exports.compare = exports.SettingsTypeToConfiguraitonTarget = exports.ConfigurationTargetToString = exports.isConfigurationOverrides = void 0;
+exports.getMigratedSettingValue = exports.keyFromOverrideIdentifier = exports.overrideIdentifierFromKey = exports.merge = exports.getConfigurationValue = exports.removeFromValueTree = exports.addToValueTree = exports.toValuesTree = exports.SettingsTypeToConfiguraitonTarget = exports.ConfigurationTargetToString = exports.isConfigurationOverrides = void 0;
 /* tslint:disable */
-const objects = require("@vscode-alt/monaco-editor/esm/vs/base/common/objects");
 const types = require("@vscode-alt/monaco-editor/esm/vs/base/common/types");
-const constants_1 = require("../../../constants");
 const uri_1 = require("@vscode-alt/monaco-editor/esm/vs/base/common/uri");
 // src/vs/platform/configuration/common/configuration.ts
 function isConfigurationOverrides(thing) {
@@ -41,42 +39,27 @@ function SettingsTypeToConfiguraitonTarget(settings) {
     }
 }
 exports.SettingsTypeToConfiguraitonTarget = SettingsTypeToConfiguraitonTarget;
-function compare(from, to) {
-    const added = to.keys.filter(key => from.keys.indexOf(key) === -1);
-    const removed = from.keys.filter(key => to.keys.indexOf(key) === -1);
-    const updated = [];
-    for (const key of from.keys) {
-        const value1 = getConfigurationValue(from.contents, key);
-        const value2 = getConfigurationValue(to.contents, key);
-        if (!objects.equals(value1, value2)) {
-            updated.push(key);
-        }
-    }
-    return { added, removed, updated };
-}
-exports.compare = compare;
 // not using currently but stays here for future reference
 //@sri modified function to take ConfigurationRegistry as second argument input
-function toOverrides(raw, configurationProperties, conflictReporter) {
-    const overrides = [];
-    // const configurationProperties = Registry.Instance.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
-    for (const key of Object.keys(raw)) {
-        if (constants_1.OVERRIDE_PROPERTY_PATTERN.test(key)) {
-            const overrideRaw = {};
-            for (const keyInOverrideRaw in raw[key]) {
-                if (configurationProperties[keyInOverrideRaw] && configurationProperties[keyInOverrideRaw].overridable) {
-                    overrideRaw[keyInOverrideRaw] = raw[key][keyInOverrideRaw];
-                }
-            }
-            overrides.push({
-                identifiers: [overrideIdentifierFromKey(key).trim()],
-                contents: toValuesTree(overrideRaw, conflictReporter)
-            });
-        }
-    }
-    return overrides;
-}
-exports.toOverrides = toOverrides;
+// export function toOverrides(raw: any, configurationProperties, conflictReporter: (message: string) => void): IOverrides[] {
+//     const overrides: IOverrides[] = [];
+//     // const configurationProperties = Registry.Instance.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
+//     for (const key of Object.keys(raw)) {
+//         if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
+//             const overrideRaw = {};
+//             for (const keyInOverrideRaw in raw[key]) {
+//                 if (configurationProperties[keyInOverrideRaw] && configurationProperties[keyInOverrideRaw].overridable) {
+//                     overrideRaw[keyInOverrideRaw] = raw[key][keyInOverrideRaw];
+//                 }
+// 			}
+//             overrides.push({
+//                 identifiers: [overrideIdentifierFromKey(key).trim()],
+//                 contents: toValuesTree(overrideRaw, conflictReporter)
+//             });
+//         }
+//     }
+//     return overrides;
+// }
 function toValuesTree(properties, conflictReporter) {
     const root = Object.create(null);
     for (let key in properties) {
@@ -189,14 +172,14 @@ exports.keyFromOverrideIdentifier = keyFromOverrideIdentifier;
 function getMigratedSettingValue(configurationService, currentSettingName, legacySettingName) {
     const setting = configurationService.inspect(currentSettingName);
     const legacySetting = configurationService.inspect(legacySettingName);
-    if (typeof setting.user !== 'undefined' || typeof setting.organization !== 'undefined' || typeof setting.organizationResource !== 'undefined') {
+    if (typeof setting.userValue !== 'undefined' || typeof setting.organizationValue !== 'undefined' || typeof setting.organizationResourceValue !== 'undefined') {
         return setting.value;
     }
-    else if (typeof legacySetting.user !== 'undefined' || typeof legacySetting.organization !== 'undefined' || typeof legacySetting.organizationResource !== 'undefined') {
+    else if (typeof legacySetting.userValue !== 'undefined' || typeof legacySetting.organizationValue !== 'undefined' || typeof legacySetting.organizationResourceValue !== 'undefined') {
         return legacySetting.value;
     }
     else {
-        return setting.default;
+        return setting.defaultValue;
     }
 }
 exports.getMigratedSettingValue = getMigratedSettingValue;

package/lib/core/configurations/helpers/configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../src/core/configurations/helpers/configuration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../src/core/configurations/helpers/configuration.ts"],"names":[],"mappings":"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"}

package/lib/core/configurations/models/{configuration-model.d.ts → ConfigurationModel.d.ts}

@@ -1,18 +1,25 @@
 import { IOverrides, IIConfigurationModel as IConfigurationModel } from '../../../interfaces';
 export declare class ConfigurationModel implements IConfigurationModel {
-    private _contents;
-    private _keys;
-    private _overrides;
-    private isFrozen;
+    private readonly _contents;
+    private readonly _keys;
+    private readonly _overrides;
+    private frozen;
+    private readonly overrideConfigurations;
     constructor(_contents?: any, _keys?: string[], _overrides?: IOverrides[]);
     get contents(): any;
     get overrides(): IOverrides[];
     get keys(): string[];
     isEmpty(): boolean;
+    isFrozen(): boolean;
     getValue<V>(section: string | undefined): V;
+    getOverrideValue<V>(section: string | undefined, overrideIdentifier: string): V | undefined;
+    getKeysForOverrideIdentifier(identifier: string): string[];
+    getAllOverrideIdentifiers(): string[];
     override(identifier: string): ConfigurationModel;
     merge(...others: ConfigurationModel[]): ConfigurationModel;
     freeze(): ConfigurationModel;
+    clone(): ConfigurationModel;
+    private createOverrideConfigurationModel;
     private mergeContents;
     private checkAndFreeze;
     private getContentsForOverrideIdentifer;

package/lib/core/configurations/models/{configuration-model.js → ConfigurationModel.js}

@@ -5,12 +5,14 @@ const objects = require("@vscode-alt/monaco-editor/esm/vs/base/common/objects");
 const arrays = require("@vscode-alt/monaco-editor/esm/vs/base/common/arrays");
 const types = require("@vscode-alt/monaco-editor/esm/vs/base/common/types");
 const configuration_1 = require("../helpers/configuration");
+// https://github.com/microsoft/vscode/blob/1562a35c863c312eec35c161b9ceac9921afa50e/src/vs/platform/configuration/common/configurationModels.ts
 class ConfigurationModel {
     constructor(_contents = {}, _keys = [], _overrides = []) {
         this._contents = _contents;
         this._keys = _keys;
         this._overrides = _overrides;
-        this.isFrozen = false;
+        this.frozen = false;
+        this.overrideConfigurations = new Map();
     }
     get contents() {
         return this.checkAndFreeze(this._contents);
@@ -24,44 +26,57 @@ class ConfigurationModel {
     isEmpty() {
         return this._keys.length === 0 && Object.keys(this._contents).length === 0 && this._overrides.length === 0;
     }
+    isFrozen() {
+        return this.frozen;
+    }
     getValue(section) {
         return section ? (0, configuration_1.getConfigurationValue)(this.contents, section) : this.contents;
     }
-    override(identifier) {
-        const overrideContents = this.getContentsForOverrideIdentifer(identifier);
-        if (!overrideContents || typeof overrideContents !== 'object' || !Object.keys(overrideContents).length) {
-            // If there are no valid overrides, return self
-            return this;
-        }
-        let contents = {};
-        for (const key of arrays.distinct([...Object.keys(this.contents), ...Object.keys(overrideContents)])) {
-            let contentsForKey = this.contents[key];
-            let overrideContentsForKey = overrideContents[key];
-            // If there are override contents for the key, clone and merge otherwise use base contents
-            if (overrideContentsForKey) {
-                // Clone and merge only if base contents and override contents are of type object otherwise just override
-                if (typeof contentsForKey === 'object' && typeof overrideContentsForKey === 'object') {
-                    contentsForKey = objects.deepClone(contentsForKey);
-                    this.mergeContents(contentsForKey, overrideContentsForKey);
-                }
-                else {
-                    contentsForKey = overrideContentsForKey;
-                }
+    getOverrideValue(section, overrideIdentifier) {
+        const overrideContents = this.getContentsForOverrideIdentifer(overrideIdentifier);
+        return overrideContents
+            ? section ? (0, configuration_1.getConfigurationValue)(overrideContents, section) : overrideContents
+            : undefined;
+    }
+    getKeysForOverrideIdentifier(identifier) {
+        const keys = [];
+        for (const override of this.overrides) {
+            if (override.identifiers.includes(identifier)) {
+                keys.push(...override.keys);
             }
-            contents[key] = contentsForKey;
         }
-        return new ConfigurationModel(contents);
+        return arrays.distinct(keys);
+    }
+    getAllOverrideIdentifiers() {
+        const result = [];
+        for (const override of this.overrides) {
+            result.push(...override.identifiers);
+        }
+        return arrays.distinct(result);
+    }
+    override(identifier) {
+        let overrideConfigurationModel = this.overrideConfigurations.get(identifier);
+        if (!overrideConfigurationModel) {
+            overrideConfigurationModel = this.createOverrideConfigurationModel(identifier);
+            this.overrideConfigurations.set(identifier, overrideConfigurationModel);
+        }
+        return overrideConfigurationModel;
     }
     merge(...others) {
         const contents = objects.deepClone(this.contents);
         const overrides = objects.deepClone(this.overrides);
         const keys = [...this.keys];
         for (const other of others) {
+            if (other.isEmpty()) {
+                continue;
+            }
             this.mergeContents(contents, other.contents);
             for (const otherOverride of other.overrides) {
                 const [override] = overrides.filter(o => arrays.equals(o.identifiers, otherOverride.identifiers));
                 if (override) {
                     this.mergeContents(override.contents, otherOverride.contents);
+                    override.keys.push(...otherOverride.keys);
+                    override.keys = arrays.distinct(override.keys);
                 }
                 else {
                     overrides.push(objects.deepClone(otherOverride));
@@ -76,9 +91,37 @@ class ConfigurationModel {
         return new ConfigurationModel(contents, keys, overrides);
     }
     freeze() {
-        this.isFrozen = true;
+        this.frozen = true;
         return this;
     }
+    clone() {
+        return new ConfigurationModel(objects.deepClone(this.contents), [...this.keys], objects.deepClone(this.overrides));
+    }
+    createOverrideConfigurationModel(identifier) {
+        const overrideContents = this.getContentsForOverrideIdentifer(identifier);
+        if (!overrideContents || typeof overrideContents !== 'object' || !Object.keys(overrideContents).length) {
+            // If there are no valid overrides, return self
+            return this;
+        }
+        const contents = {};
+        for (const key of arrays.distinct([...Object.keys(this.contents), ...Object.keys(overrideContents)])) {
+            let contentsForKey = this.contents[key];
+            const overrideContentsForKey = overrideContents[key];
+            // If there are override contents for the key, clone and merge otherwise use base contents
+            if (overrideContentsForKey) {
+                // Clone and merge only if base contents and override contents are of type object otherwise just override
+                if (typeof contentsForKey === 'object' && typeof overrideContentsForKey === 'object') {
+                    contentsForKey = objects.deepClone(contentsForKey);
+                    this.mergeContents(contentsForKey, overrideContentsForKey);
+                }
+                else {
+                    contentsForKey = overrideContentsForKey;
+                }
+            }
+            contents[key] = contentsForKey;
+        }
+        return new ConfigurationModel(contents, this.keys, this.overrides);
+    }
     mergeContents(source, target) {
         for (const key of Object.keys(target)) {
             if (key in source) {
@@ -91,18 +134,35 @@ class ConfigurationModel {
         }
     }
     checkAndFreeze(data) {
-        if (this.isFrozen && !Object.isFrozen(data)) {
+        if (this.frozen && !Object.isFrozen(data)) {
             return objects.deepFreeze(data);
         }
         return data;
     }
     getContentsForOverrideIdentifer(identifier) {
+        let contentsForIdentifierOnly = null;
+        let contents = null;
+        const mergeContents = (contentsToMerge) => {
+            if (contentsToMerge) {
+                if (contents) {
+                    this.mergeContents(contents, contentsToMerge);
+                }
+                else {
+                    contents = objects.deepClone(contentsToMerge);
+                }
+            }
+        };
         for (const override of this.overrides) {
-            if (override.identifiers.indexOf(identifier) !== -1) {
-                return override.contents;
+            if (arrays.equals(override.identifiers, [identifier])) {
+                contentsForIdentifierOnly = override.contents;
+            }
+            else if (override.identifiers.includes(identifier)) {
+                mergeContents(override.contents);
             }
         }
-        return null;
+        // Merge contents of the identifier only at the end to take precedence.
+        mergeContents(contentsForIdentifierOnly);
+        return contents;
     }
     toJSON() {
         return {
@@ -140,4 +200,4 @@ class ConfigurationModel {
     }
 }
 exports.ConfigurationModel = ConfigurationModel;
-//# sourceMappingURL=configuration-model.js.map
+//# sourceMappingURL=ConfigurationModel.js.map