@eclipse-glsp/client 1.1.0-next.6ec1da0.211 → 1.1.0-next.7be33cd.257

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

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeFormLayouter = 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.FreeFormLayouter = 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 abstract_layout_1 = require("sprotty/lib/features/bounds/abstract-layout");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 /**
- * Layouts children of a container with explit X/Y positions
+ * Layouts children of a container with explicit X/Y positions
  */
-let FreeFormLayouter = class FreeFormLayouter extends abstract_layout_1.AbstractLayout {
+let FreeFormLayouter = exports.FreeFormLayouter = class FreeFormLayouter extends _glsp_sprotty_1.AbstractLayout {
     layout(container, layouter) {
         const boundsData = layouter.getBoundsData(container);
         const options = this.getLayoutOptions(container);
@@ -52,7 +51,7 @@ let FreeFormLayouter = class FreeFormLayouter extends abstract_layout_1.Abstract
         let maxY = 0;
         container.children.forEach(child => {
             const bounds = layouter.getBoundsData(child).bounds;
-            if (bounds !== undefined && protocol_1.Dimension.isValid(bounds)) {
+            if (bounds !== undefined && _glsp_sprotty_1.Dimension.isValid(bounds)) {
                 const childMaxX = bounds.x + bounds.width;
                 const childMaxY = bounds.y + bounds.height;
                 maxX = Math.max(maxX, childMaxX);
@@ -100,8 +99,7 @@ let FreeFormLayouter = class FreeFormLayouter extends abstract_layout_1.Abstract
     }
 };
 FreeFormLayouter.KIND = 'freeform';
-FreeFormLayouter = __decorate([
+exports.FreeFormLayouter = FreeFormLayouter = __decorate([
     (0, inversify_1.injectable)()
 ], FreeFormLayouter);
-exports.FreeFormLayouter = FreeFormLayouter;
 //# sourceMappingURL=freeform-layout.js.map

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

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

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

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

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 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
@@ -18,11 +18,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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('FreeFormLayouter', () => {
-    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();
     describe('issue-610', () => {
         it('recursive hGrab/vGrab', () => {
@@ -42,22 +42,22 @@ describe('FreeFormLayouter', () => {
              * This test case checks recursive hGrab/vGrab functionality of nested compartments
              * See also issue 610 for details and an example model https://github.com/eclipse-glsp/glsp/issues/610.
              */
-            const model = (0, layouter_test_util_1.gModel)();
-            const category = (0, layouter_test_util_1.sNode)('category', 'vbox', { width: 410.0, height: 215.0 }, undefined, {
+            const model = (0, layouter_test_util_spec_1.gModel)();
+            const category = (0, layouter_test_util_spec_1.sNode)('category', 'vbox', { width: 410.0, height: 215.0 }, undefined, {
                 vGrab: false,
                 hGrab: false,
                 hAlign: 'center',
                 prefWidth: 410.0,
                 prefHeight: 215.0
             });
-            const headerComp = (0, layouter_test_util_1.sComp)('comp:header', 'hbox');
-            headerComp.children = [(0, layouter_test_util_1.sLabel)('Category 1')];
-            const childContainer = (0, layouter_test_util_1.sComp)('struct', 'freeform', { hGrab: true, vGrab: true });
-            const labelContainer = (0, layouter_test_util_1.sComp)('struct', 'hbox', { hGrab: true });
-            labelContainer.children = [(0, layouter_test_util_1.sLabel)('left text', { hGrab: true }), (0, layouter_test_util_1.sLabel)('right text')];
+            const headerComp = (0, layouter_test_util_spec_1.sComp)('comp:header', 'hbox');
+            headerComp.children = [(0, layouter_test_util_spec_1.sLabel)('Category 1')];
+            const childContainer = (0, layouter_test_util_spec_1.sComp)('struct', 'freeform', { hGrab: true, vGrab: true });
+            const labelContainer = (0, layouter_test_util_spec_1.sComp)('struct', 'hbox', { hGrab: true });
+            labelContainer.children = [(0, layouter_test_util_spec_1.sLabel)('left text', { hGrab: true }), (0, layouter_test_util_spec_1.sLabel)('right text')];
             category.children = [headerComp, childContainer, labelContainer];
             model.add(category);
-            (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+            (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
             // check category
             (0, chai_1.expect)(map.get(category).bounds).to.deep.equal({ x: 0, y: 0, width: 410.0, height: 215.0 });
             // check header compartment
@@ -83,26 +83,26 @@ describe('FreeFormLayouter', () => {
              * ||_left____________right_||
              * |_________________________|
              */
-            const model = (0, layouter_test_util_1.gModel)();
-            const category = (0, layouter_test_util_1.sNode)('category', 'vbox', { width: 500.0, height: 375.0 }, undefined, {
+            const model = (0, layouter_test_util_spec_1.gModel)();
+            const category = (0, layouter_test_util_spec_1.sNode)('category', 'vbox', { width: 500.0, height: 375.0 }, undefined, {
                 vGrab: false,
                 hGrab: false,
                 hAlign: 'center',
                 prefWidth: 500.0,
                 prefHeight: 375.0
             });
-            const headerComp = (0, layouter_test_util_1.sComp)('comp:header', 'hbox');
-            headerComp.children = [(0, layouter_test_util_1.sLabel)('Category 2')];
-            const childContainer = (0, layouter_test_util_1.sComp)('struct', 'freeform', { hGrab: true, vGrab: true });
-            const childNode = (0, layouter_test_util_1.sNode)('task', 'hbox', undefined, { x: 170, y: 190 });
-            childNode.children = [(0, layouter_test_util_1.sLabel)('Task node', undefined, { x: 5.0, y: 5.0 }, { width: 25.0, height: 20.0 })];
+            const headerComp = (0, layouter_test_util_spec_1.sComp)('comp:header', 'hbox');
+            headerComp.children = [(0, layouter_test_util_spec_1.sLabel)('Category 2')];
+            const childContainer = (0, layouter_test_util_spec_1.sComp)('struct', 'freeform', { hGrab: true, vGrab: true });
+            const childNode = (0, layouter_test_util_spec_1.sNode)('task', 'hbox', undefined, { x: 170, y: 190 });
+            childNode.children = [(0, layouter_test_util_spec_1.sLabel)('Task node', undefined, { x: 5.0, y: 5.0 }, { width: 25.0, height: 20.0 })];
             childContainer.children = [childNode];
-            const labelContainer = (0, layouter_test_util_1.sComp)('struct', 'hbox', { hGrab: true });
-            labelContainer.children = [(0, layouter_test_util_1.sLabel)('left text', { hGrab: true }), (0, layouter_test_util_1.sLabel)('right text')];
+            const labelContainer = (0, layouter_test_util_spec_1.sComp)('struct', 'hbox', { hGrab: true });
+            labelContainer.children = [(0, layouter_test_util_spec_1.sLabel)('left text', { hGrab: true }), (0, layouter_test_util_spec_1.sLabel)('right text')];
             category.children = [headerComp, childContainer, labelContainer];
             model.add(category);
             // layout graph
-            (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+            (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
             // check category
             (0, chai_1.expect)(map.get(category).bounds).to.deep.equal({ x: 0, y: 0, width: 500.0, height: 375.0 });
             // check header compartment
@@ -126,24 +126,24 @@ describe('FreeFormLayouter', () => {
              * ||_______________________||
              * |_________________________|
              */
-            const model = (0, layouter_test_util_1.gModel)();
-            const category = (0, layouter_test_util_1.sNode)('category', 'vbox', { width: 500.0, height: 375.0 }, undefined, {
+            const model = (0, layouter_test_util_spec_1.gModel)();
+            const category = (0, layouter_test_util_spec_1.sNode)('category', 'vbox', { width: 500.0, height: 375.0 }, undefined, {
                 vGrab: false,
                 hGrab: false,
                 hAlign: 'center',
                 prefWidth: 500.0,
                 prefHeight: 375.0
             });
-            const headerComp = (0, layouter_test_util_1.sComp)('comp:header', 'hbox');
-            headerComp.children = [(0, layouter_test_util_1.sLabel)('Category 2')];
-            const childContainer = (0, layouter_test_util_1.sComp)('struct', 'freeform', { hGrab: true, vGrab: true });
-            const childNode = (0, layouter_test_util_1.sNode)('task', 'hbox', undefined, { x: 55, y: 15 });
-            childNode.children = [(0, layouter_test_util_1.sLabel)('Task node', undefined, undefined, { width: 50.0, height: 35.0 })];
+            const headerComp = (0, layouter_test_util_spec_1.sComp)('comp:header', 'hbox');
+            headerComp.children = [(0, layouter_test_util_spec_1.sLabel)('Category 2')];
+            const childContainer = (0, layouter_test_util_spec_1.sComp)('struct', 'freeform', { hGrab: true, vGrab: true });
+            const childNode = (0, layouter_test_util_spec_1.sNode)('task', 'hbox', undefined, { x: 55, y: 15 });
+            childNode.children = [(0, layouter_test_util_spec_1.sLabel)('Task node', undefined, undefined, { width: 50.0, height: 35.0 })];
             childContainer.children = [childNode];
             category.children = [headerComp, childContainer];
             model.add(category);
             // layout graph
-            (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+            (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
             // check category
             (0, chai_1.expect)(map.get(category).bounds).to.deep.equal({ x: 0, y: 0, width: 500.0, height: 375.0 });
             // check header compartment
@@ -165,8 +165,8 @@ describe('FreeFormLayouter', () => {
              * ||_______________________||
              * |_________________________|
              */
-            const model = (0, layouter_test_util_1.gModel)();
-            const category = (0, layouter_test_util_1.sNode)('category', 'vbox', { width: 500.0, height: 375.0 }, undefined, {
+            const model = (0, layouter_test_util_spec_1.gModel)();
+            const category = (0, layouter_test_util_spec_1.sNode)('category', 'vbox', { width: 500.0, height: 375.0 }, undefined, {
                 vGrab: false,
                 hGrab: false,
                 hAlign: 'center',
@@ -177,16 +177,16 @@ describe('FreeFormLayouter', () => {
                 paddingTop: 10,
                 paddingBottom: 10
             });
-            const headerComp = (0, layouter_test_util_1.sComp)('comp:header', 'hbox');
-            headerComp.children = [(0, layouter_test_util_1.sLabel)('Category 2')];
-            const childContainer = (0, layouter_test_util_1.sComp)('struct', 'freeform', { hGrab: true, vGrab: true });
-            const childNode = (0, layouter_test_util_1.sNode)('task', 'hbox', undefined, { x: 55, y: 15 }, { paddingLeft: 10, paddingRight: 10, paddingTop: 10, paddingBottom: 10 });
-            childNode.children = [(0, layouter_test_util_1.sLabel)('Task node', undefined, undefined, { width: 50.0, height: 35.0 })];
+            const headerComp = (0, layouter_test_util_spec_1.sComp)('comp:header', 'hbox');
+            headerComp.children = [(0, layouter_test_util_spec_1.sLabel)('Category 2')];
+            const childContainer = (0, layouter_test_util_spec_1.sComp)('struct', 'freeform', { hGrab: true, vGrab: true });
+            const childNode = (0, layouter_test_util_spec_1.sNode)('task', 'hbox', undefined, { x: 55, y: 15 }, { paddingLeft: 10, paddingRight: 10, paddingTop: 10, paddingBottom: 10 });
+            childNode.children = [(0, layouter_test_util_spec_1.sLabel)('Task node', undefined, undefined, { width: 50.0, height: 35.0 })];
             childContainer.children = [childNode];
             category.children = [headerComp, childContainer];
             model.add(category);
             // layout graph
-            (0, layouter_test_util_1.layout)(layoutRegistry, log, map, model);
+            (0, layouter_test_util_spec_1.layout)(layoutRegistry, log, map, model);
             // check category
             (0, chai_1.expect)(map.get(category).bounds).to.deep.equal({ x: 0, y: 0, width: 500.0, height: 375.0 });
             // check header compartment

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

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

package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * 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
@@ -13,9 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, ComputedBoundsAction, ElementAndRoutingPoints } from '@eclipse-glsp/protocol';
 import { VNode } from 'snabbdom';
-import { EdgeRouterRegistry, HiddenBoundsUpdater, SModelElement, SRoutableElement } from 'sprotty';
+import { Action, ComputedBoundsAction, EdgeRouterRegistry, ElementAndRoutingPoints, HiddenBoundsUpdater, SModelElement, SRoutableElement } from '../../glsp-sprotty/index';
 /**
  * Grabs the bounds from hidden SVG DOM elements, applies layouts, collects routes and fires {@link ComputedBoundsAction}s.
  *

package/lib/features/bounds/glsp-hidden-bounds-updater.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-hidden-bounds-updater.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EAAE,oBAAoB,EAAY,uBAAuB,EAElE,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAqB,aAAa,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAGtH;;;;GAIG;AACH,qBACa,uBAAwB,SAAQ,mBAAmB;IAEpB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAEnG,SAAS,CAAC,aAAa,EAAE,uBAAuB,EAAE,CAAM;IACxD,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAM;IACzC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,CAAM;IAErB,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,KAAK;IAQrD,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAOzC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,MAAM,EAAE;IAYpD,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;CAI9E"}
+{"version":3,"file":"glsp-hidden-bounds-updater.d.ts","sourceRoot":"","sources":["../../../src/features/bounds/glsp-hidden-bounds-updater.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EACH,MAAM,EACN,oBAAoB,EAEpB,kBAAkB,EAClB,uBAAuB,EACvB,mBAAmB,EAInB,aAAa,EACb,gBAAgB,EACnB,MAAM,eAAe,CAAC;AAGvB;;;;GAIG;AACH,qBACa,uBAAwB,SAAQ,mBAAmB;IACpB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAEnG,SAAS,CAAC,aAAa,EAAE,uBAAuB,EAAE,CAAM;IACxD,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAM;IACzC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,CAAM;IAErB,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,KAAK;IAQrD,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAQzC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,MAAM,EAAE;IAYpD,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;CAI9E"}

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 });