@theia/core 1.65.0-next.19 → 1.65.0-next.39

package/lib/{browser → common}/preferences/preference-provider.d.ts

@@ -1,9 +1,8 @@
-import { JSONValue } from '@lumino/coreutils';
-import URI from '../../common/uri';
-import { Disposable, DisposableCollection, Emitter, Event } from '../../common';
-import { Deferred } from '../../common/promise-util';
-import { PreferenceScope } from './preference-scope';
-import { PreferenceLanguageOverrideService } from './preference-language-override-service';
+import { JSONObject, JSONValue } from '@lumino/coreutils';
+import { Event } from '../event';
+import { PreferenceScope } from '../preferences/preference-scope';
+import { URI } from '../uri';
+import { Disposable } from 'vscode-languageserver-protocol';
 export interface PreferenceProviderDataChange {
     /**
      * The name of the changed preference.
@@ -12,11 +11,11 @@ export interface PreferenceProviderDataChange {
     /**
      * The new value of the changed preference.
      */
-    readonly newValue?: any;
+    readonly newValue?: JSONValue;
     /**
      * The old value of the changed preference.
      */
-    readonly oldValue?: any;
+    readonly oldValue?: JSONValue;
     /**
      * The {@link PreferenceScope} of the changed preference.
      */
@@ -29,34 +28,22 @@ export interface PreferenceProviderDataChange {
 export declare namespace PreferenceProviderDataChange {
     function affects(change: PreferenceProviderDataChange, resourceUri?: string): boolean;
 }
-export interface PreferenceProviderDataChanges {
-    [preferenceName: string]: PreferenceProviderDataChange;
-}
 export interface PreferenceResolveResult<T> {
     configUri?: URI;
     value?: T;
 }
-/**
- * The {@link PreferenceProvider} is used to store and retrieve preference values. A {@link PreferenceProvider} does not operate in a global scope but is
- * configured for one or more {@link PreferenceScope}s. The (default implementation for the) {@link PreferenceService} aggregates all {@link PreferenceProvider}s and
- * serves as a common facade for manipulating preference values.
- */
-export declare abstract class PreferenceProvider implements Disposable {
-    protected readonly preferenceOverrideService: PreferenceLanguageOverrideService;
-    protected readonly onDidPreferencesChangedEmitter: Emitter<PreferenceProviderDataChanges>;
+export interface PreferenceProviderDataChanges {
+    [preferenceName: string]: PreferenceProviderDataChange;
+}
+export declare const PreferenceProvider: unique symbol;
+export interface PreferenceProvider extends Disposable {
     readonly onDidPreferencesChanged: Event<PreferenceProviderDataChanges>;
-    protected readonly toDispose: DisposableCollection;
-    protected readonly _ready: Deferred<void>;
-    constructor();
-    dispose(): void;
-    protected deferredChanges: PreferenceProviderDataChanges | undefined;
+    ready: Promise<void>;
     /**
-     * Informs the listeners that one or more preferences of this provider are changed.
-     * The listeners are able to find what was changed from the emitted event.
+     * Whether t
+     * @param scope the scope to handle
      */
-    protected emitPreferencesChangedEvent(changes: PreferenceProviderDataChanges | PreferenceProviderDataChange[]): Promise<boolean>;
-    protected mergePreferenceProviderDataChange(change: PreferenceProviderDataChange): void;
-    protected fireDidPreferencesChanged: () => Promise<boolean>;
+    canHandleScope(scope: PreferenceScope): boolean;
     /**
      * Retrieve the stored value for the given preference and resource URI.
      *
@@ -67,20 +54,6 @@ export declare abstract class PreferenceProvider implements Disposable {
      * @returns the value stored for the given preference and resourceUri if it exists, otherwise `undefined`.
      */
     get<T>(preferenceName: string, resourceUri?: string): T | undefined;
-    /**
-     * Resolve the value for the given preference and resource URI.
-     *
-     * @param preferenceName the preference identifier.
-     * @param resourceUri the URI of the resource for which this provider should resolve the preference. This is used to retrieve
-     * a potentially different value for the same preference for different resources, for example `files.encoding`.
-     *
-     * @returns an object containing the value stored for the given preference and resourceUri if it exists,
-     * otherwise `undefined`.
-     */
-    resolve<T>(preferenceName: string, resourceUri?: string): PreferenceResolveResult<T>;
-    abstract getPreferences(resourceUri?: string): {
-        [p: string]: any;
-    };
     /**
      * Stores a new value for the given preference key in the provider.
      * @param key the preference key (typically the name).
@@ -92,18 +65,18 @@ export declare abstract class PreferenceProvider implements Disposable {
      * await on `this.emitPreferencesChangedEvent(...)` or
      * `this.pendingChanges` if changes are fired indirectly.
      */
-    abstract setPreference(key: string, value: any, resourceUri?: string): Promise<boolean>;
-    /**
-     * Resolved when the preference provider is ready to provide preferences
-     * It should be resolved by subclasses.
-     */
-    get ready(): Promise<void>;
+    setPreference(key: string, value: JSONValue, resourceUri?: string): Promise<boolean>;
     /**
-     * Retrieve the domain for this provider.
+     * Resolve the value for the given preference and resource URI.
+     *
+     * @param preferenceName the preference identifier.
+     * @param resourceUri the URI of the resource for which this provider should resolve the preference. This is used to retrieve
+     * a potentially different value for the same preference for different resources, for example `files.encoding`.
      *
-     * @returns the domain or `undefined` if this provider is suitable for all domains.
+     * @returns an object containing the value stored for the given preference and resourceUri if it exists,
+     * otherwise `undefined`.
      */
-    getDomain(): string[] | undefined;
+    resolve<T>(preferenceName: string, resourceUri?: string): PreferenceResolveResult<T>;
     /**
      * Retrieve the configuration URI for the given resource URI.
      * @param resourceUri the uri of the resource or `undefined`.
@@ -111,7 +84,7 @@ export declare abstract class PreferenceProvider implements Disposable {
      *
      * @returns the corresponding resource URI or `undefined` if there is no valid URI.
      */
-    getConfigUri(resourceUri?: string, sectionName?: string): URI | undefined;
+    getConfigUri?(resourceUri?: string, sectionName?: string): URI | undefined;
     /**
      * Retrieves the first valid configuration URI contained by the given resource.
      * @param resourceUri the uri of the container resource or `undefined`.
@@ -120,14 +93,16 @@ export declare abstract class PreferenceProvider implements Disposable {
      * if there is no valid configuration URI at all.
      */
     getContainingConfigUri?(resourceUri?: string, sectionName?: string): URI | undefined;
-    static merge(source: JSONValue | undefined, target: JSONValue): JSONValue;
+    /**
+     * Return a JSONObject with all preferences stored in this preference provider
+     */
+    getPreferences(resourceUri?: string): JSONObject;
+}
+export declare namespace PreferenceUtils {
+    function merge(source: JSONValue | undefined, target: JSONValue): JSONValue;
     /**
      * Handles deep equality with the possibility of `undefined`
      */
-    static deepEqual(a: JSONValue | undefined, b: JSONValue | undefined): boolean;
-    protected getParsedContent(jsonData: any): {
-        [key: string]: any;
-    };
-    canHandleScope(scope: PreferenceScope): boolean;
+    function deepEqual(a: JSONValue | undefined, b: JSONValue | undefined): boolean;
 }
 //# sourceMappingURL=preference-provider.d.ts.map

package/lib/common/preferences/preference-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-provider.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAW,UAAU,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,WAAW,4BAA4B;IACzC;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC;IAC9B;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC;IAC9B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED,yBAAiB,4BAA4B,CAAC;IAC1C,SAAgB,OAAO,CAAC,MAAM,EAAE,4BAA4B,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAI3F;CACJ;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC;IACtC,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,KAAK,CAAC,EAAE,CAAC,CAAA;CACZ;AAED,MAAM,WAAW,6BAA6B;IAC1C,CAAC,cAAc,EAAE,MAAM,GAAG,4BAA4B,CAAC;CAC1D;AACD,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAE/D,MAAM,WAAW,kBAAmB,SAAQ,UAAU;IAClD,QAAQ,CAAC,uBAAuB,EAAE,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACvE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IAEpB;;;OAGG;IACH,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC;IAEhD;;;;;;;;OAQG;IACH,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IACpE;;;;;;;;;;OAUG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACpF;;;;;;;;;OASG;IACH,OAAO,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAErF;;;;;;OAMG;IACH,YAAY,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC;IAC3E;;;;;;OAMG;IACH,sBAAsB,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC;IAErF;;OAEG;IACH,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CACpD;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,KAAK,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,SAAS,CAqBjF;IAED;;OAEG;IACH,SAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAIrF;CAEJ"}

package/lib/common/preferences/preference-provider.js

@@ -0,0 +1,71 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2023 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PreferenceUtils = exports.PreferenceProvider = exports.PreferenceProviderDataChange = void 0;
+const coreutils_1 = require("@lumino/coreutils");
+const uri_1 = require("../uri");
+var PreferenceProviderDataChange;
+(function (PreferenceProviderDataChange) {
+    function affects(change, resourceUri) {
+        const resourcePath = resourceUri && new uri_1.URI(resourceUri).path;
+        const domain = change.domain;
+        return !resourcePath || !domain || domain.some(uri => new uri_1.URI(uri).path.relativity(resourcePath) >= 0);
+    }
+    PreferenceProviderDataChange.affects = affects;
+})(PreferenceProviderDataChange || (exports.PreferenceProviderDataChange = PreferenceProviderDataChange = {}));
+exports.PreferenceProvider = Symbol('PreferenceProvider');
+var PreferenceUtils;
+(function (PreferenceUtils) {
+    function merge(source, target) {
+        if (source === undefined || !coreutils_1.JSONExt.isObject(source)) {
+            return coreutils_1.JSONExt.deepCopy(target);
+        }
+        if (coreutils_1.JSONExt.isPrimitive(target)) {
+            return {};
+        }
+        for (const [key, value] of Object.entries(target)) {
+            if (key in source) {
+                const sourceValue = source[key];
+                if (coreutils_1.JSONExt.isObject(sourceValue) && coreutils_1.JSONExt.isObject(value)) {
+                    merge(sourceValue, value);
+                    continue;
+                }
+                else if (coreutils_1.JSONExt.isArray(sourceValue) && coreutils_1.JSONExt.isArray(value)) {
+                    source[key] = [...coreutils_1.JSONExt.deepCopy(sourceValue), ...coreutils_1.JSONExt.deepCopy(value)];
+                    continue;
+                }
+            }
+            source[key] = coreutils_1.JSONExt.deepCopy(value);
+        }
+        return source;
+    }
+    PreferenceUtils.merge = merge;
+    /**
+     * Handles deep equality with the possibility of `undefined`
+     */
+    function deepEqual(a, b) {
+        if (a === b) {
+            return true;
+        }
+        if (a === undefined || b === undefined) {
+            return false;
+        }
+        return coreutils_1.JSONExt.deepEqual(a, b);
+    }
+    PreferenceUtils.deepEqual = deepEqual;
+})(PreferenceUtils || (exports.PreferenceUtils = PreferenceUtils = {}));
+//# sourceMappingURL=preference-provider.js.map

package/lib/common/preferences/preference-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-provider.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-provider.ts"],"names":[],"mappings":"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"}

package/lib/common/preferences/preference-provider.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-provider.spec.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-provider.spec.ts"],"names":[],"mappings":""}

package/lib/{browser → common}/preferences/preference-provider.spec.js

@@ -17,17 +17,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const preference_provider_1 = require("./preference-provider");
 const { expect } = require('chai');
-describe('PreferenceProvider', () => {
+describe('PreferenceProviderImpl', () => {
     it('should preserve extra source fields on merge', () => {
-        const result = preference_provider_1.PreferenceProvider.merge({ 'configurations': [], 'compounds': [] }, { 'configurations': [] });
+        const result = preference_provider_1.PreferenceUtils.merge({ 'configurations': [], 'compounds': [] }, { 'configurations': [] });
         expect(result).deep.equals({ 'configurations': [], 'compounds': [] });
     });
     it('should preserve extra target fields on merge', () => {
-        const result = preference_provider_1.PreferenceProvider.merge({ 'configurations': [] }, { 'configurations': [], 'compounds': [] });
+        const result = preference_provider_1.PreferenceUtils.merge({ 'configurations': [] }, { 'configurations': [], 'compounds': [] });
         expect(result).deep.equals({ 'configurations': [], 'compounds': [] });
     });
     it('should merge array values', () => {
-        const result = preference_provider_1.PreferenceProvider.merge({ 'configurations': [{ 'name': 'test1', 'request': 'launch' }], 'compounds': [] }, { 'configurations': [{ 'name': 'test2' }] });
+        const result = preference_provider_1.PreferenceUtils.merge({ 'configurations': [{ 'name': 'test1', 'request': 'launch' }], 'compounds': [] }, { 'configurations': [{ 'name': 'test2' }] });
         expect(result).deep.equals({ 'configurations': [{ 'name': 'test1', 'request': 'launch' }, { 'name': 'test2' }], 'compounds': [] });
     });
 });

package/lib/common/preferences/preference-provider.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-provider.spec.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-provider.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,+DAAwD;AAExD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAEnC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACpD,MAAM,MAAM,GAAG,qCAAe,CAAC,KAAK,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1G,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACpD,MAAM,MAAM,GAAG,qCAAe,CAAC,KAAK,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1G,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACjC,MAAM,MAAM,GAAG,qCAAe,CAAC,KAAK,CAChC,EAAE,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,EACjF,EAAE,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAC9C,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;IACvI,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/lib/{browser → common}/preferences/preference-proxy.d.ts

@@ -1,6 +1,6 @@
 import { Disposable, Event, MaybePromise } from '../../common';
 import { PreferenceService } from './preference-service';
-import { PreferenceSchema } from './preference-contribution';
+import { IJSONSchema } from '../../common/json-schema';
 /**
  * It is worth explaining the type for `PreferenceChangeEvent`:
  *
@@ -147,5 +147,5 @@ export interface PreferenceProxyOptions {
  *
  * @deprecated @since 1.23.0 use `PreferenceProxyFactory` instead.
  */
-export declare function createPreferenceProxy<T>(preferences: PreferenceService, promisedSchema: MaybePromise<PreferenceSchema>, options?: PreferenceProxyOptions): PreferenceProxy<T>;
+export declare function createPreferenceProxy<T>(preferences: PreferenceService, promisedSchema: MaybePromise<IJSONSchema>, options?: PreferenceProxyOptions): PreferenceProxy<T>;
 //# sourceMappingURL=preference-proxy.d.ts.map

package/lib/common/preferences/preference-proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-proxy.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-proxy.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAY,YAAY,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAEH;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI;IACnC,OAAO,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACvE,GAAG;KACC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG;QACd,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;QAC3B,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxB;;WAEG;QAEH,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5B;CACJ,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACrC,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,mBAAmB,CAAC,CAAC;IAClC,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC,GAAG;QACvC,cAAc,EAAE,CAAC,CAAC;QAClB,kBAAkB,CAAC,EAAE,MAAM,CAAA;KAC9B,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;CACvD;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;AAC/G,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACjC;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,eAAe,CAAC,CAAC,CAAC,CA8LxK"}

package/lib/{browser → common}/preferences/preference-proxy.js

@@ -18,9 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPreferenceProxy = exports.PreferenceProxyOptions = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const common_1 = require("../../common");
-const preference_contribution_1 = require("./preference-contribution");
 const preference_scope_1 = require("./preference-scope");
-const preference_language_override_service_1 = require("./preference-language-override-service");
+const promise_util_1 = require("../../common/promise-util");
+const preference_language_override_service_1 = require("../../common/preferences/preference-language-override-service");
 exports.PreferenceProxyOptions = Symbol('PreferenceProxyOptions');
 /**
  * Creates a preference proxy for typesafe preference handling.
@@ -50,11 +50,11 @@ function createPreferenceProxy(preferences, promisedSchema, options) {
     const isDeep = style === 'deep' || style === 'both';
     const isFlat = style === 'both' || style === 'flat';
     let schema;
-    if (preference_contribution_1.PreferenceSchema.is(promisedSchema)) {
+    if (!(0, promise_util_1.isThenable)(promisedSchema)) {
         schema = promisedSchema;
     }
     else {
-        promisedSchema.then(s => schema = s);
+        promisedSchema.then((s) => schema = s);
     }
     const onPreferenceChanged = (listener, thisArgs, disposables) => preferences.onPreferencesChanged(changes => {
         if (schema) {
@@ -63,10 +63,10 @@ function createPreferenceProxy(preferences, promisedSchema, options) {
                 const overridden = preferences.overriddenPreferenceName(e.preferenceName);
                 const preferenceName = overridden ? overridden.preferenceName : e.preferenceName;
                 if (preferenceName.startsWith(prefix) && (!opts.overrideIdentifier || (overridden === null || overridden === void 0 ? void 0 : overridden.overrideIdentifier) === opts.overrideIdentifier)) {
-                    if (schema.properties[preferenceName]) {
+                    if (schema.properties && schema.properties[preferenceName]) {
                         const { newValue, oldValue } = e;
                         listener({
-                            newValue, oldValue, preferenceName,
+                            newValue: newValue, oldValue: oldValue, preferenceName: preferenceName,
                             affects: (resourceUri, overrideIdentifier) => {
                                 if (overrideIdentifier !== (overridden === null || overridden === void 0 ? void 0 : overridden.overrideIdentifier)) {
                                     return false;
@@ -90,7 +90,7 @@ function createPreferenceProxy(preferences, promisedSchema, options) {
     };
     const ownKeys = () => {
         const properties = [];
-        if (schema) {
+        if (schema && schema.properties) {
             for (const p of Object.keys(schema.properties)) {
                 if (p.startsWith(prefix)) {
                     const idx = p.indexOf('.', prefix.length);
@@ -116,7 +116,7 @@ function createPreferenceProxy(preferences, promisedSchema, options) {
         if (style === 'deep' && property.indexOf('.') !== -1) {
             return false;
         }
-        if (schema) {
+        if (schema && schema.properties) {
             const fullProperty = prefix ? prefix + property : property;
             if (schema.properties[fullProperty]) {
                 preferences.set(fullProperty, value, preference_scope_1.PreferenceScope.Default);
@@ -144,7 +144,7 @@ function createPreferenceProxy(preferences, promisedSchema, options) {
             throw new Error(`unexpected property: ${String(property)}`);
         }
         const fullProperty = prefix ? prefix + property : property;
-        if (schema) {
+        if (schema && schema.properties) {
             if (isFlat || property.indexOf('.') === -1) {
                 if (schema.properties[fullProperty]) {
                     let value;
@@ -176,7 +176,7 @@ function createPreferenceProxy(preferences, promisedSchema, options) {
         if (property === 'toJSON') {
             return toJSON();
         }
-        if (schema && isDeep) {
+        if (schema && schema.properties && isDeep) {
             const newPrefix = fullProperty + '.';
             for (const p of Object.keys(schema.properties)) {
                 if (p.startsWith(newPrefix)) {

package/lib/common/preferences/preference-proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-proxy.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-proxy.ts"],"names":[],"mappings":"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"}

package/lib/common/preferences/preference-schema-service.d.ts

@@ -0,0 +1,55 @@
+import { Disposable } from '../disposable';
+import { Emitter } from '../event';
+import { IJSONSchema } from '../json-schema';
+import { JSONObject, JSONValue } from '@lumino/coreutils';
+import { PreferenceDataProperty, PreferenceSchema, PreferenceSchemaService, DefaultValueChangedEvent, PreferenceContribution } from './preference-schema';
+import { PreferenceScope } from './preference-scope';
+import { ContributionProvider } from '../contribution-provider';
+import { Deferred } from '../promise-util';
+export declare class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
+    protected readonly schemas: Set<PreferenceSchema>;
+    protected readonly properties: Map<string, PreferenceDataProperty>;
+    /**
+     * This map stores default overrides. The primary map key is the base preference name.
+     * The preference name maps to a second map keyed by the override identifier or a special object value `NO_OVERRIDE',
+     * representing default overrides for the base property. The value in this second map is an array
+     * of entries in reverse order of their insertion. This is necessary becuaus multiple clients might register
+     * overrides for the same preference key/override combination. The elements in this array consist of a unique, generated
+     * identifier and the actual override value. This allows us to always return the last registerd override even
+     * when overrides are later removed.
+     */
+    protected readonly defaultOverrides: Map<string, Map<string | object, [number, JSONValue][]>>;
+    protected readonly _overrideIdentifiers: Set<string>;
+    protected readonly jsonSchemas: IJSONSchema[];
+    protected readonly _ready: Deferred<void>;
+    get ready(): Promise<void>;
+    get overrideIdentifiers(): ReadonlySet<string>;
+    getSchemaProperties(): ReadonlyMap<string, PreferenceDataProperty>;
+    protected nextSchemaTitle: number;
+    protected nextOverrideValueId: number;
+    protected readonly defaultValueChangedEmitter: Emitter<DefaultValueChangedEvent>;
+    protected readonly schemaChangedEmitter: Emitter<void>;
+    readonly onDidChangeDefaultValue: import("../event").Event<DefaultValueChangedEvent>;
+    readonly onDidChangeSchema: import("../event").Event<void>;
+    readonly validScopes: readonly PreferenceScope[];
+    protected readonly preferenceContributions: ContributionProvider<PreferenceContribution>;
+    protected init(): void;
+    dispose(): void;
+    registerOverrideIdentifier(overrideIdentifier: string): Disposable;
+    addSchema(schema: PreferenceSchema): Disposable;
+    isValidInScope(preferenceName: string, scope: PreferenceScope): boolean;
+    getSchemaProperty(key: string): PreferenceDataProperty | undefined;
+    updateSchemaProperty(key: string, property: PreferenceDataProperty): void;
+    registerOverride(key: string, overrideIdentifier: string | undefined, value: JSONValue): Disposable;
+    protected changeFor(key: string, overrideIdentifier: string | undefined, overrides: Map<string | object, [number, JSONValue][]> | undefined, oldValue: JSONValue | undefined, newValue: JSONValue | undefined): DefaultValueChangedEvent;
+    protected removeOverride(key: string, overrideIdentifier: string | undefined, overrideValueId: number): void;
+    getDefaultValue(key: string, overrideIdentifier: string | undefined): JSONValue | undefined;
+    inspectDefaultValue(key: string, overrideIdentifier: string | undefined): JSONValue | undefined;
+    getJSONSchema(scope: PreferenceScope): IJSONSchema;
+    private setJSONSchemasProperty;
+    private deleteFromJSONSchemas;
+    private setJSONSchemaProperty;
+    addOverrideToJsonSchema(overrideIdentifier: string): void;
+    getDefaultValues(): JSONObject;
+}
+//# sourceMappingURL=preference-schema-service.d.ts.map

package/lib/common/preferences/preference-schema-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-schema-service.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-schema-service.ts"],"names":[],"mappings":"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"}