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

package/src/common/plugin-protocol.ts

@@ -17,17 +17,113 @@ import { RpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
 import { RPCProtocol } from './rpc-protocol';
 import { Disposable } from '@theia/core/lib/common/disposable';
 import { LogPart, KeysToAnyValues, KeysToKeysToAnyValue } from './types';
-import { CharacterPair, CommentRule, PluginAPIFactory, Plugin, ThemeIcon } from './plugin-api-rpc';
+import { PluginAPIFactory, Plugin } from './plugin-api-rpc';
 import { ExtPluginApi } from './plugin-ext-api-contribution';
-import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-schema';
 import { ProblemMatcherContribution, ProblemPatternContribution, TaskDefinition } from '@theia/task/lib/common';
 import { ColorDefinition } from '@theia/core/lib/common/color';
 import { ResourceLabelFormatter } from '@theia/core/lib/common/label-protocol';
-import { PluginIdentifiers } from './plugin-identifiers';
-import { JSONObject } from '@theia/core/shared/@lumino/coreutils';
 import { PreferenceSchema } from '@theia/core';
+import { PluginIdentifiers } from './plugin-identifiers';
+import {
+    getPluginId,
+    toPluginUrl as toPluginUrlFromUtils
+} from '@theia/plugin-utils/lib/common/plugin-model';
+import {
+    PLUGIN_HOST_BACKEND,
+    PluginEntryPoint,
+    PluginLifecycle,
+    PluginManifest,
+    PluginMetadata,
+    PluginModel,
+    PluginPackageCapabilities,
+    PluginType,
+    DeployedPlugin as DeployedPluginBase,
+} from '@theia/plugin-utils/lib/common/manifest-types';
+import {
+    AutoClosingPair,
+    AutoClosingPairConditional,
+    CustomEditorPriority,
+    CustomEditorSelector,
+    EnterAction,
+    FoldingMarkers,
+    FoldingRules,
+    IndentationRules,
+    OnEnterRule,
+    PluginColorContribution,
+    PluginIconContribution,
+    PluginIconThemeContribution,
+    PluginJsonValidationContribution,
+    PluginManifestContribution,
+    PluginNotebookRendererContribution,
+    PluginPackageAuthenticationProvider,
+    PluginPackageCommand,
+    PluginPackageCustomEditor,
+    PluginPackageDebuggersContribution,
+    PluginPackageGrammarsContribution,
+    PluginPackageKeybinding,
+    PluginPackageLanguageContribution,
+    PluginPackageLanguageContributionConfiguration,
+    PluginPackageLanguageModelToolContribution,
+    PluginPackageLocalization,
+    PluginPackageMcpServerDefinitionProviderContribution,
+    PluginPackageMenu,
+    PluginPackageNotebook,
+    PluginPackageNotebookPreload,
+    PluginPackageSnippetsContribution,
+    PluginPackageSubmenu,
+    PluginPackageTerminal,
+    PluginPackageTerminalProfile,
+    PluginPackageTranslation,
+    PluginPackageView,
+    PluginPackageViewContainer,
+    PluginPackageViewWelcome,
+    PluginPackageWalkthrough,
+    PluginPackageWalkthroughStep,
+    PluginPackageWalkthroughStepMedia,
+    PluginTaskDefinitionContribution,
+    PluginThemeContribution,
+    PluginUiTheme,
+    PluginViewType,
+    PlatformSpecificAdapterContribution,
+    RegExpOptions,
+    ScopeMap,
+    type GrammarsContribution,
+    type IconUrl,
+    type JSONObject,
+    type NormalizedCommand,
+    type NormalizedCustomEditor,
+    type NormalizedIcon,
+    type NormalizedIconTheme,
+    type NormalizedKeybinding,
+    type NormalizedLanguage,
+    type NormalizedLanguageConfiguration,
+    type NormalizedLocalization,
+    type NormalizedPluginContribution,
+    type NormalizedSnippet,
+    type NormalizedSubmenu,
+    type NormalizedTerminalProfile,
+    type NormalizedTheme,
+    type NormalizedTranslation,
+    type NormalizedViewContainer,
+    type NormalizedViewWelcome,
+    type WalkthroughContribution,
+    type WalkthroughStepContribution,
+    type WalkthroughStepMedia,
+} from '@theia/plugin-utils/lib/common/contribution-types';
 
 export { PluginIdentifiers };
+export { getPluginId };
+export { toPluginUrlFromUtils as toPluginUrl };
+export {
+    PLUGIN_HOST_BACKEND,
+    PluginEntryPoint,
+    PluginLifecycle,
+    PluginManifest,
+    PluginModel,
+    PluginPackageCapabilities,
+    PluginMetadata,
+    PluginType
+};
 export const hostedServicePath = '/services/hostedPlugin';
 
 /**
@@ -36,359 +132,85 @@ export const hostedServicePath = '/services/hostedPlugin';
 export type PluginEngine = string;
 
 /**
- * This interface describes a package.json object.
+ * Loaded plugin package with stricter fields used by `@theia/plugin-ext`.
  */
-export interface PluginPackage {
-    name: string;
+export interface PluginPackage extends PluginManifest {
     // The publisher is not guaranteed to be defined for unpublished plugins. https://github.com/microsoft/vscode-vsce/commit/a38657ece04c20e4fbde15d5ac1ed39ca51cb856
     publisher: string | undefined;
-    version: string;
     engines: {
         [type in PluginEngine]: string;
     };
-    theiaPlugin?: {
-        frontend?: string;
-        backend?: string;
-        /* Requires the `@theia/plugin-ext-headless` extension. */
-        headless?: string;
-    };
-    main?: string;
-    browser?: string;
     displayName: string;
     description: string;
     contributes?: PluginPackageContribution;
-    packagePath: string;
-    activationEvents?: string[];
-    extensionDependencies?: string[];
-    extensionPack?: string[];
-    l10n?: string;
-    icon?: string;
-    type?: 'module' | 'commonjs';
-    extensionKind?: Array<'ui' | 'workspace'>;
-    capabilities?: {
-        untrustedWorkspaces?: {
-            supported: boolean | 'limited';
-            description?: string;
-            restrictedConfigurations?: string[];
-        };
-    };
 }
 export namespace PluginPackage {
-    export function toPluginUrl(pck: PluginPackage | PluginModel, relativePath: string): string {
-        return `hostedPlugin/${getPluginId(pck)}/${encodeURIComponent(relativePath)}`;
-    }
-}
+    export const toPluginUrl = toPluginUrlFromUtils;
+}
+
+export {
+    AutoClosingPair,
+    AutoClosingPairConditional,
+    CustomEditorPriority,
+    CustomEditorSelector,
+    EnterAction,
+    FoldingMarkers,
+    FoldingRules,
+    type GrammarsContribution,
+    IndentationRules,
+    OnEnterRule,
+    PluginColorContribution,
+    PluginIconContribution,
+    PluginIconThemeContribution,
+    PluginJsonValidationContribution,
+    PluginManifestContribution,
+    PluginNotebookRendererContribution,
+    PluginPackageAuthenticationProvider,
+    PluginPackageCommand,
+    PluginPackageCustomEditor,
+    PluginPackageDebuggersContribution,
+    PluginPackageGrammarsContribution,
+    PluginPackageKeybinding,
+    PluginPackageLanguageContribution,
+    PluginPackageLanguageContributionConfiguration,
+    PluginPackageLanguageModelToolContribution,
+    PluginPackageLocalization,
+    PluginPackageMcpServerDefinitionProviderContribution,
+    PluginPackageMenu,
+    PluginPackageNotebook,
+    PluginPackageNotebookPreload,
+    PluginPackageSnippetsContribution,
+    PluginPackageSubmenu,
+    PluginPackageTerminal,
+    PluginPackageTerminalProfile,
+    PluginPackageTranslation,
+    PluginPackageView,
+    PluginPackageViewContainer,
+    PluginPackageViewWelcome,
+    PluginPackageWalkthrough,
+    PluginPackageWalkthroughStep,
+    PluginPackageWalkthroughStepMedia,
+    PluginTaskDefinitionContribution,
+    PluginThemeContribution,
+    PluginUiTheme,
+    PluginViewType,
+    PlatformSpecificAdapterContribution,
+    RegExpOptions,
+    ScopeMap,
+    type IconUrl,
+    type JSONObject,
+    type WalkthroughContribution,
+    type WalkthroughStepContribution,
+    type WalkthroughStepMedia,
+};
 
 /**
- * This interface describes a package.json contribution section object.
+ * Strict `contributes` typing for scanned plugin packages.
  */
-export interface PluginPackageContribution {
-    authentication?: PluginPackageAuthenticationProvider[];
-    configuration?: JSONObject | JSONObject[];
-    configurationDefaults?: JSONObject;
-    languages?: PluginPackageLanguageContribution[];
-    grammars?: PluginPackageGrammarsContribution[];
-    customEditors?: PluginPackageCustomEditor[];
-    viewsContainers?: { [location: string]: PluginPackageViewContainer[] };
-    views?: { [location: string]: PluginPackageView[] };
-    viewsWelcome?: PluginPackageViewWelcome[];
-    commands?: PluginPackageCommand | PluginPackageCommand[];
-    menus?: { [location: string]: PluginPackageMenu[] };
-    submenus?: PluginPackageSubmenu[];
-    keybindings?: PluginPackageKeybinding | PluginPackageKeybinding[];
-    debuggers?: PluginPackageDebuggersContribution[];
-    snippets?: PluginPackageSnippetsContribution[];
-    themes?: PluginThemeContribution[];
-    iconThemes?: PluginIconThemeContribution[];
-    icons?: PluginIconContribution[];
-    colors?: PluginColorContribution[];
-    taskDefinitions?: PluginTaskDefinitionContribution[];
+export interface PluginPackageContribution extends PluginManifestContribution {
     problemMatchers?: PluginProblemMatcherContribution[];
     problemPatterns?: PluginProblemPatternContribution[];
-    jsonValidation?: PluginJsonValidationContribution[];
     resourceLabelFormatters?: ResourceLabelFormatter[];
-    localizations?: PluginPackageLocalization[];
-    terminal?: PluginPackageTerminal;
-    notebooks?: PluginPackageNotebook[];
-    notebookRenderer?: PluginNotebookRendererContribution[];
-    notebookPreload?: PluginPackageNotebookPreload[];
-    mcpServerDefinitionProviders?: PluginPackageMcpServerDefinitionProviderContribution[];
-    languageModelTools?: PluginPackageLanguageModelToolContribution[];
-    walkthroughs?: PluginPackageWalkthrough[];
-}
-
-/**
- * Media of a walkthrough step as contributed in `package.json`. Only the light and dark variant of an
- * image are mandatory, the high contrast ones were added to the VS Code schema later.
- */
-export type PluginPackageWalkthroughStepMedia =
-    { markdown: string }
-    | { image: string | { dark: string; light: string; hc?: string; hcLight?: string }; altText?: string }
-    | { svg: string; altText?: string };
-
-export interface PluginPackageWalkthroughStep {
-    id: string;
-    title: string;
-    description: string;
-    media?: PluginPackageWalkthroughStepMedia;
-    completionEvents?: string[];
-    when?: string;
-}
-
-export interface PluginPackageWalkthrough {
-    id: string;
-    title: string;
-    description: string;
-    steps: PluginPackageWalkthroughStep[];
-    when?: string;
-    icon?: string;
-}
-
-export interface PluginPackageNotebook {
-    type: string;
-    displayName: string;
-    selector?: readonly { filenamePattern?: string; excludeFileNamePattern?: string }[];
-    priority?: string;
-}
-
-export interface PluginNotebookRendererContribution {
-    readonly id: string;
-    readonly displayName: string;
-    readonly mimeTypes: string[];
-    readonly entrypoint: string | { readonly extends: string; readonly path: string };
-    readonly requiresMessaging?: 'always' | 'optional' | 'never'
-}
-
-export interface PluginPackageNotebookPreload {
-    type: string;
-    entrypoint: string;
-}
-
-export interface PluginPackageMcpServerDefinitionProviderContribution {
-    id: string;
-    label: string;
-    description?: string;
-}
-
-export interface PluginPackageLanguageModelToolContribution {
-    name: string;
-    modelDescription?: string;
-    userDescription?: string;
-    inputSchema?: object;
-    tags?: string[];
-}
-
-export interface PluginPackageAuthenticationProvider {
-    id: string;
-    label: string;
-}
-
-export interface PluginPackageTerminalProfile {
-    title: string;
-    id: string;
-    icon?: string;
-}
-
-export interface PluginPackageTerminal {
-    profiles: PluginPackageTerminalProfile[];
-}
-
-export interface PluginPackageLocalization {
-    languageId: string;
-    languageName?: string;
-    localizedLanguageName?: string;
-    translations: PluginPackageTranslation[];
-    minimalTranslations?: { [key: string]: string };
-}
-
-export interface PluginPackageTranslation {
-    id: string;
-    path: string;
-}
-
-export interface PluginPackageCustomEditor {
-    viewType: string;
-    displayName: string;
-    selector?: CustomEditorSelector[];
-    priority?: CustomEditorPriority;
-}
-
-export interface CustomEditorSelector {
-    readonly filenamePattern?: string;
-}
-
-export enum CustomEditorPriority {
-    default = 'default',
-    builtin = 'builtin',
-    option = 'option',
-}
-
-export interface PluginPackageViewContainer {
-    id: string;
-    title: string;
-    icon: string;
-    when?: string;
-}
-
-export enum PluginViewType {
-    Tree = 'tree',
-    Webview = 'webview'
-}
-
-export interface PluginPackageView {
-    id: string;
-    name: string;
-    when?: string;
-    type?: string;
-}
-
-export interface PluginPackageViewWelcome {
-    view: string;
-    contents: string;
-    when?: string;
-    enablement?: string;
-}
-
-export interface PluginPackageCommand {
-    command: string;
-    title: string;
-    shortTitle?: string;
-    original?: string;
-    category?: string;
-    icon?: string | { light: string; dark: string; };
-    enablement?: string;
-}
-
-export interface PluginPackageMenu {
-    command?: string;
-    submenu?: string;
-    alt?: string;
-    group?: string;
-    when?: string;
-}
-
-export interface PluginPackageSubmenu {
-    id: string;
-    label: string;
-    icon: IconUrl;
-}
-
-export interface PluginPackageKeybinding {
-    key?: string;
-    command: string;
-    when?: string;
-    mac?: string;
-    linux?: string;
-    win?: string;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    args?: any;
-}
-
-export interface PluginPackageGrammarsContribution {
-    language?: string;
-    scopeName: string;
-    path: string;
-    embeddedLanguages?: ScopeMap;
-    tokenTypes?: ScopeMap;
-    injectTo?: string[];
-}
-
-export interface ScopeMap {
-    [scopeName: string]: string;
-}
-
-export interface PluginPackageSnippetsContribution {
-    language?: string;
-    path?: string;
-}
-
-export interface PluginColorContribution {
-    id?: string;
-    description?: string;
-    defaults?: { light?: string, dark?: string, highContrast?: string };
-}
-
-export type PluginUiTheme = 'vs' | 'vs-dark' | 'hc-black';
-
-export interface PluginThemeContribution {
-    id?: string;
-    label?: string;
-    description?: string;
-    path?: string;
-    uiTheme?: PluginUiTheme;
-}
-
-export interface PluginIconThemeContribution {
-    id?: string;
-    label?: string;
-    description?: string;
-    path?: string;
-    uiTheme?: PluginUiTheme;
-}
-
-export interface PluginIconContribution {
-    [id: string]: {
-        description: string;
-        default: { fontPath: string; fontCharacter: string } | string;
-    };
-}
-
-export interface PlatformSpecificAdapterContribution {
-    program?: string;
-    args?: string[];
-    runtime?: string;
-    runtimeArgs?: string[];
-}
-
-/**
- * This interface describes a package.json debuggers contribution section object.
- */
-export interface PluginPackageDebuggersContribution extends PlatformSpecificAdapterContribution {
-    type: string;
-    label?: string;
-    languages?: string[];
-    enableBreakpointsFor?: { languageIds: string[] };
-    configurationAttributes: { [request: string]: IJSONSchema };
-    configurationSnippets: IJSONSchemaSnippet[];
-    variables?: ScopeMap;
-    adapterExecutableCommand?: string;
-    win?: PlatformSpecificAdapterContribution;
-    winx86?: PlatformSpecificAdapterContribution;
-    windows?: PlatformSpecificAdapterContribution;
-    osx?: PlatformSpecificAdapterContribution;
-    linux?: PlatformSpecificAdapterContribution;
-}
-
-/**
- * This interface describes a package.json languages contribution section object.
- */
-export interface PluginPackageLanguageContribution {
-    id: string;
-    extensions?: string[];
-    filenames?: string[];
-    filenamePatterns?: string[];
-    firstLine?: string;
-    aliases?: string[];
-    mimetypes?: string[];
-    configuration?: string;
-    icon?: IconUrl;
-}
-
-export interface PluginPackageLanguageContributionConfiguration {
-    comments?: CommentRule;
-    brackets?: CharacterPair[];
-    autoClosingPairs?: (CharacterPair | AutoClosingPairConditional)[];
-    surroundingPairs?: (CharacterPair | AutoClosingPair)[];
-    wordPattern?: string;
-    indentationRules?: IndentationRules;
-    folding?: FoldingRules;
-    onEnterRules?: OnEnterRule[];
-}
-
-export interface PluginTaskDefinitionContribution {
-    type: string;
-    required: string[];
-    properties?: IJSONSchema['properties'];
 }
 
 export interface PluginProblemMatcherContribution extends ProblemMatcherContribution {
@@ -399,11 +221,6 @@ export interface PluginProblemPatternContribution extends ProblemPatternContribu
     name: string;
 }
 
-export interface PluginJsonValidationContribution {
-    fileMatch: string | string[];
-    url: string;
-}
-
 export const PluginScanner = Symbol('PluginScanner');
 /**
  * This scanner process package.json object and returns plugin metadata objects.
@@ -513,14 +330,6 @@ export enum PluginDeployerEntryType {
     HEADLESS // Deployed in the Theia Node server outside the context of a frontend/backend connection
 }
 
-/**
- * Whether a plugin installed by a user or system.
- */
-export enum PluginType {
-    System,
-    User
-};
-
 export interface UnresolvedPluginEntry {
     id: string;
     type?: PluginType;
@@ -607,185 +416,47 @@ export interface PluginDeployerDirectoryHandlerContext {
 }
 
 /**
- * This interface describes a plugin model object, which is populated from package.json.
+ * Static plugin contributions after normalization.
+ * Narrows shim/`unknown` fields from {@link NormalizedPluginContribution} to core/task types.
  */
-export interface PluginModel {
-    id: string;
-    name: string;
-    publisher: string;
-    version: string;
-    displayName: string;
-    description: string;
-    engine: {
-        type: PluginEngine;
-        version: string;
-    };
-    entryPoint: PluginEntryPoint;
-    packageUri: string;
-    /**
-     * @deprecated since 1.1.0 - because it lead to problems with getting a relative path
-     * needed by Icon Themes to correctly load Fonts, use packageUri instead.
-     */
-    packagePath: string;
-    iconUrl?: string;
-    l10n?: string;
-    readmeUrl?: string;
-    licenseUrl?: string;
-    untrustedWorkspacesSupport?: boolean | 'limited';
-}
-
-export interface PluginEntryPoint {
-    frontend?: string;
-    backend?: string;
-    headless?: string;
-}
-
-/**
- * This interface describes some static plugin contributions.
- */
-export interface PluginContribution {
-    activationEvents?: string[];
-    authentication?: AuthenticationProviderInformation[];
+export type PluginContribution = Omit<NormalizedPluginContribution,
+    'configuration' | 'colors' | 'taskDefinitions' | 'problemMatchers' | 'problemPatterns' | 'resourceLabelFormatters'
+> & {
     configuration?: PreferenceSchema[];
-    configurationDefaults?: JSONObject;
-    languages?: LanguageContribution[];
-    grammars?: GrammarsContribution[];
-    customEditors?: CustomEditor[];
-    viewsContainers?: { [location: string]: ViewContainer[] };
-    views?: { [location: string]: View[] };
-    viewsWelcome?: ViewWelcome[];
-    commands?: PluginCommand[];
-    menus?: { [location: string]: Menu[] };
-    submenus?: Submenu[];
-    keybindings?: Keybinding[];
-    debuggers?: DebuggerContribution[];
-    snippets?: SnippetContribution[];
-    themes?: ThemeContribution[];
-    iconThemes?: IconThemeContribution[];
-    icons?: IconContribution[];
     colors?: ColorDefinition[];
     taskDefinitions?: TaskDefinition[];
     problemMatchers?: ProblemMatcherContribution[];
     problemPatterns?: ProblemPatternContribution[];
     resourceLabelFormatters?: ResourceLabelFormatter[];
-    localizations?: Localization[];
-    terminalProfiles?: TerminalProfile[];
-    notebooks?: NotebookContribution[];
-    notebookRenderer?: NotebookRendererContribution[];
-    notebookPreload?: notebookPreloadContribution[];
-    walkthroughs?: WalkthroughContribution[];
-}
-export interface NotebookContribution {
-    type: string;
-    displayName: string;
-    selector?: readonly { filenamePattern?: string; excludeFileNamePattern?: string }[];
-    priority?: string;
-}
-
-export interface NotebookRendererContribution {
-    readonly id: string;
-    readonly displayName: string;
-    readonly mimeTypes: string[];
-    readonly entrypoint: string | { readonly extends: string; readonly path: string };
-    readonly requiresMessaging?: 'always' | 'optional' | 'never'
-}
-
-export interface notebookPreloadContribution {
-    type: string;
-    entrypoint: string;
-}
+};
 
-/**
- * Media of a walkthrough step with every path resolved and every image variant filled in.
- */
-export type WalkthroughStepMedia =
-    { markdown: string }
-    | { image: string | { dark: string; light: string; hc: string; hcLight: string }; altText?: string }
-    | { svg: string; altText?: string };
+export type NotebookContribution = PluginPackageNotebook;
 
-export interface WalkthroughStepContribution {
-    id: string;
-    title: string;
-    description: string;
-    media?: WalkthroughStepMedia;
-    completionEvents?: string[];
-    when?: string;
-}
+export type NotebookRendererContribution = PluginNotebookRendererContribution;
 
-export interface WalkthroughContribution {
-    id: string;
-    title: string;
-    description: string;
-    steps: WalkthroughStepContribution[];
-    when?: string;
-    icon?: string;
-    pluginId: string;
-    /** Icon of the contributing extension, as a backend relative path. */
-    pluginIcon?: string;
-}
+export type notebookPreloadContribution = PluginPackageNotebookPreload;
 
-export interface AuthenticationProviderInformation {
-    id: string;
-    label: string;
-}
+export type AuthenticationProviderInformation = PluginPackageAuthenticationProvider;
 
-export interface TerminalProfile {
-    title: string,
-    id: string,
-    icon?: string
-}
+export type TerminalProfile = NormalizedTerminalProfile;
 
-export interface Localization {
-    languageId: string;
-    languageName?: string;
-    localizedLanguageName?: string;
-    translations: Translation[];
-    minimalTranslations?: { [key: string]: string };
-}
+export type Localization = NormalizedLocalization;
 
-export interface Translation {
-    id: string;
-    path: string;
-    cachedContents?: { [scope: string]: { [key: string]: string } };
-}
+export type Translation = NormalizedTranslation;
 
-export interface SnippetContribution {
-    uri: string
-    source: string
-    language?: string
-}
+export type SnippetContribution = NormalizedSnippet;
 
-export type UiTheme = 'vs' | 'vs-dark' | 'hc-black';
+export type UiTheme = PluginUiTheme;
 
-export interface ThemeContribution {
-    id?: string;
-    label?: string;
-    description?: string;
-    uri: string;
-    uiTheme?: UiTheme;
-}
+export type ThemeContribution = NormalizedTheme;
 
-export interface IconThemeContribution {
-    id: string;
-    label?: string;
-    description?: string;
-    uri: string;
-    uiTheme?: UiTheme;
-}
+export type IconThemeContribution = NormalizedIconTheme;
 
-export interface IconDefinition {
-    fontCharacter: string;
-    location: string;
-}
+export type IconDefinition = Extract<NormalizedIcon['defaults'], { fontCharacter: string }>;
 
-export type IconDefaults = ThemeIcon | IconDefinition;
+export type IconDefaults = NormalizedIcon['defaults'];
 
-export interface IconContribution {
-    id: string;
-    extensionId: string;
-    description: string | undefined;
-    defaults: IconDefaults;
-}
+export type IconContribution = NormalizedIcon;
 
 export namespace IconContribution {
     export function isIconDefinition(defaults: IconDefaults): defaults is IconDefinition {
@@ -793,219 +464,48 @@ export namespace IconContribution {
     }
 }
 
-export interface GrammarsContribution {
-    format: 'json' | 'plist';
-    language?: string;
-    scope: string;
-    grammar?: string | object;
-    grammarLocation?: string;
-    embeddedLanguages?: ScopeMap;
-    tokenTypes?: ScopeMap;
-    injectTo?: string[];
-    balancedBracketScopes?: string[];
-    unbalancedBracketScopes?: string[];
-}
-
 /**
  * The language contribution
  */
-export interface LanguageContribution {
-    id: string;
-    extensions?: string[];
-    filenames?: string[];
-    filenamePatterns?: string[];
-    firstLine?: string;
-    aliases?: string[];
-    mimetypes?: string[];
-    configuration?: LanguageConfiguration;
-    /**
-     * @internal
-     */
-    icon?: IconUrl;
-}
-
-export interface RegExpOptions {
-    pattern: string;
-    flags?: string;
-}
-
-export interface LanguageConfiguration {
-    brackets?: CharacterPair[];
-    indentationRules?: IndentationRules;
-    surroundingPairs?: AutoClosingPair[];
-    autoClosingPairs?: AutoClosingPairConditional[];
-    comments?: CommentRule;
-    folding?: FoldingRules;
-    wordPattern?: string | RegExpOptions;
-    onEnterRules?: OnEnterRule[];
-}
-
-/**
- * This interface describes a package.json debuggers contribution section object.
- */
-export interface DebuggerContribution extends PlatformSpecificAdapterContribution {
-    type: string,
-    label?: string,
-    languages?: string[],
-    enableBreakpointsFor?: {
-        languageIds: string[]
-    },
-    configurationAttributes?: {
-        [request: string]: IJSONSchema
-    },
-    configurationSnippets?: IJSONSchemaSnippet[],
-    variables?: ScopeMap,
-    adapterExecutableCommand?: string
-    win?: PlatformSpecificAdapterContribution;
-    winx86?: PlatformSpecificAdapterContribution;
-    windows?: PlatformSpecificAdapterContribution;
-    osx?: PlatformSpecificAdapterContribution;
-    linux?: PlatformSpecificAdapterContribution;
-}
+export type LanguageContribution = NormalizedLanguage;
 
-export interface IndentationRules {
-    increaseIndentPattern: string | RegExpOptions;
-    decreaseIndentPattern: string | RegExpOptions;
-    unIndentedLinePattern?: string | RegExpOptions;
-    indentNextLinePattern?: string | RegExpOptions;
-}
-export interface AutoClosingPair {
-    close: string;
-    open: string;
-}
-
-export interface AutoClosingPairConditional extends AutoClosingPair {
-    notIn?: string[];
-}
+export type LanguageConfiguration = NormalizedLanguageConfiguration;
 
-export interface FoldingMarkers {
-    start: string | RegExpOptions;
-    end: string | RegExpOptions;
-}
-
-export interface FoldingRules {
-    offSide?: boolean;
-    markers?: FoldingMarkers;
-}
-
-export interface OnEnterRule {
-    beforeText: string | RegExpOptions;
-    afterText?: string | RegExpOptions;
-    previousLineText?: string | RegExpOptions;
-    action: EnterAction;
-}
-
-export interface EnterAction {
-    indent: 'none' | 'indent' | 'outdent' | 'indentOutdent';
-    appendText?: string;
-    removeText?: number;
-}
+export type DebuggerContribution = PluginPackageDebuggersContribution;
 
 /**
  * Custom Editors contribution
  */
-export interface CustomEditor {
-    viewType: string;
-    displayName: string;
-    selector: CustomEditorSelector[];
-    priority: CustomEditorPriority;
-}
+export type CustomEditor = NormalizedCustomEditor;
 
 /**
  * Views Containers contribution
  */
-export interface ViewContainer {
-    id: string;
-    title: string;
-    iconUrl: string;
-    themeIcon?: string;
-    when?: string;
-}
+export type ViewContainer = NormalizedViewContainer;
 
 /**
  * View contribution
  */
-export interface View {
-    id: string;
-    name: string;
-    when?: string;
-    type?: string;
-}
+export type View = PluginPackageView;
 
 /**
  * View Welcome contribution
  */
-export interface ViewWelcome {
-    view: string;
-    content: string;
-    when?: string;
-    enablement?: string;
-    order: number;
-}
-
-export interface PluginCommand {
-    command: string;
-    title: string;
-    shortTitle?: string;
-    originalTitle?: string;
-    category?: string;
-    iconUrl?: IconUrl;
-    themeIcon?: string;
-    enablement?: string;
-}
+export type ViewWelcome = NormalizedViewWelcome;
 
-export type IconUrl = string | { light: string; dark: string; };
+export type PluginCommand = NormalizedCommand;
 
 /**
  * Menu contribution
  */
-export interface Menu {
-    command?: string;
-    submenu?: string
-    alt?: string;
-    group?: string;
-    when?: string;
-}
+export type Menu = PluginPackageMenu;
 
-export interface Submenu {
-    id: string;
-    label: string;
-    icon?: IconUrl;
-}
+export type Submenu = NormalizedSubmenu;
 
 /**
  * Keybinding contribution
  */
-export interface Keybinding {
-    keybinding?: string;
-    command: string;
-    when?: string;
-    mac?: string;
-    linux?: string;
-    win?: string;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    args?: any;
-}
-
-/**
- * This interface describes a plugin lifecycle object.
- */
-export interface PluginLifecycle {
-    startMethod: string;
-    stopMethod: string;
-    /**
-     * Frontend module name, frontend plugin should expose this name.
-     */
-    frontendModuleName?: string;
-    /**
-     * Path to the script which should do some initialization before frontend plugin is loaded.
-     */
-    frontendInitPath?: string;
-    /**
-     * Path to the script which should do some initialization before backend plugin is loaded.
-     */
-    backendInitPath?: string;
-}
+export type Keybinding = NormalizedKeybinding;
 
 /**
  * The export function of initialization module of backend plugin.
@@ -1026,27 +526,11 @@ export interface ExtensionContext {
     subscriptions: Disposable[];
 }
 
-export interface PluginMetadata {
-    host: string;
-    model: PluginModel;
-    lifecycle: PluginLifecycle;
-    isUnderDevelopment?: boolean;
-    outOfSync: boolean;
-}
-
 export const MetadataProcessor = Symbol('MetadataProcessor');
 export interface MetadataProcessor {
     process(pluginMetadata: PluginMetadata): void;
 }
 
-export function getPluginId(plugin: PluginPackage | PluginModel): string {
-    return `${plugin.publisher}_${plugin.name}`.replace(/\W/g, '_');
-}
-
-export function buildFrontendModuleName(plugin: PluginPackage | PluginModel): string {
-    return `${plugin.publisher}_${plugin.name}`.replace(/\W/g, '_');
-}
-
 export const HostedPluginClient = Symbol('HostedPluginClient');
 export interface HostedPluginClient {
     postMessage(pluginHost: string, buffer: Uint8Array): Promise<void>;
@@ -1107,14 +591,7 @@ export interface PluginDeployerHandler {
 
 }
 
-export interface DeployedPlugin {
-    /**
-     * defaults to system
-     */
-    type?: PluginType;
-    metadata: PluginMetadata;
-    contributes?: PluginContribution;
-}
+export type DeployedPlugin = DeployedPluginBase<PluginContribution>;
 
 export const HostedPluginServer = Symbol('HostedPluginServer');
 export interface HostedPluginServer extends RpcServer<HostedPluginClient> {
@@ -1135,8 +612,6 @@ export interface HostedPluginServer extends RpcServer<HostedPluginClient> {
 
 }
 
-export const PLUGIN_HOST_BACKEND = 'main';
-
 export interface WorkspaceStorageKind {
     workspace?: string | undefined;
     roots: string[];