@theia/filesystem 1.45.0 → 1.46.0-next.106

package/src/electron-browser/file-dialog/electron-file-dialog-service.ts

@@ -28,7 +28,7 @@ import { DefaultFileDialogService, OpenFileDialogProps, SaveFileDialogProps } fr
 // solution.
 //
 // eslint-disable-next-line @theia/runtime-import-check
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/common/file-uri';
 import { OpenDialogOptions, SaveDialogOptions } from '../../electron-common/electron-api';
 
 import '@theia/core/lib/electron-common/electron-api';

package/src/node/disk-file-system-provider.spec.ts

@@ -18,15 +18,15 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
 import { EncodingService } from '@theia/core/lib/common/encoding-service';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/common/file-uri';
 import { IPCConnectionProvider } from '@theia/core/lib/node/messaging/ipc-connection-provider';
 import { Container, ContainerModule } from '@theia/core/shared/inversify';
 import { equal, fail } from 'assert';
 import { promises as fs } from 'fs';
 import { join } from 'path';
 import * as temp from 'temp';
-import { v4 } from 'uuid';
-import { FilePermission, FileSystemProviderError, FileSystemProviderErrorCode } from '../common/files';
+import { generateUuid } from '@theia/core/lib/common/uuid';
+import { FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode } from '../common/files';
 import { DiskFileSystemProvider } from './disk-file-system-provider';
 import { bindFileSystemWatcherServer } from './filesystem-backend-module';
 
@@ -53,7 +53,7 @@ describe('disk-file-system-provider', () => {
     describe('stat', () => {
         it("should omit the 'permissions' property of the stat if the file can be both read and write", async () => {
             const tempDirPath = tracked.mkdirSync();
-            const tempFilePath = join(tempDirPath, `${v4()}.txt`);
+            const tempFilePath = join(tempDirPath, `${generateUuid()}.txt`);
             await fs.writeFile(tempFilePath, 'some content', { encoding: 'utf8' });
 
             let content = await fs.readFile(tempFilePath, { encoding: 'utf8' });
@@ -70,7 +70,7 @@ describe('disk-file-system-provider', () => {
 
         it("should set the 'permissions' property to `Readonly` if the file can be read but not write", async () => {
             const tempDirPath = tracked.mkdirSync();
-            const tempFilePath = join(tempDirPath, `${v4()}.txt`);
+            const tempFilePath = join(tempDirPath, `${generateUuid()}.txt`);
             await fs.writeFile(tempFilePath, 'readonly content', {
                 encoding: 'utf8',
             });
@@ -93,6 +93,39 @@ describe('disk-file-system-provider', () => {
         });
     });
 
+    describe('delete', () => {
+        it('delete is able to delete folder', async () => {
+            const tempDirPath = tracked.mkdirSync();
+            const testFolder = join(tempDirPath, 'test');
+            const folderUri = FileUri.create(testFolder);
+            for (const recursive of [true, false]) {
+                // Note: useTrash = true fails on Linux
+                const useTrash = false;
+                if ((fsProvider.capabilities & FileSystemProviderCapabilities.Access) === 0 && useTrash) {
+                    continue;
+                }
+                await fsProvider.mkdir(folderUri);
+                if (recursive) {
+                    await fsProvider.writeFile(FileUri.create(join(testFolder, 'test.file')), Buffer.from('test'), { overwrite: false, create: true });
+                    await fsProvider.mkdir(FileUri.create(join(testFolder, 'subFolder')));
+                }
+                await fsProvider.delete(folderUri, { recursive, useTrash });
+            }
+        });
+
+        it('delete is able to delete file', async () => {
+            const tempDirPath = tracked.mkdirSync();
+            const testFile = join(tempDirPath, 'test.file');
+            const testFileUri = FileUri.create(testFile);
+            for (const recursive of [true, false]) {
+                for (const useTrash of [true, false]) {
+                    await fsProvider.writeFile(testFileUri, Buffer.from('test'), { overwrite: false, create: true });
+                    await fsProvider.delete(testFileUri, { recursive, useTrash });
+                }
+            }
+        });
+    });
+
     function createContainer(): Container {
         const container = new Container({ defaultScope: 'Singleton' });
         const module = new ContainerModule(bind => {

package/src/node/disk-file-system-provider.ts

@@ -24,7 +24,7 @@
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import { basename, dirname, normalize, join } from 'path';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import * as os from 'os';
 import * as fs from 'fs';
 import {
@@ -35,7 +35,7 @@ import {
 import { promisify } from 'util';
 import URI from '@theia/core/lib/common/uri';
 import { Path } from '@theia/core/lib/common/path';
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/common/file-uri';
 import { Event, Emitter } from '@theia/core/lib/common/event';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { OS, isWindows } from '@theia/core/lib/common/os';
@@ -509,7 +509,12 @@ export class DiskFileSystemProvider implements Disposable,
             if (opts.recursive) {
                 await this.rimraf(filePath);
             } else {
-                await promisify(unlink)(filePath);
+                const stat = await promisify(lstat)(filePath);
+                if (stat.isDirectory() && !stat.isSymbolicLink()) {
+                    await promisify(rmdir)(filePath);
+                } else {
+                    await promisify(unlink)(filePath);
+                }
             }
         } else {
             await trash(filePath);
@@ -525,7 +530,7 @@ export class DiskFileSystemProvider implements Disposable,
 
     protected async rimrafMove(path: string): Promise<void> {
         try {
-            const pathInTemp = join(os.tmpdir(), v4());
+            const pathInTemp = join(os.tmpdir(), generateUuid());
             try {
                 await promisify(rename)(path, pathInTemp);
             } catch (error) {

package/src/node/download/directory-archiver.spec.ts

@@ -21,7 +21,7 @@ import { extract } from 'tar-fs';
 import { expect } from 'chai';
 import URI from '@theia/core/lib/common/uri';
 import { MockDirectoryArchiver } from './test/mock-directory-archiver';
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/common/file-uri';
 
 const track = temp.track();
 

package/src/node/download/directory-archiver.ts

@@ -18,7 +18,7 @@ import { injectable } from '@theia/core/shared/inversify';
 import * as fs from '@theia/core/shared/fs-extra';
 import { pack } from 'tar-fs';
 import URI from '@theia/core/lib/common/uri';
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/common/file-uri';
 
 @injectable()
 export class DirectoryArchiver {

package/src/node/download/file-download-endpoint.ts

@@ -21,7 +21,7 @@ import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { json } from 'body-parser';
 import { Application, Router } from '@theia/core/shared/express';
 import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/common/file-uri';
 import { FileDownloadHandler } from './file-download-handler';
 
 @injectable()

package/src/node/download/file-download-handler.ts

@@ -17,14 +17,14 @@
 import * as os from 'os';
 import * as fs from '@theia/core/shared/fs-extra';
 import * as path from 'path';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import { Request, Response } from '@theia/core/shared/express';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { OK, BAD_REQUEST, METHOD_NOT_ALLOWED, NOT_FOUND, INTERNAL_SERVER_ERROR, REQUESTED_RANGE_NOT_SATISFIABLE, PARTIAL_CONTENT } from 'http-status-codes';
 import URI from '@theia/core/lib/common/uri';
 import { isEmpty } from '@theia/core/lib/common/objects';
 import { ILogger } from '@theia/core/lib/common/logger';
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/common/file-uri';
 import { DirectoryArchiver } from './directory-archiver';
 import { FileDownloadData } from '../../common/download/file-download-data';
 import { FileDownloadCache, DownloadStorageItem } from './file-download-cache';
@@ -135,12 +135,12 @@ export abstract class FileDownloadHandler {
             end: (isNaN(end) || end > statSize - 1) ? (statSize - 1) : end
         };
     }
-    protected async archive(inputPath: string, outputPath: string = path.join(os.tmpdir(), v4()), entries?: string[]): Promise<string> {
+    protected async archive(inputPath: string, outputPath: string = path.join(os.tmpdir(), generateUuid()), entries?: string[]): Promise<string> {
         await this.directoryArchiver.archive(inputPath, outputPath, entries);
         return outputPath;
     }
 
-    protected async createTempDir(downloadId: string = v4()): Promise<string> {
+    protected async createTempDir(downloadId: string = generateUuid()): Promise<string> {
         const outputPath = path.join(os.tmpdir(), downloadId);
         await fs.mkdir(outputPath);
         return outputPath;
@@ -221,7 +221,7 @@ export class SingleFileDownloadHandler extends FileDownloadHandler {
             return;
         }
         try {
-            const downloadId = v4();
+            const downloadId = generateUuid();
             const options: PrepareDownloadOptions = { filePath, downloadId, remove: false };
             if (!stat.isDirectory()) {
                 await this.prepareDownload(request, response, options);
@@ -271,7 +271,7 @@ export class MultiFileDownloadHandler extends FileDownloadHandler {
             }
         }
         try {
-            const downloadId = v4();
+            const downloadId = generateUuid();
             const outputRootPath = await this.createTempDir(downloadId);
             const distinctUris = Array.from(new Set(body.uris.map(uri => new URI(uri))));
             const tarPaths = [];

package/src/node/file-change-collection.spec.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import * as assert from 'assert';
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/common/file-uri';
 import { FileChangeCollection } from './file-change-collection';
 import { FileChangeType } from '../common/files';
 

package/src/node/nsfw-watcher/nsfw-filesystem-service.ts

@@ -18,7 +18,7 @@ import nsfw = require('@theia/core/shared/nsfw');
 import path = require('path');
 import { promises as fsp } from 'fs';
 import { IMinimatch, Minimatch } from 'minimatch';
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/common/file-uri';
 import {
     FileChangeType, FileSystemWatcherService, FileSystemWatcherServiceClient, WatchOptions
 } from '../../common/filesystem-watcher-protocol';