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

package/lib/browser/preferences/preference-schema-provider.spec.js

@@ -20,8 +20,9 @@ let disableJSDOM = (0, jsdom_1.enableJSDOM)();
 const assert = require("assert");
 const inversify_1 = require("inversify");
 const frontend_application_bindings_1 = require("../frontend-application-bindings");
-const preference_contribution_1 = require("./preference-contribution");
 const frontend_application_config_provider_1 = require("../frontend-application-config-provider");
+const preference_schema_1 = require("../../common/preferences/preference-schema");
+const preferences_1 = require("../../common/preferences");
 disableJSDOM();
 process.on('unhandledRejection', (reason, promise) => {
     console.error(reason);
@@ -50,6 +51,7 @@ const EDITOR_INSERT_SPACES_PROPERTIES = {
 };
 describe('Preference Schema Provider', () => {
     let prefSchema;
+    let prefDefaults;
     before(() => {
         disableJSDOM = (0, jsdom_1.enableJSDOM)();
         frontend_application_config_provider_1.FrontendApplicationConfigProvider.set({
@@ -64,53 +66,38 @@ describe('Preference Schema Provider', () => {
     });
     beforeEach(async () => {
         testContainer = createTestContainer();
-        prefSchema = testContainer.get(preference_contribution_1.PreferenceSchemaProvider);
+        prefSchema = testContainer.get(preference_schema_1.PreferenceSchemaService);
+        await prefSchema.ready;
+        prefSchema.registerOverrideIdentifier('typescript');
+        const providerProvider = testContainer.get(preferences_1.PreferenceProviderProvider);
+        prefDefaults = providerProvider(preferences_1.PreferenceScope.Default);
+        await prefDefaults.ready;
     });
     it('Should load all preferences specified in the frontend config.', () => {
-        assert.strictEqual(prefSchema.get('editor.fontSize'), 20);
-        assert.strictEqual(prefSchema.get('[typescript].editor.fontSize'), 24);
+        assert.strictEqual(prefDefaults.get('editor.fontSize'), 20);
+        assert.strictEqual(prefDefaults.get('[typescript].editor.fontSize'), 24);
     });
     it('Should favor the default specified in the package.json over a default registered by a schema', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.User,
             properties: {
                 ...EDITOR_FONT_SIZE_PROPERTIES
             }
         });
-        assert.strictEqual(prefSchema.get('editor.fontSize'), 20);
+        assert.strictEqual(prefDefaults.get('editor.fontSize'), 20);
     });
     it('Should merge language-specific overrides from schemas and the package.json', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
             properties: {
                 ...EDITOR_FONT_SIZE_PROPERTIES,
                 ...EDITOR_INSERT_SPACES_PROPERTIES,
-                '[typescript]': {
-                    type: 'object',
-                    default: {
-                        'editor.insertSpaces': false
-                    }
-                }
-            }
-        });
-        assert.strictEqual(prefSchema.get('editor.insertSpaces'), true);
-        assert.strictEqual(prefSchema.get('[typescript].editor.insertSpaces'), false);
-        assert.strictEqual(prefSchema.get('[typescript].editor.fontSize'), 24);
-    });
-    it('Should favor package.json specifications in the merge process', () => {
-        prefSchema.setSchema({
-            properties: {
-                ...EDITOR_FONT_SIZE_PROPERTIES,
-                ...EDITOR_INSERT_SPACES_PROPERTIES,
-                '[typescript]': {
-                    type: 'object',
-                    default: {
-                        'editor.insertSpaces': false,
-                        'editor.fontSize': 36,
-                    }
-                }
-            }
+            },
+            scope: preferences_1.PreferenceScope.Default
         });
-        assert.strictEqual(prefSchema.get('[typescript].editor.insertSpaces'), false);
-        assert.strictEqual(prefSchema.get('[typescript].editor.fontSize'), 24);
+        prefSchema.registerOverride('editor.insertSpaces', 'typescript', false);
+        assert.strictEqual(prefDefaults.get('editor.insertSpaces'), true);
+        assert.strictEqual(prefDefaults.get('[typescript].editor.insertSpaces'), false);
+        assert.strictEqual(prefDefaults.get('[typescript].editor.fontSize'), 24);
     });
 });
 //# sourceMappingURL=preference-schema-provider.spec.js.map

package/lib/browser/preferences/preference-schema-provider.spec.js.map

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

package/lib/browser/preferences/preference-service.spec.js

@@ -20,14 +20,12 @@ const jsdom_1 = require("../test/jsdom");
 let disableJSDOM = (0, jsdom_1.enableJSDOM)();
 const assert = require("assert");
 const inversify_1 = require("inversify");
-const frontend_application_bindings_1 = require("../frontend-application-bindings");
-const test_1 = require("./test");
-const preference_service_1 = require("./preference-service");
-const preference_contribution_1 = require("./preference-contribution");
-const preference_scope_1 = require("./preference-scope");
-const preference_provider_1 = require("./preference-provider");
+const preferences_1 = require("../../common/preferences");
+const preference_schema_1 = require("../../common/preferences/preference-schema");
 const frontend_application_config_provider_1 = require("../frontend-application-config-provider");
-const preference_proxy_1 = require("./preference-proxy");
+const test_1 = require("./test");
+const preference_proxy_1 = require("../../common/preferences/preference-proxy");
+const frontend_application_bindings_1 = require("../frontend-application-bindings");
 disableJSDOM();
 process.on('unhandledRejection', (reason, promise) => {
     console.error(reason);
@@ -53,11 +51,11 @@ describe('Preference Service', () => {
     });
     beforeEach(async () => {
         testContainer = createTestContainer();
-        prefSchema = testContainer.get(preference_contribution_1.PreferenceSchemaProvider);
-        prefService = testContainer.get(preference_service_1.PreferenceService);
-        getProvider(preference_scope_1.PreferenceScope.User).markReady();
-        getProvider(preference_scope_1.PreferenceScope.Workspace).markReady();
-        getProvider(preference_scope_1.PreferenceScope.Folder).markReady();
+        prefSchema = testContainer.get(preference_schema_1.PreferenceSchemaService);
+        prefService = testContainer.get(preferences_1.PreferenceService);
+        getProvider(preferences_1.PreferenceScope.User).markReady();
+        getProvider(preferences_1.PreferenceScope.Workspace).markReady();
+        getProvider(preferences_1.PreferenceScope.Folder).markReady();
         console.log('before ready');
         try {
             await prefService.ready;
@@ -70,20 +68,20 @@ describe('Preference Service', () => {
     afterEach(() => {
     });
     function getProvider(scope) {
-        return testContainer.getNamed(preference_provider_1.PreferenceProvider, scope);
+        return testContainer.getNamed(preferences_1.PreferenceProvider, scope);
     }
     it('should return the preference from the more specific scope (user > workspace)', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.Folder,
             properties: {
                 'test.number': {
                     type: 'number',
-                    scope: 'resource'
                 }
             }
         });
-        const userProvider = getProvider(preference_scope_1.PreferenceScope.User);
-        const workspaceProvider = getProvider(preference_scope_1.PreferenceScope.Workspace);
-        const folderProvider = getProvider(preference_scope_1.PreferenceScope.Folder);
+        const userProvider = getProvider(preferences_1.PreferenceScope.User);
+        const workspaceProvider = getProvider(preferences_1.PreferenceScope.Workspace);
+        const folderProvider = getProvider(preferences_1.PreferenceScope.Folder);
         userProvider.setPreference('test.number', 1);
         expect(prefService.get('test.number')).equals(1);
         workspaceProvider.setPreference('test.number', 0);
@@ -95,18 +93,18 @@ describe('Preference Service', () => {
         expect(prefService.get('test.number')).equals(0);
     });
     it('should throw a TypeError if the preference (reference object) is modified', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.Folder,
             properties: {
                 'test.immutable': {
                     type: 'array',
                     items: {
                         type: 'string'
                     },
-                    scope: 'resource'
                 }
             }
         });
-        const userProvider = getProvider(preference_scope_1.PreferenceScope.User);
+        const userProvider = getProvider(preferences_1.PreferenceScope.User);
         userProvider.setPreference('test.immutable', [
             'test', 'test', 'test'
         ]);
@@ -117,16 +115,16 @@ describe('Preference Service', () => {
         }
     });
     it('should still report the more specific preference even though the less specific one changed', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.Folder,
             properties: {
                 'test.number': {
                     type: 'number',
-                    scope: 'resource'
                 }
             }
         });
-        const userProvider = getProvider(preference_scope_1.PreferenceScope.User);
-        const workspaceProvider = getProvider(preference_scope_1.PreferenceScope.Workspace);
+        const userProvider = getProvider(preferences_1.PreferenceScope.User);
+        const workspaceProvider = getProvider(preferences_1.PreferenceScope.Workspace);
         userProvider.setPreference('test.number', 1);
         workspaceProvider.setPreference('test.number', 0);
         expect(prefService.get('test.number')).equals(0);
@@ -137,21 +135,17 @@ describe('Preference Service', () => {
         const events = [];
         prefService.onPreferenceChanged(event => events.push(event));
         prefSchema.registerOverrideIdentifier('go');
-        const toUnset = prefSchema.setSchema({
+        const toUnset = prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.User,
             properties: {
                 'editor.insertSpaces': {
                     type: 'boolean',
                     default: true,
                     overridable: true
-                },
-                '[go]': {
-                    type: 'object',
-                    default: {
-                        'editor.insertSpaces': false
-                    }
                 }
             }
         });
+        prefSchema.registerOverride('editor.insertSpaces', 'go', false);
         assert.deepStrictEqual([], events.map(e => ({
             preferenceName: e.preferenceName,
             newValue: e.newValue,
@@ -165,8 +159,8 @@ describe('Preference Service', () => {
             newValue: e.newValue,
             oldValue: e.oldValue
         })), 'events after unset in the same tick');
-        assert.strictEqual(prefService.get('editor.insertSpaces'), undefined, 'get after');
-        assert.strictEqual(prefService.get('[go].editor.insertSpaces'), undefined, 'get after overridden');
+        assert.strictEqual(prefService.get('editor.insertSpaces'), undefined, 'get after'); // removing the schema does not removes the default value
+        assert.strictEqual(prefService.get('[go].editor.insertSpaces'), false, 'get after overridden'); // but not the override
         assert.deepStrictEqual([], events.map(e => ({
             preferenceName: e.preferenceName,
             newValue: e.newValue,
@@ -176,21 +170,17 @@ describe('Preference Service', () => {
     it('should fire events if preference schema is unset in another tick', async () => {
         prefSchema.registerOverrideIdentifier('go');
         let pending = new Promise(resolve => prefService.onPreferencesChanged(resolve));
-        const toUnset = prefSchema.setSchema({
+        const toUnset = prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.User,
             properties: {
                 'editor.insertSpaces': {
                     type: 'boolean',
                     default: true,
                     overridable: true
-                },
-                '[go]': {
-                    type: 'object',
-                    default: {
-                        'editor.insertSpaces': false
-                    }
                 }
             }
         });
+        prefSchema.registerOverride('editor.insertSpaces', 'go', false);
         let changes = await pending;
         assert.deepStrictEqual([{
                 preferenceName: 'editor.insertSpaces',
@@ -222,16 +212,17 @@ describe('Preference Service', () => {
             return { preferenceName, newValue, oldValue };
         }), 'events after');
         assert.strictEqual(prefService.get('editor.insertSpaces'), undefined, 'get after');
-        assert.strictEqual(prefService.get('[go].editor.insertSpaces'), undefined, 'get after overridden');
+        assert.strictEqual(prefService.get('[go].editor.insertSpaces'), false, 'get after overridden');
     });
     function prepareServices(options) {
-        prefSchema.setSchema(options && options.schema || {
+        prefSchema.addSchema(options && options.schema || {
+            scope: preferences_1.PreferenceScope.User,
             properties: {
                 'editor.tabSize': {
                     type: 'number',
+                    default: 4,
                     description: '',
                     overridable: true,
-                    default: 4
                 }
             }
         });
@@ -242,9 +233,9 @@ describe('Preference Service', () => {
         const DUMMY_URI = 'dummy_uri';
         async function generateAndCheckValues(preferences, globalValue, workspaceValue, workspaceFolderValue) {
             var _a, _b;
-            await preferences.set(TAB_SIZE, globalValue, preference_scope_1.PreferenceScope.User);
-            await preferences.set(TAB_SIZE, workspaceValue, preference_scope_1.PreferenceScope.Workspace);
-            await preferences.set(TAB_SIZE, workspaceFolderValue, preference_scope_1.PreferenceScope.Folder, DUMMY_URI);
+            await preferences.set(TAB_SIZE, globalValue, preferences_1.PreferenceScope.User);
+            await preferences.set(TAB_SIZE, workspaceValue, preferences_1.PreferenceScope.Workspace);
+            await preferences.set(TAB_SIZE, workspaceFolderValue, preferences_1.PreferenceScope.Folder, DUMMY_URI);
             const expectedValue = (_b = (_a = workspaceFolderValue !== null && workspaceFolderValue !== void 0 ? workspaceFolderValue : workspaceValue) !== null && _a !== void 0 ? _a : globalValue) !== null && _b !== void 0 ? _b : 4;
             checkValues(preferences, globalValue, workspaceValue, workspaceFolderValue, expectedValue);
         }
@@ -299,11 +290,8 @@ describe('Preference Service', () => {
     });
     describe('overridden preferences', () => {
         it('get #0', () => {
-            const { preferences, schema } = prepareServices();
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
-            expect(preferences.get('editor.tabSize')).to.equal(4);
-            expect(preferences.get('[json].editor.tabSize')).to.equal(undefined);
-            schema.registerOverrideIdentifier('json');
+            const { preferences } = prepareServices();
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
             expect(preferences.get('editor.tabSize')).to.equal(4);
             expect(preferences.get('[json].editor.tabSize')).to.equal(2);
         });
@@ -312,7 +300,7 @@ describe('Preference Service', () => {
             schema.registerOverrideIdentifier('json');
             expect(preferences.get('editor.tabSize')).to.equal(4);
             expect(preferences.get('[json].editor.tabSize')).to.equal(4);
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
             expect(preferences.get('editor.tabSize')).to.equal(4);
             expect(preferences.get('[json].editor.tabSize')).to.equal(2);
         });
@@ -321,7 +309,7 @@ describe('Preference Service', () => {
             schema.registerOverrideIdentifier('json');
             expect(preferences.get('editor.tabSize')).to.equal(4);
             expect(preferences.get('[json].editor.tabSize')).to.equal(4);
-            preferences.set('editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            preferences.set('editor.tabSize', 2, preferences_1.PreferenceScope.User);
             expect(preferences.get('editor.tabSize')).to.equal(2);
             expect(preferences.get('[json].editor.tabSize')).to.equal(2);
         });
@@ -362,7 +350,7 @@ describe('Preference Service', () => {
                 workspaceFolderValue: undefined,
                 value: 2
             };
-            preferences.set('editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            preferences.set('editor.tabSize', 2, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual(expected, preferences.inspect('editor.tabSize'));
             assert.ok(!preferences.has('[json].editor.tabSize'));
             schema.registerOverrideIdentifier('json');
@@ -385,7 +373,7 @@ describe('Preference Service', () => {
             assert.deepStrictEqual(expected, preferences.inspect('editor.tabSize'));
             assert.ok(!preferences.has('[json].editor.tabSize'));
             schema.registerOverrideIdentifier('json');
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual(expected, preferences.inspect('editor.tabSize'));
             assert.deepStrictEqual({
                 ...expected,
@@ -399,8 +387,8 @@ describe('Preference Service', () => {
             const events = [];
             preferences.onPreferenceChanged(event => events.push(event));
             schema.registerOverrideIdentifier('json');
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
-            await preferences.set('editor.tabSize', 3, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
+            await preferences.set('editor.tabSize', 3, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual([{
                     preferenceName: '[json].editor.tabSize',
                     newValue: 2
@@ -417,7 +405,7 @@ describe('Preference Service', () => {
             const events = [];
             preferences.onPreferenceChanged(event => events.push(event));
             schema.registerOverrideIdentifier('json');
-            await preferences.set('editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            await preferences.set('editor.tabSize', 2, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual([{
                     preferenceName: 'editor.tabSize',
                     newValue: 2
@@ -433,12 +421,12 @@ describe('Preference Service', () => {
             const { preferences, schema } = prepareServices();
             schema.registerOverrideIdentifier('json');
             schema.registerOverrideIdentifier('javascript');
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
-            await preferences.set('editor.tabSize', 3, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
+            await preferences.set('editor.tabSize', 3, preferences_1.PreferenceScope.User);
             const events = [];
-            const proxy = (0, preference_proxy_1.createPreferenceProxy)(preferences, schema.getCombinedSchema(), { overrideIdentifier: 'json' });
+            const proxy = (0, preference_proxy_1.createPreferenceProxy)(preferences, schema.getJSONSchema(preferences_1.PreferenceScope.Folder), { overrideIdentifier: 'json' });
             proxy.onPreferenceChanged(event => events.push(event));
-            await preferences.set('[javascript].editor.tabSize', 4, preference_scope_1.PreferenceScope.User);
+            await preferences.set('[javascript].editor.tabSize', 4, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual([], events.map(e => ({
                 preferenceName: e.preferenceName,
                 newValue: e.newValue
@@ -447,11 +435,11 @@ describe('Preference Service', () => {
         it('onPreferenceChanged #3', async () => {
             const { preferences, schema } = prepareServices();
             schema.registerOverrideIdentifier('json');
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
-            await preferences.set('editor.tabSize', 3, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
+            await preferences.set('editor.tabSize', 3, preferences_1.PreferenceScope.User);
             const events = [];
             preferences.onPreferenceChanged(event => events.push(event));
-            await preferences.set('[json].editor.tabSize', undefined, preference_scope_1.PreferenceScope.User);
+            await preferences.set('[json].editor.tabSize', undefined, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual([{
                     preferenceName: '[json].editor.tabSize',
                     newValue: 3
@@ -463,6 +451,7 @@ describe('Preference Service', () => {
         it('defaultOverrides [go].editor.formatOnSave', () => {
             const { preferences, schema } = prepareServices({
                 schema: {
+                    scope: preferences_1.PreferenceScope.Folder,
                     properties: {
                         'editor.insertSpaces': {
                             type: 'boolean',
@@ -482,20 +471,8 @@ describe('Preference Service', () => {
             assert.strictEqual(false, preferences.get('editor.formatOnSave'));
             assert.strictEqual(undefined, preferences.get('[go].editor.formatOnSave'));
             schema.registerOverrideIdentifier('go');
-            schema.setSchema({
-                id: 'defaultOverrides',
-                title: 'Default Configuration Overrides',
-                properties: {
-                    '[go]': {
-                        type: 'object',
-                        default: {
-                            'editor.insertSpaces': false,
-                            'editor.formatOnSave': true
-                        },
-                        description: 'Configure editor settings to be overridden for go language.'
-                    }
-                }
-            });
+            prefSchema.registerOverride('editor.insertSpaces', 'go', false);
+            prefSchema.registerOverride('editor.formatOnSave', 'go', true);
             assert.strictEqual(true, preferences.get('editor.insertSpaces'));
             assert.strictEqual(false, preferences.get('[go].editor.insertSpaces'));
             assert.strictEqual(false, preferences.get('editor.formatOnSave'));

package/lib/browser/preferences/preference-service.spec.js.map

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

package/lib/browser/preferences/preference-validation-service.d.ts

@@ -1,58 +1,56 @@
-import { PreferenceItem } from '../../common/preferences/preference-schema';
 import { JSONObject, JSONValue } from '../../../shared/@lumino/coreutils';
-import { PreferenceSchemaProvider } from './preference-contribution';
-import { PreferenceLanguageOverrideService } from './preference-language-override-service';
 import { IJSONSchema, JsonType } from '../../common/json-schema';
+import { PreferenceLanguageOverrideService } from '../../common/preferences/preference-language-override-service';
+import { PreferenceSchemaService, PreferenceDataProperty } from '../../common/preferences';
 export interface PreferenceValidator<T> {
     name: string;
     validate(value: unknown): T;
 }
-export interface ValidatablePreference extends IJSONSchema, Pick<PreferenceItem, 'defaultValue'> {
-}
 export type ValueValidator = (value: JSONValue) => JSONValue;
 export interface PreferenceValidationResult<T extends JSONValue> {
     original: JSONValue | undefined;
     valid: T;
     messages: string[];
 }
-type ValidatablePreferenceTuple = ValidatablePreference & ({
-    items: ValidatablePreference[];
+type ValidatablePreferenceTuple = IJSONSchema & ({
+    items: IJSONSchema[];
 } | {
-    prefixItems: ValidatablePreference[];
+    prefixItems: IJSONSchema[];
 });
 export declare class PreferenceValidationService {
-    protected readonly schemaProvider: PreferenceSchemaProvider;
+    protected readonly schemaService: PreferenceSchemaService;
     protected readonly languageOverrideService: PreferenceLanguageOverrideService;
     validateOptions(options: Record<string, JSONValue>): Record<string, JSONValue>;
     validateByName(preferenceName: string, value: JSONValue): JSONValue;
     protected doValidateByName(preferenceName: string, value: JSONValue): JSONValue;
-    validateBySchema(key: string, value: JSONValue, schema: ValidatablePreference | undefined): JSONValue;
-    protected getSchema(name: string): ValidatablePreference | undefined;
-    protected validateMultiple(key: string, value: JSONValue, schema: ValidatablePreference & {
+    validateBySchema(key: string, value: JSONValue, schema: IJSONSchema | undefined): JSONValue;
+    protected getSchema(name: string): IJSONSchema | undefined;
+    protected validateMultiple(key: string, value: JSONValue, schema: IJSONSchema & {
         type: JsonType[];
     }): JSONValue;
-    protected validateAnyOf(key: string, value: JSONValue, schema: ValidatablePreference & {
-        anyOf: ValidatablePreference[];
+    protected validateAnyOf(key: string, value: JSONValue, schema: IJSONSchema & {
+        anyOf: IJSONSchema[];
     }): JSONValue;
-    protected validateOneOf(key: string, value: JSONValue, schema: ValidatablePreference & {
-        oneOf: ValidatablePreference[];
+    protected validateOneOf(key: string, value: JSONValue, schema: IJSONSchema & {
+        oneOf: IJSONSchema[];
     }): JSONValue;
     protected mapValidators(key: string, value: JSONValue, validators: Iterable<(value: JSONValue) => JSONValue>): JSONValue;
-    protected validateArray(key: string, value: JSONValue, schema: ValidatablePreference): JSONValue[];
+    protected validateArray(key: string, value: JSONValue, schema: IJSONSchema): JSONValue[];
     protected validateTuple(key: string, value: JSONValue, schema: ValidatablePreferenceTuple): JSONValue[];
-    protected validateConst(key: string, value: JSONValue, schema: ValidatablePreference & {
+    protected validateConst(key: string, value: JSONValue, schema: IJSONSchema & {
         const: JSONValue;
     }): JSONValue;
-    protected validateEnum(key: string, value: JSONValue, schema: ValidatablePreference & {
+    protected validateEnum(key: string, value: JSONValue, schema: IJSONSchema & {
         enum: JSONValue[];
     }): JSONValue;
-    protected validateBoolean(key: string, value: JSONValue, schema: ValidatablePreference): boolean;
-    protected validateInteger(key: string, value: JSONValue, schema: ValidatablePreference): number;
-    protected validateNumber(key: string, value: JSONValue, schema: ValidatablePreference): number;
-    protected validateObject(key: string, value: JSONValue, schema: ValidatablePreference): JSONObject;
-    protected objectMatchesSchema(key: string, value: JSONValue, schema: ValidatablePreference): value is JSONObject;
-    protected validateString(key: string, value: JSONValue, schema: ValidatablePreference): string;
-    protected getDefaultFromSchema(schema: ValidatablePreference): JSONValue;
+    protected validateBoolean(key: string, value: JSONValue, schema: IJSONSchema): boolean;
+    protected validateInteger(key: string, value: JSONValue, schema: IJSONSchema): number;
+    protected validateNumber(key: string, value: JSONValue, schema: IJSONSchema): number;
+    protected validateObject(key: string, value: JSONValue, schema: IJSONSchema): JSONObject;
+    protected objectMatchesSchema(key: string, value: JSONValue, schema: IJSONSchema): value is JSONObject;
+    protected validateString(key: string, value: JSONValue, schema: IJSONSchema): string;
+    protected getDefaultFromSchema(schema: IJSONSchema): JSONValue;
+    getDefaultValue(property: PreferenceDataProperty): JSONValue;
 }
 export {};
 //# sourceMappingURL=preference-validation-service.d.ts.map