@eclipse-glsp/graph 1.0.0 → 1.1.0-RC02

package/lib/gnode.js

@@ -1,5 +1,5 @@
 "use strict";
-var _a;
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GNodeBuilder = exports.GNode = void 0;
 /********************************************************************************
@@ -18,23 +18,28 @@ exports.GNodeBuilder = exports.GNode = 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 glayout_container_1 = require("./glayout-container");
+const gedge_layoutable_1 = require("./gedge-layoutable");
+const glayouting_1 = require("./glayouting");
 const gshape_element_1 = require("./gshape-element");
 class GNode extends gshape_element_1.GShapeElement {
     constructor() {
         super(...arguments);
         this.type = protocol_1.DefaultTypes.NODE;
         this[_a] = true;
+        this[_b] = true;
     }
     static builder() {
         return new GNodeBuilder(GNode).type(protocol_1.DefaultTypes.NODE);
     }
 }
 exports.GNode = GNode;
-_a = glayout_container_1.GLayoutContainer;
+_a = gedge_layoutable_1.GEdgeLayoutable, _b = glayouting_1.GLayouting;
 class GNodeBuilder extends gshape_element_1.GShapeElementBuilder {
+    edgePlacement(placement) {
+        return gedge_layoutable_1.GEdgeLayoutableBuilder.edgePlacement(this, placement);
+    }
     layout(layout) {
-        return glayout_container_1.GLayoutContainerBuilder.layout(this, layout);
+        return glayouting_1.GLayoutingBuilder.layout(this, layout);
     }
 }
 exports.GNodeBuilder = GNodeBuilder;

package/lib/gnode.js.map

@@ -1 +1 @@
-{"version":3,"file":"gnode.js","sourceRoot":"","sources":["../src/gnode.ts"],"names":[],"mappings":";;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAsD;AACtD,2DAAgF;AAChF,qDAAuE;AAEvE,MAAa,KAAM,SAAQ,8BAAa;IAAxC;;QAKa,SAAI,GAAG,uBAAY,CAAC,IAAI,CAAC;QAElC,QAAkB,GAAG,IAAI,CAAC;IAC9B,CAAC;IAPG,MAAM,CAAC,OAAO;QACV,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,uBAAY,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;CAKJ;AARD,sBAQC;KADI,oCAAgB;AAGrB,MAAa,YAAsC,SAAQ,qCAAuB;IAC9E,MAAM,CAAC,MAAe;QAClB,OAAO,2CAAuB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;CACJ;AAJD,oCAIC"}
+{"version":3,"file":"gnode.js","sourceRoot":"","sources":["../src/gnode.ts"],"names":[],"mappings":";;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAsD;AACtD,yDAA6F;AAC7F,6CAA6D;AAC7D,qDAAuE;AAEvE,MAAa,KAAM,SAAQ,8BAAa;IAAxC;;QAKa,SAAI,GAAG,uBAAY,CAAC,IAAI,CAAC;QAGlC,QAAiB,GAAG,IAAI,CAAC;QACzB,QAAY,GAAG,IAAI,CAAC;IACxB,CAAC;IATG,MAAM,CAAC,OAAO;QACV,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,uBAAY,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;CAOJ;AAVD,sBAUC;KAFI,kCAAe,OACf,uBAAU;AAGf,MAAa,YAAsC,SAAQ,qCAAuB;IAC9E,aAAa,CAAC,SAAyB;QACnC,OAAO,yCAAsB,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,MAAe;QAClB,OAAO,8BAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;CACJ;AARD,oCAQC"}

package/lib/gshape-element.d.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { Args, Dimension, JsonPrimitive, Point } from '@eclipse-glsp/protocol';
-import { GBoundsAware } from './gbound-aware';
+import { GBoundsAware } from './gbounds-aware';
 import { GLayoutable } from './glayoutable';
 import { GModelElement, GModelElementBuilder } from './gmodel-element';
 export declare abstract class GShapeElement extends GModelElement implements GBoundsAware, GLayoutable {

package/lib/gshape-element.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gshape-element.d.ts","sourceRoot":"","sources":["../src/gshape-element.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAuB,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAsB,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,8BAAsB,aAAc,SAAQ,aAAc,YAAW,YAAY,EAAE,WAAW;IAC1F,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC;IAChB,IAAI,EAAE,SAAS,CAAC;IAChB,CAAC,YAAY,CAAC,UAAQ;IACtB,CAAC,WAAW,CAAC,UAAQ;CACxB;AAED,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IACtF,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IACpC,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI;IAK/B,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IACzC,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAK3B,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAIxD,gBAAgB,CAAC,aAAa,EAAE,IAAI,GAAG,IAAI;IAC3C,gBAAgB,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,IAAI;CAIpE"}
+{"version":3,"file":"gshape-element.d.ts","sourceRoot":"","sources":["../src/gshape-element.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAsB,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,8BAAsB,aAAc,SAAQ,aAAc,YAAW,YAAY,EAAE,WAAW;IAC1F,aAAa,CAAC,EAAE,IAAI,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC;IAChB,IAAI,EAAE,SAAS,CAAC;IAChB,CAAC,YAAY,CAAC,UAAQ;IACtB,CAAC,WAAW,CAAC,UAAQ;CACxB;AAED,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IACtF,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IACpC,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI;IAK/B,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IACzC,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAK3B,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAIxD,gBAAgB,CAAC,aAAa,EAAE,IAAI,GAAG,IAAI;IAC3C,gBAAgB,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,IAAI;CAIpE"}

package/lib/gshape-element.js

@@ -2,7 +2,7 @@
 var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GShapeElementBuilder = exports.GShapeElement = void 0;
-const gbound_aware_1 = require("./gbound-aware");
+const gbounds_aware_1 = require("./gbounds-aware");
 const glayoutable_1 = require("./glayoutable");
 const gmodel_element_1 = require("./gmodel-element");
 class GShapeElement extends gmodel_element_1.GModelElement {
@@ -13,13 +13,13 @@ class GShapeElement extends gmodel_element_1.GModelElement {
     }
 }
 exports.GShapeElement = GShapeElement;
-_a = gbound_aware_1.GBoundsAware, _b = glayoutable_1.GLayoutable;
+_a = gbounds_aware_1.GBoundsAware, _b = glayoutable_1.GLayoutable;
 class GShapeElementBuilder extends gmodel_element_1.GModelElementBuilder {
     position(pointOrX, y) {
-        return gbound_aware_1.GBoundsAwareBuilder.position(this, pointOrX, y);
+        return gbounds_aware_1.GBoundsAwareBuilder.position(this, pointOrX, y);
     }
     size(sizeOrWidth, height) {
-        return gbound_aware_1.GBoundsAwareBuilder.size(this, sizeOrWidth, height);
+        return gbounds_aware_1.GBoundsAwareBuilder.size(this, sizeOrWidth, height);
     }
     addLayoutOption(key, value) {
         return glayoutable_1.GLayoutableBuilder.addLayoutOption(this, key, value);

package/lib/gshape-element.js.map

@@ -1 +1 @@
-{"version":3,"file":"gshape-element.js","sourceRoot":"","sources":["../src/gshape-element.ts"],"names":[],"mappings":";;;;AAgBA,iDAAmE;AACnE,+CAAgE;AAChE,qDAAuE;AAEvE,MAAsB,aAAc,SAAQ,8BAAa;IAAzD;;QAII,QAAc,GAAG,IAAI,CAAC;QACtB,QAAa,GAAG,IAAI,CAAC;IACzB,CAAC;CAAA;AAND,sCAMC;KAFI,2BAAY,OACZ,yBAAW;AAGhB,MAAa,oBAA8C,SAAQ,qCAAuB;IAGtF,QAAQ,CAAC,QAAwB,EAAE,CAAU;QACzC,OAAO,kCAAmB,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;IAID,IAAI,CAAC,WAA+B,EAAE,MAAe;QACjD,OAAO,kCAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,eAAe,CAAC,GAAW,EAAE,KAAoB;QAC7C,OAAO,gCAAkB,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IAID,gBAAgB,CAAC,aAAgD;QAC7D,OAAO,gCAAkB,CAAC,gBAAgB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACpE,CAAC;CACJ;AAtBD,oDAsBC"}
+{"version":3,"file":"gshape-element.js","sourceRoot":"","sources":["../src/gshape-element.ts"],"names":[],"mappings":";;;;AAgBA,mDAAoE;AACpE,+CAAgE;AAChE,qDAAuE;AAEvE,MAAsB,aAAc,SAAQ,8BAAa;IAAzD;;QAII,QAAc,GAAG,IAAI,CAAC;QACtB,QAAa,GAAG,IAAI,CAAC;IACzB,CAAC;CAAA;AAND,sCAMC;KAFI,4BAAY,OACZ,yBAAW;AAGhB,MAAa,oBAA8C,SAAQ,qCAAuB;IAGtF,QAAQ,CAAC,QAAwB,EAAE,CAAU;QACzC,OAAO,mCAAmB,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;IAID,IAAI,CAAC,WAA+B,EAAE,MAAe;QACjD,OAAO,mCAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,eAAe,CAAC,GAAW,EAAE,KAAoB;QAC7C,OAAO,gCAAkB,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IAID,gBAAgB,CAAC,aAAgD;QAC7D,OAAO,gCAAkB,CAAC,gBAAgB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACpE,CAAC;CACJ;AAtBD,oDAsBC"}

package/lib/{gpre-shape-prerendered-element.d.ts → gshaped-prerendered-element.d.ts}

@@ -15,7 +15,7 @@
  ********************************************************************************/
 import { Dimension, Point } from '@eclipse-glsp/protocol';
 import { GAlignable } from './galignable';
-import { GBoundsAware } from './gbound-aware';
+import { GBoundsAware } from './gbounds-aware';
 import { GModelElementBuilder } from './gmodel-element';
 import { GPreRenderedElement } from './gpre-rendered-element';
 /**
@@ -25,19 +25,19 @@ import { GPreRenderedElement } from './gpre-rendered-element';
  * A popup model is rendered when hovering over a element and for many common use cases e.g rendering a tooltip
  * this model can be computed entirely on the server side.
  */
-export declare class GShapePreRenderedElement extends GPreRenderedElement implements GBoundsAware, GAlignable {
+export declare class GShapedPreRenderedElement extends GPreRenderedElement implements GBoundsAware, GAlignable {
     static builder(): GShapePreRenderedElementBuilder;
-    [GBoundsAware]: boolean;
-    [GAlignable]: boolean;
     position: Point;
     size: Dimension;
     alignment: Point;
+    [GBoundsAware]: boolean;
+    [GAlignable]: boolean;
 }
-export declare class GShapePreRenderedElementBuilder<G extends GShapePreRenderedElement = GShapePreRenderedElement> extends GModelElementBuilder<G> {
+export declare class GShapePreRenderedElementBuilder<G extends GShapedPreRenderedElement = GShapedPreRenderedElement> extends GModelElementBuilder<G> {
     code(code: string): this;
     position(x: number, y: number): this;
     position(position: Point): this;
     size(width: number, height: number): this;
     size(size: Dimension): this;
 }
-//# sourceMappingURL=gpre-shape-prerendered-element.d.ts.map
+//# sourceMappingURL=gshaped-prerendered-element.d.ts.map

package/lib/gshaped-prerendered-element.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gshaped-prerendered-element.d.ts","sourceRoot":"","sources":["../src/gshaped-prerendered-element.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D;;;;;;GAMG;AACH,qBAAa,yBAA0B,SAAQ,mBAAoB,YAAW,YAAY,EAAE,UAAU;WAClF,OAAO,IAAI,+BAA+B;IAI1D,QAAQ,EAAE,KAAK,CAAC;IAChB,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,KAAK,CAAC;IACjB,CAAC,YAAY,CAAC,UAAQ;IACtB,CAAC,UAAU,CAAC,UAAQ;CACvB;AAED,qBAAa,+BAA+B,CACxC,CAAC,SAAS,yBAAyB,GAAG,yBAAyB,CACjE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAC7B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IACpC,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI;IAK/B,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IACzC,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAI9B"}

package/lib/{gpre-shape-prerendered-element.js → gshaped-prerendered-element.js}

@@ -16,9 +16,9 @@
  ********************************************************************************/
 var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GShapePreRenderedElementBuilder = exports.GShapePreRenderedElement = void 0;
+exports.GShapePreRenderedElementBuilder = exports.GShapedPreRenderedElement = void 0;
 const galignable_1 = require("./galignable");
-const gbound_aware_1 = require("./gbound-aware");
+const gbounds_aware_1 = require("./gbounds-aware");
 const gmodel_element_1 = require("./gmodel-element");
 const gpre_rendered_element_1 = require("./gpre-rendered-element");
 /**
@@ -28,29 +28,29 @@ const gpre_rendered_element_1 = require("./gpre-rendered-element");
  * A popup model is rendered when hovering over a element and for many common use cases e.g rendering a tooltip
  * this model can be computed entirely on the server side.
  */
-class GShapePreRenderedElement extends gpre_rendered_element_1.GPreRenderedElement {
+class GShapedPreRenderedElement extends gpre_rendered_element_1.GPreRenderedElement {
     constructor() {
         super(...arguments);
         this[_a] = true;
         this[_b] = true;
     }
     static builder() {
-        return new GShapePreRenderedElementBuilder(GShapePreRenderedElement);
+        return new GShapePreRenderedElementBuilder(GShapedPreRenderedElement);
     }
 }
-exports.GShapePreRenderedElement = GShapePreRenderedElement;
-_a = gbound_aware_1.GBoundsAware, _b = galignable_1.GAlignable;
+exports.GShapedPreRenderedElement = GShapedPreRenderedElement;
+_a = gbounds_aware_1.GBoundsAware, _b = galignable_1.GAlignable;
 class GShapePreRenderedElementBuilder extends gmodel_element_1.GModelElementBuilder {
     code(code) {
         this.proxy.code = code;
         return this;
     }
     position(pointOrX, y) {
-        return gbound_aware_1.GBoundsAwareBuilder.position(this, pointOrX, y);
+        return gbounds_aware_1.GBoundsAwareBuilder.position(this, pointOrX, y);
     }
     size(sizeOrWidth, height) {
-        return gbound_aware_1.GBoundsAwareBuilder.size(this, sizeOrWidth, height);
+        return gbounds_aware_1.GBoundsAwareBuilder.size(this, sizeOrWidth, height);
     }
 }
 exports.GShapePreRenderedElementBuilder = GShapePreRenderedElementBuilder;
-//# sourceMappingURL=gpre-shape-prerendered-element.js.map
+//# sourceMappingURL=gshaped-prerendered-element.js.map

package/lib/gshaped-prerendered-element.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gshaped-prerendered-element.js","sourceRoot":"","sources":["../src/gshaped-prerendered-element.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;AAGlF,6CAA0C;AAC1C,mDAAoE;AACpE,qDAAwD;AACxD,mEAA8D;AAE9D;;;;;;GAMG;AACH,MAAa,yBAA0B,SAAQ,2CAAmB;IAAlE;;QAQI,QAAc,GAAG,IAAI,CAAC;QACtB,QAAY,GAAG,IAAI,CAAC;IACxB,CAAC;IATG,MAAM,CAAU,OAAO;QACnB,OAAO,IAAI,+BAA+B,CAAC,yBAAyB,CAAC,CAAC;IAC1E,CAAC;CAOJ;AAVD,8DAUC;KAFI,4BAAY,OACZ,uBAAU;AAGf,MAAa,+BAEX,SAAQ,qCAAuB;IAC7B,IAAI,CAAC,IAAY;QACb,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAID,QAAQ,CAAC,QAAwB,EAAE,CAAU;QACzC,OAAO,mCAAmB,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;IAID,IAAI,CAAC,WAA+B,EAAE,MAAe;QACjD,OAAO,mCAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACJ;AAnBD,0EAmBC"}

package/lib/index.d.ts

@@ -15,21 +15,22 @@
  ********************************************************************************/
 export * from './default-types';
 export * from './galignable';
-export * from './gbound-aware';
+export * from './gbounds-aware';
 export * from './gbutton';
 export * from './gcompartment';
 export * from './gedge';
 export * from './gedge-layoutable';
 export * from './ggraph';
+export * from './ghtmlroot';
 export * from './gissue-marker';
 export * from './glabel';
-export * from './glayout-container';
 export * from './glayoutable';
+export * from './glayouting';
 export * from './gmodel-element';
 export * from './gmodel-util';
 export * from './gnode';
 export * from './gport';
 export * from './gpre-rendered-element';
-export * from './gpre-shape-prerendered-element';
 export * from './gshape-element';
+export * from './gshaped-prerendered-element';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,yBAAyB,CAAC;AACxC,cAAc,kCAAkC,CAAC;AACjD,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,+BAA+B,CAAC"}

package/lib/index.js

@@ -27,21 +27,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
  ********************************************************************************/
 __exportStar(require("./default-types"), exports);
 __exportStar(require("./galignable"), exports);
-__exportStar(require("./gbound-aware"), exports);
+__exportStar(require("./gbounds-aware"), exports);
 __exportStar(require("./gbutton"), exports);
 __exportStar(require("./gcompartment"), exports);
 __exportStar(require("./gedge"), exports);
 __exportStar(require("./gedge-layoutable"), exports);
 __exportStar(require("./ggraph"), exports);
+__exportStar(require("./ghtmlroot"), exports);
 __exportStar(require("./gissue-marker"), exports);
 __exportStar(require("./glabel"), exports);
-__exportStar(require("./glayout-container"), exports);
 __exportStar(require("./glayoutable"), exports);
+__exportStar(require("./glayouting"), exports);
 __exportStar(require("./gmodel-element"), exports);
 __exportStar(require("./gmodel-util"), exports);
 __exportStar(require("./gnode"), exports);
 __exportStar(require("./gport"), exports);
 __exportStar(require("./gpre-rendered-element"), exports);
-__exportStar(require("./gpre-shape-prerendered-element"), exports);
 __exportStar(require("./gshape-element"), exports);
+__exportStar(require("./gshaped-prerendered-element"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,kDAAgC;AAChC,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,iDAA+B;AAC/B,0CAAwB;AACxB,qDAAmC;AACnC,2CAAyB;AACzB,kDAAgC;AAChC,2CAAyB;AACzB,sDAAoC;AACpC,gDAA8B;AAC9B,mDAAiC;AACjC,gDAA8B;AAC9B,0CAAwB;AACxB,0CAAwB;AACxB,0DAAwC;AACxC,mEAAiD;AACjD,mDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,kDAAgC;AAChC,+CAA6B;AAC7B,kDAAgC;AAChC,4CAA0B;AAC1B,iDAA+B;AAC/B,0CAAwB;AACxB,qDAAmC;AACnC,2CAAyB;AACzB,8CAA4B;AAC5B,kDAAgC;AAChC,2CAAyB;AACzB,gDAA8B;AAC9B,+CAA6B;AAC7B,mDAAiC;AACjC,gDAA8B;AAC9B,0CAAwB;AACxB,0CAAwB;AACxB,0DAAwC;AACxC,mDAAiC;AACjC,gEAA8C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/graph",
-  "version": "1.0.0",
+  "version": "1.1.0-RC02",
   "description": "The typescript implementation of the GLSP graphical model (GModel)",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -38,18 +38,19 @@
     "css"
   ],
   "dependencies": {
-    "@eclipse-glsp/protocol": "1.0.0"
+    "@eclipse-glsp/protocol": "1.1.0-RC02"
   },
   "devDependencies": {
     "@types/uuid": "8.3.1"
   },
   "scripts": {
+    "prepare": "yarn clean && yarn build && yarn lint",
     "clean": "rimraf tsconfig.tsbuildinfo lib",
-    "build": "yarn run clean && tsc",
+    "build": "tsc",
     "test": "mocha --config ../../.mocharc.json \"./src/**/*.spec.?(ts|tsx)\"",
     "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter",
-    "lint": "eslint -c ../../.eslintrc.js --ext .ts,.tsx ./src",
-    "lint:fix": "eslint --fix -c ../../.eslintrc.js --ext .ts,.tsx ./src",
+    "lint": "eslint --ext .ts,.tsx ./src",
+    "lint:fix": "eslint --fix --ext .ts,.tsx ./src",
     "watch": "tsc -w"
   },
   "publishConfig": {
@@ -57,5 +58,5 @@
   },
   "main": "lib/index",
   "types": "lib/index",
-  "gitHead": "cfb461fdc599bb4de5b7936b4bb502083d5ba3b0"
+  "gitHead": "f52c5f2339efb410872f353df0cc910868ddbdec"
 }

package/src/default-types.ts

@@ -18,15 +18,19 @@ import { GButton } from './gbutton';
 import { GCompartment } from './gcompartment';
 import { GEdge } from './gedge';
 import { GGraph } from './ggraph';
+import { GHtmlRoot } from './ghtmlroot';
 import { GIssueMarker } from './gissue-marker';
 import { GLabel } from './glabel';
-import { GModelElementConstructor, GModelRoot } from './gmodel-element';
+import { GModelElementConstructor } from './gmodel-element';
 import { GNode } from './gnode';
 import { GPort } from './gport';
 import { GPreRenderedElement } from './gpre-rendered-element';
-import { GShapePreRenderedElement } from './gpre-shape-prerendered-element';
+import { GShapedPreRenderedElement } from './gshaped-prerendered-element';
 
 export function getDefaultMapping(): Map<string, GModelElementConstructor> {
+    // The GModelSerializer (packages/server-node/src/features/model/gmodel-serializer.ts)
+    // has a built-in subtype handling.
+    // If the mapping for a subtype, e.g. for comp:header, is not found it will use the mapping for comp instead.
     const mapping = new Map<string, GModelElementConstructor>();
     mapping.set(types.GRAPH, GGraph);
     mapping.set(types.NODE, GNode);
@@ -37,8 +41,8 @@ export function getDefaultMapping(): Map<string, GModelElementConstructor> {
     mapping.set(types.BUTTON, GButton);
     mapping.set(types.ISSUE_MARKER, GIssueMarker);
 
-    mapping.set(types.HTML, GModelRoot);
+    mapping.set(types.HTML, GHtmlRoot);
     mapping.set(types.PRE_RENDERED, GPreRenderedElement);
-    mapping.set(types.FOREIGN_OBJECT, GShapePreRenderedElement);
+    mapping.set(types.FOREIGN_OBJECT, GShapedPreRenderedElement);
     return mapping;
 }

package/src/gcompartment.ts

@@ -13,35 +13,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Args, DefaultTypes, JsonPrimitive } from '@eclipse-glsp/protocol';
-import { GLayoutContainer, GLayoutContainerBuilder } from './glayout-container';
-import { GLayoutable, GLayoutableBuilder } from './glayoutable';
+import { DefaultTypes } from '@eclipse-glsp/protocol';
+import { GLayouting, GLayoutingBuilder } from './glayouting';
 import { GShapeElement, GShapeElementBuilder } from './gshape-element';
 
-export class GCompartment extends GShapeElement implements GLayoutContainer, GLayoutable {
+export class GCompartment extends GShapeElement implements GLayouting {
     static builder(): GCompartmentBuilder {
         return new GCompartmentBuilder(GCompartment).type(DefaultTypes.COMPARTMENT);
     }
 
     override type = DefaultTypes.COMPARTMENT;
     layout?: string;
-    override layoutOptions?: Args;
-    [GLayoutContainer] = true;
-    [GLayoutable] = true;
+    [GLayouting] = true;
 }
 
 export class GCompartmentBuilder<G extends GCompartment = GCompartment> extends GShapeElementBuilder<G> {
     layout(layout?: string): this {
-        return GLayoutContainerBuilder.layout(this, layout);
-    }
-
-    override addLayoutOption(key: string, value: JsonPrimitive): this {
-        return GLayoutableBuilder.addLayoutOption(this, key, value);
-    }
-
-    override addLayoutOptions(layoutOptions: Args): this;
-    override addLayoutOptions(layoutOptions: Map<string, JsonPrimitive>): this;
-    override addLayoutOptions(layoutOptions: Args | Map<string, JsonPrimitive>): this {
-        return GLayoutableBuilder.addLayoutOptions(this, layoutOptions);
+        return GLayoutingBuilder.layout(this, layout);
     }
 }

package/src/gedge-layoutable.ts

@@ -17,7 +17,7 @@ import { GModelElement, GModelElementBuilder } from './gmodel-element';
 
 export type EdgeSide = 'left' | 'right' | 'top' | 'bottom' | 'on';
 
-export class EdgePlacement extends Object {
+export interface GEdgePlacement {
     rotate: boolean;
     side: EdgeSide;
     position: number;
@@ -27,7 +27,7 @@ export class EdgePlacement extends Object {
 export const GEdgeLayoutable = Symbol('GEdgeLayoutable');
 
 export interface GEdgeLayoutable {
-    edgePlacement?: EdgePlacement;
+    edgePlacement?: GEdgePlacement;
     [GEdgeLayoutable]: boolean;
 }
 
@@ -38,7 +38,7 @@ export function isGEdgeLayoutable<G extends GModelElement>(element: G): element
 export type GEdgeLayoutableBuilder<G extends GModelElement = GModelElement> = GModelElementBuilder<G & GEdgeLayoutable>;
 
 export namespace GEdgeLayoutableBuilder {
-    export function edgePlacement<B extends GEdgeLayoutableBuilder>(builder: B, placement?: EdgePlacement): B {
+    export function edgePlacement<B extends GEdgeLayoutableBuilder>(builder: B, placement?: GEdgePlacement): B {
         builder['proxy'].edgePlacement = placement;
         return builder;
     }

package/src/ggraph.ts

@@ -19,11 +19,12 @@
  * Parts of the implementation is derived from Sprotty's SModel API
  * (https://github.com/eclipse/sprotty/blob/master/packages/sprotty/src/base/model/smodel.ts)
  */
-import { DefaultTypes as types, Dimension, Point } from '@eclipse-glsp/protocol';
-import { GBoundsAware, GBoundsAwareBuilder } from './gbound-aware';
+import { Args, DefaultTypes as types, Dimension, JsonPrimitive, Point } from '@eclipse-glsp/protocol';
+import { GBoundsAware, GBoundsAwareBuilder } from './gbounds-aware';
+import { GLayoutable, GLayoutableBuilder } from './glayoutable';
 import { GModelRoot, GModelRootBuilder } from './gmodel-element';
 
-export class GGraph extends GModelRoot implements GBoundsAware {
+export class GGraph extends GModelRoot implements GBoundsAware, GLayoutable {
     static override builder(): GGraphBuilder {
         return new GGraphBuilder(GGraph);
     }
@@ -31,7 +32,9 @@ export class GGraph extends GModelRoot implements GBoundsAware {
     override type = types.GRAPH;
     position: Point = Point.ORIGIN;
     size?: Dimension;
+    layoutOptions?: Args;
     [GBoundsAware] = true;
+    [GLayoutable] = true;
 }
 
 export class GGraphBuilder<G extends GGraph = GGraph> extends GModelRootBuilder<G> {
@@ -46,4 +49,14 @@ export class GGraphBuilder<G extends GGraph = GGraph> extends GModelRootBuilder<
     size(sizeOrWidth: Dimension | number, height?: number): this {
         return GBoundsAwareBuilder.size(this, sizeOrWidth, height);
     }
+
+    addLayoutOption(key: string, value: JsonPrimitive): this {
+        return GLayoutableBuilder.addLayoutOption(this, key, value);
+    }
+
+    addLayoutOptions(layoutOptions: Args): this;
+    addLayoutOptions(layoutOptions: Map<string, JsonPrimitive>): this;
+    addLayoutOptions(layoutOptions: Args | Map<string, JsonPrimitive>): this {
+        return GLayoutableBuilder.addLayoutOptions(this, layoutOptions);
+    }
 }

package/src/ghtmlroot.ts

@@ -0,0 +1,38 @@
+/********************************************************************************
+ * Copyright (c) 2022 StMicroelectronics.
+ *
+ * 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 { DefaultTypes as types, flatPush, MaybeArray } from '@eclipse-glsp/protocol';
+import { GModelRoot, GModelRootBuilder } from './gmodel-element';
+
+/**
+ * Root model element class for HTML content. Usually this is rendered with a `div` DOM element.
+ */
+export class GHtmlRoot extends GModelRoot {
+    static override builder(): GHtmlRootBuilder {
+        return new GHtmlRootBuilder(GHtmlRoot);
+    }
+
+    override type = types.HTML;
+    classes: string[] = [];
+}
+
+export class GHtmlRootBuilder<G extends GHtmlRoot = GHtmlRoot> extends GModelRootBuilder<G> {
+    addClasses(classes: string[]): this;
+    addClasses(...classes: string[]): this;
+    addClasses(...classes: MaybeArray<string>[]): this {
+        flatPush(this.proxy.classes, classes);
+        return this;
+    }
+}

package/src/gissue-marker.ts

@@ -24,6 +24,10 @@ export class GIssue {
 }
 
 export class GIssueMarker extends GShapeElement {
+    static builder(): GIssueMarkerBuilder {
+        return new GIssueMarkerBuilder(GIssueMarker).type(DefaultTypes.ISSUE_MARKER);
+    }
+
     override type = DefaultTypes.ISSUE_MARKER;
     issues: GIssue[] = [];
 }

package/src/glabel.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 import { DefaultTypes, Point } from '@eclipse-glsp/protocol';
 import { GAlignable, GAlignableBuilder } from './galignable';
-import { EdgePlacement, GEdgeLayoutable, GEdgeLayoutableBuilder } from './gedge-layoutable';
+import { GEdgeLayoutable, GEdgeLayoutableBuilder, GEdgePlacement } from './gedge-layoutable';
 import { GModelElementConstructor } from './gmodel-element';
 import { GShapeElement, GShapeElementBuilder } from './gshape-element';
 
@@ -27,7 +27,7 @@ export class GLabel extends GShapeElement implements GAlignable, GEdgeLayoutable
     override type = DefaultTypes.LABEL;
     text: string;
     alignment: Point = Point.ORIGIN;
-    edgePlacement?: EdgePlacement;
+    edgePlacement?: GEdgePlacement;
     [GAlignable] = true;
     [GEdgeLayoutable] = true;
 }
@@ -44,7 +44,7 @@ export class GLabelBuilder<G extends GLabel = GLabel> extends GShapeElementBuild
         return this;
     }
 
-    edgePlacement(placement: EdgePlacement): this {
+    edgePlacement(placement: GEdgePlacement): this {
         return GEdgeLayoutableBuilder.edgePlacement(this, placement);
     }
 }

package/src/{glayout-container.ts → glayouting.ts}

@@ -15,21 +15,21 @@
  ********************************************************************************/
 import { GModelElement, GModelElementBuilder } from './gmodel-element';
 
-export const GLayoutContainer = Symbol('GLayoutContainer');
+export const GLayouting = Symbol('GLayouting');
 
-export interface GLayoutContainer {
+export interface GLayouting {
     layout?: string;
-    [GLayoutContainer]: boolean;
+    [GLayouting]: boolean;
 }
 
-export function isGLayoutContainer<G extends GModelElement>(element: G): element is G & GLayoutContainer {
-    return ((element as any)[GLayoutContainer] = true);
+export function isGLayouting<G extends GModelElement>(element: G): element is G & GLayouting {
+    return ((element as any)[GLayouting] = true);
 }
 
-export type GLayoutContainerBuilder = GModelElementBuilder<GModelElement & GLayoutContainer>;
+export type GLayoutingBuilder = GModelElementBuilder<GModelElement & GLayouting>;
 
-export namespace GLayoutContainerBuilder {
-    export function layout<B extends GLayoutContainerBuilder>(builder: B, newLayout?: string): B {
+export namespace GLayoutingBuilder {
+    export function layout<B extends GLayoutingBuilder>(builder: B, newLayout?: string): B {
         builder['proxy'].layout = newLayout;
         return builder;
     }

package/src/gmodel-element.ts

@@ -63,7 +63,8 @@ export abstract class GModelElement implements GModelElementSchema {
      * A set of css classes that should be applied to the DOM element that corresponds to this element.
      */
     cssClasses: string[] = [];
-    /** A `GModelElement can have an arbitrary amount of children. This parent-child relation ship is also reflected in
+    /**
+     * A `GModelElement can have an arbitrary amount of children. This parent-child relation ship is also reflected in
      * the corresponding DOM element i.e. DOM elements that reflect children of this element are also children
      * of the DOM element that reflects this element.
      */
@@ -194,7 +195,7 @@ export class GModelRoot extends GModelElement implements SModelRootSchema {
     }
 
     canvasBounds?: Bounds;
-    revision = 0;
+    revision?: number;
 }
 
 export class GModelRootBuilder<G extends GModelRoot = GModelRoot> extends GModelElementBuilder<G> {

package/src/gnode.ts

@@ -14,21 +14,28 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { DefaultTypes } from '@eclipse-glsp/protocol';
-import { GLayoutContainer, GLayoutContainerBuilder } from './glayout-container';
+import { GEdgeLayoutable, GEdgeLayoutableBuilder, GEdgePlacement } from './gedge-layoutable';
+import { GLayouting, GLayoutingBuilder } from './glayouting';
 import { GShapeElement, GShapeElementBuilder } from './gshape-element';
 
-export class GNode extends GShapeElement implements GLayoutContainer {
+export class GNode extends GShapeElement implements GEdgeLayoutable, GLayouting {
     static builder(): GNodeBuilder {
         return new GNodeBuilder(GNode).type(DefaultTypes.NODE);
     }
 
     override type = DefaultTypes.NODE;
+    edgePlacement?: GEdgePlacement;
     layout?: string;
-    [GLayoutContainer] = true;
+    [GEdgeLayoutable] = true;
+    [GLayouting] = true;
 }
 
 export class GNodeBuilder<G extends GNode = GNode> extends GShapeElementBuilder<G> {
+    edgePlacement(placement: GEdgePlacement): this {
+        return GEdgeLayoutableBuilder.edgePlacement(this, placement);
+    }
+
     layout(layout?: string): this {
-        return GLayoutContainerBuilder.layout(this, layout);
+        return GLayoutingBuilder.layout(this, layout);
     }
 }

package/src/gshape-element.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { Args, Dimension, JsonPrimitive, Point } from '@eclipse-glsp/protocol';
-import { GBoundsAware, GBoundsAwareBuilder } from './gbound-aware';
+import { GBoundsAware, GBoundsAwareBuilder } from './gbounds-aware';
 import { GLayoutable, GLayoutableBuilder } from './glayoutable';
 import { GModelElement, GModelElementBuilder } from './gmodel-element';