@eclipse-glsp/graph 1.1.0-next.28838fb.26 → 1.1.0-next.2ae7567.68

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,4DAA0C;AAC1C,2CAAyB;AACzB,+CAA6B;AAC7B,kDAAgC;AAChC,2CAAyB;AACzB,gDAA8B;AAC9B,+CAA6B;AAC7B,mDAAiC;AACjC,gDAA8B;AAC9B,0CAAwB;AACxB,0CAAwB;AACxB,0DAAwC;AACxC,mDAAiC;AACjC,gEAA8C"}

package/{src/gmodel-element.spec.ts → lib/index.spec.d.ts}

@@ -13,6 +13,4 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-describe('foo', () => {
-    // Test stub
-});
+//# sourceMappingURL=index.spec.d.ts.map

package/lib/index.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.spec.d.ts","sourceRoot":"","sources":["../src/index.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF"}

package/lib/index.spec.js

@@ -0,0 +1,27 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2022 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
+ * 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
+ ********************************************************************************/
+/* note: this bogus test file is required so that
+   we are able to run mocha unit tests on this
+   package, without having any actual unit tests in it.
+   This way a coverage report will be generated,
+   showing 0% coverage, instead of no report.
+   This file can be removed once we have real unit
+   tests in place. */
+describe('graph package', () => {
+    it('should support code coverage statistics', () => true);
+});
+//# sourceMappingURL=index.spec.js.map

package/lib/index.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../src/index.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;AAElF;;;;;;qBAMqB;AAErB,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AAC9D,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@eclipse-glsp/graph",
-  "version": "1.1.0-next.28838fb.26+28838fb",
+  "version": "1.1.0-next.2ae7567.68+2ae7567",
   "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": "28838fbebe8da8b6c32f55f80ac08a83842f376c"
+  "gitHead": "2ae75670d3253d7d7e777c0941541411fba8bec6"
 }

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 './ghtml-root';
 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>;

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

@@ -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
@@ -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,18 +27,18 @@ export class EdgePlacement extends Object {
 export const GEdgeLayoutable = Symbol('GEdgeLayoutable');
 
 export interface GEdgeLayoutable {
-    edgePlacement?: EdgePlacement;
+    edgePlacement?: GEdgePlacement;
     [GEdgeLayoutable]: boolean;
 }
 
 export function isGEdgeLayoutable<G extends GModelElement>(element: G): element is G & GEdgeLayoutable {
-    return ((element as any)[GEdgeLayoutable] = true);
+    return GEdgeLayoutable in element && element[GEdgeLayoutable] === true;
 }
 
 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/gforeign-object-element.ts

@@ -0,0 +1,44 @@
+/********************************************************************************
+ * Copyright (c) 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
+ * 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 { GShapePreRenderedElementBuilder, GShapedPreRenderedElement } from './gshaped-prerendered-element';
+
+/**
+ * A `foreignObject` element to be transferred to the DOM within the SVG.
+ *
+ * This can be useful to to benefit from e.g. HTML rendering features, such as line wrapping, inside of
+ * the SVG diagram.  Note that `foreignObject` is not supported by all browsers and SVG viewers may not
+ * support rendering the `foreignObject` content.
+ *
+ * If no dimensions are specified in the schema element, this element will obtain the dimension of
+ * its parent to fill the entire available room. Thus, this element requires specified bounds itself
+ * or bounds to be available for its parent.
+ */
+export class GForeignObjectElement extends GShapedPreRenderedElement {
+    static override builder(): GForeignObjectElementBuilder {
+        return new GForeignObjectElementBuilder(GForeignObjectElement);
+    }
+    namespace: string;
+}
+
+export class GForeignObjectElementBuilder<
+    G extends GForeignObjectElement = GForeignObjectElement
+> extends GShapePreRenderedElementBuilder<G> {
+    namespace(namespace: string): this {
+        this.proxy.namespace = namespace;
+        return this;
+    }
+}

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/ghtml-root.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/glayoutable.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 GLayoutable {
 }
 
 export function isGLayoutable<G extends GModelElement>(element: G): element is G & GLayoutable {
-    return ((element as any)[GLayoutable] = true);
+    return GLayoutable in element && element[GLayoutable] === true;
 }
 
 export type GLayoutableBuilder = GModelElementBuilder<GModelElement & GLayoutable>;

package/src/{glayout-container.ts → glayouting.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
@@ -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 GLayouting in element && element[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

@@ -17,29 +17,16 @@ import {
     Args,
     Bounds,
     Dimension,
-    flatPush,
+    GModelElementSchema,
+    GModelRootSchema,
     JsonPrimitive,
     MaybeArray,
     Point,
-    SModelElementSchema,
-    SModelRootSchema
+    flatPush
 } from '@eclipse-glsp/protocol';
 import * as uuid from 'uuid';
 
 export type GModelElementConstructor<G extends GModelElement = GModelElement> = new () => G;
-/**
- * Represents a `GModeElement` serialized as plain JSON object.
- */
-export type GModelElementSchema = SModelElementSchema;
-
-export namespace GModelElementSchema {
-    /**
-     * Typeguard function to check wether the given object is an {@link GModelElementSchema}.
-     * @param object The object to check.
-     * @returns A type literal indicating wether the given object is of type {@link GModelElementSchema}.
-     */
-    export const is = SModelElementSchema.is;
-}
 
 /**
  * Base type for all elements of the graphical model.
@@ -63,7 +50,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.
      */
@@ -186,15 +174,13 @@ export abstract class GModelElementBuilder<G extends GModelElement> {
     }
 }
 
-export type GModelRootSchema = SModelRootSchema;
-
-export class GModelRoot extends GModelElement implements SModelRootSchema {
+export class GModelRoot extends GModelElement implements GModelRootSchema {
     static builder(): GModelRootBuilder {
         return new GModelRootBuilder(GModelRoot);
     }
 
     canvasBounds?: Bounds;
-    revision = 0;
+    revision?: number;
 }
 
 export class GModelRootBuilder<G extends GModelRoot = GModelRoot> extends GModelElementBuilder<G> {

package/src/gmodel-util.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,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { GModelElement, GModelElementConstructor } from '.';
+import { GModelElement, GModelElementConstructor } from './gmodel-element';
 
 export type Predicate<T> = (element: T) => boolean;
 

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;