@theia/plugin-ext 1.75.0-next.25 → 1.75.0-next.29

package/lib/hosted/node/scanners/scanner-theia.js

@@ -14,7 +14,6 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-var TheiaPluginScanner_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TheiaPluginScanner = exports.AbstractPluginScanner = void 0;
 const tslib_1 = require("tslib");
@@ -23,43 +22,17 @@ const inversify_1 = require("@theia/core/shared/inversify");
 const plugin_protocol_1 = require("../../../common/plugin-protocol");
 const fs_1 = require("fs");
 const path = require("path");
-const types_1 = require("@theia/core/lib/common/types");
-const grammars_reader_1 = require("./grammars-reader");
-const errors_1 = require("../../../common/errors");
 const jsoncparser = require("jsonc-parser");
-const objects_1 = require("@theia/core/lib/common/objects");
-const icon_utilities_1 = require("@theia/core/lib/common/markdown-rendering/icon-utilities");
+const grammars_reader_1 = require("./grammars-reader");
+const utils_1 = require("@theia/plugin-utils/lib/common/utils");
 const plugin_uri_factory_1 = require("./plugin-uri-factory");
-const preference_scope_1 = require("@theia/core/lib/common/preferences/preference-scope");
 const core_1 = require("@theia/core");
-const colorIdPattern = '^\\w+[.\\w+]*$';
-const iconIdPattern = `^${icon_utilities_1.CSSIcon.iconNameSegment}(-${icon_utilities_1.CSSIcon.iconNameSegment})+$`;
-/** Maps the view container locations used by VS Code extensions to the Theia shell locations. */
-const VIEW_CONTAINER_LOCATION_ALIASES = {
-    activitybar: 'left',
-    panel: 'bottom',
-    secondarySidebar: 'right',
-    auxiliarybar: 'right'
-};
-function getFileExtension(filePath) {
-    const index = filePath.lastIndexOf('.');
-    return index === -1 ? '' : filePath.substring(index + 1);
-}
-/**
- * Mirrors VS Code's `ConfigurationRegistry.getDefaultValue(type)`: plugins expect typed-but-defaultless properties to read as a type-based default, not `undefined`.
- */
-function deriveDefaultForType(type) {
-    const t = Array.isArray(type) ? type[0] : type;
-    switch (t) {
-        case 'boolean': return false;
-        case 'integer':
-        case 'number': return 0;
-        case 'string': return '';
-        case 'array': return [];
-        case 'object': return {};
-        default: return null;
-    }
-}
+const node_async_hooks_1 = require("node:async_hooks");
+const normalize_contributions_1 = require("@theia/plugin-utils/lib/node/normalize-contributions");
+const plugin_model_1 = require("@theia/plugin-utils/lib/common/plugin-model");
+const plugin_model_2 = require("@theia/plugin-utils/lib/node/plugin-model");
+/** Async-local contribution ctx — safe for concurrent scans on the singleton scanner. */
+const contributionCtxStorage = new node_async_hooks_1.AsyncLocalStorage();
 let AbstractPluginScanner = class AbstractPluginScanner {
     constructor(_apiType, _backendInitPath) {
         this._apiType = _apiType;
@@ -70,33 +43,21 @@ let AbstractPluginScanner = class AbstractPluginScanner {
     }
     getModel(plugin) {
         const publisher = plugin.publisher ?? plugin_protocol_1.PluginIdentifiers.UNPUBLISHED;
-        const result = {
-            packagePath: plugin.packagePath,
-            packageUri: this.pluginUriFactory.createUri(plugin).toString(),
-            // see id definition: https://github.com/microsoft/vscode/blob/15916055fe0cb9411a5f36119b3b012458fe0a1d/src/vs/platform/extensions/common/extensions.ts#L167-L169
-            id: `${publisher.toLowerCase()}.${plugin.name.toLowerCase()}`,
-            name: plugin.name,
+        const result = (0, plugin_model_1.buildModelForTheia)({
+            ...plugin,
             publisher,
-            version: plugin.version,
-            displayName: plugin.displayName,
-            description: plugin.description,
-            l10n: plugin.l10n,
-            engine: {
-                type: this._apiType,
-                version: plugin.engines[this._apiType]
-            },
-            entryPoint: this.getEntryPoint(plugin),
-            licenseUrl: this.getLicenseUrl(plugin),
-            readmeUrl: this.getReadmeUrl(plugin)
-        };
+            packageUri: this.pluginUriFactory.createUri(plugin).toString(),
+        });
+        result.engine.type = this._apiType;
+        result.engine.version = plugin.engines[this._apiType] ?? '*';
+        result.entryPoint = this.getEntryPoint(plugin);
+        result.licenseUrl = this.getLicenseUrl(plugin);
+        result.readmeUrl = this.getReadmeUrl(plugin);
         this.applyTrustExtraction(plugin, result);
         return result;
     }
     applyTrustExtraction(plugin, result) {
-        const untrustedWorkspacesSupport = plugin.capabilities?.untrustedWorkspaces?.supported;
-        if (untrustedWorkspacesSupport !== undefined) {
-            result.untrustedWorkspacesSupport = untrustedWorkspacesSupport;
-        }
+        (0, plugin_model_1.applyTrustExtraction)(plugin, result);
     }
     getReadmeUrl(plugin) {
         return this.getPluginRootFileUrl(plugin, ['readme.md', 'readme.txt', 'readme']);
@@ -105,25 +66,10 @@ let AbstractPluginScanner = class AbstractPluginScanner {
         return this.getPluginRootFileUrl(plugin, ['license', 'license.txt', 'license.md']);
     }
     getPluginRootFileUrl(plugin, names) {
-        const nameSet = new Set(names.map(n => n.toLowerCase()));
-        try {
-            const dir = (0, fs_1.readdirSync)(plugin.packagePath, { withFileTypes: true });
-            for (const dirent of dir) {
-                if (dirent.isFile() && nameSet.has(dirent.name.toLowerCase())) {
-                    return plugin_protocol_1.PluginPackage.toPluginUrl(plugin, dirent.name);
-                }
-            }
-        }
-        catch {
-            return undefined;
-        }
+        return (0, plugin_model_2.getPluginRootFileUrl)(plugin, names);
     }
     getLifecycle(plugin) {
-        const result = {
-            startMethod: 'start',
-            stopMethod: 'stop',
-            frontendModuleName: (0, plugin_protocol_1.buildFrontendModuleName)(plugin),
-        };
+        const result = (0, plugin_model_1.buildLifecycle)(plugin, 'theiaPlugin');
         if (this._backendInitPath) {
             result.backendInitPath = path.join(__dirname, this._backendInitPath);
         }
@@ -164,689 +110,142 @@ exports.AbstractPluginScanner = AbstractPluginScanner = tslib_1.__decorate([
     tslib_1.__param(1, (0, inversify_1.unmanaged)()),
     tslib_1.__metadata("design:paramtypes", [String, String])
 ], AbstractPluginScanner);
-let TheiaPluginScanner = TheiaPluginScanner_1 = class TheiaPluginScanner extends AbstractPluginScanner {
+let TheiaPluginScanner = class TheiaPluginScanner extends AbstractPluginScanner {
     constructor() {
         super('theiaPlugin', 'backend-init-theia');
     }
     getEntryPoint(plugin) {
-        const result = {
-            frontend: plugin.theiaPlugin.frontend,
-            backend: plugin.theiaPlugin.backend
-        };
-        if (plugin.theiaPlugin?.headless) {
-            result.headless = plugin.theiaPlugin.headless;
-        }
-        return result;
+        return (0, plugin_model_1.buildEntryPointForTheia)(plugin);
     }
     static getScope(monacoScope) {
-        switch (monacoScope) {
-            case 'machine-overridable':
-            case 'window':
-            case 'resource':
-                return { scope: preference_scope_1.PreferenceScope.Folder, overridable: false };
-            case 'language-overridable':
-                return { scope: preference_scope_1.PreferenceScope.Folder, overridable: true };
-            case 'application':
-            case 'machine':
-                return { scope: preference_scope_1.PreferenceScope.User, overridable: false };
-        }
-        return { scope: undefined, overridable: false };
+        return (0, normalize_contributions_1.getScope)(monacoScope);
     }
     async readContributions(rawPlugin, contributions) {
-        try {
-            if (rawPlugin.contributes.configuration) {
-                const configurations = Array.isArray(rawPlugin.contributes.configuration) ? rawPlugin.contributes.configuration : [rawPlugin.contributes.configuration];
-                const hasMultipleConfigs = configurations.length > 1;
-                contributions.configuration = [];
-                for (const c of configurations) {
-                    const config = this.readConfiguration(c, rawPlugin.packagePath);
-                    if (config) {
-                        Object.values(config.properties).forEach(property => {
-                            if (hasMultipleConfigs) {
-                                // If there are multiple configuration contributions, we need to distinguish them by their title in the settings UI.
-                                // They are placed directly under the plugin's name in the settings UI.
-                                property.owner = rawPlugin.displayName;
-                                property.group = config.title;
-                            }
-                            else {
-                                // If there's only one configuration contribution, we display the title in the settings UI.
-                                property.owner = config.title;
-                            }
-                        });
-                        contributions.configuration.push(config);
-                    }
-                }
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'configuration'.`, rawPlugin.contributes.configuration, err);
-        }
-        const configurationDefaults = rawPlugin.contributes.configurationDefaults;
-        contributions.configurationDefaults = (0, types_1.isObject)(configurationDefaults) ? configurationDefaults : undefined;
-        try {
-            if (rawPlugin.contributes.submenus) {
-                contributions.submenus = this.readSubmenus(rawPlugin.contributes.submenus, rawPlugin);
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'submenus'.`, rawPlugin.contributes.submenus, err);
-        }
-        try {
-            if (rawPlugin.contributes.customEditors) {
-                const customEditors = this.readCustomEditors(rawPlugin.contributes.customEditors);
-                contributions.customEditors = customEditors;
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'customEditors'.`, rawPlugin.contributes.customEditors, err);
-        }
-        try {
-            if (rawPlugin.contributes.viewsContainers) {
-                const viewsContainers = rawPlugin.contributes.viewsContainers;
-                contributions.viewsContainers = {};
-                for (const location of Object.keys(viewsContainers)) {
-                    const containers = this.readViewsContainers(viewsContainers[location], rawPlugin);
-                    const loc = VIEW_CONTAINER_LOCATION_ALIASES[location] ?? location;
-                    if (contributions.viewsContainers[loc]) {
-                        contributions.viewsContainers[loc] = contributions.viewsContainers[loc].concat(containers);
-                    }
-                    else {
-                        contributions.viewsContainers[loc] = containers;
-                    }
-                }
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'viewsContainers'.`, rawPlugin.contributes.viewsContainers, err);
-        }
-        try {
-            if (rawPlugin.contributes.views) {
-                contributions.views = {};
-                for (const location of Object.keys(rawPlugin.contributes.views)) {
-                    const views = this.readViews(rawPlugin.contributes.views[location]);
-                    contributions.views[location] = views;
-                }
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'views'.`, rawPlugin.contributes.views, err);
-        }
-        try {
-            if (rawPlugin.contributes.viewsWelcome) {
-                contributions.viewsWelcome = this.readViewsWelcome(rawPlugin.contributes.viewsWelcome, rawPlugin.contributes.views);
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'viewsWelcome'.`, rawPlugin.contributes.viewsWelcome, err);
-        }
-        try {
-            const pluginCommands = rawPlugin.contributes.commands;
-            if (pluginCommands) {
-                const commands = Array.isArray(pluginCommands) ? pluginCommands : [pluginCommands];
-                contributions.commands = commands.map(command => this.readCommand(command, rawPlugin));
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'commands'.`, rawPlugin.contributes.commands, err);
-        }
-        try {
-            if (rawPlugin.contributes.menus) {
-                contributions.menus = {};
-                for (const location of Object.keys(rawPlugin.contributes.menus)) {
-                    const menus = this.readMenus(rawPlugin.contributes.menus[location]);
-                    contributions.menus[location] = menus;
-                }
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'menus'.`, rawPlugin.contributes.menus, err);
-        }
-        try {
-            if (rawPlugin.contributes.keybindings) {
-                const rawKeybindings = Array.isArray(rawPlugin.contributes.keybindings) ? rawPlugin.contributes.keybindings : [rawPlugin.contributes.keybindings];
-                contributions.keybindings = rawKeybindings.map(rawKeybinding => this.readKeybinding(rawKeybinding));
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'keybindings'.`, rawPlugin.contributes.keybindings, err);
-        }
-        try {
-            if (rawPlugin.contributes.debuggers) {
-                const debuggers = this.readDebuggers(rawPlugin.contributes.debuggers);
-                contributions.debuggers = debuggers;
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'debuggers'.`, rawPlugin.contributes.debuggers, err);
-        }
-        try {
-            if (rawPlugin.contributes.taskDefinitions) {
-                const definitions = rawPlugin.contributes.taskDefinitions;
-                contributions.taskDefinitions = definitions.map(definitionContribution => this.readTaskDefinition(rawPlugin.name, definitionContribution));
-            }
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'taskDefinitions'.`, rawPlugin.contributes.taskDefinitions, err);
-        }
-        try {
-            contributions.problemMatchers = rawPlugin.contributes.problemMatchers;
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'problemMatchers'.`, rawPlugin.contributes.problemMatchers, err);
-        }
-        try {
-            contributions.problemPatterns = rawPlugin.contributes.problemPatterns;
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'problemPatterns'.`, rawPlugin.contributes.problemPatterns, err);
-        }
-        try {
-            contributions.resourceLabelFormatters = rawPlugin.contributes.resourceLabelFormatters;
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'resourceLabelFormatters'.`, rawPlugin.contributes.resourceLabelFormatters, err);
-        }
-        try {
-            contributions.authentication = rawPlugin.contributes.authentication;
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'authentication'.`, rawPlugin.contributes.authentication, err);
-        }
-        try {
-            contributions.notebooks = rawPlugin.contributes.notebooks;
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'notebooks'.`, rawPlugin.contributes.notebooks, err);
-        }
-        try {
-            contributions.notebookRenderer = rawPlugin.contributes.notebookRenderer;
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'notebook-renderer'.`, rawPlugin.contributes.notebookRenderer, err);
-        }
-        try {
-            contributions.notebookPreload = rawPlugin.contributes.notebookPreload;
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'notebooks-preload'.`, rawPlugin.contributes.notebookPreload, err);
-        }
-        try {
-            contributions.snippets = this.readSnippets(rawPlugin);
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'snippets'.`, rawPlugin.contributes.snippets, err);
-        }
-        try {
-            contributions.themes = this.readThemes(rawPlugin);
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'themes'.`, rawPlugin.contributes.themes, err);
-        }
-        try {
-            contributions.icons = this.readIcons(rawPlugin);
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'icons'.`, rawPlugin.contributes.icons, err);
-        }
-        try {
-            contributions.iconThemes = this.readIconThemes(rawPlugin);
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'iconThemes'.`, rawPlugin.contributes.iconThemes, err);
-        }
-        try {
-            contributions.colors = this.readColors(rawPlugin);
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'colors'.`, rawPlugin.contributes.colors, err);
-        }
-        try {
-            contributions.terminalProfiles = this.readTerminals(rawPlugin);
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'terminals'.`, rawPlugin.contributes.terminal, err);
-        }
-        try {
-            contributions.localizations = this.readLocalizations(rawPlugin);
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'localizations'.`, rawPlugin.contributes.localizations, err);
-        }
-        const [languagesResult, grammarsResult] = await Promise.allSettled([
-            rawPlugin.contributes.languages ? this.readLanguages(rawPlugin.contributes.languages, rawPlugin) : undefined,
-            rawPlugin.contributes.grammars ? this.grammarsReader.readGrammars(rawPlugin.contributes.grammars, rawPlugin.packagePath) : undefined
-        ]);
-        if (rawPlugin.contributes.languages) {
-            if (languagesResult.status === 'fulfilled') {
-                contributions.languages = languagesResult.value;
-            }
-            else {
-                this.logger.error(`Could not read '${rawPlugin.name}' contribution 'languages'.`, rawPlugin.contributes.languages, languagesResult.reason);
-            }
-        }
-        if (rawPlugin.contributes.grammars) {
-            if (grammarsResult.status === 'fulfilled') {
-                contributions.grammars = grammarsResult.value;
-            }
-            else {
-                this.logger.error(`Could not read '${rawPlugin.name}' contribution 'grammars'.`, rawPlugin.contributes.grammars, grammarsResult.reason);
-            }
-        }
-        try {
-            contributions.walkthroughs = this.readWalkthroughs(rawPlugin);
-        }
-        catch (err) {
-            this.logger.error(`Could not read '${rawPlugin.name}' contribution 'walkthroughs'.`, rawPlugin.contributes.walkthroughs, err);
-        }
-        return contributions;
+        const ctx = this.contributionCtx(rawPlugin);
+        return contributionCtxStorage.run(ctx, () => (0, normalize_contributions_1.normalizeContributions)(ctx, contributions));
+    }
+    contributionCtx(pck) {
+        const active = contributionCtxStorage.getStore();
+        if (active?.plugin === pck) {
+            return active;
+        }
+        const ctx = {
+            plugin: pck,
+            resolveUrl: relativePath => this.toPluginUrl(pck, relativePath),
+            resolveUri: (_plugin, relativePath) => this.pluginUriFactory.createUri(pck, relativePath).toString(),
+            onError: (type, err, detail) => this.logger.error(`Could not read '${pck.name}' contribution '${type}'.`, detail, err),
+            onWarn: msg => this.logger.warn(msg),
+            readJsonFile: filePath => this.readJson(filePath),
+            // Route through protected methods so Inversify/subclass overrides still apply.
+            transformIconUrl: (plugin, original) => this.transformIconUrl(plugin, original),
+            readLocalization: (entry, pluginPath) => this.readLocalization(entry, pluginPath),
+            readTranslation: (entry, pluginPath) => this.readTranslation(entry, pluginPath),
+            toSchema: definition => this.toSchema(definition),
+            readConfiguration: this.readConfiguration.bind(this),
+            readCustomEditors: this.readCustomEditors.bind(this),
+            readViews: this.readViews.bind(this),
+            readKeybinding: this.readKeybinding.bind(this),
+            readDebuggers: this.readDebuggers.bind(this),
+            readSubmenus: (submenus, plugin) => this.readSubmenus(submenus, plugin),
+            readViewsContainers: (containers, plugin) => this.readViewsContainers(containers, plugin),
+            readViewsWelcome: (welcome, views) => this.readViewsWelcome(welcome, views),
+            readCommand: (command, plugin) => this.readCommand(command, plugin),
+            readMenus: menus => this.readMenus(menus),
+            readTaskDefinition: (pluginName, definition) => this.readTaskDefinition(pluginName, definition),
+            readSnippets: plugin => this.readSnippets(plugin),
+            readThemes: plugin => this.readThemes(plugin),
+            readIcons: plugin => this.readIcons(plugin),
+            readIconThemes: plugin => this.readIconThemes(plugin),
+            readColors: plugin => this.readColors(plugin),
+            readTerminals: plugin => this.readTerminals(plugin),
+            readLocalizations: plugin => this.readLocalizations(plugin),
+            readWalkthroughs: plugin => this.readWalkthroughs(plugin),
+            readLanguages: (languages, plugin) => this.readLanguages(languages, plugin),
+        };
+        ctx.readGrammars = (grammars, pluginPath) => this.grammarsReader.readGrammars(grammars, pluginPath, ctx);
+        return ctx;
     }
     readTerminals(pck) {
-        if (!pck?.contributes?.terminal?.profiles) {
-            return undefined;
-        }
-        return pck.contributes.terminal.profiles.filter(profile => profile.id && profile.title);
+        return (0, normalize_contributions_1.readTerminals)(pck);
     }
     readLocalizations(pck) {
-        if (!pck.contributes || !pck.contributes.localizations) {
-            return undefined;
-        }
-        return pck.contributes.localizations.map(e => this.readLocalization(e, pck.packagePath));
+        return (0, normalize_contributions_1.readLocalizations)(pck, this.contributionCtx(pck));
     }
-    readLocalization({ languageId, languageName, localizedLanguageName, translations }, pluginPath) {
-        const local = {
-            languageId,
-            languageName,
-            localizedLanguageName,
-            translations: []
-        };
-        local.translations = translations.map(e => this.readTranslation(e, pluginPath));
-        return local;
+    readLocalization(entry, pluginPath) {
+        return (0, normalize_contributions_1.readLocalization)(entry, pluginPath, {
+            readTranslation: (translation, translationPath) => this.readTranslation(translation, translationPath),
+        });
     }
     readTranslation(packageTranslation, pluginPath) {
-        const translation = {
-            id: packageTranslation.id,
-            path: packageTranslation.path
-        };
-        return translation;
+        return (0, normalize_contributions_1.readTranslation)(packageTranslation, pluginPath);
     }
     readWalkthroughs(pck) {
-        if (!pck.contributes || !pck.contributes.walkthroughs) {
-            return undefined;
-        }
-        const pluginId = plugin_protocol_1.PluginIdentifiers.componentsToUnversionedId({ publisher: pck.publisher, name: pck.name, version: pck.version });
-        // `PluginModel` does not carry the extension icon, so it travels with the walkthroughs that show it.
-        const pluginIcon = pck.icon ? this.toPluginUrl(pck, pck.icon) : undefined;
-        const result = [];
-        for (const walkthrough of pck.contributes.walkthroughs) {
-            if (typeof walkthrough.id !== 'string' || !walkthrough.id) {
-                this.logger.error(`'contributes.walkthroughs.id' of '${pluginId}' must be defined and non-empty`);
-                continue;
-            }
-            if (typeof walkthrough.title !== 'string' || !walkthrough.title) {
-                this.logger.error(`'contributes.walkthroughs.title' of '${pluginId}.${walkthrough.id}' must be defined and non-empty`);
-                continue;
-            }
-            if (!Array.isArray(walkthrough.steps)) {
-                this.logger.error(`'contributes.walkthroughs.steps' of '${pluginId}.${walkthrough.id}' must be an array`);
-                continue;
-            }
-            const steps = [];
-            for (const step of walkthrough.steps) {
-                if (typeof step.id !== 'string' || !step.id) {
-                    this.logger.error(`'contributes.walkthroughs.steps.id' of '${pluginId}.${walkthrough.id}' must be defined and non-empty`);
-                    continue;
-                }
-                if (typeof step.title !== 'string' || !step.title) {
-                    this.logger.error(`'contributes.walkthroughs.steps.title' of '${pluginId}.${walkthrough.id}.${step.id}' must be defined and non-empty`);
-                    continue;
-                }
-                steps.push({
-                    id: step.id,
-                    title: step.title,
-                    description: step.description || '',
-                    media: this.resolveWalkthroughMedia(pck, step.media),
-                    completionEvents: step.completionEvents,
-                    when: step.when
-                });
-            }
-            result.push({
-                id: walkthrough.id,
-                title: walkthrough.title,
-                description: walkthrough.description || '',
-                steps,
-                when: walkthrough.when,
-                icon: walkthrough.icon,
-                pluginId,
-                pluginIcon
-            });
-        }
-        return result.length > 0 ? result : undefined;
+        return (0, normalize_contributions_1.readWalkthroughs)(pck, this.contributionCtx(pck));
     }
-    resolveWalkthroughMedia(pck, media) {
-        if (!media) {
-            return undefined;
-        }
-        if ('markdown' in media) {
-            return { markdown: this.toPluginUrl(pck, media.markdown) };
-        }
-        const altText = 'altText' in media ? media.altText : undefined;
-        if ('svg' in media) {
-            return { svg: this.toPluginUrl(pck, media.svg), ...(altText !== undefined && { altText }) };
-        }
-        if ('image' in media) {
-            if (typeof media.image === 'string') {
-                return { image: this.toPluginUrl(pck, media.image), ...(altText !== undefined && { altText }) };
-            }
-            // Only `dark` and `light` are mandatory; the high contrast variants fall back to them.
-            const dark = this.toPluginUrl(pck, media.image.dark);
-            const light = this.toPluginUrl(pck, media.image.light);
-            return {
-                image: {
-                    dark,
-                    light,
-                    hc: media.image.hc ? this.toPluginUrl(pck, media.image.hc) : dark,
-                    hcLight: media.image.hcLight ? this.toPluginUrl(pck, media.image.hcLight) : light
-                },
-                ...(altText !== undefined && { altText })
-            };
-        }
-        return undefined;
-    }
-    readCommand({ command, title, shortTitle, original, category, icon, enablement }, pck) {
-        const { themeIcon, iconUrl } = this.transformIconUrl(pck, icon) ?? {};
-        return { command, title, shortTitle, originalTitle: original, category, iconUrl, themeIcon, enablement };
+    readCommand(command, pck) {
+        return (0, normalize_contributions_1.readCommand)(this.contributionCtx(pck), command, pck);
     }
     transformIconUrl(plugin, original) {
-        if (original) {
-            if (typeof original === 'string') {
-                if (original.startsWith('$(')) {
-                    return { themeIcon: original };
-                }
-                else {
-                    return { iconUrl: this.toPluginUrl(plugin, original) };
-                }
-            }
-            else {
-                return {
-                    iconUrl: {
-                        light: this.toPluginUrl(plugin, original.light),
-                        dark: this.toPluginUrl(plugin, original.dark)
-                    }
-                };
-            }
-        }
+        return (0, normalize_contributions_1.transformIconUrl)(this.contributionCtx(plugin), plugin, original);
     }
     toPluginUrl(pck, relativePath) {
-        return plugin_protocol_1.PluginPackage.toPluginUrl(pck, relativePath);
+        return (0, plugin_model_1.toPluginUrl)(pck, relativePath);
     }
     readColors(pck) {
-        if (!pck.contributes || !pck.contributes.colors) {
-            return undefined;
-        }
-        const result = [];
-        for (const contribution of pck.contributes.colors) {
-            if (typeof contribution.id !== 'string' || contribution.id.length === 0) {
-                this.logger.error("'configuration.colors.id' must be defined and can not be empty");
-                continue;
-            }
-            if (!contribution.id.match(colorIdPattern)) {
-                this.logger.error("'configuration.colors.id' must follow the word[.word]*");
-                continue;
-            }
-            if (typeof contribution.description !== 'string' || contribution.id.length === 0) {
-                this.logger.error("'configuration.colors.description' must be defined and can not be empty");
-                continue;
-            }
-            const defaults = contribution.defaults;
-            if (!defaults || typeof defaults !== 'object' || typeof defaults.light !== 'string' || typeof defaults.dark !== 'string' || typeof defaults.highContrast !== 'string') {
-                this.logger.error("'configuration.colors.defaults' must be defined and must contain 'light', 'dark' and 'highContrast'");
-                continue;
-            }
-            result.push({
-                id: contribution.id,
-                description: contribution.description,
-                defaults: {
-                    light: defaults.light,
-                    dark: defaults.dark,
-                    hc: defaults.highContrast
-                }
-            });
-        }
-        return result;
+        return (0, normalize_contributions_1.readColors)(this.contributionCtx(pck), pck);
     }
     readThemes(pck) {
-        if (!pck.contributes || !pck.contributes.themes) {
-            return undefined;
-        }
-        const result = [];
-        for (const contribution of pck.contributes.themes) {
-            if (contribution.path) {
-                result.push({
-                    id: contribution.id,
-                    uri: this.pluginUriFactory.createUri(pck, contribution.path).toString(),
-                    description: contribution.description,
-                    label: contribution.label,
-                    uiTheme: contribution.uiTheme
-                });
-            }
-        }
-        return result;
+        return (0, normalize_contributions_1.readThemes)(this.contributionCtx(pck), pck);
     }
     readIconThemes(pck) {
-        if (!pck.contributes || !pck.contributes.iconThemes) {
-            return undefined;
-        }
-        const result = [];
-        for (const contribution of pck.contributes.iconThemes) {
-            if (typeof contribution.id !== 'string') {
-                this.logger.error('Expected string in `contributes.iconThemes.id`. Provided value:', contribution.id);
-                continue;
-            }
-            if (typeof contribution.path !== 'string') {
-                this.logger.error('Expected string in `contributes.iconThemes.path`. Provided value:', contribution.path);
-                continue;
-            }
-            result.push({
-                id: contribution.id,
-                uri: this.pluginUriFactory.createUri(pck, contribution.path).toString(),
-                description: contribution.description,
-                label: contribution.label,
-                uiTheme: contribution.uiTheme
-            });
-        }
-        return result;
+        return (0, normalize_contributions_1.readIconThemes)(this.contributionCtx(pck), pck);
     }
     readIcons(pck) {
-        if (!pck.contributes || !pck.contributes.icons) {
-            return undefined;
-        }
-        const result = [];
-        const iconEntries = pck.contributes.icons;
-        for (const id in iconEntries) {
-            if (pck.contributes.icons.hasOwnProperty(id)) {
-                if (!id.match(iconIdPattern)) {
-                    this.logger.error("'configuration.icons' keys represent the icon id and can only contain letter, digits and minuses. " +
-                        'They need to consist of at least two segments in the form `component-iconname`.', 'extension: ', pck.name, 'icon id: ', id);
-                    return;
-                }
-                const iconContribution = iconEntries[id];
-                if (typeof iconContribution.description !== 'string' || iconContribution.description['length'] === 0) {
-                    this.logger.error('configuration.icons.description must be defined and can not be empty, ', 'extension: ', pck.name, 'icon id: ', id);
-                    return;
-                }
-                const defaultIcon = iconContribution.default;
-                if (typeof defaultIcon === 'string') {
-                    result.push({
-                        id,
-                        extensionId: pck.publisher + '.' + pck.name,
-                        description: iconContribution.description,
-                        defaults: { id: defaultIcon }
-                    });
-                }
-                else if (typeof defaultIcon === 'object' && typeof defaultIcon.fontPath === 'string' && typeof defaultIcon.fontCharacter === 'string') {
-                    const format = getFileExtension(defaultIcon.fontPath);
-                    if (['woff', 'woff2', 'ttf'].indexOf(format) === -1) {
-                        this.logger.warn("Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.", format);
-                        return;
-                    }
-                    const iconFontLocation = this.pluginUriFactory.createUri(pck, defaultIcon.fontPath).toString();
-                    result.push({
-                        id,
-                        extensionId: pck.publisher + '.' + pck.name,
-                        description: iconContribution.description,
-                        defaults: {
-                            fontCharacter: defaultIcon.fontCharacter,
-                            location: iconFontLocation
-                        }
-                    });
-                }
-                else {
-                    this.logger.error("'configuration.icons.default' must be either a reference to the id of an other theme icon (string) or a icon definition (object) with ", 'properties `fontPath` and `fontCharacter`.');
-                }
-            }
-        }
-        return result;
+        return (0, normalize_contributions_1.readIcons)(this.contributionCtx(pck), pck);
     }
     readSnippets(pck) {
-        if (!pck.contributes || !pck.contributes.snippets) {
-            return undefined;
-        }
-        const result = [];
-        for (const contribution of pck.contributes.snippets) {
-            if (contribution.path) {
-                result.push({
-                    language: contribution.language,
-                    source: pck.displayName || pck.name,
-                    uri: this.pluginUriFactory.createUri(pck, contribution.path).toString()
-                });
-            }
-        }
-        return result;
+        return (0, normalize_contributions_1.readSnippets)(this.contributionCtx(pck), pck);
     }
-    async readJson(filePath) {
-        const content = await this.readFile(filePath);
-        return content ? jsoncparser.parse(content, undefined, { disallowComments: false }) : undefined;
-    }
-    async readFile(filePath) {
-        try {
-            const content = await fs_1.promises.readFile(filePath, { encoding: 'utf8' });
-            return content;
-        }
-        catch (e) {
-            if (!(0, errors_1.isENOENT)(e)) {
-                this.logger.error(e);
-            }
-            return '';
-        }
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     readConfiguration(rawConfiguration, pluginPath) {
-        const { scope, overridable } = TheiaPluginScanner_1.getScope(rawConfiguration.scope);
-        const schema = {
-            scope,
-            defaultOverridable: overridable,
-            title: rawConfiguration.title,
-            properties: {}
-        };
-        if (rawConfiguration.properties) {
-            for (const [key, property] of Object.entries(rawConfiguration.properties)) {
-                const scopeInfo = TheiaPluginScanner_1.getScope(property.scope);
-                const schemaProperty = {
-                    ...property,
-                    scope: scopeInfo.scope,
-                    overridable: scopeInfo.overridable,
-                    default: property.default !== undefined ? property.default : deriveDefaultForType(property.type)
-                };
-                schema.properties[key] = schemaProperty;
-            }
-        }
-        return schema;
+        return (0, normalize_contributions_1.readConfiguration)(rawConfiguration, pluginPath);
     }
     readKeybinding(rawKeybinding) {
-        return {
-            keybinding: rawKeybinding.key,
-            command: rawKeybinding.command,
-            when: rawKeybinding.when,
-            mac: rawKeybinding.mac,
-            linux: rawKeybinding.linux,
-            win: rawKeybinding.win,
-            args: rawKeybinding.args
-        };
+        return (0, normalize_contributions_1.readKeybinding)(rawKeybinding);
     }
     readCustomEditors(rawCustomEditors) {
         return rawCustomEditors.map(rawCustomEditor => this.readCustomEditor(rawCustomEditor));
     }
     readCustomEditor(rawCustomEditor) {
-        return {
-            viewType: rawCustomEditor.viewType,
-            displayName: rawCustomEditor.displayName,
-            selector: rawCustomEditor.selector || [],
-            priority: rawCustomEditor.priority || plugin_protocol_1.CustomEditorPriority.default
-        };
+        return (0, normalize_contributions_1.readCustomEditor)(rawCustomEditor);
     }
     readViewsContainers(rawViewsContainers, pck) {
-        return rawViewsContainers.map(rawViewContainer => this.readViewContainer(rawViewContainer, pck));
+        return rawViewsContainers
+            .map(rawViewContainer => this.readViewContainer(rawViewContainer, pck))
+            .filter((container) => container !== undefined);
     }
     readViewContainer(rawViewContainer, pck) {
-        const themeIcon = rawViewContainer.icon.startsWith('$(') ? rawViewContainer.icon : undefined;
-        const iconUrl = this.toPluginUrl(pck, rawViewContainer.icon);
-        return {
-            id: rawViewContainer.id,
-            title: rawViewContainer.title,
-            iconUrl,
-            themeIcon,
-            when: rawViewContainer.when,
-        };
+        return (0, normalize_contributions_1.readViewContainer)(this.contributionCtx(pck), rawViewContainer, pck);
     }
     readViews(rawViews) {
         return rawViews.map(rawView => this.readView(rawView));
     }
     readView(rawView) {
-        const result = {
-            id: rawView.id,
-            name: rawView.name,
-            when: rawView.when,
-            type: rawView.type
-        };
-        return result;
+        return (0, normalize_contributions_1.readView)(rawView);
     }
     readViewsWelcome(rawViewsWelcome, rowViews) {
         return rawViewsWelcome.map(rawViewWelcome => this.readViewWelcome(rawViewWelcome, this.extractPluginViewsIds(rowViews)));
     }
     readViewWelcome(rawViewWelcome, pluginViewsIds) {
-        const result = {
-            view: rawViewWelcome.view,
-            content: rawViewWelcome.contents,
-            when: rawViewWelcome.when,
-            enablement: rawViewWelcome.enablement,
-            // if the plugin contributes Welcome view to its own view - it will be ordered first
-            order: pluginViewsIds.findIndex(v => v === rawViewWelcome.view) > -1 ? 0 : 1
-        };
-        return result;
+        return (0, normalize_contributions_1.readViewWelcome)(rawViewWelcome, pluginViewsIds);
     }
     extractPluginViewsIds(views) {
-        const pluginViewsIds = [];
-        if (views) {
-            for (const location of Object.keys(views)) {
-                const viewsIds = views[location].map(view => view.id);
-                pluginViewsIds.push(...viewsIds);
-            }
-            ;
-        }
-        return pluginViewsIds;
+        return (0, normalize_contributions_1.extractPluginViewsIds)(views);
     }
     readMenus(rawMenus) {
         return rawMenus.map(rawMenu => this.readMenu(rawMenu));
     }
     readMenu(rawMenu) {
-        const result = {
-            command: rawMenu.command,
-            submenu: rawMenu.submenu,
-            alt: rawMenu.alt,
-            group: rawMenu.group,
-            when: rawMenu.when
-        };
-        return result;
+        return (0, normalize_contributions_1.readMenu)(rawMenu);
     }
     async readLanguages(rawLanguages, plugin) {
         return Promise.all(rawLanguages.map(language => this.readLanguage(language, plugin)));
@@ -855,175 +254,40 @@ let TheiaPluginScanner = TheiaPluginScanner_1 = class TheiaPluginScanner extends
         return rawSubmenus.map(submenu => this.readSubmenu(submenu, plugin));
     }
     readSubmenu(rawSubmenu, plugin) {
-        const icon = this.transformIconUrl(plugin, rawSubmenu.icon);
-        return {
-            icon: icon?.iconUrl ?? icon?.themeIcon,
-            id: rawSubmenu.id,
-            label: rawSubmenu.label
-        };
+        return (0, normalize_contributions_1.readSubmenu)(this.contributionCtx(plugin), rawSubmenu, plugin);
     }
     async readLanguage(rawLang, plugin) {
-        // TODO: add validation to all parameters
-        const icon = this.transformIconUrl(plugin, rawLang.icon);
-        const result = {
-            id: rawLang.id,
-            aliases: rawLang.aliases,
-            extensions: rawLang.extensions,
-            filenamePatterns: rawLang.filenamePatterns,
-            filenames: rawLang.filenames,
-            firstLine: rawLang.firstLine,
-            mimetypes: rawLang.mimetypes,
-            icon: icon?.iconUrl ?? icon?.themeIcon
-        };
-        if (rawLang.configuration) {
-            const rawConfiguration = await this.readJson(path.resolve(plugin.packagePath, rawLang.configuration));
-            if (rawConfiguration) {
-                const configuration = {
-                    brackets: rawConfiguration.brackets,
-                    comments: rawConfiguration.comments,
-                    folding: rawConfiguration.folding,
-                    wordPattern: rawConfiguration.wordPattern,
-                    autoClosingPairs: this.extractValidAutoClosingPairs(rawLang.id, rawConfiguration),
-                    indentationRules: rawConfiguration.indentationRules,
-                    surroundingPairs: this.extractValidSurroundingPairs(rawLang.id, rawConfiguration),
-                    onEnterRules: rawConfiguration.onEnterRules,
-                };
-                result.configuration = configuration;
-            }
-        }
-        return result;
+        return (0, normalize_contributions_1.readLanguage)(this.contributionCtx(plugin), rawLang, plugin);
     }
     readDebuggers(rawDebuggers) {
-        return rawDebuggers.map(rawDebug => this.readDebugger(rawDebug));
+        return rawDebuggers.map(rawDebugger => this.readDebugger(rawDebugger));
     }
     readDebugger(rawDebugger) {
-        const result = {
-            type: rawDebugger.type,
-            label: rawDebugger.label,
-            languages: rawDebugger.languages,
-            enableBreakpointsFor: rawDebugger.enableBreakpointsFor,
-            variables: rawDebugger.variables,
-            adapterExecutableCommand: rawDebugger.adapterExecutableCommand,
-            configurationSnippets: rawDebugger.configurationSnippets,
-            win: rawDebugger.win,
-            winx86: rawDebugger.winx86,
-            windows: rawDebugger.windows,
-            osx: rawDebugger.osx,
-            linux: rawDebugger.linux,
-            program: rawDebugger.program,
-            args: rawDebugger.args,
-            runtime: rawDebugger.runtime,
-            runtimeArgs: rawDebugger.runtimeArgs,
-            configurationAttributes: rawDebugger.configurationAttributes
-        };
-        return result;
+        return (0, normalize_contributions_1.readDebugger)(rawDebugger);
     }
     readTaskDefinition(pluginName, definitionContribution) {
-        const propertyKeys = definitionContribution.properties ? Object.keys(definitionContribution.properties) : [];
-        const schema = this.toSchema(definitionContribution);
-        return {
-            taskType: definitionContribution.type,
-            source: pluginName,
-            properties: {
-                required: definitionContribution.required || [],
-                all: propertyKeys,
-                schema
-            }
-        };
+        return (0, normalize_contributions_1.readTaskDefinition)(pluginName, definitionContribution, {
+            toSchema: definition => this.toSchema(definition)
+        });
     }
     toSchema(definition) {
-        const reconciliation = { ...definition, type: 'object' };
-        const schema = (0, objects_1.deepClone)(reconciliation);
-        if (schema.properties === undefined) {
-            schema.properties = Object.create(null);
-        }
-        schema.type = 'object';
-        schema.properties.type = { type: 'string', const: definition.type };
-        return schema;
+        return (0, normalize_contributions_1.toSchema)(definition);
     }
-    extractValidAutoClosingPairs(langId, configuration) {
-        const source = configuration.autoClosingPairs;
-        if (typeof source === 'undefined') {
-            return undefined;
-        }
-        if (!Array.isArray(source)) {
-            this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs\` to be an array.`);
-            return undefined;
-        }
-        let result = undefined;
-        for (let i = 0, len = source.length; i < len; i++) {
-            const pair = source[i];
-            if (Array.isArray(pair)) {
-                if (!isCharacterPair(pair)) {
-                    this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}]\` to be an array of two strings or an object.`);
-                    continue;
-                }
-                result = result || [];
-                result.push({ open: pair[0], close: pair[1] });
-            }
-            else {
-                if (!(0, types_1.isObject)(pair)) {
-                    this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}]\` to be an array of two strings or an object.`);
-                    continue;
-                }
-                if (typeof pair.open !== 'string') {
-                    this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].open\` to be a string.`);
-                    continue;
-                }
-                if (typeof pair.close !== 'string') {
-                    this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].close\` to be a string.`);
-                    continue;
-                }
-                if (typeof pair.notIn !== 'undefined') {
-                    if (!(0, types_1.isStringArray)(pair.notIn)) {
-                        this.logger.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].notIn\` to be a string array.`);
-                        continue;
-                    }
-                }
-                result = result || [];
-                result.push({ open: pair.open, close: pair.close, notIn: pair.notIn });
-            }
-        }
-        return result;
+    async readJson(filePath) {
+        const content = await this.readFile(filePath);
+        return content ? jsoncparser.parse(content, undefined, { disallowComments: false }) : undefined;
     }
-    extractValidSurroundingPairs(langId, configuration) {
-        const source = configuration.surroundingPairs;
-        if (typeof source === 'undefined') {
-            return undefined;
-        }
-        if (!Array.isArray(source)) {
-            this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs\` to be an array.`);
-            return undefined;
+    async readFile(filePath) {
+        try {
+            const content = await fs_1.promises.readFile(filePath, { encoding: 'utf8' });
+            return content;
         }
-        let result = undefined;
-        for (let i = 0, len = source.length; i < len; i++) {
-            const pair = source[i];
-            if (Array.isArray(pair)) {
-                if (!isCharacterPair(pair)) {
-                    this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}]\` to be an array of two strings or an object.`);
-                    continue;
-                }
-                result = result || [];
-                result.push({ open: pair[0], close: pair[1] });
-            }
-            else {
-                if (!(0, types_1.isObject)(pair)) {
-                    this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}]\` to be an array of two strings or an object.`);
-                    continue;
-                }
-                if (typeof pair.open !== 'string') {
-                    this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}].open\` to be a string.`);
-                    continue;
-                }
-                if (typeof pair.close !== 'string') {
-                    this.logger.warn(`[${langId}]: language configuration: expected \`surroundingPairs[${i}].close\` to be a string.`);
-                    continue;
-                }
-                result = result || [];
-                result.push({ open: pair.open, close: pair.close });
+        catch (e) {
+            if (!(0, utils_1.isENOENT)(e)) {
+                this.logger.error(e);
             }
+            return '';
         }
-        return result;
     }
 };
 exports.TheiaPluginScanner = TheiaPluginScanner;
@@ -1032,12 +296,8 @@ tslib_1.__decorate([
     (0, inversify_1.named)('plugin-ext:TheiaPluginScanner'),
     tslib_1.__metadata("design:type", Object)
 ], TheiaPluginScanner.prototype, "logger", void 0);
-exports.TheiaPluginScanner = TheiaPluginScanner = TheiaPluginScanner_1 = tslib_1.__decorate([
+exports.TheiaPluginScanner = TheiaPluginScanner = tslib_1.__decorate([
     (0, inversify_1.injectable)(),
     tslib_1.__metadata("design:paramtypes", [])
 ], TheiaPluginScanner);
-function isCharacterPair(something) {
-    return ((0, types_1.isStringArray)(something)
-        && something.length === 2);
-}
 //# sourceMappingURL=scanner-theia.js.map