@eclipse-glsp/graph 1.1.0-next.28838fb.26 → 1.1.0-next.35b3b9d.33

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';
 

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

@@ -16,7 +16,7 @@
 
 import { Dimension, Point } from '@eclipse-glsp/protocol';
 import { GAlignable } from './galignable';
-import { GBoundsAware, GBoundsAwareBuilder } from './gbound-aware';
+import { GBoundsAware, GBoundsAwareBuilder } from './gbounds-aware';
 import { GModelElementBuilder } from './gmodel-element';
 import { GPreRenderedElement } from './gpre-rendered-element';
 
@@ -27,20 +27,20 @@ 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 class GShapePreRenderedElement extends GPreRenderedElement implements GBoundsAware, GAlignable {
+export class GShapedPreRenderedElement extends GPreRenderedElement implements GBoundsAware, GAlignable {
     static override builder(): GShapePreRenderedElementBuilder {
-        return new GShapePreRenderedElementBuilder(GShapePreRenderedElement);
+        return new GShapePreRenderedElementBuilder(GShapedPreRenderedElement);
     }
 
-    [GBoundsAware] = true;
-    [GAlignable] = true;
     position: Point;
     size: Dimension;
     alignment: Point;
+    [GBoundsAware] = true;
+    [GAlignable] = true;
 }
 
 export class GShapePreRenderedElementBuilder<
-    G extends GShapePreRenderedElement = GShapePreRenderedElement
+    G extends GShapedPreRenderedElement = GShapedPreRenderedElement
 > extends GModelElementBuilder<G> {
     code(code: string): this {
         this.proxy.code = code;

package/src/index.ts

@@ -15,20 +15,21 @@
  ********************************************************************************/
 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';

package/lib/gbound-aware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"gbound-aware.d.ts","sourceRoot":"","sources":["../src/gbound-aware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,eAAO,MAAM,YAAY,eAAyB,CAAC;AAEnD,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,cAAc,CAAC,CAAC,SAAS,aAAa,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,YAAY,CAE/F;AAED,oBAAY,mBAAmB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI,oBAAoB,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC;AAElH,yBAAiB,mBAAmB,CAAC;IACjC,SAAgB,QAAQ,CAAC,CAAC,SAAS,mBAAmB,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,GAAG,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAQ3G;IAED,SAAgB,IAAI,CAAC,CAAC,SAAS,mBAAmB,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,SAAS,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAQnH;CACJ"}

package/lib/gbound-aware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"gbound-aware.js","sourceRoot":"","sources":["../src/gbound-aware.ts"],"names":[],"mappings":";;;AAkBa,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAQnD,SAAgB,cAAc,CAA0B,OAAU;IAC9D,OAAO,CAAE,OAAe,CAAC,oBAAY,CAAC,GAAG,IAAI,CAAC,CAAC;AACnD,CAAC;AAFD,wCAEC;AAID,IAAiB,mBAAmB,CAoBnC;AApBD,WAAiB,mBAAmB;IAChC,SAAgB,QAAQ,CAAgC,OAAU,EAAE,QAAwB,EAAE,CAAU;QACpG,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAC9B,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAC7B;aAAM,IAAI,CAAC,EAAE;YACV,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;SACvC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IARe,4BAAQ,WAQvB,CAAA;IAED,SAAgB,IAAI,CAAgC,OAAU,EAAE,WAA+B,EAAE,MAAe;QAC5G,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACjC,KAAK,CAAC,IAAI,GAAG,WAAW,CAAC;SAC5B;aAAM,IAAI,MAAM,EAAE;YACf,KAAK,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;SAC/C;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IARe,wBAAI,OAQnB,CAAA;AACL,CAAC,EApBgB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAoBnC"}

package/lib/glayout-container.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"glayout-container.d.ts","sourceRoot":"","sources":["../src/glayout-container.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,aAAa,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,gBAAgB,CAEvG;AAED,oBAAY,uBAAuB,GAAG,oBAAoB,CAAC,aAAa,GAAG,gBAAgB,CAAC,CAAC;AAE7F,yBAAiB,uBAAuB,CAAC;IACrC,SAAgB,MAAM,CAAC,CAAC,SAAS,uBAAuB,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,CAAC,CAG3F;CACJ"}

package/lib/glayout-container.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GLayoutContainerBuilder = exports.isGLayoutContainer = exports.GLayoutContainer = void 0;
-exports.GLayoutContainer = Symbol('GLayoutContainer');
-function isGLayoutContainer(element) {
-    return (element[exports.GLayoutContainer] = true);
-}
-exports.isGLayoutContainer = isGLayoutContainer;
-var GLayoutContainerBuilder;
-(function (GLayoutContainerBuilder) {
-    function layout(builder, newLayout) {
-        builder['proxy'].layout = newLayout;
-        return builder;
-    }
-    GLayoutContainerBuilder.layout = layout;
-})(GLayoutContainerBuilder = exports.GLayoutContainerBuilder || (exports.GLayoutContainerBuilder = {}));
-//# sourceMappingURL=glayout-container.js.map

package/lib/glayout-container.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"glayout-container.js","sourceRoot":"","sources":["../src/glayout-container.ts"],"names":[],"mappings":";;;AAiBa,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAO3D,SAAgB,kBAAkB,CAA0B,OAAU;IAClE,OAAO,CAAE,OAAe,CAAC,wBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC;AACvD,CAAC;AAFD,gDAEC;AAID,IAAiB,uBAAuB,CAKvC;AALD,WAAiB,uBAAuB;IACpC,SAAgB,MAAM,CAAoC,OAAU,EAAE,SAAkB;QACpF,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC;QACpC,OAAO,OAAO,CAAC;IACnB,CAAC;IAHe,8BAAM,SAGrB,CAAA;AACL,CAAC,EALgB,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAKvC"}

package/lib/gpre-shape-prerendered-element.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"gpre-shape-prerendered-element.d.ts","sourceRoot":"","sources":["../src/gpre-shape-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,gBAAgB,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,mBAAoB,YAAW,YAAY,EAAE,UAAU;WACjF,OAAO,IAAI,+BAA+B;IAI1D,CAAC,YAAY,CAAC,UAAQ;IACtB,CAAC,UAAU,CAAC,UAAQ;IACpB,QAAQ,EAAE,KAAK,CAAC;IAChB,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,KAAK,CAAC;CACpB;AAED,qBAAa,+BAA+B,CACxC,CAAC,SAAS,wBAAwB,GAAG,wBAAwB,CAC/D,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.map

@@ -1 +0,0 @@
-{"version":3,"file":"gpre-shape-prerendered-element.js","sourceRoot":"","sources":["../src/gpre-shape-prerendered-element.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;AAGlF,6CAA0C;AAC1C,iDAAmE;AACnE,qDAAwD;AACxD,mEAA8D;AAE9D;;;;;;GAMG;AACH,MAAa,wBAAyB,SAAQ,2CAAmB;IAAjE;;QAKI,QAAc,GAAG,IAAI,CAAC;QACtB,QAAY,GAAG,IAAI,CAAC;IAIxB,CAAC;IATG,MAAM,CAAU,OAAO;QACnB,OAAO,IAAI,+BAA+B,CAAC,wBAAwB,CAAC,CAAC;IACzE,CAAC;CAOJ;AAVD,4DAUC;KALI,2BAAY,OACZ,uBAAU;AAMf,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,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;CACJ;AAnBD,0EAmBC"}