diff --git a/CHANGELOG.md b/CHANGELOG.md index 52163562..604c7b23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [4.5.0] + +### Changed +* Upgrade @hpcc-js/wasm to 1.16.6 (Graphviz 7.0.1) + ## [4.4.0] ### Changed @@ -131,7 +136,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## 2.x & 1.x See the [release notes](https://github.com/magjac/d3-graphviz/releases). -[Unreleased]: https://github.com/magjac/d3-graphviz/compare/v4.4.0...HEAD +[Unreleased]: https://github.com/magjac/d3-graphviz/compare/v4.5.0...HEAD +[4.5.0]: https://github.com/magjac/d3-graphviz/compare/v4.4.0...v4.5.0 [4.4.0]: https://github.com/magjac/d3-graphviz/compare/v4.3.0...v4.4.0 [4.3.0]: https://github.com/magjac/d3-graphviz/compare/v4.2.0...v4.3.0 [4.2.0]: https://github.com/magjac/d3-graphviz/compare/v4.1.1...v4.2.0 diff --git a/package-lock.json b/package-lock.json index d2117ea6..bde98093 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "d3-graphviz", - "version": "4.4.0", + "version": "4.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "d3-graphviz", - "version": "4.4.0", + "version": "4.5.0", "license": "BSD-3-Clause", "dependencies": { - "@hpcc-js/wasm": "1.16.1", + "@hpcc-js/wasm": "1.16.6", "d3-dispatch": "^2.0.0", "d3-format": "^2.0.0", "d3-interpolate": "^2.0.1", @@ -1687,9 +1687,9 @@ } }, "node_modules/@hpcc-js/wasm": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.16.1.tgz", - "integrity": "sha512-izJM0Rgx60SEw11UcEfqmqCRovcogPOpHyilFLUxZhgLmvRhf+r8sYsw95vgTpp0E4tzseMM/x3WkthDeS/HeQ==", + "version": "1.16.6", + "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.16.6.tgz", + "integrity": "sha512-heqfVIqFifmjEaUiHW6ZHLHZ4fQ8EFFhYlNJWFB/F/gHsjKEuBih0bNbSHkdh0opuKNwqfGvLqNXpoNbbec69g==", "dependencies": { "yargs": "17.5.1" }, @@ -7164,9 +7164,9 @@ } }, "@hpcc-js/wasm": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.16.1.tgz", - "integrity": "sha512-izJM0Rgx60SEw11UcEfqmqCRovcogPOpHyilFLUxZhgLmvRhf+r8sYsw95vgTpp0E4tzseMM/x3WkthDeS/HeQ==", + "version": "1.16.6", + "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.16.6.tgz", + "integrity": "sha512-heqfVIqFifmjEaUiHW6ZHLHZ4fQ8EFFhYlNJWFB/F/gHsjKEuBih0bNbSHkdh0opuKNwqfGvLqNXpoNbbec69g==", "requires": { "yargs": "17.5.1" } diff --git a/package.json b/package.json index 2788a762..d2e73242 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "d3-graphviz", - "version": "4.4.0", + "version": "4.5.0", "description": "Graphviz DOT rendering and animated transitions for D3", "keywords": [ "d3", @@ -63,7 +63,7 @@ "tiny-worker": "^2.1.2" }, "dependencies": { - "@hpcc-js/wasm": "1.16.1", + "@hpcc-js/wasm": "1.16.6", "d3-dispatch": "^2.0.0", "d3-format": "^2.0.0", "d3-interpolate": "^2.0.1", diff --git a/test/dot-data-test.js b/test/dot-data-test.js index a20c102b..4f3b8cae 100644 --- a/test/dot-data-test.js +++ b/test/dot-data-test.js @@ -205,7 +205,7 @@ var basic_data = { }, "center": { "x": "27", - "y": "-85.8", + "y": "-85.8" }, "parent": "[Circular ~.children.1.children.7]", "children": [ @@ -345,7 +345,7 @@ var basic_data = { }, "center": { "x": "27", - "y": "-13.8", + "y": "-13.8" }, "parent": "[Circular ~.children.1.children.11]", "children": [ @@ -451,17 +451,17 @@ var basic_data = { "attributes": { "fill": "none", "stroke": "black", - "d": "M27,-71.7C27,-63.98 27,-54.71 27,-46.11" + "d": "M27,-71.7C27,-64.41 27,-55.73 27,-47.54" }, "bbox": { "x": 27, "y": -71.7, "width": 0, - "height": 25.590000000000003 + "height": 24.160000000000004 }, "center": { "x": 27, - "y": -58.905 + "y": -59.620000000000005 }, "totalLength": 100, "parent": "[Circular ~.children.1.children.15]", @@ -483,17 +483,17 @@ var basic_data = { "attributes": { "fill": "black", "stroke": "black", - "points": "30.5,-46.1 27,-36.1 23.5,-46.1 30.5,-46.1" + "points": "30.5,-47.62 27,-37.62 23.5,-47.62 30.5,-47.62" }, "bbox": { "x": 23.5, - "y": -46.1, + "y": -47.62, "width": 7, "height": 10 }, "center": { "x": 27, - "y": -41.1 + "y": -42.62 }, "parent": "[Circular ~.children.1.children.15]", "children": [], diff --git a/test/drawEdge-test.js b/test/drawEdge-test.js index 63a3fe1f..3d8cc2e7 100644 --- a/test/drawEdge-test.js +++ b/test/drawEdge-test.js @@ -28,10 +28,12 @@ tape("Check our understanding of how Graphviz draws edges.", function(test) { test.equal(d3.selectAll('path').size(), num_edges, 'Number of initial paths'); const arrowHeadLength = 10; const arrowHeadWidth = 7; - const margin = 0.1; + const margin = -0.1; + // start of edge tail const x1 = 54.4; const y1 = -18; - const x2 = 89.92; + // end of edge arrowhead + const x2 = 88.1; const y2 = -18.000; const line = d3.selectAll('.edge').selectAll('path').filter(function(d) { @@ -51,9 +53,9 @@ tape("Check our understanding of how Graphviz draws edges.", function(test) { var expected_y = []; expected_x.push(x1); expected_y.push(y1); - expected_x.push(62.39); + expected_x.push(61.89); expected_y.push(y1); - expected_x.push(71.31); + expected_x.push(70.18); expected_y.push(y1); expected_x.push(Math.round((x2 - margin - arrowHeadLength) * 1000) / 1000); expected_y.push(y2); diff --git a/test/graphviz-test.js b/test/graphviz-test.js index af955b1b..8cc7f357 100644 --- a/test/graphviz-test.js +++ b/test/graphviz-test.js @@ -28,8 +28,8 @@ tape("graphviz().render() renders an SVG from graphviz DOT.", function(test) { a->b - - + + `;