@eclipse-glsp/client 1.1.0-next.6ec1da0.211 → 1.1.0-next.7be33cd.257

package/lib/features/export/di.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/export/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,iDAAuI;AACvI,2DAAsD;AAEtD,MAAM,mBAAmB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACvE,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,IAAA,6BAAa,EAAC,OAAO,EAAE,qBAAK,CAAC,WAAW,EAAE,oCAAoB,CAAC,CAAC;IAChE,IAAA,6BAAa,EAAC,OAAO,EAAE,qBAAK,CAAC,wBAAwB,EAAE,sCAAsB,CAAC,CAAC;IAC/E,IAAA,gCAAgB,EAAC,OAAO,EAAE,gCAAgB,CAAC,CAAC;IAC5C,IAAI,CAAC,qBAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,mCAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACnE,CAAC,CAAC,CAAC;AAEH,kBAAe,mBAAmB,CAAC"}

package/lib/features/export/glsp-svg-exporter.d.ts

@@ -1,20 +1,4 @@
-/********************************************************************************
- * 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 { RequestAction } from '@eclipse-glsp/protocol';
-import { ExportSvgAction, SModelRoot, SvgExporter } from 'sprotty';
+import { ExportSvgAction, RequestAction, SModelRoot, SvgExporter } from '../../glsp-sprotty/index';
 export declare class GLSPSvgExporter extends SvgExporter {
     export(root: SModelRoot, _request?: RequestAction<ExportSvgAction>): void;
     protected findSvgElement(): SVGSVGElement | null;

package/lib/features/export/glsp-svg-exporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-svg-exporter.d.ts","sourceRoot":"","sources":["../../../src/features/export/glsp-svg-exporter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGlE,qBACa,eAAgB,SAAQ,WAAW;IACpC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,IAAI;IAsBlF,SAAS,CAAC,cAAc,IAAI,aAAa,GAAG,IAAI;CAKlD"}
+{"version":3,"file":"glsp-svg-exporter.d.ts","sourceRoot":"","sources":["../../../src/features/export/glsp-svg-exporter.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAExF,qBACa,eAAgB,SAAQ,WAAW;IACnC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,IAAI;IAuBlF,SAAS,CAAC,cAAc,IAAI,aAAa,GAAG,IAAI;CAKnD"}

package/lib/features/export/glsp-svg-exporter.js

@@ -7,10 +7,25 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPSvgExporter = void 0;
+/********************************************************************************
+ * Copyright (c) 2022-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
+ ********************************************************************************/
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
 const uuid_1 = require("uuid");
-let GLSPSvgExporter = class GLSPSvgExporter extends sprotty_1.SvgExporter {
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+let GLSPSvgExporter = exports.GLSPSvgExporter = class GLSPSvgExporter extends _glsp_sprotty_1.SvgExporter {
     export(root, _request) {
         if (typeof document !== 'undefined') {
             const svgElement = this.findSvgElement();
@@ -21,10 +36,9 @@ let GLSPSvgExporter = class GLSPSvgExporter extends sprotty_1.SvgExporter {
                     svgElement.id = originalId || (0, uuid_1.v4)();
                     // provide generated svg code with respective sizing for proper viewing in browser and remove undesired border
                     const bounds = this.getBounds(root);
-                    const svg = this.createSvg(svgElement, root)
-                        .replace('style="', `style="width: ${bounds.width}px !important;height: ${bounds.height}px !important;border: none !important;`);
+                    const svg = this.createSvg(svgElement, root).replace('style="', `style="width: ${bounds.width}px !important;height: ${bounds.height}px !important;border: none !important;`);
                     // do not give request/response id here as otherwise the action is treated as an unrequested response
-                    this.actionDispatcher.dispatch(sprotty_1.ExportSvgAction.create(svg, ''));
+                    this.actionDispatcher.dispatch(_glsp_sprotty_1.ExportSvgAction.create(svg, ''));
                 }
                 finally {
                     svgElement.id = originalId;
@@ -38,8 +52,7 @@ let GLSPSvgExporter = class GLSPSvgExporter extends sprotty_1.SvgExporter {
         return div && div.querySelector('svg');
     }
 };
-GLSPSvgExporter = __decorate([
+exports.GLSPSvgExporter = GLSPSvgExporter = __decorate([
     (0, inversify_1.injectable)()
 ], GLSPSvgExporter);
-exports.GLSPSvgExporter = GLSPSvgExporter;
 //# sourceMappingURL=glsp-svg-exporter.js.map

package/lib/features/export/glsp-svg-exporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-svg-exporter.js","sourceRoot":"","sources":["../../../src/features/export/glsp-svg-exporter.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,yCAAuC;AACvC,qCAAmE;AACnE,+BAAkC;AAG1B,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,qBAAW;IACpC,MAAM,CAAC,IAAgB,EAAE,QAAyC;QACvE,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACzC,IAAI,UAAU,EAAE;gBACZ,qFAAqF;gBACrF,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC;gBACjC,IAAI;oBACA,UAAU,CAAC,EAAE,GAAG,UAAU,IAAI,IAAA,SAAI,GAAE,CAAC;oBACrC,8GAA8G;oBAC9G,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBACpC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC;yBACvC,OAAO,CAAC,SAAS,EACd,iBAAiB,MAAM,CAAC,KAAK,yBAAyB,MAAM,CAAC,MAAM,wCAAwC,CAAC,CAAC;oBACrH,qGAAqG;oBACrG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,yBAAe,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;iBACnE;wBAAS;oBACN,UAAU,CAAC,EAAE,GAAG,UAAU,CAAC;iBAC9B;aACJ;SACJ;IACL,CAAC;IAES,cAAc;QACpB,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5D,wEAAwE;QACxE,OAAO,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;CACH,CAAA;AA5BY,eAAe;IAD3B,IAAA,sBAAU,GAAE;GACA,eAAe,CA4B3B;AA5BY,0CAAe"}
+{"version":3,"file":"glsp-svg-exporter.js","sourceRoot":"","sources":["../../../src/features/export/glsp-svg-exporter.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,+BAAkC;AAClC,iDAAwF;AAGjF,IAAM,eAAe,6BAArB,MAAM,eAAgB,SAAQ,2BAAW;IACnC,MAAM,CAAC,IAAgB,EAAE,QAAyC;QACvE,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACzC,IAAI,UAAU,EAAE;gBACZ,qFAAqF;gBACrF,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC;gBACjC,IAAI;oBACA,UAAU,CAAC,EAAE,GAAG,UAAU,IAAI,IAAA,SAAI,GAAE,CAAC;oBACrC,8GAA8G;oBAC9G,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBACpC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,OAAO,CAChD,SAAS,EACT,iBAAiB,MAAM,CAAC,KAAK,yBAAyB,MAAM,CAAC,MAAM,wCAAwC,CAC9G,CAAC;oBACF,qGAAqG;oBACrG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,+BAAe,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;iBACnE;wBAAS;oBACN,UAAU,CAAC,EAAE,GAAG,UAAU,CAAC;iBAC9B;aACJ;SACJ;IACL,CAAC;IAES,cAAc;QACpB,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5D,wEAAwE;QACxE,OAAO,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;CACJ,CAAA;0BA7BY,eAAe;IAD3B,IAAA,sBAAU,GAAE;GACA,eAAe,CA6B3B"}

package/lib/features/hints/di.config.d.ts

@@ -1,3 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2019-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
+ ********************************************************************************/
 import { ContainerModule } from 'inversify';
 declare const modelHintsModule: ContainerModule;
 export default modelHintsModule;

package/lib/features/hints/di.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAK5C,QAAA,MAAM,gBAAgB,iBAKpB,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAI5C,QAAA,MAAM,gBAAgB,iBAKpB,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

package/lib/features/hints/di.config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -15,16 +15,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const types_1 = require("../../base/types");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const type_hints_1 = require("./type-hints");
 const modelHintsModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
     bind(type_hints_1.TypeHintProvider).toSelf().inSingletonScope();
-    bind(types_1.TYPES.ITypeHintProvider).toService(type_hints_1.TypeHintProvider);
-    (0, sprotty_1.configureActionHandler)({ bind, isBound }, protocol_1.SetTypeHintsAction.KIND, type_hints_1.TypeHintProvider);
-    (0, sprotty_1.configureCommand)({ bind, isBound }, type_hints_1.ApplyTypeHintsCommand);
+    bind(_glsp_sprotty_1.TYPES.ITypeHintProvider).toService(type_hints_1.TypeHintProvider);
+    (0, _glsp_sprotty_1.configureActionHandler)({ bind, isBound }, _glsp_sprotty_1.SetTypeHintsAction.KIND, type_hints_1.TypeHintProvider);
+    (0, _glsp_sprotty_1.configureCommand)({ bind, isBound }, type_hints_1.ApplyTypeHintsCommand);
 });
 exports.default = modelHintsModule;
 //# sourceMappingURL=di.config.js.map

package/lib/features/hints/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA4D;AAC5D,yCAA4C;AAC5C,qCAAmE;AACnE,4CAAyC;AACzC,6CAAuE;AAEvE,MAAM,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACpE,IAAI,CAAC,6BAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnD,IAAI,CAAC,aAAK,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,6BAAgB,CAAC,CAAC;IAC1D,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,6BAAkB,CAAC,IAAI,EAAE,6BAAgB,CAAC,CAAC;IACrF,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAqB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,iDAAoG;AACpG,6CAAuE;AAEvE,MAAM,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACpE,IAAI,CAAC,6BAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnD,IAAI,CAAC,qBAAK,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,6BAAgB,CAAC,CAAC;IAC1D,IAAA,sCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAkB,CAAC,IAAI,EAAE,6BAAgB,CAAC,CAAC;IACrF,IAAA,gCAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAqB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,kBAAe,gBAAgB,CAAC"}

package/lib/features/hints/model.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 EclipseSource and others.
+ * Copyright (c) 2019-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,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElementSchema } from '@eclipse-glsp/protocol';
-import { SModelElement, SModelExtension } from 'sprotty';
+import { SModelElement, SModelElementSchema, SModelExtension } from '../../glsp-sprotty/index';
 export declare const containerFeature: unique symbol;
 export interface Containable extends SModelExtension {
     isContainableElement(input: SModelElement | SModelElementSchema | string): boolean;

package/lib/features/hints/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/hints/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEzD,eAAO,MAAM,gBAAgB,eAAwB,CAAC;AAEtD,MAAM,WAAW,WAAY,SAAQ,eAAe;IAChD,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,mBAAmB,GAAG,MAAM,GAAG,OAAO,CAAC;CACtF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,WAAW,CAE5F;AAED,eAAO,MAAM,eAAe,eAA4B,CAAC;AAEzD,MAAM,WAAW,YAAa,SAAQ,eAAe;CAAG;AAExD,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,YAAY,CAE9F"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/hints/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEpF,eAAO,MAAM,gBAAgB,eAAwB,CAAC;AAEtD,MAAM,WAAW,WAAY,SAAQ,eAAe;IAChD,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,mBAAmB,GAAG,MAAM,GAAG,OAAO,CAAC;CACtF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,WAAW,CAE5F;AAED,eAAO,MAAM,eAAe,eAA4B,CAAC;AAEzD,MAAM,WAAW,YAAa,SAAQ,eAAe;CAAG;AAExD,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,YAAY,CAE9F"}

package/lib/features/hints/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/features/hints/model.ts"],"names":[],"mappings":";;;AAkBa,QAAA,gBAAgB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAMtD,SAAgB,aAAa,CAAC,OAAsB;IAChD,OAAO,OAAO,CAAC,UAAU,CAAC,wBAAgB,CAAC,CAAC;AAChD,CAAC;AAFD,sCAEC;AAEY,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAIzD,SAAgB,cAAc,CAAC,OAAsB;IACjD,OAAO,OAAO,CAAC,UAAU,CAAC,uBAAe,CAAC,CAAC;AAC/C,CAAC;AAFD,wCAEC"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/features/hints/model.ts"],"names":[],"mappings":";;;AAiBa,QAAA,gBAAgB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAMtD,SAAgB,aAAa,CAAC,OAAsB;IAChD,OAAO,OAAO,CAAC,UAAU,CAAC,wBAAgB,CAAC,CAAC;AAChD,CAAC;AAFD,sCAEC;AAEY,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAIzD,SAAgB,cAAc,CAAC,OAAsB;IACjD,OAAO,OAAO,CAAC,UAAU,CAAC,uBAAe,CAAC,CAAC;AAC/C,CAAC;AAFD,wCAEC"}

package/lib/features/hints/type-hints.d.ts

@@ -1,22 +1,6 @@
-/********************************************************************************
- * Copyright (c) 2019-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 { Action, EdgeTypeHint, ShapeTypeHint } from '@eclipse-glsp/protocol';
-import { CommandExecutionContext, CommandReturn, IActionHandler, ICommand, SModelElement } from 'sprotty';
-import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
-import { FeedbackCommand } from '../tool-feedback/model';
+import { Action, CommandExecutionContext, CommandReturn, EdgeTypeHint, IActionHandler, ICommand, SModelElement, ShapeTypeHint } from '../../glsp-sprotty/index';
+import { FeedbackCommand } from '../../base/feedback/feeback-command';
+import { IFeedbackActionDispatcher } from '../../base/feedback/feedback-action-dispatcher';
 /**
  * Is dispatched by the {@link TypeHintProvider} to apply the type hints received from the server
  * onto the graphical model. The action is dispatched as persistent feedback to ensure the applied type hints

package/lib/features/hints/type-hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-hints.d.ts","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAsB,aAAa,EAAY,MAAM,wBAAwB,CAAC;AAE3G,OAAO,EACH,uBAAuB,EACvB,aAAa,EAMb,cAAc,EACd,QAAQ,EAGR,aAAa,EAGhB,MAAM,SAAS,CAAC;AAKjB,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;;GAIG;AACH,MAAM,WAAW,oBAAqB,SAAQ,MAAM;IAChD,IAAI,EAAE,OAAO,oBAAoB,CAAC,IAAI,CAAC;CAC1C;AAED,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,IAAI,mBAAmB,CAAC;IAErC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,oBAAoB,CAE9D;IAED,SAAgB,MAAM,IAAI,oBAAoB,CAE7C;CACJ;AAED,qBACa,qBAAsB,SAAQ,eAAe;IAMpB,SAAS,CAAC,MAAM,EAAE,MAAM;IAL1D,OAAc,IAAI,SAA6B;IAC/C,SAAyB,QAAQ,MAAM;IAEN,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;gBAEnC,MAAM,EAAE,MAAM;IAI1D,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAWxD,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IASzD,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAmB7D;AA4BD,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAC3F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACzF,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE,CAAC;CAChH;AAED,qBACa,gBAAiB,YAAW,cAAc,EAAE,iBAAiB;IAEtE,SAAS,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;IAE9D,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IAC7D,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAE3D,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI;IAQhD,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE;IAqB5G,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS;IAI1F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS;CAG3F"}
+{"version":3,"file":"type-hints.d.ts","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,uBAAuB,EACvB,aAAa,EAEb,YAAY,EAEZ,cAAc,EACd,QAAQ,EAER,aAAa,EAIb,aAAa,EAOhB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAM3F;;;;GAIG;AACH,MAAM,WAAW,oBAAqB,SAAQ,MAAM;IAChD,IAAI,EAAE,OAAO,oBAAoB,CAAC,IAAI,CAAC;CAC1C;AAED,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,IAAI,mBAAmB,CAAC;IAErC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,oBAAoB,CAE9D;IAED,SAAgB,MAAM,IAAI,oBAAoB,CAE7C;CACJ;AAED,qBACa,qBAAsB,SAAQ,eAAe;IAMpB,SAAS,CAAC,MAAM,EAAE,MAAM;IAL1D,OAAc,IAAI,SAA6B;IAC/C,SAAyB,QAAQ,MAAM;IAEN,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;gBAEnC,MAAM,EAAE,MAAM;IAI1D,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAWxD,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IASzD,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAmB7D;AA4BD,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAC3F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACzF,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE,CAAC;CAChH;AAED,qBACa,gBAAiB,YAAW,cAAc,EAAE,iBAAiB;IAEtE,SAAS,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;IAE9D,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IAC7D,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAE3D,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI;IAQhD,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE;IAqB5G,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS;IAI1F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS;CAG3F"}

package/lib/features/hints/type-hints.js

@@ -14,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeHintProvider = exports.ApplyTypeHintsCommand = exports.ApplyTypeHintsAction = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -28,28 +28,26 @@ exports.TypeHintProvider = exports.ApplyTypeHintsCommand = exports.ApplyTypeHint
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const types_1 = require("../../base/types");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+const feeback_command_1 = require("../../base/feedback/feeback-command");
 const smodel_util_1 = require("../../utils/smodel-util");
 const model_1 = require("../change-bounds/model");
 const model_2 = require("../reconnect/model");
-const model_3 = require("../tool-feedback/model");
-const model_4 = require("./model");
+const model_3 = require("./model");
 var ApplyTypeHintsAction;
 (function (ApplyTypeHintsAction) {
     ApplyTypeHintsAction.KIND = 'applyTypeHints';
     function is(object) {
-        return protocol_1.Action.hasKind(object, ApplyTypeHintsAction.KIND);
+        return _glsp_sprotty_1.Action.hasKind(object, ApplyTypeHintsAction.KIND);
     }
     ApplyTypeHintsAction.is = is;
     function create() {
         return { kind: ApplyTypeHintsAction.KIND };
     }
     ApplyTypeHintsAction.create = create;
-})(ApplyTypeHintsAction = exports.ApplyTypeHintsAction || (exports.ApplyTypeHintsAction = {}));
-let ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends model_3.FeedbackCommand {
+})(ApplyTypeHintsAction || (exports.ApplyTypeHintsAction = ApplyTypeHintsAction = {}));
+let ApplyTypeHintsCommand = exports.ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends feeback_command_1.FeedbackCommand {
     constructor(action) {
         super();
         this.action = action;
@@ -57,10 +55,10 @@ let ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends model_3.Feedback
     }
     execute(context) {
         context.root.index.all().forEach(element => {
-            if (element instanceof sprotty_1.SShapeElement || element instanceof sprotty_1.SModelRoot) {
+            if (element instanceof _glsp_sprotty_1.SShapeElement || element instanceof _glsp_sprotty_1.SModelRoot) {
                 this.applyShapeTypeHint(element);
             }
-            else if (element instanceof sprotty_1.SEdge) {
+            else if (element instanceof _glsp_sprotty_1.SEdge) {
                 return this.applyEdgeTypeHint(element);
             }
         });
@@ -69,22 +67,22 @@ let ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends model_3.Feedback
     applyEdgeTypeHint(element) {
         const hint = this.typeHintProvider.getEdgeTypeHint(element);
         if (hint && isModifiableFeatureSet(element.features)) {
-            addOrRemove(element.features, sprotty_1.deletableFeature, hint.deletable);
-            addOrRemove(element.features, sprotty_1.editFeature, hint.routable);
+            addOrRemove(element.features, _glsp_sprotty_1.deletableFeature, hint.deletable);
+            addOrRemove(element.features, _glsp_sprotty_1.editFeature, hint.routable);
             addOrRemove(element.features, model_2.reconnectFeature, hint.repositionable);
         }
     }
     applyShapeTypeHint(element) {
         const hint = this.typeHintProvider.getShapeTypeHint(element);
         if (hint && isModifiableFeatureSet(element.features)) {
-            addOrRemove(element.features, sprotty_1.deletableFeature, hint.deletable);
-            addOrRemove(element.features, sprotty_1.moveFeature, hint.repositionable);
+            addOrRemove(element.features, _glsp_sprotty_1.deletableFeature, hint.deletable);
+            addOrRemove(element.features, _glsp_sprotty_1.moveFeature, hint.repositionable);
             addOrRemove(element.features, model_1.resizeFeature, hint.resizable);
-            addOrRemove(element.features, model_4.reparentFeature, hint.reparentable);
-            addOrRemove(element.features, model_4.containerFeature, true);
+            addOrRemove(element.features, model_3.reparentFeature, hint.reparentable);
+            addOrRemove(element.features, model_3.containerFeature, true);
             const containable = createContainable(hint);
             Object.assign(element, containable);
-            addOrRemove(element.features, sprotty_1.connectableFeature, true);
+            addOrRemove(element.features, _glsp_sprotty_1.connectableFeature, true);
             const validSourceEdges = this.typeHintProvider.getValidEdgeElementTypes(element, 'source');
             const validTargetEdges = this.typeHintProvider.getValidEdgeElementTypes(element, 'target');
             const connectable = createConnectable(validSourceEdges, validTargetEdges);
@@ -94,15 +92,14 @@ let ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends model_3.Feedback
 };
 ApplyTypeHintsCommand.KIND = ApplyTypeHintsAction.KIND;
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.ITypeHintProvider),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.ITypeHintProvider),
     __metadata("design:type", Object)
 ], ApplyTypeHintsCommand.prototype, "typeHintProvider", void 0);
-ApplyTypeHintsCommand = __decorate([
+exports.ApplyTypeHintsCommand = ApplyTypeHintsCommand = __decorate([
     (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.inject)(types_1.TYPES.Action)),
+    __param(0, (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.Action)),
     __metadata("design:paramtypes", [Object])
 ], ApplyTypeHintsCommand);
-exports.ApplyTypeHintsCommand = ApplyTypeHintsCommand;
 function createConnectable(validSourceEdges, validTargetEdges) {
     return {
         canConnect: (routable, role) => role === 'source' ? validSourceEdges.includes(routable.type) : validTargetEdges.includes(routable.type)
@@ -124,13 +121,13 @@ function addOrRemove(features, feature, add) {
 function isModifiableFeatureSet(featureSet) {
     return featureSet !== undefined && featureSet instanceof Set;
 }
-let TypeHintProvider = class TypeHintProvider {
+let TypeHintProvider = exports.TypeHintProvider = class TypeHintProvider {
     constructor() {
         this.shapeHints = new Map();
         this.edgeHints = new Map();
     }
     handle(action) {
-        if (protocol_1.SetTypeHintsAction.is(action)) {
+        if (_glsp_sprotty_1.SetTypeHintsAction.is(action)) {
             action.shapeHints.forEach(hint => this.shapeHints.set(hint.elementTypeId, hint));
             action.edgeHints.forEach(hint => this.edgeHints.set(hint.elementTypeId, hint));
             this.feedbackActionDispatcher.registerFeedback(this, [ApplyTypeHintsAction.create()]);
@@ -157,13 +154,12 @@ let TypeHintProvider = class TypeHintProvider {
     }
 };
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IFeedbackActionDispatcher),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IFeedbackActionDispatcher),
     __metadata("design:type", Object)
 ], TypeHintProvider.prototype, "feedbackActionDispatcher", void 0);
-TypeHintProvider = __decorate([
+exports.TypeHintProvider = TypeHintProvider = __decorate([
     (0, inversify_1.injectable)()
 ], TypeHintProvider);
-exports.TypeHintProvider = TypeHintProvider;
 function getTypeHint(input, hints) {
     const type = (0, smodel_util_1.getElementTypeId)(input);
     let hint = hints.get(type);

package/lib/features/hints/type-hints.js.map

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

package/lib/features/hover/di.config.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 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

package/lib/features/hover/di.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAsB5C,QAAA,MAAM,eAAe,iBA0BnB,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAuB5C,QAAA,MAAM,eAAe,iBA0BnB,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/lib/features/hover/di.config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2020-2022 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
@@ -16,35 +16,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const popup_position_updater_1 = require("sprotty/lib/features/hover/popup-position-updater");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const focus_change_action_1 = require("../../base/actions/focus-change-action");
 const hover_1 = require("./hover");
 const glspHoverModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
-    bind(sprotty_1.TYPES.PopupVNodePostprocessor).to(popup_position_updater_1.PopupPositionUpdater).inSingletonScope();
-    bind(hover_1.GlspHoverMouseListener).toSelf().inSingletonScope();
-    bind(sprotty_1.TYPES.MouseListener).toService(hover_1.GlspHoverMouseListener);
-    bind(sprotty_1.TYPES.PopupMouseListener).to(sprotty_1.PopupHoverMouseListener);
-    bind(sprotty_1.TYPES.KeyListener).to(sprotty_1.HoverKeyListener);
-    bind(sprotty_1.TYPES.HoverState).toConstantValue({
+    const context = { bind, isBound };
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.PopupVNodePostprocessor, _glsp_sprotty_1.PopupPositionUpdater);
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.MouseListener, hover_1.GlspHoverMouseListener);
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.PopupMouseListener, _glsp_sprotty_1.PopupHoverMouseListener);
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.KeyListener, _glsp_sprotty_1.HoverKeyListener);
+    bind(_glsp_sprotty_1.TYPES.HoverState).toConstantValue({
         mouseOverTimer: undefined,
         mouseOutTimer: undefined,
         popupOpen: false,
         previousPopupElement: undefined
     });
-    bind(sprotty_1.ClosePopupActionHandler).toSelf().inSingletonScope();
-    const context = { bind, isBound };
-    (0, sprotty_1.configureCommand)(context, sprotty_1.HoverFeedbackCommand);
-    (0, sprotty_1.configureCommand)(context, sprotty_1.SetPopupModelCommand);
-    (0, sprotty_1.configureActionHandler)(context, sprotty_1.SetPopupModelCommand.KIND, sprotty_1.ClosePopupActionHandler);
-    (0, sprotty_1.configureActionHandler)(context, sprotty_1.FitToScreenCommand.KIND, sprotty_1.ClosePopupActionHandler);
-    (0, sprotty_1.configureActionHandler)(context, sprotty_1.CenterCommand.KIND, sprotty_1.ClosePopupActionHandler);
-    (0, sprotty_1.configureActionHandler)(context, sprotty_1.SetViewportCommand.KIND, sprotty_1.ClosePopupActionHandler);
-    (0, sprotty_1.configureActionHandler)(context, sprotty_1.MoveCommand.KIND, sprotty_1.ClosePopupActionHandler);
-    (0, sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, sprotty_1.ClosePopupActionHandler);
-    (0, sprotty_1.configureActionHandler)(context, sprotty_1.EnableToolsAction.KIND, hover_1.GlspHoverMouseListener);
-    (0, sprotty_1.configureActionHandler)(context, sprotty_1.EnableDefaultToolsAction.KIND, hover_1.GlspHoverMouseListener);
-    (0, sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, hover_1.GlspHoverMouseListener);
+    bind(_glsp_sprotty_1.ClosePopupActionHandler).toSelf().inSingletonScope();
+    (0, _glsp_sprotty_1.configureCommand)(context, _glsp_sprotty_1.HoverFeedbackCommand);
+    (0, _glsp_sprotty_1.configureCommand)(context, _glsp_sprotty_1.SetPopupModelCommand);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.SetPopupModelCommand.KIND, _glsp_sprotty_1.ClosePopupActionHandler);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.FitToScreenCommand.KIND, _glsp_sprotty_1.ClosePopupActionHandler);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.CenterCommand.KIND, _glsp_sprotty_1.ClosePopupActionHandler);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.SetViewportCommand.KIND, _glsp_sprotty_1.ClosePopupActionHandler);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.MoveCommand.KIND, _glsp_sprotty_1.ClosePopupActionHandler);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, _glsp_sprotty_1.ClosePopupActionHandler);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.EnableToolsAction.KIND, hover_1.GlspHoverMouseListener);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.EnableDefaultToolsAction.KIND, hover_1.GlspHoverMouseListener);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, hover_1.GlspHoverMouseListener);
 });
 exports.default = glspHoverModule;
 //# sourceMappingURL=di.config.js.map

package/lib/features/hover/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAgBiB;AACjB,8FAAyF;AACzF,gFAAiF;AACjF,mCAAiD;AAEjD,MAAM,eAAe,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACnE,IAAI,CAAC,eAAK,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC,6CAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChF,IAAI,CAAC,8BAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,8BAAsB,CAAC,CAAC;IAC5D,IAAI,CAAC,eAAK,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,iCAAuB,CAAC,CAAC;IAC3D,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,0BAAgB,CAAC,CAAC;IAC7C,IAAI,CAAa,eAAK,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC;QAC/C,cAAc,EAAE,SAAS;QACzB,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;QAChB,oBAAoB,EAAE,SAAS;KAClC,CAAC,CAAC;IACH,IAAI,CAAC,iCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,IAAA,0BAAgB,EAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC;IAChD,IAAA,0BAAgB,EAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC;IAChD,IAAA,gCAAsB,EAAC,OAAO,EAAE,8BAAoB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IACpF,IAAA,gCAAsB,EAAC,OAAO,EAAE,4BAAkB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAClF,IAAA,gCAAsB,EAAC,OAAO,EAAE,uBAAa,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAC7E,IAAA,gCAAsB,EAAC,OAAO,EAAE,4BAAkB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAClF,IAAA,gCAAsB,EAAC,OAAO,EAAE,qBAAW,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAC3E,IAAA,gCAAsB,EAAC,OAAO,EAAE,6CAAuB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IACvF,IAAA,gCAAsB,EAAC,OAAO,EAAE,2BAAiB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;IAChF,IAAA,gCAAsB,EAAC,OAAO,EAAE,kCAAwB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;IACvF,IAAA,gCAAsB,EAAC,OAAO,EAAE,6CAAuB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;AAC1F,CAAC,CAAC,CAAC;AAEH,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,iDAkBuB;AACvB,gFAAiF;AACjF,mCAAiD;AAEjD,MAAM,eAAe,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACnE,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,IAAA,6BAAa,EAAC,OAAO,EAAE,qBAAK,CAAC,uBAAuB,EAAE,oCAAoB,CAAC,CAAC;IAC5E,IAAA,6BAAa,EAAC,OAAO,EAAE,qBAAK,CAAC,aAAa,EAAE,8BAAsB,CAAC,CAAC;IACpE,IAAA,6BAAa,EAAC,OAAO,EAAE,qBAAK,CAAC,kBAAkB,EAAE,uCAAuB,CAAC,CAAC;IAC1E,IAAA,6BAAa,EAAC,OAAO,EAAE,qBAAK,CAAC,WAAW,EAAE,gCAAgB,CAAC,CAAC;IAE5D,IAAI,CAAa,qBAAK,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC;QAC/C,cAAc,EAAE,SAAS;QACzB,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;QAChB,oBAAoB,EAAE,SAAS;KAClC,CAAC,CAAC;IACH,IAAI,CAAC,uCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAA,gCAAgB,EAAC,OAAO,EAAE,oCAAoB,CAAC,CAAC;IAChD,IAAA,gCAAgB,EAAC,OAAO,EAAE,oCAAoB,CAAC,CAAC;IAChD,IAAA,sCAAsB,EAAC,OAAO,EAAE,oCAAoB,CAAC,IAAI,EAAE,uCAAuB,CAAC,CAAC;IACpF,IAAA,sCAAsB,EAAC,OAAO,EAAE,kCAAkB,CAAC,IAAI,EAAE,uCAAuB,CAAC,CAAC;IAClF,IAAA,sCAAsB,EAAC,OAAO,EAAE,6BAAa,CAAC,IAAI,EAAE,uCAAuB,CAAC,CAAC;IAC7E,IAAA,sCAAsB,EAAC,OAAO,EAAE,kCAAkB,CAAC,IAAI,EAAE,uCAAuB,CAAC,CAAC;IAClF,IAAA,sCAAsB,EAAC,OAAO,EAAE,2BAAW,CAAC,IAAI,EAAE,uCAAuB,CAAC,CAAC;IAC3E,IAAA,sCAAsB,EAAC,OAAO,EAAE,6CAAuB,CAAC,IAAI,EAAE,uCAAuB,CAAC,CAAC;IACvF,IAAA,sCAAsB,EAAC,OAAO,EAAE,iCAAiB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;IAChF,IAAA,sCAAsB,EAAC,OAAO,EAAE,wCAAwB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;IACvF,IAAA,sCAAsB,EAAC,OAAO,EAAE,6CAAuB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;AAC1F,CAAC,CAAC,CAAC;AAEH,kBAAe,eAAe,CAAC"}

package/lib/features/hover/hover.d.ts

@@ -1,20 +1,4 @@
-/********************************************************************************
- * 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
- ********************************************************************************/
-import { Action, Bounds, SModelElementSchema, SModelRootSchema } from '@eclipse-glsp/protocol';
-import { HoverMouseListener, IActionHandler, ICommand, SModelElement } from 'sprotty';
+import { Action, Bounds, HoverMouseListener, IActionHandler, ICommand, SModelElement, SModelElementSchema, SModelRootSchema } from '../../glsp-sprotty/index';
 import { GIssueMarker } from '../validation/issue-marker';
 export declare class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
     protected enableHover: boolean;

package/lib/features/hover/hover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,MAAM,EAIN,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAc,kBAAkB,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAKlG,OAAO,EAAe,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACvE,qBACa,sBAAuB,SAAQ,kBAAmB,YAAW,cAAc;IACpF,SAAS,CAAC,WAAW,UAAQ;IAC7B;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAevC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;cAOvE,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBjG,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAYlF,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB;IAS3E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IAI1D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAGjD"}
+{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,MAAM,EAKN,kBAAkB,EAClB,cAAc,EACd,QAAQ,EAGR,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAEnB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,YAAY,EAAe,MAAM,4BAA4B,CAAC;AACvE,qBACa,sBAAuB,SAAQ,kBAAmB,YAAW,cAAc;IACpF,SAAS,CAAC,WAAW,UAAQ;IAC7B;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAevC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;cAOvE,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBjG,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAYlF,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB;IAS3E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IAI1D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAGjD"}

package/lib/features/hover/hover.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlspHoverMouseListener = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2022 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
@@ -22,15 +22,12 @@ exports.GlspHoverMouseListener = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const actions_1 = require("sprotty-protocol/lib/actions");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const focus_change_action_1 = require("../../base/actions/focus-change-action");
-const tool_actions_1 = require("../../base/tool-manager/tool-actions");
 const edge_creation_tool_1 = require("../tools/edge-creation-tool");
 const issue_marker_1 = require("../validation/issue-marker");
-let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.HoverMouseListener {
+let GlspHoverMouseListener = exports.GlspHoverMouseListener = class GlspHoverMouseListener extends _glsp_sprotty_1.HoverMouseListener {
     constructor() {
         super(...arguments);
         this.enableHover = true;
@@ -50,13 +47,13 @@ let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.Hove
             if (this.lastHoverFeedbackElementId) {
                 const previousTargetId = this.lastHoverFeedbackElementId;
                 this.lastHoverFeedbackElementId = undefined;
-                return actions_1.HoverFeedbackAction.create({ mouseoverElement: previousTargetId, mouseIsOver: false });
+                return _glsp_sprotty_1.HoverFeedbackAction.create({ mouseoverElement: previousTargetId, mouseIsOver: false });
             }
         }
-        else if (tool_actions_1.EnableToolsAction.is(action)) {
+        else if (_glsp_sprotty_1.EnableToolsAction.is(action)) {
             this.enableHover = !action.toolIds.includes(edge_creation_tool_1.EdgeCreationTool.ID);
         }
-        else if (tool_actions_1.EnableDefaultToolsAction.is(action)) {
+        else if (_glsp_sprotty_1.EnableDefaultToolsAction.is(action)) {
             this.enableHover = true;
         }
     }
@@ -72,10 +69,10 @@ let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.Hove
             this.state.mouseOverTimer = window.setTimeout(() => {
                 const popupBounds = this.computePopupBounds(target, { x: event.pageX, y: event.pageY });
                 if (target instanceof issue_marker_1.GIssueMarker) {
-                    resolve(protocol_1.SetPopupModelAction.create(this.createPopupModel(target, popupBounds)));
+                    resolve(_glsp_sprotty_1.SetPopupModelAction.create(this.createPopupModel(target, popupBounds)));
                 }
                 else {
-                    resolve(protocol_1.RequestPopupModelAction.create({ elementId: target.id, bounds: popupBounds }));
+                    resolve(_glsp_sprotty_1.RequestPopupModelAction.create({ elementId: target.id, bounds: popupBounds }));
                 }
                 this.state.popupOpen = true;
                 this.state.previousPopupElement = target;
@@ -91,7 +88,7 @@ let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.Hove
                 canvasBounds: this.modifyBounds(bounds)
             };
         }
-        return { type: sprotty_1.EMPTY_ROOT.type, id: sprotty_1.EMPTY_ROOT.id };
+        return { type: _glsp_sprotty_1.EMPTY_ROOT.type, id: _glsp_sprotty_1.EMPTY_ROOT.id };
     }
     createMarkerIssuePopup(marker) {
         const message = this.createIssueMessage(marker);
@@ -108,8 +105,7 @@ let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.Hove
         return bounds;
     }
 };
-GlspHoverMouseListener = __decorate([
+exports.GlspHoverMouseListener = GlspHoverMouseListener = __decorate([
     (0, inversify_1.injectable)()
 ], GlspHoverMouseListener);
-exports.GlspHoverMouseListener = GlspHoverMouseListener;
 //# sourceMappingURL=hover.js.map