@eclipse-glsp/client 1.1.0-next.ee71b2a.218 → 1.1.0-next.f382a8e.231

package/css/decoration.css

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

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
@@ -77,7 +77,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.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
@@ -162,7 +162,7 @@ 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);
@@ -170,7 +170,7 @@ class AutoCompleteWidget {
         itemElement.innerHTML += item.label.replace(regex, match => '<em>' + match + '</em>');
         return itemElement;
     }
-    espaceForRegExp(value) {
+    escapeForRegExp(value) {
         return value.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
     }
     renderIcon(itemElement, icon) {

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,18 +13,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+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];
 /**
- *  Creates a GLSP Diagram container with the GLSP default modules and the specified custom `modules`.
- *  Default modules can be excluded using {@link ExcludeDescription}s.
- *
+ *  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)
+ *  // or
+ *  const container= createDiagramContainer({ add: [myModule1, myModule2]})
+ *  ```
+ *  Default modules can be excluded using {@link ModuleConfiguration}s.
  *  This means, you can still customize the default modules in two ways.
  *
  * First, you can exclude default modules and add a module with your custom code.
  *
  * ```typescript
- * const container = createDiagramContainer(myModule1, {exclude: modelSourceWatcherModule},myModelSourceWatcherModule );
+ * const container = createDiagramContainer({ add:myModelSourceWatcherModule, remove: modelSourceWatcherModule} );
  * ```
  *
  * Second, you can unbind or rebind implementations that are originally bound in one of the default modules.
@@ -33,17 +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 | ExcludeDescription>): Container;
-/**
- * Can be passed to the {@link createDiagramContainer} utility function to exclude (i.e. not load) a specific default module.
+ * @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 ExcludeDescription {
-    exclude: 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`.
  *
@@ -64,7 +64,7 @@ export interface ExcludeDescription {
  * ```
  * @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;AAGlF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAmCvD,eAAO,MAAM,eAAe,4jBAkClB,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,aAAa,EAAE,KAAK,CAAC,eAAe,GAAG,kBAAkB,CAAC,GAAG,SAAS,CAa/G;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,eAAe,CAAC;CAC5B;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;AAmCvD,eAAO,MAAM,eAAe,4jBAkClB,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,7 +15,7 @@
  * 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");
@@ -64,7 +64,7 @@ exports.DEFAULT_MODULES = [
     di_config_8.default,
     sprotty_1.modelSourceModule,
     di_config_14.default,
-    di_config_12.navigationModule,
+    di_config_12.default,
     sprotty_1.openModule,
     di_config_16.default,
     sprotty_1.routingModule,
@@ -75,15 +75,20 @@ exports.DEFAULT_MODULES = [
     sprotty_1.zorderModule
 ];
 /**
- *  Creates a GLSP Diagram container with the GLSP default modules and the specified custom `modules`.
- *  Default modules can be excluded using {@link ExcludeDescription}s.
- *
+ *  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)
+ *  // or
+ *  const container= createDiagramContainer({ add: [myModule1, myModule2]})
+ *  ```
+ *  Default modules can be excluded using {@link ModuleConfiguration}s.
  *  This means, you can still customize the default modules in two ways.
  *
  * First, you can exclude default modules and add a module with your custom code.
  *
  * ```typescript
- * const container = createDiagramContainer(myModule1, {exclude: modelSourceWatcherModule},myModelSourceWatcherModule );
+ * const container = createDiagramContainer({ add:myModelSourceWatcherModule, remove: modelSourceWatcherModule} );
  * ```
  *
  * Second, you can unbind or rebind implementations that are originally bound in one of the default modules.
@@ -92,25 +97,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 {
-            (0, protocol_1.remove)(modules, customModule.exclude);
-        }
-    });
-    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`.
  *
@@ -131,10 +125,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,qDAAgD;AAChD,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;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAgB,sBAAsB,CAAC,GAAG,aAA0D;IAChG,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,IAAA,iBAAM,EAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;SACzC;IACL,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAC3B,OAAO,SAAS,CAAC;AACrB,CAAC;AAbD,wDAaC;AASD;;;;;;;;;;;;;;;;;;;;;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,4DAA4D;AAC5D,qEAA6E;AAC7E,kEAAuE;AACvE,gEAA6E;AAC7E,gEAAoE;AACpE,gEAAmE;AACnE,4DAA4D;AAC5D,2DAA2D;AAC3D,2DAA0D;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,mBAAe;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;CACN,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;
 /**

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/editor-context-service.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
@@ -17,7 +17,7 @@ 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 {
-    editModeChanged(newValue: string, oldvalue: string): void;
+    editModeChanged(newValue: string, oldValue: string): void;
 }
 /**
  * The `EditorContextService` is a central injectable component that gives read-only access to
@@ -42,7 +42,7 @@ export declare class EditorContextService implements IActionHandler {
     get(args?: Args): EditorContext;
     getWithSelection(selectedElementIds: string[], args?: Args): EditorContext;
     handle(action: Action): void;
-    protected notifiyEditModeListeners(oldValue: string): void;
+    protected notifyEditModeListeners(oldValue: string): void;
     getSourceUri(): Promise<string | undefined>;
     get editMode(): string;
     get modelRoot(): Readonly<SModelRoot>;

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,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIpD,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":"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"}

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

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditorContextService = 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
@@ -71,10 +71,10 @@ let EditorContextService = class EditorContextService {
         if (protocol_1.SetEditModeAction.is(action)) {
             const oldValue = this._editMode;
             this._editMode = action.editMode;
-            this.notifiyEditModeListeners(oldValue);
+            this.notifyEditModeListeners(oldValue);
         }
     }
-    notifiyEditModeListeners(oldValue) {
+    notifyEditModeListeners(oldValue) {
         this.editModeListeners.forEach(listener => listener.editModeChanged(oldValue, this.editMode));
     }
     async getSourceUri() {

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,wBAAwB,CAAC,QAAQ,CAAC,CAAC;SAC3C;IACL,CAAC;IAES,wBAAwB,CAAC,QAAgB;QAC/C,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":";;;;;;;;;;;;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"}

package/lib/base/tool-manager/glsp-tool-manager.d.ts

@@ -1,9 +1,6 @@
 import { Tool, ToolManager } from 'sprotty';
 import { EditModeListener, EditorContextService, EditorContextServiceProvider } from '../editor-context-service';
-export interface IGLSPToolManager extends ToolManager {
-    disableEditTools(): void;
-}
-export declare class GLSPToolManager extends ToolManager implements IGLSPToolManager, EditModeListener {
+export declare class GLSPToolManager extends ToolManager implements EditModeListener {
     protected editorContext?: EditorContextService;
     tools: Tool[];
     defaultTools: Tool[];
@@ -18,5 +15,7 @@ export declare class GLSPToolManager extends ToolManager implements IGLSPToolMan
 export interface GLSPTool extends Tool {
     isEditTool: boolean;
 }
-export declare function isGLSPTool(tool: any): tool is GLSPTool;
+export declare namespace GLSPTool {
+    function is(object: unknown): object is GLSPTool;
+}
 //# sourceMappingURL=glsp-tool-manager.d.ts.map

package/lib/base/tool-manager/glsp-tool-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-tool-manager.d.ts","sourceRoot":"","sources":["../../../src/base/tool-manager/glsp-tool-manager.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAGjH,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IAEjD,gBAAgB,IAAI,IAAI,CAAC;CAC5B;AAED,qBACa,eAAgB,SAAQ,WAAY,YAAW,gBAAgB,EAAE,gBAAgB;IAC1F,SAAS,CAAC,aAAa,CAAC,EAAE,oBAAoB,CAAC;IAEA,KAAK,EAAE,IAAI,EAAE,CAAC;IACP,YAAY,EAAE,IAAI,EAAE,CAAC;IAC9B,sBAAsB,EAAE,4BAA4B,CAAC;IAGlG,SAAS,CAAC,UAAU,IAAI,IAAI;IAUnB,oBAAoB,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAM5C,aAAa,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAMrC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAcxC,gBAAgB,IAAI,IAAI;IAKxB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAU5D;AAED,MAAM,WAAW,QAAS,SAAQ,IAAI;IAClC,UAAU,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,QAAQ,CAEtD"}
+{"version":3,"file":"glsp-tool-manager.d.ts","sourceRoot":"","sources":["../../../src/base/tool-manager/glsp-tool-manager.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAGjH,qBACa,eAAgB,SAAQ,WAAY,YAAW,gBAAgB;IACxE,SAAS,CAAC,aAAa,CAAC,EAAE,oBAAoB,CAAC;IAEA,KAAK,EAAE,IAAI,EAAE,CAAC;IACP,YAAY,EAAE,IAAI,EAAE,CAAC;IAC9B,sBAAsB,EAAE,4BAA4B,CAAC;IAGlG,SAAS,CAAC,UAAU,IAAI,IAAI;IAUnB,oBAAoB,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAM5C,aAAa,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAMrC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAcxC,gBAAgB,IAAI,IAAI;IAKxB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAU5D;AAED,MAAM,WAAW,QAAS,SAAQ,IAAI;IAClC,UAAU,EAAE,OAAO,CAAC;CACvB;AAED,yBAAiB,QAAQ,CAAC;IACtB,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,QAAQ,CAQtD;CACJ"}

package/lib/base/tool-manager/glsp-tool-manager.js

@@ -9,9 +9,9 @@ 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.isGLSPTool = exports.GLSPToolManager = void 0;
+exports.GLSPTool = exports.GLSPToolManager = 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
@@ -53,7 +53,7 @@ let GLSPToolManager = class GLSPToolManager extends sprotty_1.ToolManager {
         this.disableActiveTools();
         let tools = toolIds.map(id => this.tool(id));
         if (this.editorContext && this.editorContext.isReadonly) {
-            tools = tools.filter(tool => tool && (!isGLSPTool(tool) || tool.isEditTool === false));
+            tools = tools.filter(tool => tool && (!GLSPTool.is(tool) || tool.isEditTool === false));
         }
         tools.forEach(tool => {
             if (tool !== undefined) {
@@ -64,7 +64,7 @@ let GLSPToolManager = class GLSPToolManager extends sprotty_1.ToolManager {
     }
     disableEditTools() {
         this.disableActiveTools();
-        this.enable(this.defaultTools.filter(tool => !isGLSPTool(tool) || tool.isEditTool === false).map(tool => tool.id));
+        this.enable(this.defaultTools.filter(tool => !GLSPTool.is(tool) || tool.isEditTool === false).map(tool => tool.id));
     }
     editModeChanged(oldValue, newValue) {
         if (oldValue === newValue) {
@@ -102,8 +102,15 @@ GLSPToolManager = __decorate([
     (0, inversify_1.injectable)()
 ], GLSPToolManager);
 exports.GLSPToolManager = GLSPToolManager;
-function isGLSPTool(tool) {
-    return 'isEditTool' in tool && typeof tool['isEditTool'] === 'boolean';
-}
-exports.isGLSPTool = isGLSPTool;
+var GLSPTool;
+(function (GLSPTool) {
+    function is(object) {
+        return (protocol_1.AnyObject.is(object) &&
+            (0, protocol_1.hasStringProp)(object, 'id') &&
+            (0, protocol_1.hasFunctionProp)(object, 'enable') &&
+            (0, protocol_1.hasFunctionProp)(object, 'disable') &&
+            (0, protocol_1.hasBooleanProp)(object, 'isEditTool'));
+    }
+    GLSPTool.is = is;
+})(GLSPTool = exports.GLSPTool || (exports.GLSPTool = {}));
 //# sourceMappingURL=glsp-tool-manager.js.map

package/lib/base/tool-manager/glsp-tool-manager.js.map

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

package/lib/features/bounds/di.config.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 { ContainerModule } from 'inversify';
-import '../../../css/command-palette.css';
 declare const glspBoundsModule: ContainerModule;
 export default glspBoundsModule;
 //# sourceMappingURL=di.config.d.ts.map

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

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

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * 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
@@ -15,22 +15,25 @@ 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");
-require("../../../css/command-palette.css");
 const types_1 = require("../../base/types");
+const freeform_layout_1 = require("./freeform-layout");
 const glsp_hidden_bounds_updater_1 = require("./glsp-hidden-bounds-updater");
+const hbox_layout_1 = require("./hbox-layout");
+const vbox_layout_1 = require("./vbox-layout");
 const glspBoundsModule = new inversify_1.ContainerModule((bind, _unbind, isBound, _rebind) => {
-    (0, sprotty_1.configureCommand)({ bind, isBound }, sprotty_1.SetBoundsCommand);
-    (0, sprotty_1.configureCommand)({ bind, isBound }, sprotty_1.RequestBoundsCommand);
+    const context = { bind, isBound };
+    (0, sprotty_1.configureCommand)(context, sprotty_1.SetBoundsCommand);
+    (0, sprotty_1.configureCommand)(context, sprotty_1.RequestBoundsCommand);
     bind(sprotty_1.HiddenBoundsUpdater).toSelf().inSingletonScope();
-    bind(glsp_hidden_bounds_updater_1.GLSPHiddenBoundsUpdater).toSelf().inSingletonScope();
-    bind(types_1.TYPES.HiddenVNodePostprocessor).toService(glsp_hidden_bounds_updater_1.GLSPHiddenBoundsUpdater);
+    (0, protocol_1.bindAsService)(context, types_1.TYPES.HiddenVNodePostprocessor, glsp_hidden_bounds_updater_1.GLSPHiddenBoundsUpdater);
     bind(types_1.TYPES.Layouter).to(sprotty_1.Layouter).inSingletonScope();
     bind(types_1.TYPES.LayoutRegistry).to(sprotty_1.LayoutRegistry).inSingletonScope();
-    (0, sprotty_1.configureLayout)({ bind, isBound }, sprotty_1.VBoxLayouter.KIND, sprotty_1.VBoxLayouter);
-    (0, sprotty_1.configureLayout)({ bind, isBound }, sprotty_1.HBoxLayouter.KIND, sprotty_1.HBoxLayouter);
-    (0, sprotty_1.configureLayout)({ bind, isBound }, sprotty_1.StackLayouter.KIND, sprotty_1.StackLayouter);
+    (0, sprotty_1.configureLayout)(context, sprotty_1.VBoxLayouter.KIND, vbox_layout_1.VBoxLayouterExt);
+    (0, sprotty_1.configureLayout)(context, sprotty_1.HBoxLayouter.KIND, hbox_layout_1.HBoxLayouterExt);
+    (0, sprotty_1.configureLayout)(context, freeform_layout_1.FreeFormLayouter.KIND, freeform_layout_1.FreeFormLayouter);
 });
 exports.default = glspBoundsModule;
 //# sourceMappingURL=di.config.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/bounds/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAGiB;AACjB,4CAA0C;AAC1C,4CAAyC;AACzC,6EAAuE;AAEvE,MAAM,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC7E,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,0BAAgB,CAAC,CAAC;IACtD,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,8BAAoB,CAAC,CAAC;IAC1D,IAAI,CAAC,6BAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtD,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,aAAK,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,oDAAuB,CAAC,CAAC;IACxE,IAAI,CAAC,aAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,kBAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,aAAK,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,wBAAc,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEjE,IAAA,yBAAe,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,sBAAY,CAAC,IAAI,EAAE,sBAAY,CAAC,CAAC;IACpE,IAAA,yBAAe,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,sBAAY,CAAC,IAAI,EAAE,sBAAY,CAAC,CAAC;IACpE,IAAA,yBAAe,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,uBAAa,CAAC,IAAI,EAAE,uBAAa,CAAC,CAAC;AAC1E,CAAC,CAAC,CAAC;AAEH,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/bounds/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAuD;AACvD,yCAA4C;AAC5C,qCAUiB;AACjB,4CAAyC;AACzC,uDAAqD;AACrD,6EAAuE;AACvE,+CAAgD;AAChD,+CAAgD;AAEhD,MAAM,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC7E,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,IAAA,0BAAgB,EAAC,OAAO,EAAE,0BAAgB,CAAC,CAAC;IAC5C,IAAA,0BAAgB,EAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC;IAChD,IAAI,CAAC,6BAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtD,IAAA,wBAAa,EAAC,OAAO,EAAE,aAAK,CAAC,wBAAwB,EAAE,oDAAuB,CAAC,CAAC;IAChF,IAAI,CAAC,aAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,kBAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,aAAK,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,wBAAc,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEjE,IAAA,yBAAe,EAAC,OAAO,EAAE,sBAAY,CAAC,IAAI,EAAE,6BAAe,CAAC,CAAC;IAC7D,IAAA,yBAAe,EAAC,OAAO,EAAE,sBAAY,CAAC,IAAI,EAAE,6BAAe,CAAC,CAAC;IAC7D,IAAA,yBAAe,EAAC,OAAO,EAAE,kCAAgB,CAAC,IAAI,EAAE,kCAAgB,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,kBAAe,gBAAgB,CAAC"}

package/lib/features/{layout → bounds}/freeform-layout.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@ import { BoundsData, LayoutContainer, SChildElement, SParentElement, StatefulLay
 import { AbstractLayout } from 'sprotty/lib/features/bounds/abstract-layout';
 import { AbstractLayoutOptions } from 'sprotty/lib/features/bounds/layout-options';
 /**
- * Layouts children of a container with explit X/Y positions
+ * Layouts children of a container with explicit X/Y positions
  */
 export declare class FreeFormLayouter extends AbstractLayout<AbstractLayoutOptions> {
     static KIND: string;