@theia/core 1.53.0-next.4 → 1.53.0-next.55

package/src/node/dynamic-require.ts

@@ -1,56 +1,56 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson 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
-// *****************************************************************************
-
-declare const __non_webpack_require__: NodeJS.Require;
-
-const nodeRequire = typeof __non_webpack_require__ !== 'undefined' ? __non_webpack_require__ : require;
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function dynamicRequire<T = any>(id: string): T {
-    if (typeof id !== 'string') {
-        throw new TypeError('module id must be a string');
-    }
-    if (id.startsWith('.')) {
-        throw new Error(`module id cannot be a relative path, id: "${id}"`);
-    }
-    return nodeRequire(id);
-}
-
-/**
- * Remove all references to a module from Node's module cache.
- * @param filter callback to filter modules from the cache: return `true` to remove the module from the cache.
- */
-export function removeFromCache(filter: (mod: NodeJS.Module) => boolean): void {
-    Object.entries(nodeRequire.cache).forEach(([key, mod]) => {
-        if (!mod || mod.id.endsWith('.node')) {
-            return;
-        }
-        if (filter(mod)) {
-            delete nodeRequire.cache[key];
-            delete mod.exports;
-            mod.children.length = 0;
-            return;
-        }
-        mod.children.splice(0, mod.children.length, ...mod.children.filter(child => {
-            if (filter(child)) {
-                delete child.exports;
-                child.children.length = 0;
-                return false;
-            }
-            return true;
-        }));
-    });
-}
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson 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
+// *****************************************************************************
+
+declare const __non_webpack_require__: NodeJS.Require;
+
+const nodeRequire = typeof __non_webpack_require__ !== 'undefined' ? __non_webpack_require__ : require;
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function dynamicRequire<T = any>(id: string): T {
+    if (typeof id !== 'string') {
+        throw new TypeError('module id must be a string');
+    }
+    if (id.startsWith('.')) {
+        throw new Error(`module id cannot be a relative path, id: "${id}"`);
+    }
+    return nodeRequire(id);
+}
+
+/**
+ * Remove all references to a module from Node's module cache.
+ * @param filter callback to filter modules from the cache: return `true` to remove the module from the cache.
+ */
+export function removeFromCache(filter: (mod: NodeJS.Module) => boolean): void {
+    Object.entries(nodeRequire.cache).forEach(([key, mod]) => {
+        if (!mod || mod.id.endsWith('.node')) {
+            return;
+        }
+        if (filter(mod)) {
+            delete nodeRequire.cache[key];
+            delete mod.exports;
+            mod.children.length = 0;
+            return;
+        }
+        mod.children.splice(0, mod.children.length, ...mod.children.filter(child => {
+            if (filter(child)) {
+                delete child.exports;
+                child.children.length = 0;
+                return false;
+            }
+            return true;
+        }));
+    });
+}

package/src/node/env-variables/env-variables-server.ts

@@ -1,123 +1,123 @@
-// *****************************************************************************
-// Copyright (C) 2018-2020 Red Hat, Inc. 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 { join } from 'path';
-import { homedir } from 'os';
-import { injectable } from 'inversify';
-import * as drivelist from 'drivelist';
-import { pathExists, mkdir } from 'fs-extra';
-import { EnvVariable, EnvVariablesServer } from '../../common/env-variables';
-import { isWindows } from '../../common/os';
-import { FileUri } from '../../common/file-uri';
-import { BackendApplicationPath } from '../backend-application';
-
-@injectable()
-export class EnvVariablesServerImpl implements EnvVariablesServer {
-
-    protected readonly envs: { [key: string]: EnvVariable } = {};
-    protected readonly homeDirUri = FileUri.create(homedir()).toString();
-    protected readonly configDirUri: Promise<string>;
-    protected readonly pathExistenceCache: { [key: string]: boolean } = {};
-
-    constructor() {
-        this.configDirUri = this.createConfigDirUri();
-        this.configDirUri.then(configDirUri => console.log(`Configuration directory URI: '${configDirUri}'`));
-        const prEnv = process.env;
-        Object.keys(prEnv).forEach((key: string) => {
-            let keyName = key;
-            if (isWindows) {
-                keyName = key.toLowerCase();
-            }
-            this.envs[keyName] = { 'name': keyName, 'value': prEnv[key] };
-        });
-    }
-
-    protected async createConfigDirUri(): Promise<string> {
-        if (process.env.THEIA_CONFIG_DIR) {
-            // this has been explicitly set by the user, so we do not override its value
-            return FileUri.create(process.env.THEIA_CONFIG_DIR).toString();
-        }
-
-        const dataFolderPath = join(BackendApplicationPath, 'data');
-        const userDataPath = join(dataFolderPath, 'user-data');
-        const dataFolderExists = this.pathExistenceCache[dataFolderPath] ??= await pathExists(dataFolderPath);
-        if (dataFolderExists) {
-            const userDataExists = this.pathExistenceCache[userDataPath] ??= await pathExists(userDataPath);
-            if (userDataExists) {
-                process.env.THEIA_CONFIG_DIR = userDataPath;
-            } else {
-                await mkdir(userDataPath);
-                process.env.THEIA_CONFIG_DIR = userDataPath;
-                this.pathExistenceCache[userDataPath] = true;
-            }
-        } else {
-            process.env.THEIA_CONFIG_DIR = join(homedir(), '.theia');
-        }
-        return FileUri.create(process.env.THEIA_CONFIG_DIR).toString();
-    }
-
-    async getExecPath(): Promise<string> {
-        return process.execPath;
-    }
-
-    async getVariables(): Promise<EnvVariable[]> {
-        return Object.keys(this.envs).map(key => this.envs[key]);
-    }
-
-    async getValue(key: string): Promise<EnvVariable | undefined> {
-        if (isWindows) {
-            key = key.toLowerCase();
-        }
-        return this.envs[key];
-    }
-
-    getConfigDirUri(): Promise<string> {
-        return this.configDirUri;
-    }
-
-    async getHomeDirUri(): Promise<string> {
-        return this.homeDirUri;
-    }
-
-    async getDrives(): Promise<string[]> {
-        const uris: string[] = [];
-        const drives = await drivelist.list();
-        for (const drive of drives) {
-            for (const mountpoint of drive.mountpoints) {
-                if (this.filterHiddenPartitions(mountpoint.path)) {
-                    uris.push(FileUri.create(mountpoint.path).toString());
-                }
-            }
-        }
-        return uris;
-    }
-
-    /**
-     * Filters hidden and system partitions.
-     */
-    protected filterHiddenPartitions(path: string): boolean {
-        // OS X: This is your sleep-image. When your Mac goes to sleep it writes the contents of its memory to the hard disk. (https://bit.ly/2R6cztl)
-        if (path === '/private/var/vm') {
-            return false;
-        }
-        // Ubuntu: This system partition is simply the boot partition created when the computers mother board runs UEFI rather than BIOS. (https://bit.ly/2N5duHr)
-        if (path === '/boot/efi') {
-            return false;
-        }
-        return true;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018-2020 Red Hat, Inc. 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 { join } from 'path';
+import { homedir } from 'os';
+import { injectable } from 'inversify';
+import * as drivelist from 'drivelist';
+import { pathExists, mkdir } from 'fs-extra';
+import { EnvVariable, EnvVariablesServer } from '../../common/env-variables';
+import { isWindows } from '../../common/os';
+import { FileUri } from '../../common/file-uri';
+import { BackendApplicationPath } from '../backend-application';
+
+@injectable()
+export class EnvVariablesServerImpl implements EnvVariablesServer {
+
+    protected readonly envs: { [key: string]: EnvVariable } = {};
+    protected readonly homeDirUri = FileUri.create(homedir()).toString();
+    protected readonly configDirUri: Promise<string>;
+    protected readonly pathExistenceCache: { [key: string]: boolean } = {};
+
+    constructor() {
+        this.configDirUri = this.createConfigDirUri();
+        this.configDirUri.then(configDirUri => console.log(`Configuration directory URI: '${configDirUri}'`));
+        const prEnv = process.env;
+        Object.keys(prEnv).forEach((key: string) => {
+            let keyName = key;
+            if (isWindows) {
+                keyName = key.toLowerCase();
+            }
+            this.envs[keyName] = { 'name': keyName, 'value': prEnv[key] };
+        });
+    }
+
+    protected async createConfigDirUri(): Promise<string> {
+        if (process.env.THEIA_CONFIG_DIR) {
+            // this has been explicitly set by the user, so we do not override its value
+            return FileUri.create(process.env.THEIA_CONFIG_DIR).toString();
+        }
+
+        const dataFolderPath = join(BackendApplicationPath, 'data');
+        const userDataPath = join(dataFolderPath, 'user-data');
+        const dataFolderExists = this.pathExistenceCache[dataFolderPath] ??= await pathExists(dataFolderPath);
+        if (dataFolderExists) {
+            const userDataExists = this.pathExistenceCache[userDataPath] ??= await pathExists(userDataPath);
+            if (userDataExists) {
+                process.env.THEIA_CONFIG_DIR = userDataPath;
+            } else {
+                await mkdir(userDataPath);
+                process.env.THEIA_CONFIG_DIR = userDataPath;
+                this.pathExistenceCache[userDataPath] = true;
+            }
+        } else {
+            process.env.THEIA_CONFIG_DIR = join(homedir(), '.theia');
+        }
+        return FileUri.create(process.env.THEIA_CONFIG_DIR).toString();
+    }
+
+    async getExecPath(): Promise<string> {
+        return process.execPath;
+    }
+
+    async getVariables(): Promise<EnvVariable[]> {
+        return Object.keys(this.envs).map(key => this.envs[key]);
+    }
+
+    async getValue(key: string): Promise<EnvVariable | undefined> {
+        if (isWindows) {
+            key = key.toLowerCase();
+        }
+        return this.envs[key];
+    }
+
+    getConfigDirUri(): Promise<string> {
+        return this.configDirUri;
+    }
+
+    async getHomeDirUri(): Promise<string> {
+        return this.homeDirUri;
+    }
+
+    async getDrives(): Promise<string[]> {
+        const uris: string[] = [];
+        const drives = await drivelist.list();
+        for (const drive of drives) {
+            for (const mountpoint of drive.mountpoints) {
+                if (this.filterHiddenPartitions(mountpoint.path)) {
+                    uris.push(FileUri.create(mountpoint.path).toString());
+                }
+            }
+        }
+        return uris;
+    }
+
+    /**
+     * Filters hidden and system partitions.
+     */
+    protected filterHiddenPartitions(path: string): boolean {
+        // OS X: This is your sleep-image. When your Mac goes to sleep it writes the contents of its memory to the hard disk. (https://bit.ly/2R6cztl)
+        if (path === '/private/var/vm') {
+            return false;
+        }
+        // Ubuntu: This system partition is simply the boot partition created when the computers mother board runs UEFI rather than BIOS. (https://bit.ly/2N5duHr)
+        if (path === '/boot/efi') {
+            return false;
+        }
+        return true;
+    }
+
+}

package/src/node/env-variables/index.ts

@@ -1,17 +1,17 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. 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
-// *****************************************************************************
-
-export * from './env-variables-server';
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. 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
+// *****************************************************************************
+
+export * from './env-variables-server';

package/src/node/environment-utils.spec.ts

@@ -1,92 +1,92 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson 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 chai from 'chai';
-import { EnvironmentUtils } from './environment-utils';
-
-const expect = chai.expect;
-
-describe('EnvironmentUtils', function (): void {
-
-    describe('#mergeProcessEnv', function (): void {
-        this.timeout(5000);
-
-        let utils: EnvironmentUtils;
-
-        const PATH = 'PATH';
-
-        beforeEach(function (): void {
-            utils = new EnvironmentUtils();
-        });
-
-        it('should validate the presence of a known process variable', function (): void {
-            const mergedEnv = utils.mergeProcessEnv({});
-            expect(mergedEnv[PATH]).length.greaterThan(0);
-        });
-
-        for (const platform of ['linux', 'darwin'] as NodeJS.Platform[]) {
-            it(`should conserve case for keys on "${platform}"`, function (): void {
-                utils['getPlatform'] = () => platform;
-                process.env['TestKey'] = 'test_value';
-                const mergedEnv = utils.mergeProcessEnv({});
-                expect(mergedEnv['TestKey']).equal('test_value');
-                expect(mergedEnv['TESTKEY']).equal(undefined);
-            });
-        }
-
-        it('should uppercase keys on "win32"', function (): void {
-            utils['getPlatform'] = () => 'win32';
-            process.env['TestKey'] = 'test_value';
-            const mergedEnv = utils.mergeProcessEnv({});
-            expect(mergedEnv['TestKey']).equal(undefined);
-            expect(mergedEnv['TESTKEY']).equal('test_value');
-        });
-
-        it('should be possible to remove a known process variable', function (): void {
-            // eslint-disable-next-line no-null/no-null
-            const customizedEnv = { [PATH]: null };
-            const mergedEnv = utils.mergeProcessEnv(customizedEnv);
-            expect(mergedEnv[PATH]).equal(undefined);
-        });
-
-        it('should be possible to override the value of a known process variable', function (): void {
-            const expectedValue = '/path/to/one';
-            const customizedEnv = { [PATH]: expectedValue };
-
-            const mergedEnv = utils.mergeProcessEnv(customizedEnv);
-            expect(mergedEnv[PATH]).equals(expectedValue);
-        });
-
-        it('should not produce a different result when merging a previous result', function (): void {
-            const variableName = 'NEW_VARIABLE';
-            const expectedValue = 'true';
-            const customizedEnv = { [variableName]: expectedValue };
-
-            const mergedEnv = utils.mergeProcessEnv(customizedEnv);
-            expect(mergedEnv[variableName]).equals(expectedValue);
-        });
-
-        it('should not produce a different result when performing multiple merges', function (): void {
-            const variableName = 'NEW_VARIABLE';
-            const expectedValue = 'true';
-            const customizedEnv = { [variableName]: expectedValue };
-
-            const mergedEnv = utils.mergeProcessEnv(customizedEnv);
-            const mergedSecondPass = utils.mergeProcessEnv(mergedEnv);
-            expect(mergedEnv).to.deep.equal(mergedSecondPass);
-        });
-    });
-});
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson 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 chai from 'chai';
+import { EnvironmentUtils } from './environment-utils';
+
+const expect = chai.expect;
+
+describe('EnvironmentUtils', function (): void {
+
+    describe('#mergeProcessEnv', function (): void {
+        this.timeout(5000);
+
+        let utils: EnvironmentUtils;
+
+        const PATH = 'PATH';
+
+        beforeEach(function (): void {
+            utils = new EnvironmentUtils();
+        });
+
+        it('should validate the presence of a known process variable', function (): void {
+            const mergedEnv = utils.mergeProcessEnv({});
+            expect(mergedEnv[PATH]).length.greaterThan(0);
+        });
+
+        for (const platform of ['linux', 'darwin'] as NodeJS.Platform[]) {
+            it(`should conserve case for keys on "${platform}"`, function (): void {
+                utils['getPlatform'] = () => platform;
+                process.env['TestKey'] = 'test_value';
+                const mergedEnv = utils.mergeProcessEnv({});
+                expect(mergedEnv['TestKey']).equal('test_value');
+                expect(mergedEnv['TESTKEY']).equal(undefined);
+            });
+        }
+
+        it('should uppercase keys on "win32"', function (): void {
+            utils['getPlatform'] = () => 'win32';
+            process.env['TestKey'] = 'test_value';
+            const mergedEnv = utils.mergeProcessEnv({});
+            expect(mergedEnv['TestKey']).equal(undefined);
+            expect(mergedEnv['TESTKEY']).equal('test_value');
+        });
+
+        it('should be possible to remove a known process variable', function (): void {
+            // eslint-disable-next-line no-null/no-null
+            const customizedEnv = { [PATH]: null };
+            const mergedEnv = utils.mergeProcessEnv(customizedEnv);
+            expect(mergedEnv[PATH]).equal(undefined);
+        });
+
+        it('should be possible to override the value of a known process variable', function (): void {
+            const expectedValue = '/path/to/one';
+            const customizedEnv = { [PATH]: expectedValue };
+
+            const mergedEnv = utils.mergeProcessEnv(customizedEnv);
+            expect(mergedEnv[PATH]).equals(expectedValue);
+        });
+
+        it('should not produce a different result when merging a previous result', function (): void {
+            const variableName = 'NEW_VARIABLE';
+            const expectedValue = 'true';
+            const customizedEnv = { [variableName]: expectedValue };
+
+            const mergedEnv = utils.mergeProcessEnv(customizedEnv);
+            expect(mergedEnv[variableName]).equals(expectedValue);
+        });
+
+        it('should not produce a different result when performing multiple merges', function (): void {
+            const variableName = 'NEW_VARIABLE';
+            const expectedValue = 'true';
+            const customizedEnv = { [variableName]: expectedValue };
+
+            const mergedEnv = utils.mergeProcessEnv(customizedEnv);
+            const mergedSecondPass = utils.mergeProcessEnv(mergedEnv);
+            expect(mergedEnv).to.deep.equal(mergedSecondPass);
+        });
+    });
+});