@eclipse-glsp/graph 1.1.0-next.cfb461f.25 → 1.1.0-next.dc6b980.47

package/lib/{glayout-container.d.ts → glayouting.d.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * 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
@@ -14,14 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { GModelElement, GModelElementBuilder } from './gmodel-element';
-export declare const GLayoutContainer: unique symbol;
-export interface GLayoutContainer {
+export declare const GLayouting: unique symbol;
+export interface GLayouting {
     layout?: string;
-    [GLayoutContainer]: boolean;
+    [GLayouting]: boolean;
 }
-export declare function isGLayoutContainer<G extends GModelElement>(element: G): element is G & GLayoutContainer;
-export declare type GLayoutContainerBuilder = GModelElementBuilder<GModelElement & GLayoutContainer>;
-export declare namespace GLayoutContainerBuilder {
-    function layout<B extends GLayoutContainerBuilder>(builder: B, newLayout?: string): B;
+export declare function isGLayouting<G extends GModelElement>(element: G): element is G & GLayouting;
+export type GLayoutingBuilder = GModelElementBuilder<GModelElement & GLayouting>;
+export declare namespace GLayoutingBuilder {
+    function layout<B extends GLayoutingBuilder>(builder: B, newLayout?: string): B;
 }
-//# sourceMappingURL=glayout-container.d.ts.map
+//# sourceMappingURL=glayouting.d.ts.map

package/lib/glayouting.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"glayouting.d.ts","sourceRoot":"","sources":["../src/glayouting.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,eAAO,MAAM,UAAU,eAAuB,CAAC;AAE/C,MAAM,WAAW,UAAU;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,aAAa,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,UAAU,CAE3F;AAED,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,aAAa,GAAG,UAAU,CAAC,CAAC;AAEjF,yBAAiB,iBAAiB,CAAC;IAC/B,SAAgB,MAAM,CAAC,CAAC,SAAS,iBAAiB,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,CAAC,CAGrF;CACJ"}

package/lib/glayouting.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLayoutingBuilder = exports.isGLayouting = exports.GLayouting = void 0;
+exports.GLayouting = Symbol('GLayouting');
+function isGLayouting(element) {
+    return exports.GLayouting in element && element[exports.GLayouting] === true;
+}
+exports.isGLayouting = isGLayouting;
+var GLayoutingBuilder;
+(function (GLayoutingBuilder) {
+    function layout(builder, newLayout) {
+        builder['proxy'].layout = newLayout;
+        return builder;
+    }
+    GLayoutingBuilder.layout = layout;
+})(GLayoutingBuilder = exports.GLayoutingBuilder || (exports.GLayoutingBuilder = {}));
+//# sourceMappingURL=glayouting.js.map

package/lib/glayouting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"glayouting.js","sourceRoot":"","sources":["../src/glayouting.ts"],"names":[],"mappings":";;;AAiBa,QAAA,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAO/C,SAAgB,YAAY,CAA0B,OAAU;IAC5D,OAAO,kBAAU,IAAI,OAAO,IAAI,OAAO,CAAC,kBAAU,CAAC,KAAK,IAAI,CAAC;AACjE,CAAC;AAFD,oCAEC;AAID,IAAiB,iBAAiB,CAKjC;AALD,WAAiB,iBAAiB;IAC9B,SAAgB,MAAM,CAA8B,OAAU,EAAE,SAAkB;QAC9E,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC;QACpC,OAAO,OAAO,CAAC;IACnB,CAAC;IAHe,wBAAM,SAGrB,CAAA;AACL,CAAC,EALgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAKjC"}

package/lib/gmodel-element.d.ts

@@ -14,11 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { Args, Bounds, Dimension, JsonPrimitive, Point, SModelElementSchema, SModelRootSchema } from '@eclipse-glsp/protocol';
-export declare type GModelElementConstructor<G extends GModelElement = GModelElement> = new () => G;
+export type GModelElementConstructor<G extends GModelElement = GModelElement> = new () => G;
 /**
  * Represents a `GModeElement` serialized as plain JSON object.
  */
-export declare type GModelElementSchema = SModelElementSchema;
+export type GModelElementSchema = SModelElementSchema;
 export declare namespace GModelElementSchema {
     /**
      * Typeguard function to check wether the given object is an {@link GModelElementSchema}.
@@ -49,7 +49,8 @@ export declare 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.
      */
@@ -92,11 +93,11 @@ export declare abstract class GModelElementBuilder<G extends GModelElement> {
     addArgs(args: Args): this;
     addArgs(args: Map<string, JsonPrimitive>): this;
 }
-export declare type GModelRootSchema = SModelRootSchema;
+export type GModelRootSchema = SModelRootSchema;
 export declare class GModelRoot extends GModelElement implements SModelRootSchema {
     static builder(): GModelRootBuilder;
     canvasBounds?: Bounds;
-    revision: number;
+    revision?: number;
 }
 export declare class GModelRootBuilder<G extends GModelRoot = GModelRoot> extends GModelElementBuilder<G> {
     revision(revision: number): this;

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

@@ -1 +1 @@
-{"version":3,"file":"gmodel-element.d.ts","sourceRoot":"","sources":["../src/gmodel-element.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,IAAI,EACJ,MAAM,EACN,SAAS,EAET,aAAa,EAEb,KAAK,EACL,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAGhC,oBAAY,wBAAwB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI,UAAU,CAAC,CAAC;AAC5F;;GAEG;AACH,oBAAY,mBAAmB,GAAG,mBAAmB,CAAC;AAEtD,yBAAiB,mBAAmB,CAAC;IACjC;;;;OAIG;IACI,MAAM,EAAE,+BAAyB,CAAC;CAC5C;AAED;;;GAGG;AACH,8BAAsB,aAAc,YAAW,mBAAmB;IAC9D;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAC1B;;;OAGG;IACH,QAAQ,EAAE,aAAa,EAAE,CAAM;IAC/B;;OAEG;IACH,MAAM,EAAE,aAAa,CAAC;IACtB;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IAEZ;;OAEG;IACH,IAAI,IAAI,IAAI,UAAU,CAMrB;CACJ;AAED;;;;;GAKG;AACH,8BAAsB,oBAAoB,CAAC,CAAC,SAAS,aAAa;IAC9D,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;IACnB,SAAS,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC;gBAE9C,kBAAkB,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAQ3D,KAAK,IAAI,IAAI;IAKb,KAAK,IAAI,CAAC;IAaV,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAKpB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKnC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI;IACzC,aAAa,CAAC,GAAG,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI;IAM5C,GAAG,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAK/B,WAAW,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI;IAC5C,WAAW,CAAC,GAAG,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI;IAM/C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAQ/C,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IACzB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,IAAI;CAelD;AAED,oBAAY,gBAAgB,GAAG,gBAAgB,CAAC;AAEhD,qBAAa,UAAW,SAAQ,aAAc,YAAW,gBAAgB;IACrE,MAAM,CAAC,OAAO,IAAI,iBAAiB;IAInC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,SAAK;CAChB;AAED,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAC7F,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKhC,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IACpD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAWrC"}
+{"version":3,"file":"gmodel-element.d.ts","sourceRoot":"","sources":["../src/gmodel-element.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,IAAI,EACJ,MAAM,EACN,SAAS,EAET,aAAa,EAEb,KAAK,EACL,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAGhC,MAAM,MAAM,wBAAwB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI,UAAU,CAAC,CAAC;AAC5F;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AAEtD,yBAAiB,mBAAmB,CAAC;IACjC;;;;OAIG;IACI,MAAM,EAAE,+BAAyB,CAAC;CAC5C;AAED;;;GAGG;AACH,8BAAsB,aAAc,YAAW,mBAAmB;IAC9D;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,UAAU,EAAE,MAAM,EAAE,CAAM;IAC1B;;;;OAIG;IACH,QAAQ,EAAE,aAAa,EAAE,CAAM;IAC/B;;OAEG;IACH,MAAM,EAAE,aAAa,CAAC;IACtB;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IAEZ;;OAEG;IACH,IAAI,IAAI,IAAI,UAAU,CAMrB;CACJ;AAED;;;;;GAKG;AACH,8BAAsB,oBAAoB,CAAC,CAAC,SAAS,aAAa;IAC9D,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;IACnB,SAAS,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC;gBAE9C,kBAAkB,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAQ3D,KAAK,IAAI,IAAI;IAKb,KAAK,IAAI,CAAC;IAaV,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAKpB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKnC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI;IACzC,aAAa,CAAC,GAAG,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI;IAM5C,GAAG,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAK/B,WAAW,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI;IAC5C,WAAW,CAAC,GAAG,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI;IAM/C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAQ/C,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IACzB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,IAAI;CAelD;AAED,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,CAAC;AAEhD,qBAAa,UAAW,SAAQ,aAAc,YAAW,gBAAgB;IACrE,MAAM,CAAC,OAAO,IAAI,iBAAiB;IAInC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAC7F,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKhC,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IACpD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAWrC"}

package/lib/gmodel-element.js

@@ -37,7 +37,8 @@ class GModelElement {
          * A set of css classes that should be applied to the DOM element that corresponds to this element.
          */
         this.cssClasses = [];
-        /** 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.
          */
@@ -135,10 +136,6 @@ class GModelElementBuilder {
 }
 exports.GModelElementBuilder = GModelElementBuilder;
 class GModelRoot extends GModelElement {
-    constructor() {
-        super(...arguments);
-        this.revision = 0;
-    }
     static builder() {
         return new GModelRootBuilder(GModelRoot);
     }

package/lib/gmodel-element.js.map

@@ -1 +1 @@
-{"version":3,"file":"gmodel-element.js","sourceRoot":"","sources":["../src/gmodel-element.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gmodel-element.js","sourceRoot":"","sources":["../src/gmodel-element.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAUgC;AAChC,6BAA6B;AAQ7B,IAAiB,mBAAmB,CAOnC;AAPD,WAAiB,mBAAmB;IAChC;;;;OAIG;IACU,sBAAE,GAAG,8BAAmB,CAAC,EAAE,CAAC;AAC7C,CAAC,EAPgB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAOnC;AAED;;;GAGG;AACH,MAAsB,aAAa;IAAnC;QAcI;;WAEG;QACH,eAAU,GAAa,EAAE,CAAC;QAC1B;;;;WAIG;QACH,aAAQ,GAAoB,EAAE,CAAC;IAqBnC,CAAC;IAVG;;OAEG;IACH,IAAI,IAAI;QACJ,IAAI,OAAO,GAAkB,IAAI,CAAC;QAClC,OAAO,CAAC,CAAC,OAAO,YAAY,UAAU,CAAC,EAAE;YACrC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;SAC5B;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ;AA5CD,sCA4CC;AAED;;;;;GAKG;AACH,MAAsB,oBAAoB;IAItC,YAAY,kBAA+C;QACvD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK;QACD,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;QAC5D,IAAI,OAAO,CAAC,EAAE,KAAK,SAAS,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;SAClF;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;SACpF;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,EAAE,CAAC,EAAU;QACT,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,IAAY;QACb,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,WAAW,CAAC,QAAgB;QACxB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IAID,aAAa,CAAC,GAAG,UAAgC;QAC7C,IAAA,mBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,GAAG,CAAC,KAAoB;QACpB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IAChB,CAAC;IAID,WAAW,CAAC,GAAG,QAAqC;QAChD,IAAA,mBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,GAAW,EAAE,KAAoB;QACpC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YAClB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC;SACxB;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAID,OAAO,CAAC,IAAuC;QAC3C,MAAM,QAAQ,GAAS,EAAE,CAAC;QAC1B,IAAI,IAAI,YAAY,GAAG,EAAE;YACrB,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,CAAC,CAAC;SACrE;aAAM;YACH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACjE;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YACjB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SAC5C;aAAM;YACH,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;SAC9B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAxFD,oDAwFC;AAID,MAAa,UAAW,SAAQ,aAAa;IACzC,MAAM,CAAC,OAAO;QACV,OAAO,IAAI,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;CAIJ;AAPD,gCAOC;AAED,MAAa,iBAAqD,SAAQ,oBAAuB;IAC7F,QAAQ,CAAC,QAAgB;QACrB,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAID,YAAY,CAAC,gBAAgC,EAAE,IAAgB;QAC3D,IAAI,MAAc,CAAC;QACnB,IAAI,IAAI,EAAE;YACN,MAAM,mCAAQ,gBAAgB,GAAK,IAAI,CAAE,CAAC;SAC7C;aAAM;YACH,MAAM,GAAG,gBAA0B,CAAC;SACvC;QACD,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAlBD,8CAkBC"}

package/lib/gmodel-util.d.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { GModelElement, GModelElementConstructor } from '.';
-export declare type Predicate<T> = (element: T) => boolean;
+export type Predicate<T> = (element: T) => boolean;
 /**
  * Returns the first element matching the search predicate starting from the given
  * element and walking up the parent hierarchy.

package/lib/gmodel-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gmodel-util.d.ts","sourceRoot":"","sources":["../src/gmodel-util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,GAAG,CAAC;AAE5D,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,CAAC,aAAa,CAAC,GAAG,aAAa,GAAG,SAAS,CASvH;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,aAAa,EACrD,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACzC,CAAC,GAAG,SAAS,CAOf"}
+{"version":3,"file":"gmodel-util.d.ts","sourceRoot":"","sources":["../src/gmodel-util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,GAAG,CAAC;AAE5D,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,CAAC,aAAa,CAAC,GAAG,aAAa,GAAG,SAAS,CASvH;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,aAAa,EACrD,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACzC,CAAC,GAAG,SAAS,CAOf"}

package/lib/gnode.d.ts

@@ -1,12 +1,16 @@
-import { GLayoutContainer } from './glayout-container';
+import { GEdgeLayoutable, GEdgePlacement } from './gedge-layoutable';
+import { GLayouting } from './glayouting';
 import { GShapeElement, GShapeElementBuilder } from './gshape-element';
-export declare class GNode extends GShapeElement implements GLayoutContainer {
+export declare class GNode extends GShapeElement implements GEdgeLayoutable, GLayouting {
     static builder(): GNodeBuilder;
     type: string;
+    edgePlacement?: GEdgePlacement;
     layout?: string;
-    [GLayoutContainer]: boolean;
+    [GEdgeLayoutable]: boolean;
+    [GLayouting]: boolean;
 }
 export declare class GNodeBuilder<G extends GNode = GNode> extends GShapeElementBuilder<G> {
+    edgePlacement(placement: GEdgePlacement): this;
     layout(layout?: string): this;
 }
 //# sourceMappingURL=gnode.d.ts.map

package/lib/gnode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gnode.d.ts","sourceRoot":"","sources":["../src/gnode.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,gBAAgB,EAA2B,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,qBAAa,KAAM,SAAQ,aAAc,YAAW,gBAAgB;IAChE,MAAM,CAAC,OAAO,IAAI,YAAY;IAIrB,IAAI,SAAqB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,gBAAgB,CAAC,UAAQ;CAC7B;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAC9E,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;CAGhC"}
+{"version":3,"file":"gnode.d.ts","sourceRoot":"","sources":["../src/gnode.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAA0B,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAqB,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,qBAAa,KAAM,SAAQ,aAAc,YAAW,eAAe,EAAE,UAAU;IAC3E,MAAM,CAAC,OAAO,IAAI,YAAY;IAIrB,IAAI,SAAqB;IAClC,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,eAAe,CAAC,UAAQ;IACzB,CAAC,UAAU,CAAC,UAAQ;CACvB;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IAC9E,aAAa,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI;IAI9C,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;CAGhC"}

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -27,21 +31,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,8 +1,7 @@
 {
   "name": "@eclipse-glsp/graph",
-  "version": "1.1.0-next.cfb461f.25+cfb461f",
+  "version": "1.1.0-next.dc6b980.47+dc6b980",
   "description": "The typescript implementation of the GLSP graphical model (GModel)",
-  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
     "eclipse",
     "graphics",
@@ -12,15 +11,16 @@
     "glsp",
     "diagram editor"
   ],
-  "author": {
-    "name": "Eclipse GLSP"
-  },
   "homepage": "https://www.eclipse.org/glsp/",
+  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
   "repository": {
     "type": "git",
     "url": "https://github.com/eclipse-glsp/glsp-server-node.git"
   },
-  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
+  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
+  "author": {
+    "name": "Eclipse GLSP"
+  },
   "contributors": [
     {
       "name": "STMicroelectronics",
@@ -32,30 +32,31 @@
       "url": "https://projects.eclipse.org/projects/ecd.glsp"
     }
   ],
+  "main": "lib/index",
+  "types": "lib/index",
   "files": [
     "lib",
-    "src",
-    "css"
+    "src"
   ],
+  "scripts": {
+    "build": "tsc -b",
+    "clean": "rimraf lib tsconfig.tsbuildinfo coverage .nyc_output",
+    "lint": "eslint --ext .ts,.tsx ./src",
+    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
+    "prepare": "yarn clean && yarn build",
+    "test": "mocha --config ../../.mocharc \"./src/**/*.spec.?(ts|tsx)\"",
+    "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter",
+    "test:coverage": "nyc yarn test",
+    "watch": "tsc -w"
+  },
   "dependencies": {
-    "@eclipse-glsp/protocol": "1.0.0"
+    "@eclipse-glsp/protocol": "next"
   },
   "devDependencies": {
     "@types/uuid": "8.3.1"
   },
-  "scripts": {
-    "clean": "rimraf tsconfig.tsbuildinfo lib",
-    "build": "yarn run clean && 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",
-    "watch": "tsc -w"
-  },
   "publishConfig": {
     "access": "public"
   },
-  "main": "lib/index",
-  "types": "lib/index",
-  "gitHead": "cfb461fdc599bb4de5b7936b4bb502083d5ba3b0"
+  "gitHead": "dc6b980a473afbce8e304a2b68efe6877069dc97"
 }

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/galignable.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * 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
@@ -24,7 +24,7 @@ export interface GAlignable {
 }
 
 export function isGAlignable<G extends GModelElement>(element: G): element is G & GAlignable {
-    return ((element as any)[GAlignable] = true);
+    return GAlignable in element && element[GAlignable] === true;
 }
 
 export type GAlignableBuilder<G extends GModelElement = GModelElement> = GModelElementBuilder<G & GAlignable>;

package/src/{gbound-aware.ts → gbounds-aware.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * 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
@@ -25,7 +25,7 @@ export interface GBoundsAware {
 }
 
 export function isGBoundsAware<G extends GModelElement>(element: G): element is G & GBoundsAware {
-    return ((element as any)[GBoundsAware] = true);
+    return GBoundsAware in element && element[GBoundsAware] === true;
 }
 
 export type GBoundsAwareBuilder<G extends GModelElement = GModelElement> = GModelElementBuilder<G & GBoundsAware>;