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

package/src/node/hosting/ws-origin-validator.ts

@@ -1,36 +1,36 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 http from 'http';
-import { inject, injectable } from 'inversify';
-import * as url from 'url';
-import { WsRequestValidatorContribution } from '../ws-request-validators';
-import { BackendApplicationHosts } from './backend-application-hosts';
-
-@injectable()
-export class WsOriginValidator implements WsRequestValidatorContribution {
-
-    @inject(BackendApplicationHosts)
-    protected readonly backendApplicationHosts: BackendApplicationHosts;
-
-    allowWsUpgrade(request: http.IncomingMessage): boolean {
-        if (!this.backendApplicationHosts.hasKnownHosts() || !request.headers.origin) {
-            return true;
-        }
-        const origin = url.parse(request.headers.origin);
-        return this.backendApplicationHosts.hosts.has(origin.host!);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 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 http from 'http';
+import { inject, injectable } from 'inversify';
+import * as url from 'url';
+import { WsRequestValidatorContribution } from '../ws-request-validators';
+import { BackendApplicationHosts } from './backend-application-hosts';
+
+@injectable()
+export class WsOriginValidator implements WsRequestValidatorContribution {
+
+    @inject(BackendApplicationHosts)
+    protected readonly backendApplicationHosts: BackendApplicationHosts;
+
+    allowWsUpgrade(request: http.IncomingMessage): boolean {
+        if (!this.backendApplicationHosts.hasKnownHosts() || !request.headers.origin) {
+            return true;
+        }
+        const origin = url.parse(request.headers.origin);
+        return this.backendApplicationHosts.hosts.has(origin.host!);
+    }
+}

package/src/node/i18n/i18n-backend-module.ts

@@ -1,42 +1,42 @@
-// *****************************************************************************
-// 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 { ContainerModule } from 'inversify';
-import { localizationPath } from '../../common/i18n/localization';
-import { LocalizationProvider } from './localization-provider';
-import { ConnectionHandler, RpcConnectionHandler, bindContributionProvider } from '../../common';
-import { LocalizationRegistry, LocalizationContribution } from './localization-contribution';
-import { LocalizationServerImpl } from './localization-server';
-import { TheiaLocalizationContribution } from './theia-localization-contribution';
-import { LocalizationServer, LocalizationServerPath } from '../../common/i18n/localization-server';
-import { BackendApplicationContribution } from '../backend-application';
-
-export default new ContainerModule(bind => {
-    bind(LocalizationProvider).toSelf().inSingletonScope();
-    bind(ConnectionHandler).toDynamicValue(ctx =>
-        new RpcConnectionHandler(localizationPath, () => ctx.container.get(LocalizationProvider))
-    ).inSingletonScope();
-    bind(LocalizationRegistry).toSelf().inSingletonScope();
-    bindContributionProvider(bind, LocalizationContribution);
-    bind(LocalizationServerImpl).toSelf().inSingletonScope();
-    bind(LocalizationServer).toService(LocalizationServerImpl);
-    bind(BackendApplicationContribution).toService(LocalizationServerImpl);
-    bind(ConnectionHandler).toDynamicValue(ctx =>
-        new RpcConnectionHandler(LocalizationServerPath, () => ctx.container.get(LocalizationServer))
-    ).inSingletonScope();
-    bind(TheiaLocalizationContribution).toSelf().inSingletonScope();
-    bind(LocalizationContribution).toService(TheiaLocalizationContribution);
-});
+// *****************************************************************************
+// 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 { ContainerModule } from 'inversify';
+import { localizationPath } from '../../common/i18n/localization';
+import { LocalizationProvider } from './localization-provider';
+import { ConnectionHandler, RpcConnectionHandler, bindContributionProvider } from '../../common';
+import { LocalizationRegistry, LocalizationContribution } from './localization-contribution';
+import { LocalizationServerImpl } from './localization-server';
+import { TheiaLocalizationContribution } from './theia-localization-contribution';
+import { LocalizationServer, LocalizationServerPath } from '../../common/i18n/localization-server';
+import { BackendApplicationContribution } from '../backend-application';
+
+export default new ContainerModule(bind => {
+    bind(LocalizationProvider).toSelf().inSingletonScope();
+    bind(ConnectionHandler).toDynamicValue(ctx =>
+        new RpcConnectionHandler(localizationPath, () => ctx.container.get(LocalizationProvider))
+    ).inSingletonScope();
+    bind(LocalizationRegistry).toSelf().inSingletonScope();
+    bindContributionProvider(bind, LocalizationContribution);
+    bind(LocalizationServerImpl).toSelf().inSingletonScope();
+    bind(LocalizationServer).toService(LocalizationServerImpl);
+    bind(BackendApplicationContribution).toService(LocalizationServerImpl);
+    bind(ConnectionHandler).toDynamicValue(ctx =>
+        new RpcConnectionHandler(LocalizationServerPath, () => ctx.container.get(LocalizationServer))
+    ).inSingletonScope();
+    bind(TheiaLocalizationContribution).toSelf().inSingletonScope();
+    bind(LocalizationContribution).toService(TheiaLocalizationContribution);
+});

package/src/node/i18n/localization-contribution.ts

@@ -1,112 +1,112 @@
-// *****************************************************************************
-// Copyright (C) 2021 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 fs from 'fs-extra';
-import { inject, injectable, named } from 'inversify';
-import { ContributionProvider, isObject } from '../../common';
-import { LanguageInfo, Localization } from '../../common/i18n/localization';
-import { LazyLocalization, LocalizationProvider } from './localization-provider';
-
-export const LocalizationContribution = Symbol('LocalizationContribution');
-
-export interface LocalizationContribution {
-    registerLocalizations(registry: LocalizationRegistry): Promise<void>;
-}
-
-@injectable()
-export class LocalizationRegistry {
-
-    @inject(LocalizationProvider)
-    protected readonly localizationProvider: LocalizationProvider;
-
-    @inject(ContributionProvider) @named(LocalizationContribution)
-    protected readonly contributions: ContributionProvider<LocalizationContribution>;
-
-    async initialize(): Promise<void> {
-        await Promise.all(this.contributions.getContributions().map(
-            contribution => contribution.registerLocalizations(this)
-        ));
-    }
-
-    registerLocalization(localization: Localization | LazyLocalization): void {
-        if (!LazyLocalization.is(localization)) {
-            localization = LazyLocalization.fromLocalization(localization);
-        }
-        this.localizationProvider.addLocalizations(localization);
-    }
-
-    registerLocalizationFromRequire(locale: string | LanguageInfo, required: unknown): void {
-        const translations = this.flattenTranslations(required);
-        this.registerLocalization(this.createLocalization(locale, () => Promise.resolve(translations)));
-    }
-
-    registerLocalizationFromFile(localizationPath: string, locale?: string | LanguageInfo): void {
-        if (!locale) {
-            locale = this.identifyLocale(localizationPath);
-        }
-        if (!locale) {
-            throw new Error('Could not determine locale from path.');
-        }
-        this.registerLocalization(this.createLocalization(locale, async () => {
-            const translationJson = await fs.readJson(localizationPath);
-            return this.flattenTranslations(translationJson);
-        }));
-    }
-
-    protected createLocalization(locale: string | LanguageInfo, translations: () => Promise<Record<string, string>>): LazyLocalization {
-        let localization: LazyLocalization;
-        if (typeof locale === 'string') {
-            localization = {
-                languageId: locale,
-                getTranslations: translations
-            };
-        } else {
-            localization = {
-                ...locale,
-                getTranslations: translations
-            };
-        }
-        return localization;
-    }
-
-    protected flattenTranslations(localization: unknown): Record<string, string> {
-        if (isObject(localization)) {
-            const record: Record<string, string> = {};
-            for (const [key, value] of Object.entries(localization)) {
-                if (typeof value === 'string') {
-                    record[key] = value;
-                } else if (isObject(value)) {
-                    const flattened = this.flattenTranslations(value);
-                    for (const [flatKey, flatValue] of Object.entries(flattened)) {
-                        record[`${key}/${flatKey}`] = flatValue;
-                    }
-                }
-            }
-            return record;
-        } else {
-            return {};
-        }
-    }
-
-    protected identifyLocale(localizationPath: string): string | undefined {
-        const regex = /nls\.(\w+)\.json$/i;
-        const match = regex.exec(localizationPath);
-        if (match) {
-            return match[1];
-        }
-        return undefined;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 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 fs from 'fs-extra';
+import { inject, injectable, named } from 'inversify';
+import { ContributionProvider, isObject } from '../../common';
+import { LanguageInfo, Localization } from '../../common/i18n/localization';
+import { LazyLocalization, LocalizationProvider } from './localization-provider';
+
+export const LocalizationContribution = Symbol('LocalizationContribution');
+
+export interface LocalizationContribution {
+    registerLocalizations(registry: LocalizationRegistry): Promise<void>;
+}
+
+@injectable()
+export class LocalizationRegistry {
+
+    @inject(LocalizationProvider)
+    protected readonly localizationProvider: LocalizationProvider;
+
+    @inject(ContributionProvider) @named(LocalizationContribution)
+    protected readonly contributions: ContributionProvider<LocalizationContribution>;
+
+    async initialize(): Promise<void> {
+        await Promise.all(this.contributions.getContributions().map(
+            contribution => contribution.registerLocalizations(this)
+        ));
+    }
+
+    registerLocalization(localization: Localization | LazyLocalization): void {
+        if (!LazyLocalization.is(localization)) {
+            localization = LazyLocalization.fromLocalization(localization);
+        }
+        this.localizationProvider.addLocalizations(localization);
+    }
+
+    registerLocalizationFromRequire(locale: string | LanguageInfo, required: unknown): void {
+        const translations = this.flattenTranslations(required);
+        this.registerLocalization(this.createLocalization(locale, () => Promise.resolve(translations)));
+    }
+
+    registerLocalizationFromFile(localizationPath: string, locale?: string | LanguageInfo): void {
+        if (!locale) {
+            locale = this.identifyLocale(localizationPath);
+        }
+        if (!locale) {
+            throw new Error('Could not determine locale from path.');
+        }
+        this.registerLocalization(this.createLocalization(locale, async () => {
+            const translationJson = await fs.readJson(localizationPath);
+            return this.flattenTranslations(translationJson);
+        }));
+    }
+
+    protected createLocalization(locale: string | LanguageInfo, translations: () => Promise<Record<string, string>>): LazyLocalization {
+        let localization: LazyLocalization;
+        if (typeof locale === 'string') {
+            localization = {
+                languageId: locale,
+                getTranslations: translations
+            };
+        } else {
+            localization = {
+                ...locale,
+                getTranslations: translations
+            };
+        }
+        return localization;
+    }
+
+    protected flattenTranslations(localization: unknown): Record<string, string> {
+        if (isObject(localization)) {
+            const record: Record<string, string> = {};
+            for (const [key, value] of Object.entries(localization)) {
+                if (typeof value === 'string') {
+                    record[key] = value;
+                } else if (isObject(value)) {
+                    const flattened = this.flattenTranslations(value);
+                    for (const [flatKey, flatValue] of Object.entries(flattened)) {
+                        record[`${key}/${flatKey}`] = flatValue;
+                    }
+                }
+            }
+            return record;
+        } else {
+            return {};
+        }
+    }
+
+    protected identifyLocale(localizationPath: string): string | undefined {
+        const regex = /nls\.(\w+)\.json$/i;
+        const match = regex.exec(localizationPath);
+        if (match) {
+            return match[1];
+        }
+        return undefined;
+    }
+}

package/src/node/i18n/localization-provider.ts

@@ -1,125 +1,125 @@
-// *****************************************************************************
-// Copyright (C) 2021 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 { injectable } from 'inversify';
-import { nls } from '../../common/nls';
-import { LanguageInfo, Localization } from '../../common/i18n/localization';
-import { Disposable } from '../../common/disposable';
-import { isObject } from '../../common/types';
-
-/**
- * Localization data structure that contributes its localizations asynchronously.
- * Allows to load localizations on demand when requested by the user.
- */
-export interface LazyLocalization extends LanguageInfo {
-    getTranslations(): Promise<Record<string, string>>;
-}
-
-export namespace LazyLocalization {
-    export function is(obj: unknown): obj is LazyLocalization {
-        return isObject<LazyLocalization>(obj) && typeof obj.languageId === 'string' && typeof obj.getTranslations === 'function';
-    }
-    export function fromLocalization(localization: Localization): LazyLocalization {
-        const {
-            languageId,
-            languageName,
-            languagePack,
-            localizedLanguageName,
-            translations
-        } = localization;
-        return {
-            languageId,
-            languageName,
-            languagePack,
-            localizedLanguageName,
-            getTranslations: () => Promise.resolve(translations)
-        };
-    }
-    export async function toLocalization(localization: LazyLocalization): Promise<Localization> {
-        const {
-            languageId,
-            languageName,
-            languagePack,
-            localizedLanguageName
-        } = localization;
-        return {
-            languageId,
-            languageName,
-            languagePack,
-            localizedLanguageName,
-            translations: await localization.getTranslations()
-        };
-    }
-}
-
-@injectable()
-export class LocalizationProvider {
-
-    protected localizations: LazyLocalization[] = [];
-    protected currentLanguage = nls.defaultLocale;
-
-    addLocalizations(...localizations: LazyLocalization[]): Disposable {
-        this.localizations.push(...localizations);
-        return Disposable.create(() => {
-            for (const localization of localizations) {
-                const index = this.localizations.indexOf(localization);
-                if (index >= 0) {
-                    this.localizations.splice(index, 1);
-                }
-            }
-        });
-    }
-
-    setCurrentLanguage(languageId: string): void {
-        this.currentLanguage = languageId;
-    }
-
-    getCurrentLanguage(): string {
-        return this.currentLanguage;
-    }
-
-    getAvailableLanguages(all?: boolean): LanguageInfo[] {
-        const languageInfos = new Map<string, LanguageInfo>();
-        for (const localization of this.localizations.values()) {
-            if (all || localization.languagePack) {
-                const languageInfo = languageInfos.get(localization.languageId) ?? {
-                    languageId: localization.languageId
-                };
-                languageInfo.languageName ||= localization.languageName;
-                languageInfo.localizedLanguageName ||= localization.localizedLanguageName;
-                languageInfo.languagePack ||= localization.languagePack;
-                languageInfos.set(localization.languageId, languageInfo);
-            }
-        }
-        return Array.from(languageInfos.values()).sort((a, b) => a.languageId.localeCompare(b.languageId));
-    }
-
-    async loadLocalization(languageId: string): Promise<Localization> {
-        const merged: Localization = {
-            languageId,
-            translations: {}
-        };
-        const localizations = await Promise.all(this.localizations.filter(e => e.languageId === languageId).map(LazyLocalization.toLocalization));
-        for (const localization of localizations) {
-            merged.languageName ||= localization.languageName;
-            merged.localizedLanguageName ||= localization.localizedLanguageName;
-            merged.languagePack ||= localization.languagePack;
-            Object.assign(merged.translations, localization.translations);
-        }
-        return merged;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2021 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 { injectable } from 'inversify';
+import { nls } from '../../common/nls';
+import { LanguageInfo, Localization } from '../../common/i18n/localization';
+import { Disposable } from '../../common/disposable';
+import { isObject } from '../../common/types';
+
+/**
+ * Localization data structure that contributes its localizations asynchronously.
+ * Allows to load localizations on demand when requested by the user.
+ */
+export interface LazyLocalization extends LanguageInfo {
+    getTranslations(): Promise<Record<string, string>>;
+}
+
+export namespace LazyLocalization {
+    export function is(obj: unknown): obj is LazyLocalization {
+        return isObject<LazyLocalization>(obj) && typeof obj.languageId === 'string' && typeof obj.getTranslations === 'function';
+    }
+    export function fromLocalization(localization: Localization): LazyLocalization {
+        const {
+            languageId,
+            languageName,
+            languagePack,
+            localizedLanguageName,
+            translations
+        } = localization;
+        return {
+            languageId,
+            languageName,
+            languagePack,
+            localizedLanguageName,
+            getTranslations: () => Promise.resolve(translations)
+        };
+    }
+    export async function toLocalization(localization: LazyLocalization): Promise<Localization> {
+        const {
+            languageId,
+            languageName,
+            languagePack,
+            localizedLanguageName
+        } = localization;
+        return {
+            languageId,
+            languageName,
+            languagePack,
+            localizedLanguageName,
+            translations: await localization.getTranslations()
+        };
+    }
+}
+
+@injectable()
+export class LocalizationProvider {
+
+    protected localizations: LazyLocalization[] = [];
+    protected currentLanguage = nls.defaultLocale;
+
+    addLocalizations(...localizations: LazyLocalization[]): Disposable {
+        this.localizations.push(...localizations);
+        return Disposable.create(() => {
+            for (const localization of localizations) {
+                const index = this.localizations.indexOf(localization);
+                if (index >= 0) {
+                    this.localizations.splice(index, 1);
+                }
+            }
+        });
+    }
+
+    setCurrentLanguage(languageId: string): void {
+        this.currentLanguage = languageId;
+    }
+
+    getCurrentLanguage(): string {
+        return this.currentLanguage;
+    }
+
+    getAvailableLanguages(all?: boolean): LanguageInfo[] {
+        const languageInfos = new Map<string, LanguageInfo>();
+        for (const localization of this.localizations.values()) {
+            if (all || localization.languagePack) {
+                const languageInfo = languageInfos.get(localization.languageId) ?? {
+                    languageId: localization.languageId
+                };
+                languageInfo.languageName ||= localization.languageName;
+                languageInfo.localizedLanguageName ||= localization.localizedLanguageName;
+                languageInfo.languagePack ||= localization.languagePack;
+                languageInfos.set(localization.languageId, languageInfo);
+            }
+        }
+        return Array.from(languageInfos.values()).sort((a, b) => a.languageId.localeCompare(b.languageId));
+    }
+
+    async loadLocalization(languageId: string): Promise<Localization> {
+        const merged: Localization = {
+            languageId,
+            translations: {}
+        };
+        const localizations = await Promise.all(this.localizations.filter(e => e.languageId === languageId).map(LazyLocalization.toLocalization));
+        for (const localization of localizations) {
+            merged.languageName ||= localization.languageName;
+            merged.localizedLanguageName ||= localization.localizedLanguageName;
+            merged.languagePack ||= localization.languagePack;
+            Object.assign(merged.translations, localization.translations);
+        }
+        return merged;
+    }
+
+}