d3-hierarchy - npm Package Compare versions

Comparing version 2.0.0-rc.2 to 2.0.0-rc.3

dist/d3-hierarchy.js

@@ -1,2 +0,2 @@
-// https://d3js.org/d3-hierarchy/ v2.0.0-rc.2 Copyright 2019 Mike Bostock
+// https://d3js.org/d3-hierarchy/ v2.0.0-rc.3 Copyright 2019 Mike Bostock
 (function (global, factory) {
@@ -249,4 +249,8 @@ typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 function hierarchy(data, children) {
-  if (data instanceof Map) return hierarchy([undefined, data], children === undefined ? mapChildren : children).each(mapData);
-  if (children === undefined) children = objectChildren;
+  if (data instanceof Map) {
+    data = [undefined, data];
+    if (children === undefined) children = mapChildren;
+  } else if (children === undefined) {
+    children = objectChildren;
+  }
 
@@ -272,7 +276,7 @@ var root = new Node(data),
 
-  return root.each(computeHeight);
+  return root.eachBefore(computeHeight);
 }
 
 function node_copy() {
-  return hierarchy(this).each(copyData);
+  return hierarchy(this).eachBefore(copyData);
 }
@@ -288,8 +292,2 @@
 
-function mapData(node) {
-  if (Array.isArray(node.data)) {
-    node.data = {name: node.data[0], value: node.data[1]};
-  }
-}
-
 function copyData(node) {
@@ -296,0 +294,0 @@ if (node.data.value !== undefined) node.value = node.data.value;

dist/d3-hierarchy.min.js

@@ -1,2 +0,2 @@
-// https://d3js.org/d3-hierarchy/ v2.0.0-rc.2 Copyright 2019 Mike Bostock
-!function(n,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports):"function"==typeof define&&define.amd?define(["exports"],r):r((n=n||self).d3=n.d3||{})}(this,function(n){"use strict";function r(n,r){return n.parent===r.parent?1:2}function t(n,r){return n+r.x}function e(n,r){return Math.max(n,r.y)}function i(n){var r=0,t=n.children,e=t&&t.length;if(e)for(;--e>=0;)r+=t[e].value;else r=1;n.value=r}function u(n,r){if(n instanceof Map)return u([void 0,n],void 0===r?a:r).each(f);void 0===r&&(r=o);for(var t,e,i,c,p,d=new l(n),s=[d];t=s.pop();)if((i=r(t.data))&&(p=(i=Array.from(i)).length))for(t.children=i,c=p-1;c>=0;--c)s.push(e=i[c]=new l(i[c])),e.parent=t,e.depth=t.depth+1;return d.each(h)}function o(n){return n.children}function a(n){return Array.isArray(n)?n[1]:null}function f(n){Array.isArray(n.data)&&(n.data={name:n.data[0],value:n.data[1]})}function c(n){void 0!==n.data.value&&(n.value=n.data.value),n.data=n.data.data}function h(n){var r=0;do{n.height=r}while((n=n.parent)&&n.height<++r)}function l(n){this.data=n,this.depth=this.height=0,this.parent=null}function p(n){for(var r,t,e=0,i=(n=function(n){for(var r,t,e=n.length;e;)t=Math.random()*e--|0,r=n[e],n[e]=n[t],n[t]=r;return n}(Array.from(n))).length,u=[];e<i;)r=n[e],t&&v(t,r)?++e:(t=x(u=d(u,r)),e=0);return t}function d(n,r){var t,e;if(y(r,n))return[r];for(t=0;t<n.length;++t)if(s(r,n[t])&&y(g(n[t],r),n))return[n[t],r];for(t=0;t<n.length-1;++t)for(e=t+1;e<n.length;++e)if(s(g(n[t],n[e]),r)&&s(g(n[t],r),n[e])&&s(g(n[e],r),n[t])&&y(m(n[t],n[e],r),n))return[n[t],n[e],r];throw new Error}function s(n,r){var t=n.r-r.r,e=r.x-n.x,i=r.y-n.y;return t<0||t*t<e*e+i*i}function v(n,r){var t=n.r-r.r+1e-6,e=r.x-n.x,i=r.y-n.y;return t>0&&t*t>e*e+i*i}function y(n,r){for(var t=0;t<r.length;++t)if(!v(n,r[t]))return!1;return!0}function x(n){switch(n.length){case 1:return{x:(r=n[0]).x,y:r.y,r:r.r};case 2:return g(n[0],n[1]);case 3:return m(n[0],n[1],n[2])}var r}function g(n,r){var t=n.x,e=n.y,i=n.r,u=r.x,o=r.y,a=r.r,f=u-t,c=o-e,h=a-i,l=Math.sqrt(f*f+c*c);return{x:(t+u+f/l*h)/2,y:(e+o+c/l*h)/2,r:(l+i+a)/2}}function m(n,r,t){var e=n.x,i=n.y,u=n.r,o=r.x,a=r.y,f=r.r,c=t.x,h=t.y,l=t.r,p=e-o,d=e-c,s=i-a,v=i-h,y=f-u,x=l-u,g=e*e+i*i-u*u,m=g-o*o-a*a+f*f,w=g-c*c-h*h+l*l,_=d*s-p*v,A=(s*w-v*m)/(2*_)-e,M=(v*y-s*x)/_,z=(d*m-p*w)/(2*_)-i,B=(p*x-d*y)/_,q=M*M+B*B-1,b=2*(u+A*M+z*B),E=A*A+z*z-u*u,S=-(q?(b+Math.sqrt(b*b-4*q*E))/(2*q):E/b);return{x:e+A+M*S,y:i+z+B*S,r:S}}function w(n,r,t){var e,i,u,o,a=n.x-r.x,f=n.y-r.y,c=a*a+f*f;c?(i=r.r+t.r,i*=i,o=n.r+t.r,i>(o*=o)?(e=(c+o-i)/(2*c),u=Math.sqrt(Math.max(0,o/c-e*e)),t.x=n.x-e*a-u*f,t.y=n.y-e*f+u*a):(e=(c+i-o)/(2*c),u=Math.sqrt(Math.max(0,i/c-e*e)),t.x=r.x+e*a-u*f,t.y=r.y+e*f+u*a)):(t.x=r.x+t.r,t.y=r.y)}function _(n,r){var t=n.r+r.r-1e-6,e=r.x-n.x,i=r.y-n.y;return t>0&&t*t>e*e+i*i}function A(n){var r=n._,t=n.next._,e=r.r+t.r,i=(r.x*t.r+t.x*r.r)/e,u=(r.y*t.r+t.y*r.r)/e;return i*i+u*u}function M(n){this._=n,this.next=null,this.previous=null}function z(n){if(!(u=(r=n,n="object"==typeof r&&"length"in r?r:Array.from(r)).length))return 0;var r,t,e,i,u,o,a,f,c,h,l,d;if((t=n[0]).x=0,t.y=0,!(u>1))return t.r;if(e=n[1],t.x=-e.r,e.x=t.r,e.y=0,!(u>2))return t.r+e.r;w(e,t,i=n[2]),t=new M(t),e=new M(e),i=new M(i),t.next=i.previous=e,e.next=t.previous=i,i.next=e.previous=t;n:for(f=3;f<u;++f){w(t._,e._,i=n[f]),i=new M(i),c=e.next,h=t.previous,l=e._.r,d=t._.r;do{if(l<=d){if(_(c._,i._)){e=c,t.next=e,e.previous=t,--f;continue n}l+=c._.r,c=c.next}else{if(_(h._,i._)){(t=h).next=e,e.previous=t,--f;continue n}d+=h._.r,h=h.previous}}while(c!==h.next);for(i.previous=t,i.next=e,t.next=e.previous=e=i,o=A(t);(i=i.next)!==e;)(a=A(i))<o&&(t=i,o=a);e=t.next}for(t=[e._],i=e;(i=i.next)!==e;)t.push(i._);for(i=p(t),f=0;f<u;++f)(t=n[f]).x-=i.x,t.y-=i.y;return i.r}function B(n){return null==n?null:q(n)}function q(n){if("function"!=typeof n)throw new Error;return n}function b(){return 0}function E(n){return function(){return n}}function S(n){return Math.sqrt(n.value)}function k(n){return function(r){r.children||(r.r=Math.max(0,+n(r)||0))}}function I(n,r){return function(t){if(e=t.children){var e,i,u,o=e.length,a=n(t)*r||0;if(a)for(i=0;i<o;++i)e[i].r+=a;if(u=z(e),a)for(i=0;i<o;++i)e[i].r-=a;t.r=u+a}}}function j(n){return function(r){var t=r.parent;r.r*=n,t&&(r.x=t.x+n*r.x,r.y=t.y+n*r.y)}}function O(n){n.x0=Math.round(n.x0),n.y0=Math.round(n.y0),n.x1=Math.round(n.x1),n.y1=Math.round(n.y1)}function R(n,r,t,e,i){for(var u,o=n.children,a=-1,f=o.length,c=n.value&&(e-r)/n.value;++a<f;)(u=o[a]).y0=t,u.y1=i,u.x0=r,u.x1=r+=u.value*c}l.prototype=u.prototype={constructor:l,count:function(){return this.eachAfter(i)},each:function(n,r){let t=-1;for(const e of this)n.call(r,e,++t,this);return this},eachAfter:function(n,r){for(var t,e,i,u=this,o=[u],a=[],f=-1;u=o.pop();)if(a.push(u),t=u.children)for(e=0,i=t.length;e<i;++e)o.push(t[e]);for(;u=a.pop();)n.call(r,u,++f,this);return this},eachBefore:function(n,r){for(var t,e,i=this,u=[i],o=-1;i=u.pop();)if(n.call(r,i,++o,this),t=i.children)for(e=t.length-1;e>=0;--e)u.push(t[e]);return this},find:function(n,r){let t=-1;for(const e of this)if(n.call(r,e,++t,this))return e},sum:function(n){return this.eachAfter(function(r){for(var t=+n(r.data)||0,e=r.children,i=e&&e.length;--i>=0;)t+=e[i].value;r.value=t})},sort:function(n){return this.eachBefore(function(r){r.children&&r.children.sort(n)})},path:function(n){for(var r=this,t=function(n,r){if(n===r)return n;var t=n.ancestors(),e=r.ancestors(),i=null;for(n=t.pop(),r=e.pop();n===r;)i=n,n=t.pop(),r=e.pop();return i}(r,n),e=[r];r!==t;)r=r.parent,e.push(r);for(var i=e.length;n!==t;)e.splice(i,0,n),n=n.parent;return e},ancestors:function(){for(var n=this,r=[n];n=n.parent;)r.push(n);return r},descendants:function(){return Array.from(this)},leaves:function(){var n=[];return this.eachBefore(function(r){r.children||n.push(r)}),n},links:function(){var n=this,r=[];return n.each(function(t){t!==n&&r.push({source:t.parent,target:t})}),r},copy:function(){return u(this).each(c)},[Symbol.iterator]:function*(){var n,r,t,e,i=this,u=[i];do{for(n=u.reverse(),u=[];i=n.pop();)if(yield i,r=i.children)for(t=0,e=r.length;t<e;++t)u.push(r[t])}while(u.length)}};var T={depth:-1},D={};function L(n){return n.id}function P(n){return n.parentId}function C(n,r){return n.parent===r.parent?1:2}function F(n){var r=n.children;return r?r[0]:n.t}function G(n){var r=n.children;return r?r[r.length-1]:n.t}function H(n,r,t){var e=t/(r.i-n.i);r.c-=e,r.s+=t,n.c+=e,r.z+=t,r.m+=t}function J(n,r,t){return n.a.parent===r.parent?n.a:t}function K(n,r){this._=n,this.parent=null,this.children=null,this.A=null,this.a=this,this.z=0,this.m=0,this.c=0,this.s=0,this.t=null,this.i=r}function N(n,r,t,e,i){for(var u,o=n.children,a=-1,f=o.length,c=n.value&&(i-t)/n.value;++a<f;)(u=o[a]).x0=r,u.x1=e,u.y0=t,u.y1=t+=u.value*c}K.prototype=Object.create(l.prototype);var Q=(1+Math.sqrt(5))/2;function U(n,r,t,e,i,u){for(var o,a,f,c,h,l,p,d,s,v,y,x=[],g=r.children,m=0,w=0,_=g.length,A=r.value;m<_;){f=i-t,c=u-e;do{h=g[w++].value}while(!h&&w<_);for(l=p=h,y=h*h*(v=Math.max(c/f,f/c)/(A*n)),s=Math.max(p/y,y/l);w<_;++w){if(h+=a=g[w].value,a<l&&(l=a),a>p&&(p=a),y=h*h*v,(d=Math.max(p/y,y/l))>s){h-=a;break}s=d}x.push(o={value:h,dice:f<c,children:g.slice(m,w)}),o.dice?R(o,t,e,i,A?e+=c*h/A:u):N(o,t,e,A?t+=f*h/A:i,u),A-=h,m=w}return x}var V=function n(r){function t(n,t,e,i,u){U(r,n,t,e,i,u)}return t.ratio=function(r){return n((r=+r)>1?r:1)},t}(Q);var W=function n(r){function t(n,t,e,i,u){if((o=n._squarify)&&o.ratio===r)for(var o,a,f,c,h,l=-1,p=o.length,d=n.value;++l<p;){for(f=(a=o[l]).children,c=a.value=0,h=f.length;c<h;++c)a.value+=f[c].value;a.dice?R(a,t,e,i,e+=(u-e)*a.value/d):N(a,t,e,t+=(i-t)*a.value/d,u),d-=a.value}else n._squarify=o=U(r,n,t,e,i,u),o.ratio=r}return t.ratio=function(r){return n((r=+r)>1?r:1)},t}(Q);n.cluster=function(){var n=r,i=1,u=1,o=!1;function a(r){var a,f=0;r.eachAfter(function(r){var i=r.children;i?(r.x=function(n){return n.reduce(t,0)/n.length}(i),r.y=function(n){return 1+n.reduce(e,0)}(i)):(r.x=a?f+=n(r,a):0,r.y=0,a=r)});var c=function(n){for(var r;r=n.children;)n=r[0];return n}(r),h=function(n){for(var r;r=n.children;)n=r[r.length-1];return n}(r),l=c.x-n(c,h)/2,p=h.x+n(h,c)/2;return r.eachAfter(o?function(n){n.x=(n.x-r.x)*i,n.y=(r.y-n.y)*u}:function(n){n.x=(n.x-l)/(p-l)*i,n.y=(1-(r.y?n.y/r.y:1))*u})}return a.separation=function(r){return arguments.length?(n=r,a):n},a.size=function(n){return arguments.length?(o=!1,i=+n[0],u=+n[1],a):o?null:[i,u]},a.nodeSize=function(n){return arguments.length?(o=!0,i=+n[0],u=+n[1],a):o?[i,u]:null},a},n.hierarchy=u,n.pack=function(){var n=null,r=1,t=1,e=b;function i(i){return i.x=r/2,i.y=t/2,n?i.eachBefore(k(n)).eachAfter(I(e,.5)).eachBefore(j(1)):i.eachBefore(k(S)).eachAfter(I(b,1)).eachAfter(I(e,i.r/Math.min(r,t))).eachBefore(j(Math.min(r,t)/(2*i.r))),i}return i.radius=function(r){return arguments.length?(n=B(r),i):n},i.size=function(n){return arguments.length?(r=+n[0],t=+n[1],i):[r,t]},i.padding=function(n){return arguments.length?(e="function"==typeof n?n:E(+n),i):e},i},n.packEnclose=p,n.packSiblings=function(n){return z(n),n},n.partition=function(){var n=1,r=1,t=0,e=!1;function i(i){var u=i.height+1;return i.x0=i.y0=t,i.x1=n,i.y1=r/u,i.eachBefore(function(n,r){return function(e){e.children&&R(e,e.x0,n*(e.depth+1)/r,e.x1,n*(e.depth+2)/r);var i=e.x0,u=e.y0,o=e.x1-t,a=e.y1-t;o<i&&(i=o=(i+o)/2),a<u&&(u=a=(u+a)/2),e.x0=i,e.y0=u,e.x1=o,e.y1=a}}(r,u)),e&&i.eachBefore(O),i}return i.round=function(n){return arguments.length?(e=!!n,i):e},i.size=function(t){return arguments.length?(n=+t[0],r=+t[1],i):[n,r]},i.padding=function(n){return arguments.length?(t=+n,i):t},i},n.stratify=function(){var n=L,r=P;function t(t){var e,i,u,o,a,f,c,p=Array.from(t),d=p.length,s=new Map;for(i=0;i<d;++i)e=p[i],a=p[i]=new l(e),null!=(f=n(e,i,t))&&(f+="")&&(c=a.id=f,s.set(c,s.has(c)?D:a)),null!=(f=r(e,i,t))&&(f+="")&&(a.parent=f);for(i=0;i<d;++i)if(f=(a=p[i]).parent){if(!(o=s.get(f)))throw new Error("missing: "+f);if(o===D)throw new Error("ambiguous: "+f);o.children?o.children.push(a):o.children=[a],a.parent=o}else{if(u)throw new Error("multiple roots");u=a}if(!u)throw new Error("no root");if(u.parent=T,u.eachBefore(function(n){n.depth=n.parent.depth+1,--d}).eachBefore(h),u.parent=null,d>0)throw new Error("cycle");return u}return t.id=function(r){return arguments.length?(n=q(r),t):n},t.parentId=function(n){return arguments.length?(r=q(n),t):r},t},n.tree=function(){var n=C,r=1,t=1,e=null;function i(i){var f=function(n){for(var r,t,e,i,u,o=new K(n,0),a=[o];r=a.pop();)if(e=r._.children)for(r.children=new Array(u=e.length),i=u-1;i>=0;--i)a.push(t=r.children[i]=new K(e[i],i)),t.parent=r;return(o.parent=new K(null,0)).children=[o],o}(i);if(f.eachAfter(u),f.parent.m=-f.z,f.eachBefore(o),e)i.eachBefore(a);else{var c=i,h=i,l=i;i.eachBefore(function(n){n.x<c.x&&(c=n),n.x>h.x&&(h=n),n.depth>l.depth&&(l=n)});var p=c===h?1:n(c,h)/2,d=p-c.x,s=r/(h.x+p+d),v=t/(l.depth||1);i.eachBefore(function(n){n.x=(n.x+d)*s,n.y=n.depth*v})}return i}function u(r){var t=r.children,e=r.parent.children,i=r.i?e[r.i-1]:null;if(t){!function(n){for(var r,t=0,e=0,i=n.children,u=i.length;--u>=0;)(r=i[u]).z+=t,r.m+=t,t+=r.s+(e+=r.c)}(r);var u=(t[0].z+t[t.length-1].z)/2;i?(r.z=i.z+n(r._,i._),r.m=r.z-u):r.z=u}else i&&(r.z=i.z+n(r._,i._));r.parent.A=function(r,t,e){if(t){for(var i,u=r,o=r,a=t,f=u.parent.children[0],c=u.m,h=o.m,l=a.m,p=f.m;a=G(a),u=F(u),a&&u;)f=F(f),(o=G(o)).a=r,(i=a.z+l-u.z-c+n(a._,u._))>0&&(H(J(a,r,e),r,i),c+=i,h+=i),l+=a.m,c+=u.m,p+=f.m,h+=o.m;a&&!G(o)&&(o.t=a,o.m+=l-h),u&&!F(f)&&(f.t=u,f.m+=c-p,e=r)}return e}(r,i,r.parent.A||e[0])}function o(n){n._.x=n.z+n.parent.m,n.m+=n.parent.m}function a(n){n.x*=r,n.y=n.depth*t}return i.separation=function(r){return arguments.length?(n=r,i):n},i.size=function(n){return arguments.length?(e=!1,r=+n[0],t=+n[1],i):e?null:[r,t]},i.nodeSize=function(n){return arguments.length?(e=!0,r=+n[0],t=+n[1],i):e?[r,t]:null},i},n.treemap=function(){var n=V,r=!1,t=1,e=1,i=[0],u=b,o=b,a=b,f=b,c=b;function h(n){return n.x0=n.y0=0,n.x1=t,n.y1=e,n.eachBefore(l),i=[0],r&&n.eachBefore(O),n}function l(r){var t=i[r.depth],e=r.x0+t,h=r.y0+t,l=r.x1-t,p=r.y1-t;l<e&&(e=l=(e+l)/2),p<h&&(h=p=(h+p)/2),r.x0=e,r.y0=h,r.x1=l,r.y1=p,r.children&&(t=i[r.depth+1]=u(r)/2,e+=c(r)-t,h+=o(r)-t,(l-=a(r)-t)<e&&(e=l=(e+l)/2),(p-=f(r)-t)<h&&(h=p=(h+p)/2),n(r,e,h,l,p))}return h.round=function(n){return arguments.length?(r=!!n,h):r},h.size=function(n){return arguments.length?(t=+n[0],e=+n[1],h):[t,e]},h.tile=function(r){return arguments.length?(n=q(r),h):n},h.padding=function(n){return arguments.length?h.paddingInner(n).paddingOuter(n):h.paddingInner()},h.paddingInner=function(n){return arguments.length?(u="function"==typeof n?n:E(+n),h):u},h.paddingOuter=function(n){return arguments.length?h.paddingTop(n).paddingRight(n).paddingBottom(n).paddingLeft(n):h.paddingTop()},h.paddingTop=function(n){return arguments.length?(o="function"==typeof n?n:E(+n),h):o},h.paddingRight=function(n){return arguments.length?(a="function"==typeof n?n:E(+n),h):a},h.paddingBottom=function(n){return arguments.length?(f="function"==typeof n?n:E(+n),h):f},h.paddingLeft=function(n){return arguments.length?(c="function"==typeof n?n:E(+n),h):c},h},n.treemapBinary=function(n,r,t,e,i){var u,o,a=n.children,f=a.length,c=new Array(f+1);for(c[0]=o=u=0;u<f;++u)c[u+1]=o+=a[u].value;!function n(r,t,e,i,u,o,f){if(r>=t-1){var h=a[r];return h.x0=i,h.y0=u,h.x1=o,void(h.y1=f)}for(var l=c[r],p=e/2+l,d=r+1,s=t-1;d<s;){var v=d+s>>>1;c[v]<p?d=v+1:s=v}p-c[d-1]<c[d]-p&&r+1<d&&--d;var y=c[d]-l,x=e-y;if(o-i>f-u){var g=(i*x+o*y)/e;n(r,d,y,i,u,g,f),n(d,t,x,g,u,o,f)}else{var m=(u*x+f*y)/e;n(r,d,y,i,u,o,m),n(d,t,x,i,m,o,f)}}(0,f,n.value,r,t,e,i)},n.treemapDice=R,n.treemapResquarify=W,n.treemapSlice=N,n.treemapSliceDice=function(n,r,t,e,i){(1&n.depth?N:R)(n,r,t,e,i)},n.treemapSquarify=V,Object.defineProperty(n,"__esModule",{value:!0})});
+// https://d3js.org/d3-hierarchy/ v2.0.0-rc.3 Copyright 2019 Mike Bostock
+!function(n,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports):"function"==typeof define&&define.amd?define(["exports"],r):r((n=n||self).d3=n.d3||{})}(this,function(n){"use strict";function r(n,r){return n.parent===r.parent?1:2}function t(n,r){return n+r.x}function e(n,r){return Math.max(n,r.y)}function i(n){var r=0,t=n.children,e=t&&t.length;if(e)for(;--e>=0;)r+=t[e].value;else r=1;n.value=r}function u(n,r){n instanceof Map?(n=[void 0,n],void 0===r&&(r=a)):void 0===r&&(r=o);for(var t,e,i,u,f,l=new h(n),p=[l];t=p.pop();)if((i=r(t.data))&&(f=(i=Array.from(i)).length))for(t.children=i,u=f-1;u>=0;--u)p.push(e=i[u]=new h(i[u])),e.parent=t,e.depth=t.depth+1;return l.eachBefore(c)}function o(n){return n.children}function a(n){return Array.isArray(n)?n[1]:null}function f(n){void 0!==n.data.value&&(n.value=n.data.value),n.data=n.data.data}function c(n){var r=0;do{n.height=r}while((n=n.parent)&&n.height<++r)}function h(n){this.data=n,this.depth=this.height=0,this.parent=null}function l(n){for(var r,t,e=0,i=(n=function(n){for(var r,t,e=n.length;e;)t=Math.random()*e--|0,r=n[e],n[e]=n[t],n[t]=r;return n}(Array.from(n))).length,u=[];e<i;)r=n[e],t&&s(t,r)?++e:(t=x(u=p(u,r)),e=0);return t}function p(n,r){var t,e;if(v(r,n))return[r];for(t=0;t<n.length;++t)if(d(r,n[t])&&v(y(n[t],r),n))return[n[t],r];for(t=0;t<n.length-1;++t)for(e=t+1;e<n.length;++e)if(d(y(n[t],n[e]),r)&&d(y(n[t],r),n[e])&&d(y(n[e],r),n[t])&&v(g(n[t],n[e],r),n))return[n[t],n[e],r];throw new Error}function d(n,r){var t=n.r-r.r,e=r.x-n.x,i=r.y-n.y;return t<0||t*t<e*e+i*i}function s(n,r){var t=n.r-r.r+1e-6,e=r.x-n.x,i=r.y-n.y;return t>0&&t*t>e*e+i*i}function v(n,r){for(var t=0;t<r.length;++t)if(!s(n,r[t]))return!1;return!0}function x(n){switch(n.length){case 1:return{x:(r=n[0]).x,y:r.y,r:r.r};case 2:return y(n[0],n[1]);case 3:return g(n[0],n[1],n[2])}var r}function y(n,r){var t=n.x,e=n.y,i=n.r,u=r.x,o=r.y,a=r.r,f=u-t,c=o-e,h=a-i,l=Math.sqrt(f*f+c*c);return{x:(t+u+f/l*h)/2,y:(e+o+c/l*h)/2,r:(l+i+a)/2}}function g(n,r,t){var e=n.x,i=n.y,u=n.r,o=r.x,a=r.y,f=r.r,c=t.x,h=t.y,l=t.r,p=e-o,d=e-c,s=i-a,v=i-h,x=f-u,y=l-u,g=e*e+i*i-u*u,m=g-o*o-a*a+f*f,w=g-c*c-h*h+l*l,_=d*s-p*v,M=(s*w-v*m)/(2*_)-e,z=(v*x-s*y)/_,B=(d*m-p*w)/(2*_)-i,A=(p*y-d*x)/_,q=z*z+A*A-1,b=2*(u+M*z+B*A),E=M*M+B*B-u*u,S=-(q?(b+Math.sqrt(b*b-4*q*E))/(2*q):E/b);return{x:e+M+z*S,y:i+B+A*S,r:S}}function m(n,r,t){var e,i,u,o,a=n.x-r.x,f=n.y-r.y,c=a*a+f*f;c?(i=r.r+t.r,i*=i,o=n.r+t.r,i>(o*=o)?(e=(c+o-i)/(2*c),u=Math.sqrt(Math.max(0,o/c-e*e)),t.x=n.x-e*a-u*f,t.y=n.y-e*f+u*a):(e=(c+i-o)/(2*c),u=Math.sqrt(Math.max(0,i/c-e*e)),t.x=r.x+e*a-u*f,t.y=r.y+e*f+u*a)):(t.x=r.x+t.r,t.y=r.y)}function w(n,r){var t=n.r+r.r-1e-6,e=r.x-n.x,i=r.y-n.y;return t>0&&t*t>e*e+i*i}function _(n){var r=n._,t=n.next._,e=r.r+t.r,i=(r.x*t.r+t.x*r.r)/e,u=(r.y*t.r+t.y*r.r)/e;return i*i+u*u}function M(n){this._=n,this.next=null,this.previous=null}function z(n){if(!(u=(r=n,n="object"==typeof r&&"length"in r?r:Array.from(r)).length))return 0;var r,t,e,i,u,o,a,f,c,h,p,d;if((t=n[0]).x=0,t.y=0,!(u>1))return t.r;if(e=n[1],t.x=-e.r,e.x=t.r,e.y=0,!(u>2))return t.r+e.r;m(e,t,i=n[2]),t=new M(t),e=new M(e),i=new M(i),t.next=i.previous=e,e.next=t.previous=i,i.next=e.previous=t;n:for(f=3;f<u;++f){m(t._,e._,i=n[f]),i=new M(i),c=e.next,h=t.previous,p=e._.r,d=t._.r;do{if(p<=d){if(w(c._,i._)){e=c,t.next=e,e.previous=t,--f;continue n}p+=c._.r,c=c.next}else{if(w(h._,i._)){(t=h).next=e,e.previous=t,--f;continue n}d+=h._.r,h=h.previous}}while(c!==h.next);for(i.previous=t,i.next=e,t.next=e.previous=e=i,o=_(t);(i=i.next)!==e;)(a=_(i))<o&&(t=i,o=a);e=t.next}for(t=[e._],i=e;(i=i.next)!==e;)t.push(i._);for(i=l(t),f=0;f<u;++f)(t=n[f]).x-=i.x,t.y-=i.y;return i.r}function B(n){return null==n?null:A(n)}function A(n){if("function"!=typeof n)throw new Error;return n}function q(){return 0}function b(n){return function(){return n}}function E(n){return Math.sqrt(n.value)}function S(n){return function(r){r.children||(r.r=Math.max(0,+n(r)||0))}}function k(n,r){return function(t){if(e=t.children){var e,i,u,o=e.length,a=n(t)*r||0;if(a)for(i=0;i<o;++i)e[i].r+=a;if(u=z(e),a)for(i=0;i<o;++i)e[i].r-=a;t.r=u+a}}}function I(n){return function(r){var t=r.parent;r.r*=n,t&&(r.x=t.x+n*r.x,r.y=t.y+n*r.y)}}function j(n){n.x0=Math.round(n.x0),n.y0=Math.round(n.y0),n.x1=Math.round(n.x1),n.y1=Math.round(n.y1)}function O(n,r,t,e,i){for(var u,o=n.children,a=-1,f=o.length,c=n.value&&(e-r)/n.value;++a<f;)(u=o[a]).y0=t,u.y1=i,u.x0=r,u.x1=r+=u.value*c}h.prototype=u.prototype={constructor:h,count:function(){return this.eachAfter(i)},each:function(n,r){let t=-1;for(const e of this)n.call(r,e,++t,this);return this},eachAfter:function(n,r){for(var t,e,i,u=this,o=[u],a=[],f=-1;u=o.pop();)if(a.push(u),t=u.children)for(e=0,i=t.length;e<i;++e)o.push(t[e]);for(;u=a.pop();)n.call(r,u,++f,this);return this},eachBefore:function(n,r){for(var t,e,i=this,u=[i],o=-1;i=u.pop();)if(n.call(r,i,++o,this),t=i.children)for(e=t.length-1;e>=0;--e)u.push(t[e]);return this},find:function(n,r){let t=-1;for(const e of this)if(n.call(r,e,++t,this))return e},sum:function(n){return this.eachAfter(function(r){for(var t=+n(r.data)||0,e=r.children,i=e&&e.length;--i>=0;)t+=e[i].value;r.value=t})},sort:function(n){return this.eachBefore(function(r){r.children&&r.children.sort(n)})},path:function(n){for(var r=this,t=function(n,r){if(n===r)return n;var t=n.ancestors(),e=r.ancestors(),i=null;for(n=t.pop(),r=e.pop();n===r;)i=n,n=t.pop(),r=e.pop();return i}(r,n),e=[r];r!==t;)r=r.parent,e.push(r);for(var i=e.length;n!==t;)e.splice(i,0,n),n=n.parent;return e},ancestors:function(){for(var n=this,r=[n];n=n.parent;)r.push(n);return r},descendants:function(){return Array.from(this)},leaves:function(){var n=[];return this.eachBefore(function(r){r.children||n.push(r)}),n},links:function(){var n=this,r=[];return n.each(function(t){t!==n&&r.push({source:t.parent,target:t})}),r},copy:function(){return u(this).eachBefore(f)},[Symbol.iterator]:function*(){var n,r,t,e,i=this,u=[i];do{for(n=u.reverse(),u=[];i=n.pop();)if(yield i,r=i.children)for(t=0,e=r.length;t<e;++t)u.push(r[t])}while(u.length)}};var R={depth:-1},T={};function D(n){return n.id}function L(n){return n.parentId}function P(n,r){return n.parent===r.parent?1:2}function C(n){var r=n.children;return r?r[0]:n.t}function F(n){var r=n.children;return r?r[r.length-1]:n.t}function G(n,r,t){var e=t/(r.i-n.i);r.c-=e,r.s+=t,n.c+=e,r.z+=t,r.m+=t}function H(n,r,t){return n.a.parent===r.parent?n.a:t}function J(n,r){this._=n,this.parent=null,this.children=null,this.A=null,this.a=this,this.z=0,this.m=0,this.c=0,this.s=0,this.t=null,this.i=r}function K(n,r,t,e,i){for(var u,o=n.children,a=-1,f=o.length,c=n.value&&(i-t)/n.value;++a<f;)(u=o[a]).x0=r,u.x1=e,u.y0=t,u.y1=t+=u.value*c}J.prototype=Object.create(h.prototype);var N=(1+Math.sqrt(5))/2;function Q(n,r,t,e,i,u){for(var o,a,f,c,h,l,p,d,s,v,x,y=[],g=r.children,m=0,w=0,_=g.length,M=r.value;m<_;){f=i-t,c=u-e;do{h=g[w++].value}while(!h&&w<_);for(l=p=h,x=h*h*(v=Math.max(c/f,f/c)/(M*n)),s=Math.max(p/x,x/l);w<_;++w){if(h+=a=g[w].value,a<l&&(l=a),a>p&&(p=a),x=h*h*v,(d=Math.max(p/x,x/l))>s){h-=a;break}s=d}y.push(o={value:h,dice:f<c,children:g.slice(m,w)}),o.dice?O(o,t,e,i,M?e+=c*h/M:u):K(o,t,e,M?t+=f*h/M:i,u),M-=h,m=w}return y}var U=function n(r){function t(n,t,e,i,u){Q(r,n,t,e,i,u)}return t.ratio=function(r){return n((r=+r)>1?r:1)},t}(N);var V=function n(r){function t(n,t,e,i,u){if((o=n._squarify)&&o.ratio===r)for(var o,a,f,c,h,l=-1,p=o.length,d=n.value;++l<p;){for(f=(a=o[l]).children,c=a.value=0,h=f.length;c<h;++c)a.value+=f[c].value;a.dice?O(a,t,e,i,e+=(u-e)*a.value/d):K(a,t,e,t+=(i-t)*a.value/d,u),d-=a.value}else n._squarify=o=Q(r,n,t,e,i,u),o.ratio=r}return t.ratio=function(r){return n((r=+r)>1?r:1)},t}(N);n.cluster=function(){var n=r,i=1,u=1,o=!1;function a(r){var a,f=0;r.eachAfter(function(r){var i=r.children;i?(r.x=function(n){return n.reduce(t,0)/n.length}(i),r.y=function(n){return 1+n.reduce(e,0)}(i)):(r.x=a?f+=n(r,a):0,r.y=0,a=r)});var c=function(n){for(var r;r=n.children;)n=r[0];return n}(r),h=function(n){for(var r;r=n.children;)n=r[r.length-1];return n}(r),l=c.x-n(c,h)/2,p=h.x+n(h,c)/2;return r.eachAfter(o?function(n){n.x=(n.x-r.x)*i,n.y=(r.y-n.y)*u}:function(n){n.x=(n.x-l)/(p-l)*i,n.y=(1-(r.y?n.y/r.y:1))*u})}return a.separation=function(r){return arguments.length?(n=r,a):n},a.size=function(n){return arguments.length?(o=!1,i=+n[0],u=+n[1],a):o?null:[i,u]},a.nodeSize=function(n){return arguments.length?(o=!0,i=+n[0],u=+n[1],a):o?[i,u]:null},a},n.hierarchy=u,n.pack=function(){var n=null,r=1,t=1,e=q;function i(i){return i.x=r/2,i.y=t/2,n?i.eachBefore(S(n)).eachAfter(k(e,.5)).eachBefore(I(1)):i.eachBefore(S(E)).eachAfter(k(q,1)).eachAfter(k(e,i.r/Math.min(r,t))).eachBefore(I(Math.min(r,t)/(2*i.r))),i}return i.radius=function(r){return arguments.length?(n=B(r),i):n},i.size=function(n){return arguments.length?(r=+n[0],t=+n[1],i):[r,t]},i.padding=function(n){return arguments.length?(e="function"==typeof n?n:b(+n),i):e},i},n.packEnclose=l,n.packSiblings=function(n){return z(n),n},n.partition=function(){var n=1,r=1,t=0,e=!1;function i(i){var u=i.height+1;return i.x0=i.y0=t,i.x1=n,i.y1=r/u,i.eachBefore(function(n,r){return function(e){e.children&&O(e,e.x0,n*(e.depth+1)/r,e.x1,n*(e.depth+2)/r);var i=e.x0,u=e.y0,o=e.x1-t,a=e.y1-t;o<i&&(i=o=(i+o)/2),a<u&&(u=a=(u+a)/2),e.x0=i,e.y0=u,e.x1=o,e.y1=a}}(r,u)),e&&i.eachBefore(j),i}return i.round=function(n){return arguments.length?(e=!!n,i):e},i.size=function(t){return arguments.length?(n=+t[0],r=+t[1],i):[n,r]},i.padding=function(n){return arguments.length?(t=+n,i):t},i},n.stratify=function(){var n=D,r=L;function t(t){var e,i,u,o,a,f,l,p=Array.from(t),d=p.length,s=new Map;for(i=0;i<d;++i)e=p[i],a=p[i]=new h(e),null!=(f=n(e,i,t))&&(f+="")&&(l=a.id=f,s.set(l,s.has(l)?T:a)),null!=(f=r(e,i,t))&&(f+="")&&(a.parent=f);for(i=0;i<d;++i)if(f=(a=p[i]).parent){if(!(o=s.get(f)))throw new Error("missing: "+f);if(o===T)throw new Error("ambiguous: "+f);o.children?o.children.push(a):o.children=[a],a.parent=o}else{if(u)throw new Error("multiple roots");u=a}if(!u)throw new Error("no root");if(u.parent=R,u.eachBefore(function(n){n.depth=n.parent.depth+1,--d}).eachBefore(c),u.parent=null,d>0)throw new Error("cycle");return u}return t.id=function(r){return arguments.length?(n=A(r),t):n},t.parentId=function(n){return arguments.length?(r=A(n),t):r},t},n.tree=function(){var n=P,r=1,t=1,e=null;function i(i){var f=function(n){for(var r,t,e,i,u,o=new J(n,0),a=[o];r=a.pop();)if(e=r._.children)for(r.children=new Array(u=e.length),i=u-1;i>=0;--i)a.push(t=r.children[i]=new J(e[i],i)),t.parent=r;return(o.parent=new J(null,0)).children=[o],o}(i);if(f.eachAfter(u),f.parent.m=-f.z,f.eachBefore(o),e)i.eachBefore(a);else{var c=i,h=i,l=i;i.eachBefore(function(n){n.x<c.x&&(c=n),n.x>h.x&&(h=n),n.depth>l.depth&&(l=n)});var p=c===h?1:n(c,h)/2,d=p-c.x,s=r/(h.x+p+d),v=t/(l.depth||1);i.eachBefore(function(n){n.x=(n.x+d)*s,n.y=n.depth*v})}return i}function u(r){var t=r.children,e=r.parent.children,i=r.i?e[r.i-1]:null;if(t){!function(n){for(var r,t=0,e=0,i=n.children,u=i.length;--u>=0;)(r=i[u]).z+=t,r.m+=t,t+=r.s+(e+=r.c)}(r);var u=(t[0].z+t[t.length-1].z)/2;i?(r.z=i.z+n(r._,i._),r.m=r.z-u):r.z=u}else i&&(r.z=i.z+n(r._,i._));r.parent.A=function(r,t,e){if(t){for(var i,u=r,o=r,a=t,f=u.parent.children[0],c=u.m,h=o.m,l=a.m,p=f.m;a=F(a),u=C(u),a&&u;)f=C(f),(o=F(o)).a=r,(i=a.z+l-u.z-c+n(a._,u._))>0&&(G(H(a,r,e),r,i),c+=i,h+=i),l+=a.m,c+=u.m,p+=f.m,h+=o.m;a&&!F(o)&&(o.t=a,o.m+=l-h),u&&!C(f)&&(f.t=u,f.m+=c-p,e=r)}return e}(r,i,r.parent.A||e[0])}function o(n){n._.x=n.z+n.parent.m,n.m+=n.parent.m}function a(n){n.x*=r,n.y=n.depth*t}return i.separation=function(r){return arguments.length?(n=r,i):n},i.size=function(n){return arguments.length?(e=!1,r=+n[0],t=+n[1],i):e?null:[r,t]},i.nodeSize=function(n){return arguments.length?(e=!0,r=+n[0],t=+n[1],i):e?[r,t]:null},i},n.treemap=function(){var n=U,r=!1,t=1,e=1,i=[0],u=q,o=q,a=q,f=q,c=q;function h(n){return n.x0=n.y0=0,n.x1=t,n.y1=e,n.eachBefore(l),i=[0],r&&n.eachBefore(j),n}function l(r){var t=i[r.depth],e=r.x0+t,h=r.y0+t,l=r.x1-t,p=r.y1-t;l<e&&(e=l=(e+l)/2),p<h&&(h=p=(h+p)/2),r.x0=e,r.y0=h,r.x1=l,r.y1=p,r.children&&(t=i[r.depth+1]=u(r)/2,e+=c(r)-t,h+=o(r)-t,(l-=a(r)-t)<e&&(e=l=(e+l)/2),(p-=f(r)-t)<h&&(h=p=(h+p)/2),n(r,e,h,l,p))}return h.round=function(n){return arguments.length?(r=!!n,h):r},h.size=function(n){return arguments.length?(t=+n[0],e=+n[1],h):[t,e]},h.tile=function(r){return arguments.length?(n=A(r),h):n},h.padding=function(n){return arguments.length?h.paddingInner(n).paddingOuter(n):h.paddingInner()},h.paddingInner=function(n){return arguments.length?(u="function"==typeof n?n:b(+n),h):u},h.paddingOuter=function(n){return arguments.length?h.paddingTop(n).paddingRight(n).paddingBottom(n).paddingLeft(n):h.paddingTop()},h.paddingTop=function(n){return arguments.length?(o="function"==typeof n?n:b(+n),h):o},h.paddingRight=function(n){return arguments.length?(a="function"==typeof n?n:b(+n),h):a},h.paddingBottom=function(n){return arguments.length?(f="function"==typeof n?n:b(+n),h):f},h.paddingLeft=function(n){return arguments.length?(c="function"==typeof n?n:b(+n),h):c},h},n.treemapBinary=function(n,r,t,e,i){var u,o,a=n.children,f=a.length,c=new Array(f+1);for(c[0]=o=u=0;u<f;++u)c[u+1]=o+=a[u].value;!function n(r,t,e,i,u,o,f){if(r>=t-1){var h=a[r];return h.x0=i,h.y0=u,h.x1=o,void(h.y1=f)}for(var l=c[r],p=e/2+l,d=r+1,s=t-1;d<s;){var v=d+s>>>1;c[v]<p?d=v+1:s=v}p-c[d-1]<c[d]-p&&r+1<d&&--d;var x=c[d]-l,y=e-x;if(o-i>f-u){var g=(i*y+o*x)/e;n(r,d,x,i,u,g,f),n(d,t,y,g,u,o,f)}else{var m=(u*y+f*x)/e;n(r,d,x,i,u,o,m),n(d,t,y,i,m,o,f)}}(0,f,n.value,r,t,e,i)},n.treemapDice=O,n.treemapResquarify=V,n.treemapSlice=K,n.treemapSliceDice=function(n,r,t,e,i){(1&n.depth?K:O)(n,r,t,e,i)},n.treemapSquarify=U,Object.defineProperty(n,"__esModule",{value:!0})});

package.json

 {
   "name": "d3-hierarchy",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.3",
   "publishConfig": {
@@ -5,0 +5,0 @@ "tag": "next"

src/hierarchy/index.js

@@ -16,4 +16,8 @@ import node_count from "./count.js";
 export default function hierarchy(data, children) {
-  if (data instanceof Map) return hierarchy([undefined, data], children === undefined ? mapChildren : children).each(mapData);
-  if (children === undefined) children = objectChildren;
+  if (data instanceof Map) {
+    data = [undefined, data];
+    if (children === undefined) children = mapChildren;
+  } else if (children === undefined) {
+    children = objectChildren;
+  }
 
@@ -39,7 +43,7 @@ var root = new Node(data),
 
-  return root.each(computeHeight);
+  return root.eachBefore(computeHeight);
 }
 
 function node_copy() {
-  return hierarchy(this).each(copyData);
+  return hierarchy(this).eachBefore(copyData);
 }
@@ -55,8 +59,2 @@
 
-function mapData(node) {
-  if (Array.isArray(node.data)) {
-    node.data = {name: node.data[0], value: node.data[1]};
-  }
-}
-
 function copyData(node) {
@@ -63,0 +61,0 @@ if (node.data.value !== undefined) node.value = node.data.value;

No alert changes

Worsened metrics

Total package byte prevSize

128592

decreased by-0.23%

Lines of code

2355

decreased by-0.13%

No dependency changes