@theia/filesystem 1.45.1 → 1.46.0-next.72

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

@@ -1,30 +1,30 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { DirectoryArchiver } from '../directory-archiver';
-import URI from '@theia/core/lib/common/uri';
-
-export class MockDirectoryArchiver extends DirectoryArchiver {
-
-    constructor(private folders?: URI[]) {
-        super();
-    }
-
-    protected override async isDir(uri: URI): Promise<boolean> {
-        return !!this.folders && this.folders.map(u => u.toString()).indexOf(uri.toString()) !== -1;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { DirectoryArchiver } from '../directory-archiver';
+import URI from '@theia/core/lib/common/uri';
+
+export class MockDirectoryArchiver extends DirectoryArchiver {
+
+    constructor(private folders?: URI[]) {
+        super();
+    }
+
+    protected override async isDir(uri: URI): Promise<boolean> {
+        return !!this.folders && this.folders.map(u => u.toString()).indexOf(uri.toString()) !== -1;
+    }
+
+}

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

@@ -1,110 +1,110 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as assert from 'assert';
-import { FileUri } from '@theia/core/lib/node/file-uri';
-import { FileChangeCollection } from './file-change-collection';
-import { FileChangeType } from '../common/files';
-
-describe('FileChangeCollection', () => {
-
-    assertChanges({
-        changes: [FileChangeType.ADDED, FileChangeType.ADDED],
-        expected: FileChangeType.ADDED
-    });
-
-    assertChanges({
-        changes: [FileChangeType.ADDED, FileChangeType.UPDATED],
-        expected: FileChangeType.ADDED
-    });
-
-    assertChanges({
-        changes: [FileChangeType.ADDED, FileChangeType.DELETED],
-        expected: [FileChangeType.ADDED, FileChangeType.DELETED]
-    });
-
-    assertChanges({
-        changes: [FileChangeType.UPDATED, FileChangeType.ADDED],
-        expected: FileChangeType.UPDATED
-    });
-
-    assertChanges({
-        changes: [FileChangeType.UPDATED, FileChangeType.UPDATED],
-        expected: FileChangeType.UPDATED
-    });
-
-    assertChanges({
-        changes: [FileChangeType.UPDATED, FileChangeType.DELETED],
-        expected: FileChangeType.DELETED
-    });
-
-    assertChanges({
-        changes: [FileChangeType.DELETED, FileChangeType.ADDED],
-        expected: FileChangeType.UPDATED
-    });
-
-    assertChanges({
-        changes: [FileChangeType.DELETED, FileChangeType.UPDATED],
-        expected: FileChangeType.UPDATED
-    });
-
-    assertChanges({
-        changes: [FileChangeType.DELETED, FileChangeType.DELETED],
-        expected: FileChangeType.DELETED
-    });
-
-    assertChanges({
-        changes: [FileChangeType.ADDED, FileChangeType.UPDATED, FileChangeType.DELETED],
-        expected: [FileChangeType.ADDED, FileChangeType.DELETED]
-    });
-
-    assertChanges({
-        changes: [FileChangeType.ADDED, FileChangeType.UPDATED, FileChangeType.DELETED, FileChangeType.ADDED],
-        expected: [FileChangeType.ADDED]
-    });
-
-    assertChanges({
-        changes: [FileChangeType.ADDED, FileChangeType.UPDATED, FileChangeType.DELETED, FileChangeType.UPDATED],
-        expected: [FileChangeType.ADDED]
-    });
-
-    assertChanges({
-        changes: [FileChangeType.ADDED, FileChangeType.UPDATED, FileChangeType.DELETED, FileChangeType.DELETED],
-        expected: [FileChangeType.ADDED, FileChangeType.DELETED]
-    });
-
-    function assertChanges({ changes, expected }: {
-        changes: FileChangeType[],
-        expected: FileChangeType[] | FileChangeType
-    }): void {
-        const expectedTypes = Array.isArray(expected) ? expected : [expected];
-        const expectation = expectedTypes.map(type => typeAsString(type)).join(' + ');
-        it(`${changes.map(type => typeAsString(type)).join(' + ')} => ${expectation}`, () => {
-            const collection = new FileChangeCollection();
-            const uri = FileUri.create('/root/foo/bar.txt').toString();
-            for (const type of changes) {
-                collection.push({ uri, type });
-            }
-            const actual = collection.values().map(({ type }) => typeAsString(type)).join(' + ');
-            assert.deepStrictEqual(expectation, actual);
-        });
-    }
-
-    function typeAsString(type: FileChangeType): string {
-        return type === FileChangeType.UPDATED ? 'UPDATED' : type === FileChangeType.ADDED ? 'ADDED' : 'DELETED';
-    }
-
-});
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as assert from 'assert';
+import { FileUri } from '@theia/core/lib/common/file-uri';
+import { FileChangeCollection } from './file-change-collection';
+import { FileChangeType } from '../common/files';
+
+describe('FileChangeCollection', () => {
+
+    assertChanges({
+        changes: [FileChangeType.ADDED, FileChangeType.ADDED],
+        expected: FileChangeType.ADDED
+    });
+
+    assertChanges({
+        changes: [FileChangeType.ADDED, FileChangeType.UPDATED],
+        expected: FileChangeType.ADDED
+    });
+
+    assertChanges({
+        changes: [FileChangeType.ADDED, FileChangeType.DELETED],
+        expected: [FileChangeType.ADDED, FileChangeType.DELETED]
+    });
+
+    assertChanges({
+        changes: [FileChangeType.UPDATED, FileChangeType.ADDED],
+        expected: FileChangeType.UPDATED
+    });
+
+    assertChanges({
+        changes: [FileChangeType.UPDATED, FileChangeType.UPDATED],
+        expected: FileChangeType.UPDATED
+    });
+
+    assertChanges({
+        changes: [FileChangeType.UPDATED, FileChangeType.DELETED],
+        expected: FileChangeType.DELETED
+    });
+
+    assertChanges({
+        changes: [FileChangeType.DELETED, FileChangeType.ADDED],
+        expected: FileChangeType.UPDATED
+    });
+
+    assertChanges({
+        changes: [FileChangeType.DELETED, FileChangeType.UPDATED],
+        expected: FileChangeType.UPDATED
+    });
+
+    assertChanges({
+        changes: [FileChangeType.DELETED, FileChangeType.DELETED],
+        expected: FileChangeType.DELETED
+    });
+
+    assertChanges({
+        changes: [FileChangeType.ADDED, FileChangeType.UPDATED, FileChangeType.DELETED],
+        expected: [FileChangeType.ADDED, FileChangeType.DELETED]
+    });
+
+    assertChanges({
+        changes: [FileChangeType.ADDED, FileChangeType.UPDATED, FileChangeType.DELETED, FileChangeType.ADDED],
+        expected: [FileChangeType.ADDED]
+    });
+
+    assertChanges({
+        changes: [FileChangeType.ADDED, FileChangeType.UPDATED, FileChangeType.DELETED, FileChangeType.UPDATED],
+        expected: [FileChangeType.ADDED]
+    });
+
+    assertChanges({
+        changes: [FileChangeType.ADDED, FileChangeType.UPDATED, FileChangeType.DELETED, FileChangeType.DELETED],
+        expected: [FileChangeType.ADDED, FileChangeType.DELETED]
+    });
+
+    function assertChanges({ changes, expected }: {
+        changes: FileChangeType[],
+        expected: FileChangeType[] | FileChangeType
+    }): void {
+        const expectedTypes = Array.isArray(expected) ? expected : [expected];
+        const expectation = expectedTypes.map(type => typeAsString(type)).join(' + ');
+        it(`${changes.map(type => typeAsString(type)).join(' + ')} => ${expectation}`, () => {
+            const collection = new FileChangeCollection();
+            const uri = FileUri.create('/root/foo/bar.txt').toString();
+            for (const type of changes) {
+                collection.push({ uri, type });
+            }
+            const actual = collection.values().map(({ type }) => typeAsString(type)).join(' + ');
+            assert.deepStrictEqual(expectation, actual);
+        });
+    }
+
+    function typeAsString(type: FileChangeType): string {
+        return type === FileChangeType.UPDATED ? 'UPDATED' : type === FileChangeType.ADDED ? 'ADDED' : 'DELETED';
+    }
+
+});

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

@@ -1,78 +1,78 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { FileChange, FileChangeType } from '../common/filesystem-watcher-protocol';
-
-/**
- * A file change collection guarantees that only one change is reported for each URI.
- *
- * Changes are normalized according following rules:
- * - ADDED + ADDED => ADDED
- * - ADDED + UPDATED => ADDED
- * - ADDED + DELETED => [ADDED, DELETED]
- * - UPDATED + ADDED => UPDATED
- * - UPDATED + UPDATED => UPDATED
- * - UPDATED + DELETED => DELETED
- * - DELETED + ADDED => UPDATED
- * - DELETED + UPDATED => UPDATED
- * - DELETED + DELETED => DELETED
- */
-export class FileChangeCollection {
-    protected readonly changes = new Map<string, FileChange[]>();
-
-    push(change: FileChange): void {
-        const changes = this.changes.get(change.uri) || [];
-        this.normalize(changes, change);
-        this.changes.set(change.uri, changes);
-    }
-
-    protected normalize(changes: FileChange[], change: FileChange): void {
-        let currentType;
-        let nextType: FileChangeType | [FileChangeType, FileChangeType] = change.type;
-        do {
-            const current = changes.pop();
-            currentType = current && current.type;
-            nextType = this.reduce(currentType, nextType);
-        } while (!Array.isArray(nextType) && currentType !== undefined && currentType !== nextType);
-
-        const uri = change.uri;
-        if (Array.isArray(nextType)) {
-            changes.push(...nextType.map(type => ({ uri, type })));
-        } else {
-            changes.push({ uri, type: nextType });
-        }
-    }
-
-    protected reduce(current: FileChangeType | undefined, change: FileChangeType): FileChangeType | [FileChangeType, FileChangeType] {
-        if (current === undefined) {
-            return change;
-        }
-        if (current === FileChangeType.ADDED) {
-            if (change === FileChangeType.DELETED) {
-                return [FileChangeType.ADDED, FileChangeType.DELETED];
-            }
-            return FileChangeType.ADDED;
-        }
-        if (change === FileChangeType.DELETED) {
-            return FileChangeType.DELETED;
-        }
-        return FileChangeType.UPDATED;
-    }
-
-    values(): FileChange[] {
-        return Array.from(this.changes.values()).reduce((acc, val) => acc.concat(val), []);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { FileChange, FileChangeType } from '../common/filesystem-watcher-protocol';
+
+/**
+ * A file change collection guarantees that only one change is reported for each URI.
+ *
+ * Changes are normalized according following rules:
+ * - ADDED + ADDED => ADDED
+ * - ADDED + UPDATED => ADDED
+ * - ADDED + DELETED => [ADDED, DELETED]
+ * - UPDATED + ADDED => UPDATED
+ * - UPDATED + UPDATED => UPDATED
+ * - UPDATED + DELETED => DELETED
+ * - DELETED + ADDED => UPDATED
+ * - DELETED + UPDATED => UPDATED
+ * - DELETED + DELETED => DELETED
+ */
+export class FileChangeCollection {
+    protected readonly changes = new Map<string, FileChange[]>();
+
+    push(change: FileChange): void {
+        const changes = this.changes.get(change.uri) || [];
+        this.normalize(changes, change);
+        this.changes.set(change.uri, changes);
+    }
+
+    protected normalize(changes: FileChange[], change: FileChange): void {
+        let currentType;
+        let nextType: FileChangeType | [FileChangeType, FileChangeType] = change.type;
+        do {
+            const current = changes.pop();
+            currentType = current && current.type;
+            nextType = this.reduce(currentType, nextType);
+        } while (!Array.isArray(nextType) && currentType !== undefined && currentType !== nextType);
+
+        const uri = change.uri;
+        if (Array.isArray(nextType)) {
+            changes.push(...nextType.map(type => ({ uri, type })));
+        } else {
+            changes.push({ uri, type: nextType });
+        }
+    }
+
+    protected reduce(current: FileChangeType | undefined, change: FileChangeType): FileChangeType | [FileChangeType, FileChangeType] {
+        if (current === undefined) {
+            return change;
+        }
+        if (current === FileChangeType.ADDED) {
+            if (change === FileChangeType.DELETED) {
+                return [FileChangeType.ADDED, FileChangeType.DELETED];
+            }
+            return FileChangeType.ADDED;
+        }
+        if (change === FileChangeType.DELETED) {
+            return FileChangeType.DELETED;
+        }
+        return FileChangeType.UPDATED;
+    }
+
+    values(): FileChange[] {
+        return Array.from(this.changes.values()).reduce((acc, val) => acc.concat(val), []);
+    }
+}