@codingame/monaco-vscode-configuration-service-override 11.1.1 → 12.0.0

package/index.d.ts

@@ -1,2 +1,29 @@
-export * from 'vscode/service-override/configuration';
-export { default } from 'vscode/service-override/configuration';
+import type { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+import { ConfigurationScope, type IConfigurationDefaults, type IConfigurationNode, type IConfigurationRegistry } from "vscode/vscode/vs/platform/configuration/common/configurationRegistry";
+import type { IFileWriteOptions } from "vscode/vscode/vs/platform/files/common/files";
+import type { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from "vscode/vscode/vs/platform/workspace/common/workspace";
+import type { IStoredWorkspace, IWorkspaceFolderCreationData } from "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common/vscode/vs/platform/workspaces/common/workspaces";
+import type { IColorCustomizations, IThemeScopedColorCustomizations } from "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common/vscode/vs/workbench/services/themes/common/workbenchThemeService";
+declare const defaultUserConfigurationFile: URI;
+/**
+ * Should be called only BEFORE the service are initialized to initialize the file on the filesystem before the configuration service initializes
+ */
+declare function initUserConfiguration(configurationJson: string, options?: Partial<IFileWriteOptions>, file?: URI): Promise<void>;
+/**
+ * Can be called at any time after the services are initialized to update the user configuration
+ */
+declare function updateUserConfiguration(configurationJson: string): Promise<void>;
+declare function getUserConfiguration(): Promise<string>;
+declare function onUserConfigurationChange(callback: () => void): IDisposable;
+declare const configurationRegistry: IConfigurationRegistry;
+export declare function reinitializeWorkspace(workspace: IAnyWorkspaceIdentifier): Promise<void>;
+declare function getServiceOverride(): IEditorOverrideServices;
+/**
+ * @deprecated Provide workspace via the services `initialize` function `configuration.workspaceProvider` parameter
+ */
+declare function getServiceOverride(defaultWorkspace?: URI | IAnyWorkspaceIdentifier): IEditorOverrideServices;
+export default getServiceOverride;
+export { ConfigurationScope, configurationRegistry, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, updateUserConfiguration };
+export type { IAnyWorkspaceIdentifier, IColorCustomizations, IConfigurationDefaults, IConfigurationNode, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IStoredWorkspace, IThemeScopedColorCustomizations, IWorkspaceFolderCreationData, IWorkspaceIdentifier };

package/index.js

@@ -1,2 +1,139 @@
-export { configurationRegistry, default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, reinitializeWorkspace, updateUserConfiguration } from './configuration.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
+import { ITextResourceConfigurationService, ITextResourcePropertiesService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
+import { TextResourceConfigurationService } from './vscode/src/vs/editor/common/services/textResourceConfigurationService.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 export { ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IPolicyService } from 'vscode/vscode/vs/platform/policy/common/policy.service';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces.service';
+import './vscode/src/vs/workbench/api/common/configurationExtensionPoint.js';
+import './vscode/src/vs/workbench/contrib/workspaces/browser/workspaces.contribution.js';
+import { WorkspaceService } from './vscode/src/vs/workbench/services/configuration/browser/configurationService.js';
+import { ConfigurationCache } from './vscode/src/vs/workbench/services/configuration/common/configurationCache.js';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { TextResourcePropertiesService } from './vscode/src/vs/workbench/services/textresourceProperties/common/textResourcePropertiesService.js';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
+import { AbstractWorkspaceEditingService } from './vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js';
+import { BrowserWorkspacesService } from './vscode/src/vs/workbench/services/workspaces/browser/workspacesService.js';
+import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceEditing.service';
+import { ConfigurationResolverService } from './vscode/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.js';
+import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
+import getServiceOverride$1, { initFile } from '@codingame/monaco-vscode-files-service-override';
+import { registerServiceInitializePreParticipant } from 'vscode/lifecycle';
+import { getService, withReadyServices } from 'vscode/services';
+import { unsupported, memoizedConstructor } from 'vscode/tools';
+import { getWorkspaceIdentifier } from 'vscode/workbench';
+
+const defaultUserConfigurationFile = URI.from({
+    scheme: Schemas.vscodeUserData,
+    path: '/User/settings.json'
+});
+async function initUserConfiguration(configurationJson, options, file = defaultUserConfigurationFile) {
+    await initFile(file, configurationJson, options);
+}
+async function updateUserConfiguration(configurationJson) {
+    const userDataProfilesService = await getService(IUserDataProfilesService);
+    const fileService = await getService(IFileService);
+    await fileService.writeFile(userDataProfilesService.defaultProfile.settingsResource, VSBuffer.fromString(configurationJson));
+}
+async function getUserConfiguration() {
+    const userDataProfilesService = await getService(IUserDataProfilesService);
+    const fileService = await getService(IFileService);
+    return (await fileService.readFile(userDataProfilesService.defaultProfile.settingsResource)).value.toString();
+}
+function onUserConfigurationChange(callback) {
+    return withReadyServices((accessor) => {
+        const userDataProfilesService = accessor.get(IUserDataProfilesService);
+        return accessor.get(IFileService).onDidFilesChange((e) => {
+            if (e.affects(userDataProfilesService.defaultProfile.settingsResource)) {
+                callback();
+            }
+        });
+    });
+}
+const configurationRegistry = Registry.as(Extensions.Configuration);
+let InjectedConfigurationService = class InjectedConfigurationService extends WorkspaceService {
+    constructor(workbenchEnvironmentService, userDataProfileService, userDataProfilesService, fileService, remoteAgentService, uriIdentityService, logService, policyService) {
+        const configurationCache = new ConfigurationCache([Schemas.file, Schemas.vscodeUserData, Schemas.tmp], workbenchEnvironmentService, fileService);
+        super({ configurationCache }, workbenchEnvironmentService, userDataProfileService, userDataProfilesService, fileService, remoteAgentService, uriIdentityService, logService, policyService);
+    }
+};
+InjectedConfigurationService = __decorate([
+    __param(0, IWorkbenchEnvironmentService),
+    __param(1, IUserDataProfileService),
+    __param(2, IUserDataProfilesService),
+    __param(3, IFileService),
+    __param(4, IRemoteAgentService),
+    __param(5, IUriIdentityService),
+    __param(6, ILogService),
+    __param(7, IPolicyService)
+], InjectedConfigurationService);
+class MonacoWorkspaceEditingService extends AbstractWorkspaceEditingService {
+    constructor() {
+        super(...arguments);
+        this.enterWorkspace = unsupported;
+    }
+}
+let _defaultWorkspace;
+registerServiceInitializePreParticipant(async (accessor) => {
+    const workspaceService = accessor.get(IWorkspaceContextService);
+    workspaceService.acquireInstantiationService(accessor.get(IInstantiationService));
+    const workspace = _defaultWorkspace ?? getWorkspaceIdentifier();
+    if (URI.isUri(workspace)) {
+        const configPath = workspace.with({ path: '/workspace.code-workspace' });
+        try {
+            const fileService = accessor.get(IFileService);
+            await fileService.createFolder(workspace);
+            await fileService.writeFile(configPath, VSBuffer.fromString(JSON.stringify({
+                folders: [
+                    {
+                        path: workspace.path
+                    }
+                ]
+            })));
+        }
+        catch {
+        }
+        await workspaceService.initialize({
+            id: generateUuid(),
+            configPath
+        });
+    }
+    else {
+        await workspaceService.initialize(workspace);
+    }
+});
+const MemoizedInjectedConfigurationService = memoizedConstructor(InjectedConfigurationService);
+async function reinitializeWorkspace(workspace) {
+    const workspaceService = (await getService(IWorkspaceContextService));
+    await workspaceService.initialize(workspace);
+}
+function getServiceOverride(defaultWorkspace) {
+    _defaultWorkspace = defaultWorkspace;
+    return {
+        ...getServiceOverride$1(),
+        [IConfigurationService.toString()]: new SyncDescriptor(MemoizedInjectedConfigurationService, [], true),
+        [IWorkspaceContextService.toString()]: new SyncDescriptor(MemoizedInjectedConfigurationService, [], true),
+        [ITextResourceConfigurationService.toString()]: new SyncDescriptor(TextResourceConfigurationService, [], true),
+        [IWorkspaceEditingService.toString()]: new SyncDescriptor(MonacoWorkspaceEditingService, [], true),
+        [IWorkspacesService.toString()]: new SyncDescriptor(BrowserWorkspacesService, [], true),
+        [ITextResourcePropertiesService.toString()]: new SyncDescriptor(TextResourcePropertiesService, [], true),
+        [IConfigurationResolverService.toString()]: new SyncDescriptor(ConfigurationResolverService, [], true)
+    };
+}
+
+export { configurationRegistry, getServiceOverride as default, defaultUserConfigurationFile, getUserConfiguration, initUserConfiguration, onUserConfigurationChange, reinitializeWorkspace, updateUserConfiguration };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-configuration-service-override",
-  "version": "11.1.1",
+  "version": "12.0.0",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - configuration service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,24 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - configuration service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common": "12.0.0",
+    "@codingame/monaco-vscode-422642f2-7e3a-5c1c-9e1e-1d3ef1817346-common": "12.0.0",
+    "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "12.0.0",
+    "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common": "12.0.0",
+    "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common": "12.0.0",
+    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "12.0.0",
+    "@codingame/monaco-vscode-files-service-override": "12.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
+  },
+  "peerDependencies": {
+    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": "12.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@codingame/monaco-vscode-9d0168a3-519b-57f3-9bcc-89efc41f951a-common": {
+      "optional": true
+    }
+  },
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,11 +40,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.1",
-    "@codingame/monaco-vscode-files-service-override": "11.1.1"
   }
 }

package/vscode/src/vs/editor/common/services/textResourceConfigurationService.d.ts

@@ -0,0 +1,26 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IPosition } from "vscode/vscode/vs/editor/common/core/position";
+import { ILanguageService } from "vscode/vscode/vs/editor/common/languages/language";
+import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
+import { ITextResourceConfigurationService, ITextResourceConfigurationChangeEvent } from "vscode/vscode/vs/editor/common/services/textResourceConfiguration";
+import { ConfigurationTarget, IConfigurationValue } from "vscode/vscode/vs/platform/configuration/common/configuration";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+export declare class TextResourceConfigurationService extends Disposable implements ITextResourceConfigurationService {
+    private readonly configurationService;
+    private readonly modelService;
+    private readonly languageService;
+    _serviceBrand: undefined;
+    private readonly _onDidChangeConfiguration;
+    readonly onDidChangeConfiguration: Event<ITextResourceConfigurationChangeEvent>;
+    constructor(configurationService: IConfigurationService, modelService: IModelService, languageService: ILanguageService);
+    getValue<T>(resource: URI | undefined, section?: string): T;
+    getValue<T>(resource: URI | undefined, at?: IPosition, section?: string): T;
+    updateValue(resource: URI, key: string, value: any, configurationTarget?: ConfigurationTarget): Promise<void>;
+    private deriveConfigurationTarget;
+    private _getValue;
+    inspect<T>(resource: URI | undefined, position: IPosition | null, section: string): IConfigurationValue<Readonly<T>>;
+    private getLanguage;
+    private toResourceConfigurationChangeEvent;
+}

package/vscode/src/vs/editor/common/services/textResourceConfigurationService.js

@@ -1,9 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
 let TextResourceConfigurationService = class TextResourceConfigurationService extends Disposable {
@@ -34,34 +36,34 @@ let TextResourceConfigurationService = class TextResourceConfigurationService ex
     deriveConfigurationTarget(configurationValue, language) {
         if (language) {
             if (configurationValue.memory?.override !== undefined) {
-                return 8 ;
+                return ConfigurationTarget.MEMORY;
             }
             if (configurationValue.workspaceFolder?.override !== undefined) {
-                return 6 ;
+                return ConfigurationTarget.WORKSPACE_FOLDER;
             }
             if (configurationValue.workspace?.override !== undefined) {
-                return 5 ;
+                return ConfigurationTarget.WORKSPACE;
             }
             if (configurationValue.userRemote?.override !== undefined) {
-                return 4 ;
+                return ConfigurationTarget.USER_REMOTE;
             }
             if (configurationValue.userLocal?.override !== undefined) {
-                return 3 ;
+                return ConfigurationTarget.USER_LOCAL;
             }
         }
         if (configurationValue.memory?.value !== undefined) {
-            return 8 ;
+            return ConfigurationTarget.MEMORY;
         }
         if (configurationValue.workspaceFolder?.value !== undefined) {
-            return 6 ;
+            return ConfigurationTarget.WORKSPACE_FOLDER;
         }
         if (configurationValue.workspace?.value !== undefined) {
-            return 5 ;
+            return ConfigurationTarget.WORKSPACE;
         }
         if (configurationValue.userRemote?.value !== undefined) {
-            return 4 ;
+            return ConfigurationTarget.USER_REMOTE;
         }
-        return 3 ;
+        return ConfigurationTarget.USER_LOCAL;
     }
     _getValue(resource, position, section) {
         const language = resource ? this.getLanguage(resource, position) : undefined;

package/vscode/src/vs/workbench/api/common/configurationExtensionPoint.d.ts

@@ -0,0 +1 @@
+export {};