@eclipse-glsp/client 1.1.0-next.5a004c2.229 → 1.1.0-next.698b9de.254

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValidationDecorator = exports.IValidationDecorator = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2020-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,8 +16,7 @@ exports.ValidationDecorator = exports.IValidationDecorator = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const codicon_1 = require("sprotty/lib/utils/codicon");
-const protocol_1 = require("@eclipse-glsp/protocol");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 var IValidationDecorator;
 (function (IValidationDecorator) {
     IValidationDecorator.NO_DECORATION = {
@@ -36,18 +35,18 @@ class ValidationDecorator {
     constructor(containerElement) {
         this.containerElement = containerElement;
         this.warningClasses = ['warning'];
-        this.warningIconClasses = (0, codicon_1.codiconCSSString)('warning');
+        this.warningIconClasses = (0, _glsp_sprotty_1.codiconCSSString)('warning');
         this.errorClasses = ['error'];
-        this.errorIconClasses = (0, codicon_1.codiconCSSString)('error');
+        this.errorIconClasses = (0, _glsp_sprotty_1.codiconCSSString)('error');
         this.isValidated = false;
         this.hasValidationError = false;
     }
     decorateValidationResult(status) {
-        if (protocol_1.ValidationStatus.isError(status)) {
+        if (_glsp_sprotty_1.ValidationStatus.isError(status)) {
             this.hasValidationError = true;
             this.decorateError(status.message ? status.message : 'Error');
         }
-        else if (protocol_1.ValidationStatus.isWarning(status)) {
+        else if (_glsp_sprotty_1.ValidationStatus.isWarning(status)) {
             this.hasValidationError = false;
             this.decorateWarning(status.message ? status.message : 'Warning');
         }

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

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

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

@@ -1,6 +1,5 @@
-import { CommandStack, IActionDispatcher, SModelRoot } from 'sprotty';
+import { CommandStack, SModelRoot } from '../glsp-sprotty/index';
 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,eAAe,CAAC;AAEzD,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 {
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+let GLSPCommandStack = class GLSPCommandStack extends _glsp_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,iDAAyD;AAGzD,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,4BAAY;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 { 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];
+import { ContainerConfiguration } from '../glsp-sprotty/index';
+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,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EACH,sBAAsB,EAazB,MAAM,eAAe,CAAC;AAuBvB,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,10 +15,9 @@
  * 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;
-const protocol_1 = require("@eclipse-glsp/protocol");
+exports.createClientContainer = exports.initializeDiagramContainer = exports.DEFAULT_MODULES = void 0;
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
 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");
@@ -33,21 +32,22 @@ 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_15 = require("../features/svg-metadata/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,
-    sprotty_1.buttonModule,
-    sprotty_1.edgeIntersectionModule,
-    sprotty_1.edgeLayoutModule,
-    sprotty_1.expandModule,
+    _glsp_sprotty_1.defaultModule,
+    di_config_21.default,
+    _glsp_sprotty_1.buttonModule,
+    _glsp_sprotty_1.edgeIntersectionModule,
+    _glsp_sprotty_1.edgeLayoutModule,
+    _glsp_sprotty_1.expandModule,
     di_config_7.default,
-    sprotty_1.fadeModule,
+    _glsp_sprotty_1.fadeModule,
     di_config_1.default,
     di_config_2.default,
     di_config_3.default,
@@ -57,25 +57,26 @@ exports.DEFAULT_MODULES = [
     di_config_11.default,
     di_config_13.default,
     di_config_4.glspServerCopyPasteModule,
-    di_config_19.default,
-    sprotty_1.labelEditUiModule,
+    di_config_20.default,
+    _glsp_sprotty_1.labelEditUiModule,
     di_config_10.default,
-    di_config_18.markerNavigatorModule,
+    di_config_19.markerNavigatorModule,
     di_config_8.default,
-    sprotty_1.modelSourceModule,
+    _glsp_sprotty_1.modelSourceModule,
     di_config_14.default,
-    di_config_12.navigationModule,
-    sprotty_1.openModule,
+    di_config_12.default,
+    _glsp_sprotty_1.openModule,
+    di_config_17.default,
+    _glsp_sprotty_1.routingModule,
     di_config_16.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_18.toolsModule,
+    di_config_18.enableDefaultToolsOnFocusLossModule,
+    di_config_19.validationModule,
+    _glsp_sprotty_1.zorderModule,
+    di_config_15.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 +98,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, _glsp_sprotty_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 +126,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,yCAAuD;AACvD,iDAcuB;AACvB,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,mEAAmE;AACnE,oEAAqE;AACrE,mEAAmE;AACnE,4DAA+F;AAC/F,iEAA2F;AAC3F,+DAAgE;AAChE,4CAA4C;AAE/B,QAAA,eAAe,GAAG;IAC3B,6BAAa;IACb,oBAAiB;IACjB,4BAAY;IACZ,sCAAsB;IACtB,gCAAgB;IAChB,4BAAY;IACZ,mBAAgB;IAChB,0BAAU;IACV,mBAAgB;IAChB,mBAAwB;IACxB,mBAAqB;IACrB,mBAAoB;IACpB,mBAAmB;IACnB,mBAAe;IACf,oBAAmB;IACnB,oBAAgB;IAChB,qCAAyB;IACzB,oBAAkB;IAClB,iCAAiB;IACjB,oBAAY;IACZ,kCAAqB;IACrB,mBAAgB;IAChB,iCAAiB;IACjB,oBAAwB;IACxB,oBAAgB;IAChB,0BAAU;IACV,oBAAiB;IACjB,6BAAa;IACb,oBAAkB;IAClB,wBAAW;IACX,gDAAmC;IACnC,6BAAgB;IAChB,4BAAY;IACZ,oBAAiB;CACX,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,SAAgB,0BAA0B,CAAC,SAAoB,EAAE,GAAG,sBAA8C;IAC9G,OAAO,IAAA,mCAAmB,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
@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { InitializeResult } from '@eclipse-glsp/protocol';
 import '@vscode/codicons/dist/codicon.css';
 import { Container, ContainerModule } from 'inversify';
+import { InitializeResult } from '../glsp-sprotty/index';
 import '../../css/glsp-sprotty.css';
 declare const defaultGLSPModule: ContainerModule;
 export default defaultGLSPModule;

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

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../src/base/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,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,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAMH,gBAAgB,EAKnB,MAAM,eAAe,CAAC;AACvB,OAAO,4BAA4B,CAAC;AAapC,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
@@ -16,10 +16,9 @@ exports.configureServerActions = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 require("@vscode/codicons/dist/codicon.css");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
 require("../../css/glsp-sprotty.css");
 const action_dispatcher_1 = require("./action-dispatcher");
 const focus_change_action_1 = require("./actions/focus-change-action");
@@ -31,12 +30,11 @@ const model_registry_1 = require("./model/model-registry");
 const update_model_command_1 = require("./model/update-model-command");
 const selection_clearing_mouse_listener_1 = require("./selection-clearing-mouse-listener");
 const glsp_tool_manager_1 = require("./tool-manager/glsp-tool-manager");
-const types_1 = require("./types");
 const view_registry_1 = require("./view/view-registry");
 const defaultGLSPModule = new inversify_1.ContainerModule((bind, _unbind, isBound, rebind) => {
     const context = { bind, _unbind, isBound, rebind };
     bind(editor_context_service_1.EditorContextService).toSelf().inSingletonScope();
-    bind(types_1.TYPES.IEditorContextServiceProvider).toProvider(ctx => () => new Promise((resolve, reject) => {
+    bind(_glsp_sprotty_1.TYPES.IEditorContextServiceProvider).toProvider(ctx => () => new Promise((resolve, reject) => {
         if (ctx.container.isBound(editor_context_service_1.EditorContextService)) {
             resolve(ctx.container.get(editor_context_service_1.EditorContextService));
         }
@@ -44,22 +42,22 @@ const defaultGLSPModule = new inversify_1.ContainerModule((bind, _unbind, isBoun
             reject();
         }
     }));
-    (0, sprotty_1.configureActionHandler)(context, protocol_1.SetEditModeAction.KIND, editor_context_service_1.EditorContextService);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.SetEditModeAction.KIND, editor_context_service_1.EditorContextService);
     bind(focus_tracker_1.FocusTracker).toSelf().inSingletonScope();
-    (0, sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, focus_tracker_1.FocusTracker);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, focus_change_action_1.FocusStateChangedAction.KIND, focus_tracker_1.FocusTracker);
     // Model update initialization ------------------------------------
-    (0, sprotty_1.configureCommand)(context, update_model_command_1.FeedbackAwareUpdateModelCommand);
-    (0, sprotty_1.configureActionHandler)(context, sprotty_1.SetModelCommand.KIND, update_model_command_1.SetModelActionHandler);
-    bind(types_1.TYPES.MouseListener).to(selection_clearing_mouse_listener_1.SelectionClearingMouseListener);
-    rebind(types_1.TYPES.ICommandStack).to(command_stack_1.GLSPCommandStack);
+    (0, _glsp_sprotty_1.configureCommand)(context, update_model_command_1.FeedbackAwareUpdateModelCommand);
+    (0, _glsp_sprotty_1.configureActionHandler)(context, _glsp_sprotty_1.SetModelCommand.KIND, update_model_command_1.SetModelActionHandler);
+    (0, _glsp_sprotty_1.bindAsService)(context, _glsp_sprotty_1.TYPES.MouseListener, selection_clearing_mouse_listener_1.SelectionClearingMouseListener);
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.ICommandStack).to(command_stack_1.GLSPCommandStack);
     bind(glsp_tool_manager_1.GLSPToolManager).toSelf().inSingletonScope();
-    rebind(types_1.TYPES.IToolManager).toService(glsp_tool_manager_1.GLSPToolManager);
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.IToolManager).toService(glsp_tool_manager_1.GLSPToolManager);
     bind(action_dispatcher_1.GLSPActionDispatcher).toSelf().inSingletonScope();
-    rebind(types_1.TYPES.IActionDispatcher).toService(action_dispatcher_1.GLSPActionDispatcher);
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.IActionDispatcher).toService(action_dispatcher_1.GLSPActionDispatcher);
     bind(model_initialization_constraint_1.ModelInitializationConstraint).to(model_initialization_constraint_1.DefaultModelInitializationConstraint).inSingletonScope();
     // support re-registration of model elements and views
-    rebind(types_1.TYPES.SModelRegistry).to(model_registry_1.GLSPModelRegistry).inSingletonScope();
-    rebind(types_1.TYPES.ViewRegistry).to(view_registry_1.GLSPViewRegistry).inSingletonScope();
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.SModelRegistry).to(model_registry_1.GLSPModelRegistry).inSingletonScope();
+    (0, _glsp_sprotty_1.bindOrRebind)(context, _glsp_sprotty_1.TYPES.ViewRegistry).to(view_registry_1.GLSPViewRegistry).inSingletonScope();
 });
 exports.default = defaultGLSPModule;
 /**
@@ -70,8 +68,8 @@ exports.default = defaultGLSPModule;
  * @param container The di container.
  */
 async function configureServerActions(result, diagramType, container) {
-    const modelSource = container.get(types_1.TYPES.ModelSource);
-    const actionHandlerRegistry = container.get(sprotty_1.ActionHandlerRegistry);
+    const modelSource = container.get(_glsp_sprotty_1.TYPES.ModelSource);
+    const actionHandlerRegistry = container.get(_glsp_sprotty_1.ActionHandlerRegistry);
     const serverActions = result.serverActions[diagramType];
     if (serverActions.length === 0) {
         throw new Error(`No server-handled actions could be derived from the initialize result for diagramType: ${diagramType}!`);

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

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

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
-import { MouseListener, SModelElement } from 'sprotty';
+import { Action, MouseListener, SModelElement } from '../glsp-sprotty/index';
 /**
  * A mouse listener that is aware of prior mouse dragging.
  *

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

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

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

@@ -1,7 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DragAwareMouseListener = void 0;
-const sprotty_1 = require("sprotty");
+/********************************************************************************
+ * Copyright (c) 2019-2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
 /**
  * A mouse listener that is aware of prior mouse dragging.
  *
@@ -10,7 +25,7 @@ const sprotty_1 = require("sprotty");
  * `draggingMouseUp` and/or `nonDraggingMouseUp` to react to only these specific kinds
  * of mouse up events.
  */
-class DragAwareMouseListener extends sprotty_1.MouseListener {
+class DragAwareMouseListener extends _glsp_sprotty_1.MouseListener {
     constructor() {
         super(...arguments);
         this._isMouseDown = false;

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

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

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

@@ -1,23 +1,7 @@
-/********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
-import { Action, Args, EditorContext } from '@eclipse-glsp/protocol';
-import { IActionHandler, ModelSource, MousePositionTracker, SModelElement, SModelRoot } from 'sprotty';
+import { Action, Args, EditorContext, IActionHandler, ModelSource, MousePositionTracker, SModelElement, SModelRoot } from '../glsp-sprotty/index';
 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 +26,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":"AAgBA,OAAO,EACH,MAAM,EACN,IAAI,EAEJ,aAAa,EACb,cAAc,EACd,WAAW,EACX,oBAAoB,EACpB,aAAa,EACb,UAAU,EAKb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAGxE,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"}