@eclipse-glsp/client 1.1.0-next.ee71b2a.218 → 1.1.0-next.f12aad0.255

package/lib/features/bounds/glsp-hidden-bounds-updater.js

@@ -1,6 +1,6 @@
 "use strict";
 /********************************************************************************
- * 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
@@ -25,16 +25,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPHiddenBoundsUpdater = void 0;
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const smodel_util_1 = require("../../utils/smodel-util");
 /**
  * Grabs the bounds from hidden SVG DOM elements, applies layouts, collects routes and fires {@link ComputedBoundsAction}s.
  *
  * The actions will contain the bound, alignment, and routing points of elements.
  */
-let GLSPHiddenBoundsUpdater = class GLSPHiddenBoundsUpdater extends sprotty_1.HiddenBoundsUpdater {
+let GLSPHiddenBoundsUpdater = exports.GLSPHiddenBoundsUpdater = class GLSPHiddenBoundsUpdater extends _glsp_sprotty_1.HiddenBoundsUpdater {
     constructor() {
         super(...arguments);
         this.element2route = [];
@@ -50,7 +49,8 @@ let GLSPHiddenBoundsUpdater = class GLSPHiddenBoundsUpdater extends sprotty_1.Hi
     }
     postUpdate(cause) {
         const actions = this.captureActions(() => super.postUpdate(cause));
-        actions.filter(action => protocol_1.ComputedBoundsAction.is(action))
+        actions
+            .filter(action => _glsp_sprotty_1.ComputedBoundsAction.is(action))
             .forEach(action => this.actionDispatcher.dispatch(this.enhanceAction(action)));
         this.element2route = [];
     }
@@ -72,14 +72,13 @@ let GLSPHiddenBoundsUpdater = class GLSPHiddenBoundsUpdater extends sprotty_1.Hi
     }
 };
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.EdgeRouterRegistry),
+    (0, inversify_1.inject)(_glsp_sprotty_1.EdgeRouterRegistry),
     (0, inversify_1.optional)(),
-    __metadata("design:type", sprotty_1.EdgeRouterRegistry)
+    __metadata("design:type", _glsp_sprotty_1.EdgeRouterRegistry)
 ], GLSPHiddenBoundsUpdater.prototype, "edgeRouterRegistry", void 0);
-GLSPHiddenBoundsUpdater = __decorate([
+exports.GLSPHiddenBoundsUpdater = GLSPHiddenBoundsUpdater = __decorate([
     (0, inversify_1.injectable)()
 ], GLSPHiddenBoundsUpdater);
-exports.GLSPHiddenBoundsUpdater = GLSPHiddenBoundsUpdater;
 class CapturingActionDispatcher {
     constructor() {
         this.actions = [];
@@ -92,7 +91,7 @@ class CapturingActionDispatcher {
     }
     async request(action) {
         // ignore, not needed for our purposes
-        return new protocol_1.Deferred().promise;
+        return new _glsp_sprotty_1.Deferred().promise;
     }
 }
 //# sourceMappingURL=glsp-hidden-bounds-updater.js.map

package/lib/features/bounds/glsp-hidden-bounds-updater.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-hidden-bounds-updater.js","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,qDAGgC;AAChC,yCAAyD;AAEzD,qCAAsH;AACtH,yDAA0E;AAE1E;;;;GAIG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,6BAAmB;IAAzD;;QAIO,kBAAa,GAA8B,EAAE,CAAC;QAC9C,UAAK,GAAuB,EAAE,CAAC;QAC/B,UAAK,GAAY,EAAE,CAAC;IAiClC,CAAC;IA/BY,QAAQ,CAAC,KAAY,EAAE,OAAsB;QAClD,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,IAAA,wBAAU,EAAC,OAAO,CAAC,EAAE;YACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAA,iCAAmB,EAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAClF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,UAAU,CAAC,KAAc;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QACnE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,+BAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;aACpD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,MAA8B,CAAC,CAAC,CAAC,CAAC;QAC3G,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;IAES,cAAc,CAAC,IAAgB;QACrC,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,EAAE,CAAC;QAClE,MAAM,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrD,IAAI,CAAC,gBAAgB,GAAG,yBAAyB,CAAC;QAClD,IAAI;YACA,IAAI,EAAE,CAAC;YACP,OAAO,yBAAyB,CAAC,OAAO,CAAC;SAC5C;gBAAS;YACN,IAAI,CAAC,gBAAgB,GAAG,sBAAsB,CAAC;SAClD;IACL,CAAC;IAES,aAAa,CAAC,MAA4B;QAChD,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;QACjF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AArCG;IAAC,IAAA,kBAAM,EAAC,4BAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAAyC,4BAAkB;mEAAC;AAF1F,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAuCnC;AAvCY,0DAAuB;AAyCpC,MAAM,yBAAyB;IAA/B;QACa,YAAO,GAAa,EAAE,CAAC;IAcpC,CAAC;IAZG,KAAK,CAAC,QAAQ,CAAC,MAAc;QACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAiB;QAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAA6B,MAA0B;QAChE,sCAAsC;QACtC,OAAO,IAAI,mBAAQ,EAAO,CAAC,OAAO,CAAC;IACvC,CAAC;CACJ"}
+{"version":3,"file":"glsp-hidden-bounds-updater.js","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,yCAAyD;AAEzD,iDAYuB;AACvB,yDAA0E;AAE1E;;;;GAIG;AAEI,IAAM,uBAAuB,qCAA7B,MAAM,uBAAwB,SAAQ,mCAAmB;IAAzD;;QAGO,kBAAa,GAA8B,EAAE,CAAC;QAC9C,UAAK,GAAuB,EAAE,CAAC;QAC/B,UAAK,GAAY,EAAE,CAAC;IAkClC,CAAC;IAhCY,QAAQ,CAAC,KAAY,EAAE,OAAsB;QAClD,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,IAAA,wBAAU,EAAC,OAAO,CAAC,EAAE;YACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAA,iCAAmB,EAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;SAClF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,UAAU,CAAC,KAAc;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QACnE,OAAO;aACF,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,oCAAoB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;aACjD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,MAA8B,CAAC,CAAC,CAAC,CAAC;QAC3G,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;IAES,cAAc,CAAC,IAAgB;QACrC,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,EAAE,CAAC;QAClE,MAAM,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrD,IAAI,CAAC,gBAAgB,GAAG,yBAAyB,CAAC;QAClD,IAAI;YACA,IAAI,EAAE,CAAC;YACP,OAAO,yBAAyB,CAAC,OAAO,CAAC;SAC5C;gBAAS;YACN,IAAI,CAAC,gBAAgB,GAAG,sBAAsB,CAAC;SAClD;IACL,CAAC;IAES,aAAa,CAAC,MAA4B;QAChD,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;QACjF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AAtC8D;IAA1D,IAAA,kBAAM,EAAC,kCAAkB,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAAyC,kCAAkB;mEAAC;kCAD1F,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAuCnC;AAED,MAAM,yBAAyB;IAA/B;QACa,YAAO,GAAa,EAAE,CAAC;IAcpC,CAAC;IAZG,KAAK,CAAC,QAAQ,CAAC,MAAc;QACzB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAiB;QAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAA6B,MAA0B;QAChE,sCAAsC;QACtC,OAAO,IAAI,wBAAQ,EAAO,CAAC,OAAO,CAAC;IACvC,CAAC;CACJ"}

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

@@ -1,20 +1,4 @@
-/********************************************************************************
- * Copyright (c) 2021-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 { Bounds, Dimension, Point } from '@eclipse-glsp/protocol';
-import { BoundsData, LayoutContainer, SChildElement, SModelElement, SParentElement, StatefulLayouter, HBoxLayouter, HBoxLayoutOptions } from 'sprotty';
+import { Bounds, BoundsData, Dimension, HBoxLayoutOptions, HBoxLayouter, LayoutContainer, Point, SChildElement, SModelElement, SParentElement, StatefulLayouter } from '../../glsp-sprotty/index';
 export interface HBoxLayoutOptionsExt extends HBoxLayoutOptions {
     hGrab: boolean;
     vGrab: boolean;

package/lib/features/bounds/hbox-layout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hbox-layout.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/hbox-layout.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,UAAU,EACV,SAAS,EACT,iBAAiB,EACjB,YAAY,EACZ,eAAe,EACf,KAAK,EACL,aAAa,EACb,aAAa,EACb,cAAc,EACd,gBAAgB,EAGnB,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC3D,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,qBACa,eAAgB,SAAQ,YAAY;IAC7C,OAAgB,IAAI,SAAqB;IAEhC,MAAM,CAAC,SAAS,EAAE,cAAc,GAAG,eAAe,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI;cAwC3E,eAAe,CAC9B,SAAS,EAAE,cAAc,GAAG,eAAe,EAC3C,gBAAgB,EAAE,oBAAoB,EACtC,QAAQ,EAAE,gBAAgB,GAC3B,SAAS;cAyBO,cAAc,CAC7B,SAAS,EAAE,cAAc,GAAG,eAAe,EAC3C,QAAQ,EAAE,gBAAgB,EAC1B,gBAAgB,EAAE,oBAAoB,EACtC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,MAAM,GAC1B,KAAK;cA8BW,WAAW,CAC1B,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,oBAAoB,EAClC,gBAAgB,EAAE,oBAAoB,EACtC,aAAa,EAAE,KAAK,EACpB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,MAAM,GAC1B,KAAK;cAgCW,uBAAuB,CACtC,SAAS,EAAE,aAAa,EACxB,aAAa,EAAE,oBAAoB,EACnC,QAAQ,EAAE,gBAAgB,GAC3B,MAAM;cAaU,qBAAqB,CAAC,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,oBAAoB,GAAG,oBAAoB;cAIzG,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,oBAAoB;IAIjF,SAAS,CAAC,uBAAuB,CAAC,OAAO,EAAE,aAAa,GAAG,oBAAoB,GAAG,SAAS;cAIxE,uBAAuB,CACtC,SAAS,EAAE,cAAc,GAAG,eAAe,EAC3C,UAAU,EAAE,KAAK,EACjB,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAClB,MAAM;cAeU,uBAAuB,IAAI,oBAAoB;IAqBlE,SAAS,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,oBAAoB;CAOjG"}

package/lib/features/{layout → bounds}/hbox-layout.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HBoxLayouterExt = void 0;
 /********************************************************************************
- * 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
@@ -22,13 +22,12 @@ exports.HBoxLayouterExt = 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 _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 /**
  * Extends HBoxLayouter to support additional layout options
  */
-let HBoxLayouterExt = class HBoxLayouterExt extends sprotty_1.HBoxLayouter {
+let HBoxLayouterExt = exports.HBoxLayouterExt = class HBoxLayouterExt extends _glsp_sprotty_1.HBoxLayouter {
     layout(container, layouter) {
         var _a, _b;
         const boundsData = layouter.getBoundsData(container);
@@ -66,9 +65,9 @@ let HBoxLayouterExt = class HBoxLayouterExt extends sprotty_1.HBoxLayouter {
         let maxHeight = -1;
         let isFirst = true;
         container.children.forEach(child => {
-            if ((0, sprotty_1.isLayoutableChild)(child)) {
+            if ((0, _glsp_sprotty_1.isLayoutableChild)(child)) {
                 const bounds = layouter.getBoundsData(child).bounds;
-                if (bounds !== undefined && protocol_1.Dimension.isValid(bounds)) {
+                if (bounds !== undefined && _glsp_sprotty_1.Dimension.isValid(bounds)) {
                     maxWidth += bounds.width;
                     if (isFirst) {
                         isFirst = false;
@@ -92,11 +91,11 @@ let HBoxLayouterExt = class HBoxLayouterExt extends sprotty_1.HBoxLayouter {
             y: containerOptions.paddingTop + 0.5 * (maxHeight - maxHeight / containerOptions.paddingFactor)
         };
         container.children.forEach(child => {
-            if ((0, sprotty_1.isLayoutableChild)(child)) {
+            if ((0, _glsp_sprotty_1.isLayoutableChild)(child)) {
                 const boundsData = layouter.getBoundsData(child);
                 const bounds = boundsData.bounds;
                 const childOptions = this.getChildLayoutOptions(child, containerOptions);
-                if (bounds !== undefined && protocol_1.Dimension.isValid(bounds)) {
+                if (bounds !== undefined && _glsp_sprotty_1.Dimension.isValid(bounds)) {
                     currentOffset = this.layoutChild(child, boundsData, bounds, childOptions, containerOptions, currentOffset, maxWidth, maxHeight, grabWidth, grabbingChildren);
                 }
             }
@@ -134,14 +133,14 @@ let HBoxLayouterExt = class HBoxLayouterExt extends sprotty_1.HBoxLayouter {
         var _a, _b;
         const currentContainer = container;
         // eslint-disable-next-line no-constant-condition
-        if ((0, sprotty_1.isBoundsAware)(currentContainer)) {
+        if ((0, _glsp_sprotty_1.isBoundsAware)(currentContainer)) {
             const bounds = currentContainer.bounds;
             const elementOptions = this.getElementLayoutOptions(currentContainer);
             const width = (_a = elementOptions === null || elementOptions === void 0 ? void 0 : elementOptions.prefWidth) !== null && _a !== void 0 ? _a : 0;
             const height = (_b = elementOptions === null || elementOptions === void 0 ? void 0 : elementOptions.prefHeight) !== null && _b !== void 0 ? _b : 0;
             return Object.assign(Object.assign({}, bounds), { width, height });
         }
-        return protocol_1.Bounds.EMPTY;
+        return _glsp_sprotty_1.Bounds.EMPTY;
     }
     getChildLayoutOptions(child, containerOptions) {
         return super.getChildLayoutOptions(child, this.filterContainerOptions(containerOptions));
@@ -193,9 +192,8 @@ let HBoxLayouterExt = class HBoxLayouterExt extends sprotty_1.HBoxLayouter {
         return Object.assign(Object.assign({}, containerOptions), localOptions);
     }
 };
-HBoxLayouterExt.KIND = sprotty_1.HBoxLayouter.KIND;
-HBoxLayouterExt = __decorate([
+HBoxLayouterExt.KIND = _glsp_sprotty_1.HBoxLayouter.KIND;
+exports.HBoxLayouterExt = HBoxLayouterExt = __decorate([
     (0, inversify_1.injectable)()
 ], HBoxLayouterExt);
-exports.HBoxLayouterExt = HBoxLayouterExt;
 //# sourceMappingURL=hbox-layout.js.map

package/lib/features/bounds/hbox-layout.js.map

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

package/lib/features/bounds/hbox-layout.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hbox-layout.spec.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/hbox-layout.spec.ts"],"names":[],"mappings":"AAiBA,OAAO,OAAO,CAAC;AACf,OAAO,kBAAkB,CAAC"}

package/lib/features/{layout/tests → bounds}/hbox-layout.spec.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2022 TypeFox, STMicroelectronics and others.
+ * Copyright (c) 2022-2023 TypeFox, STMicroelectronics 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,29 +16,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable deprecation/deprecation */
-const protocol_1 = require("@eclipse-glsp/protocol");
 const chai_1 = require("chai");
 require("mocha");
 require("reflect-metadata");
-const sprotty_1 = require("sprotty");
-const layouter_test_util_1 = require("./layouter-test-util");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+const layouter_test_util_spec_1 = require("./layouter-test-util.spec");
 describe('HBoxLayouter', () => {
-    const layoutRegistry = (0, layouter_test_util_1.setupLayoutRegistry)();
-    const log = new sprotty_1.ConsoleLogger();
+    const layoutRegistry = (0, layouter_test_util_spec_1.setupLayoutRegistry)();
+    const log = new _glsp_sprotty_1.ConsoleLogger();
     const map = new Map();
     function createModel() {
-        const model = (0, layouter_test_util_1.sNode)('node', undefined, protocol_1.Dimension.EMPTY);
+        const model = (0, layouter_test_util_spec_1.sNode)('node', undefined, _glsp_sprotty_1.Dimension.EMPTY);
         model.children = [
-            (0, layouter_test_util_1.sLabel)('label1', undefined, undefined, { width: 1, height: 2 }),
-            (0, layouter_test_util_1.sLabel)('label2', undefined, undefined, { width: 2, height: 1 }),
-            (0, layouter_test_util_1.sLabel)('label3', undefined, undefined, { width: 3, height: 3 })
+            (0, layouter_test_util_spec_1.sLabel)('label1', undefined, undefined, { width: 1, height: 2 }),
+            (0, layouter_test_util_spec_1.sLabel)('label2', undefined, undefined, { width: 2, height: 1 }),
+            (0, layouter_test_util_spec_1.sLabel)('label3', undefined, undefined, { width: 3, height: 3 })
         ];
         model.layout = 'hbox';
         return model;
     }
     it('defaultParams', () => {
         const model = createModel();
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 18, height: 13 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 5, y: 5.5, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 7, y: 6, width: 2, height: 1 });
@@ -49,7 +48,7 @@ describe('HBoxLayouter', () => {
         model.layoutOptions = {
             vAlign: 'top'
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 18, height: 13 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 5, y: 5, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 7, y: 5, width: 2, height: 1 });
@@ -60,7 +59,7 @@ describe('HBoxLayouter', () => {
         model.layoutOptions = {
             vAlign: 'center'
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 18, height: 13 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 5, y: 5.5, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 7, y: 6, width: 2, height: 1 });
@@ -71,7 +70,7 @@ describe('HBoxLayouter', () => {
         model.layoutOptions = {
             vAlign: 'bottom'
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 18, height: 13 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 5, y: 6, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 7, y: 7, width: 2, height: 1 });
@@ -85,7 +84,7 @@ describe('HBoxLayouter', () => {
             paddingLeft: 9,
             paddingRight: 10
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 27, height: 18 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 9, y: 7.5, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 11, y: 8, width: 2, height: 1 });
@@ -96,7 +95,7 @@ describe('HBoxLayouter', () => {
         model.layoutOptions = {
             hGap: 4
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 24, height: 13 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 5, y: 5.5, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 10, y: 6, width: 2, height: 1 });
@@ -107,7 +106,7 @@ describe('HBoxLayouter', () => {
         model.layoutOptions = {
             paddingFactor: 2
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 18, height: 13 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 9, y: 8.5, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 11, y: 9, width: 2, height: 1 });
@@ -118,7 +117,7 @@ describe('HBoxLayouter', () => {
         model.layoutOptions = {
             minWidth: 25
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 25, height: 13 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 5, y: 5.5, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 7, y: 6, width: 2, height: 1 });
@@ -129,7 +128,7 @@ describe('HBoxLayouter', () => {
         model.layoutOptions = {
             minHeight: 25
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 18, height: 25 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 5, y: 11.5, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 7, y: 12, width: 2, height: 1 });
@@ -140,7 +139,7 @@ describe('HBoxLayouter', () => {
         model.layoutOptions = {
             prefWidth: 20
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 20, height: 13 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 5, y: 5.5, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 7, y: 6, width: 2, height: 1 });
@@ -151,7 +150,7 @@ describe('HBoxLayouter', () => {
         model.layoutOptions = {
             prefHeight: 20
         };
-        (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+        (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
         (0, chai_1.expect)(map.get(model).bounds).to.deep.equal({ x: 0, y: 0, width: 18, height: 20 });
         (0, chai_1.expect)(map.get(model.children[0]).bounds).to.deep.equal({ x: 5, y: 9, width: 1, height: 2 });
         (0, chai_1.expect)(map.get(model.children[1]).bounds).to.deep.equal({ x: 7, y: 9.5, width: 2, height: 1 });

package/lib/features/bounds/hbox-layout.spec.js.map

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

package/lib/features/{layout/tests/layouter-test-util.d.ts → bounds/layouter-test-util.spec.d.ts}

@@ -13,11 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Dimension, Point } from '@eclipse-glsp/protocol';
 import 'mocha';
-import 'reflect-metadata';
-import { BoundsData, ConsoleLogger, LayoutRegistry, SCompartment, SLabel, SModelElement, SNode } from 'sprotty';
-import { GLSPGraph } from '../../../lib/model';
+import { BoundsData, ConsoleLogger, Dimension, LayoutRegistry, Point, SCompartment, SLabel, SModelElement, SNode } from '../../glsp-sprotty/index';
+import { GLSPGraph } from '../../lib/model';
 export declare function gModel(): GLSPGraph;
 export declare function sNode(type: string, nodeLayout?: string, size?: Dimension, position?: Point, layoutOptions?: {
     [key: string]: string | number | boolean;
@@ -31,4 +29,4 @@ export declare function sLabel(labelText: string, layoutOptions?: {
 export declare function addToMap(map: Map<SModelElement, BoundsData>, element: SModelElement): void;
 export declare function layout(layoutRegistry: LayoutRegistry, log: ConsoleLogger, map: Map<SModelElement, BoundsData>, model: SNode | GLSPGraph): void;
 export declare function setupLayoutRegistry(): LayoutRegistry;
-//# sourceMappingURL=layouter-test-util.d.ts.map
+//# sourceMappingURL=layouter-test-util.spec.d.ts.map

package/lib/features/bounds/layouter-test-util.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"layouter-test-util.spec.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/layouter-test-util.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,OAAO,CAAC;AACf,OAAO,EACH,UAAU,EACV,aAAa,EACb,SAAS,EACT,cAAc,EACd,KAAK,EACL,YAAY,EACZ,MAAM,EACN,aAAa,EACb,KAAK,EAKR,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,wBAAgB,MAAM,IAAI,SAAS,CAElC;AAED,wBAAgB,KAAK,CACjB,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,SAAS,EAChB,QAAQ,CAAC,EAAE,KAAK,EAChB,aAAa,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;CAAE,GAC7D,KAAK,CAgBP;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;CAAE,GAAG,YAAY,CAOlI;AAED,wBAAgB,MAAM,CAClB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;CAAE,EAC5D,QAAQ,CAAC,EAAE,KAAK,EAChB,IAAI,CAAC,EAAE,SAAS,GACjB,MAAM,CAaR;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI,CAS1F;AAED,wBAAgB,MAAM,CAClB,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,EACnC,KAAK,EAAE,KAAK,GAAG,SAAS,GACzB,IAAI,CAKN;AAED,wBAAgB,mBAAmB,IAAI,cAAc,CAKpD"}

package/lib/features/{layout/tests/layouter-test-util.js → bounds/layouter-test-util.spec.js}

@@ -16,19 +16,19 @@
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupLayoutRegistry = exports.layout = exports.addToMap = exports.sLabel = exports.sComp = exports.sNode = exports.gModel = void 0;
+const inversify_1 = require("inversify");
 require("mocha");
-require("reflect-metadata");
-const sprotty_1 = require("sprotty");
-const container_modules_1 = require("../../../base/container-modules");
-const model_1 = require("../../../lib/model");
-const layouter_1 = require("../layouter");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+const container_modules_1 = require("../../container-modules");
+const model_1 = require("../../lib/model");
+const layouter_1 = require("./layouter");
 function gModel() {
     return new model_1.GLSPGraph();
 }
 exports.gModel = gModel;
 function sNode(type, nodeLayout, size, position, layoutOptions) {
-    const node = new sprotty_1.SNode();
-    node.features = (0, sprotty_1.createFeatureSet)(sprotty_1.SNode.DEFAULT_FEATURES, { enable: [sprotty_1.layoutableChildFeature] });
+    const node = new _glsp_sprotty_1.SNode();
+    node.features = (0, _glsp_sprotty_1.createFeatureSet)(_glsp_sprotty_1.SNode.DEFAULT_FEATURES, { enable: [_glsp_sprotty_1.layoutableChildFeature] });
     node.position = position || {
         x: 0,
         y: 0
@@ -45,8 +45,8 @@ function sNode(type, nodeLayout, size, position, layoutOptions) {
 }
 exports.sNode = sNode;
 function sComp(type, compLayout, layoutOptions) {
-    const comp = new sprotty_1.SCompartment();
-    comp.features = (0, sprotty_1.createFeatureSet)(sprotty_1.SCompartment.DEFAULT_FEATURES);
+    const comp = new _glsp_sprotty_1.SCompartment();
+    comp.features = (0, _glsp_sprotty_1.createFeatureSet)(_glsp_sprotty_1.SCompartment.DEFAULT_FEATURES);
     comp.type = type;
     comp.layout = compLayout;
     comp.layoutOptions = layoutOptions;
@@ -54,8 +54,8 @@ function sComp(type, compLayout, layoutOptions) {
 }
 exports.sComp = sComp;
 function sLabel(labelText, layoutOptions, position, size) {
-    const label = new sprotty_1.SLabel();
-    label.features = (0, sprotty_1.createFeatureSet)(sprotty_1.SLabel.DEFAULT_FEATURES);
+    const label = new _glsp_sprotty_1.SLabel();
+    label.features = (0, _glsp_sprotty_1.createFeatureSet)(_glsp_sprotty_1.SLabel.DEFAULT_FEATURES);
     if (position) {
         label.position = position;
     }
@@ -74,7 +74,7 @@ function addToMap(map, element) {
         boundsChanged: true,
         alignmentChanged: true
     });
-    if (element instanceof sprotty_1.SParentElement) {
+    if (element instanceof _glsp_sprotty_1.SParentElement) {
         element.children.forEach(c => addToMap(map, c));
     }
 }
@@ -89,8 +89,8 @@ exports.layout = layout;
 function setupLayoutRegistry() {
     // Generic Test setup
     // create client container that registers all default modules including the layoutModule
-    const layoutContainer = (0, container_modules_1.createDiagramContainer)();
-    return layoutContainer.get(sprotty_1.TYPES.LayoutRegistry);
+    const layoutContainer = (0, container_modules_1.initializeDiagramContainer)(new inversify_1.Container());
+    return layoutContainer.get(_glsp_sprotty_1.TYPES.LayoutRegistry);
 }
 exports.setupLayoutRegistry = setupLayoutRegistry;
-//# sourceMappingURL=layouter-test-util.js.map
+//# sourceMappingURL=layouter-test-util.spec.js.map

package/lib/features/bounds/layouter-test-util.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layouter-test-util.spec.js","sourceRoot":"","sources":["../../../src/features/bounds/layouter-test-util.spec.ts"],"names":[],"mappings":"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"}

package/lib/features/bounds/layouter.d.ts

@@ -0,0 +1,21 @@
+import { Bounds, BoundsData, ILogger, LayoutContainer, LayoutRegistry, Layouter, SModelElement, SParentElement, StatefulLayouter } from '../../glsp-sprotty/index';
+export declare class LayouterExt extends Layouter {
+    layout(element2boundsData: Map<SModelElement, BoundsData>): void;
+}
+export declare class StatefulLayouterExt extends StatefulLayouter {
+    protected readonly elementToBoundsData: Map<SModelElement, BoundsData>;
+    protected readonly layoutRegistry2: LayoutRegistry;
+    protected toBeLayouted2: (SParentElement & LayoutContainer)[];
+    /**
+     *
+     * @param elementToBoundsData The map of element to bounds data. Bounds Data are computed from the hidden
+     * SVG rendering pass.
+     * @param layoutRegistry2 The registry of available layouts.
+     * @param log The log.
+     */
+    constructor(elementToBoundsData: Map<SModelElement, BoundsData>, layoutRegistry2: LayoutRegistry, log: ILogger);
+    getBoundsData(element: SModelElement): BoundsData;
+    layout(): void;
+    protected doLayout(element: SParentElement & LayoutContainer): Bounds;
+}
+//# sourceMappingURL=layouter.d.ts.map

package/lib/features/bounds/layouter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"layouter.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/layouter.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,UAAU,EACV,OAAO,EACP,eAAe,EACf,cAAc,EACd,QAAQ,EACR,aAAa,EACb,cAAc,EACd,gBAAgB,EAEnB,MAAM,eAAe,CAAC;AAEvB,qBACa,WAAY,SAAQ,QAAQ;IAC5B,MAAM,CAAC,kBAAkB,EAAE,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,IAAI;CAG5E;AASD,qBAAa,mBAAoB,SAAQ,gBAAgB;IAWjD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC;IACtE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,cAAc;IAXtD,SAAS,CAAC,aAAa,EAAE,CAAC,cAAc,GAAG,eAAe,CAAC,EAAE,CAAC;IAE9D;;;;;;OAMG;gBAEoB,mBAAmB,EAAE,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,EACnD,eAAe,EAAE,cAAc,EAClD,GAAG,EAAE,OAAO;IAeP,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,UAAU;IAwBjD,MAAM,IAAI,IAAI;cAwBJ,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,eAAe,GAAG,MAAM;CAiBjF"}

package/lib/features/{layout → bounds}/layouter.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StatefulLayouterExt = exports.LayouterExt = void 0;
 /********************************************************************************
- * 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
@@ -22,25 +22,23 @@ exports.StatefulLayouterExt = exports.LayouterExt = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const sprotty_1 = require("sprotty");
 const inversify_1 = require("inversify");
-const geometry_1 = require("sprotty-protocol/lib/utils/geometry");
-let LayouterExt = class LayouterExt extends sprotty_1.Layouter {
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+let LayouterExt = exports.LayouterExt = class LayouterExt extends _glsp_sprotty_1.Layouter {
     layout(element2boundsData) {
         new StatefulLayouterExt(element2boundsData, this.layoutRegistry, this.logger).layout();
     }
 };
-LayouterExt = __decorate([
+exports.LayouterExt = LayouterExt = __decorate([
     (0, inversify_1.injectable)()
 ], LayouterExt);
-exports.LayouterExt = LayouterExt;
 // 2-pass layout:
 // Step 1: Find "rendered size" of each element (may take resizeContainer into account)
 // Child-to-parent layout
 // Step 2: Extend parents as necessary, then use the adjusted parent size to properly
 // align children (center/end alignments, hGrab/vGrab)
 // Parent-to-children layout
-class StatefulLayouterExt extends sprotty_1.StatefulLayouter {
+class StatefulLayouterExt extends _glsp_sprotty_1.StatefulLayouter {
     /**
      *
      * @param elementToBoundsData The map of element to bounds data. Bounds Data are computed from the hidden
@@ -54,7 +52,7 @@ class StatefulLayouterExt extends sprotty_1.StatefulLayouter {
         this.layoutRegistry2 = layoutRegistry2;
         this.toBeLayouted2 = [];
         elementToBoundsData.forEach((data, element) => {
-            if ((0, sprotty_1.isLayoutContainer)(element)) {
+            if ((0, _glsp_sprotty_1.isLayoutContainer)(element)) {
                 this.toBeLayouted2.push(element);
             }
         });
@@ -66,10 +64,10 @@ class StatefulLayouterExt extends sprotty_1.StatefulLayouter {
     getBoundsData(element) {
         let boundsData = this.elementToBoundsData.get(element);
         let bounds = element.bounds;
-        if ((0, sprotty_1.isLayoutContainer)(element) && this.toBeLayouted2.indexOf(element) >= 0) {
+        if ((0, _glsp_sprotty_1.isLayoutContainer)(element) && this.toBeLayouted2.indexOf(element) >= 0) {
             bounds = this.doLayout(element);
         }
-        else if ((0, sprotty_1.isLayoutContainer)(element)) {
+        else if ((0, _glsp_sprotty_1.isLayoutContainer)(element)) {
             bounds = {
                 x: 0,
                 y: 0,
@@ -96,7 +94,7 @@ class StatefulLayouterExt extends sprotty_1.StatefulLayouter {
         }
         this.toBeLayouted2 = [];
         this.elementToBoundsData.forEach((data, element) => {
-            if ((0, sprotty_1.isLayoutContainer)(element)) {
+            if ((0, _glsp_sprotty_1.isLayoutContainer)(element)) {
                 this.toBeLayouted2.push(element);
             }
         });
@@ -123,7 +121,7 @@ class StatefulLayouterExt extends sprotty_1.StatefulLayouter {
         }
         else {
             this.log.error(element, 'Layout failed');
-            return geometry_1.Bounds.EMPTY;
+            return _glsp_sprotty_1.Bounds.EMPTY;
         }
     }
 }

package/lib/features/bounds/layouter.js.map

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

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

@@ -1,20 +1,4 @@
-/********************************************************************************
- * Copyright (c) 2021-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 { Bounds, Dimension, Point } from '@eclipse-glsp/protocol';
-import { BoundsData, LayoutContainer, SChildElement, SModelElement, SParentElement, StatefulLayouter, VBoxLayouter, VBoxLayoutOptions } from 'sprotty';
+import { Bounds, BoundsData, Dimension, LayoutContainer, Point, SChildElement, SModelElement, SParentElement, StatefulLayouter, VBoxLayoutOptions, VBoxLayouter } from '../../glsp-sprotty/index';
 export interface VBoxLayoutOptionsExt extends VBoxLayoutOptions {
     hGrab: boolean;
     vGrab: boolean;

package/lib/features/bounds/vbox-layout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vbox-layout.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/vbox-layout.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,UAAU,EACV,SAAS,EACT,eAAe,EACf,KAAK,EACL,aAAa,EACb,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,EAGf,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC3D,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,qBACa,eAAgB,SAAQ,YAAY;IAC7C,OAAgB,IAAI,SAAqB;IAEhC,MAAM,CAAC,SAAS,EAAE,cAAc,GAAG,eAAe,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI;cAwC3E,eAAe,CAC9B,SAAS,EAAE,cAAc,GAAG,eAAe,EAC3C,gBAAgB,EAAE,oBAAoB,EACtC,QAAQ,EAAE,gBAAgB,GAC3B,SAAS;cAyBO,cAAc,CAC7B,SAAS,EAAE,cAAc,GAAG,eAAe,EAC3C,QAAQ,EAAE,gBAAgB,EAC1B,gBAAgB,EAAE,oBAAoB,EACtC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,GAC1B,KAAK;cA8BW,WAAW,CAC1B,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,oBAAoB,EAClC,gBAAgB,EAAE,oBAAoB,EACtC,aAAa,EAAE,KAAK,EACpB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,GAC1B,KAAK;cAgCW,uBAAuB,CACtC,SAAS,EAAE,aAAa,EACxB,aAAa,EAAE,oBAAoB,EACnC,QAAQ,EAAE,gBAAgB,GAC3B,MAAM;cAaU,qBAAqB,CAAC,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,oBAAoB,GAAG,oBAAoB;cAIzG,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,oBAAoB;IAIjF,SAAS,CAAC,uBAAuB,CAAC,OAAO,EAAE,aAAa,GAAG,oBAAoB,GAAG,SAAS;cAIxE,uBAAuB,CACtC,SAAS,EAAE,cAAc,GAAG,eAAe,EAC3C,UAAU,EAAE,KAAK,EACjB,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAClB,MAAM;cAeU,uBAAuB,IAAI,oBAAoB;IAqBlE,SAAS,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,oBAAoB;CAOjG"}