@theia/core 1.22.0-next.6 → 1.22.0

package/src/common/uri.ts

@@ -78,6 +78,16 @@ export default class URI {
         return this.withPath(this.path.join(path.toString()));
     }
 
+    /**
+     * @returns a new, absolute URI if one can be computed from the path segments passed in.
+     */
+    resolveToAbsolute(...pathSegments: Array<string | Path>): URI | undefined {
+        const absolutePath = this.path.resolve(...pathSegments.map(path => path.toString()));
+        if (absolutePath) {
+            return this.withPath(absolutePath);
+        }
+    }
+
     /**
      * return a new URI replacing the current with the given scheme
      */

package/src/electron-browser/keyboard/electron-keyboard-layout-change-notifier.ts

@@ -14,8 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { ipcRenderer } from '@theia/electron/shared/electron';
 import { postConstruct, injectable } from 'inversify';
-import { ipcRenderer } from '../../../shared/electron';
 import { KeyboardLayoutChangeNotifier, NativeKeyboardLayout } from '../../common/keyboard/keyboard-layout-provider';
 import { Emitter, Event } from '../../common/event';
 

package/src/electron-browser/menu/electron-context-menu-renderer.ts

@@ -16,7 +16,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import * as electron from '../../../shared/electron';
+import * as electron from '../../../electron-shared/electron';
 import { inject, injectable, postConstruct } from 'inversify';
 import {
     ContextMenuRenderer, RenderContextMenuOptions, ContextMenuAccess, FrontendApplicationContribution, CommonCommands, coordinateFromAnchor, PreferenceService
@@ -105,8 +105,10 @@ export class ElectronContextMenuRenderer extends BrowserContextMenuRenderer {
             const menu = this.electronMenuFactory.createElectronContextMenu(menuPath, args);
             const { x, y } = coordinateFromAnchor(anchor);
             const zoom = electron.webFrame.getZoomFactor();
+            // TODO: Remove the offset once Electron fixes https://github.com/electron/electron/issues/31641
+            const offset = process.platform === 'win32' ? 0 : 2;
             // x and y values must be Ints or else there is a conversion error
-            menu.popup({ x: Math.round(x * zoom), y: Math.round(y * zoom) });
+            menu.popup({ x: Math.round(x * zoom) + offset, y: Math.round(y * zoom) + offset });
             // native context menu stops the event loop, so there is no keyboard events
             this.context.resetAltPressed();
             if (onHide) {

package/src/electron-browser/menu/electron-main-menu-factory.ts

@@ -16,7 +16,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import * as electron from '../../../shared/electron';
+import * as electronRemote from '../../../electron-shared/@electron/remote';
 import { inject, injectable } from 'inversify';
 import {
     CommandRegistry, isOSX, ActionMenuNode, CompositeMenuNode,
@@ -56,7 +56,7 @@ export type ElectronMenuItemRole = ('undo' | 'redo' | 'cut' | 'copy' | 'paste' |
 @injectable()
 export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
 
-    protected _menu: Electron.Menu | undefined;
+    protected _menu?: Electron.Menu;
     protected _toggledCommands: Set<string> = new Set();
 
     constructor(
@@ -73,9 +73,12 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
                 }
                 if (this._menu) {
                     for (const item of this._toggledCommands) {
-                        this._menu.getMenuItemById(item).checked = this.commandRegistry.isToggled(item);
+                        const menuItem = this._menu.getMenuItemById(item);
+                        if (menuItem) {
+                            menuItem.checked = this.commandRegistry.isToggled(item);
+                        }
                     }
-                    electron.remote.getCurrentWindow().setMenu(this._menu);
+                    electronRemote.getCurrentWindow().setMenu(this._menu);
                 }
             }, 10)
         );
@@ -88,10 +91,10 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
         await this.preferencesService.ready;
         if (isOSX) {
             const createdMenuBar = this.createElectronMenuBar();
-            electron.remote.Menu.setApplicationMenu(createdMenuBar);
+            electronRemote.Menu.setApplicationMenu(createdMenuBar);
         } else if (this.preferencesService.get('window.titleBarStyle') === 'native') {
             const createdMenuBar = this.createElectronMenuBar();
-            electron.remote.getCurrentWindow().setMenu(createdMenuBar);
+            electronRemote.getCurrentWindow().setMenu(createdMenuBar);
         }
     }
 
@@ -104,7 +107,10 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
             if (isOSX) {
                 template.unshift(this.createOSXMenu());
             }
-            const menu = electron.remote.Menu.buildFromTemplate(template);
+            const menu = electronRemote.Menu.buildFromTemplate(template);
+            if (!menu) {
+                throw new Error('menu is null');
+            }
             this._menu = menu;
             return this._menu;
         }
@@ -116,7 +122,7 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
     createElectronContextMenu(menuPath: MenuPath, args?: any[]): Electron.Menu {
         const menuModel = this.menuProvider.getMenu(menuPath);
         const template = this.fillMenuTemplate([], menuModel, args, { showDisabled: false });
-        return electron.remote.Menu.buildFromTemplate(template);
+        return electronRemote.Menu.buildFromTemplate(template);
     }
 
     protected fillMenuTemplate(items: Electron.MenuItemConstructorOptions[],
@@ -184,15 +190,9 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
 
                 const bindings = this.keybindingRegistry.getKeybindingsForCommand(commandId);
 
-                let accelerator;
+                const accelerator = bindings[0] && this.acceleratorFor(bindings[0]);
 
-                /* Only consider the first keybinding. */
-                if (bindings.length > 0) {
-                    const binding = bindings[0];
-                    accelerator = this.acceleratorFor(binding);
-                }
-
-                const menuItem = {
+                const menuItem: Electron.MenuItemConstructorOptions = {
                     id: node.id,
                     label: node.label,
                     type: this.commandRegistry.getToggledHandler(commandId, ...args) ? 'checkbox' : 'normal',
@@ -201,7 +201,7 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
                     visible: true,
                     accelerator,
                     click: () => this.execute(commandId, args)
-                } as Electron.MenuItemConstructorOptions;
+                };
 
                 if (isOSX) {
                     const role = this.roleFor(node.id);
@@ -241,7 +241,7 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
         }
 
         const keyCode = bindingKeySequence[0];
-        return this.keybindingRegistry.acceleratorForKeyCode(keyCode, '+');
+        return this.keybindingRegistry.acceleratorForKeyCode(keyCode, '+', true);
     }
 
     protected roleFor(id: string): ElectronMenuItemRole | undefined {
@@ -279,8 +279,11 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
             if (this.commandRegistry.isEnabled(command, ...args)) {
                 await this.commandRegistry.executeCommand(command, ...args);
                 if (this._menu && this.commandRegistry.isVisible(command, ...args)) {
-                    this._menu.getMenuItemById(command).checked = this.commandRegistry.isToggled(command, ...args);
-                    electron.remote.getCurrentWindow().setMenu(this._menu);
+                    const item = this._menu.getMenuItemById(command);
+                    if (item) {
+                        item.checked = this.commandRegistry.isToggled(command, ...args);
+                        electronRemote.getCurrentWindow().setMenu(this._menu);
+                    }
                 }
             }
         } catch {

package/src/electron-browser/menu/electron-menu-contribution.ts

@@ -14,7 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import * as electron from '../../../shared/electron';
+import * as electron from '../../../electron-shared/electron';
+import * as electronRemote from '../../../electron-shared/@electron/remote';
 import { inject, injectable } from 'inversify';
 import {
     Command, CommandContribution, CommandRegistry,
@@ -104,7 +105,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
             // OSX: Recreate the menus when changing windows.
             // OSX only has one menu bar for all windows, so we need to swap
             // between them as the user switches windows.
-            electron.remote.getCurrentWindow().on('focus', () => this.setMenu(app));
+            electronRemote.getCurrentWindow().on('focus', () => this.setMenu(app));
         }
         // Make sure the application menu is complete, once the frontend application is ready.
         // https://github.com/theia-ide/theia/issues/5100
@@ -136,11 +137,11 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
         electron.ipcRenderer.send(RequestTitleBarStyle);
         this.preferenceService.ready.then(() => {
             this.setMenu(app);
-            electron.remote.getCurrentWindow().setMenuBarVisibility(['classic', 'visible'].includes(this.preferenceService.get('window.menuBarVisibility', 'classic')));
+            electronRemote.getCurrentWindow().setMenuBarVisibility(['classic', 'visible'].includes(this.preferenceService.get('window.menuBarVisibility', 'classic')));
         });
         this.preferenceService.onPreferenceChanged(change => {
             if (change.preferenceName === 'window.titleBarStyle') {
-                if (this.titleBarStyleChangeFlag && this.titleBarStyle !== change.newValue && electron.remote.getCurrentWindow().isFocused()) {
+                if (this.titleBarStyleChangeFlag && this.titleBarStyle !== change.newValue && electronRemote.getCurrentWindow().isFocused()) {
                     electron.ipcRenderer.send(TitleBarStyleChanged, change.newValue);
                     this.handleRequiredRestart();
                 }
@@ -177,9 +178,9 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
     }
 
     protected setMenu(app: FrontendApplication, electronMenu: electron.Menu | null = this.factory.createElectronMenuBar(),
-        electronWindow: electron.BrowserWindow = electron.remote.getCurrentWindow()): void {
+        electronWindow: electron.BrowserWindow = electronRemote.getCurrentWindow()): void {
         if (isOSX) {
-            electron.remote.Menu.setApplicationMenu(electronMenu);
+            electronRemote.Menu.setApplicationMenu(electronMenu);
         } else {
             this.hideTopPanel(app);
             if (this.titleBarStyle === 'custom' && !this.menuBar) {
@@ -252,11 +253,11 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
 
     registerCommands(registry: CommandRegistry): void {
 
-        const currentWindow = electron.remote.getCurrentWindow();
+        const currentWindow = electronRemote.getCurrentWindow();
 
         registry.registerCommand(ElectronCommands.TOGGLE_DEVELOPER_TOOLS, {
             execute: () => {
-                const webContent = electron.remote.getCurrentWebContents();
+                const webContent = electronRemote.getCurrentWebContents();
                 if (!webContent.isDevToolsOpened()) {
                     webContent.openDevTools();
                 } else {

package/src/electron-browser/messaging/electron-ipc-connection-provider.ts

@@ -14,8 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { Event as ElectronEvent, ipcRenderer } from '@theia/electron/shared/electron';
 import { injectable, interfaces } from 'inversify';
-import { Event as ElectronEvent, ipcRenderer } from '../../../shared/electron';
 import { JsonRpcProxy } from '../../common/messaging';
 import { WebSocketChannel } from '../../common/messaging/web-socket-channel';
 import { AbstractConnectionProvider } from '../../common/messaging/abstract-connection-provider';

package/src/electron-browser/token/electron-token-frontend-module.ts

@@ -14,10 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import * as electron from '../../../shared/electron';
+import * as electronRemote from '../../../electron-shared/@electron/remote';
 import { ContainerModule } from 'inversify';
 import { ElectronSecurityToken } from '../../electron-common/electron-token';
 
 export default new ContainerModule(bind => {
-    bind(ElectronSecurityToken).toConstantValue(electron.remote.getGlobal(ElectronSecurityToken));
+    bind(ElectronSecurityToken).toConstantValue(electronRemote.getGlobal(ElectronSecurityToken));
 });

package/src/electron-browser/window/electron-window-service.ts

@@ -14,8 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import * as electronRemote from '../../../electron-shared/@electron/remote';
 import { injectable, inject, postConstruct } from 'inversify';
-import * as electron from '../../../shared/electron';
+import * as electron from '../../../electron-shared/electron';
 import { NewWindowOptions } from '../../common/window';
 import { DefaultWindowService } from '../../browser/window/default-window-service';
 import { ElectronMainWindowService } from '../../electron-common/electron-main-window-service';
@@ -85,7 +86,7 @@ export class ElectronWindowService extends DefaultWindowService {
      */
     protected updateWindowZoomLevel(): void {
         const preferredZoomLevel = this.electronWindowPreferences['window.zoomLevel'];
-        const webContents = electron.remote.getCurrentWindow().webContents;
+        const webContents = electronRemote.getCurrentWindow().webContents;
         if (webContents.getZoomLevel() !== preferredZoomLevel) {
             webContents.setZoomLevel(preferredZoomLevel);
         }

package/src/electron-main/electron-main-application.ts

@@ -15,7 +15,8 @@
  ********************************************************************************/
 
 import { inject, injectable, named } from 'inversify';
-import { screen, globalShortcut, ipcMain, app, BrowserWindow, BrowserWindowConstructorOptions, Event as ElectronEvent } from '../../shared/electron';
+import * as electronRemoteMain from '../../electron-shared/@electron/remote/main';
+import { screen, globalShortcut, ipcMain, app, BrowserWindow, BrowserWindowConstructorOptions, Event as ElectronEvent } from '../../electron-shared/electron';
 import * as path from 'path';
 import { Argv } from 'yargs';
 import { AddressInfo } from 'net';
@@ -190,7 +191,9 @@ export class ElectronMainApplication {
     @inject(ElectronSecurityToken)
     protected readonly electronSecurityToken: ElectronSecurityToken;
 
-    protected readonly electronStore = new Storage();
+    protected readonly electronStore = new Storage<{
+        windowstate?: TheiaBrowserWindowOptions
+    }>();
 
     protected readonly _backendPort = new Deferred<number>();
     readonly backendPort = this._backendPort.promise;
@@ -266,6 +269,7 @@ export class ElectronMainApplication {
         this.attachGlobalShortcuts(electronWindow);
         this.restoreMaximizedState(electronWindow, options);
         this.attachCloseListeners(electronWindow, options);
+        electronRemoteMain.enable(electronWindow.webContents);
         return electronWindow;
     }
 
@@ -304,6 +308,8 @@ export class ElectronMainApplication {
             minWidth: 200,
             minHeight: 120,
             webPreferences: {
+                // `global` is undefined when `true`.
+                contextIsolation: false,
                 // https://github.com/eclipse-theia/theia/issues/2018
                 nodeIntegration: true,
                 // Setting the following option to `true` causes some features to break, somehow.
@@ -487,7 +493,14 @@ export class ElectronMainApplication {
 
     protected async handleStopRequest(electronWindow: BrowserWindow, onSafeCallback: () => unknown, reason: StopReason): Promise<void> {
         // Only confirm close to windows that have loaded our front end.
-        const safeToClose = !electronWindow.webContents.getURL().includes(this.globals.THEIA_FRONTEND_HTML_PATH) || await this.checkSafeToStop(electronWindow, reason);
+        let currentUrl = electronWindow.webContents.getURL();
+        let frontendUri = this.globals.THEIA_FRONTEND_HTML_PATH;
+        // Since our resolved frontend HTML path might contain backward slashes on Windows, we normalize everything first.
+        if (isWindows) {
+            currentUrl = currentUrl.replace(/\\/g, '/');
+            frontendUri = frontendUri.replace(/\\/g, '/');
+        }
+        const safeToClose = !currentUrl.includes(frontendUri) || await this.checkSafeToStop(electronWindow, reason);
         if (safeToClose) {
             onSafeCallback();
         }
@@ -582,7 +595,12 @@ export class ElectronMainApplication {
 
         ipcMain.on(TitleBarStyleChanged, ({ sender }, titleBarStyle: string) => {
             this.useNativeWindowFrame = titleBarStyle === 'native';
-            this.saveWindowState(BrowserWindow.fromId(sender.id));
+            const browserWindow = BrowserWindow.fromId(sender.id);
+            if (browserWindow) {
+                this.saveWindowState(browserWindow);
+            } else {
+                console.warn(`no BrowserWindow with id: ${sender.id}`);
+            }
         });
 
         ipcMain.on(Restart, ({ sender }) => {
@@ -619,8 +637,11 @@ export class ElectronMainApplication {
 
     protected restart(id: number): void {
         this.restarting = true;
-        const window = BrowserWindow.fromId(id);
-        window.on('closed', async () => {
+        const browserWindow = BrowserWindow.fromId(id);
+        if (!browserWindow) {
+            throw new Error(`no BrowserWindow with id: ${id}`);
+        }
+        browserWindow.on('closed', async () => {
             await this.launch({
                 secondInstance: false,
                 argv: this.processArgv.getProcessArgvWithoutBin(process.argv),
@@ -628,12 +649,15 @@ export class ElectronMainApplication {
             });
             this.restarting = false;
         });
-        this.handleStopRequest(window, () => this.doCloseWindow(window), StopReason.Restart);
+        this.handleStopRequest(browserWindow, () => this.doCloseWindow(browserWindow), StopReason.Restart);
     }
 
     protected async handleReload(event: Electron.IpcMainEvent): Promise<void> {
-        const window = BrowserWindow.fromId(event.sender.id);
-        this.reload(window);
+        const browserWindow = BrowserWindow.fromId(event.sender.id);
+        if (!browserWindow) {
+            throw new Error(`no BrowserWindow with id: ${event.sender.id}`);
+        }
+        this.reload(browserWindow);
     }
 
     protected reload(electronWindow: BrowserWindow): void {

package/src/electron-main/electron-main-window-service-impl.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { shell } from '../../shared/electron';
+import { shell } from '@theia/electron/shared/electron';
 import { injectable, inject } from 'inversify';
 import { ElectronMainWindowService } from '../electron-common/electron-main-window-service';
 import { ElectronMainApplication } from './electron-main-application';

package/src/electron-main/electron-native-keymap.ts

@@ -14,10 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { webContents } from '../../shared/electron';
+import { webContents } from '@theia/electron/shared/electron';
+import * as nativeKeymap from '@theia/electron/shared/native-keymap';
 import { injectable } from 'inversify';
 import { ElectronMainApplication, ElectronMainApplicationContribution } from './electron-main-application';
-import * as nativeKeymap from '@theia/electron/native-keymap';
 
 @injectable()
 export class ElectronNativeKeymap implements ElectronMainApplicationContribution {

package/src/electron-main/electron-security-token-service.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { session } from '../../shared/electron';
+import { session } from '@theia/electron/shared/electron';
 import { inject, injectable } from 'inversify';
 import { ElectronSecurityToken } from '../electron-common/electron-token';
 

package/src/electron-main/messaging/electron-messaging-contribution.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { IpcMainEvent, ipcMain, WebContents } from '../../../shared/electron';
+import { IpcMainEvent, ipcMain, WebContents } from '@theia/electron/shared/electron';
 import { inject, injectable, named, postConstruct } from 'inversify';
 import { MessageConnection } from 'vscode-ws-jsonrpc';
 import { createWebSocketConnection } from 'vscode-ws-jsonrpc/lib/socket/connection';

package/src/electron-node/keyboard/electron-keyboard-layout-provider.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import * as nativeKeymap from '@theia/electron/native-keymap';
+import * as nativeKeymap from '@theia/electron/shared/native-keymap';
 import { injectable } from 'inversify';
 import { KeyboardLayoutProvider, NativeKeyboardLayout } from '../../common/keyboard/keyboard-layout-provider';
 

package/lib/browser/markdown-renderer.d.ts

@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-import * as markdownit from 'markdown-it';
-export declare class MarkdownRenderer {
-    protected engine: markdownit;
-    protected callbacks: Map<string, ((element: Element) => Element | void)[]>;
-    constructor(engine?: markdownit);
-    /**
-     * Adds a modification callback that is applied to every element with the specified tag after rendering to HTML.
-     *
-     * @param tag The tag that this modification applies to.
-     * @param callback The modification to apply on every selected rendered element. Can either modify the element in place or return a new element.
-     */
-    modify<K extends keyof HTMLElementTagNameMap>(tag: K, callback: (element: HTMLElementTagNameMap[K]) => Element | void): MarkdownRenderer;
-    render(markdown: string): HTMLElement;
-    renderInline(markdown: string): HTMLElement;
-    protected renderInternal(renderedHtml: string): HTMLElement;
-    protected sanitizeHtml(html: string): HTMLElement;
-}
-//# sourceMappingURL=markdown-renderer.d.ts.map

package/lib/browser/markdown-renderer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown-renderer.d.ts","sourceRoot":"","sources":["../../src/browser/markdown-renderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAE1C,qBAAa,gBAAgB;IAEzB,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAC7B,SAAS,CAAC,SAAS,yBAA8B,OAAO,KAAK,OAAO,GAAG,IAAI,KAAO;gBAEtE,MAAM,CAAC,EAAE,UAAU;IAI/B;;;;;OAKG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,qBAAqB,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG,IAAI,GAAG,gBAAgB;IASxI,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW;IAIrC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW;IAI3C,SAAS,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW;IAmB3D,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;CAKpD"}

package/lib/browser/markdown-renderer.js

@@ -1,72 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MarkdownRenderer = void 0;
-const DOMPurify = require("dompurify");
-const markdownit = require("markdown-it");
-class MarkdownRenderer {
-    constructor(engine) {
-        this.callbacks = new Map();
-        this.engine = engine !== null && engine !== void 0 ? engine : markdownit();
-    }
-    /**
-     * Adds a modification callback that is applied to every element with the specified tag after rendering to HTML.
-     *
-     * @param tag The tag that this modification applies to.
-     * @param callback The modification to apply on every selected rendered element. Can either modify the element in place or return a new element.
-     */
-    modify(tag, callback) {
-        if (this.callbacks.has(tag)) {
-            this.callbacks.get(tag).push(callback);
-        }
-        else {
-            this.callbacks.set(tag, [callback]);
-        }
-        return this;
-    }
-    render(markdown) {
-        return this.renderInternal(this.engine.render(markdown));
-    }
-    renderInline(markdown) {
-        return this.renderInternal(this.engine.renderInline(markdown));
-    }
-    renderInternal(renderedHtml) {
-        const div = this.sanitizeHtml(renderedHtml);
-        for (const [tag, calls] of this.callbacks) {
-            for (const callback of calls) {
-                const elements = Array.from(div.getElementsByTagName(tag));
-                for (const element of elements) {
-                    const result = callback(element);
-                    if (result) {
-                        const parent = element.parentElement;
-                        if (parent) {
-                            parent.replaceChild(result, element);
-                        }
-                    }
-                }
-            }
-        }
-        return div;
-    }
-    sanitizeHtml(html) {
-        const div = document.createElement('div');
-        div.innerHTML = DOMPurify.sanitize(html);
-        return div;
-    }
-}
-exports.MarkdownRenderer = MarkdownRenderer;
-//# sourceMappingURL=markdown-renderer.js.map

package/lib/browser/markdown-renderer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown-renderer.js","sourceRoot":"","sources":["../../src/browser/markdown-renderer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,uCAAuC;AACvC,0CAA0C;AAE1C,MAAa,gBAAgB;IAKzB,YAAY,MAAmB;QAFrB,cAAS,GAAG,IAAI,GAAG,EAAoD,CAAC;QAG9E,IAAI,CAAC,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,UAAU,EAAE,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAwC,GAAM,EAAE,QAA+D;QACjH,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACzB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC3C;aAAM;YACH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;SACvC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,QAAgB;QACnB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,YAAY,CAAC,QAAgB;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnE,CAAC;IAES,cAAc,CAAC,YAAoB;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QAC5C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;YACvC,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE;gBAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC3D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;oBAC5B,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;oBACjC,IAAI,MAAM,EAAE;wBACR,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;wBACrC,IAAI,MAAM,EAAE;4BACR,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;yBACxC;qBACJ;iBACJ;aACJ;SACJ;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAES,YAAY,CAAC,IAAY;QAC/B,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AAxDD,4CAwDC"}

package/lib/browser/markdown-renderer.spec.d.ts

@@ -1,17 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-export {};
-//# sourceMappingURL=markdown-renderer.spec.d.ts.map

package/lib/browser/markdown-renderer.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"markdown-renderer.spec.d.ts","sourceRoot":"","sources":["../../src/browser/markdown-renderer.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF"}

package/lib/browser/markdown-renderer.spec.js

@@ -1,71 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2021 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-const jsdom_1 = require("../browser/test/jsdom");
-let disableJSDOM = jsdom_1.enableJSDOM();
-const chai_1 = require("chai");
-const markdownit = require("markdown-it");
-const markdown_renderer_1 = require("./markdown-renderer");
-disableJSDOM();
-describe('MarkdownRenderer', () => {
-    before(() => disableJSDOM = jsdom_1.enableJSDOM());
-    after(() => disableJSDOM());
-    it('Should render markdown', () => {
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer();
-        const result = markdownRenderer.renderInline('[title](link)').innerHTML;
-        chai_1.expect(result).to.be.equal('<a href="link">title</a>');
-    });
-    it('Should accept and use custom engine', () => {
-        const engine = markdownit();
-        const originalTextRenderer = engine.renderer.rules.text;
-        engine.renderer.rules.text = (tokens, idx, options, env, self) => `[${originalTextRenderer(tokens, idx, options, env, self)}]`;
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer(engine);
-        const result = markdownRenderer.renderInline('text').innerHTML;
-        chai_1.expect(result).to.be.equal('[text]');
-    });
-    it('Should modify rendered markdown in place', () => {
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer().modify('a', a => {
-            a.href = 'something-else';
-        });
-        const result = markdownRenderer.renderInline('[title](link)').innerHTML;
-        chai_1.expect(result).to.be.equal('<a href="something-else">title</a>');
-    });
-    it('Should modify descendants of children', () => {
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer().modify('em', em => {
-            const strong = document.createElement('strong');
-            // eslint-disable-next-line no-unsanitized/property
-            strong.innerHTML = em.innerHTML;
-            return strong;
-        });
-        const result = markdownRenderer.render('**bold *bold and italic***').innerHTML;
-        chai_1.expect(result).to.be.equal('<p><strong>bold <strong>bold and italic</strong></strong></p>\n');
-    });
-    it('Should modify descendants of children after previous modification', () => {
-        const markdownRenderer = new markdown_renderer_1.MarkdownRenderer().modify('em', em => {
-            const strong = document.createElement('strong');
-            // eslint-disable-next-line no-unsanitized/property
-            strong.innerHTML = em.innerHTML;
-            return strong;
-        }).modify('strong', strong => {
-            const textNode = strong.childNodes.item(0);
-            textNode.textContent = `changed_${textNode.textContent}`;
-        });
-        const result = markdownRenderer.render('**bold *bold and italic***').innerHTML;
-        chai_1.expect(result).to.be.equal('<p><strong>changed_bold <strong>changed_bold and italic</strong></strong></p>\n');
-    });
-});
-//# sourceMappingURL=markdown-renderer.spec.js.map