diff --git a/codecov.yaml b/.github/codecov.yaml
similarity index 92%
rename from codecov.yaml
rename to .github/codecov.yaml
index 91ae0771b..d33925afc 100644
--- a/codecov.yaml
+++ b/.github/codecov.yaml
@@ -1,3 +1,6 @@
+codecov:
+ branch: develop
+
comment:
layout: 'reach, diff, flags, files'
behavior: default
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
index f3e440fce..b9e542cf8 100644
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -2,6 +2,7 @@ name: Build Vitepress docs
on:
pull_request:
+ merge_group:
permissions:
contents: read
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2a70b5901..49be6364a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,7 @@ name: Build
on:
push: {}
+ merge_group:
pull_request:
types:
- opened
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 396ff4e6e..df761325c 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -1,5 +1,6 @@
on:
- push: {}
+ push:
+ merge_group:
pull_request:
types:
- opened
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 64637c5fb..c27425beb 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -1,6 +1,9 @@
name: E2E
-on: [push, pull_request]
+on:
+ push:
+ pull_request:
+ merge_group:
permissions:
contents: read
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d4bf4afe8..53b7f484d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,8 @@
name: Lint
on:
- push: {}
+ push:
+ merge_group:
pull_request:
types:
- opened
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6bae6b71f..2d8c96165 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,6 @@
name: Unit Tests
-on: [push, pull_request]
+on: [push, pull_request, merge_group]
permissions:
contents: read
diff --git a/__mocks__/sankeyRenderer.js b/__mocks__/sankeyRenderer.js
new file mode 100644
index 000000000..76324c93f
--- /dev/null
+++ b/__mocks__/sankeyRenderer.js
@@ -0,0 +1,13 @@
+/**
+ * Mocked Sankey diagram renderer
+ */
+
+import { vi } from 'vitest';
+
+export const draw = vi.fn().mockImplementation(() => {
+ return '';
+});
+
+export default {
+ draw,
+};
diff --git a/cSpell.json b/cSpell.json
index e13677222..690c2bd33 100644
--- a/cSpell.json
+++ b/cSpell.json
@@ -106,6 +106,7 @@
"rehype",
"roledescription",
"sandboxed",
+ "sankey",
"setupgraphviewbox",
"shiki",
"sidharth",
diff --git a/cypress/integration/rendering/sankey.spec.ts b/cypress/integration/rendering/sankey.spec.ts
new file mode 100644
index 000000000..e334b898b
--- /dev/null
+++ b/cypress/integration/rendering/sankey.spec.ts
@@ -0,0 +1,144 @@
+import { imgSnapshotTest, renderGraph } from '../../helpers/util.js';
+
+describe('Sankey Diagram', () => {
+ it('should render a simple example', () => {
+ imgSnapshotTest(
+ `
+ sankey-beta
+
+ sourceNode,targetNode,10
+ `,
+ {}
+ );
+ });
+
+ describe('when given a linkColor', function () {
+ this.beforeAll(() => {
+ cy.wrap(
+ `sankey-beta
+ a,b,10
+ `
+ ).as('graph');
+ });
+
+ it('links should use hex color', function () {
+ renderGraph(this.graph, { sankey: { linkColor: '#636465' } });
+
+ cy.get('.link path').should((link) => {
+ expect(link.attr('stroke')).to.equal('#636465');
+ });
+ });
+
+ it('links should be the same color as source node', function () {
+ renderGraph(this.graph, { sankey: { linkColor: 'source' } });
+
+ cy.get('.link path').then((link) => {
+ cy.get('.node[id="node-1"] rect').should((node) =>
+ expect(link.attr('stroke')).to.equal(node.attr('fill'))
+ );
+ });
+ });
+
+ it('links should be the same color as target node', function () {
+ renderGraph(this.graph, { sankey: { linkColor: 'target' } });
+
+ cy.get('.link path').then((link) => {
+ cy.get('.node[id="node-2"] rect').should((node) =>
+ expect(link.attr('stroke')).to.equal(node.attr('fill'))
+ );
+ });
+ });
+
+ it('links must be gradient', function () {
+ renderGraph(this.graph, { sankey: { linkColor: 'gradient' } });
+
+ cy.get('.link path').should((link) => {
+ expect(link.attr('stroke')).to.equal('url(#linearGradient-3)');
+ });
+ });
+ });
+
+ describe('when given a nodeAlignment', function () {
+ this.beforeAll(() => {
+ cy.wrap(
+ `
+ sankey-beta
+
+ a,b,8
+ b,c,8
+ c,d,8
+ d,e,8
+
+ x,c,4
+ c,y,4
+ `
+ ).as('graph');
+ });
+
+ this.afterEach(() => {
+ cy.get('.node[id="node-1"]').should((node) => {
+ expect(node.attr('x')).to.equal('0');
+ });
+ cy.get('.node[id="node-2"]').should((node) => {
+ expect(node.attr('x')).to.equal('100');
+ });
+ cy.get('.node[id="node-3"]').should((node) => {
+ expect(node.attr('x')).to.equal('200');
+ });
+ cy.get('.node[id="node-4"]').should((node) => {
+ expect(node.attr('x')).to.equal('300');
+ });
+ cy.get('.node[id="node-5"]').should((node) => {
+ expect(node.attr('x')).to.equal('400');
+ });
+ });
+
+ it('should justify nodes', function () {
+ renderGraph(this.graph, {
+ sankey: { nodeAlignment: 'justify', width: 410, useMaxWidth: false },
+ });
+ cy.get('.node[id="node-6"]').should((node) => {
+ expect(node.attr('x')).to.equal('0');
+ });
+ cy.get('.node[id="node-7"]').should((node) => {
+ expect(node.attr('x')).to.equal('400');
+ });
+ });
+
+ it('should align nodes left', function () {
+ renderGraph(this.graph, {
+ sankey: { nodeAlignment: 'left', width: 410, useMaxWidth: false },
+ });
+ cy.get('.node[id="node-6"]').should((node) => {
+ expect(node.attr('x')).to.equal('0');
+ });
+ cy.get('.node[id="node-7"]').should((node) => {
+ expect(node.attr('x')).to.equal('300');
+ });
+ });
+
+ it('should align nodes right', function () {
+ renderGraph(this.graph, {
+ sankey: { nodeAlignment: 'right', width: 410, useMaxWidth: false },
+ });
+ cy.get('.node[id="node-6"]').should((node) => {
+ expect(node.attr('x')).to.equal('100');
+ });
+ cy.get('.node[id="node-7"]').should((node) => {
+ expect(node.attr('x')).to.equal('400');
+ });
+ });
+
+ it('should center nodes', function () {
+ renderGraph(this.graph, {
+ sankey: { nodeAlignment: 'center', width: 410, useMaxWidth: false },
+ });
+ cy.get('.node[id="node-6"]').should((node) => {
+ expect(node.attr('x')).to.equal('100');
+ });
+ cy.get('.node[id="node-7"]').should((node) => {
+ expect(node.attr('x')).to.equal('300');
+ });
+ });
+ });
+});
diff --git a/demos/index.html b/demos/index.html
index 391042182..24c4fbf3b 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -75,6 +75,9 @@
+
+
+