@eclipse-glsp/vscode-integration-webview 0.9.0-next.ecc539e1 → 0.10.0-next.4484750.44

package/README.md

@@ -3,13 +3,14 @@
 This package helps you to implement a [VS Code Webview](https://code.visualstudio.com/api/extension-guides/webview) that renders a [GLSP](https://www.eclipse.org/glsp/) diagram.
 Since GLSP is based on sprotty(https://github.com/eclipse/sprotty) this glue code is built on top of [sprotty-vscode-webview](https://www.npmjs.com/package/sprotty-vscode-webview).
 
-### Where to find the sources?
+## Where to find the sources?
 
 In addition to this repository, the related source code can be found here:
 
--   https://github.com/eclipse-glsp/glsp-server
--   https://github.com/eclipse-glsp/glsp-client
+-   <https://github.com/eclipse-glsp/glsp-server>
+-   <https://github.com/eclipse-glsp/glsp-client>
 
 ## More information
 
-For more information, please visit the [Eclipse GLSP Umbrella repository](https://github.com/eclipse-glsp/glsp) and the [Eclipse GLSP Website](https://www.eclipse.org/glsp/). If you have questions, contact us on our [spectrum chat](https://spectrum.chat/glsp/) and have a look at our [communication and support options](https://www.eclipse.org/glsp/contact/).
+For more information, please visit the [Eclipse GLSP Umbrella repository](https://github.com/eclipse-glsp/glsp) and the [Eclipse GLSP Website](https://www.eclipse.org/glsp/).
+If you have questions, please raise them in the [discussions](https://github.com/eclipse-glsp/glsp/discussions) and have a look at our [communication and support options](https://www.eclipse.org/glsp/contact/).

package/css/diagram.css

@@ -1,5 +1,5 @@
 /********************************************************************************
-* Copyright (c) 2020-2021 EclipseSource and others.
+* 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
@@ -52,10 +52,51 @@ body {
     stroke: var(--vscode-editor-foreground);
 }
 
-.sprotty-edge.arrow {
+.sprotty-edge .arrow {
     fill: var(--vscode-editor-foreground);
 }
 
-.sprotty-node.selected {
-    stroke: var(--vscode-menu-selectionBackground);
+.sprotty-node.selected,
+.sprotty-edge.selected {
+    stroke: var(--vscode-focusBorder);
+}
+
+.sprotty-edge.selected .arrow {
+    fill: var(--vscode-focusBorder);
+    stroke: var(--vscode-focusBorder);
+}
+
+.inactive .sprotty-node.selected {
+    stroke: var(--vscode-editor-inactiveSelectionBackground);
+}
+
+.sprotty-resize-handle.selected,
+.sprotty-resize-handle.active,
+.sprotty-edge > .sprotty-routing-handle.selected,
+.sprotty-edge > .sprotty-routing-handle.mouseover {
+    fill: var(--vscode-focusBorder);
+}
+
+.inactive .sprotty-resize-handle,
+.inactive .sprotty-routing-handle {
+    fill: var(--vscode-tab-unfocusedInactiveForeground);
+}
+
+.sprotty-node.mouseover:not(.selected),
+.sprotty-edge.mouseover:not(.selected) {
+    stroke: var(--vscode-editor-foreground);
+}
+
+.sprotty-edge.mouseover:not(.selected) .arrow {
+    fill: var(--vscode-editor-foreground);
+    stroke: var(--vscode-editor-foreground);
+}
+
+.sprotty-popup {
+    padding: 0px;
+    border-radius: 2px;
+    box-shadow: 0px 1px 6px var(--vscode-widget-shadow);
+    background-color: var(--vscode-editorHoverWidget-background);
+    color: var(--vscode-editorHoverWidget-foreground);
+    border: 1px solid var(--vscode-editorHoverWidget-border);
 }

package/css/tool-palette.css

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * 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
@@ -18,8 +18,16 @@
     box-shadow: 0px 1px 6px var(--vscode-widget-shadow);
 }
 
+.tool-palette :focus-visible {
+    outline: none;
+}
+
+.tool-group {
+    background: var(--vscode-settings-dropdownBackground);
+}
+
 .tool-palette .palette-header {
-    background: var(--vscode-titleBar-activeBackground);
+    background: var(--vscode-settings-dropdownBackground);
     color: var(--vscode-titleBar-activeForeground);
     border: 0;
     font-weight: normal;
@@ -31,20 +39,23 @@
 }
 
 .tool-palette .palette-header .header-icon {
-    font-size: var(--vscode-ui-font-size1);
     float: left;
     padding: 0.2em;
+    font-size: 11px;
+    text-transform: uppercase;
+    font-weight: 400;
 }
 
 .tool-palette .palette-header .header-tools {
-    font-size: var(--vscode-ui-font-size3);
     float: right;
+    font-size: 11px;
 }
 
 .tool-palette .palette-header .header-tools i {
     border: none;
     width: 1em;
     text-align: center;
+    border-radius: 5px;
 }
 
 .tool-palette .palette-header .header-tools i:hover:not(.clicked) {
@@ -58,35 +69,34 @@
 .tool-palette .palette-body {
     border: 0;
     box-shadow: none;
+    background: var(--vscode-list-focusBackground);
+    color: var(--vscode-titleBar-activeForeground);
 }
 
 .tool-palette .palette-body .group-header {
     font-size: var(--vscode-ui-font-size1);
-    font-weight: normal;
-    background: var(--vscode-settings-dropdownBackground);
+    text-transform: uppercase;
+    font-weight: bold;
+    background: var(--vscode-editorHoverWidget-statusBarBackground);
     color: var(--vscode-titleBar-activeForeground);
     border: 0;
 }
 
-.tool-palette .palette-body .tool-button {
-    background: var(--vscode-menu-background);
+.tool-button {
+    background: var(--vscode-settings-dropdownBackground);
     color: var(--vscode-titleBar-activeForeground);
 }
 
 .tool-palette .palette-body .tool-button:hover:not(.clicked) {
-    background: var(--vscode-list-hoverBackground);
+    background: var(--vscode-menubar-selectionBackground);
 }
 
 .tool-palette .tool-button.clicked {
-    background: var(--vscode-menu-selectionBackground);
-    color: var(--vscode-menu-selectionForeground);
+    background: var(--vscode-inputOption-activeBackground);
 }
 
 .search-input {
     background: var(--vscode-input-background);
     color: var(--vscode-input-foreground);
     border: var(--vscode-border-width) solid var(--vscode-input-border);
-    font-family: var(--vscode-ui-font-family);
-    font-size: var(--vscode-ui-font-size1);
-    line-height: var(--vscode-content-line-height);
 }

package/lib/copy-paste-handler-provider.d.ts

@@ -0,0 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 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
+ ********************************************************************************/
+import { ICopyPasteHandler } from '@eclipse-glsp/client/lib/features/copy-paste/copy-paste-handler';
+export declare const CopyPasteHandlerProvider: unique symbol;
+/**
+ * Service identifier and type definition to bind the {@link ICopyPasteHandler} to an provider.
+ * This enables asynchronous injections and can be used to bypass circular dependency issues.
+ */
+export declare type CopyPasteHandlerProvider = () => Promise<ICopyPasteHandler>;
+//# sourceMappingURL=copy-paste-handler-provider.d.ts.map

package/lib/copy-paste-handler-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"copy-paste-handler-provider.d.ts","sourceRoot":"","sources":["../src/copy-paste-handler-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,iEAAiE,CAAC;AAEpG,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAC3E;;;GAGG;AACH,oBAAY,wBAAwB,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC"}

package/lib/copy-paste-handler-provider.js

@@ -0,0 +1,20 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 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
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CopyPasteHandlerProvider = void 0;
+exports.CopyPasteHandlerProvider = Symbol('CopyPasteHandlerProvider');
+//# sourceMappingURL=copy-paste-handler-provider.js.map

package/lib/copy-paste-handler-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"copy-paste-handler-provider.js","sourceRoot":"","sources":["../src/copy-paste-handler-provider.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAIrE,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC"}

package/lib/diagram-identifer.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-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

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

@@ -1 +1 @@
-{"version":3,"file":"diagram-identifer.d.ts","sourceRoot":"","sources":["../src/diagram-identifer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,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"}
+{"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

@@ -1,14 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isDiagramIdentifier = exports.GLSPDiagramIdentifier = void 0;
-const protocol_1 = require("@eclipse-glsp/protocol");
+/********************************************************************************
+ * Copyright (c) 2021-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");
 exports.GLSPDiagramIdentifier = Symbol('GLSPDiagramIdentifier');
 function isDiagramIdentifier(object) {
     return (object !== undefined &&
         typeof object === 'object' &&
-        (0, protocol_1.isString)(object, 'clientId') &&
-        (0, protocol_1.isString)(object, 'diagramType') &&
-        (0, protocol_1.isString)(object, 'uri'));
+        (0, client_1.hasStringProp)(object, 'clientId') &&
+        (0, client_1.hasStringProp)(object, 'diagramType') &&
+        (0, client_1.hasStringProp)(object, 'uri'));
 }
 exports.isDiagramIdentifier = isDiagramIdentifier;
 //# sourceMappingURL=diagram-identifer.js.map

package/lib/diagram-identifer.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-identifer.js","sourceRoot":"","sources":["../src/diagram-identifer.ts"],"names":[],"mappings":";;;AAgBA,qDAAkD;AAErC,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,mBAAQ,EAAC,MAAM,EAAE,UAAU,CAAC;QAC5B,IAAA,mBAAQ,EAAC,MAAM,EAAE,aAAa,CAAC;QAC/B,IAAA,mBAAQ,EAAC,MAAM,EAAE,KAAK,CAAC,CAC1B,CAAC;AACN,CAAC;AARD,kDAQC"}
+{"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/extension-action-handler.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, ActionHandlerRegistry, IActionHandler, IActionHandlerInitializer, ICommand } from 'sprotty';
+import { Action, ActionHandlerRegistry, IActionHandler, IActionHandlerInitializer, ICommand } from '@eclipse-glsp/client';
 import { SprottyDiagramIdentifier } from 'sprotty-vscode-webview';
 /**
  * Delegates actions that should be handled inside of the glsp vscode extension instead

package/lib/extension-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extension-action-handler.d.ts","sourceRoot":"","sources":["../src/extension-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,cAAc,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC7G,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAGlE;;;;GAIG;AACH,qBAAa,gCAAiC,YAAW,cAAc,EAAE,yBAAyB;IAClF,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE;IAAE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,wBAAwB;gBAArF,WAAW,EAAE,MAAM,EAAE,EAAqB,iBAAiB,EAAE,wBAAwB;IAEpH,UAAU,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAIjD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;CAUnD"}
+{"version":3,"file":"extension-action-handler.d.ts","sourceRoot":"","sources":["../src/extension-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,cAAc,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC1H,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAGlE;;;;GAIG;AACH,qBAAa,gCAAiC,YAAW,cAAc,EAAE,yBAAyB;IAClF,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE;IAAE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,wBAAwB;gBAArF,WAAW,EAAE,MAAM,EAAE,EAAqB,iBAAiB,EAAE,wBAAwB;IAEpH,UAAU,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAIjD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;CAUnD"}

package/lib/glsp-starter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-starter.d.ts","sourceRoot":"","sources":["../src/glsp-starter.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACH,wBAAwB,EACxB,cAAc,EAIjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAuB,MAAM,qBAAqB,CAAC;AAKjF,8BAAsB,WAAY,SAAQ,cAAc;IACpD,SAAS,CAAC,uBAAuB,IAAI,IAAI;IA2BzC,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,qBAAqB,GAAG,IAAI;IAgBjG,SAAS,CAAC,+BAA+B,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,wBAAwB,GAAG,IAAI;IAMlH;;OAEG;IACH,SAAS,KAAK,oBAAoB,IAAI,MAAM,EAAE,CAQ7C;CACJ"}
+{"version":3,"file":"glsp-starter.d.ts","sourceRoot":"","sources":["../src/glsp-starter.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACH,wBAAwB,EACxB,cAAc,EAIjB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,qBAAqB,EAAuB,MAAM,qBAAqB,CAAC;AAKjF,8BAAsB,WAAY,SAAQ,cAAc;cACjC,uBAAuB,IAAI,IAAI;cA2B/B,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,qBAAqB,GAAG,IAAI;IAsB1G,SAAS,CAAC,+BAA+B,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,wBAAwB,GAAG,IAAI;IAMlH;;OAEG;IACH,SAAS,KAAK,oBAAoB,IAAI,MAAM,EAAE,CAQ7C;CACJ"}

package/lib/glsp-starter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPStarter = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * 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
@@ -18,6 +18,7 @@ exports.GLSPStarter = void 0;
  ********************************************************************************/
 const client_1 = require("@eclipse-glsp/client");
 const sprotty_vscode_webview_1 = require("sprotty-vscode-webview");
+const copy_paste_handler_provider_1 = require("./copy-paste-handler-provider");
 const diagram_identifer_1 = require("./diagram-identifer");
 const extension_action_handler_1 = require("./extension-action-handler");
 const glsp_vscode_diagram_widget_1 = require("./glsp-vscode-diagram-widget");
@@ -57,11 +58,14 @@ class GLSPStarter extends sprotty_vscode_webview_1.SprottyStarter {
             .bind(sprotty_vscode_webview_1.VscodeDiagramWidgetFactory)
             .toFactory(context => () => context.container.get(glsp_vscode_diagram_widget_1.GLSPVscodeDiagramWidget));
         container.bind(diagram_identifer_1.GLSPDiagramIdentifier).toConstantValue(diagramIdentifier);
-        container.bind(sprotty_vscode_webview_1.SprottyDiagramIdentifier).toConstantValue(diagramIdentifier);
+        container
+            .bind(copy_paste_handler_provider_1.CopyPasteHandlerProvider)
+            .toProvider(ctx => () => new Promise(resolve => resolve(ctx.container.get(client_1.TYPES.ICopyPasteHandler))));
+        container.bind(sprotty_vscode_webview_1.SprottyDiagramIdentifier).toService(diagram_identifer_1.GLSPDiagramIdentifier);
         container.bind(glsp_vscode_diagramserver_1.GLSPVscodeDiagramServer).toSelf().inSingletonScope();
         container.bind(sprotty_vscode_webview_1.VscodeDiagramServer).toService(glsp_vscode_diagramserver_1.GLSPVscodeDiagramServer);
         container.bind(client_1.TYPES.ModelSource).toService(glsp_vscode_diagramserver_1.GLSPVscodeDiagramServer);
-        container.bind(client_1.DiagramServer).toService(glsp_vscode_diagramserver_1.GLSPVscodeDiagramServer);
+        container.bind(client_1.DiagramServerProxy).toService(glsp_vscode_diagramserver_1.GLSPVscodeDiagramServer);
         this.configureExtensionActionHandler(container, diagramIdentifier);
     }
     configureExtensionActionHandler(container, diagramIdentifier) {

package/lib/glsp-starter.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-starter.js","sourceRoot":"","sources":["../src/glsp-starter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"glsp-starter.js","sourceRoot":"","sources":["../src/glsp-starter.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"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;IACrE,SAAS,CAAC,iBAAiB,IAAI,IAAI;CActC;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C"}
+{"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

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeURI = exports.GLSPVscodeDiagramWidget = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * 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
@@ -27,15 +27,17 @@ 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.DiagramServer) {
+        if (this.modelSource instanceof client_1.DiagramServerProxy) {
             this.modelSource.clientId = this.diagramIdentifier.clientId;
         }
-        this.actionDispatcher.dispatch(new client_1.RequestModelAction({
-            sourceUri: decodeURI(this.diagramIdentifier.uri),
-            diagramType: this.diagramIdentifier.diagramType
+        this.actionDispatcher.dispatch(client_1.RequestModelAction.create({
+            options: {
+                sourceUri: decodeURI(this.diagramIdentifier.uri),
+                diagramType: this.diagramIdentifier.diagramType
+            }
         }));
-        this.actionDispatcher.dispatch(new client_1.RequestTypeHintsAction(this.diagramIdentifier.diagramType));
-        this.actionDispatcher.dispatch(new client_1.EnableToolPaletteAction());
+        this.actionDispatcher.dispatch(client_1.RequestTypeHintsAction.create());
+        this.actionDispatcher.dispatch(client_1.EnableToolPaletteAction.create());
     }
 };
 GLSPVscodeDiagramWidget = __decorate([

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

@@ -1 +1 @@
-{"version":3,"file":"glsp-vscode-diagram-widget.js","sourceRoot":"","sources":["../src/glsp-vscode-diagram-widget.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAA0H;AAC1H,yCAAuC;AACvC,mEAA6D;AAG7D,IAAsB,uBAAuB,GAA7C,MAAsB,uBAAwB,SAAQ,4CAAmB;IAC3D,iBAAiB;QACvB,IAAI,IAAI,CAAC,WAAW,YAAY,sBAAa,EAAE;YAC3C,IAAI,CAAC,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;SAC/D;QACD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAC1B,IAAI,2BAAkB,CAAC;YACnB,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;YAChD,WAAW,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW;SAClD,CAAC,CACL,CAAC;QAEF,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,+BAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;QAC/F,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,gCAAuB,EAAE,CAAC,CAAC;IAClE,CAAC;CACJ,CAAA;AAfqB,uBAAuB;IAD5C,IAAA,sBAAU,GAAE;GACS,uBAAuB,CAe5C;AAfqB,0DAAuB;AAiB7C,SAAgB,SAAS,CAAC,GAAW;IACjC,OAAO,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;AACvD,CAAC;AAFD,8BAEC"}
+{"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;AAG7D,IAAsB,uBAAuB,GAA7C,MAAsB,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"}

package/lib/glsp-vscode-diagramserver.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * 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
@@ -13,14 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, ActionHandlerRegistry, ActionMessage, ComputedBoundsAction, DeleteElementOperation, ICopyPasteHandler, SetEditModeAction } from '@eclipse-glsp/client';
+import { Action, ActionHandlerRegistry, ActionMessage, ComputedBoundsAction, DeleteElementOperation, SetEditModeAction } from '@eclipse-glsp/client';
 import { SelectionService } from '@eclipse-glsp/client/lib/features/select/selection-service';
-import { VscodeDiagramServer } from 'sprotty-vscode-webview';
+import { VscodeDiagramServer } from 'sprotty-vscode-webview/lib/vscode-diagram-server';
+import { CopyPasteHandlerProvider } from './copy-paste-handler-provider';
 export declare const receivedFromServerProperty = "__receivedFromServer";
 export declare const localDispatchProperty = "__localDispatch";
 export declare class GLSPVscodeDiagramServer extends VscodeDiagramServer {
     protected selectionService: SelectionService;
-    protected copyPasteHandler: ICopyPasteHandler;
+    protected copyPasteHandlerProvider: CopyPasteHandlerProvider;
     initialize(registry: ActionHandlerRegistry): void;
     handleLocally(action: Action): boolean;
     protected messageReceived(data: any): void;

package/lib/glsp-vscode-diagramserver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-vscode-diagramserver.d.ts","sourceRoot":"","sources":["../src/glsp-vscode-diagramserver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,qBAAqB,EACrB,aAAa,EACb,oBAAoB,EACpB,sBAAsB,EAEtB,iBAAiB,EAIjB,iBAAiB,EACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4DAA4D,CAAC;AAE9F,OAAO,EAAmB,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE9E,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AAEvD,qBAAa,uBAAwB,SAAQ,mBAAmB;IACvB,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAEpF,UAAU,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAsBjD,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUtC,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI;IAe1C,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAO1D,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO;IAIrE,SAAS,CAAC,4BAA4B,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO;IAOlF,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO;CAGxE"}
+{"version":3,"file":"glsp-vscode-diagramserver.d.ts","sourceRoot":"","sources":["../src/glsp-vscode-diagramserver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,qBAAqB,EACrB,aAAa,EACb,oBAAoB,EACpB,sBAAsB,EAEtB,iBAAiB,EAEpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,4DAA4D,CAAC;AAE9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AAEvD,qBAAa,uBAAwB,SAAQ,mBAAmB;IAE5D,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAEpD,UAAU,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAyBjD,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;cAU5B,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI;IAenD,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;cAOvC,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO;IAI9E,SAAS,CAAC,4BAA4B,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO;IAOlF,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO;CAGxE"}

package/lib/glsp-vscode-diagramserver.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPVscodeDiagramServer = exports.localDispatchProperty = exports.receivedFromServerProperty = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * 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
@@ -28,40 +28,43 @@ exports.GLSPVscodeDiagramServer = exports.localDispatchProperty = exports.receiv
 const client_1 = require("@eclipse-glsp/client");
 const selection_service_1 = require("@eclipse-glsp/client/lib/features/select/selection-service");
 const inversify_1 = require("inversify");
-const sprotty_vscode_webview_1 = require("sprotty-vscode-webview");
+const vscode_diagram_server_1 = require("sprotty-vscode-webview/lib/vscode-diagram-server");
+const copy_paste_handler_provider_1 = require("./copy-paste-handler-provider");
 exports.receivedFromServerProperty = '__receivedFromServer';
 exports.localDispatchProperty = '__localDispatch';
-class GLSPVscodeDiagramServer extends sprotty_vscode_webview_1.VscodeDiagramServer {
+class GLSPVscodeDiagramServer extends vscode_diagram_server_1.VscodeDiagramServer {
     initialize(registry) {
         (0, client_1.registerDefaultGLSPServerActions)(registry, this);
         this.clientId = this.viewerOptions.baseDiv;
         window.addEventListener('message', message => {
-            if ('data' in message && (0, sprotty_vscode_webview_1.isActionMessage)(message.data)) {
+            if ('data' in message && client_1.ActionMessage.is(message.data)) {
                 this.messageReceived(message.data);
             }
         });
-        window.addEventListener('copy', (e) => {
-            this.copyPasteHandler.handleCopy(e);
-        });
-        window.addEventListener('cut', (e) => {
-            this.copyPasteHandler.handleCut(e);
-        });
-        window.addEventListener('paste', (e) => {
-            this.copyPasteHandler.handlePaste(e);
+        this.copyPasteHandlerProvider().then(copyPasteHandler => {
+            document.addEventListener('copy', (e) => {
+                copyPasteHandler.handleCopy(e);
+            });
+            document.addEventListener('cut', (e) => {
+                copyPasteHandler.handleCut(e);
+            });
+            document.addEventListener('paste', (e) => {
+                copyPasteHandler.handlePaste(e);
+            });
         });
     }
     handleLocally(action) {
-        if ((0, client_1.isSetEditModeAction)(action)) {
+        if (client_1.SetEditModeAction.is(action)) {
             return this.handleSetEditModeAction(action);
         }
-        if ((0, client_1.isDeleteElementOperation)(action)) {
+        if (client_1.DeleteElementOperation.is(action)) {
             return this.handleDeleteElementOperation(action);
         }
         return super.handleLocally(action);
     }
     messageReceived(data) {
         const object = typeof data === 'string' ? JSON.parse(data) : data;
-        if ((0, sprotty_vscode_webview_1.isActionMessage)(object) && object.action) {
+        if (client_1.ActionMessage.is(object) && object.action) {
             if (!object.clientId || object.clientId === this.clientId) {
                 this.checkMessageOrigin(object);
                 this.logger.log(this, 'receiving', object);
@@ -94,12 +97,12 @@ class GLSPVscodeDiagramServer extends sprotty_vscode_webview_1.VscodeDiagramServ
     }
 }
 __decorate([
-    (0, inversify_1.inject)(client_1.GLSP_TYPES.SelectionService),
+    (0, inversify_1.inject)(client_1.TYPES.SelectionService),
     __metadata("design:type", selection_service_1.SelectionService)
 ], GLSPVscodeDiagramServer.prototype, "selectionService", void 0);
 __decorate([
-    (0, inversify_1.inject)(client_1.GLSP_TYPES.ICopyPasteHandler),
-    __metadata("design:type", Object)
-], GLSPVscodeDiagramServer.prototype, "copyPasteHandler", void 0);
+    (0, inversify_1.inject)(copy_paste_handler_provider_1.CopyPasteHandlerProvider),
+    __metadata("design:type", Function)
+], GLSPVscodeDiagramServer.prototype, "copyPasteHandlerProvider", void 0);
 exports.GLSPVscodeDiagramServer = GLSPVscodeDiagramServer;
 //# sourceMappingURL=glsp-vscode-diagramserver.js.map

package/lib/glsp-vscode-diagramserver.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-vscode-diagramserver.js","sourceRoot":"","sources":["../src/glsp-vscode-diagramserver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"glsp-vscode-diagramserver.js","sourceRoot":"","sources":["../src/glsp-vscode-diagramserver.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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,iDAA+B;AAC/B,8DAA4C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/vscode-integration-webview",
-  "version": "0.9.0-next.ecc539e1",
+  "version": "0.10.0-next.4484750.44+4484750",
   "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": [
@@ -33,16 +33,14 @@
   ],
   "dependencies": {
     "@eclipse-glsp/client": "next",
-    "sprotty-vscode-webview": "0.1.2"
+    "sprotty-vscode-webview": "0.2.0"
   },
   "devDependencies": {
-    "reflect-metadata": "^0.1.13",
-    "rimraf": "latest",
-    "typescript": "^4.4.3"
+    "reflect-metadata": "^0.1.13"
   },
   "scripts": {
     "prepare": "yarn clean && yarn build && yarn lint",
-    "clean": "rimraf lib",
+    "clean": "rimraf lib tsconfig.tsbuildinfo",
     "build": "tsc",
     "watch": "tsc -w",
     "lint": "eslint -c ./.eslintrc.js --ext .ts ./src"
@@ -51,5 +49,6 @@
     "access": "public"
   },
   "main": "lib/index",
-  "types": "lib/index"
+  "types": "lib/index",
+  "gitHead": "4484750c642ccfb0143da69b868237771b1764c6"
 }

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

@@ -0,0 +1,24 @@
+/********************************************************************************
+ * Copyright (c) 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
+ ********************************************************************************/
+
+import { ICopyPasteHandler } from '@eclipse-glsp/client/lib/features/copy-paste/copy-paste-handler';
+
+export const CopyPasteHandlerProvider = Symbol('CopyPasteHandlerProvider');
+/**
+ * Service identifier and type definition to bind the {@link ICopyPasteHandler} to an provider.
+ * This enables asynchronous injections and can be used to bypass circular dependency issues.
+ */
+export type CopyPasteHandlerProvider = () => Promise<ICopyPasteHandler>;

package/src/diagram-identifer.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-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
@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { InitializeResult } from '@eclipse-glsp/client';
-import { isString } from '@eclipse-glsp/protocol';
+import { hasStringProp, InitializeResult } from '@eclipse-glsp/client';
 
 export const GLSPDiagramIdentifier = Symbol('GLSPDiagramIdentifier');
 
@@ -29,8 +28,8 @@ export function isDiagramIdentifier(object: any): object is GLSPDiagramIdentifie
     return (
         object !== undefined &&
         typeof object === 'object' &&
-        isString(object, 'clientId') &&
-        isString(object, 'diagramType') &&
-        isString(object, 'uri')
+        hasStringProp(object, 'clientId') &&
+        hasStringProp(object, 'diagramType') &&
+        hasStringProp(object, 'uri')
     );
 }

package/src/extension-action-handler.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, ActionHandlerRegistry, IActionHandler, IActionHandlerInitializer, ICommand } from 'sprotty';
+import { Action, ActionHandlerRegistry, IActionHandler, IActionHandlerInitializer, ICommand } from '@eclipse-glsp/client';
 import { SprottyDiagramIdentifier } from 'sprotty-vscode-webview';
 import { vscodeApi } from 'sprotty-vscode-webview/lib/vscode-api';
 

package/src/glsp-starter.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * 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
@@ -15,8 +15,9 @@
  ********************************************************************************/
 import {
     configureServerActions,
-    DiagramServer,
+    DiagramServerProxy,
     ExportSvgAction,
+    ICopyPasteHandler,
     NavigateToExternalTargetAction,
     RequestClipboardDataAction,
     SelectAction,
@@ -31,13 +32,14 @@ import {
     VscodeDiagramWidget,
     VscodeDiagramWidgetFactory
 } from 'sprotty-vscode-webview';
+import { CopyPasteHandlerProvider } from './copy-paste-handler-provider';
 import { GLSPDiagramIdentifier, isDiagramIdentifier } from './diagram-identifer';
 import { GLSPVscodeExtensionActionHandler } from './extension-action-handler';
 import { GLSPVscodeDiagramWidget } from './glsp-vscode-diagram-widget';
 import { GLSPVscodeDiagramServer } from './glsp-vscode-diagramserver';
 
 export abstract class GLSPStarter extends SprottyStarter {
-    protected acceptDiagramIdentifier(): void {
+    protected override acceptDiagramIdentifier(): void {
         console.log('Waiting for diagram identifier...');
         const eventListener = (message: any): void => {
             if (isDiagramIdentifier(message.data)) {
@@ -64,18 +66,24 @@ export abstract class GLSPStarter extends SprottyStarter {
         window.addEventListener('message', eventListener);
     }
 
-    protected addVscodeBindings(container: Container, diagramIdentifier: GLSPDiagramIdentifier): void {
+    protected override addVscodeBindings(container: Container, diagramIdentifier: GLSPDiagramIdentifier): void {
         container.bind(GLSPVscodeDiagramWidget).toSelf().inSingletonScope();
         container.bind(VscodeDiagramWidget).toService(GLSPVscodeDiagramWidget);
         container
             .bind(VscodeDiagramWidgetFactory)
             .toFactory(context => () => context.container.get<GLSPVscodeDiagramWidget>(GLSPVscodeDiagramWidget));
         container.bind(GLSPDiagramIdentifier).toConstantValue(diagramIdentifier);
-        container.bind(SprottyDiagramIdentifier).toConstantValue(diagramIdentifier);
+        container
+            .bind(CopyPasteHandlerProvider)
+            .toProvider(
+                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(DiagramServer).toService(GLSPVscodeDiagramServer);
+        container.bind(DiagramServerProxy).toService(GLSPVscodeDiagramServer);
 
         this.configureExtensionActionHandler(container, diagramIdentifier);
     }

package/src/glsp-vscode-diagram-widget.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * 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
@@ -13,25 +13,27 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { DiagramServer, EnableToolPaletteAction, RequestModelAction, RequestTypeHintsAction } from '@eclipse-glsp/client';
+import { DiagramServerProxy, EnableToolPaletteAction, RequestModelAction, RequestTypeHintsAction } from '@eclipse-glsp/client';
 import { injectable } from 'inversify';
 import { VscodeDiagramWidget } from 'sprotty-vscode-webview';
 
 @injectable()
 export abstract class GLSPVscodeDiagramWidget extends VscodeDiagramWidget {
-    protected initializeSprotty(): void {
-        if (this.modelSource instanceof DiagramServer) {
+    protected override initializeSprotty(): void {
+        if (this.modelSource instanceof DiagramServerProxy) {
             this.modelSource.clientId = this.diagramIdentifier.clientId;
         }
         this.actionDispatcher.dispatch(
-            new RequestModelAction({
-                sourceUri: decodeURI(this.diagramIdentifier.uri),
-                diagramType: this.diagramIdentifier.diagramType
+            RequestModelAction.create({
+                options: {
+                    sourceUri: decodeURI(this.diagramIdentifier.uri),
+                    diagramType: this.diagramIdentifier.diagramType
+                }
             })
         );
 
-        this.actionDispatcher.dispatch(new RequestTypeHintsAction(this.diagramIdentifier.diagramType));
-        this.actionDispatcher.dispatch(new EnableToolPaletteAction());
+        this.actionDispatcher.dispatch(RequestTypeHintsAction.create());
+        this.actionDispatcher.dispatch(EnableToolPaletteAction.create());
     }
 }
 

package/src/glsp-vscode-diagramserver.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * 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
@@ -19,59 +19,62 @@ import {
     ActionMessage,
     ComputedBoundsAction,
     DeleteElementOperation,
-    GLSP_TYPES,
-    ICopyPasteHandler,
-    isDeleteElementOperation,
-    isSetEditModeAction,
     registerDefaultGLSPServerActions,
-    SetEditModeAction
+    SetEditModeAction,
+    TYPES
 } from '@eclipse-glsp/client';
 import { SelectionService } from '@eclipse-glsp/client/lib/features/select/selection-service';
 import { inject } from 'inversify';
-import { isActionMessage, VscodeDiagramServer } from 'sprotty-vscode-webview';
-
+import { VscodeDiagramServer } from 'sprotty-vscode-webview/lib/vscode-diagram-server';
+import { CopyPasteHandlerProvider } from './copy-paste-handler-provider';
 export const receivedFromServerProperty = '__receivedFromServer';
 export const localDispatchProperty = '__localDispatch';
 
 export class GLSPVscodeDiagramServer extends VscodeDiagramServer {
-    @inject(GLSP_TYPES.SelectionService) protected selectionService: SelectionService;
-    @inject(GLSP_TYPES.ICopyPasteHandler) protected copyPasteHandler: ICopyPasteHandler;
+    @inject(TYPES.SelectionService)
+    protected selectionService: SelectionService;
+
+    @inject(CopyPasteHandlerProvider)
+    protected copyPasteHandlerProvider: CopyPasteHandlerProvider;
 
-    initialize(registry: ActionHandlerRegistry): void {
+    override initialize(registry: ActionHandlerRegistry): void {
         registerDefaultGLSPServerActions(registry, this);
         this.clientId = this.viewerOptions.baseDiv;
+
         window.addEventListener('message', message => {
-            if ('data' in message && isActionMessage(message.data)) {
+            if ('data' in message && ActionMessage.is(message.data)) {
                 this.messageReceived(message.data);
             }
         });
 
-        window.addEventListener('copy', (e: ClipboardEvent) => {
-            this.copyPasteHandler.handleCopy(e);
-        });
+        this.copyPasteHandlerProvider().then(copyPasteHandler => {
+            document.addEventListener('copy', (e: ClipboardEvent) => {
+                copyPasteHandler.handleCopy(e);
+            });
 
-        window.addEventListener('cut', (e: ClipboardEvent) => {
-            this.copyPasteHandler.handleCut(e);
-        });
+            document.addEventListener('cut', (e: ClipboardEvent) => {
+                copyPasteHandler.handleCut(e);
+            });
 
-        window.addEventListener('paste', (e: ClipboardEvent) => {
-            this.copyPasteHandler.handlePaste(e);
+            document.addEventListener('paste', (e: ClipboardEvent) => {
+                copyPasteHandler.handlePaste(e);
+            });
         });
     }
 
-    handleLocally(action: Action): boolean {
-        if (isSetEditModeAction(action)) {
+    override handleLocally(action: Action): boolean {
+        if (SetEditModeAction.is(action)) {
             return this.handleSetEditModeAction(action);
         }
-        if (isDeleteElementOperation(action)) {
+        if (DeleteElementOperation.is(action)) {
             return this.handleDeleteElementOperation(action);
         }
         return super.handleLocally(action);
     }
 
-    protected messageReceived(data: any): void {
+    protected override messageReceived(data: any): void {
         const object = typeof data === 'string' ? JSON.parse(data) : data;
-        if (isActionMessage(object) && object.action) {
+        if (ActionMessage.is(object) && object.action) {
             if (!object.clientId || object.clientId === this.clientId) {
                 this.checkMessageOrigin(object);
                 this.logger.log(this, 'receiving', object);
@@ -91,7 +94,7 @@ export class GLSPVscodeDiagramServer extends VscodeDiagramServer {
         }
     }
 
-    protected handleComputedBounds(action: ComputedBoundsAction): boolean {
+    protected override handleComputedBounds(action: ComputedBoundsAction): boolean {
         return true;
     }