@eclipse-glsp/vscode-integration-webview 1.1.0-RC07 → 1.1.0-RC09

package/lib/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2023 EclipseSource 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
@@ -29,6 +29,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+__exportStar(require("./copy-paste-handler-provider"), exports);
+__exportStar(require("./diagram-identifier"), exports);
+__exportStar(require("./extension-action-handler"), exports);
+__exportStar(require("./glsp-diagram-widget"), exports);
 __exportStar(require("./glsp-starter"), exports);
 __exportStar(require("./glsp-vscode-diagramserver"), exports);
+__exportStar(require("./services"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAA+B;AAC/B,8DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,gEAA8C;AAC9C,uDAAqC;AACrC,6DAA2C;AAC3C,wDAAsC;AACtC,iDAA+B;AAC/B,8DAA4C;AAC5C,6CAA2B"}

package/lib/services.d.ts

@@ -0,0 +1,24 @@
+/********************************************************************************
+ * Copyright (c) 2022 TypeFox and others.
+ * Modifications: 2023 EclipseSource 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 interface VsCodeApi {
+    postMessage: (message: any) => void;
+}
+export declare const VsCodeApi: unique symbol;
+export interface GLSPStarterServices {
+    vscodeApi?: VsCodeApi;
+}
+//# sourceMappingURL=services.d.ts.map

package/lib/services.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;kFAekF;AAElF,MAAM,WAAW,SAAS;IACtB,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;CACvC;AAED,eAAO,MAAM,SAAS,eAAsB,CAAC;AAE7C,MAAM,WAAW,mBAAmB;IAChC,SAAS,CAAC,EAAE,SAAS,CAAC;CACzB"}

package/lib/services.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VsCodeApi = void 0;
+exports.VsCodeApi = Symbol('VsCodeApi');
+//# sourceMappingURL=services.js.map

package/lib/services.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"services.js","sourceRoot":"","sources":["../src/services.ts"],"names":[],"mappings":";;;AAqBa,QAAA,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC"}

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@eclipse-glsp/vscode-integration-webview",
-  "version": "1.1.0-RC07",
+  "version": "1.1.0-RC09",
   "description": "Integration of a GLSP diagram in a VS Code extensions (WebView part)",
-  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
     "vscode",
     "graph",
@@ -12,13 +11,14 @@
   ],
   "homepage": "https://www.eclipse.org/glsp/",
   "bugs": "https://github.com/eclipse-glsp/glsp/issues",
-  "author": {
-    "name": "Eclipse GLSP"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/eclipse-glsp/glsp-vscode-integration.git"
   },
+  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
+  "author": {
+    "name": "Eclipse GLSP"
+  },
   "contributors": [
     {
       "name": "Eclipse GLSP Project",
@@ -26,18 +26,13 @@
       "url": "https://projects.eclipse.org/projects/ecd.glsp"
     }
   ],
+  "main": "lib/index",
+  "types": "lib/index",
   "files": [
     "lib",
     "src",
     "css"
   ],
-  "dependencies": {
-    "@eclipse-glsp/client": "1.1.0-RC07",
-    "sprotty-vscode-webview": "~0.3.1"
-  },
-  "devDependencies": {
-    "reflect-metadata": "^0.1.13"
-  },
   "scripts": {
     "build": "tsc -b",
     "clean": "rimraf lib tsconfig.tsbuildinfo ",
@@ -46,10 +41,14 @@
     "prepare": "yarn clean && yarn build",
     "watch": "tsc -w"
   },
+  "dependencies": {
+    "@eclipse-glsp/client": "1.1.0-RC09"
+  },
+  "devDependencies": {
+    "reflect-metadata": "^0.1.13"
+  },
   "publishConfig": {
     "access": "public"
   },
-  "main": "lib/index",
-  "types": "lib/index",
-  "gitHead": "a1ee3f51d6de27234165d37636ac43081a378523"
+  "gitHead": "e60e31264c893cf01f4cbb7f80fd3648db967d25"
 }

package/src/copy-paste-handler-provider.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ICopyPasteHandler } from '@eclipse-glsp/client/lib/features/copy-paste/copy-paste-handler';
+import { ICopyPasteHandler } from '@eclipse-glsp/client';
 
 export const CopyPasteHandlerProvider = Symbol('CopyPasteHandlerProvider');
 /**

package/src/{diagram-identifer.ts → diagram-identifier.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 EclipseSource 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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { hasStringProp, InitializeResult } from '@eclipse-glsp/client';
+import { AnyObject, hasStringProp, InitializeResult } from '@eclipse-glsp/client';
 
 export const GLSPDiagramIdentifier = Symbol('GLSPDiagramIdentifier');
 
@@ -26,10 +26,22 @@ export interface GLSPDiagramIdentifier {
 
 export function isDiagramIdentifier(object: any): object is GLSPDiagramIdentifier {
     return (
-        object !== undefined &&
-        typeof object === 'object' &&
+        AnyObject.is(object) && //
         hasStringProp(object, 'clientId') &&
         hasStringProp(object, 'diagramType') &&
         hasStringProp(object, 'uri')
     );
 }
+
+// ----------------------------------
+// Initial Handshake
+
+export interface WebviewReadyMessage {
+    readyMessage: string;
+}
+
+export namespace WebviewReadyMessage {
+    export function is(object: unknown): object is WebviewReadyMessage {
+        return AnyObject.is(object) && hasStringProp(object, 'readyMessage');
+    }
+}

package/src/extension-action-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 EclipseSource 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
@@ -14,8 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { Action, ActionHandlerRegistry, IActionHandler, IActionHandlerInitializer, ICommand } from '@eclipse-glsp/client';
-import { SprottyDiagramIdentifier } from 'sprotty-vscode-webview';
-import { VsCodeApi } from 'sprotty-vscode-webview/lib/services';
+import { GLSPDiagramIdentifier } from './diagram-identifier';
+import { VsCodeApi } from './services';
 
 /**
  * Delegates actions that should be handled inside of the glsp vscode extension instead
@@ -25,7 +25,7 @@ import { VsCodeApi } from 'sprotty-vscode-webview/lib/services';
 export class GLSPVscodeExtensionActionHandler implements IActionHandler, IActionHandlerInitializer {
     constructor(
         protected readonly actionKinds: string[],
-        protected readonly diagramIdentifier: SprottyDiagramIdentifier,
+        protected readonly diagramIdentifier: GLSPDiagramIdentifier,
         protected vscodeApi: VsCodeApi
     ) {}
 

package/src/glsp-diagram-widget.ts

@@ -0,0 +1,136 @@
+/********************************************************************************
+ * Copyright (c) 2018 TypeFox and others.
+ * Modifications: (c) 2020-2023 EclipseSource 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
+ ********************************************************************************/
+// based on https://github.com/eclipse-sprotty/sprotty-vscode/blob/v0.3.0/sprotty-vscode-webview/src/vscode-diagram-widget.ts
+import {
+    DiagramServerProxy,
+    EnableToolPaletteAction,
+    IActionDispatcher,
+    ModelSource,
+    RequestModelAction,
+    RequestTypeHintsAction,
+    ServerStatusAction,
+    TYPES,
+    ViewerOptions
+} from '@eclipse-glsp/client';
+import { inject, injectable, postConstruct } from 'inversify';
+import { GLSPDiagramIdentifier } from './diagram-identifier';
+
+export const GLSPDiagramWidgetFactory = Symbol('GLSPDiagramWidgetFactory');
+export type GLSPDiagramWidgetFactory = () => GLSPDiagramWidget;
+
+@injectable()
+export abstract class GLSPDiagramWidget {
+    @inject(GLSPDiagramIdentifier)
+    protected diagramIdentifier: GLSPDiagramIdentifier;
+    @inject(TYPES.IActionDispatcher)
+    readonly actionDispatcher: IActionDispatcher;
+    @inject(TYPES.ModelSource)
+    readonly modelSource: ModelSource;
+    @inject(TYPES.ViewerOptions)
+    protected viewerOptions: ViewerOptions;
+
+    protected statusIconDiv: HTMLDivElement;
+    protected statusMessageDiv: HTMLDivElement;
+
+    @postConstruct()
+    initialize(): void {
+        this.initializeHtml();
+        this.dispatchInitialActions();
+    }
+
+    protected initializeHtml(): void {
+        const containerDiv = document.getElementById(this.diagramIdentifier.clientId + '_container');
+        if (containerDiv) {
+            const svgContainer = document.createElement('div');
+            svgContainer.id = this.viewerOptions.baseDiv;
+            containerDiv.appendChild(svgContainer);
+
+            const hiddenContainer = document.createElement('div');
+            hiddenContainer.id = this.viewerOptions.hiddenDiv;
+            document.body.appendChild(hiddenContainer);
+
+            const statusDiv = document.createElement('div');
+            statusDiv.setAttribute('class', 'sprotty-status');
+            containerDiv.appendChild(statusDiv);
+
+            this.statusIconDiv = document.createElement('div');
+            statusDiv.appendChild(this.statusIconDiv);
+
+            this.statusMessageDiv = document.createElement('div');
+            this.statusMessageDiv.setAttribute('class', 'sprotty-status-message');
+            statusDiv.appendChild(this.statusMessageDiv);
+        }
+    }
+
+    dispatchInitialActions(): void {
+        if (this.modelSource instanceof DiagramServerProxy) {
+            this.modelSource.clientId = this.diagramIdentifier.clientId;
+        }
+        this.actionDispatcher.dispatch(
+            RequestModelAction.create({
+                options: {
+                    sourceUri: decodeURI(this.diagramIdentifier.uri),
+                    diagramType: this.diagramIdentifier.diagramType
+                }
+            })
+        );
+
+        this.actionDispatcher.dispatch(RequestTypeHintsAction.create());
+        this.actionDispatcher.dispatch(EnableToolPaletteAction.create());
+    }
+
+    setStatus(status: ServerStatusAction): void {
+        this.statusMessageDiv.textContent = status.message;
+        this.removeClasses(this.statusMessageDiv, 1);
+        this.statusMessageDiv.classList.add(status.severity.toLowerCase());
+        this.removeClasses(this.statusIconDiv, 0);
+        const classes = this.statusIconDiv.classList;
+        classes.add(status.severity.toLowerCase());
+        switch (status.severity) {
+            case 'FATAL':
+                classes.add('fa');
+                classes.add('fa-times-circle');
+                break;
+            case 'ERROR':
+                classes.add('fa');
+                classes.add('fa-exclamation-circle');
+                break;
+            case 'WARNING':
+                classes.add('fa');
+                classes.add('fa-exclamation-circle');
+                break;
+            case 'INFO':
+                classes.add('fa');
+                classes.add('fa-info-circle');
+                break;
+        }
+    }
+
+    protected removeClasses(element: Element, keep: number): void {
+        const classes = element.classList;
+        while (classes.length > keep) {
+            const item = classes.item(classes.length - 1);
+            if (item) {
+                classes.remove(item);
+            }
+        }
+    }
+}
+
+export function decodeURI(uri: string): string {
+    return decodeURIComponent(uri.replace(/\+/g, ' '));
+}

package/src/glsp-starter.ts

@@ -1,5 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2018 TypeFox and others.
+ * Modifications: (c) 2020-2023 EclipseSource 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
@@ -13,6 +14,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+// based on https://github.com/eclipse-sprotty/sprotty-vscode/blob/v0.3.0/sprotty-vscode-webview/src/sprotty-starter.ts
 import {
     configureServerActions,
     DiagramServerProxy,
@@ -25,22 +27,30 @@ import {
     TYPES
 } from '@eclipse-glsp/client';
 import { Container } from 'inversify';
-import {
-    SprottyDiagramIdentifier,
-    SprottyStarter,
-    VscodeDiagramServer,
-    VscodeDiagramWidget,
-    VscodeDiagramWidgetFactory
-} from 'sprotty-vscode-webview';
-import { VsCodeApi } from 'sprotty-vscode-webview/lib/services';
 import { CopyPasteHandlerProvider } from './copy-paste-handler-provider';
-import { GLSPDiagramIdentifier, isDiagramIdentifier } from './diagram-identifer';
+import { GLSPDiagramIdentifier, isDiagramIdentifier, WebviewReadyMessage } from './diagram-identifier';
 import { GLSPVscodeExtensionActionHandler } from './extension-action-handler';
-import { GLSPVscodeDiagramWidget } from './glsp-vscode-diagram-widget';
+import { GLSPDiagramWidget, GLSPDiagramWidgetFactory } from './glsp-diagram-widget';
 import { GLSPVscodeDiagramServer } from './glsp-vscode-diagramserver';
+import { GLSPStarterServices, VsCodeApi } from './services';
+
+declare function acquireVsCodeApi(): VsCodeApi;
+
+export abstract class GLSPStarter {
+    protected container?: Container;
+    protected vscodeApi: VsCodeApi;
+
+    constructor(services: GLSPStarterServices = {}) {
+        this.vscodeApi = services.vscodeApi ?? acquireVsCodeApi();
+        this.sendReadyMessage();
+        this.acceptDiagramIdentifier();
+    }
 
-export abstract class GLSPStarter extends SprottyStarter {
-    protected override acceptDiagramIdentifier(): void {
+    protected sendReadyMessage(): void {
+        this.vscodeApi.postMessage({ readyMessage: 'Sprotty Webview ready' } as WebviewReadyMessage);
+    }
+
+    protected acceptDiagramIdentifier(): void {
         console.log('Waiting for diagram identifier...');
         const eventListener = (message: any): void => {
             if (isDiagramIdentifier(message.data)) {
@@ -50,8 +60,8 @@ export abstract class GLSPStarter extends SprottyStarter {
                     const newIdentifier = message.data as GLSPDiagramIdentifier;
                     oldIdentifier.diagramType = newIdentifier.diagramType;
                     oldIdentifier.uri = newIdentifier.uri;
-                    const diagramWidget = this.container.get(VscodeDiagramWidget);
-                    diagramWidget.requestModel();
+                    const diagramWidget = this.container.get(GLSPDiagramWidget);
+                    diagramWidget.dispatchInitialActions();
                 } else {
                     console.log('...received...', message);
                     const diagramIdentifier = message.data as GLSPDiagramIdentifier;
@@ -60,20 +70,19 @@ export abstract class GLSPStarter extends SprottyStarter {
                     if (diagramIdentifier.initializeResult) {
                         configureServerActions(diagramIdentifier.initializeResult, diagramIdentifier.diagramType, this.container);
                     }
-                    this.container.get(VscodeDiagramWidget);
+                    this.container.get(GLSPDiagramWidget);
                 }
             }
         };
         window.addEventListener('message', eventListener);
     }
 
-    protected override addVscodeBindings(container: Container, diagramIdentifier: GLSPDiagramIdentifier): void {
+    protected abstract createContainer(diagramIdentifier: GLSPDiagramIdentifier): Container;
+
+    protected addVscodeBindings(container: Container, diagramIdentifier: GLSPDiagramIdentifier): void {
         container.bind(VsCodeApi).toConstantValue(this.vscodeApi);
-        container.bind(GLSPVscodeDiagramWidget).toSelf().inSingletonScope();
-        container.bind(VscodeDiagramWidget).toService(GLSPVscodeDiagramWidget);
-        container
-            .bind(VscodeDiagramWidgetFactory)
-            .toFactory(context => () => context.container.get<GLSPVscodeDiagramWidget>(GLSPVscodeDiagramWidget));
+        container.bind(GLSPDiagramWidget).toSelf().inSingletonScope();
+        container.bind(GLSPDiagramWidgetFactory).toFactory(context => () => context.container.get<GLSPDiagramWidget>(GLSPDiagramWidget));
         container.bind(GLSPDiagramIdentifier).toConstantValue(diagramIdentifier);
         container
             .bind(CopyPasteHandlerProvider)
@@ -81,16 +90,14 @@ export abstract class GLSPStarter extends SprottyStarter {
                 ctx => () =>
                     new Promise<ICopyPasteHandler>(resolve => resolve(ctx.container.get<ICopyPasteHandler>(TYPES.ICopyPasteHandler)))
             );
-        container.bind(SprottyDiagramIdentifier).toService(GLSPDiagramIdentifier);
         container.bind(GLSPVscodeDiagramServer).toSelf().inSingletonScope();
-        container.bind(VscodeDiagramServer).toService(GLSPVscodeDiagramServer);
         container.bind(TYPES.ModelSource).toService(GLSPVscodeDiagramServer);
         container.bind(DiagramServerProxy).toService(GLSPVscodeDiagramServer);
 
         this.configureExtensionActionHandler(container, diagramIdentifier);
     }
 
-    protected configureExtensionActionHandler(container: Container, diagramIdentifier: SprottyDiagramIdentifier): void {
+    protected configureExtensionActionHandler(container: Container, diagramIdentifier: GLSPDiagramIdentifier): void {
         const extensionActionHandler = new GLSPVscodeExtensionActionHandler(this.extensionActionKinds, diagramIdentifier, this.vscodeApi);
         container.bind(GLSPVscodeExtensionActionHandler).toConstantValue(extensionActionHandler);
         container.bind(TYPES.IActionHandlerInitializer).toService(GLSPVscodeExtensionActionHandler);

package/src/glsp-vscode-diagramserver.ts

@@ -1,5 +1,6 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2018 TypeFox and others.
+ * Modifications: (c) 2020-2023 EclipseSource 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
@@ -13,27 +14,37 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+// based on https://github.com/eclipse-sprotty/sprotty-vscode/blob/v0.3.0/sprotty-vscode-webview/src/vscode-diagram-server.ts
 import {
     Action,
     ActionHandlerRegistry,
     ActionMessage,
     ComputedBoundsAction,
     DeleteElementOperation,
+    DiagramServerProxy,
     registerDefaultGLSPServerActions,
+    ServerStatusAction,
     SetEditModeAction,
     TYPES
 } from '@eclipse-glsp/client';
 import { SelectionService } from '@eclipse-glsp/client/lib/features/select/selection-service';
 import { inject } from 'inversify';
-import { VscodeDiagramServer } from 'sprotty-vscode-webview/lib/vscode-diagram-server';
 import { CopyPasteHandlerProvider } from './copy-paste-handler-provider';
+import { GLSPDiagramWidgetFactory } from './glsp-diagram-widget';
+import { VsCodeApi } from './services';
 export const receivedFromServerProperty = '__receivedFromServer';
 export const localDispatchProperty = '__localDispatch';
 
-export class GLSPVscodeDiagramServer extends VscodeDiagramServer {
+export class GLSPVscodeDiagramServer extends DiagramServerProxy {
     @inject(TYPES.SelectionService)
     protected selectionService: SelectionService;
 
+    @inject(VsCodeApi)
+    protected vscodeApi: VsCodeApi;
+
+    @inject(GLSPDiagramWidgetFactory)
+    protected diagramWidgetFactory: GLSPDiagramWidgetFactory;
+
     @inject(CopyPasteHandlerProvider)
     protected copyPasteHandlerProvider: CopyPasteHandlerProvider;
 
@@ -62,6 +73,10 @@ export class GLSPVscodeDiagramServer extends VscodeDiagramServer {
         });
     }
 
+    protected sendMessage(message: ActionMessage): void {
+        this.vscodeApi.postMessage(message);
+    }
+
     override handleLocally(action: Action): boolean {
         if (SetEditModeAction.is(action)) {
             return this.handleSetEditModeAction(action);
@@ -72,6 +87,11 @@ export class GLSPVscodeDiagramServer extends VscodeDiagramServer {
         return super.handleLocally(action);
     }
 
+    protected override handleServerStateAction(status: ServerStatusAction): boolean {
+        this.diagramWidgetFactory().setStatus(status);
+        return false;
+    }
+
     protected override messageReceived(data: any): void {
         const object = typeof data === 'string' ? JSON.parse(data) : data;
         if (ActionMessage.is(object) && object.action) {

package/src/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2023 EclipseSource 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
@@ -13,5 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+export * from './copy-paste-handler-provider';
+export * from './diagram-identifier';
+export * from './extension-action-handler';
+export * from './glsp-diagram-widget';
 export * from './glsp-starter';
 export * from './glsp-vscode-diagramserver';
+export * from './services';

package/src/services.ts

@@ -0,0 +1,26 @@
+/********************************************************************************
+ * Copyright (c) 2022 TypeFox and others.
+ * Modifications: 2023 EclipseSource 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
+ ********************************************************************************/
+// based on https://github.com/eclipse-sprotty/sprotty-vscode/blob/v0.3.0/sprotty-vscode-webview/src/services.ts
+export interface VsCodeApi {
+    postMessage: (message: any) => void;
+}
+
+export const VsCodeApi = Symbol('VsCodeApi');
+
+export interface GLSPStarterServices {
+    vscodeApi?: VsCodeApi;
+}

package/lib/diagram-identifer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"diagram-identifer.d.ts","sourceRoot":"","sources":["../src/diagram-identifer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAiB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAEvE,eAAO,MAAM,qBAAqB,eAAkC,CAAC;AAErE,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACvC;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,qBAAqB,CAQhF"}

package/lib/diagram-identifer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"diagram-identifer.js","sourceRoot":"","sources":["../src/diagram-identifer.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAuE;AAE1D,QAAA,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AASrE,SAAgB,mBAAmB,CAAC,MAAW;IAC3C,OAAO,CACH,MAAM,KAAK,SAAS;QACpB,OAAO,MAAM,KAAK,QAAQ;QAC1B,IAAA,sBAAa,EAAC,MAAM,EAAE,UAAU,CAAC;QACjC,IAAA,sBAAa,EAAC,MAAM,EAAE,aAAa,CAAC;QACpC,IAAA,sBAAa,EAAC,MAAM,EAAE,KAAK,CAAC,CAC/B,CAAC;AACN,CAAC;AARD,kDAQC"}

package/lib/glsp-vscode-diagram-widget.d.ts

@@ -1,6 +0,0 @@
-import { VscodeDiagramWidget } from 'sprotty-vscode-webview';
-export declare abstract class GLSPVscodeDiagramWidget extends VscodeDiagramWidget {
-    protected initializeSprotty(): void;
-}
-export declare function decodeURI(uri: string): string;
-//# sourceMappingURL=glsp-vscode-diagram-widget.d.ts.map

package/lib/glsp-vscode-diagram-widget.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"glsp-vscode-diagram-widget.d.ts","sourceRoot":"","sources":["../src/glsp-vscode-diagram-widget.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,8BACsB,uBAAwB,SAAQ,mBAAmB;cAClD,iBAAiB,IAAI,IAAI;CAgB/C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C"}

package/lib/glsp-vscode-diagram-widget.js

@@ -1,51 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeURI = exports.GLSPVscodeDiagramWidget = void 0;
-/********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource 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
- ********************************************************************************/
-const client_1 = require("@eclipse-glsp/client");
-const inversify_1 = require("inversify");
-const sprotty_vscode_webview_1 = require("sprotty-vscode-webview");
-let GLSPVscodeDiagramWidget = class GLSPVscodeDiagramWidget extends sprotty_vscode_webview_1.VscodeDiagramWidget {
-    initializeSprotty() {
-        if (this.modelSource instanceof client_1.DiagramServerProxy) {
-            this.modelSource.clientId = this.diagramIdentifier.clientId;
-        }
-        this.actionDispatcher.dispatch(client_1.RequestModelAction.create({
-            options: {
-                sourceUri: decodeURI(this.diagramIdentifier.uri),
-                diagramType: this.diagramIdentifier.diagramType
-            }
-        }));
-        this.actionDispatcher.dispatch(client_1.RequestTypeHintsAction.create());
-        this.actionDispatcher.dispatch(client_1.EnableToolPaletteAction.create());
-    }
-};
-GLSPVscodeDiagramWidget = __decorate([
-    (0, inversify_1.injectable)()
-], GLSPVscodeDiagramWidget);
-exports.GLSPVscodeDiagramWidget = GLSPVscodeDiagramWidget;
-function decodeURI(uri) {
-    return decodeURIComponent(uri.replace(/\+/g, ' '));
-}
-exports.decodeURI = decodeURI;
-//# sourceMappingURL=glsp-vscode-diagram-widget.js.map

package/lib/glsp-vscode-diagram-widget.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"glsp-vscode-diagram-widget.js","sourceRoot":"","sources":["../src/glsp-vscode-diagram-widget.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAA+H;AAC/H,yCAAuC;AACvC,mEAA6D;AAGtD,IAAe,uBAAuB,GAAtC,MAAe,uBAAwB,SAAQ,4CAAmB;IAClD,iBAAiB;QAChC,IAAI,IAAI,CAAC,WAAW,YAAY,2BAAkB,EAAE;YAChD,IAAI,CAAC,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;SAC/D;QACD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAC1B,2BAAkB,CAAC,MAAM,CAAC;YACtB,OAAO,EAAE;gBACL,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;gBAChD,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW;aAClD;SACJ,CAAC,CACL,CAAC;QAEF,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,+BAAsB,CAAC,MAAM,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,gCAAuB,CAAC,MAAM,EAAE,CAAC,CAAC;IACrE,CAAC;CACJ,CAAA;AAjBqB,uBAAuB;IAD5C,IAAA,sBAAU,GAAE;GACS,uBAAuB,CAiB5C;AAjBqB,0DAAuB;AAmB7C,SAAgB,SAAS,CAAC,GAAW;IACjC,OAAO,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;AACvD,CAAC;AAFD,8BAEC"}