@theia/plugin-ext 1.75.0-next.3 → 1.75.0-next.34

package/src/hosted/browser/hosted-plugin.ts

@@ -22,7 +22,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { generateUuid } from '@theia/core/lib/common/uuid';
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
 import { PluginWorker } from './plugin-worker';
 import { getPluginId, DeployedPlugin, HostedPluginServer } from '../../common/plugin-protocol';
 import { HostedPluginWatcher } from './hosted-plugin-watcher';
@@ -33,7 +33,7 @@ import {
     Disposable, DisposableCollection, isCancelled,
     CommandRegistry, WillExecuteCommandEvent,
     CancellationTokenSource, ProgressService, nls,
-    RpcProxy
+    RpcProxy, ILogger
 } from '@theia/core';
 import { PreferenceServiceImpl, PreferenceProviderProvider } from '@theia/core/lib/common/preferences';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
@@ -183,6 +183,9 @@ export class HostedPluginSupport extends AbstractHostedPluginSupport<PluginManag
     @inject(WorkspaceTrustService)
     protected readonly workspaceTrustService: WorkspaceTrustService;
 
+    @inject(ILogger) @named('plugin-ext:HostedPluginSupport')
+    protected override readonly logger: ILogger;
+
     constructor() {
         super(generateUuid());
     }
@@ -290,7 +293,7 @@ export class HostedPluginSupport extends AbstractHostedPluginSupport<PluginManag
             await this.viewRegistry.initWidgets();
             // remove restored plugin widgets which were not registered by contributions
             this.viewRegistry.removeStaleWidgets();
-        }).catch(console.error);
+        }).catch(e => this.logger.error(e));
         this.workspaceTrustService.refreshRestrictedModeIndicator();
     }
 
@@ -583,7 +586,7 @@ export class HostedPluginSupport extends AbstractHostedPluginSupport<PluginManag
                     return result.length > 0;
                 } catch (e) {
                     if (!isCancelled(e)) {
-                        console.error(e);
+                        this.logger.error(e);
                     }
                     return false;
                 } finally {
@@ -644,7 +647,7 @@ export class HostedPluginSupport extends AbstractHostedPluginSupport<PluginManag
                 webview.setHTML(this.getDeserializationFailedContents(`
                 An error occurred while restoring '${webview.viewType}' view. Please check logs.
                 `));
-                console.error('Failed to restore the webview', e);
+                this.logger.error('Failed to restore the webview', e);
             }
         }
     }

package/src/hosted/browser/worker/plugin-manifest-loader.ts

@@ -16,11 +16,11 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { PluginIdentifiers, PluginModel, PluginPackage } from '../../../common/plugin-protocol';
+import { PluginModel, PluginPackage } from '../../../common/plugin-protocol';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
 import URI from '@theia/core/lib/common/uri';
-
-const NLS_REGEX = /^%([\w\d.-]+)%$/i;
+import { localizeWithResolver } from '@theia/plugin-utils/lib/common/package-nls';
+import { prepareLoadedManifest } from '@theia/plugin-utils/lib/common/plugin-manifest';
 
 function getUri(pluginModel: PluginModel, relativePath: string): URI {
     const ownURI = new Endpoint().getRestUrl();
@@ -54,23 +54,18 @@ function readContents(uri: string): Promise<string> {
 
 async function readPluginJson(pluginModel: PluginModel, relativePath: string): Promise<any> {
     const content = await readPluginFile(pluginModel, relativePath);
-    const json = JSON.parse(content) as PluginPackage;
-    json.publisher ??= PluginIdentifiers.UNPUBLISHED;
-    return json;
+    return JSON.parse(content);
 }
 
 export async function loadManifest(pluginModel: PluginModel): Promise<any> {
     const [manifest, translations] = await Promise.all([
-        readPluginJson(pluginModel, 'package.json'),
+        readPluginJson(pluginModel, 'package.json').then(raw =>
+            prepareLoadedManifest(raw as PluginPackage, { updateActivationEvents: false })
+        ),
         loadTranslations(pluginModel)
     ]);
-    // translate vscode builtins, as they are published with a prefix.
-    const built_prefix = '@theia/vscode-builtin-';
-    if (manifest && manifest.name && manifest.name.startsWith(built_prefix)) {
-        manifest.name = manifest.name.substring(built_prefix.length);
-    }
     return manifest && translations && Object.keys(translations).length ?
-        localize(manifest, translations) :
+        localizeWithResolver(manifest, key => translations[key]) :
         manifest;
 }
 
@@ -84,31 +79,3 @@ async function loadTranslations(pluginModel: PluginModel): Promise<any> {
         return {};
     }
 }
-
-function localize(value: any, translations: {
-    [key: string]: string
-}): any {
-    if (typeof value === 'string') {
-        const match = NLS_REGEX.exec(value);
-        return match && translations[match[1]] || value;
-    }
-    if (Array.isArray(value)) {
-        const result = [];
-        for (const item of value) {
-            result.push(localize(item, translations));
-        }
-        return result;
-    }
-    if (value === null) {
-        return value;
-    }
-    if (typeof value === 'object') {
-        const result: { [key: string]: any } = {};
-        // eslint-disable-next-line guard-for-in
-        for (const propertyName in value) {
-            result[propertyName] = localize(value[propertyName], translations);
-        }
-        return result;
-    }
-    return value;
-}

package/src/hosted/browser/worker/worker-main.ts

@@ -35,6 +35,7 @@ import { EnvExtImpl } from '../../../plugin/env';
 import { DebugExtImpl } from '../../../plugin/debug/debug-ext';
 import { LocalizationExtImpl } from '../../../plugin/localization-ext';
 import pluginHostModule from './worker-plugin-module';
+import { PLUGINS_BASE_PATH } from '@theia/plugin-utils/lib/common/constants';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const ctx = self as any;
@@ -70,7 +71,7 @@ pluginManager.setPluginHost({
                         ctx.frontendModuleName = plugin.lifecycle.frontendModuleName;
                     }
 
-                    ctx.importScripts('./hostedPlugin/' + getPluginId(plugin.model) + '/' + plugin.pluginPath);
+                    ctx.importScripts(`./${PLUGINS_BASE_PATH}/` + getPluginId(plugin.model) + '/' + plugin.pluginPath);
                 }
             }
 

package/src/hosted/common/hosted-plugin.spec.ts

@@ -19,6 +19,7 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
 import { DeployedPlugin, PluginIdentifiers } from '../../common/plugin-protocol';
 import { AbstractHostedPluginSupport, PluginContributions } from './hosted-plugin';
 import { Measurement } from '@theia/core/lib/common/performance/measurement';
+import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
@@ -64,6 +65,7 @@ function createNoopMeasurement(): Measurement {
 class TestHostedPluginSupport extends AbstractHostedPluginSupport<any, any> {
     constructor() {
         super('test-client');
+        (this as unknown as { logger: MockLogger }).logger = new MockLogger();
     }
 
     protected createTheiaReadyPromise(): Promise<unknown> {

package/src/hosted/common/hosted-plugin.ts

@@ -54,7 +54,7 @@ export abstract class AbstractHostedPluginSupport<PM extends AbstractPluginManag
 
     protected container: interfaces.Container;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:AbstractHostedPluginSupport')
     protected readonly logger: ILogger;
 
     @inject(HostedPluginServer)
@@ -147,7 +147,7 @@ export abstract class AbstractHostedPluginSupport<PM extends AbstractPluginManag
         try {
             await this.runOperation(() => this.doLoad());
         } catch (e) {
-            console.error('Failed to load plugins:', e);
+            this.logger.error('Failed to load plugins:', e);
             // Resolve the startup deferreds so that clients awaiting `willStart` or `didStart`,
             // e.g. file system provider activations, do not hang forever on a failed load.
             this.deferredWillStart.resolve();
@@ -316,7 +316,7 @@ export abstract class AbstractHostedPluginSupport<PM extends AbstractPluginManag
         const loadPluginsMeasurement = this.measure('loadPlugins');
 
         const hostContributions = new Map<PluginHost, PluginContributions[]>();
-        console.log(`[${this.clientId}] Loading plugin contributions`);
+        this.logger.info(`[${this.clientId}] Loading plugin contributions`);
         for (const contributions of this.contributions.values()) {
             if (!this.workspaceTrusted && contributions.plugin.metadata.model.untrustedWorkspacesSupport === false) {
                 this._disabledByTrust.add(PluginIdentifiers.componentsToUnversionedId(contributions.plugin.metadata.model));
@@ -327,10 +327,10 @@ export abstract class AbstractHostedPluginSupport<PM extends AbstractPluginManag
             const pluginId = plugin.model.id;
             if (contributions.state === PluginContributions.State.INITIALIZING) {
                 contributions.state = PluginContributions.State.LOADING;
-                contributions.push(Disposable.create(() => console.log(`[${pluginId}]: Unloaded plugin.`)));
+                contributions.push(Disposable.create(() => this.logger.info(`[${pluginId}]: Unloaded plugin.`)));
                 contributions.push(this.handleContributions(contributions.plugin));
                 contributions.state = PluginContributions.State.LOADED;
-                console.debug(`[${this.clientId}][${pluginId}]: Loaded contributions.`);
+                this.logger.debug(`[${this.clientId}][${pluginId}]: Loaded contributions.`);
                 loaded++;
             }
 
@@ -342,7 +342,7 @@ export abstract class AbstractHostedPluginSupport<PM extends AbstractPluginManag
                 hostContributions.set(host, dynamicContributions);
                 toDisconnect.push(Disposable.create(() => {
                     contributions!.state = PluginContributions.State.LOADED;
-                    console.debug(`[${this.clientId}][${pluginId}]: Disconnected.`);
+                    this.logger.debug(`[${this.clientId}][${pluginId}]: Disconnected.`);
                 }));
             }
         }
@@ -398,22 +398,22 @@ export abstract class AbstractHostedPluginSupport<PM extends AbstractPluginManag
                     if (toDisconnect.disposed) {
                         return;
                     }
-                    console.log(`[${this.clientId}] Starting plugins.`);
+                    this.logger.info(`[${this.clientId}] Starting plugins.`);
                     for (const contributions of hostContributions) {
                         started++;
                         const plugin = contributions.plugin;
                         const id = plugin.metadata.model.id;
                         contributions.state = PluginContributions.State.STARTED;
-                        console.debug(`[${this.clientId}][${id}]: Started plugin.`);
+                        this.logger.debug(`[${this.clientId}][${id}]: Started plugin.`);
                         toDisconnect.push(contributions.push(Disposable.create(() => {
-                            console.debug(`[${this.clientId}][${id}]: Stopped plugin.`);
+                            this.logger.debug(`[${this.clientId}][${id}]: Stopped plugin.`);
                             manager.$stop(id);
                         })));
 
                         this.handlePluginStarted(manager, plugin);
                     }
                 } catch (e) {
-                    console.error(`Failed to start plugins for '${host}' host`, e);
+                    this.logger.error(`Failed to start plugins for '${host}' host`, e);
                 }
             })());
         }

package/src/hosted/node/hosted-plugin-localization-service.ts

@@ -22,9 +22,11 @@ import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { DeployedPlugin, Localization as PluginLocalization, PluginIdentifiers, Translation } from '../../common';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { Disposable, DisposableCollection, isObject, MaybePromise, nls, Path, URI, ILogger } from '@theia/core';
+import { Disposable, DisposableCollection, MaybePromise, nls, Path, URI, ILogger } from '@theia/core';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { LanguagePackBundle, LanguagePackService } from '../../common/language-pack-service';
+import { localizePackage } from '@theia/plugin-utils/lib/common/package-nls';
+import { loadPackageTranslations } from '@theia/plugin-utils/lib/node/package-nls';
 
 export interface VSCodeNlsConfig {
     locale: string
@@ -327,84 +329,3 @@ async function loadTranslations(packagePath: Path, translations: Translation[]):
 function buildTranslationKey(pluginId: string, scope: string, key: string): string {
     return `${pluginId}/${Localization.transformKey(scope)}/${key}`;
 }
-
-// Localization logic for `package.json` entries
-// Extensions can use `package.nls.json` files to store translations for values in their package.json
-// This logic has not changed with the introduction of the vscode.l10n API
-
-interface PackageTranslation {
-    translation?: Record<string, string>
-    default?: Record<string, string>
-}
-
-async function loadPackageTranslations(pluginPath: string, locale: string): Promise<PackageTranslation> {
-    const localizedPluginPath = path.join(pluginPath, `package.nls.${locale}.json`);
-    try {
-        const defaultValue = coerceLocalizations(await fs.readJson(path.join(pluginPath, 'package.nls.json')));
-        if (await fs.pathExists(localizedPluginPath)) {
-            return {
-                translation: coerceLocalizations(await fs.readJson(localizedPluginPath)),
-                default: defaultValue
-            };
-        }
-        return {
-            default: defaultValue
-        };
-    } catch (e) {
-        if (e.code !== 'ENOENT') {
-            throw e;
-        }
-        return {};
-    }
-}
-
-interface LocalizeInfo {
-    message: string
-    comment?: string
-}
-
-function isLocalizeInfo(obj: unknown): obj is LocalizeInfo {
-    return isObject(obj) && 'message' in obj || false;
-}
-
-function coerceLocalizations(translations: Record<string, string | LocalizeInfo>): Record<string, string> {
-    for (const [key, value] of Object.entries(translations)) {
-        if (isLocalizeInfo(value)) {
-            translations[key] = value.message;
-        } else if (typeof value !== 'string') {
-            // Only strings or LocalizeInfo values are valid
-            translations[key] = 'INVALID TRANSLATION VALUE';
-        }
-    }
-    return translations as Record<string, string>;
-}
-
-function localizePackage(value: unknown, translations: PackageTranslation, callback: (key: string, defaultValue: string) => string): unknown {
-    if (typeof value === 'string') {
-        let result = value;
-        if (value.length > 2 && value.startsWith('%') && value.endsWith('%')) {
-            const key = value.slice(1, -1);
-            if (translations.translation && key in translations.translation) {
-                result = translations.translation[key];
-            } else if (translations.default && key in translations.default) {
-                result = callback(key, translations.default[key]);
-            }
-        }
-        return result;
-    }
-    if (Array.isArray(value)) {
-        const result = [];
-        for (const item of value) {
-            result.push(localizePackage(item, translations, callback));
-        }
-        return result;
-    }
-    if (isObject(value)) {
-        const result: Record<string, unknown> = {};
-        for (const [name, item] of Object.entries(value)) {
-            result[name] = localizePackage(item, translations, callback);
-        }
-        return result;
-    }
-    return value;
-}

package/src/hosted/node/hosted-plugin-process.ts

@@ -46,7 +46,7 @@ export class HostedPluginProcess implements ServerPluginRunner {
     @inject(HostedPluginProcessConfiguration)
     protected configuration: HostedPluginProcessConfiguration;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:HostedPluginProcess')
     protected readonly logger: ILogger;
 
     @inject(HostedPluginCliContribution)

package/src/hosted/node/hosted-plugin.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject, multiInject, postConstruct, optional } from '@theia/core/shared/inversify';
+import { injectable, inject, multiInject, postConstruct, optional, named } from '@theia/core/shared/inversify';
 import { ILogger, ConnectionErrorHandler } from '@theia/core/lib/common';
 import { HostedPluginClient, PluginModel, ServerPluginRunner } from '../../common/plugin-protocol';
 import { LogPart } from '../../common/types';
@@ -32,7 +32,7 @@ export class HostedPluginSupport {
     private isPluginProcessRunning = false;
     private client: HostedPluginClient;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:HostedPluginSupport')
     protected readonly logger: ILogger;
 
     @inject(HostedPluginProcess)

package/src/hosted/node/plugin-host-rpc.ts

@@ -25,7 +25,7 @@ import {
     MAIN_RPC_CONTEXT, Plugin, PluginAPIFactory, PluginManager,
     LocalizationExt
 } from '../../common/plugin-api-rpc';
-import { PluginMetadata, PluginModel } from '../../common/plugin-protocol';
+import { PluginMetadata, PluginModel, PluginPackage } from '../../common/plugin-protocol';
 import { createAPIFactory } from '../../plugin/plugin-context';
 import { EnvExtImpl } from '../../plugin/env';
 import { PreferenceRegistryExtImpl } from '../../plugin/preference-registry';
@@ -35,7 +35,7 @@ import { EditorsAndDocumentsExtImpl } from '../../plugin/editors-and-documents';
 import { WorkspaceExtImpl } from '../../plugin/workspace';
 import { MessageRegistryExt } from '../../plugin/message-registry';
 import { ClipboardExt } from '../../plugin/clipboard-ext';
-import { loadManifest } from './plugin-manifest-loader';
+import { loadManifest } from '@theia/plugin-utils/lib/node/plugin-manifest';
 import { KeyValueStorageProxy } from '../../plugin/plugin-storage';
 import { WebviewsExtImpl } from '../../plugin/webviews';
 import { TerminalServiceExtImpl } from '../../plugin/terminal-ext';
@@ -214,7 +214,7 @@ export abstract class AbstractPluginHostRPC<PM extends AbstractPluginManagerExtI
                         const pluginModel = plg.model;
                         const pluginLifecycle = plg.lifecycle;
 
-                        const rawModel = await loadManifest(pluginModel.packagePath);
+                        const rawModel = await loadManifest<PluginPackage>(pluginModel.packagePath);
                         rawModel.packagePath = pluginModel.packagePath;
                         if (pluginModel.entryPoint!.frontend) {
                             foreign.push({

package/src/hosted/node/plugin-reader.ts

@@ -19,16 +19,17 @@ import * as express from '@theia/core/shared/express';
 import * as escape_html from 'escape-html';
 import { realpath, stat } from 'fs/promises';
 import { ILogger } from '@theia/core';
-import { inject, injectable, optional, multiInject } from '@theia/core/shared/inversify';
+import { inject, injectable, optional, multiInject, named } from '@theia/core/shared/inversify';
 import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
 import { PluginMetadata, getPluginId, MetadataProcessor, PluginPackage, PluginContribution } from '../../common/plugin-protocol';
 import { MetadataScanner } from './metadata-scanner';
-import { loadManifest } from './plugin-manifest-loader';
+import { loadManifest } from '@theia/plugin-utils/lib/node/plugin-manifest';
+import { PLUGINS_BASE_PATH } from '@theia/plugin-utils/lib/common/constants';
 
 @injectable()
 export class HostedPluginReader implements BackendApplicationContribution {
 
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:HostedPluginReader')
     protected readonly logger: ILogger;
 
     @inject(MetadataScanner)
@@ -43,7 +44,7 @@ export class HostedPluginReader implements BackendApplicationContribution {
     protected pluginsIdsFiles: Map<string, string> = new Map();
 
     configure(app: express.Application): void {
-        app.get('/hostedPlugin/:pluginId/:path(*)', async (req, res) => {
+        app.get(`/${PLUGINS_BASE_PATH}/:pluginId/:path(*)`, async (req, res) => {
             const pluginId = req.params.pluginId;
             const filePath = req.params.path;
 
@@ -59,7 +60,7 @@ export class HostedPluginReader implements BackendApplicationContribution {
                         // the file was found and successfully transferred
                         return;
                     }
-                    console.error(`Could not transfer '${filePath}' file from '${pluginId}'`, e);
+                    this.logger.error(`Could not transfer '${filePath}' file from '${pluginId}'`, e);
                     if (res.headersSent) {
                         // the request was already closed
                         return;
@@ -141,7 +142,7 @@ export class HostedPluginReader implements BackendApplicationContribution {
             return undefined;
         }
         const resolvedPluginPath = await realpath(pluginPath);
-        const manifest = await loadManifest(resolvedPluginPath);
+        const manifest = await loadManifest<PluginPackage>(resolvedPluginPath);
         if (!manifest) {
             return undefined;
         }

package/src/hosted/node/plugin-service.ts

@@ -37,7 +37,7 @@ export type BackendPluginHostableFilter = (plugin: DeployedPlugin) => boolean;
  */
 @injectable()
 export class HostedPluginServerImpl implements HostedPluginServer {
-    @inject(ILogger)
+    @inject(ILogger) @named('plugin-ext:HostedPluginServerImpl')
     protected readonly logger: ILogger;
 
     @inject(PluginDeployerHandlerImpl)

package/src/hosted/node/scanners/grammars-reader.ts

@@ -16,16 +16,20 @@
 
 import { injectable } from '@theia/core/shared/inversify';
 import { PluginPackageGrammarsContribution, GrammarsContribution } from '../../../common';
-import * as path from 'path';
-import * as fs from '@theia/core/shared/fs-extra';
+import { readGrammarFromDisk } from '@theia/plugin-utils/lib/node/read-grammars';
+import type { NormalizeContributionsContext } from '@theia/plugin-utils/lib/common/contribution-types';
 
 @injectable()
 export class GrammarsReader {
 
-    async readGrammars(rawGrammars: PluginPackageGrammarsContribution[], pluginPath: string): Promise<GrammarsContribution[]> {
+    async readGrammars(
+        rawGrammars: readonly PluginPackageGrammarsContribution[],
+        pluginPath: string,
+        log?: Pick<NormalizeContributionsContext, 'onError'>
+    ): Promise<GrammarsContribution[]> {
         const result = new Array<GrammarsContribution>();
         for (const rawGrammar of rawGrammars) {
-            const grammar = await this.readGrammar(rawGrammar, pluginPath);
+            const grammar = await this.readGrammar(rawGrammar, pluginPath, log);
             if (grammar) {
                 result.push(grammar);
             }
@@ -34,24 +38,11 @@ export class GrammarsReader {
         return result;
     }
 
-    private async readGrammar(rawGrammar: PluginPackageGrammarsContribution, pluginPath: string): Promise<GrammarsContribution | undefined> {
-        // TODO: validate inputs
-        let grammar: string | object;
-
-        if (rawGrammar.path.endsWith('json')) {
-            grammar = await fs.readJSON(path.resolve(pluginPath, rawGrammar.path));
-        } else {
-            grammar = await fs.readFile(path.resolve(pluginPath, rawGrammar.path), 'utf8');
-        }
-        return {
-            language: rawGrammar.language,
-            scope: rawGrammar.scopeName,
-            format: rawGrammar.path.endsWith('json') ? 'json' : 'plist',
-            grammar: grammar,
-            grammarLocation: rawGrammar.path,
-            injectTo: rawGrammar.injectTo,
-            embeddedLanguages: rawGrammar.embeddedLanguages,
-            tokenTypes: rawGrammar.tokenTypes
-        };
+    protected async readGrammar(
+        rawGrammar: PluginPackageGrammarsContribution,
+        pluginPath: string,
+        log?: Pick<NormalizeContributionsContext, 'onError'>
+    ): Promise<GrammarsContribution | undefined> {
+        return readGrammarFromDisk(rawGrammar, pluginPath, log);
     }
 }