@eclipse-glsp/client 1.1.0-next.697cc23.237 → 1.1.0-next.69a77b0.259

package/lib/base/auto-complete/validation-decorator.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValidationDecorator = exports.IValidationDecorator = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2021 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,8 +16,7 @@ exports.ValidationDecorator = exports.IValidationDecorator = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const codicon_1 = require("sprotty/lib/utils/codicon");
-const protocol_1 = require("@eclipse-glsp/protocol");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 var IValidationDecorator;
 (function (IValidationDecorator) {
     IValidationDecorator.NO_DECORATION = {
@@ -31,23 +30,23 @@ var IValidationDecorator;
         // eslint-disable-next-line @typescript-eslint/no-empty-function
         dispose() { }
     };
-})(IValidationDecorator = exports.IValidationDecorator || (exports.IValidationDecorator = {}));
+})(IValidationDecorator || (exports.IValidationDecorator = IValidationDecorator = {}));
 class ValidationDecorator {
     constructor(containerElement) {
         this.containerElement = containerElement;
         this.warningClasses = ['warning'];
-        this.warningIconClasses = (0, codicon_1.codiconCSSString)('warning');
+        this.warningIconClasses = (0, _glsp_sprotty_1.codiconCSSString)('warning');
         this.errorClasses = ['error'];
-        this.errorIconClasses = (0, codicon_1.codiconCSSString)('error');
+        this.errorIconClasses = (0, _glsp_sprotty_1.codiconCSSString)('error');
         this.isValidated = false;
         this.hasValidationError = false;
     }
     decorateValidationResult(status) {
-        if (protocol_1.ValidationStatus.isError(status)) {
+        if (_glsp_sprotty_1.ValidationStatus.isError(status)) {
             this.hasValidationError = true;
             this.decorateError(status.message ? status.message : 'Error');
         }
-        else if (protocol_1.ValidationStatus.isWarning(status)) {
+        else if (_glsp_sprotty_1.ValidationStatus.isWarning(status)) {
             this.hasValidationError = false;
             this.decorateWarning(status.message ? status.message : 'Warning');
         }

package/lib/base/auto-complete/validation-decorator.js.map

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

package/lib/base/command-stack.d.ts

@@ -1,6 +1,21 @@
-import { CommandStack, SModelRoot } from 'sprotty';
-export declare class GLSPCommandStack extends CommandStack {
+import { CommandStack, Disposable, DisposableCollection, Emitter, Event, ICommand, SModelRoot } from '../glsp-sprotty/index';
+/**
+ * A hook to listen for model root changes. Will be called after a server update
+ * has been processed
+ */
+export interface ISModelRootListener {
+    modelRootChanged(root: Readonly<SModelRoot>): void;
+}
+export declare class GLSPCommandStack extends CommandStack implements Disposable {
+    protected modelRootListeners: ISModelRootListener[];
+    protected toDispose: DisposableCollection;
+    protected initialize(): void;
+    dispose(): void;
+    protected onModelRootChangedEmitter: Emitter<Readonly<SModelRoot>>;
+    get onModelRootChanged(): Event<Readonly<SModelRoot>>;
     undo(): Promise<SModelRoot>;
     redo(): Promise<SModelRoot>;
+    execute(command: ICommand): Promise<SModelRoot>;
+    protected notifyListeners(root: Readonly<SModelRoot>): void;
 }
 //# sourceMappingURL=command-stack.d.ts.map

package/lib/base/command-stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-stack.d.ts","sourceRoot":"","sources":["../../src/base/command-stack.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEnD,qBACa,gBAAiB,SAAQ,YAAY;IACrC,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IAQ3B,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;CAOvC"}
+{"version":3,"file":"command-stack.d.ts","sourceRoot":"","sources":["../../src/base/command-stack.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,KAAK,EACL,QAAQ,EACR,UAAU,EAIb,MAAM,eAAe,CAAC;AAEvB;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAChC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;CACtD;AAED,qBACa,gBAAiB,SAAQ,YAAa,YAAW,UAAU;IAGpE,SAAS,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,CAAM;IACzD,SAAS,CAAC,SAAS,uBAA8B;cAE9B,UAAU,IAAI,IAAI;IAOrC,OAAO,IAAI,IAAI;IAIf,SAAS,CAAC,yBAAyB,gCAAuC;IAC1E,IAAI,kBAAkB,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAEpD;IAEQ,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IAQ3B,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IAQ3B,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAQxD,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;CAG9D"}

package/lib/base/command-stack.js

@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPCommandStack = void 0;
 /********************************************************************************
@@ -23,8 +26,25 @@ exports.GLSPCommandStack = void 0;
  * 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");
-let GLSPCommandStack = class GLSPCommandStack extends sprotty_1.CommandStack {
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+let GLSPCommandStack = exports.GLSPCommandStack = class GLSPCommandStack extends _glsp_sprotty_1.CommandStack {
+    constructor() {
+        super(...arguments);
+        this.modelRootListeners = [];
+        this.toDispose = new _glsp_sprotty_1.DisposableCollection();
+        this.onModelRootChangedEmitter = new _glsp_sprotty_1.Emitter();
+    }
+    initialize() {
+        super.initialize();
+        this.toDispose.push(this.onModelRootChangedEmitter);
+        this.modelRootListeners.forEach(listener => this.onModelRootChanged(root => listener.modelRootChanged(root)));
+    }
+    dispose() {
+        this.toDispose.dispose();
+    }
+    get onModelRootChanged() {
+        return this.onModelRootChangedEmitter.event;
+    }
     undo() {
         this.logger.warn(this, 'GLSPCommandStack.undo() was called. This should never happen as the GLSP server is responsible for handling undo requests');
         return this.currentModel;
@@ -33,9 +53,29 @@ let GLSPCommandStack = class GLSPCommandStack extends sprotty_1.CommandStack {
         this.logger.warn(this, 'GLSPCommandStack.redo() was called. This should never happen as the GLSP server is responsible for handling redo requests');
         return this.currentModel;
     }
+    execute(command) {
+        const result = super.execute(command);
+        if (command instanceof _glsp_sprotty_1.SetModelCommand || command instanceof _glsp_sprotty_1.UpdateModelCommand) {
+            result.then(root => this.notifyListeners(root));
+        }
+        return result;
+    }
+    notifyListeners(root) {
+        this.onModelRootChangedEmitter.fire(root);
+    }
 };
-GLSPCommandStack = __decorate([
+__decorate([
+    (0, inversify_1.multiInject)(_glsp_sprotty_1.TYPES.ISModelRootListener),
+    (0, inversify_1.optional)(),
+    __metadata("design:type", Array)
+], GLSPCommandStack.prototype, "modelRootListeners", void 0);
+__decorate([
+    (0, inversify_1.preDestroy)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], GLSPCommandStack.prototype, "dispose", null);
+exports.GLSPCommandStack = GLSPCommandStack = __decorate([
     (0, inversify_1.injectable)()
 ], GLSPCommandStack);
-exports.GLSPCommandStack = GLSPCommandStack;
 //# sourceMappingURL=command-stack.js.map

package/lib/base/command-stack.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../src/base/command-stack.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,qCAAmD;AAG5C,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,sBAAY;IACrC,IAAI;QACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,IAAI,EACJ,2HAA2H,CAC9H,CAAC;QACF,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAEQ,IAAI;QACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,IAAI,EACJ,2HAA2H,CAC9H,CAAC;QACF,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;CACJ,CAAA;AAhBY,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAgB5B;AAhBY,4CAAgB"}
+{"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../src/base/command-stack.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA0E;AAC1E,iDAWuB;AAWhB,IAAM,gBAAgB,8BAAtB,MAAM,gBAAiB,SAAQ,4BAAY;IAA3C;;QAGO,uBAAkB,GAA0B,EAAE,CAAC;QAC/C,cAAS,GAAG,IAAI,oCAAoB,EAAE,CAAC;QAavC,8BAAyB,GAAG,IAAI,uBAAO,EAAwB,CAAC;IAgC9E,CAAC;IA3CsB,UAAU;QACzB,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACpD,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClH,CAAC;IAGD,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAGD,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;IAChD,CAAC;IAEQ,IAAI;QACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,IAAI,EACJ,2HAA2H,CAC9H,CAAC;QACF,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAEQ,IAAI;QACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,IAAI,EACJ,2HAA2H,CAC9H,CAAC;QACF,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAEQ,OAAO,CAAC,OAAiB;QAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACtC,IAAI,OAAO,YAAY,+BAAe,IAAI,OAAO,YAAY,kCAAkB,EAAE;YAC7E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;SACnD;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,eAAe,CAAC,IAA0B;QAChD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;CACJ,CAAA;AA9Ca;IAFT,IAAA,uBAAW,EAAC,qBAAK,CAAC,mBAAmB,CAAC;IACtC,IAAA,oBAAQ,GAAE;;4DAC8C;AAUzD;IADC,IAAA,sBAAU,GAAE;;;;+CAGZ;2BAfQ,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAiD5B"}

package/lib/base/di.config.d.ts

@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { InitializeResult } from '@eclipse-glsp/protocol';
 import '@vscode/codicons/dist/codicon.css';
 import { Container, ContainerModule } from 'inversify';
+import { InitializeResult } from '../glsp-sprotty/index';
 import '../../css/glsp-sprotty.css';
 declare const defaultGLSPModule: ContainerModule;
 export default defaultGLSPModule;

package/lib/base/di.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../src/base/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAA+B,gBAAgB,EAAqB,MAAM,wBAAwB,CAAC;AAC1G,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEvD,OAAO,4BAA4B,CAAC;AAcpC,QAAA,MAAM,iBAAiB,iBAoCrB,CAAC;AAEH,eAAe,iBAAiB,CAAC;AAEjC;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/H"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../src/base/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAEH,gBAAgB,EAYnB,MAAM,eAAe,CAAC;AACvB,OAAO,4BAA4B,CAAC;AAkBpC,QAAA,MAAM,iBAAiB,iBAqDrB,CAAC;AAEH,eAAe,iBAAiB,CAAC;AAEjC;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/H"}

package/lib/base/di.config.js

@@ -16,27 +16,30 @@ exports.configureServerActions = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 require("@vscode/codicons/dist/codicon.css");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
 require("../../css/glsp-sprotty.css");
 const action_dispatcher_1 = require("./action-dispatcher");
 const focus_change_action_1 = require("./actions/focus-change-action");
 const command_stack_1 = require("./command-stack");
 const editor_context_service_1 = require("./editor-context-service");
+const css_feedback_1 = require("./feedback/css-feedback");
+const feedback_action_dispatcher_1 = require("./feedback/feedback-action-dispatcher");
+const update_model_command_1 = require("./feedback/update-model-command");
 const focus_tracker_1 = require("./focus-tracker");
 const model_initialization_constraint_1 = require("./model-initialization-constraint");
 const model_registry_1 = require("./model/model-registry");
-const update_model_command_1 = require("./model/update-model-command");
 const selection_clearing_mouse_listener_1 = require("./selection-clearing-mouse-listener");
+const selection_service_1 = require("./selection-service");
 const glsp_tool_manager_1 = require("./tool-manager/glsp-tool-manager");
-const types_1 = require("./types");
+const key_tool_1 = require("./view/key-tool");
+const mouse_tool_1 = require("./view/mouse-tool");
 const view_registry_1 = require("./view/view-registry");
 const defaultGLSPModule = new inversify_1.ContainerModule((bind, _unbind, isBound, rebind) => {
     const context = { bind, _unbind, isBound, rebind };
     bind(editor_context_service_1.EditorContextService).toSelf().inSingletonScope();
-    bind(types_1.TYPES.IEditorContextServiceProvider).toProvider(ctx => () => new Promise((resolve, reject) => {
+    bind(_glsp_sprotty_1.TYPES.IEditorContextServiceProvider).toProvider(ctx => () => new Promise((resolve, reject) => {
         if (ctx.container.isBound(editor_context_service_1.EditorContextService)) {
             resolve(ctx.container.get(editor_context_service_1.EditorContextService));
         }
@@ -44,22 +47,35 @@ const defaultGLSPModule = new inversify_1.ContainerModule((bind, _unbind, isBoun
             reject();
         }
     }));
-    (0, sprotty_1.configureActionHandler)(context, protocol_1.SetEditModeAction.KIND, editor_context_service_1.EditorContextService);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.SetEditModeAction.KIND, editor_context_service_1.EditorContextService);
     bind(focus_tracker_1.FocusTracker).toSelf().inSingletonScope();
-    (0, sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, focus_tracker_1.FocusTracker);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, focus_tracker_1.FocusTracker);
     // Model update initialization ------------------------------------
-    (0, sprotty_1.configureCommand)(context, update_model_command_1.FeedbackAwareUpdateModelCommand);
-    (0, sprotty_1.configureActionHandler)(context, sprotty_1.SetModelCommand.KIND, update_model_command_1.SetModelActionHandler);
-    (0, protocol_1.bindAsService)(context, types_1.TYPES.MouseListener, selection_clearing_mouse_listener_1.SelectionClearingMouseListener);
-    (0, protocol_1.bindOrRebind)(context, types_1.TYPES.ICommandStack).to(command_stack_1.GLSPCommandStack);
+    bind(_glsp_sprotty_1.TYPES.IFeedbackActionDispatcher).to(feedback_action_dispatcher_1.FeedbackActionDispatcher).inSingletonScope();
+    (0, _glsp_sprotty_1.configureCommand)(context, update_model_command_1.FeedbackAwareUpdateModelCommand);
+    bind(mouse_tool_1.GLSPMouseTool).toSelf().inSingletonScope();
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.MouseTool).toService(mouse_tool_1.GLSPMouseTool);
+    bind(key_tool_1.GLSPKeyTool).toSelf().inSingletonScope();
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.KeyTool).toService(key_tool_1.GLSPKeyTool);
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.MouseListener, selection_clearing_mouse_listener_1.SelectionClearingMouseListener);
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.ICommandStack).to(command_stack_1.GLSPCommandStack).inSingletonScope();
     bind(glsp_tool_manager_1.GLSPToolManager).toSelf().inSingletonScope();
-    (0, protocol_1.bindOrRebind)(context, types_1.TYPES.IToolManager).toService(glsp_tool_manager_1.GLSPToolManager);
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.IToolManager).toService(glsp_tool_manager_1.GLSPToolManager);
     bind(action_dispatcher_1.GLSPActionDispatcher).toSelf().inSingletonScope();
-    (0, protocol_1.bindOrRebind)(context, types_1.TYPES.IActionDispatcher).toService(action_dispatcher_1.GLSPActionDispatcher);
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.IActionDispatcher).toService(action_dispatcher_1.GLSPActionDispatcher);
     bind(model_initialization_constraint_1.ModelInitializationConstraint).to(model_initialization_constraint_1.DefaultModelInitializationConstraint).inSingletonScope();
     // support re-registration of model elements and views
-    (0, protocol_1.bindOrRebind)(context, types_1.TYPES.SModelRegistry).to(model_registry_1.GLSPModelRegistry).inSingletonScope();
-    (0, protocol_1.bindOrRebind)(context, types_1.TYPES.ViewRegistry).to(view_registry_1.GLSPViewRegistry).inSingletonScope();
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.SModelRegistry).to(model_registry_1.GLSPModelRegistry).inSingletonScope();
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.ViewRegistry).to(view_registry_1.GLSPViewRegistry).inSingletonScope();
+    bind(selection_service_1.SelectionService).toSelf().inSingletonScope();
+    bind(_glsp_sprotty_1.TYPES.ISModelRootListener).toService(selection_service_1.SelectionService);
+    // Feedback Support ------------------------------------
+    // Generic re-usable feedback modifying css classes
+    (0, _glsp_sprotty_1.configureCommand)(context, css_feedback_1.ModifyCssFeedbackCommand);
+    // We support using sprotty's MoveCommand as client-side visual feedback
+    (0, _glsp_sprotty_1.configureCommand)(context, _glsp_sprotty_1.MoveCommand);
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.IVNodePostprocessor, _glsp_sprotty_1.LocationPostprocessor);
+    bind(_glsp_sprotty_1.TYPES.HiddenVNodePostprocessor).toService(_glsp_sprotty_1.LocationPostprocessor);
 });
 exports.default = defaultGLSPModule;
 /**
@@ -70,8 +86,8 @@ exports.default = defaultGLSPModule;
  * @param container The di container.
  */
 async function configureServerActions(result, diagramType, container) {
-    const modelSource = container.get(types_1.TYPES.ModelSource);
-    const actionHandlerRegistry = container.get(sprotty_1.ActionHandlerRegistry);
+    const modelSource = container.get(_glsp_sprotty_1.TYPES.ModelSource);
+    const actionHandlerRegistry = container.get(_glsp_sprotty_1.ActionHandlerRegistry);
     const serverActions = result.serverActions[diagramType];
     if (serverActions.length === 0) {
         throw new Error(`No server-handled actions could be derived from the initialize result for diagramType: ${diagramType}!`);

package/lib/base/di.config.js.map

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

package/lib/base/drag-aware-mouse-listener.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * 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
@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
-import { MouseListener, SModelElement } from 'sprotty';
+import { Action, MouseListener, SModelElement } from '../glsp-sprotty/index';
 /**
  * A mouse listener that is aware of prior mouse dragging.
  *
@@ -24,8 +23,8 @@ import { MouseListener, SModelElement } from 'sprotty';
  * of mouse up events.
  */
 export declare class DragAwareMouseListener extends MouseListener {
-    private _isMouseDown;
-    private _isMouseDrag;
+    protected _isMouseDown: boolean;
+    protected _isMouseDrag: boolean;
     mouseDown(target: SModelElement, event: MouseEvent): Action[];
     mouseMove(target: SModelElement, event: MouseEvent): Action[];
     mouseUp(element: SModelElement, event: MouseEvent): Action[];

package/lib/base/drag-aware-mouse-listener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drag-aware-mouse-listener.d.ts","sourceRoot":"","sources":["../../src/base/drag-aware-mouse-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEvD;;;;;;;GAOG;AACH,qBAAa,sBAAuB,SAAQ,aAAa;IACrD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAAS;IAEpB,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAK7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAO7D,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAUrE,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAIvE,eAAe,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAIpE,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;CACJ"}
+{"version":3,"file":"drag-aware-mouse-listener.d.ts","sourceRoot":"","sources":["../../src/base/drag-aware-mouse-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAErE;;;;;;;GAOG;AACH,qBAAa,sBAAuB,SAAQ,aAAa;IACrD,SAAS,CAAC,YAAY,UAAS;IAC/B,SAAS,CAAC,YAAY,UAAS;IAEtB,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAK7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAO7D,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAUrE,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAIvE,eAAe,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAIpE,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;CACJ"}

package/lib/base/drag-aware-mouse-listener.js

@@ -1,7 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DragAwareMouseListener = void 0;
-const sprotty_1 = require("sprotty");
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
 /**
  * A mouse listener that is aware of prior mouse dragging.
  *
@@ -10,7 +25,7 @@ const sprotty_1 = require("sprotty");
  * `draggingMouseUp` and/or `nonDraggingMouseUp` to react to only these specific kinds
  * of mouse up events.
  */
-class DragAwareMouseListener extends sprotty_1.MouseListener {
+class DragAwareMouseListener extends _glsp_sprotty_1.MouseListener {
     constructor() {
         super(...arguments);
         this._isMouseDown = false;

package/lib/base/drag-aware-mouse-listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"drag-aware-mouse-listener.js","sourceRoot":"","sources":["../../src/base/drag-aware-mouse-listener.ts"],"names":[],"mappings":";;;AAgBA,qCAAuD;AAEvD;;;;;;;GAOG;AACH,MAAa,sBAAuB,SAAQ,uBAAa;IAAzD;;QACY,iBAAY,GAAG,KAAK,CAAC;QACrB,iBAAY,GAAG,KAAK,CAAC;IAuCjC,CAAC;IArCY,SAAS,CAAC,MAAqB,EAAE,KAAiB;QACvD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,SAAS,CAAC,MAAqB,EAAE,KAAiB;QACvD,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;SAC5B;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,OAAO,CAAC,OAAsB,EAAE,KAAiB;QACtD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC/C;QAED,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;IAED,kBAAkB,CAAC,OAAsB,EAAE,KAAiB;QACxD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,eAAe,CAAC,OAAsB,EAAE,KAAiB;QACrD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;CACJ;AAzCD,wDAyCC"}
+{"version":3,"file":"drag-aware-mouse-listener.js","sourceRoot":"","sources":["../../src/base/drag-aware-mouse-listener.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAAqE;AAErE;;;;;;;GAOG;AACH,MAAa,sBAAuB,SAAQ,6BAAa;IAAzD;;QACc,iBAAY,GAAG,KAAK,CAAC;QACrB,iBAAY,GAAG,KAAK,CAAC;IAuCnC,CAAC;IArCY,SAAS,CAAC,MAAqB,EAAE,KAAiB;QACvD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,SAAS,CAAC,MAAqB,EAAE,KAAiB;QACvD,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;SAC5B;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEQ,OAAO,CAAC,OAAsB,EAAE,KAAiB;QACtD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC/C;QAED,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;IAED,kBAAkB,CAAC,OAAsB,EAAE,KAAiB;QACxD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,eAAe,CAAC,OAAsB,EAAE,KAAiB;QACrD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;CACJ;AAzCD,wDAyCC"}

package/lib/base/editor-context-service.d.ts

@@ -1,22 +1,6 @@
-/********************************************************************************
- * 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
- * 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, Args, EditorContext } from '@eclipse-glsp/protocol';
-import { IActionHandler, ModelSource, MousePositionTracker, SModelElement, SModelRoot } from 'sprotty';
-import { SelectionService } from '../features/select/selection-service';
-export interface EditModeListener {
+import { Action, Args, Disposable, DisposableCollection, EditorContext, Emitter, Event, IActionHandler, ModelSource, MousePositionTracker, SModelElement, SModelRoot, ValueChange } from '../glsp-sprotty/index';
+import { SelectionService } from './selection-service';
+export interface IEditModeListener {
     editModeChanged(newValue: string, oldValue: string): void;
 }
 /**
@@ -31,14 +15,17 @@ export interface EditModeListener {
  *    actions to the server to describe the current state of the editor (selection, last mouse
  *    position, etc.).
  */
-export declare class EditorContextService implements IActionHandler {
+export declare class EditorContextService implements IActionHandler, Disposable {
     protected selectionService: SelectionService;
     protected mousePositionTracker: MousePositionTracker;
-    protected editModeListeners: EditModeListener[];
+    protected editModeListeners: IEditModeListener[];
     protected modelSourceProvider: () => Promise<ModelSource>;
     protected _editMode: string;
-    register(editModeListener: EditModeListener): void;
-    deregister(editModeListener: EditModeListener): void;
+    protected onEditModeChangedEmitter: Emitter<ValueChange<string>>;
+    get onEditModeChanged(): Event<ValueChange<string>>;
+    protected toDispose: DisposableCollection;
+    protected initialize(): void;
+    dispose(): void;
     get(args?: Args): EditorContext;
     getWithSelection(selectedElementIds: string[], args?: Args): EditorContext;
     handle(action: Action): void;

package/lib/base/editor-context-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor-context-service.d.ts","sourceRoot":"","sources":["../../src/base/editor-context-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAyB,aAAa,EAA6B,MAAM,wBAAwB,CAAC;AAEvH,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACvG,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAIxE,MAAM,WAAW,gBAAgB;IAC7B,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7D;AAED;;;;;;;;;;;GAWG;AACH,qBACa,oBAAqB,YAAW,cAAc;IAEvD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAIrD,SAAS,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,CAAM;IAGrD,SAAS,CAAC,mBAAmB,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IAE1D,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAE5B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAIlD,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IAIpD,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,aAAa;IAQ/B,gBAAgB,CAAC,kBAAkB,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,aAAa;IAQ1E,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAQ5B,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInD,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQjD,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,SAAS,IAAI,QAAQ,CAAC,UAAU,CAAC,CAEpC;IAED,IAAI,gBAAgB,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE,CAEhD;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;CACJ;AAED,MAAM,MAAM,4BAA4B,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"editor-context-service.d.ts","sourceRoot":"","sources":["../../src/base/editor-context-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,IAAI,EACJ,UAAU,EACV,oBAAoB,EAEpB,aAAa,EACb,OAAO,EACP,KAAK,EACL,cAAc,EACd,WAAW,EACX,oBAAoB,EACpB,aAAa,EACb,UAAU,EAGV,WAAW,EACd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,MAAM,WAAW,iBAAiB;IAC9B,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7D;AAED;;;;;;;;;;;GAWG;AACH,qBACa,oBAAqB,YAAW,cAAc,EAAE,UAAU;IAEnE,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAIrD,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,CAAM;IAGtD,SAAS,CAAC,mBAAmB,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IAE1D,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAE5B,SAAS,CAAC,wBAAwB,+BAAsC;IACxE,IAAI,iBAAiB,IAAI,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAElD;IAED,SAAS,CAAC,SAAS,uBAA8B;IAGjD,SAAS,CAAC,UAAU,IAAI,IAAI;IAQ5B,OAAO,IAAI,IAAI;IAIf,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,aAAa;IAQ/B,gBAAgB,CAAC,kBAAkB,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,aAAa;IAQ1E,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAQ5B,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInD,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQjD,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,SAAS,IAAI,QAAQ,CAAC,UAAU,CAAC,CAEpC;IAED,IAAI,gBAAgB,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE,CAEhD;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;CACJ;AAED,MAAM,MAAM,4BAA4B,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC"}

package/lib/base/editor-context-service.js

@@ -25,12 +25,10 @@ exports.EditorContextService = 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 selection_service_1 = require("../features/select/selection-service");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+const selection_service_1 = require("./selection-service");
 const source_uri_aware_1 = require("./source-uri-aware");
-const types_1 = require("./types");
 /**
  * The `EditorContextService` is a central injectable component that gives read-only access to
  * certain aspects of the diagram, such as the currently selected elements, the model root,
@@ -43,15 +41,21 @@ const types_1 = require("./types");
  *    actions to the server to describe the current state of the editor (selection, last mouse
  *    position, etc.).
  */
-let EditorContextService = class EditorContextService {
+let EditorContextService = exports.EditorContextService = class EditorContextService {
     constructor() {
         this.editModeListeners = [];
+        this.onEditModeChangedEmitter = new _glsp_sprotty_1.Emitter();
+        this.toDispose = new _glsp_sprotty_1.DisposableCollection();
     }
-    register(editModeListener) {
-        (0, protocol_1.distinctAdd)(this.editModeListeners, editModeListener);
+    get onEditModeChanged() {
+        return this.onEditModeChangedEmitter.event;
     }
-    deregister(editModeListener) {
-        (0, protocol_1.remove)(this.editModeListeners, editModeListener);
+    initialize() {
+        this.toDispose.push(this.onEditModeChangedEmitter);
+        this.editModeListeners.forEach(listener => this.onEditModeChanged(change => listener.editModeChanged(change.newValue, change.oldValue)));
+    }
+    dispose() {
+        this.toDispose.dispose();
     }
     get(args) {
         return {
@@ -68,14 +72,14 @@ let EditorContextService = class EditorContextService {
         };
     }
     handle(action) {
-        if (protocol_1.SetEditModeAction.is(action)) {
+        if (_glsp_sprotty_1.SetEditModeAction.is(action)) {
             const oldValue = this._editMode;
             this._editMode = action.editMode;
             this.notifyEditModeListeners(oldValue);
         }
     }
     notifyEditModeListeners(oldValue) {
-        this.editModeListeners.forEach(listener => listener.editModeChanged(oldValue, this.editMode));
+        this.onEditModeChangedEmitter.fire({ newValue: this.editMode, oldValue });
     }
     async getSourceUri() {
         const modelSource = await this.modelSourceProvider();
@@ -94,28 +98,39 @@ let EditorContextService = class EditorContextService {
         return this.selectionService.getSelectedElements();
     }
     get isReadonly() {
-        return this.editMode === protocol_1.EditMode.READONLY;
+        return this.editMode === _glsp_sprotty_1.EditMode.READONLY;
     }
 };
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.SelectionService),
+    (0, inversify_1.inject)(selection_service_1.SelectionService),
     __metadata("design:type", selection_service_1.SelectionService)
 ], EditorContextService.prototype, "selectionService", void 0);
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.MousePositionTracker),
-    __metadata("design:type", sprotty_1.MousePositionTracker)
+    (0, inversify_1.inject)(_glsp_sprotty_1.MousePositionTracker),
+    __metadata("design:type", _glsp_sprotty_1.MousePositionTracker)
 ], EditorContextService.prototype, "mousePositionTracker", void 0);
 __decorate([
-    (0, inversify_1.multiInject)(types_1.TYPES.IEditModeListener),
+    (0, inversify_1.multiInject)(_glsp_sprotty_1.TYPES.IEditModeListener),
     (0, inversify_1.optional)(),
     __metadata("design:type", Array)
 ], EditorContextService.prototype, "editModeListeners", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.ModelSourceProvider),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.ModelSourceProvider),
     __metadata("design:type", Function)
 ], EditorContextService.prototype, "modelSourceProvider", void 0);
-EditorContextService = __decorate([
+__decorate([
+    (0, inversify_1.postConstruct)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], EditorContextService.prototype, "initialize", null);
+__decorate([
+    (0, inversify_1.preDestroy)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], EditorContextService.prototype, "dispose", null);
+exports.EditorContextService = EditorContextService = __decorate([
     (0, inversify_1.injectable)()
 ], EditorContextService);
-exports.EditorContextService = EditorContextService;
 //# sourceMappingURL=editor-context-service.js.map

package/lib/base/editor-context-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"editor-context-service.js","sourceRoot":"","sources":["../../src/base/editor-context-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAuH;AACvH,yCAAsE;AACtE,qCAAuG;AACvG,4EAAwE;AACxE,yDAAsD;AACtD,mCAAgC;AAMhC;;;;;;;;;;;GAWG;AAEI,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;QASO,sBAAiB,GAAuB,EAAE,CAAC;IAkEzD,CAAC;IA3DG,QAAQ,CAAC,gBAAkC;QACvC,IAAA,sBAAW,EAAC,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;IAC1D,CAAC;IAED,UAAU,CAAC,gBAAkC;QACzC,IAAA,iBAAM,EAAC,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;IACrD,CAAC;IAED,GAAG,CAAC,IAAW;QACX,OAAO;YACH,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,EAAE,CAAC;YAC7E,iBAAiB,EAAE,IAAI,CAAC,oBAAoB,CAAC,qBAAqB;YAClE,IAAI;SACP,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,kBAA4B,EAAE,IAAW;QACtD,OAAO;YACH,kBAAkB;YAClB,iBAAiB,EAAE,IAAI,CAAC,oBAAoB,CAAC,qBAAqB;YAClE,IAAI;SACP,CAAC;IACN,CAAC;IAED,MAAM,CAAC,MAAc;QACjB,IAAI,4BAAiB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;YAChC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;YACjC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;SAC1C;IACL,CAAC;IAES,uBAAuB,CAAC,QAAgB;QAC9C,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClG,CAAC;IAED,KAAK,CAAC,YAAY;QACd,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACrD,IAAI,IAAA,mCAAgB,EAAC,WAAW,CAAC,EAAE;YAC/B,OAAO,WAAW,CAAC,SAAS,CAAC;SAChC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;IAChD,CAAC;IAED,IAAI,gBAAgB;QAChB,OAAO,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC;IACvD,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,QAAQ,KAAK,mBAAQ,CAAC,QAAQ,CAAC;IAC/C,CAAC;CACJ,CAAA;AA1EG;IAAC,IAAA,kBAAM,EAAC,aAAK,CAAC,gBAAgB,CAAC;8BACH,oCAAgB;8DAAC;AAE7C;IAAC,IAAA,kBAAM,EAAC,8BAAoB,CAAC;8BACG,8BAAoB;kEAAC;AAErD;IAAC,IAAA,uBAAW,EAAC,aAAK,CAAC,iBAAiB,CAAC;IACpC,IAAA,oBAAQ,GAAE;;+DAC0C;AAErD;IAAC,IAAA,kBAAM,EAAC,aAAK,CAAC,mBAAmB,CAAC;;iEACwB;AAZjD,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA2EhC;AA3EY,oDAAoB"}
+{"version":3,"file":"editor-context-service.js","sourceRoot":"","sources":["../../src/base/editor-context-service.ts"],"names":[],"mappings":"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"}

package/lib/{features/tool-feedback → base/feedback}/css-feedback.d.ts

@@ -1,21 +1,5 @@
-/********************************************************************************
- * 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 } from '@eclipse-glsp/protocol';
-import { CommandExecutionContext, SModelElement, SModelRoot } from 'sprotty';
-import { FeedbackCommand } from './model';
+import { Action, CommandExecutionContext, SModelElement, SModelRoot } from '../../glsp-sprotty/index';
+import { FeedbackCommand } from './feedback-command';
 export interface ModifyCSSFeedbackAction extends Action {
     kind: typeof ModifyCSSFeedbackAction.KIND;
     elementIds?: string[];

package/lib/base/feedback/css-feedback.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"css-feedback.d.ts","sourceRoot":"","sources":["../../../src/base/feedback/css-feedback.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,aAAa,EAAE,UAAU,EAAuB,MAAM,eAAe,CAAC;AAEhH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,WAAW,uBAAwB,SAAQ,MAAM;IACnD,IAAI,EAAE,OAAO,uBAAuB,CAAC,IAAI,CAAC;IAE1C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,IAAI,sBAAsB,CAAC;IAExC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,uBAAuB,CAEjE;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,EAAE,CAAC,MAAM,GAAG,aAAa,CAAC,EAAE,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,uBAAuB,CAQrI;CACJ;AAED,qBACa,wBAAyB,SAAQ,eAAe;IAGvB,QAAQ,CAAC,MAAM,EAAE,uBAAuB;IAF1E,MAAM,CAAC,QAAQ,CAAC,IAAI,uBAAgC;gBAET,MAAM,EAAE,uBAAuB;IAI1E,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,UAAU;CAexD;AAED,oBAAY,SAAS;IACjB,OAAO,iBAAiB;IACxB,iBAAiB,2BAA2B;IAC5C,aAAa,uBAAuB;IACpC,oBAAoB,qCAAqC;IACzD,oBAAoB,qCAAqC;IACzD,cAAc,sCAAsC;IACpD,qBAAqB,uCAAuC;IAC5D,gBAAgB,0BAA0B;IAC1C,WAAW,qBAAqB;IAChC,WAAW,qBAAqB;IAChC,IAAI,cAAc;IAClB,OAAO,iBAAiB;CAC3B;AAED,wBAAgB,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,uBAAuB,CAMnF;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAEjG;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAErG"}