@darajs/ui-causal-graph-editor 1.4.4 → 1.5.1

package/dist/shared/graph-layout/marketing-layout.d.ts

@@ -1,15 +1,24 @@
 import { LayoutMapping, XYPosition } from 'graphology-layout/utils';
-import { SimulationGraph } from '../../types';
+import { DirectionType, GraphTiers, SimulationGraph, TieredGraphLayoutBuilder } from '../../types';
 import { GraphLayout, GraphLayoutBuilder } from './common';
 export type TargetLocation = 'center' | 'bottom';
-declare class MarketingLayoutBuilder extends GraphLayoutBuilder<MarketingLayout> {
+declare class MarketingLayoutBuilder extends GraphLayoutBuilder<MarketingLayout> implements TieredGraphLayoutBuilder {
     _targetLocation: TargetLocation;
+    _tierSeparation: number;
+    orientation: DirectionType;
+    tiers: GraphTiers;
     /**
      * Sets the target location and returns the builder
      *
      * @param location location of the target node
      */
     targetLocation(location: TargetLocation): this;
+    /**
+     * Set tier separation
+     *
+     * @param separation separation
+     */
+    tierSeparation(separation: number): this;
     build(): MarketingLayout;
 }
 /**
@@ -20,6 +29,9 @@ declare class MarketingLayoutBuilder extends GraphLayoutBuilder<MarketingLayout>
  */
 export default class MarketingLayout extends GraphLayout {
     targetLocation: TargetLocation;
+    tierSeparation: number;
+    orientation: DirectionType;
+    tiers: GraphTiers;
     constructor(builder: MarketingLayoutBuilder);
     applyLayout(graph: SimulationGraph): Promise<{
         layout: LayoutMapping<XYPosition>;

package/dist/shared/graph-layout/marketing-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marketing-layout.d.ts","sourceRoot":"","sources":["../../../src/shared/graph-layout/marketing-layout.tsx"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEpE,OAAO,EAAE,eAAe,EAA2B,MAAM,aAAa,CAAC;AAEvE,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE3D,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEjD,cAAM,sBAAuB,SAAQ,kBAAkB,CAAC,eAAe,CAAC;IACpE,eAAe,EAAE,cAAc,CAAY;IAE3C;;;;OAIG;IACH,cAAc,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAK9C,KAAK,IAAI,eAAe;CAI3B;AAED;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,WAAW;IAC7C,cAAc,EAAE,cAAc,CAAY;gBAErC,OAAO,EAAE,sBAAsB;IAK3C,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC;QACzC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;KACrC,CAAC;IAqEF,MAAM,KAAK,OAAO,IAAI,sBAAsB,CAE3C;CACJ"}
+{"version":3,"file":"marketing-layout.d.ts","sourceRoot":"","sources":["../../../src/shared/graph-layout/marketing-layout.tsx"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEpE,OAAO,EACH,aAAa,EACb,UAAU,EACV,eAAe,EAEf,wBAAwB,EAC3B,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG3D,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEjD,cAAM,sBAAuB,SAAQ,kBAAkB,CAAC,eAAe,CAAE,YAAW,wBAAwB;IACxG,eAAe,EAAE,cAAc,CAAY;IAE3C,eAAe,SAAO;IAEtB,WAAW,EAAE,aAAa,CAAgB;IAE1C,KAAK,EAAE,UAAU,CAAC;IAElB;;;;OAIG;IACH,cAAc,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAK9C;;;;OAIG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAKxC,KAAK,IAAI,eAAe;CAI3B;AAED;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,WAAW;IAC7C,cAAc,EAAE,cAAc,CAAY;IAE1C,cAAc,EAAE,MAAM,CAAC;IAEvB,WAAW,EAAE,aAAa,CAAC;IAE3B,KAAK,EAAE,UAAU,CAAC;gBAEb,OAAO,EAAE,sBAAsB;IAQ3C,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC;QACzC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;KACrC,CAAC;IAyEF,MAAM,KAAK,OAAO,IAAI,sBAAsB,CAE3C;CACJ"}

package/dist/shared/graph-layout/marketing-layout.js

@@ -17,10 +17,13 @@
 import * as d3 from 'd3';
 import { getD3Data, nodesToLayout } from '../parsers';
 import { GraphLayout, GraphLayoutBuilder } from './common';
+import { applyTierForces } from './spring-layout';
 class MarketingLayoutBuilder extends GraphLayoutBuilder {
     constructor() {
         super(...arguments);
         this._targetLocation = 'bottom';
+        this._tierSeparation = 300;
+        this.orientation = 'horizontal';
     }
     /**
      * Sets the target location and returns the builder
@@ -31,6 +34,15 @@ class MarketingLayoutBuilder extends GraphLayoutBuilder {
         this._targetLocation = location;
         return this;
     }
+    /**
+     * Set tier separation
+     *
+     * @param separation separation
+     */
+    tierSeparation(separation) {
+        this._tierSeparation = separation;
+        return this;
+    }
     build() {
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         return new MarketingLayout(this);
@@ -47,6 +59,9 @@ export default class MarketingLayout extends GraphLayout {
         super(builder);
         this.targetLocation = 'bottom';
         this.targetLocation = builder._targetLocation;
+        this.tierSeparation = builder._tierSeparation;
+        this.orientation = builder.orientation;
+        this.tiers = builder.tiers;
     }
     applyLayout(graph) {
         const [edges, nodes] = getD3Data(graph);
@@ -95,6 +110,9 @@ export default class MarketingLayout extends GraphLayout {
             return node.group === 'other' ? 0.7 : 1;
         }))
             .stop();
+        if (this.tiers) {
+            applyTierForces(simulation, graph, nodes, this.tiers, this.tierSeparation, this.orientation);
+        }
         simulation.tick(1000);
         return Promise.resolve({ layout: nodesToLayout(simulation.nodes()) });
     }

package/dist/shared/graph-layout/marketing-layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketing-layout.js","sourceRoot":"","sources":["../../../src/shared/graph-layout/marketing-layout.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"marketing-layout.js","sourceRoot":"","sources":["../../../src/shared/graph-layout/marketing-layout.tsx"],"names":[],"mappings":"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"}

package/dist/shared/graph-layout/planar-layout.d.ts

@@ -1,23 +1,30 @@
 import { LayoutMapping, XYPosition } from 'graphology-layout/utils';
-import { SimulationGraph } from '../../types';
+import { DirectionType, GraphTiers, SimulationGraph, TieredGraphLayoutBuilder } from '../../types';
 import { GraphLayout, GraphLayoutBuilder } from './common';
-export type DirectionType = 'horizontal' | 'vertical';
 declare class PlanarLayoutBuilder extends GraphLayoutBuilder<PlanarLayout> {
     _orientation: DirectionType;
+    _tiers: GraphTiers;
     /**
      * Sets the nodes orientation
      *
      * @param direction vertical or horizontal
      */
     orientation(direction: DirectionType): this;
+    /**
+     * Sets the tiers for the graph
+     *
+     * @param tiers the tiers to use
+     */
+    tiers(tiers: GraphTiers): this;
     build(): PlanarLayout;
 }
 /**
  * The Planar layout utilises the sugiyama algorithm to lay out nodes in a way that minimises
  * edge crossings.
  */
-export default class PlanarLayout extends GraphLayout {
+export default class PlanarLayout extends GraphLayout implements TieredGraphLayoutBuilder {
     orientation: DirectionType;
+    tiers: GraphTiers;
     constructor(builder: PlanarLayoutBuilder);
     get supportsDrag(): boolean;
     applyLayout(graph: SimulationGraph, forceUpdate?: (layout: LayoutMapping<XYPosition>, edgePoints: LayoutMapping<XYPosition[]>) => void): Promise<{

package/dist/shared/graph-layout/planar-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"planar-layout.d.ts","sourceRoot":"","sources":["../../../src/shared/graph-layout/planar-layout.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE3D,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,UAAU,CAAC;AAEtD,cAAM,mBAAoB,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IAC9D,YAAY,EAAE,aAAa,CAAgB;IAE3C;;;;OAIG;IACH,WAAW,CAAC,SAAS,EAAE,aAAa,GAAG,IAAI;IAK3C,KAAK,IAAI,YAAY;CAIxB;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IAC1C,WAAW,EAAE,aAAa,CAAgB;gBAErC,OAAO,EAAE,mBAAmB;IAMxC,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,WAAW,CACP,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,KAAK,IAAI,GACnG,OAAO,CAAC;QACP,UAAU,CAAC,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC;QACzC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;QAClC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAC1C,CAAC;IAqDF,MAAM,KAAK,OAAO,IAAI,mBAAmB,CAExC;CACJ"}
+{"version":3,"file":"planar-layout.d.ts","sourceRoot":"","sources":["../../../src/shared/graph-layout/planar-layout.tsx"],"names":[],"mappings":"AA0BA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEnG,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE3D,cAAM,mBAAoB,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IAC9D,YAAY,EAAE,aAAa,CAAgB;IAE3C,MAAM,EAAE,UAAU,CAAC;IAEnB;;;;OAIG;IACH,WAAW,CAAC,SAAS,EAAE,aAAa,GAAG,IAAI;IAK3C;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAK9B,KAAK,IAAI,YAAY;CAIxB;AAqCD;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAY,YAAW,wBAAwB;IAC9E,WAAW,EAAE,aAAa,CAAgB;IAE1C,KAAK,EAAE,UAAU,CAAC;gBAEb,OAAO,EAAE,mBAAmB;IAOxC,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,WAAW,CACP,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,KAAK,IAAI,GACnG,OAAO,CAAC;QACP,UAAU,CAAC,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC;QACzC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;QAClC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAC1C,CAAC;IAyEF,MAAM,KAAK,OAAO,IAAI,mBAAmB,CAExC;CACJ"}

package/dist/shared/graph-layout/planar-layout.js

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { coordQuad, sugiyama } from 'd3-dag';
+import { coordQuad, decrossTwoLayer, layeringSimplex, sugiyama, } from 'd3-dag';
 import { dagGraphParser } from '../parsers';
 import { GraphLayout, GraphLayoutBuilder } from './common';
 class PlanarLayoutBuilder extends GraphLayoutBuilder {
@@ -31,11 +31,50 @@ class PlanarLayoutBuilder extends GraphLayoutBuilder {
         this._orientation = direction;
         return this;
     }
+    /**
+     * Sets the tiers for the graph
+     *
+     * @param tiers the tiers to use
+     */
+    tiers(tiers) {
+        this._tiers = tiers;
+        return this;
+    }
     build() {
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         return new PlanarLayout(this);
     }
 }
+/**
+ * Gets the order value for a given node or link data
+ *
+ * @param data the data of a pure node or link
+ */
+function getOrdValue(data) {
+    if (data.role === 'node') {
+        return Number(data.node.data.ord) || 0;
+    }
+    // Here we define which order the edges connecting nodes from previous layer should appear in
+    // As a crude approach we define that their order should follow the mean of the source and target nodes.
+    const sourceOrd = Number.isNaN(Number(data.link.source.data.ord)) ? 0 : Number(data.link.source.data.ord);
+    const targetOrd = Number.isNaN(Number(data.link.target.data.ord)) ? 0 : Number(data.link.target.data.ord);
+    return (sourceOrd + targetOrd) / 2;
+}
+/**
+ * customDecross function that takes ordering of nodes into account
+ *
+ * @param layers the layers defined by the layering step
+ */
+function customDecross(layers) {
+    const vals = new Map();
+    layers.forEach((layer) => {
+        layer.forEach((node) => {
+            const val = getOrdValue(node.data);
+            vals.set(node, val);
+        });
+        layer.sort((a, b) => vals.get(a) - vals.get(b));
+    });
+}
 /**
  * The Planar layout utilises the sugiyama algorithm to lay out nodes in a way that minimises
  * edge crossings.
@@ -45,6 +84,7 @@ export default class PlanarLayout extends GraphLayout {
         super(builder);
         this.orientation = 'horizontal';
         this.orientation = builder._orientation;
+        this.tiers = builder._tiers;
     }
     // eslint-disable-next-line class-methods-use-this
     get supportsDrag() {
@@ -53,26 +93,41 @@ export default class PlanarLayout extends GraphLayout {
     applyLayout(graph, forceUpdate) {
         // define an inner method so it can be called repeatedly when nodes or edges are added
         const computeLayout = (currentGraph) => {
-            const dag = dagGraphParser(currentGraph);
+            const dag = dagGraphParser(currentGraph, this.tiers);
             /**
              * The nodeSize is scaled for consistent spacing in the horizontal layout
              */
-            const newDagLayout = sugiyama()
-                .nodeSize(() => [this.nodeSize * 3, this.nodeSize * 6])
-                .coord(coordQuad())(dag);
-            const edgePoints = newDagLayout.dag.links().reduce((acc, link) => {
-                acc[`${link.source.id}||${link.target.id}`] = link.points.map((point) => ({
-                    x: this.orientation === 'vertical' ? point.x : point.y,
-                    y: this.orientation === 'vertical' ? point.y : point.x,
+            let newDagLayout;
+            try {
+                function groupAccessor(node) {
+                    return node.data.group;
+                }
+                function rankAccessor(node) {
+                    return node.data.rank;
+                }
+                newDagLayout = sugiyama()
+                    .nodeSize(() => [this.nodeSize * 3, this.nodeSize * 6])
+                    .coord(coordQuad())
+                    .layering(this.tiers ? layeringSimplex().group(groupAccessor).rank(rankAccessor) : layeringSimplex())
+                    .decross(this.tiers ? customDecross : decrossTwoLayer());
+                newDagLayout(dag);
+            }
+            catch (e) {
+                throw new Error('d3-dag failed to resolve the layering of graph nodes for PlanarLayout.');
+            }
+            const edgePoints = Array.from(dag.links()).reduce((acc, link) => {
+                acc[`${link.source.data.id}||${link.target.data.id}`] = link.points.map((point) => ({
+                    x: this.orientation === 'vertical' ? point[0] : point[1],
+                    y: this.orientation === 'vertical' ? point[1] : point[0],
                 }));
                 return acc;
             }, {});
-            const newLayout = newDagLayout.dag.descendants().reduce((acc, node) => {
-                acc[node.id] = {
+            const newLayout = Array.from(dag.nodes()).reduce((layout, node) => {
+                layout[node.data.id] = {
                     x: this.orientation === 'vertical' ? node.x : node.y,
                     y: this.orientation === 'vertical' ? node.y : node.x,
                 };
-                return acc;
+                return layout;
             }, {});
             return { edgePoints, newLayout };
         };

package/dist/shared/graph-layout/planar-layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"planar-layout.js","sourceRoot":"","sources":["../../../src/shared/graph-layout/planar-layout.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"planar-layout.js","sourceRoot":"","sources":["../../../src/shared/graph-layout/planar-layout.tsx"],"names":[],"mappings":"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"}

package/dist/shared/graph-layout/spring-layout.d.ts

@@ -1,11 +1,31 @@
+/**
+ * Copyright 2023 Impulse Innovations Limited
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as d3 from 'd3';
 import { LayoutMapping, XYPosition } from 'graphology-layout/utils';
-import { SimulationGraph } from '../../types';
+import { D3SimulationEdge, DirectionType, GraphTiers, SimulationGraph, SimulationNode, SimulationNodeWithGroup, TieredGraphLayoutBuilder } from '../../types';
 import { GraphLayout, GraphLayoutBuilder } from './common';
-declare class SpringLayoutBuilder extends GraphLayoutBuilder<SpringLayout> {
+declare class SpringLayoutBuilder extends GraphLayoutBuilder<SpringLayout> implements TieredGraphLayoutBuilder {
     _collisionForce: number;
     _gravity: number;
     _linkForce: number;
     _warmupTicks: number;
+    _tierSeparation: number;
+    orientation: DirectionType;
+    tiers: GraphTiers;
     /**
      * Set the multiplier for collision force
      *
@@ -30,8 +50,26 @@ declare class SpringLayoutBuilder extends GraphLayoutBuilder<SpringLayout> {
      * @param ticks number of ticks to run before display
      */
     warmupTicks(ticks: number): this;
+    /**
+     * Set tier separation
+     *
+     * @param separation separation
+     */
+    tierSeparation(separation: number): this;
     build(): SpringLayout;
 }
+/**
+ * Apply forces which are needed as part of a tiered layout.
+ * There is one force which snaps the nodes to the relevant layers and another force ordering the nodes within the layers.
+ *
+ * @param simulation the D3 simulation
+ * @param graph the simulation graph
+ * @param nodes array of the nodes
+ * @param tiers the tiers passed to the layout
+ * @param tiersSeparation the separation between the tiers
+ * @param orientation the orientation of the layout
+ */
+export declare function applyTierForces(simulation: d3.Simulation<SimulationNode, D3SimulationEdge>, graph: SimulationGraph, nodes: SimulationNodeWithGroup[], tiers: GraphTiers, tiersSeparation: number, orientation: DirectionType): void;
 /**
  * The Spring layout uses a force simulation to position nodes.
  * The layout keeps the simulation running as nodes are being dragged which produces the spring behaviour of edges.
@@ -41,6 +79,9 @@ export default class SpringLayout extends GraphLayout {
     gravity: number;
     linkForce: number;
     warmupTicks: number;
+    tierSeparation: number;
+    orientation: DirectionType;
+    tiers: GraphTiers;
     constructor(builder: SpringLayoutBuilder);
     applyLayout(graph: SimulationGraph, forceUpdate: (layout: LayoutMapping<XYPosition>) => void): Promise<{
         layout: LayoutMapping<XYPosition>;

package/dist/shared/graph-layout/spring-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spring-layout.d.ts","sourceRoot":"","sources":["../../../src/shared/graph-layout/spring-layout.tsx"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGpE,OAAO,EAAoB,eAAe,EAAkB,MAAM,aAAa,CAAC;AAEhF,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE3D,cAAM,mBAAoB,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IAC9D,eAAe,SAAK;IAEpB,QAAQ,SAAO;IAEf,UAAU,SAAK;IAEf,YAAY,SAAO;IAEnB;;;;OAIG;IACH,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKnC;;;;OAIG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK9B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK5B;;;;OAIG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKhC,KAAK,IAAI,YAAY;CAIxB;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IAC1C,cAAc,EAAE,MAAM,CAAC;IAEvB,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,EAAE,MAAM,CAAC;IAElB,WAAW,EAAE,MAAM,CAAC;gBAEf,OAAO,EAAE,mBAAmB;IAQxC,WAAW,CACP,KAAK,EAAE,eAAe,EACtB,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,KAAK,IAAI,GACzD,OAAO,CAAC;QACP,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;QAClC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;QACxD,WAAW,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAC5C,CAAC;IA4EF,MAAM,KAAK,OAAO,IAAI,mBAAmB,CAExC;CACJ"}
+{"version":3,"file":"spring-layout.d.ts","sourceRoot":"","sources":["../../../src/shared/graph-layout/spring-layout.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGpE,OAAO,EACH,gBAAgB,EAChB,aAAa,EACb,UAAU,EACV,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,wBAAwB,EAC3B,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE3D,cAAM,mBAAoB,SAAQ,kBAAkB,CAAC,YAAY,CAAE,YAAW,wBAAwB;IAClG,eAAe,SAAK;IAEpB,QAAQ,SAAO;IAEf,UAAU,SAAK;IAEf,YAAY,SAAO;IAEnB,eAAe,SAAO;IAEtB,WAAW,EAAE,aAAa,CAAgB;IAE1C,KAAK,EAAE,UAAU,CAAC;IAElB;;;;OAIG;IACH,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKnC;;;;OAIG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK9B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK5B;;;;OAIG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKhC;;;;OAIG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAKxC,KAAK,IAAI,YAAY;CAIxB;AAsDD;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC3B,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,gBAAgB,CAAC,EAC3D,KAAK,EAAE,eAAe,EACtB,KAAK,EAAE,uBAAuB,EAAE,EAChC,KAAK,EAAE,UAAU,EACjB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,aAAa,GAC3B,IAAI,CA8BN;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IAC1C,cAAc,EAAE,MAAM,CAAC;IAEvB,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,EAAE,MAAM,CAAC;IAElB,WAAW,EAAE,MAAM,CAAC;IAEpB,cAAc,EAAE,MAAM,CAAC;IAEvB,WAAW,EAAE,aAAa,CAAC;IAE3B,KAAK,EAAE,UAAU,CAAC;gBAEb,OAAO,EAAE,mBAAmB;IAWxC,WAAW,CACP,KAAK,EAAE,eAAe,EACtB,WAAW,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,KAAK,IAAI,GACzD,OAAO,CAAC;QACP,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;QAClC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;QACxD,WAAW,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAC5C,CAAC;IAgFF,MAAM,KAAK,OAAO,IAAI,mBAAmB,CAExC;CACJ"}

package/dist/shared/graph-layout/spring-layout.js

@@ -17,6 +17,7 @@
 import * as d3 from 'd3';
 import debounce from 'lodash/debounce';
 import { getD3Data, nodesToLayout } from '../parsers';
+import { getNodeOrder, getTiersArray } from '../utils';
 import { GraphLayout, GraphLayoutBuilder } from './common';
 class SpringLayoutBuilder extends GraphLayoutBuilder {
     constructor() {
@@ -25,6 +26,8 @@ class SpringLayoutBuilder extends GraphLayoutBuilder {
         this._gravity = -50;
         this._linkForce = 5;
         this._warmupTicks = 100;
+        this._tierSeparation = 300;
+        this.orientation = 'horizontal';
     }
     /**
      * Set the multiplier for collision force
@@ -62,11 +65,103 @@ class SpringLayoutBuilder extends GraphLayoutBuilder {
         this._warmupTicks = ticks;
         return this;
     }
+    /**
+     * Set tier separation
+     *
+     * @param separation separation
+     */
+    tierSeparation(separation) {
+        this._tierSeparation = separation;
+        return this;
+    }
     build() {
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         return new SpringLayout(this);
     }
 }
+/**
+ * Apply force that orders nodes based on the tier order_nodes_by values
+ *
+ * @param simulation the D3 simulation
+ * @param tiers the tiers passed to the layout
+ * @param graph the simulation graph
+ * @param orientation the orientation of the layout
+ * @param nodesMap a map of node name to node object
+ */
+function applyOrderNodesForce(simulation, tiers, graph, orientation, nodesMap) {
+    if (!Array.isArray(tiers)) {
+        const { order_nodes_by } = tiers;
+        if (order_nodes_by) {
+            const simNodes = graph.nodes();
+            const nodesOrder = getNodeOrder(simNodes, order_nodes_by, graph);
+            const sortedNodesOrderArray = Object.entries(nodesOrder)
+                .sort((a, b) => Number(a[1]) - Number(b[1]))
+                .map((entry) => entry[0]);
+            const nodeSeparation = 200;
+            function forceOrder() {
+                function force(alpha) {
+                    sortedNodesOrderArray.forEach((nodeName, index) => {
+                        const targetPosition = index * nodeSeparation;
+                        const targettedNode = nodesMap.get(nodeName);
+                        if (targettedNode) {
+                            if (orientation === 'horizontal') {
+                                // Apply a nudge towards the target y position
+                                targettedNode.vy += (targetPosition - targettedNode.y) * alpha;
+                            }
+                            else {
+                                // Apply a nudge towards the target x position
+                                targettedNode.vx += (targetPosition - targettedNode.x) * alpha;
+                            }
+                        }
+                    });
+                }
+                return force;
+            }
+            // apply layer force
+            simulation.force('order', forceOrder());
+        }
+    }
+}
+/**
+ * Apply forces which are needed as part of a tiered layout.
+ * There is one force which snaps the nodes to the relevant layers and another force ordering the nodes within the layers.
+ *
+ * @param simulation the D3 simulation
+ * @param graph the simulation graph
+ * @param nodes array of the nodes
+ * @param tiers the tiers passed to the layout
+ * @param tiersSeparation the separation between the tiers
+ * @param orientation the orientation of the layout
+ */
+export function applyTierForces(simulation, graph, nodes, tiers, tiersSeparation, orientation) {
+    const tiersArray = getTiersArray(tiers, graph);
+    const nodesMapping = new Map();
+    nodes.forEach((node) => nodesMapping.set(node.id, node));
+    applyOrderNodesForce(simulation, tiers, graph, orientation, nodesMapping);
+    function forceLayer() {
+        function force(alpha) {
+            tiersArray.forEach((tier, index) => {
+                const targetPosition = index * tiersSeparation;
+                tier.forEach((nodeName) => {
+                    const targettedNode = nodesMapping.get(nodeName);
+                    if (targettedNode) {
+                        if (orientation === 'horizontal') {
+                            // Directly set the x position
+                            targettedNode.x = targetPosition + (targettedNode.x - targetPosition) * alpha;
+                        }
+                        else {
+                            // Directly set the y position
+                            targettedNode.y = targetPosition + (targettedNode.y - targetPosition) * alpha;
+                        }
+                    }
+                });
+            });
+        }
+        return force;
+    }
+    // apply layer force
+    simulation.force('layer', forceLayer());
+}
 /**
  * The Spring layout uses a force simulation to position nodes.
  * The layout keeps the simulation running as nodes are being dragged which produces the spring behaviour of edges.
@@ -78,6 +173,9 @@ export default class SpringLayout extends GraphLayout {
         this.linkForce = builder._linkForce;
         this.gravity = builder._gravity;
         this.warmupTicks = builder._warmupTicks;
+        this.tierSeparation = builder._tierSeparation;
+        this.orientation = builder.orientation;
+        this.tiers = builder.tiers;
     }
     applyLayout(graph, forceUpdate) {
         // We're modifying edges/nodes
@@ -96,6 +194,9 @@ export default class SpringLayout extends GraphLayout {
             // The center force keeps nodes in the middle of the viewport
             .force('center', d3.forceCenter())
             .stop(); // don't start just yet
+        if (this.tiers) {
+            applyTierForces(simulation, graph, nodes, this.tiers, this.tierSeparation, this.orientation);
+        }
         // Warm-up the simulation so the jump to the center isn't visible
         simulation.tick(this.warmupTicks);
         simulation

package/dist/shared/graph-layout/spring-layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"spring-layout.js","sourceRoot":"","sources":["../../../src/shared/graph-layout/spring-layout.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"spring-layout.js","sourceRoot":"","sources":["../../../src/shared/graph-layout/spring-layout.tsx"],"names":[],"mappings":"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"}

package/dist/shared/parsers.d.ts

@@ -14,18 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Dag, DagNode } from 'd3-dag';
+import { MutGraph } from 'd3-dag';
 import { LayoutMapping, XYPosition } from 'graphology-layout/utils';
-import { CausalGraph, CausalGraphEdge, CausalGraphNode, D3SimulationEdge, SimulationEdge, SimulationGraph, SimulationNode, SimulationNodeWithGroup } from '../types';
-export type DagNodeData = SimulationNode & {
+import { CausalGraph, CausalGraphEdge, CausalGraphNode, D3SimulationEdge, GraphTiers, SimulationEdge, SimulationGraph, SimulationNode, SimulationNodeWithGroup } from '../types';
+interface NodeOrder {
+    group: string;
+    order: string;
+    rank: number;
+}
+export type DagNodeData = SimulationNode & Partial<NodeOrder> & {
     parentIds: string[];
 };
 /**
  * This parses the graph structure into a Dag structure that the d3-dag library can understand
  *
- * @param rawData
+ * @param graph The SimulationGraph
+ * @param tiers Any tiers passed to the layout
  */
-export declare function dagGraphParser(graph: SimulationGraph): Dag<DagNode<DagNodeData>>;
+export declare function dagGraphParser(graph: SimulationGraph, tiers?: GraphTiers): MutGraph<DagNodeData, any>;
 /**
  * Get graph edges in d3 expected format
  *
@@ -60,4 +66,5 @@ export declare function parseGraphEdge(edgeData: CausalGraphEdge): SimulationEdg
  * @param availableInputs names of input nodes
  */
 export declare function causalGraphParser(data: CausalGraph, availableInputs?: string[], initialGraph?: SimulationGraph): SimulationGraph;
+export {};
 //# sourceMappingURL=parsers.d.ts.map

package/dist/shared/parsers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parsers.d.ts","sourceRoot":"","sources":["../../src/shared/parsers.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,GAAG,EAAE,OAAO,EAAe,MAAM,QAAQ,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAIpE,OAAO,EACH,WAAW,EACX,eAAe,EACf,eAAe,EACf,gBAAgB,EAIhB,cAAc,EACd,eAAe,EACf,cAAc,EACd,uBAAuB,EAC1B,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG;IACvC,SAAS,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAYhF;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC,CAqB/G;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC,UAAU,CAAC,CAShF;AAaD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC1B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,WAAW,EACjB,eAAe,CAAC,EAAE,MAAM,EAAE,GAC3B,cAAc,CAoChB;AAaD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,eAAe,GAAG,cAAc,CAoBxE;AAiBD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC7B,IAAI,EAAE,WAAW,EACjB,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,YAAY,CAAC,EAAE,eAAe,GAC/B,eAAe,CA2EjB"}
+{"version":3,"file":"parsers.d.ts","sourceRoot":"","sources":["../../src/shared/parsers.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,QAAQ,EAAiB,MAAM,QAAQ,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAIpE,OAAO,EACH,WAAW,EACX,eAAe,EACf,eAAe,EACf,gBAAgB,EAGhB,UAAU,EAEV,cAAc,EACd,eAAe,EACf,cAAc,EACd,uBAAuB,EAC1B,MAAM,UAAU,CAAC;AAGlB,UAAU,SAAS;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,WAAW,GAAG,cAAc,GACpC,OAAO,CAAC,SAAS,CAAC,GAAG;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEN;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CA6CrG;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC,CAqB/G;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC,UAAU,CAAC,CAShF;AAaD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC1B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,WAAW,EACjB,eAAe,CAAC,EAAE,MAAM,EAAE,GAC3B,cAAc,CAoChB;AAaD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,eAAe,GAAG,cAAc,CAoBxE;AAiBD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC7B,IAAI,EAAE,WAAW,EACjB,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,YAAY,CAAC,EAAE,eAAe,GAC/B,eAAe,CA2EjB"}

package/dist/shared/parsers.js

@@ -25,22 +25,49 @@ var __rest = (this && this.__rest) || function (s, e) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { dagStratify } from 'd3-dag';
+import { graphStratify } from 'd3-dag';
 import { DirectedGraph } from 'graphology';
 import isEqual from 'lodash/isEqual';
 import { generate } from 'shortid';
-import { getNodeGroup } from './utils';
+import { getNodeGroup, getNodeOrder, getTiersArray } from './utils';
 /**
  * This parses the graph structure into a Dag structure that the d3-dag library can understand
  *
- * @param rawData
+ * @param graph The SimulationGraph
+ * @param tiers Any tiers passed to the layout
  */
-export function dagGraphParser(graph) {
+export function dagGraphParser(graph, tiers) {
+    const nodeTiersMap = new Map();
+    let nodesOrder = {};
+    // If there are tiers we need to add group and ord properties to the node for PlanarLayout algo to consider them
+    if (tiers) {
+        const nodeTiersArray = getTiersArray(tiers, graph);
+        if (!Array.isArray(tiers)) {
+            const { order_nodes_by } = tiers;
+            nodesOrder = order_nodes_by ? getNodeOrder(graph.nodes(), order_nodes_by, graph) : {};
+        }
+        nodeTiersArray.forEach((innerArray, index) => {
+            innerArray.forEach((node) => {
+                nodeTiersMap.set(node, { group: String(index), order: nodesOrder[node], rank: index });
+            });
+        });
+    }
     const nodes = graph.mapNodes((id, attributes) => {
         const parentIds = graph.inboundNeighbors(id);
-        return Object.assign(Object.assign({}, attributes), { group: 'latent', parentIds });
+        let nodeGroup = 'latent';
+        let nodeOrder;
+        let nodeRank;
+        if (tiers) {
+            const nodeData = nodeTiersMap.get(id);
+            // in the case of e.g. a new node group etc may be undefined
+            nodeGroup = nodeData === null || nodeData === void 0 ? void 0 : nodeData.group;
+            nodeOrder = nodeData === null || nodeData === void 0 ? void 0 : nodeData.order;
+            nodeRank = nodeData === null || nodeData === void 0 ? void 0 : nodeData.rank;
+        }
+        return Object.assign(Object.assign({}, attributes), { group: nodeGroup, ord: nodeOrder, parentIds, rank: nodeRank });
     });
-    return dagStratify()(nodes);
+    const stratify = graphStratify();
+    return stratify(nodes);
 }
 /**
  * Get graph edges in d3 expected format