@codingame/monaco-vscode-files-service-override 4.3.1 → 4.4.0

package/files.d.ts

@@ -2,7 +2,7 @@ import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/brow
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, IDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { FileType, IStat, IFileSystemProviderWithFileReadWriteCapability, IFileChange, IFileSystemProvider, FileSystemProviderCapabilities, FileChangeType, IFileWriteOptions, IWatchOptions, IFileDeleteOptions, IFileOverwriteOptions } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileType, IStat, IFileSystemProviderWithFileReadWriteCapability, IFileChange, IWatchOptions, IFileWriteOptions, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProvider, FileSystemProviderCapabilities, FileChangeType } from 'vscode/vscode/vs/platform/files/common/files';
 export { FileChangeType, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProviderWithFileReadWriteCapability, IFileWriteOptions, IStat, IWatchOptions } from 'vscode/vscode/vs/platform/files/common/files';
 import { IndexedDBFileSystemProvider } from './vscode/src/vs/platform/files/browser/indexedDBFileSystemProvider.js';
 
@@ -62,6 +62,27 @@ declare class RegisteredFileSystemProvider extends Disposable implements IFileSy
     rename(from: URI, to: URI): Promise<void>;
     mkdir(): Promise<never>;
 }
+declare class OverlayFileSystemProvider implements IFileSystemProviderWithFileReadWriteCapability {
+    private providers;
+    register(priority: number, provider: IFileSystemProviderWithFileReadWriteCapability): IDisposable;
+    get delegates(): IFileSystemProviderWithFileReadWriteCapability[];
+    onDidChangeCapabilities: Event<any>;
+    _onDidChangeFile: Emitter<readonly IFileChange[]>;
+    onDidChangeFile: Event<readonly IFileChange[]>;
+    _onDidChangeOverlays: Emitter<void>;
+    onDidChangeOverlays: Event<void>;
+    capabilities: number;
+    private readFromDelegates;
+    private writeToDelegates;
+    stat(resource: URI): Promise<IStat>;
+    readFile(resource: URI): Promise<Uint8Array>;
+    readdir(resource: URI): Promise<[string, FileType][]>;
+    watch(resource: URI, opts: IWatchOptions): IDisposable;
+    writeFile(resource: URI, content: Uint8Array, opts: IFileWriteOptions): Promise<void>;
+    mkdir(resource: URI): Promise<void>;
+    delete(resource: URI, opts: IFileDeleteOptions): Promise<void>;
+    rename(from: URI, to: URI, opts: IFileOverwriteOptions): Promise<void>;
+}
 declare class DelegateFileSystemProvider implements IFileSystemProvider {
     private options;
     constructor(options: {
@@ -84,6 +105,19 @@ declare class DelegateFileSystemProvider implements IFileSystemProvider {
     delete(resource: URI, opts: IFileDeleteOptions): Promise<void>;
     rename(from: URI, to: URI, opts: IFileOverwriteOptions): Promise<void>;
 }
+declare class EmptyFileSystemProvider implements IFileSystemProviderWithFileReadWriteCapability {
+    readFile(): Promise<Uint8Array>;
+    writeFile(): Promise<void>;
+    capabilities: number;
+    onDidChangeCapabilities: Event<any>;
+    onDidChangeFile: Event<any>;
+    watch(): IDisposable;
+    stat(): Promise<IStat>;
+    mkdir(): Promise<void>;
+    readdir(): Promise<[string, FileType][]>;
+    delete(): Promise<void>;
+    rename(): Promise<void>;
+}
 declare namespace CustomSchemas {
     /**
      * A schema that is used for models that exist in memory
@@ -106,6 +140,11 @@ declare function initFile(file: URI, content: Uint8Array | string, options?: Par
  * Can be used to replace memory providers by indexeddb providers before the fileService is initialized
  */
 declare function createIndexedDBProviders(): Promise<IndexedDBFileSystemProvider>;
+/**
+ * Can be used to replace the default filesystem provider by the HTMLFileSystemProvider before the fileService is initialized
+ * Should be called "after" createIndexedDBProviders if used
+ */
+declare function registerHTMLFileSystemProvider(): void;
 /**
  * Register a file system overlay
  *
@@ -119,4 +158,4 @@ declare function createIndexedDBProviders(): Promise<IndexedDBFileSystemProvider
  */
 declare function registerFileSystemOverlay(priority: number, provider: IFileSystemProviderWithFileReadWriteCapability): IDisposable;
 
-export { CustomSchemas, DelegateFileSystemProvider, IndexedDBFileSystemProvider, RegisteredFile, RegisteredFileSystemProvider, RegisteredMemoryFile, RegisteredReadOnlyFile, createIndexedDBProviders, getServiceOverride as default, initFile, registerCustomProvider, registerExtensionFile, registerFileSystemOverlay };
+export { CustomSchemas, DelegateFileSystemProvider, EmptyFileSystemProvider, IndexedDBFileSystemProvider, OverlayFileSystemProvider, RegisteredFile, RegisteredFileSystemProvider, RegisteredMemoryFile, RegisteredReadOnlyFile, createIndexedDBProviders, getServiceOverride as default, initFile, registerCustomProvider, registerExtensionFile, registerFileSystemOverlay, registerHTMLFileSystemProvider };

package/files.js

@@ -1,4 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { FileService } from './vscode/src/vs/platform/files/common/fileService.js';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
@@ -10,6 +11,7 @@ export { FileChangeType, FilePermission, FileSystemProviderCapabilities, FileSys
 import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { extUri, joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { HTMLFileSystemProvider } from 'vscode/vscode/vs/platform/files/browser/htmlFileSystemProvider';
 export { HTMLFileSystemProvider } from 'vscode/vscode/vs/platform/files/browser/htmlFileSystemProvider';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IndexedDBFileSystemProvider } from './vscode/src/vs/platform/files/browser/indexedDBFileSystemProvider.js';
@@ -264,6 +266,9 @@ class OverlayFileSystemProvider {
         return ( this.providers.map(({ provider }) => provider));
     }
     async readFromDelegates(caller) {
+        if (this.delegates.length === 0) {
+            throw createFileSystemProviderError('No delegate', FileSystemProviderErrorCode.Unavailable);
+        }
         let firstError;
         for (const delegate of this.delegates) {
             try {
@@ -284,6 +289,9 @@ class OverlayFileSystemProvider {
         throw firstError;
     }
     async writeToDelegates(caller) {
+        if (this.delegates.length === 0) {
+            throw createFileSystemProviderError('No delegate', FileSystemProviderErrorCode.Unavailable);
+        }
         for (const provider of this.delegates) {
             if (((provider.capabilities & 2048) ) > 0) {
                 continue;
@@ -436,8 +444,39 @@ class DelegateFileSystemProvider {
         return this.options.delegate.rename(this.options.toDelegate(from), this.options.toDelegate(to), opts);
     }
 }
-const fileSystemProvider = new OverlayFileSystemProvider();
-fileSystemProvider.register(0, new MkdirpOnWriteInMemoryFileSystemProvider());
+class EmptyFileSystemProvider {
+    constructor() {
+        this.capabilities = 2  | 1024 ;
+        this.onDidChangeCapabilities = Event.None;
+        this.onDidChangeFile = Event.None;
+    }
+    async readFile() {
+        throw createFileSystemProviderError('Not found', FileSystemProviderErrorCode.FileNotFound);
+    }
+    async writeFile() {
+        throw createFileSystemProviderError('Not allowed', FileSystemProviderErrorCode.NoPermissions);
+    }
+    watch() {
+        return Disposable.None;
+    }
+    async stat() {
+        throw createFileSystemProviderError('Not found', FileSystemProviderErrorCode.FileNotFound);
+    }
+    async mkdir() {
+        throw createFileSystemProviderError('Not allowed', FileSystemProviderErrorCode.NoPermissions);
+    }
+    async readdir() {
+        throw createFileSystemProviderError('Not found', FileSystemProviderErrorCode.FileNotFound);
+    }
+    async delete() {
+        throw createFileSystemProviderError('Not allowed', FileSystemProviderErrorCode.NoPermissions);
+    }
+    async rename() {
+        throw createFileSystemProviderError('Not allowed', FileSystemProviderErrorCode.NoPermissions);
+    }
+}
+const overlayFileSystemProvider = new OverlayFileSystemProvider();
+overlayFileSystemProvider.register(0, new MkdirpOnWriteInMemoryFileSystemProvider());
 const extensionFileSystemProvider = new RegisteredFileSystemProvider(true);
 const userDataFileSystemProvider = new InMemoryFileSystemProvider();
 void userDataFileSystemProvider.mkdir(( URI.from({ scheme: Schemas.vscodeUserData, path: '/User/' })));
@@ -450,9 +489,9 @@ const providers = {
     [logsPath.scheme]: new InMemoryFileSystemProvider(),
     [Schemas.vscodeUserData]: userDataFileSystemProvider,
     [Schemas.tmp]: new InMemoryFileSystemProvider(),
-    [Schemas.file]: fileSystemProvider
+    [Schemas.file]: overlayFileSystemProvider
 };
-let MemoryFileService = class MemoryFileService extends FileService {
+let FileServiceOverride = class FileServiceOverride extends FileService {
     constructor(logService, telemetryService) {
         super(logService);
         for (const [scheme, provider] of Object.entries(providers)) {
@@ -460,7 +499,7 @@ let MemoryFileService = class MemoryFileService extends FileService {
             if (provider instanceof OverlayFileSystemProvider) {
                 provider.onDidChangeOverlays(() => {
                     disposable.dispose();
-                    disposable = this.registerProvider(scheme, fileSystemProvider);
+                    disposable = this.registerProvider(scheme, provider);
                 });
             }
             if (provider instanceof IndexedDBFileSystemProvider) {
@@ -469,16 +508,16 @@ let MemoryFileService = class MemoryFileService extends FileService {
         }
     }
 };
-MemoryFileService = __decorate([
+FileServiceOverride = __decorate([
     ( __param(1, ITelemetryService))
-], MemoryFileService);
+], FileServiceOverride);
 const fileLogger = new BufferLogger();
 registerServiceInitializePreParticipant(async (accessor) => {
     fileLogger.logger = accessor.get(ILogService);
 });
 function getServiceOverride() {
     return {
-        [( IFileService.toString())]: new SyncDescriptor(MemoryFileService, [fileLogger], true),
+        [( IFileService.toString())]: new SyncDescriptor(FileServiceOverride, [fileLogger], true),
         [( ITextFileService.toString())]: new SyncDescriptor(BrowserTextFileService, [], true),
         [( IFilesConfigurationService.toString())]: new SyncDescriptor(FilesConfigurationService, [], true),
         [( IElevatedFileService.toString())]: new SyncDescriptor(BrowserElevatedFileService, [], true)
@@ -513,17 +552,58 @@ async function initFile(file, content, options) {
         ...options
     });
 }
+let indexedDB;
+const userDataStore = 'vscode-userdata-store';
+const logsStore = 'vscode-logs-store';
+const handlesStore = 'vscode-filehandles-store';
 async function createIndexedDBProviders() {
-    const userDataStore = 'vscode-userdata-store';
-    const logsStore = 'vscode-logs-store';
-    const indexedDB = await IndexedDB.create('vscode-web-db', 3, [userDataStore, logsStore]);
+    indexedDB = await IndexedDB.create('vscode-web-db', 3, [userDataStore, logsStore, handlesStore]);
     registerCustomProvider(logsPath.scheme, new IndexedDBFileSystemProvider(logsPath.scheme, indexedDB, logsStore, false));
     const userDataProvider = new IndexedDBFileSystemProvider(Schemas.vscodeUserData, indexedDB, userDataStore, true);
     registerCustomProvider(Schemas.vscodeUserData, userDataProvider);
     return userDataProvider;
 }
+function registerHTMLFileSystemProvider() {
+    class LazyLogService {
+        get onDidChangeLogLevel() {
+            return StandaloneServices.get(ILogService).onDidChangeLogLevel;
+        }
+        getLevel() {
+            return StandaloneServices.get(ILogService).getLevel();
+        }
+        setLevel(level) {
+            StandaloneServices.get(ILogService).setLevel(level);
+        }
+        trace(message, ...args) {
+            StandaloneServices.get(ILogService).trace(message, ...args);
+        }
+        debug(message, ...args) {
+            StandaloneServices.get(ILogService).debug(message, ...args);
+        }
+        info(message, ...args) {
+            StandaloneServices.get(ILogService).info(message, ...args);
+        }
+        warn(message, ...args) {
+            StandaloneServices.get(ILogService).warn(message, ...args);
+        }
+        error(message, ...args) {
+            StandaloneServices.get(ILogService).error(message, ...args);
+        }
+        flush() {
+            StandaloneServices.get(ILogService).flush();
+        }
+        dispose() {
+            StandaloneServices.get(ILogService).dispose();
+        }
+    }
+    registerCustomProvider(Schemas.file, new HTMLFileSystemProvider(indexedDB, handlesStore, new LazyLogService()));
+}
 function registerFileSystemOverlay(priority, provider) {
-    return fileSystemProvider.register(priority, provider);
+    const overlayProvider = providers.file;
+    if (!(overlayProvider instanceof OverlayFileSystemProvider)) {
+        throw new Error('The overlay filesystem provider was replaced');
+    }
+    return overlayProvider.register(priority, provider);
 }
 
-export { CustomSchemas, DelegateFileSystemProvider, IndexedDBFileSystemProvider, RegisteredFile, RegisteredFileSystemProvider, RegisteredMemoryFile, RegisteredReadOnlyFile, createIndexedDBProviders, getServiceOverride as default, initFile, registerCustomProvider, registerExtensionFile, registerFileSystemOverlay };
+export { CustomSchemas, DelegateFileSystemProvider, EmptyFileSystemProvider, IndexedDBFileSystemProvider, OverlayFileSystemProvider, RegisteredFile, RegisteredFileSystemProvider, RegisteredMemoryFile, RegisteredReadOnlyFile, createIndexedDBProviders, getServiceOverride as default, initFile, registerCustomProvider, registerExtensionFile, registerFileSystemOverlay, registerHTMLFileSystemProvider };

package/index.d.ts

@@ -1,4 +1,4 @@
-export { CustomSchemas, DelegateFileSystemProvider, RegisteredFile, RegisteredFileSystemProvider, RegisteredMemoryFile, RegisteredReadOnlyFile, createIndexedDBProviders, default, initFile, registerCustomProvider, registerExtensionFile, registerFileSystemOverlay } from './files.js';
+export { CustomSchemas, DelegateFileSystemProvider, EmptyFileSystemProvider, OverlayFileSystemProvider, RegisteredFile, RegisteredFileSystemProvider, RegisteredMemoryFile, RegisteredReadOnlyFile, createIndexedDBProviders, default, initFile, registerCustomProvider, registerExtensionFile, registerFileSystemOverlay, registerHTMLFileSystemProvider } from './files.js';
 export { InMemoryFileSystemProvider } from './vscode/src/vs/platform/files/common/inMemoryFilesystemProvider.js';
 export { FileChangeType, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileSystemProviderWithFileReadWriteCapability, IFileWriteOptions, IStat, IWatchOptions } from 'vscode/vscode/vs/platform/files/common/files';
 export { HTMLFileSystemProvider } from './vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js';

package/index.js

@@ -1,4 +1,4 @@
-export { CustomSchemas, DelegateFileSystemProvider, RegisteredFile, RegisteredFileSystemProvider, RegisteredMemoryFile, RegisteredReadOnlyFile, createIndexedDBProviders, default, initFile, registerCustomProvider, registerExtensionFile, registerFileSystemOverlay } from './files.js';
+export { CustomSchemas, DelegateFileSystemProvider, EmptyFileSystemProvider, OverlayFileSystemProvider, RegisteredFile, RegisteredFileSystemProvider, RegisteredMemoryFile, RegisteredReadOnlyFile, createIndexedDBProviders, default, initFile, registerCustomProvider, registerExtensionFile, registerFileSystemOverlay, registerHTMLFileSystemProvider } from './files.js';
 export { FileChangeType, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType } from 'vscode/vscode/vs/platform/files/common/files';
 export { HTMLFileSystemProvider } from 'vscode/vscode/vs/platform/files/browser/htmlFileSystemProvider';
 export { InMemoryFileSystemProvider } from 'vscode/vscode/vs/platform/files/common/inMemoryFilesystemProvider';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.3.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.4.0"
   }
 }