@codingame/monaco-vscode-files-service-override 4.5.1 → 5.0.0

package/files.js

@@ -1,13 +1,13 @@
 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 { mkdirp, FileService } from './vscode/src/vs/platform/files/common/fileService.js';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { InMemoryFileSystemProvider } from 'vscode/vscode/vs/platform/files/common/inMemoryFilesystemProvider';
 export { InMemoryFileSystemProvider } from 'vscode/vscode/vs/platform/files/common/inMemoryFilesystemProvider';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
-import { FileType, FilePermission, createFileSystemProviderError, FileSystemProviderErrorCode, FileSystemProviderError, toFileSystemProviderErrorCode } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileType, FilePermission, createFileSystemProviderError, FileSystemProviderErrorCode, FileSystemProviderError } from 'vscode/vscode/vs/platform/files/common/files';
 export { FileChangeType, FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType } from 'vscode/vscode/vs/platform/files/common/files';
 import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { extUri, joinPath } from 'vscode/vscode/vs/base/common/resources';
@@ -20,7 +20,6 @@ import { IndexedDB } from 'vscode/vscode/vs/base/browser/indexedDB';
 export { IndexedDB } from 'vscode/vscode/vs/base/browser/indexedDB';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { BufferLogger } from 'vscode/vscode/vs/platform/log/common/bufferLog';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { BrowserTextFileService } from './vscode/src/vs/workbench/services/textfile/browser/browserTextFileService.js';
 import { FilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
@@ -29,7 +28,7 @@ import { BrowserElevatedFileService } from './vscode/src/vs/workbench/services/f
 import { IElevatedFileService } from 'vscode/vscode/vs/workbench/services/files/common/elevatedFileService.service';
 import { registerServiceInitializePreParticipant, checkServicesNotInitialized } from 'vscode/lifecycle';
 import { logsPath } from 'vscode/workbench';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/files.configuration.contribution';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution._configuration';
 
 class RegisteredFile {
     constructor(uri, readonly) {
@@ -171,9 +170,10 @@ class RegisteredFileSystemProvider extends Disposable {
         throw createFileSystemProviderError('file not found', FileSystemProviderErrorCode.FileNotFound);
     }
     async readdir(resource) {
-        const includedPaths = ( Array.from(( this.files.keys()))
-            .map(uri => extUri.relativePath(resource, ( URI.parse(uri)))))
-            .filter(path => !path.startsWith('..'));
+        const includedPaths = ( ( Array.from(( this.files.keys()))
+            .map(uri => ( URI.parse(uri))))
+            .filter(uri => uri.path.startsWith(resource.path + '/'))
+            .map(uri => extUri.relativePath(resource, uri)));
         const files = includedPaths.filter(path => !path.includes('/'));
         const directories = ( includedPaths.filter(path => path.includes('/')).map(path => path.slice(0, path.indexOf('/'))));
         return [
@@ -365,45 +365,9 @@ class OverlayFileSystemProvider {
         await this.writeToDelegates(delegate => delegate.rename(from, to, opts));
     }
 }
-function resourceForError(resource) {
-    if (resource.scheme === Schemas.file) {
-        return resource.fsPath;
-    }
-    return ( resource.toString(true));
-}
-async function mkdirp(provider, directory) {
-    const directoriesToCreate = [];
-    while (!extUri.isEqual(directory, extUri.dirname(directory))) {
-        try {
-            const stat = await provider.stat(directory);
-            if ((stat.type & FileType.Directory) === 0) {
-                throw new Error(localizeWithPath('mkdirExistsError', "Unable to create folder '{0}' that already exists but is not a directory", resourceForError(directory)));
-            }
-            break;
-        }
-        catch (error) {
-            if (toFileSystemProviderErrorCode(error) !== FileSystemProviderErrorCode.FileNotFound) {
-                throw error;
-            }
-            directoriesToCreate.push(extUri.basename(directory));
-            directory = extUri.dirname(directory);
-        }
-    }
-    for (let i = directoriesToCreate.length - 1; i >= 0; i--) {
-        directory = extUri.joinPath(directory, directoriesToCreate[i]);
-        try {
-            await provider.mkdir(directory);
-        }
-        catch (error) {
-            if (toFileSystemProviderErrorCode(error) !== FileSystemProviderErrorCode.FileExists) {
-                throw error;
-            }
-        }
-    }
-}
 class MkdirpOnWriteInMemoryFileSystemProvider extends InMemoryFileSystemProvider {
     async writeFile(resource, content, opts) {
-        await mkdirp(this, extUri.dirname(resource));
+        await mkdirp(extUri, this, extUri.dirname(resource));
         return super.writeFile(resource, content, opts);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-files-service-override",
-  "version": "4.5.1",
+  "version": "5.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.0"
   }
 }

package/vscode/src/vs/platform/files/browser/indexedDBFileSystemProvider.js

@@ -10,34 +10,15 @@ import { createFileSystemProviderError, FileSystemProviderErrorCode, FileType, F
 import { DBClosedError } from 'vscode/vscode/vs/base/browser/indexedDB';
 import { BroadcastDataChannel } from 'vscode/vscode/vs/base/browser/broadcast';
 
-const ERR_FILE_NOT_FOUND = createFileSystemProviderError(( localizeWithPath(
-    'vs/platform/files/browser/indexedDBFileSystemProvider',
-    'fileNotExists',
-    "File does not exist"
-)), FileSystemProviderErrorCode.FileNotFound);
-const ERR_FILE_IS_DIR = createFileSystemProviderError(( localizeWithPath(
-    'vs/platform/files/browser/indexedDBFileSystemProvider',
-    'fileIsDirectory',
-    "File is Directory"
-)), FileSystemProviderErrorCode.FileIsADirectory);
-const ERR_FILE_NOT_DIR = createFileSystemProviderError(( localizeWithPath(
-    'vs/platform/files/browser/indexedDBFileSystemProvider',
-    'fileNotDirectory',
-    "File is not a directory"
-)), FileSystemProviderErrorCode.FileNotADirectory);
-const ERR_DIR_NOT_EMPTY = createFileSystemProviderError(( localizeWithPath(
-    'vs/platform/files/browser/indexedDBFileSystemProvider',
-    'dirIsNotEmpty',
-    "Directory is not empty"
-)), FileSystemProviderErrorCode.Unknown);
-const ERR_FILE_EXCEEDS_STORAGE_QUOTA = createFileSystemProviderError(( localizeWithPath(
-    'vs/platform/files/browser/indexedDBFileSystemProvider',
-    'fileExceedsStorageQuota',
-    "File exceeds available storage quota"
-)), FileSystemProviderErrorCode.FileExceedsStorageQuota);
+const _moduleId = "vs/platform/files/browser/indexedDBFileSystemProvider";
+const ERR_FILE_NOT_FOUND = createFileSystemProviderError(( localizeWithPath(_moduleId, 0, "File does not exist")), FileSystemProviderErrorCode.FileNotFound);
+const ERR_FILE_IS_DIR = createFileSystemProviderError(( localizeWithPath(_moduleId, 1, "File is Directory")), FileSystemProviderErrorCode.FileIsADirectory);
+const ERR_FILE_NOT_DIR = createFileSystemProviderError(( localizeWithPath(_moduleId, 2, "File is not a directory")), FileSystemProviderErrorCode.FileNotADirectory);
+const ERR_DIR_NOT_EMPTY = createFileSystemProviderError(( localizeWithPath(_moduleId, 3, "Directory is not empty")), FileSystemProviderErrorCode.Unknown);
+const ERR_FILE_EXCEEDS_STORAGE_QUOTA = createFileSystemProviderError(( localizeWithPath(_moduleId, 4, "File exceeds available storage quota")), FileSystemProviderErrorCode.FileExceedsStorageQuota);
 const ERR_UNKNOWN_INTERNAL = (message) => createFileSystemProviderError(( localizeWithPath(
-    'vs/platform/files/browser/indexedDBFileSystemProvider',
-    'internal',
+    _moduleId,
+    5,
     "Internal error occurred in IndexedDB File System Provider. ({0})",
     message
 )), FileSystemProviderErrorCode.Unknown);
@@ -109,32 +90,32 @@ class IndexedDBFileSystemNode {
                 if (existing?.entry.type === FileType.File) {
                     throw ERR_UNKNOWN_INTERNAL(`Internal error creating IndexedDBFSNode -- overwriting file with directory: ${this.entry.path}/${next} (encountered while adding ${originalPath})`);
                 }
-                this.entry.children.set(next, existing ?? ( new IndexedDBFileSystemNode({
+                this.entry.children.set(next, existing ?? ( (new IndexedDBFileSystemNode({
                     type: FileType.Directory,
                     path: this.entry.path + '/' + next,
-                    children: ( new Map()),
-                })));
+                    children: ( (new Map())),
+                }))));
             }
             else {
                 if (existing?.entry.type === FileType.Directory) {
                     throw ERR_UNKNOWN_INTERNAL(`Internal error creating IndexedDBFSNode -- overwriting directory with file: ${this.entry.path}/${next} (encountered while adding ${originalPath})`);
                 }
-                this.entry.children.set(next, ( new IndexedDBFileSystemNode({
+                this.entry.children.set(next, ( (new IndexedDBFileSystemNode({
                     type: FileType.File,
                     path: this.entry.path + '/' + next,
                     size: entry.size,
-                })));
+                }))));
             }
         }
         else if (pathParts.length > 1) {
             const next = pathParts[0];
             let childNode = this.entry.children.get(next);
             if (!childNode) {
-                childNode = ( new IndexedDBFileSystemNode({
-                    children: ( new Map()),
+                childNode = ( (new IndexedDBFileSystemNode({
+                    children: ( (new Map())),
                     path: this.entry.path + '/' + next,
                     type: FileType.Directory
-                }));
+                })));
                 this.entry.children.set(next, childNode);
             }
             else if (childNode.type === FileType.File) {
@@ -159,18 +140,18 @@ class IndexedDBFileSystemProvider extends Disposable {
         this.capabilities = 2
             | 1024 ;
         this.onDidChangeCapabilities = Event.None;
-        this.extUri = ( new ExtUri(() => false)) ;
-        this._onDidChangeFile = this._register(( new Emitter()));
+        this.extUri = ( (new ExtUri(() => false))) ;
+        this._onDidChangeFile = this._register(( (new Emitter())));
         this.onDidChangeFile = this._onDidChangeFile.event;
-        this._onReportError = this._register(( new Emitter()));
+        this._onReportError = this._register(( (new Emitter())));
         this.onReportError = this._onReportError.event;
-        this.mtimes = ( new Map());
+        this.mtimes = ( (new Map()));
         this.fileWriteBatch = [];
-        this.writeManyThrottler = ( new Throttler());
+        this.writeManyThrottler = ( (new Throttler()));
         if (watchCrossWindowChanges) {
-            this.changesBroadcastChannel = this._register(( new BroadcastDataChannel(`vscode.indexedDB.${scheme}.changes`)));
+            this.changesBroadcastChannel = this._register(( (new BroadcastDataChannel(`vscode.indexedDB.${scheme}.changes`))));
             this._register(this.changesBroadcastChannel.onDidReceiveData(changes => {
-                this._onDidChangeFile.fire(( changes.map(c => ({ type: c.type, resource: URI.revive(c.resource) }))));
+                this._onDidChangeFile.fire(( (changes.map(c => ({ type: c.type, resource: URI.revive(c.resource) })))));
             }));
         }
     }
@@ -193,7 +174,7 @@ class IndexedDBFileSystemProvider extends Disposable {
             return {
                 type: FileType.File,
                 ctime: 0,
-                mtime: this.mtimes.get(( resource.toString())) || 0,
+                mtime: this.mtimes.get(( (resource.toString()))) || 0,
                 size: entry.size ?? (await this.readFile(resource)).byteLength
             };
         }
@@ -217,7 +198,9 @@ class IndexedDBFileSystemProvider extends Disposable {
                 throw ERR_FILE_NOT_DIR;
             }
             else {
-                return ( [...entry.children.entries()].map(([name, node]) => [name, node.type]));
+                return (
+                     ([...entry.children.entries()].map(([name, node]) => [name, node.type]))
+                );
             }
         }
         catch (error) {
@@ -286,7 +269,7 @@ class IndexedDBFileSystemProvider extends Disposable {
         }
         if (sourceFiles.length) {
             const targetFiles = [];
-            const sourceFilesContents = await this.indexedDB.runInTransaction(this.store, 'readonly', objectStore => ( sourceFiles.map(([path]) => objectStore.get(path))));
+            const sourceFilesContents = await this.indexedDB.runInTransaction(this.store, 'readonly', objectStore => ( (sourceFiles.map(([path]) => objectStore.get(path)))));
             for (let index = 0; index < sourceFiles.length; index++) {
                 const content = sourceFilesContents[index] instanceof Uint8Array ? sourceFilesContents[index] : isString(sourceFilesContents[index]) ? VSBuffer.fromString(sourceFilesContents[index]).buffer : undefined;
                 if (content) {
@@ -311,7 +294,7 @@ class IndexedDBFileSystemProvider extends Disposable {
         let toDelete;
         if (opts.recursive) {
             const tree = await this.tree(resource);
-            toDelete = ( tree.map(([path]) => path));
+            toDelete = ( (tree.map(([path]) => path)));
         }
         else {
             if (stat.type === FileType.Directory && (await this.readdir(resource)).length) {
@@ -322,9 +305,9 @@ class IndexedDBFileSystemProvider extends Disposable {
         await this.deleteKeys(toDelete);
         (await this.getFiletree()).delete(resource.path);
         toDelete.forEach(key => this.mtimes.delete(key));
-        this.triggerChanges(( toDelete.map(
+        this.triggerChanges(( (toDelete.map(
             path => ({ resource: resource.with({ path }), type: 2  })
-        )));
+        ))));
     }
     async tree(resource) {
         const stat = await this.stat(resource);
@@ -351,13 +334,13 @@ class IndexedDBFileSystemProvider extends Disposable {
     getFiletree() {
         if (!this.cachedFiletree) {
             this.cachedFiletree = (async () => {
-                const rootNode = ( new IndexedDBFileSystemNode({
-                    children: ( new Map()),
+                const rootNode = ( (new IndexedDBFileSystemNode({
+                    children: ( (new Map())),
                     path: '',
                     type: FileType.Directory
-                }));
+                })));
                 const result = await this.indexedDB.runInTransaction(this.store, 'readonly', objectStore => objectStore.getAllKeys());
-                const keys = ( result.map(key => ( key.toString())));
+                const keys = ( (result.map(key => ( (key.toString())))));
                 keys.forEach(key => rootNode.add(key, { type: 'file' }));
                 return rootNode;
             })();
@@ -370,17 +353,17 @@ class IndexedDBFileSystemProvider extends Disposable {
         const fileTree = await this.getFiletree();
         for (const [resource, content] of files) {
             fileTree.add(resource.path, { type: 'file', size: content.byteLength });
-            this.mtimes.set(( resource.toString()), Date.now());
+            this.mtimes.set(( (resource.toString())), Date.now());
         }
-        this.triggerChanges(( files.map(([resource]) => ({ resource, type: 0  }))));
+        this.triggerChanges(( (files.map(([resource]) => ({ resource, type: 0  })))));
     }
     async writeMany() {
         if (this.fileWriteBatch.length) {
             const fileBatch = this.fileWriteBatch.splice(0, this.fileWriteBatch.length);
             try {
-                await this.indexedDB.runInTransaction(this.store, 'readwrite', objectStore => ( fileBatch.map(entry => {
+                await this.indexedDB.runInTransaction(this.store, 'readwrite', objectStore => ( (fileBatch.map(entry => {
                     return objectStore.put(entry.content, entry.resource.path);
-                })));
+                }))));
             }
             catch (ex) {
                 if (ex instanceof DOMException && ex.name === 'QuotaExceededError') {
@@ -392,7 +375,7 @@ class IndexedDBFileSystemProvider extends Disposable {
     }
     async deleteKeys(keys) {
         if (keys.length) {
-            await this.indexedDB.runInTransaction(this.store, 'readwrite', objectStore => ( keys.map(key => objectStore.delete(key))));
+            await this.indexedDB.runInTransaction(this.store, 'readwrite', objectStore => ( (keys.map(key => objectStore.delete(key)))));
         }
     }
     async reset() {