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

package/src/node/cli.spec.ts

@@ -1,94 +1,94 @@
-// *****************************************************************************
-// Copyright (C) 2017 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 yargs from 'yargs';
-import * as chai from 'chai';
-import { CliManager, CliContribution } from './cli';
-import { Deferred } from '../common/promise-util';
-import { MaybePromise } from '../common/types';
-
-class TestCliManager extends CliManager {
-    constructor(...contribs: CliContribution[]) {
-        super({
-            getContributions(): CliContribution[] { return contribs; }
-        });
-    }
-}
-
-beforeEach(() => {
-    yargs.global([]);
-});
-
-describe('CliManager', () => {
-    it('Parses simple option', async () => {
-        const value = new Deferred<string>();
-        const manager = new TestCliManager({
-            configure(conf: yargs.Argv): void {
-                conf.option('foo', { alias: 'f', description: 'Some foo.' });
-                conf.option('bar', { alias: 'b', description: 'Some bla.', default: 'my-default', type: 'string' });
-            },
-            setArguments(args: yargs.Arguments): void {
-                value.resolve(args['foo'] as string);
-            }
-        });
-        await manager.initializeCli(['-f', 'bla'], () => Promise.resolve(), () => Promise.resolve());
-        chai.assert.equal(await value.promise, 'bla');
-    });
-
-    it('resolves with default', async () => {
-        const value = new Deferred<string>();
-        const manager = new TestCliManager({
-            configure(conf: yargs.Argv): void {
-                conf.option('foo', { alias: 'f', description: 'Some foo.' });
-                conf.option('bar', { alias: 'b', description: 'Some bla.', default: 'my-default', type: 'string' });
-            },
-            setArguments(args: yargs.Arguments): MaybePromise<void> {
-                value.resolve(args['bar'] as string);
-            }
-        });
-        await manager.initializeCli(['--foo'], () => Promise.resolve(), () => Promise.resolve());
-        chai.assert.equal(await value.promise, 'my-default');
-    });
-
-    it('prints help and exits', async () =>
-        assertExits(async () => {
-            const manager = new TestCliManager();
-            await manager.initializeCli(['--help'], () => Promise.resolve(), () => Promise.resolve());
-        })
-    );
-});
-
-async function assertExits(code: () => Promise<void>): Promise<void> {
-    const oldExit = process.exit;
-    const exitCalled = new Deferred<void>();
-    const exitError = new Error();
-    process.exit = () => {
-        throw exitError;
-    };
-    try {
-        await code();
-        exitCalled.reject();
-    } catch (err) {
-        if (err === exitError) {
-            exitCalled.resolve();
-        } else {
-            exitCalled.reject();
-        }
-    } finally {
-        process.exit = oldExit;
-    }
-    return exitCalled.promise;
-}
+// *****************************************************************************
+// Copyright (C) 2017 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 yargs from 'yargs';
+import * as chai from 'chai';
+import { CliManager, CliContribution } from './cli';
+import { Deferred } from '../common/promise-util';
+import { MaybePromise } from '../common/types';
+
+class TestCliManager extends CliManager {
+    constructor(...contribs: CliContribution[]) {
+        super({
+            getContributions(): CliContribution[] { return contribs; }
+        });
+    }
+}
+
+beforeEach(() => {
+    yargs.global([]);
+});
+
+describe('CliManager', () => {
+    it('Parses simple option', async () => {
+        const value = new Deferred<string>();
+        const manager = new TestCliManager({
+            configure(conf: yargs.Argv): void {
+                conf.option('foo', { alias: 'f', description: 'Some foo.' });
+                conf.option('bar', { alias: 'b', description: 'Some bla.', default: 'my-default', type: 'string' });
+            },
+            setArguments(args: yargs.Arguments): void {
+                value.resolve(args['foo'] as string);
+            }
+        });
+        await manager.initializeCli(['-f', 'bla'], () => Promise.resolve(), () => Promise.resolve());
+        chai.assert.equal(await value.promise, 'bla');
+    });
+
+    it('resolves with default', async () => {
+        const value = new Deferred<string>();
+        const manager = new TestCliManager({
+            configure(conf: yargs.Argv): void {
+                conf.option('foo', { alias: 'f', description: 'Some foo.' });
+                conf.option('bar', { alias: 'b', description: 'Some bla.', default: 'my-default', type: 'string' });
+            },
+            setArguments(args: yargs.Arguments): MaybePromise<void> {
+                value.resolve(args['bar'] as string);
+            }
+        });
+        await manager.initializeCli(['--foo'], () => Promise.resolve(), () => Promise.resolve());
+        chai.assert.equal(await value.promise, 'my-default');
+    });
+
+    it('prints help and exits', async () =>
+        assertExits(async () => {
+            const manager = new TestCliManager();
+            await manager.initializeCli(['--help'], () => Promise.resolve(), () => Promise.resolve());
+        })
+    );
+});
+
+async function assertExits(code: () => Promise<void>): Promise<void> {
+    const oldExit = process.exit;
+    const exitCalled = new Deferred<void>();
+    const exitError = new Error();
+    process.exit = () => {
+        throw exitError;
+    };
+    try {
+        await code();
+        exitCalled.reject();
+    } catch (err) {
+        if (err === exitError) {
+            exitCalled.resolve();
+        } else {
+            exitCalled.reject();
+        }
+    } finally {
+        process.exit = oldExit;
+    }
+    return exitCalled.promise;
+}

package/src/node/cli.ts

@@ -1,63 +1,63 @@
-// *****************************************************************************
-// Copyright (C) 2017 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 yargs from 'yargs';
-import { inject, named, injectable } from 'inversify';
-import { ContributionProvider } from '../common/contribution-provider';
-import { MaybePromise } from '../common/types';
-
-export const CliContribution = Symbol('CliContribution');
-
-/**
- * Call back for extension to contribute options to the cli.
- */
-export interface CliContribution {
-    configure(conf: yargs.Argv): void;
-    setArguments(args: yargs.Arguments): MaybePromise<void>;
-}
-
-@injectable()
-export class CliManager {
-
-    constructor(@inject(ContributionProvider) @named(CliContribution)
-    protected readonly contributionsProvider: ContributionProvider<CliContribution>) { }
-
-    async initializeCli<T>(argv: string[], postSetArguments: () => Promise<void>, defaultCommand: () => Promise<void>): Promise<void> {
-        const pack = require('../../package.json');
-        const version = pack.version;
-        const command = yargs(argv, process.cwd()).version(version);
-        command.exitProcess(this.isExit());
-        for (const contrib of this.contributionsProvider.getContributions()) {
-            contrib.configure(command);
-        }
-        await command
-            .detectLocale(false)
-            .showHelpOnFail(false, 'Specify --help for available options')
-            .help('help')
-            .middleware(async args => {
-                for (const contrib of this.contributionsProvider.getContributions()) {
-                    await contrib.setArguments(args);
-                }
-                await postSetArguments();
-            })
-            .command('$0', false, () => { }, defaultCommand)
-            .parse();
-    }
-
-    protected isExit(): boolean {
-        return true;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017 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 yargs from 'yargs';
+import { inject, named, injectable } from 'inversify';
+import { ContributionProvider } from '../common/contribution-provider';
+import { MaybePromise } from '../common/types';
+
+export const CliContribution = Symbol('CliContribution');
+
+/**
+ * Call back for extension to contribute options to the cli.
+ */
+export interface CliContribution {
+    configure(conf: yargs.Argv): void;
+    setArguments(args: yargs.Arguments): MaybePromise<void>;
+}
+
+@injectable()
+export class CliManager {
+
+    constructor(@inject(ContributionProvider) @named(CliContribution)
+    protected readonly contributionsProvider: ContributionProvider<CliContribution>) { }
+
+    async initializeCli<T>(argv: string[], postSetArguments: () => Promise<void>, defaultCommand: () => Promise<void>): Promise<void> {
+        const pack = require('../../package.json');
+        const version = pack.version;
+        const command = yargs(argv, process.cwd()).version(version);
+        command.exitProcess(this.isExit());
+        for (const contrib of this.contributionsProvider.getContributions()) {
+            contrib.configure(command);
+        }
+        await command
+            .detectLocale(false)
+            .showHelpOnFail(false, 'Specify --help for available options')
+            .help('help')
+            .middleware(async args => {
+                for (const contrib of this.contributionsProvider.getContributions()) {
+                    await contrib.setArguments(args);
+                }
+                await postSetArguments();
+            })
+            .command('$0', false, () => { }, defaultCommand)
+            .parse();
+    }
+
+    protected isExit(): boolean {
+        return true;
+    }
+}

package/src/node/console-logger-server.spec.ts

@@ -1,59 +1,59 @@
-// *****************************************************************************
-// Copyright (C) 2018 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 { Container, injectable, postConstruct } from 'inversify';
-import { ConsoleLoggerServer } from './console-logger-server';
-import { LogLevel } from '../common/logger-protocol';
-import { LoggerWatcher } from '../common/logger-watcher';
-import { LogLevelCliContribution } from './logger-cli-contribution';
-import { expect } from 'chai';
-
-let server: ConsoleLoggerServer;
-let logLevelCliContribution: MockLogLevelCliContribution;
-
-@injectable()
-class MockLogLevelCliContribution extends LogLevelCliContribution {
-
-    @postConstruct()
-    init(): void {
-        this._logLevels['test-logger'] = LogLevel.DEBUG;
-    }
-
-    changeLogLevel(newLevel: LogLevel): void {
-        this._logLevels['test-logger'] = newLevel;
-    }
-}
-
-beforeEach(() => {
-    const container = new Container;
-    container.bind(ConsoleLoggerServer).toSelf().inSingletonScope();
-    container.bind(LoggerWatcher).toSelf().inSingletonScope();
-    container.bind(MockLogLevelCliContribution).toSelf().inSingletonScope();
-    container.bind(LogLevelCliContribution).toService(MockLogLevelCliContribution);
-
-    logLevelCliContribution = container.get<MockLogLevelCliContribution>(MockLogLevelCliContribution);
-    server = container.get<ConsoleLoggerServer>(ConsoleLoggerServer);
-});
-
-describe('ConsoleLoggerServer', function (): void {
-    it('should respect log level config', async function (): Promise<void> {
-        expect(await server.getLogLevel('test-logger')).eq(LogLevel.DEBUG);
-        await server.child('test-logger');
-        expect(await server.getLogLevel('test-logger')).eq(LogLevel.DEBUG);
-        logLevelCliContribution.changeLogLevel(LogLevel.WARN);
-        expect(await server.getLogLevel('test-logger')).eq(LogLevel.WARN);
-    });
-});
+// *****************************************************************************
+// Copyright (C) 2018 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 { Container, injectable, postConstruct } from 'inversify';
+import { ConsoleLoggerServer } from './console-logger-server';
+import { LogLevel } from '../common/logger-protocol';
+import { LoggerWatcher } from '../common/logger-watcher';
+import { LogLevelCliContribution } from './logger-cli-contribution';
+import { expect } from 'chai';
+
+let server: ConsoleLoggerServer;
+let logLevelCliContribution: MockLogLevelCliContribution;
+
+@injectable()
+class MockLogLevelCliContribution extends LogLevelCliContribution {
+
+    @postConstruct()
+    init(): void {
+        this._logLevels['test-logger'] = LogLevel.DEBUG;
+    }
+
+    changeLogLevel(newLevel: LogLevel): void {
+        this._logLevels['test-logger'] = newLevel;
+    }
+}
+
+beforeEach(() => {
+    const container = new Container;
+    container.bind(ConsoleLoggerServer).toSelf().inSingletonScope();
+    container.bind(LoggerWatcher).toSelf().inSingletonScope();
+    container.bind(MockLogLevelCliContribution).toSelf().inSingletonScope();
+    container.bind(LogLevelCliContribution).toService(MockLogLevelCliContribution);
+
+    logLevelCliContribution = container.get<MockLogLevelCliContribution>(MockLogLevelCliContribution);
+    server = container.get<ConsoleLoggerServer>(ConsoleLoggerServer);
+});
+
+describe('ConsoleLoggerServer', function (): void {
+    it('should respect log level config', async function (): Promise<void> {
+        expect(await server.getLogLevel('test-logger')).eq(LogLevel.DEBUG);
+        await server.child('test-logger');
+        expect(await server.getLogLevel('test-logger')).eq(LogLevel.DEBUG);
+        logLevelCliContribution.changeLogLevel(LogLevel.WARN);
+        expect(await server.getLogLevel('test-logger')).eq(LogLevel.WARN);
+    });
+});

package/src/node/console-logger-server.ts

@@ -1,76 +1,76 @@
-// *****************************************************************************
-// Copyright (C) 2017 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 { inject, injectable, postConstruct } from 'inversify';
-import { LoggerWatcher } from '../common/logger-watcher';
-import { LogLevelCliContribution } from './logger-cli-contribution';
-import { ILoggerServer, ILoggerClient, ConsoleLogger, rootLoggerName } from '../common/logger-protocol';
-
-@injectable()
-export class ConsoleLoggerServer implements ILoggerServer {
-
-    protected client: ILoggerClient | undefined = undefined;
-
-    @inject(LoggerWatcher)
-    protected watcher: LoggerWatcher;
-
-    @inject(LogLevelCliContribution)
-    protected cli: LogLevelCliContribution;
-
-    @postConstruct()
-    protected init(): void {
-        this.setLogLevel(rootLoggerName, this.cli.defaultLogLevel);
-        for (const name of Object.keys(this.cli.logLevels)) {
-            this.setLogLevel(name, this.cli.logLevels[name]);
-        }
-        this.cli.onLogConfigChanged(() => {
-            this.client?.onLogConfigChanged();
-        });
-    }
-
-    async setLogLevel(name: string, newLogLevel: number): Promise<void> {
-        const event = {
-            loggerName: name,
-            newLogLevel
-        };
-        if (this.client !== undefined) {
-            this.client.onLogLevelChanged(event);
-        }
-    }
-
-    async getLogLevel(name: string): Promise<number> {
-        return this.cli.logLevelFor(name);
-    }
-
-    /* eslint-disable @typescript-eslint/no-explicit-any */
-    async log(name: string, logLevel: number, message: string, params: any[]): Promise<void> {
-        const configuredLogLevel = await this.getLogLevel(name);
-        if (logLevel >= configuredLogLevel) {
-            ConsoleLogger.log(name, logLevel, message, params);
-        }
-    }
-
-    async child(name: string): Promise<void> {
-        this.setLogLevel(name, this.cli.logLevelFor(name));
-    }
-
-    dispose(): void { }
-
-    setClient(client: ILoggerClient | undefined): void {
-        this.client = client;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2017 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 { inject, injectable, postConstruct } from 'inversify';
+import { LoggerWatcher } from '../common/logger-watcher';
+import { LogLevelCliContribution } from './logger-cli-contribution';
+import { ILoggerServer, ILoggerClient, ConsoleLogger, rootLoggerName } from '../common/logger-protocol';
+
+@injectable()
+export class ConsoleLoggerServer implements ILoggerServer {
+
+    protected client: ILoggerClient | undefined = undefined;
+
+    @inject(LoggerWatcher)
+    protected watcher: LoggerWatcher;
+
+    @inject(LogLevelCliContribution)
+    protected cli: LogLevelCliContribution;
+
+    @postConstruct()
+    protected init(): void {
+        this.setLogLevel(rootLoggerName, this.cli.defaultLogLevel);
+        for (const name of Object.keys(this.cli.logLevels)) {
+            this.setLogLevel(name, this.cli.logLevels[name]);
+        }
+        this.cli.onLogConfigChanged(() => {
+            this.client?.onLogConfigChanged();
+        });
+    }
+
+    async setLogLevel(name: string, newLogLevel: number): Promise<void> {
+        const event = {
+            loggerName: name,
+            newLogLevel
+        };
+        if (this.client !== undefined) {
+            this.client.onLogLevelChanged(event);
+        }
+    }
+
+    async getLogLevel(name: string): Promise<number> {
+        return this.cli.logLevelFor(name);
+    }
+
+    /* eslint-disable @typescript-eslint/no-explicit-any */
+    async log(name: string, logLevel: number, message: string, params: any[]): Promise<void> {
+        const configuredLogLevel = await this.getLogLevel(name);
+        if (logLevel >= configuredLogLevel) {
+            ConsoleLogger.log(name, logLevel, message, params);
+        }
+    }
+
+    async child(name: string): Promise<void> {
+        this.setLogLevel(name, this.cli.logLevelFor(name));
+    }
+
+    dispose(): void { }
+
+    setClient(client: ILoggerClient | undefined): void {
+        this.client = client;
+    }
+
+}

package/src/node/debug.ts

@@ -1,30 +1,30 @@
-// *****************************************************************************
-// Copyright (C) 2017 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
-// *****************************************************************************
-
-// eslint-disable-next-line no-var, @typescript-eslint/no-explicit-any
-declare var v8debug: any;
-function isInDebugMode(): boolean {
-    if (typeof v8debug === 'object') {
-        return true;
-    }
-    if (process && process.execArgv) {
-        return process.execArgv.some(arg =>
-            /^--(debug|inspect)(-brk)?=?/.test(arg)
-        );
-    }
-    return false;
-}
-export const DEBUG_MODE = isInDebugMode();
+// *****************************************************************************
+// Copyright (C) 2017 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
+// *****************************************************************************
+
+// eslint-disable-next-line no-var, @typescript-eslint/no-explicit-any
+declare var v8debug: any;
+function isInDebugMode(): boolean {
+    if (typeof v8debug === 'object') {
+        return true;
+    }
+    if (process && process.execArgv) {
+        return process.execArgv.some(arg =>
+            /^--(debug|inspect)(-brk)?=?/.test(arg)
+        );
+    }
+    return false;
+}
+export const DEBUG_MODE = isInDebugMode();