@eclipse-glsp/client 1.1.0-next.5a004c2.229 → 1.1.0-next.6c2f3cc.244

package/{lib/features/change-bounds/snap.spec.d.ts → css/autocomplete-palette.css}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,5 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export {};
-//# sourceMappingURL=snap.spec.d.ts.map
+
+.autocomplete-palette {
+    position: absolute;
+    left: 20px;
+    top: 20px;
+    width: 400px;
+}

package/css/decoration.css

@@ -39,4 +39,4 @@
 .sprotty-issue.sprotty-info {
     fill: var(--glsp-info-foreground);
     background-color: var(--glsp-info-foreground);
-}
+}

package/css/glsp-sprotty.css

@@ -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
@@ -254,3 +254,18 @@
     fill: transparent;
     width: var(--theia-scrollbar-rail-width);
 }
+
+.search-hidden {
+    opacity: 0.2;
+}
+
+.search-highlighted .sprotty-node,
+.search-highlighted .sprotty-edge {
+    stroke-width: 1.5px;
+    stroke-width: 2px;
+    stroke-dashoffset: 5;
+    stroke-dasharray: 5, 5;
+    stroke-linecap: round;
+    stroke: rgb(218, 89, 15) !important;
+    stroke: #130bf7 !important;
+}

package/lib/base/auto-complete/auto-complete-widget.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
@@ -23,6 +23,7 @@ export interface AutoCompleteSettings {
     readonly debounceWaitMs?: number;
     readonly showOnFocus?: boolean;
 }
+export type CloseReason = 'submission' | 'blur' | 'escape';
 export interface InputValidator {
     validate(input: string): Promise<ValidationStatus>;
 }
@@ -38,6 +39,10 @@ export interface SuggestionSubmitHandler {
 export interface TextSubmitHandler {
     executeFromTextOnlyInput(input: string): void;
 }
+export interface AutoCompleteWidgetOptions {
+    visibleSuggestionsChanged?: (suggestions: LabeledAction[]) => void;
+    selectedSuggestionChanged?: (suggestion?: LabeledAction) => void;
+}
 /**
  * The `AutoCompleteWidget` is a reusable UI element that provides a text input supporting auto-completion,
  * validation, validation messages, etc.
@@ -49,8 +54,9 @@ export declare class AutoCompleteWidget {
     autoSuggestionSettings: AutoCompleteSettings;
     suggestionProvider: SuggestionProvider;
     suggestionSubmitHandler: SuggestionSubmitHandler;
-    protected notifyClose: () => void;
+    protected notifyClose: (reason: CloseReason) => void;
     protected logger?: ILogger | undefined;
+    protected options?: AutoCompleteWidgetOptions | undefined;
     loadingIndicatorClasses: string[];
     protected containerElement: HTMLElement;
     protected inputElement: HTMLInputElement;
@@ -61,7 +67,7 @@ export declare class AutoCompleteWidget {
     protected inputValidator?: InputValidator;
     protected validationDecorator: IValidationDecorator;
     protected textSubmitHandler?: TextSubmitHandler;
-    constructor(autoSuggestionSettings: AutoCompleteSettings, suggestionProvider: SuggestionProvider, suggestionSubmitHandler: SuggestionSubmitHandler, notifyClose?: () => void, logger?: ILogger | undefined);
+    constructor(autoSuggestionSettings: AutoCompleteSettings, suggestionProvider: SuggestionProvider, suggestionSubmitHandler: SuggestionSubmitHandler, notifyClose?: (reason: CloseReason) => void, logger?: ILogger | undefined, options?: AutoCompleteWidgetOptions | undefined);
     configureValidation(inputValidator: InputValidator, validationDecorator?: IValidationDecorator): void;
     configureTextSubmitHandler(textSubmitHandler: TextSubmitHandler): void;
     initialize(containerElement: HTMLElement): void;
@@ -77,7 +83,7 @@ export declare class AutoCompleteWidget {
     protected doUpdateSuggestions(text: string, root: Readonly<SModelRoot>, ...contextElementIds: string[]): Promise<LabeledAction[]>;
     protected onLoaded(_success: 'success' | 'error'): void;
     protected renderSuggestions(item: LabeledAction, value: string): HTMLDivElement;
-    protected espaceForRegExp(value: string): string;
+    protected escapeForRegExp(value: string): string;
     protected renderIcon(itemElement: HTMLDivElement, icon: string): void;
     protected filterActions(filterText: string, actions: LabeledAction[]): LabeledAction[];
     protected onSelect(item: LabeledAction): void;

package/lib/base/auto-complete/auto-complete-widget.d.ts.map

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

package/lib/base/auto-complete/auto-complete-widget.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toActionArray = exports.AutoCompleteWidget = 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
@@ -34,12 +34,13 @@ const configureAutocomplete = require('autocompleter');
 class AutoCompleteWidget {
     constructor(autoSuggestionSettings, suggestionProvider, suggestionSubmitHandler, 
     // eslint-disable-next-line @typescript-eslint/no-empty-function
-    notifyClose = () => { }, logger) {
+    notifyClose = () => { }, logger, options) {
         this.autoSuggestionSettings = autoSuggestionSettings;
         this.suggestionProvider = suggestionProvider;
         this.suggestionSubmitHandler = suggestionSubmitHandler;
         this.notifyClose = notifyClose;
         this.logger = logger;
+        this.options = options;
         this.loadingIndicatorClasses = (0, sprotty_1.codiconCSSClasses)('loading', false, true, ['loading']);
         this.validationDecorator = validation_decorator_1.IValidationDecorator.NO_DECORATION;
     }
@@ -64,12 +65,16 @@ class AutoCompleteWidget {
         inputElement.autocomplete = 'false';
         inputElement.style.width = '100%';
         inputElement.addEventListener('keydown', event => this.handleKeyDown(event));
-        inputElement.addEventListener('blur', () => window.setTimeout(() => this.notifyClose(), 200));
+        inputElement.addEventListener('blur', () => {
+            if (this.containerElement.style.visibility !== 'hidden') {
+                window.setTimeout(() => this.notifyClose('blur'), 200);
+            }
+        });
         return inputElement;
     }
     handleKeyDown(event) {
         if ((0, keyboard_1.matchesKeystroke)(event, 'Escape')) {
-            this.notifyClose();
+            this.notifyClose('escape');
             return;
         }
         if ((0, keyboard_1.matchesKeystroke)(event, 'Enter') && !this.isInputElementChanged() && this.isSuggestionAvailable()) {
@@ -87,7 +92,7 @@ class AutoCompleteWidget {
         }
         if (this.textSubmitHandler) {
             this.executeFromTextOnlyInput();
-            this.notifyClose();
+            this.notifyClose('submission');
         }
     }
     isInputElementChanged() {
@@ -121,17 +126,31 @@ class AutoCompleteWidget {
         };
     }
     customizeInputElement(input, inputRect, container, maxHeight) {
+        var _a;
         // move container into our UIExtension container as this is already positioned correctly
         if (this.containerElement) {
             this.containerElement.appendChild(container);
+            if (this.options && this.options.selectedSuggestionChanged) {
+                const selectedElement = container.querySelector('.selected');
+                // eslint-disable-next-line no-null/no-null
+                if (selectedElement !== null && selectedElement !== undefined) {
+                    const index = Array.from(container.children).indexOf(selectedElement);
+                    this.options.selectedSuggestionChanged((_a = this.contextActions) === null || _a === void 0 ? void 0 : _a[index]);
+                }
+                else {
+                    this.options.selectedSuggestionChanged(undefined);
+                }
+            }
         }
     }
     updateSuggestions(update, text, root, ...contextElementIds) {
         this.onLoading();
         this.doUpdateSuggestions(text, root)
             .then(actions => {
+            var _a, _b;
             this.contextActions = this.filterActions(text, actions);
             update(this.contextActions);
+            (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.visibleSuggestionsChanged) === null || _b === void 0 ? void 0 : _b.call(_a, this.contextActions);
             this.onLoaded('success');
         })
             .catch(reason => {
@@ -162,15 +181,15 @@ class AutoCompleteWidget {
     }
     renderSuggestions(item, value) {
         const itemElement = document.createElement('div');
-        const wordMatcher = this.espaceForRegExp(value).split(' ').join('|');
+        const wordMatcher = this.escapeForRegExp(value).split(' ').join('|');
         const regex = new RegExp(wordMatcher, 'gi');
         if (item.icon) {
             this.renderIcon(itemElement, item.icon);
         }
-        itemElement.innerHTML += item.label.replace(regex, match => '<em>' + match + '</em>');
+        itemElement.innerHTML += item.label.replace(regex, match => '<em>' + match + '</em>').replace(/ /g, '&nbsp;');
         return itemElement;
     }
-    espaceForRegExp(value) {
+    escapeForRegExp(value) {
         return value.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
     }
     renderIcon(itemElement, icon) {
@@ -191,7 +210,7 @@ class AutoCompleteWidget {
         }
         else {
             this.executeFromSuggestion(item);
-            this.notifyClose();
+            this.notifyClose('submission');
         }
     }
     validateInputIfNoContextActions() {

package/lib/base/auto-complete/auto-complete-widget.js.map

@@ -1 +1 @@
-{"version":3,"file":"auto-complete-widget.js","sourceRoot":"","sources":["../../../src/base/auto-complete/auto-complete-widget.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auto-complete-widget.js","sourceRoot":"","sources":["../../../src/base/auto-complete/auto-complete-widget.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAiF;AAEjF,qCAAiE;AACjE,yDAAqD;AACrD,yDAA8D;AAC9D,mEAA4D;AAC5D,iEAA8D;AAmC9D,8DAA8D;AAC9D,MAAM,qBAAqB,GAA0E,OAAO,CAAC,eAAe,CAAC,CAAC;AAE9H;;;;;;GAMG;AACH,MAAa,kBAAkB;IAe3B,YACW,sBAA4C,EAC5C,kBAAsC,EACtC,uBAAgD;IACvD,gEAAgE;IACtD,cAA6C,GAAG,EAAE,GAAE,CAAC,EACrD,MAAgB,EAChB,OAAmC;QANtC,2BAAsB,GAAtB,sBAAsB,CAAsB;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAE7C,gBAAW,GAAX,WAAW,CAA0C;QACrD,WAAM,GAAN,MAAM,CAAU;QAChB,YAAO,GAAP,OAAO,CAA4B;QArBjD,4BAAuB,GAAG,IAAA,2BAAiB,EAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAUvE,wBAAmB,GAAyB,2CAAoB,CAAC,aAAa,CAAC;IAYtF,CAAC;IAEJ,mBAAmB,CACf,cAA8B,EAC9B,sBAA4C,2CAAoB,CAAC,aAAa;QAE9E,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACnD,CAAC;IAED,0BAA0B,CAAC,iBAAoC;QAC3D,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAED,UAAU,CAAC,gBAA6B;QACpC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9C,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACrD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;IACtD,CAAC;IAES,kBAAkB;QACxB,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACrD,YAAY,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;QACzC,YAAY,CAAC,UAAU,GAAG,KAAK,CAAC;QAChC,YAAY,CAAC,cAAc,GAAG,OAAO,CAAC;QACtC,YAAY,CAAC,YAAY,GAAG,OAAO,CAAC;QACpC,YAAY,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC;QAClC,YAAY,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7E,YAAY,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE;YACvC,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAE;gBACrD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;aAC1D;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC;IACxB,CAAC;IAES,aAAa,CAAC,KAAoB;QACxC,IAAI,IAAA,2BAAgB,EAAC,KAAK,EAAE,QAAQ,CAAC,EAAE;YACnC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC3B,OAAO;SACV;QACD,IAAI,IAAA,2BAAgB,EAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;YACnG,OAAO;SACV;QACD,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;YAC9B,IAAI,CAAC,2CAA2C,EAAE,CAAC;SACtD;QACD,IAAI,CAAC,IAAA,2BAAgB,EAAC,KAAK,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;YACnE,OAAO;SACV;QACD,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,EAAE;YAC3C,KAAK,CAAC,wBAAwB,EAAE,CAAC;YACjC,OAAO;SACV;QACD,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAChC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;SAClC;IACL,CAAC;IAES,qBAAqB;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,KAAK,IAAI,CAAC,eAAe,CAAC;IAC5D,CAAC;IAES,2CAA2C;QACjD,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,IAA0B,EAAE,GAAG,iBAA2B;QAC3D,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,IAAI,CAAC,kBAAkB,GAAG,qBAAqB,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;QAC/C,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACvE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAES,oBAAoB,CAAC,IAA0B;QACrD,OAAO;YACH,KAAK,EAAE,IAAI,CAAC,YAAY;YACxB,QAAQ,EAAE,IAAI,CAAC,sBAAsB,CAAC,oBAAoB;YAC1D,SAAS,EAAE,IAAI,CAAC,sBAAsB,CAAC,gBAAgB;YACvD,WAAW,EAAE,IAAI,CAAC,sBAAsB,CAAC,WAAW;YACpD,cAAc,EAAE,IAAI,CAAC,sBAAsB,CAAC,cAAc;YAC1D,SAAS,EAAE,CAAC,CAAC;YACb,KAAK,EAAE,CAAC,IAAY,EAAE,MAAwC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC;YAC7G,QAAQ,EAAE,CAAC,IAAmB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACtD,MAAM,EAAE,CAAC,IAAmB,EAAE,YAAoB,EAA8B,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,YAAY,CAAC;YAC7H,SAAS,EAAE,CAAC,KAAuB,EAAE,SAAkB,EAAE,SAAyB,EAAE,SAAiB,EAAE,EAAE;gBACrG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YACvE,CAAC;SACJ,CAAC;IACN,CAAC;IAES,qBAAqB,CAAC,KAAuB,EAAE,SAAkB,EAAE,SAAyB,EAAE,SAAiB;;QACrH,wFAAwF;QACxF,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACvB,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAE7C,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,yBAAyB,EAAE;gBACxD,MAAM,eAAe,GAAG,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;gBAC7D,2CAA2C;gBAC3C,IAAI,eAAe,KAAK,IAAI,IAAI,eAAe,KAAK,SAAS,EAAE;oBAC3D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;oBACtE,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,MAAA,IAAI,CAAC,cAAc,0CAAG,KAAK,CAAC,CAAC,CAAC;iBACxE;qBAAM;oBACH,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;iBACrD;aACJ;SACJ;IACL,CAAC;IAES,iBAAiB,CACvB,MAAwC,EACxC,IAAY,EACZ,IAA0B,EAC1B,GAAG,iBAA2B;QAE9B,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC;aAC/B,IAAI,CAAC,OAAO,CAAC,EAAE;;YACZ,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5B,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,yBAAyB,mDAAG,IAAI,CAAC,cAAc,CAAC,CAAC;YAC/D,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,EAAE;YACZ,IAAI,IAAI,CAAC,MAAM,EAAE;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,8BAA8B,EAAE,MAAM,CAAC,CAAC;aACnE;YACD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACX,CAAC;IAES,SAAS;QACf,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;YAChF,OAAO;SACV;QACD,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACrE,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC7D,CAAC;IAES,mBAAmB,CAAC,IAAY,EAAE,IAA0B,EAAE,GAAG,iBAA2B;QAClG,OAAO,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAES,QAAQ,CAAC,QAA6B;QAC5C,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;YACvD,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC5D;QACD,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC;QACtC,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACvC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;IACnD,CAAC;IAES,iBAAiB,CAAC,IAAmB,EAAE,KAAa;QAC1D,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;SAC3C;QACD,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,GAAG,KAAK,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC9G,OAAO,WAAW,CAAC;IACvB,CAAC;IAES,eAAe,CAAC,KAAa;QACnC,OAAO,KAAK,CAAC,OAAO,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;IAES,UAAU,CAAC,WAA2B,EAAE,IAAY;QAC1D,WAAW,CAAC,SAAS,IAAI,qBAAqB,IAAI,WAAW,CAAC;IAClE,CAAC;IAES,aAAa,CAAC,UAAkB,EAAE,OAAwB;QAChE,OAAO,IAAA,kBAAO,EACV,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACzC,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1C,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/E,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAES,QAAQ,CAAC,IAAmB;QAClC,IAAI,yCAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;YAC5B,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;YACpC,oDAAoD;YACpD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAChF;aAAM;YACH,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;SAClC;IACL,CAAC;IAES,+BAA+B;QACrC,IAAI,IAAI,CAAC,qCAAqC,EAAE,EAAE;YAC9C,IAAI,CAAC,aAAa,EAAE,CAAC;SACxB;aAAM;YACH,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;SACtC;IACL,CAAC;IAEO,qCAAqC;QACzC,OAAO,CACH,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7B,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAC9H,CAAC;IACN,CAAC;IAES,qBAAqB;QAC3B,OAAO,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,aAAa;QACT,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,CAAC,cAAc;iBACd,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;iBACjC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;iBACzE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAC;SAChE;IACL,CAAC;IAES,2BAA2B,CAAC,KAAY;QAC9C,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,0BAA0B,EAAE,KAAK,CAAC,CAAC;SAC9D;QACD,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;IACvC,CAAC;IAES,qBAAqB,CAAC,KAAwC;QACpE,IAAI,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IAES,wBAAwB;QAC9B,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SAC5E;IACL,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,OAAO;QACH,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,kBAAkB,EAAE;YACzB,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;SACrC;IACL,CAAC;CACJ;AApRD,gDAoRC;AAED,SAAgB,aAAa,CAAC,KAAwC;IAClE,IAAI,wBAAa,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,KAAK,CAAC,OAAO,CAAC;KACxB;SAAM,IAAI,iBAAM,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,CAAC,KAAK,CAAC,CAAC;KAClB;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAPD,sCAOC"}

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

@@ -1,6 +1,5 @@
-import { CommandStack, IActionDispatcher, SModelRoot } from 'sprotty';
+import { CommandStack, SModelRoot } from 'sprotty';
 export declare class GLSPCommandStack extends CommandStack {
-    protected actionDispatcher: () => Promise<IActionDispatcher>;
     undo(): Promise<SModelRoot>;
     redo(): Promise<SModelRoot>;
 }

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":"AAiBA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGtE,qBACa,gBAAiB,SAAQ,YAAY;IACL,SAAS,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAE7F,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IAK3B,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;CAIvC"}
+{"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"}

package/lib/base/command-stack.js

@@ -5,13 +5,10 @@ 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;
 /********************************************************************************
- * 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
@@ -25,24 +22,18 @@ exports.GLSPCommandStack = 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 types_1 = require("./types");
 let GLSPCommandStack = class GLSPCommandStack extends sprotty_1.CommandStack {
     undo() {
-        this.actionDispatcher().then(dispatcher => dispatcher.dispatch(protocol_1.UndoAction.create()));
-        return this.thenUpdate();
+        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;
     }
     redo() {
-        this.actionDispatcher().then(dispatcher => dispatcher.dispatch(protocol_1.RedoAction.create()));
-        return this.thenUpdate();
+        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;
     }
 };
-__decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IActionDispatcherProvider),
-    __metadata("design:type", Function)
-], GLSPCommandStack.prototype, "actionDispatcher", void 0);
 GLSPCommandStack = __decorate([
     (0, inversify_1.injectable)()
 ], GLSPCommandStack);

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,qDAAgE;AAChE,yCAA+C;AAC/C,qCAAsE;AACtE,mCAAgC;AAGzB,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,sBAAY;IAGrC,IAAI;QACT,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,qBAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACrF,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;IAC7B,CAAC;IAEQ,IAAI;QACT,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,qBAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACrF,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;IAC7B,CAAC;CACJ,CAAA;AAXG;IAAC,IAAA,kBAAM,EAAC,aAAK,CAAC,yBAAyB,CAAC;;0DAA8D;AAD7F,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAY5B;AAZY,4CAAgB"}
+{"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"}

package/lib/base/container-modules.d.ts

@@ -13,11 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { MaybeArray } from '@eclipse-glsp/protocol';
+import { ContainerConfiguration } from '@eclipse-glsp/protocol';
 import { Container, ContainerModule } from 'inversify';
-export declare const DEFAULT_MODULES: readonly [ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule];
+export declare const DEFAULT_MODULES: readonly [ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule, ContainerModule];
 /**
- *  Creates a GLSP Diagram container with the GLSP default modules and the specified custom `modules`.
+ *  Initializes a GLSP Diagram container with the GLSP default modules and the specified custom `modules`.
  *  Additional modules can be passed as direct arguments or as part of a {@link ModuleConfiguration}.
  *  ```typescript
  *  const container= createDiagramContainer(myModule1, myModule2)
@@ -39,19 +39,11 @@ export declare const DEFAULT_MODULES: readonly [ContainerModule, ContainerModule
  * rebind(NavigationTargetResolver).to(MyNavigationTargetResolver);
  * ```
  *
- * @param customModules Custom modules to be loaded in addition to the default modules and/or default modules that should be excluded.
- * @param options Options to customize the module loading
- * @returns The created container.
- */
-export declare function createDiagramContainer(...customModules: Array<ContainerModule | ModuleConfiguration>): Container;
-/**
- * Can be passed to the {@link createDiagramContainer} utility function to configure additional modules or
- *  remove (i.e. not load) default modules.
+ * @param containerConfiguration
+ *          Custom modules to be loaded in addition to the default modules and/or default modules that should be excluded.
+ * @returns The initialized container.
  */
-export interface ModuleConfiguration {
-    add?: MaybeArray<ContainerModule>;
-    remove?: MaybeArray<ContainerModule>;
-}
+export declare function initializeDiagramContainer(container: Container, ...containerConfiguration: ContainerConfiguration): Container;
 /**
  * Creates a GLSP Client container with the GLSP default modules and the specified custom `modules`.
  *
@@ -72,7 +64,7 @@ export interface ModuleConfiguration {
  * ```
  * @param modules Custom modules to be loaded in addition to the default modules.
  * @returns The created container.
- * @deprecated Please use `createDiagramContainer` from `@eclipse-glsp/client` instead
+ * @deprecated Please use `initializeDiagramContainer` from `@eclipse-glsp/client` instead
  */
 export declare function createClientContainer(...modules: ContainerModule[]): Container;
 //# sourceMappingURL=container-modules.d.ts.map

package/lib/base/container-modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container-modules.d.ts","sourceRoot":"","sources":["../../src/base/container-modules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAwB,UAAU,EAAU,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAmCvD,eAAO,MAAM,eAAe,4jBAkClB,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,aAAa,EAAE,KAAK,CAAC,eAAe,GAAG,mBAAmB,CAAC,GAAG,SAAS,CAkBhH;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAChC,GAAG,CAAC,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;CACxC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS,CAE9E"}
+{"version":3,"file":"container-modules.d.ts","sourceRoot":"","sources":["../../src/base/container-modules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,sBAAsB,EAAuB,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAoCvD,eAAO,MAAM,eAAe,6kBAmClB,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAE7H;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS,CAE9E"}

package/lib/base/container-modules.js

@@ -15,67 +15,69 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClientContainer = exports.createDiagramContainer = exports.DEFAULT_MODULES = void 0;
+exports.createClientContainer = exports.initializeDiagramContainer = exports.DEFAULT_MODULES = void 0;
 const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
 const sprotty_1 = require("sprotty");
-const di_config_1 = require("../features/bounds/di.config");
-const di_config_2 = require("../features/command-palette/di.config");
-const di_config_3 = require("../features/context-menu/di.config");
-const di_config_4 = require("../features/copy-paste/di.config");
-const di_config_5 = require("../features/decoration/di.config");
-const di_config_6 = require("../features/edit-label/di.config");
-const di_config_7 = require("../features/export/di.config");
-const di_config_8 = require("../features/hints/di.config");
-const di_config_9 = require("../features/hover/di.config");
-const di_config_10 = require("../features/layout/di.config");
-const di_config_11 = require("../features/mouse-tool/di.config");
-const di_config_12 = require("../features/navigation/di.config");
-const di_config_13 = require("../features/select/di.config");
-const di_config_14 = require("../features/source-model-watcher/di.config");
-const di_config_15 = require("../features/tool-feedback/di.config");
-const di_config_16 = require("../features/tool-palette/di.config");
-const di_config_17 = require("../features/tools/di.config");
-const di_config_18 = require("../features/validation/di.config");
-const di_config_19 = require("../features/viewport/di.config");
-const di_config_20 = require("./di.config");
+const di_config_1 = require("../features/svg-metadata/di.config");
+const di_config_2 = require("../features/bounds/di.config");
+const di_config_3 = require("../features/command-palette/di.config");
+const di_config_4 = require("../features/context-menu/di.config");
+const di_config_5 = require("../features/copy-paste/di.config");
+const di_config_6 = require("../features/decoration/di.config");
+const di_config_7 = require("../features/edit-label/di.config");
+const di_config_8 = require("../features/export/di.config");
+const di_config_9 = require("../features/hints/di.config");
+const di_config_10 = require("../features/hover/di.config");
+const di_config_11 = require("../features/layout/di.config");
+const di_config_12 = require("../features/mouse-tool/di.config");
+const di_config_13 = require("../features/navigation/di.config");
+const di_config_14 = require("../features/select/di.config");
+const di_config_15 = require("../features/source-model-watcher/di.config");
+const di_config_16 = require("../features/tool-feedback/di.config");
+const di_config_17 = require("../features/tool-palette/di.config");
+const di_config_18 = require("../features/tools/di.config");
+const di_config_19 = require("../features/validation/di.config");
+const di_config_20 = require("../features/viewport/di.config");
+const di_config_21 = require("./di.config");
 exports.DEFAULT_MODULES = [
     sprotty_1.defaultModule,
-    di_config_20.default,
+    di_config_21.default,
     sprotty_1.buttonModule,
     sprotty_1.edgeIntersectionModule,
     sprotty_1.edgeLayoutModule,
     sprotty_1.expandModule,
-    di_config_7.default,
+    di_config_8.default,
     sprotty_1.fadeModule,
-    di_config_1.default,
     di_config_2.default,
     di_config_3.default,
-    di_config_5.default,
+    di_config_4.default,
     di_config_6.default,
-    di_config_9.default,
-    di_config_11.default,
-    di_config_13.default,
-    di_config_4.glspServerCopyPasteModule,
-    di_config_19.default,
-    sprotty_1.labelEditUiModule,
+    di_config_7.default,
     di_config_10.default,
-    di_config_18.markerNavigatorModule,
-    di_config_8.default,
-    sprotty_1.modelSourceModule,
+    di_config_12.default,
     di_config_14.default,
-    di_config_12.navigationModule,
+    di_config_5.glspServerCopyPasteModule,
+    di_config_20.default,
+    sprotty_1.labelEditUiModule,
+    di_config_11.default,
+    di_config_19.markerNavigatorModule,
+    di_config_9.default,
+    sprotty_1.modelSourceModule,
+    di_config_15.default,
+    di_config_13.default,
     sprotty_1.openModule,
-    di_config_16.default,
+    di_config_17.default,
     sprotty_1.routingModule,
-    di_config_15.default,
-    di_config_17.toolsModule,
-    di_config_17.enableDefaultToolsOnFocusLossModule,
-    di_config_18.validationModule,
-    sprotty_1.zorderModule
+    di_config_16.default,
+    di_config_18.toolsModule,
+    di_config_18.enableDefaultToolsOnFocusLossModule,
+    di_config_19.validationModule,
+    sprotty_1.zorderModule,
+    di_config_1.default
 ];
 /**
- *  Creates a GLSP Diagram container with the GLSP default modules and the specified custom `modules`.
+ *  Initializes a GLSP Diagram container with the GLSP default modules and the specified custom `modules`.
  *  Additional modules can be passed as direct arguments or as part of a {@link ModuleConfiguration}.
  *  ```typescript
  *  const container= createDiagramContainer(myModule1, myModule2)
@@ -97,30 +99,14 @@ exports.DEFAULT_MODULES = [
  * rebind(NavigationTargetResolver).to(MyNavigationTargetResolver);
  * ```
  *
- * @param customModules Custom modules to be loaded in addition to the default modules and/or default modules that should be excluded.
- * @param options Options to customize the module loading
- * @returns The created container.
+ * @param containerConfiguration
+ *          Custom modules to be loaded in addition to the default modules and/or default modules that should be excluded.
+ * @returns The initialized container.
  */
-function createDiagramContainer(...customModules) {
-    const container = new inversify_1.Container();
-    const modules = [...exports.DEFAULT_MODULES];
-    customModules.forEach(customModule => {
-        if (customModule instanceof inversify_1.ContainerModule) {
-            modules.push(customModule);
-        }
-        else {
-            if (customModule.remove) {
-                (0, protocol_1.remove)(modules, ...(0, protocol_1.asArray)(customModule.remove));
-            }
-            if (customModule.add) {
-                (0, protocol_1.distinctAdd)(modules, ...(0, protocol_1.asArray)(customModule.add));
-            }
-        }
-    });
-    container.load(...modules);
-    return container;
+function initializeDiagramContainer(container, ...containerConfiguration) {
+    return (0, protocol_1.initializeContainer)(container, ...exports.DEFAULT_MODULES, ...containerConfiguration);
 }
-exports.createDiagramContainer = createDiagramContainer;
+exports.initializeDiagramContainer = initializeDiagramContainer;
 /**
  * Creates a GLSP Client container with the GLSP default modules and the specified custom `modules`.
  *
@@ -141,10 +127,10 @@ exports.createDiagramContainer = createDiagramContainer;
  * ```
  * @param modules Custom modules to be loaded in addition to the default modules.
  * @returns The created container.
- * @deprecated Please use `createDiagramContainer` from `@eclipse-glsp/client` instead
+ * @deprecated Please use `initializeDiagramContainer` from `@eclipse-glsp/client` instead
  */
 function createClientContainer(...modules) {
-    return createDiagramContainer(...modules);
+    return initializeDiagramContainer(new inversify_1.Container(), ...modules);
 }
 exports.createClientContainer = createClientContainer;
 //# sourceMappingURL=container-modules.js.map

package/lib/base/container-modules.js.map

@@ -1 +1 @@
-{"version":3,"file":"container-modules.js","sourceRoot":"","sources":["../../src/base/container-modules.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAAkF;AAClF,yCAAuD;AACvD,qCAYiB;AACjB,4DAA4D;AAC5D,qEAA6E;AAC7E,kEAAuE;AACvE,gEAA6E;AAC7E,gEAAoE;AACpE,gEAAmE;AACnE,4DAA4D;AAC5D,2DAA2D;AAC3D,2DAA0D;AAC1D,6DAAwD;AACxD,iEAAmE;AACnE,iEAAoE;AACpE,6DAA4D;AAC5D,2EAAkF;AAClF,oEAAqE;AACrE,mEAAmE;AACnE,4DAA+F;AAC/F,iEAA2F;AAC3F,+DAAgE;AAChE,4CAA4C;AAE/B,QAAA,eAAe,GAAG;IAC3B,uBAAa;IACb,oBAAiB;IACjB,sBAAY;IACZ,gCAAsB;IACtB,0BAAgB;IAChB,sBAAY;IACZ,mBAAgB;IAChB,oBAAU;IACV,mBAAgB;IAChB,mBAAwB;IACxB,mBAAqB;IACrB,mBAAoB;IACpB,mBAAmB;IACnB,mBAAe;IACf,oBAAmB;IACnB,oBAAgB;IAChB,qCAAyB;IACzB,oBAAkB;IAClB,2BAAiB;IACjB,oBAAY;IACZ,kCAAqB;IACrB,mBAAgB;IAChB,2BAAiB;IACjB,oBAAwB;IACxB,6BAAgB;IAChB,oBAAU;IACV,oBAAiB;IACjB,uBAAa;IACb,oBAAkB;IAClB,wBAAW;IACX,gDAAmC;IACnC,6BAAgB;IAChB,sBAAY;CACN,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,SAAgB,sBAAsB,CAAC,GAAG,aAA2D;IACjG,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;IAElC,MAAM,OAAO,GAAG,CAAC,GAAG,uBAAe,CAAC,CAAC;IACrC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACjC,IAAI,YAAY,YAAY,2BAAe,EAAE;YACzC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC9B;aAAM;YACH,IAAI,YAAY,CAAC,MAAM,EAAE;gBACrB,IAAA,iBAAM,EAAC,OAAO,EAAE,GAAG,IAAA,kBAAO,EAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;aACpD;YACD,IAAI,YAAY,CAAC,GAAG,EAAE;gBAClB,IAAA,sBAAW,EAAC,OAAO,EAAE,GAAG,IAAA,kBAAO,EAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;aACtD;SACJ;IACL,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAC3B,OAAO,SAAS,CAAC;AACrB,CAAC;AAlBD,wDAkBC;AAWD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAgB,qBAAqB,CAAC,GAAG,OAA0B;IAC/D,OAAO,sBAAsB,CAAC,GAAG,OAAO,CAAC,CAAC;AAC9C,CAAC;AAFD,sDAEC"}
+{"version":3,"file":"container-modules.js","sourceRoot":"","sources":["../../src/base/container-modules.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,qDAAqF;AACrF,yCAAuD;AACvD,qCAYiB;AACjB,kEAAmE;AACnE,4DAA4D;AAC5D,qEAA6E;AAC7E,kEAAuE;AACvE,gEAA6E;AAC7E,gEAAoE;AACpE,gEAAmE;AACnE,4DAA4D;AAC5D,2DAA2D;AAC3D,4DAA0D;AAC1D,6DAAwD;AACxD,iEAAmE;AACnE,iEAAgE;AAChE,6DAA4D;AAC5D,2EAAkF;AAClF,oEAAqE;AACrE,mEAAmE;AACnE,4DAA+F;AAC/F,iEAA2F;AAC3F,+DAAgE;AAChE,4CAA4C;AAE/B,QAAA,eAAe,GAAG;IAC3B,uBAAa;IACb,oBAAiB;IACjB,sBAAY;IACZ,gCAAsB;IACtB,0BAAgB;IAChB,sBAAY;IACZ,mBAAgB;IAChB,oBAAU;IACV,mBAAgB;IAChB,mBAAwB;IACxB,mBAAqB;IACrB,mBAAoB;IACpB,mBAAmB;IACnB,oBAAe;IACf,oBAAmB;IACnB,oBAAgB;IAChB,qCAAyB;IACzB,oBAAkB;IAClB,2BAAiB;IACjB,oBAAY;IACZ,kCAAqB;IACrB,mBAAgB;IAChB,2BAAiB;IACjB,oBAAwB;IACxB,oBAAgB;IAChB,oBAAU;IACV,oBAAiB;IACjB,uBAAa;IACb,oBAAkB;IAClB,wBAAW;IACX,gDAAmC;IACnC,6BAAgB;IAChB,sBAAY;IACZ,mBAAiB;CACX,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,SAAgB,0BAA0B,CAAC,SAAoB,EAAE,GAAG,sBAA8C;IAC9G,OAAO,IAAA,8BAAmB,EAAC,SAAS,EAAE,GAAG,uBAAe,EAAE,GAAG,sBAAsB,CAAC,CAAC;AACzF,CAAC;AAFD,gEAEC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAgB,qBAAqB,CAAC,GAAG,OAA0B;IAC/D,OAAO,0BAA0B,CAAC,IAAI,qBAAS,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC;AACnE,CAAC;AAFD,sDAEC"}

package/lib/base/di.config.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

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,EAAE,gBAAgB,EAAqB,MAAM,wBAAwB,CAAC;AAC7E,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,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"}

package/lib/base/di.config.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureServerActions = 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
@@ -50,16 +50,16 @@ const defaultGLSPModule = new inversify_1.ContainerModule((bind, _unbind, isBoun
     // 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);
-    bind(types_1.TYPES.MouseListener).to(selection_clearing_mouse_listener_1.SelectionClearingMouseListener);
-    rebind(types_1.TYPES.ICommandStack).to(command_stack_1.GLSPCommandStack);
+    (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_tool_manager_1.GLSPToolManager).toSelf().inSingletonScope();
-    rebind(types_1.TYPES.IToolManager).toService(glsp_tool_manager_1.GLSPToolManager);
+    (0, protocol_1.bindOrRebind)(context, types_1.TYPES.IToolManager).toService(glsp_tool_manager_1.GLSPToolManager);
     bind(action_dispatcher_1.GLSPActionDispatcher).toSelf().inSingletonScope();
-    rebind(types_1.TYPES.IActionDispatcher).toService(action_dispatcher_1.GLSPActionDispatcher);
+    (0, protocol_1.bindOrRebind)(context, types_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
-    rebind(types_1.TYPES.SModelRegistry).to(model_registry_1.GLSPModelRegistry).inSingletonScope();
-    rebind(types_1.TYPES.ViewRegistry).to(view_registry_1.GLSPViewRegistry).inSingletonScope();
+    (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();
 });
 exports.default = defaultGLSPModule;
 /**