vega-encode - npm Package Compare versions

Comparing version 4.4.1 to 4.5.0

build/vega-encode.js

 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vega-scale'), require('vega-util'), require('d3-time-format'), require('d3-format'), require('vega-dataflow'), require('d3-array'), require('d3-interpolate')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'vega-scale', 'vega-util', 'd3-time-format', 'd3-format', 'vega-dataflow', 'd3-array', 'd3-interpolate'], factory) :
-  (global = global || self, factory((global.vega = global.vega || {}, global.vega.transforms = {}), global.vega, global.vega, global.d3, global.d3, global.vega, global.d3, global.d3));
-}(this, function (exports, vegaScale, vegaUtil, d3TimeFormat, d3Format, vegaDataflow, d3Array, d3Interpolate) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vega-scale'), require('vega-time'), require('vega-util'), require('d3-format'), require('vega-dataflow'), require('d3-array'), require('d3-interpolate')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'vega-scale', 'vega-time', 'vega-util', 'd3-format', 'vega-dataflow', 'd3-array', 'd3-interpolate'], factory) :
+  (global = global || self, factory((global.vega = global.vega || {}, global.vega.transforms = {}), global.vega, global.vega, global.vega, global.d3, global.vega, global.d3, global.d3));
+}(this, (function (exports, vegaScale, vegaTime, vegaUtil, d3Format, vegaDataflow, d3Array, d3Interpolate) { 'use strict';
 
@@ -32,4 +32,5 @@ /**
     if (vegaUtil.isString(count)) {
-      count = vegaScale.timeInterval(count, scale.type)
-            || vegaUtil.error('Only time and utc scales accept interval strings.');
+      count = scale.type === vegaScale.Time ? vegaTime.timeInterval(count)
+        : scale.type == vegaScale.UTC ? vegaTime.utcInterval(count)
+        : vegaUtil.error('Only time and utc scales accept interval strings.');
       if (step) count = count.every(step);
@@ -104,14 +105,17 @@ }
    * @param {string} [specifier] - The format specifier. Must be a legal d3
-   *   specifier string (see https://github.com/d3/d3-format#formatSpecifier).
+   *   specifier string (see https://github.com/d3/d3-format#formatSpecifier) or
+   *   time multi-format specifier object.
    * @return {function(*):string} - The generated label formatter.
    */
-  function tickFormat(scale, count, specifier, formatType) {
-    var format = scale.tickFormat ? scale.tickFormat(count, specifier)
-      : specifier && formatType === vegaScale.Time ? d3TimeFormat.timeFormat(specifier)
-      : specifier ? d3Format.format(specifier)
-      : String;
+  function tickFormat(scale, count, specifier, formatType, noSkip) {
+    var type = scale.type,
+        format = (type === vegaScale.Time || formatType === vegaScale.Time) ? vegaTime.timeFormat(specifier)
+          : (type === vegaScale.UTC || formatType === vegaScale.UTC) ? vegaTime.utcFormat(specifier)
+          : scale.tickFormat ? scale.tickFormat(count, specifier)
+          : specifier ? d3Format.format(specifier)
+          : String;
 
-    if (vegaScale.isLogarithmic(scale.type)) {
+    if (vegaScale.isLogarithmic(type)) {
       var logfmt = variablePrecision(specifier);
-      format = scale.bins ? logfmt : filter(format, logfmt);
+      format = noSkip || scale.bins ? logfmt : filter(format, logfmt);
     }
@@ -123,5 +127,3 @@
   function filter(sourceFormat, targetFormat) {
-    return function(_) {
-      return sourceFormat(_) ? targetFormat(_) : '';
-    };
+    return _ => sourceFormat(_) ? targetFormat(_) : '';
   }
@@ -204,3 +206,3 @@
         count = tickCount(scale, tally, _.minstep),
-        format = _.format || tickFormat(scale, count, _.formatSpecifier, _.formatType),
+        format = _.format || tickFormat(scale, count, _.formatSpecifier, _.formatType, !!_.values),
         values = _.values ? validTicks(scale, _.values, count) : tickValues(scale, count);
@@ -456,6 +458,6 @@
 
-  function labelFormat(scale, count, type, specifier, formatType) {
-    const format = formats[scale.type] && formatType !== vegaScale.Time
+  function labelFormat(scale, count, type, specifier, formatType, noSkip) {
+    const format = formats[scale.type] && formatType !== vegaScale.Time && formatType !== vegaScale.UTC
       ? thresholdFormat(scale, specifier)
-      : tickFormat(scale, count, specifier, formatType);
+      : tickFormat(scale, count, specifier, formatType, noSkip);
 
@@ -546,3 +548,3 @@ return type === Symbols && isDiscreteRange(scale) ? formatRange(format)
         count = tickCount(scale, _.count == null ? 5 : _.count, _.minstep),
-        format = _.format || labelFormat(scale, count, type, _.formatSpecifier, _.formatType),
+        format = _.format || labelFormat(scale, count, type, _.formatSpecifier, _.formatType, !!_.values),
         values = _.values || labelValues(scale, count),
@@ -1344,2 +1346,2 @@ domain, fraction, size, offset, ellipsis;
 
-}));
+})));

build/vega-encode.min.js

@@ -1,1 +0,1 @@
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("vega-scale"),require("vega-util"),require("d3-time-format"),require("d3-format"),require("vega-dataflow"),require("d3-array"),require("d3-interpolate")):"function"==typeof define&&define.amd?define(["exports","vega-scale","vega-util","d3-time-format","d3-format","vega-dataflow","d3-array","d3-interpolate"],n):n(((e=e||self).vega=e.vega||{},e.vega.transforms={}),e.vega,e.vega,e.d3,e.d3,e.vega,e.d3,e.d3)}(this,(function(e,n,t,r,i,a,o,u){"use strict";function l(e,r,i){var a;return t.isNumber(r)&&(e.bins&&(r=Math.max(r,e.bins.length)),null!=i&&(r=Math.min(r,~~(t.span(e.domain())/i)||1))),t.isObject(r)&&(a=r.step,r=r.interval),t.isString(r)&&(r=n.timeInterval(r,e.type)||t.error("Only time and utc scales accept interval strings."),a&&(r=r.every(a))),r}function s(e,n,r){var i=e.range(),a=Math.floor(i[0]),o=Math.ceil(t.peek(i));if(a>o&&(i=o,o=a,a=i),n=n.filter((function(n){return n=e(n),a<=n&&n<=o})),r>0&&n.length>1){for(var u=[n[0],t.peek(n)];n.length>r&&n.length>=3;)n=n.filter((function(e,n){return!(n%2)}));n.length<3&&(n=u)}return n}function f(e,n){return e.bins?s(e,e.bins):e.ticks?e.ticks(n):e.domain()}function c(e,t,a,o){var u,l,s=e.tickFormat?e.tickFormat(t,a):a&&o===n.Time?r.timeFormat(a):a?i.format(a):String;if(n.isLogarithmic(e.type)){var f=function(e){var n=i.formatSpecifier(e||",");if(null==n.precision){switch(n.precision=12,n.type){case"%":n.precision-=2;break;case"e":n.precision-=1}return t=i.format(n),r=i.format(".1f")(1)[1],function(e){var n,i,a=t(e),o=a.indexOf(r);if(o<0)return a;for(i=(n=function(e,n){var t,r=e.lastIndexOf("e");if(r>0)return r;for(r=e.length;--r>n;)if((t=e.charCodeAt(r))>=48&&t<=57)return r+1}(a,o))<a.length?a.slice(n):"";--n>o;)if("0"!==a[n]){++n;break}return a.slice(0,n)+i}}return i.format(n);var t,r}(a);s=e.bins?f:(u=s,l=f,function(e){return u(e)?l(e):""})}return s}function d(e){a.Transform.call(this,null,e)}function m(e){a.Transform.call(this,null,e)}function p(){return a.ingest({})}function h(e){return e.exit}function g(e){a.Transform.call(this,null,e)}t.inherits(d,a.Transform).transform=function(e,n){if(this.value&&!e.modified())return n.StopPropagation;var t=n.fork(n.NO_SOURCE|n.NO_FIELDS),r=this.value,i=e.scale,o=l(i,null==e.count?e.values?e.values.length:10:e.count,e.minstep),u=e.format||c(i,o,e.formatSpecifier,e.formatType),d=e.values?s(i,e.values,o):f(i,o);return r&&(t.rem=r),r=d.map((function(e,n){return a.ingest({index:n/(d.length-1||1),value:e,label:u(e)})})),e.extra&&r.length&&r.push(a.ingest({index:-1,extra:{value:r[0].value},label:""})),t.source=r,t.add=r,this.value=r,t},t.inherits(m,a.Transform).transform=function(e,n){var r=n.dataflow,i=n.fork(n.NO_SOURCE|n.NO_FIELDS),o=e.item||p,u=e.key||a.tupleid,l=this.value;return t.isArray(i.encode)&&(i.encode=null),l&&(e.modified("key")||n.modified(u))&&t.error("DataJoin does not support modified key function or fields."),l||(n=n.addAll(),this.value=l=t.fastmap().test(h),l.lookup=function(e){return l.get(u(e))}),n.visit(n.ADD,(function(e){var n=u(e),t=l.get(n);t?t.exit?(l.empty--,i.add.push(t)):i.mod.push(t):(l.set(n,t=o(e)),i.add.push(t)),t.datum=e,t.exit=!1})),n.visit(n.MOD,(function(e){var n=u(e),t=l.get(n);t&&(t.datum=e,i.mod.push(t))})),n.visit(n.REM,(function(e){var n=u(e),t=l.get(n);e!==t.datum||t.exit||(i.rem.push(t),t.exit=!0,++l.empty)})),n.changed(n.ADD_MOD)&&i.modifies("datum"),e.clean&&l.empty>r.cleanThreshold&&r.runAfter(l.clean),i},t.inherits(g,a.Transform).transform=function(e,n){var r=n.fork(n.ADD_REM),i=e.mod||!1,a=e.encoders,o=n.encode;if(t.isArray(o)){if(!r.changed()&&!o.every((function(e){return a[e]})))return n.StopPropagation;o=o[0],r.encode=null}var u="enter"===o,l=a.update||t.falsy,s=a.enter||t.falsy,f=a.exit||t.falsy,c=(o&&!u?a[o]:l)||t.falsy;if(n.changed(n.ADD)&&(n.visit(n.ADD,(function(n){s(n,e),l(n,e)})),r.modifies(s.output),r.modifies(l.output),c!==t.falsy&&c!==l&&(n.visit(n.ADD,(function(n){c(n,e)})),r.modifies(c.output))),n.changed(n.REM)&&f!==t.falsy&&(n.visit(n.REM,(function(n){f(n,e)})),r.modifies(f.output)),u||c!==t.falsy){var d=n.MOD|(e.modified()?n.REFLOW:0);u?(n.visit(d,(function(n){var t=s(n,e)||i;(c(n,e)||t)&&r.mod.push(n)})),r.mod.length&&r.modifies(s.output)):n.visit(d,(function(n){(c(n,e)||i)&&r.mod.push(n)})),r.mod.length&&r.modifies(c.output)}return r.changed()?r:n.StopPropagation};var v="symbol",y="discrete";const M={[n.Quantile]:"quantiles",[n.Quantize]:"thresholds",[n.Threshold]:"domain"},b={[n.Quantile]:"quantiles",[n.Quantize]:"domain"};function x(e,n){return e.bins?function(e){const n=e.slice(0,-1);return n.max=t.peek(e),n}(e.bins):M[e.type]?function(e){const n=[-1/0].concat(e);return n.max=1/0,n}(e[M[e.type]]()):f(e,n)}function S(e,t,r,i,a){const o=b[e.type]&&a!==n.Time?function(e,t){var r,i=e[b[e.type]](),a=i.length,o=a>1?i[1]-i[0]:i[0];for(r=1;r<a;++r)o=Math.min(o,i[r]-i[r-1]);return n.tickFormat(0,o,30,t)}(e,i):c(e,t,i,a);return r===v&&function(e){return M[e.type]||e.bins}(e)?function(e){return function(n,t,r){var i=r[t+1]||r.max||1/0,a=k(n,e),o=k(i,e);return a&&o?a+"–"+o:o?"< "+o:"≥ "+a}}(o):r===y?function(e){return function(n,t){return t?e(n):null}}(o):function(e){return function(n){return e(n)}}(o)}function k(e,n){return Number.isFinite(e)?n(e):null}function O(e){a.Transform.call(this,[],e)}t.inherits(O,a.Transform).transform=function(e,r){if(null!=this.value&&!e.modified())return r.StopPropagation;var i,o,u,s,f,c=r.fork(r.NO_SOURCE|r.NO_FIELDS),d=this.value,m=e.type||v,p=e.scale,h=+e.limit,g=l(p,null==e.count?5:e.count,e.minstep),y=e.format||S(p,g,m,e.formatSpecifier,e.formatType),M=e.values||x(p,g);return d&&(c.rem=d),m===v?(h&&M.length>h?(r.dataflow.warn("Symbol legend count exceeds limit, filtering items."),d=M.slice(0,h-1),f=!0):d=M,t.isFunction(u=e.size)?(e.values||0!==p(d[0])||(d=d.slice(1)),s=d.reduce((function(n,t){return Math.max(n,u(t,e))}),0)):u=t.constant(s=u||8),d=d.map((function(n,t){return a.ingest({index:t,label:y(n,t,M),value:n,offset:s,size:u(n,e)})})),f&&(f=M[d.length],d.push(a.ingest({index:d.length,label:`…${M.length-d.length} entries`,value:f,offset:s,size:u(f,e)})))):"gradient"===m?(i=p.domain(),o=n.scaleFraction(p,i[0],t.peek(i)),M.length<3&&!e.values&&i[0]!==t.peek(i)&&(M=[i[0],t.peek(i)]),d=M.map((function(e,n){return a.ingest({index:n,label:y(e,n,M),value:e,perc:o(e)})}))):(u=M.length-1,o=function(e){var r=e.domain(),i=r.length-1,a=+r[0],o=+t.peek(r),u=o-a;if(e.type===n.Threshold){var l=i?u/i:.1;u=(o+=l)-(a-=l)}return function(e){return(e-a)/u}}(p),d=M.map((function(e,n){return a.ingest({index:n,label:y(e,n,M),value:e,perc:n?o(e):0,perc2:n===u?1:o(M[n+1])})}))),c.source=d,c.add=d,this.value=d,c};var T=t.fastmap({line:L,"line-radial":function(e,n,t,r){return L(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))},arc:q,"arc-radial":function(e,n,t,r){return q(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))},curve:F,"curve-radial":function(e,n,t,r){return F(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))},"orthogonal-horizontal":function(e,n,t,r){return"M"+e+","+n+"V"+r+"H"+t},"orthogonal-vertical":function(e,n,t,r){return"M"+e+","+n+"H"+t+"V"+r},"orthogonal-radial":function(e,n,t,r){var i=Math.cos(e),a=Math.sin(e),o=Math.cos(t),u=Math.sin(t),l=Math.abs(t-e)>Math.PI?t<=e:t>e;return"M"+n*i+","+n*a+"A"+n+","+n+" 0 0,"+(l?1:0)+" "+n*o+","+n*u+"L"+r*o+","+r*u},"diagonal-horizontal":function(e,n,t,r){var i=(e+t)/2;return"M"+e+","+n+"C"+i+","+n+" "+i+","+r+" "+t+","+r},"diagonal-vertical":function(e,n,t,r){var i=(n+r)/2;return"M"+e+","+n+"C"+e+","+i+" "+t+","+i+" "+t+","+r},"diagonal-radial":function(e,n,t,r){var i=Math.cos(e),a=Math.sin(e),o=Math.cos(t),u=Math.sin(t),l=(n+r)/2;return"M"+n*i+","+n*a+"C"+l*i+","+l*a+" "+l*o+","+l*u+" "+r*o+","+r*u}});function D(e){return e.source.x}function w(e){return e.source.y}function A(e){return e.target.x}function z(e){return e.target.y}function C(e){a.Transform.call(this,{},e)}function L(e,n,t,r){return"M"+e+","+n+"L"+t+","+r}function q(e,n,t,r){var i=t-e,a=r-n,o=Math.sqrt(i*i+a*a)/2;return"M"+e+","+n+"A"+o+","+o+" "+180*Math.atan2(a,i)/Math.PI+" 0 1 "+t+","+r}function F(e,n,t,r){var i=t-e,a=r-n,o=.2*(i+a),u=.2*(a-i);return"M"+e+","+n+"C"+(e+o)+","+(n+u)+" "+(t+u)+","+(r-o)+" "+t+","+r}function I(e){a.Transform.call(this,null,e)}C.Definition={type:"LinkPath",metadata:{modifies:!0},params:[{name:"sourceX",type:"field",default:"source.x"},{name:"sourceY",type:"field",default:"source.y"},{name:"targetX",type:"field",default:"target.x"},{name:"targetY",type:"field",default:"target.y"},{name:"orient",type:"enum",default:"vertical",values:["horizontal","vertical","radial"]},{name:"shape",type:"enum",default:"line",values:["line","arc","curve","diagonal","orthogonal"]},{name:"require",type:"signal"},{name:"as",type:"string",default:"path"}]},t.inherits(C,a.Transform).transform=function(e,n){var r=e.sourceX||D,i=e.sourceY||w,a=e.targetX||A,o=e.targetY||z,u=e.as||"path",l=e.orient||"vertical",s=e.shape||"line",f=T.get(s+"-"+l)||T.get(s);return f||t.error("LinkPath unsupported type: "+e.shape+(e.orient?"-"+e.orient:"")),n.visit(n.SOURCE,(function(e){e[u]=f(r(e),i(e),a(e),o(e))})),n.reflow(e.modified()).modifies(u)},I.Definition={type:"Pie",metadata:{modifies:!0},params:[{name:"field",type:"field"},{name:"startAngle",type:"number",default:0},{name:"endAngle",type:"number",default:6.283185307179586},{name:"sort",type:"boolean",default:!1},{name:"as",type:"string",array:!0,length:2,default:["startAngle","endAngle"]}]},t.inherits(I,a.Transform).transform=function(e,n){var r,i,a,u=e.as||["startAngle","endAngle"],l=u[0],s=u[1],f=e.field||t.one,c=e.startAngle||0,d=null!=e.endAngle?e.endAngle:2*Math.PI,m=n.source,p=m.map(f),h=p.length,g=c,v=(d-c)/o.sum(p),y=o.range(h);for(e.sort&&y.sort((function(e,n){return p[e]-p[n]})),r=0;r<h;++r)a=p[y[r]],(i=m[y[r]])[l]=g,i[s]=g+=a*v;return this.value=p,n.reflow(e.modified()).modifies(u)};var P=5;function E(e){return n.isContinuous(e)&&e!==n.Sequential}var R=t.toSet(["set","modified","clear","type","scheme","schemeExtent","schemeCount","domain","domainMin","domainMid","domainMax","domainRaw","domainImplicit","nice","zero","bins","range","rangeStep","round","reverse","interpolate","interpolateGamma"]);function _(e){a.Transform.call(this,null,e),this.modified(!0)}function N(e,r,i){n.isLogarithmic(e)&&(Math.abs(r.reduce((function(e,n){return e+(n<0?-1:n>0?1:0)}),0))!==r.length&&i.warn("Log scale domain includes zero: "+t.stringValue(r)));return r}function U(e,r,i){return t.isFunction(e)&&(r||i)?n.interpolateRange(e,Q(r||[0,1],i)):e}function Q(e,n){return n?e.slice().reverse():e}function j(e){a.Transform.call(this,null,e)}t.inherits(_,a.Transform).transform=function(e,r){var i=r.dataflow,a=this.value,s=function(e){var r,i=e.type,a="";if(i===n.Sequential)return n.Sequential+"-"+n.Linear;(function(e){const r=e.type;return n.isContinuous(r)&&r!==n.Time&&r!==n.UTC&&(e.scheme||e.range&&e.range.length&&e.range.every(t.isString))})(e)&&(r=e.rawDomain?e.rawDomain.length:e.domain?e.domain.length+ +(null!=e.domainMid):0,a=2===r?n.Sequential+"-":3===r?n.Diverging+"-":"");return(a+i||n.Linear).toLowerCase()}(e);for(s in a&&s===a.type||(this.value=a=n.scale(s)()),e)if(!R[s]){if("padding"===s&&E(a.type))continue;t.isFunction(a[s])?a[s](e[s]):i.warn("Unsupported scale property: "+s)}return function(e,r,i){var a=e.type,o=r.round||!1,l=r.range;if(null!=r.rangeStep)l=function(e,r,i){e!==n.Band&&e!==n.Point&&t.error("Only band and point scales support rangeStep.");var a=(null!=r.paddingOuter?r.paddingOuter:r.padding)||0,o=e===n.Point?1:(null!=r.paddingInner?r.paddingInner:r.padding)||0;return[0,r.rangeStep*n.bandSpace(i,o,a)]}(a,r,i);else if(r.scheme&&(l=function(e,r,i){var a,o,u=r.schemeExtent;t.isArray(r.scheme)?o=n.interpolateColors(r.scheme,r.interpolate,r.interpolateGamma):(a=r.scheme.toLowerCase(),(o=n.scheme(a))||t.error(`Unrecognized scheme name: ${r.scheme}`));return i=e===n.Threshold?i+1:e===n.BinOrdinal?i-1:e===n.Quantile||e===n.Quantize?+r.schemeCount||P:i,n.isInterpolating(e)?U(o,u,r.reverse):t.isFunction(o)?n.quantizeInterpolator(U(o,u),i):e===n.Ordinal?o:o.slice(0,i)}(a,r,i),t.isFunction(l))){if(e.interpolator)return e.interpolator(l);t.error(`Scale type ${a} does not support interpolating color schemes.`)}if(l&&n.isInterpolating(a))return e.interpolator(n.interpolateColors(Q(l,r.reverse),r.interpolate,r.interpolateGamma));l&&r.interpolate&&e.interpolate?e.interpolate(n.interpolate(r.interpolate,r.interpolateGamma)):t.isFunction(e.round)?e.round(o):t.isFunction(e.rangeRound)&&e.interpolate(o?u.interpolateRound:u.interpolate);l&&e.range(Q(l,r.reverse))}(a,e,function(e,r,i){let a=r.bins;if(a&&!t.isArray(a)){let n=e.domain(),r=n[0],i=t.peek(n),u=null==a.start?r:a.start,l=null==a.stop?i:a.stop,s=a.step;s||t.error("Scale bins parameter missing step property."),u<r&&(u=s*Math.ceil(r/s)),l>i&&(l=s*Math.floor(i/s)),a=o.range(u,l+s/2,s)}a?e.bins=a:e.bins&&delete e.bins;e.type===n.BinOrdinal&&(a?r.domain||r.domainRaw||(e.domain(a),i=a.length):e.bins=e.domain());return i}(a,e,function(e,r,i){var a=function(e,n,t){return n?(e.domain(N(e.type,n,t)),n.length):-1}(e,r.domainRaw,i);if(a>-1)return a;var o,u,s=r.domain,f=e.type,c=r.zero||void 0===r.zero&&function(e){const t=e.type;return!e.bins&&(t===n.Linear||t===n.Pow||t===n.Sqrt)}(e);if(!s)return 0;E(f)&&r.padding&&s[0]!==t.peek(s)&&(s=function(e,r,i,a,o,u){var l=Math.abs(t.peek(i)-i[0]),s=l/(l-2*a),f=e===n.Log?t.zoomLog(r,null,s):e===n.Sqrt?t.zoomPow(r,null,s,.5):e===n.Pow?t.zoomPow(r,null,s,o||1):e===n.Symlog?t.zoomSymlog(r,null,s,u||1):t.zoomLinear(r,null,s);return(r=r.slice())[0]=f[0],r[r.length-1]=f[1],r}(f,s,r.range,r.padding,r.exponent,r.constant));(c||null!=r.domainMin||null!=r.domainMax||null!=r.domainMid)&&(o=(s=s.slice()).length-1||1,c&&(s[0]>0&&(s[0]=0),s[o]<0&&(s[o]=0)),null!=r.domainMin&&(s[0]=r.domainMin),null!=r.domainMax&&(s[o]=r.domainMax),null!=r.domainMid&&(((u=r.domainMid)<s[0]||u>s[o])&&i.warn("Scale domainMid exceeds domain min or max.",u),s.splice(o,0,u)));e.domain(N(f,s,i)),f===n.Ordinal&&e.unknown(r.domainImplicit?n.scaleImplicit:void 0);r.nice&&e.nice&&e.nice(!0!==r.nice&&l(e,r.nice)||null);return s.length}(a,e,i))),r.fork(r.NO_SOURCE|r.NO_FIELDS)},t.inherits(j,a.Transform).transform=function(e,n){var t=e.modified("sort")||n.changed(n.ADD)||n.modified(e.sort.fields)||n.modified("datum");return t&&n.source.sort(a.stableCompare(e.sort)),this.modified(t),n};var G=["y0","y1"];function X(e){a.Transform.call(this,null,e)}function Y(e,n,t,r,i){for(var a,o=(n-e.sum)/2,u=e.length,l=0;l<u;++l)(a=e[l])[r]=o,a[i]=o+=Math.abs(t(a))}function B(e,n,t,r,i){for(var a,o=1/e.sum,u=0,l=e.length,s=0,f=0;s<l;++s)(a=e[s])[r]=u,a[i]=u=o*(f+=Math.abs(t(a)))}function V(e,n,t,r,i){for(var a,o,u=0,l=0,s=e.length,f=0;f<s;++f)(a=+t(o=e[f]))<0?(o[r]=l,o[i]=l+=a):(o[r]=u,o[i]=u+=a)}X.Definition={type:"Stack",metadata:{modifies:!0},params:[{name:"field",type:"field"},{name:"groupby",type:"field",array:!0},{name:"sort",type:"compare"},{name:"offset",type:"enum",default:"zero",values:["zero","center","normalize"]},{name:"as",type:"string",array:!0,length:2,default:G}]},t.inherits(X,a.Transform).transform=function(e,n){var r,i,o,u,l=e.as||G,s=l[0],f=l[1],c=a.stableCompare(e.sort),d=e.field||t.one,m="center"===e.offset?Y:"normalize"===e.offset?B:V;for(r=function(e,n,t,r){var i,a,o,u,l,s,f,c,d,m=[],p=function(e){return e(l)};if(null==n)m.push(e.slice());else for(i={},a=0,o=e.length;a<o;++a)l=e[a],s=n.map(p),(f=i[s])||(i[s]=f=[],m.push(f)),f.push(l);for(s=0,d=0,u=m.length;s<u;++s){for(f=m[s],a=0,c=0,o=f.length;a<o;++a)c+=Math.abs(r(f[a]));f.sum=c,c>d&&(d=c),t&&f.sort(t)}return m.max=d,m}(n.source,e.groupby,c,d),i=0,o=r.length,u=r.max;i<o;++i)m(r[i],u,d,s,f);return n.reflow(e.modified()).modifies(l)},e.axisticks=d,e.datajoin=m,e.encode=g,e.legendentries=O,e.linkpath=C,e.pie=I,e.scale=_,e.sortitems=j,e.stack=X,e.validTicks=s,Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("vega-scale"),require("vega-time"),require("vega-util"),require("d3-format"),require("vega-dataflow"),require("d3-array"),require("d3-interpolate")):"function"==typeof define&&define.amd?define(["exports","vega-scale","vega-time","vega-util","d3-format","vega-dataflow","d3-array","d3-interpolate"],n):n(((e=e||self).vega=e.vega||{},e.vega.transforms={}),e.vega,e.vega,e.vega,e.d3,e.vega,e.d3,e.d3)}(this,(function(e,n,t,r,i,a,o,u){"use strict";function l(e,i,a){var o;return r.isNumber(i)&&(e.bins&&(i=Math.max(i,e.bins.length)),null!=a&&(i=Math.min(i,~~(r.span(e.domain())/a)||1))),r.isObject(i)&&(o=i.step,i=i.interval),r.isString(i)&&(i=e.type===n.Time?t.timeInterval(i):e.type==n.UTC?t.utcInterval(i):r.error("Only time and utc scales accept interval strings."),o&&(i=i.every(o))),i}function s(e,n,t){var i=e.range(),a=Math.floor(i[0]),o=Math.ceil(r.peek(i));if(a>o&&(i=o,o=a,a=i),n=n.filter((function(n){return n=e(n),a<=n&&n<=o})),t>0&&n.length>1){for(var u=[n[0],r.peek(n)];n.length>t&&n.length>=3;)n=n.filter((function(e,n){return!(n%2)}));n.length<3&&(n=u)}return n}function f(e,n){return e.bins?s(e,e.bins):e.ticks?e.ticks(n):e.domain()}function c(e,r,a,o,u){var l,s,f=e.type,c=f===n.Time||o===n.Time?t.timeFormat(a):f===n.UTC||o===n.UTC?t.utcFormat(a):e.tickFormat?e.tickFormat(r,a):a?i.format(a):String;if(n.isLogarithmic(f)){var d=function(e){var n=i.formatSpecifier(e||",");if(null==n.precision){switch(n.precision=12,n.type){case"%":n.precision-=2;break;case"e":n.precision-=1}return function(e,n){return function(t){var r,i,a=e(t),o=a.indexOf(n);if(o<0)return a;for(i=(r=function(e,n){var t,r=e.lastIndexOf("e");if(r>0)return r;for(r=e.length;--r>n;)if((t=e.charCodeAt(r))>=48&&t<=57)return r+1}(a,o))<a.length?a.slice(r):"";--r>o;)if("0"!==a[r]){++r;break}return a.slice(0,r)+i}}(i.format(n),i.format(".1f")(1)[1])}return i.format(n)}(a);c=u||e.bins?d:(l=c,s=d,e=>l(e)?s(e):"")}return c}function d(e){a.Transform.call(this,null,e)}function m(e){a.Transform.call(this,null,e)}function p(){return a.ingest({})}function h(e){return e.exit}function g(e){a.Transform.call(this,null,e)}r.inherits(d,a.Transform).transform=function(e,n){if(this.value&&!e.modified())return n.StopPropagation;var t=n.fork(n.NO_SOURCE|n.NO_FIELDS),r=this.value,i=e.scale,o=l(i,null==e.count?e.values?e.values.length:10:e.count,e.minstep),u=e.format||c(i,o,e.formatSpecifier,e.formatType,!!e.values),d=e.values?s(i,e.values,o):f(i,o);return r&&(t.rem=r),r=d.map((function(e,n){return a.ingest({index:n/(d.length-1||1),value:e,label:u(e)})})),e.extra&&r.length&&r.push(a.ingest({index:-1,extra:{value:r[0].value},label:""})),t.source=r,t.add=r,this.value=r,t},r.inherits(m,a.Transform).transform=function(e,n){var t=n.dataflow,i=n.fork(n.NO_SOURCE|n.NO_FIELDS),o=e.item||p,u=e.key||a.tupleid,l=this.value;return r.isArray(i.encode)&&(i.encode=null),l&&(e.modified("key")||n.modified(u))&&r.error("DataJoin does not support modified key function or fields."),l||(n=n.addAll(),this.value=l=r.fastmap().test(h),l.lookup=function(e){return l.get(u(e))}),n.visit(n.ADD,(function(e){var n=u(e),t=l.get(n);t?t.exit?(l.empty--,i.add.push(t)):i.mod.push(t):(l.set(n,t=o(e)),i.add.push(t)),t.datum=e,t.exit=!1})),n.visit(n.MOD,(function(e){var n=u(e),t=l.get(n);t&&(t.datum=e,i.mod.push(t))})),n.visit(n.REM,(function(e){var n=u(e),t=l.get(n);e!==t.datum||t.exit||(i.rem.push(t),t.exit=!0,++l.empty)})),n.changed(n.ADD_MOD)&&i.modifies("datum"),e.clean&&l.empty>t.cleanThreshold&&t.runAfter(l.clean),i},r.inherits(g,a.Transform).transform=function(e,n){var t=n.fork(n.ADD_REM),i=e.mod||!1,a=e.encoders,o=n.encode;if(r.isArray(o)){if(!t.changed()&&!o.every((function(e){return a[e]})))return n.StopPropagation;o=o[0],t.encode=null}var u="enter"===o,l=a.update||r.falsy,s=a.enter||r.falsy,f=a.exit||r.falsy,c=(o&&!u?a[o]:l)||r.falsy;if(n.changed(n.ADD)&&(n.visit(n.ADD,(function(n){s(n,e),l(n,e)})),t.modifies(s.output),t.modifies(l.output),c!==r.falsy&&c!==l&&(n.visit(n.ADD,(function(n){c(n,e)})),t.modifies(c.output))),n.changed(n.REM)&&f!==r.falsy&&(n.visit(n.REM,(function(n){f(n,e)})),t.modifies(f.output)),u||c!==r.falsy){var d=n.MOD|(e.modified()?n.REFLOW:0);u?(n.visit(d,(function(n){var r=s(n,e)||i;(c(n,e)||r)&&t.mod.push(n)})),t.mod.length&&t.modifies(s.output)):n.visit(d,(function(n){(c(n,e)||i)&&t.mod.push(n)})),t.mod.length&&t.modifies(c.output)}return t.changed()?t:n.StopPropagation};var v="symbol",y="discrete";const M={[n.Quantile]:"quantiles",[n.Quantize]:"thresholds",[n.Threshold]:"domain"},b={[n.Quantile]:"quantiles",[n.Quantize]:"domain"};function x(e,n){return e.bins?function(e){const n=e.slice(0,-1);return n.max=r.peek(e),n}(e.bins):M[e.type]?function(e){const n=[-1/0].concat(e);return n.max=1/0,n}(e[M[e.type]]()):f(e,n)}function S(e,t,r,i,a,o){const u=b[e.type]&&a!==n.Time&&a!==n.UTC?function(e,t){var r,i=e[b[e.type]](),a=i.length,o=a>1?i[1]-i[0]:i[0];for(r=1;r<a;++r)o=Math.min(o,i[r]-i[r-1]);return n.tickFormat(0,o,30,t)}(e,i):c(e,t,i,a,o);return r===v&&function(e){return M[e.type]||e.bins}(e)?function(e){return function(n,t,r){var i=r[t+1]||r.max||1/0,a=T(n,e),o=T(i,e);return a&&o?a+"–"+o:o?"< "+o:"≥ "+a}}(u):r===y?function(e){return function(n,t){return t?e(n):null}}(u):function(e){return function(n){return e(n)}}(u)}function T(e,n){return Number.isFinite(e)?n(e):null}function k(e){a.Transform.call(this,[],e)}r.inherits(k,a.Transform).transform=function(e,t){if(null!=this.value&&!e.modified())return t.StopPropagation;var i,o,u,s,f,c=t.fork(t.NO_SOURCE|t.NO_FIELDS),d=this.value,m=e.type||v,p=e.scale,h=+e.limit,g=l(p,null==e.count?5:e.count,e.minstep),y=e.format||S(p,g,m,e.formatSpecifier,e.formatType,!!e.values),M=e.values||x(p,g);return d&&(c.rem=d),m===v?(h&&M.length>h?(t.dataflow.warn("Symbol legend count exceeds limit, filtering items."),d=M.slice(0,h-1),f=!0):d=M,r.isFunction(u=e.size)?(e.values||0!==p(d[0])||(d=d.slice(1)),s=d.reduce((function(n,t){return Math.max(n,u(t,e))}),0)):u=r.constant(s=u||8),d=d.map((function(n,t){return a.ingest({index:t,label:y(n,t,M),value:n,offset:s,size:u(n,e)})})),f&&(f=M[d.length],d.push(a.ingest({index:d.length,label:`…${M.length-d.length} entries`,value:f,offset:s,size:u(f,e)})))):"gradient"===m?(i=p.domain(),o=n.scaleFraction(p,i[0],r.peek(i)),M.length<3&&!e.values&&i[0]!==r.peek(i)&&(M=[i[0],r.peek(i)]),d=M.map((function(e,n){return a.ingest({index:n,label:y(e,n,M),value:e,perc:o(e)})}))):(u=M.length-1,o=function(e){var t=e.domain(),i=t.length-1,a=+t[0],o=+r.peek(t),u=o-a;if(e.type===n.Threshold){var l=i?u/i:.1;u=(o+=l)-(a-=l)}return function(e){return(e-a)/u}}(p),d=M.map((function(e,n){return a.ingest({index:n,label:y(e,n,M),value:e,perc:n?o(e):0,perc2:n===u?1:o(M[n+1])})}))),c.source=d,c.add=d,this.value=d,c};var O=r.fastmap({line:L,"line-radial":function(e,n,t,r){return L(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))},arc:F,"arc-radial":function(e,n,t,r){return F(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))},curve:q,"curve-radial":function(e,n,t,r){return q(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))},"orthogonal-horizontal":function(e,n,t,r){return"M"+e+","+n+"V"+r+"H"+t},"orthogonal-vertical":function(e,n,t,r){return"M"+e+","+n+"H"+t+"V"+r},"orthogonal-radial":function(e,n,t,r){var i=Math.cos(e),a=Math.sin(e),o=Math.cos(t),u=Math.sin(t),l=Math.abs(t-e)>Math.PI?t<=e:t>e;return"M"+n*i+","+n*a+"A"+n+","+n+" 0 0,"+(l?1:0)+" "+n*o+","+n*u+"L"+r*o+","+r*u},"diagonal-horizontal":function(e,n,t,r){var i=(e+t)/2;return"M"+e+","+n+"C"+i+","+n+" "+i+","+r+" "+t+","+r},"diagonal-vertical":function(e,n,t,r){var i=(n+r)/2;return"M"+e+","+n+"C"+e+","+i+" "+t+","+i+" "+t+","+r},"diagonal-radial":function(e,n,t,r){var i=Math.cos(e),a=Math.sin(e),o=Math.cos(t),u=Math.sin(t),l=(n+r)/2;return"M"+n*i+","+n*a+"C"+l*i+","+l*a+" "+l*o+","+l*u+" "+r*o+","+r*u}});function D(e){return e.source.x}function w(e){return e.source.y}function A(e){return e.target.x}function C(e){return e.target.y}function z(e){a.Transform.call(this,{},e)}function L(e,n,t,r){return"M"+e+","+n+"L"+t+","+r}function F(e,n,t,r){var i=t-e,a=r-n,o=Math.sqrt(i*i+a*a)/2;return"M"+e+","+n+"A"+o+","+o+" "+180*Math.atan2(a,i)/Math.PI+" 0 1 "+t+","+r}function q(e,n,t,r){var i=t-e,a=r-n,o=.2*(i+a),u=.2*(a-i);return"M"+e+","+n+"C"+(e+o)+","+(n+u)+" "+(t+u)+","+(r-o)+" "+t+","+r}function I(e){a.Transform.call(this,null,e)}z.Definition={type:"LinkPath",metadata:{modifies:!0},params:[{name:"sourceX",type:"field",default:"source.x"},{name:"sourceY",type:"field",default:"source.y"},{name:"targetX",type:"field",default:"target.x"},{name:"targetY",type:"field",default:"target.y"},{name:"orient",type:"enum",default:"vertical",values:["horizontal","vertical","radial"]},{name:"shape",type:"enum",default:"line",values:["line","arc","curve","diagonal","orthogonal"]},{name:"require",type:"signal"},{name:"as",type:"string",default:"path"}]},r.inherits(z,a.Transform).transform=function(e,n){var t=e.sourceX||D,i=e.sourceY||w,a=e.targetX||A,o=e.targetY||C,u=e.as||"path",l=e.orient||"vertical",s=e.shape||"line",f=O.get(s+"-"+l)||O.get(s);return f||r.error("LinkPath unsupported type: "+e.shape+(e.orient?"-"+e.orient:"")),n.visit(n.SOURCE,(function(e){e[u]=f(t(e),i(e),a(e),o(e))})),n.reflow(e.modified()).modifies(u)},I.Definition={type:"Pie",metadata:{modifies:!0},params:[{name:"field",type:"field"},{name:"startAngle",type:"number",default:0},{name:"endAngle",type:"number",default:6.283185307179586},{name:"sort",type:"boolean",default:!1},{name:"as",type:"string",array:!0,length:2,default:["startAngle","endAngle"]}]},r.inherits(I,a.Transform).transform=function(e,n){var t,i,a,u=e.as||["startAngle","endAngle"],l=u[0],s=u[1],f=e.field||r.one,c=e.startAngle||0,d=null!=e.endAngle?e.endAngle:2*Math.PI,m=n.source,p=m.map(f),h=p.length,g=c,v=(d-c)/o.sum(p),y=o.range(h);for(e.sort&&y.sort((function(e,n){return p[e]-p[n]})),t=0;t<h;++t)a=p[y[t]],(i=m[y[t]])[l]=g,i[s]=g+=a*v;return this.value=p,n.reflow(e.modified()).modifies(u)};var P=5;function E(e){return n.isContinuous(e)&&e!==n.Sequential}var R=r.toSet(["set","modified","clear","type","scheme","schemeExtent","schemeCount","domain","domainMin","domainMid","domainMax","domainRaw","domainImplicit","nice","zero","bins","range","rangeStep","round","reverse","interpolate","interpolateGamma"]);function U(e){a.Transform.call(this,null,e),this.modified(!0)}function _(e,t,i){n.isLogarithmic(e)&&(Math.abs(t.reduce((function(e,n){return e+(n<0?-1:n>0?1:0)}),0))!==t.length&&i.warn("Log scale domain includes zero: "+r.stringValue(t)));return t}function N(e,t,i){return r.isFunction(e)&&(t||i)?n.interpolateRange(e,Q(t||[0,1],i)):e}function Q(e,n){return n?e.slice().reverse():e}function j(e){a.Transform.call(this,null,e)}r.inherits(U,a.Transform).transform=function(e,t){var i=t.dataflow,a=this.value,s=function(e){var t,i=e.type,a="";if(i===n.Sequential)return n.Sequential+"-"+n.Linear;(function(e){const t=e.type;return n.isContinuous(t)&&t!==n.Time&&t!==n.UTC&&(e.scheme||e.range&&e.range.length&&e.range.every(r.isString))})(e)&&(t=e.rawDomain?e.rawDomain.length:e.domain?e.domain.length+ +(null!=e.domainMid):0,a=2===t?n.Sequential+"-":3===t?n.Diverging+"-":"");return(a+i||n.Linear).toLowerCase()}(e);for(s in a&&s===a.type||(this.value=a=n.scale(s)()),e)if(!R[s]){if("padding"===s&&E(a.type))continue;r.isFunction(a[s])?a[s](e[s]):i.warn("Unsupported scale property: "+s)}return function(e,t,i){var a=e.type,o=t.round||!1,l=t.range;if(null!=t.rangeStep)l=function(e,t,i){e!==n.Band&&e!==n.Point&&r.error("Only band and point scales support rangeStep.");var a=(null!=t.paddingOuter?t.paddingOuter:t.padding)||0,o=e===n.Point?1:(null!=t.paddingInner?t.paddingInner:t.padding)||0;return[0,t.rangeStep*n.bandSpace(i,o,a)]}(a,t,i);else if(t.scheme&&(l=function(e,t,i){var a,o,u=t.schemeExtent;r.isArray(t.scheme)?o=n.interpolateColors(t.scheme,t.interpolate,t.interpolateGamma):(a=t.scheme.toLowerCase(),(o=n.scheme(a))||r.error(`Unrecognized scheme name: ${t.scheme}`));return i=e===n.Threshold?i+1:e===n.BinOrdinal?i-1:e===n.Quantile||e===n.Quantize?+t.schemeCount||P:i,n.isInterpolating(e)?N(o,u,t.reverse):r.isFunction(o)?n.quantizeInterpolator(N(o,u),i):e===n.Ordinal?o:o.slice(0,i)}(a,t,i),r.isFunction(l))){if(e.interpolator)return e.interpolator(l);r.error(`Scale type ${a} does not support interpolating color schemes.`)}if(l&&n.isInterpolating(a))return e.interpolator(n.interpolateColors(Q(l,t.reverse),t.interpolate,t.interpolateGamma));l&&t.interpolate&&e.interpolate?e.interpolate(n.interpolate(t.interpolate,t.interpolateGamma)):r.isFunction(e.round)?e.round(o):r.isFunction(e.rangeRound)&&e.interpolate(o?u.interpolateRound:u.interpolate);l&&e.range(Q(l,t.reverse))}(a,e,function(e,t,i){let a=t.bins;if(a&&!r.isArray(a)){let n=e.domain(),t=n[0],i=r.peek(n),u=null==a.start?t:a.start,l=null==a.stop?i:a.stop,s=a.step;s||r.error("Scale bins parameter missing step property."),u<t&&(u=s*Math.ceil(t/s)),l>i&&(l=s*Math.floor(i/s)),a=o.range(u,l+s/2,s)}a?e.bins=a:e.bins&&delete e.bins;e.type===n.BinOrdinal&&(a?t.domain||t.domainRaw||(e.domain(a),i=a.length):e.bins=e.domain());return i}(a,e,function(e,t,i){var a=function(e,n,t){return n?(e.domain(_(e.type,n,t)),n.length):-1}(e,t.domainRaw,i);if(a>-1)return a;var o,u,s=t.domain,f=e.type,c=t.zero||void 0===t.zero&&function(e){const t=e.type;return!e.bins&&(t===n.Linear||t===n.Pow||t===n.Sqrt)}(e);if(!s)return 0;E(f)&&t.padding&&s[0]!==r.peek(s)&&(s=function(e,t,i,a,o,u){var l=Math.abs(r.peek(i)-i[0]),s=l/(l-2*a),f=e===n.Log?r.zoomLog(t,null,s):e===n.Sqrt?r.zoomPow(t,null,s,.5):e===n.Pow?r.zoomPow(t,null,s,o||1):e===n.Symlog?r.zoomSymlog(t,null,s,u||1):r.zoomLinear(t,null,s);return(t=t.slice())[0]=f[0],t[t.length-1]=f[1],t}(f,s,t.range,t.padding,t.exponent,t.constant));(c||null!=t.domainMin||null!=t.domainMax||null!=t.domainMid)&&(o=(s=s.slice()).length-1||1,c&&(s[0]>0&&(s[0]=0),s[o]<0&&(s[o]=0)),null!=t.domainMin&&(s[0]=t.domainMin),null!=t.domainMax&&(s[o]=t.domainMax),null!=t.domainMid&&(((u=t.domainMid)<s[0]||u>s[o])&&i.warn("Scale domainMid exceeds domain min or max.",u),s.splice(o,0,u)));e.domain(_(f,s,i)),f===n.Ordinal&&e.unknown(t.domainImplicit?n.scaleImplicit:void 0);t.nice&&e.nice&&e.nice(!0!==t.nice&&l(e,t.nice)||null);return s.length}(a,e,i))),t.fork(t.NO_SOURCE|t.NO_FIELDS)},r.inherits(j,a.Transform).transform=function(e,n){var t=e.modified("sort")||n.changed(n.ADD)||n.modified(e.sort.fields)||n.modified("datum");return t&&n.source.sort(a.stableCompare(e.sort)),this.modified(t),n};var G=["y0","y1"];function X(e){a.Transform.call(this,null,e)}function Y(e,n,t,r,i){for(var a,o=(n-e.sum)/2,u=e.length,l=0;l<u;++l)(a=e[l])[r]=o,a[i]=o+=Math.abs(t(a))}function B(e,n,t,r,i){for(var a,o=1/e.sum,u=0,l=e.length,s=0,f=0;s<l;++s)(a=e[s])[r]=u,a[i]=u=o*(f+=Math.abs(t(a)))}function V(e,n,t,r,i){for(var a,o,u=0,l=0,s=e.length,f=0;f<s;++f)(a=+t(o=e[f]))<0?(o[r]=l,o[i]=l+=a):(o[r]=u,o[i]=u+=a)}X.Definition={type:"Stack",metadata:{modifies:!0},params:[{name:"field",type:"field"},{name:"groupby",type:"field",array:!0},{name:"sort",type:"compare"},{name:"offset",type:"enum",default:"zero",values:["zero","center","normalize"]},{name:"as",type:"string",array:!0,length:2,default:G}]},r.inherits(X,a.Transform).transform=function(e,n){var t,i,o,u,l=e.as||G,s=l[0],f=l[1],c=a.stableCompare(e.sort),d=e.field||r.one,m="center"===e.offset?Y:"normalize"===e.offset?B:V;for(t=function(e,n,t,r){var i,a,o,u,l,s,f,c,d,m=[],p=function(e){return e(l)};if(null==n)m.push(e.slice());else for(i={},a=0,o=e.length;a<o;++a)l=e[a],s=n.map(p),(f=i[s])||(i[s]=f=[],m.push(f)),f.push(l);for(s=0,d=0,u=m.length;s<u;++s){for(f=m[s],a=0,c=0,o=f.length;a<o;++a)c+=Math.abs(r(f[a]));f.sum=c,c>d&&(d=c),t&&f.sort(t)}return m.max=d,m}(n.source,e.groupby,c,d),i=0,o=t.length,u=t.max;i<o;++i)m(t[i],u,d,s,f);return n.reflow(e.modified()).modifies(l)},e.axisticks=d,e.datajoin=m,e.encode=g,e.legendentries=k,e.linkpath=z,e.pie=I,e.scale=U,e.sortitems=j,e.stack=X,e.validTicks=s,Object.defineProperty(e,"__esModule",{value:!0})}));

package.json

 {
   "name": "vega-encode",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "description": "Visual encoding transforms for Vega dataflows.",
@@ -17,3 +17,3 @@ "keywords": [
   "scripts": {
-    "rollup": "rollup -g d3-array:d3,d3-format:d3,d3-interpolate:d3,d3-time-format:d3,vega-dataflow:vega,vega-scale:vega,vega-util:vega -f umd -n vega.transforms -o build/vega-encode.js -- index.js",
+    "rollup": "rollup -g d3-array:d3,d3-format:d3,d3-interpolate:d3,vega-dataflow:vega,vega-scale:vega,vega-time:vega,vega-util:vega -f umd -n vega.transforms -o build/vega-encode.js -- index.js",
     "prebuild": "rimraf build && mkdir build",
@@ -28,9 +28,9 @@ "build": "yarn rollup",
   "dependencies": {
-    "d3-array": "^2.3.1",
+    "d3-array": "^2.3.3",
     "d3-format": "^1.4.1",
     "d3-interpolate": "^1.3.2",
-    "d3-time-format": "^2.1.3",
-    "vega-dataflow": "^5.4.0",
-    "vega-scale": "^4.1.2",
-    "vega-util": "^1.11.2"
+    "vega-dataflow": "^5.4.1",
+    "vega-scale": "^5.0.0",
+    "vega-time": "^1.0.0",
+    "vega-util": "^1.12.0"
   },
@@ -40,3 +40,3 @@ "devDependencies": {
   },
-  "gitHead": "b1337d09ced5f517d54c8ec17fdf849651f5c16c"
+  "gitHead": "8180e8ca9379dec7f1722ce0ebd2aa01083be7b2"
 }

src/AxisTicks.js

@@ -37,3 +37,3 @@ import {tickCount, tickFormat, tickValues, validTicks} from './ticks';
       count = tickCount(scale, tally, _.minstep),
-      format = _.format || tickFormat(scale, count, _.formatSpecifier, _.formatType),
+      format = _.format || tickFormat(scale, count, _.formatSpecifier, _.formatType, !!_.values),
       values = _.values ? validTicks(scale, _.values, count) : tickValues(scale, count);
@@ -40,0 +40,0 @@

src/labels.js

 import {Symbols, Discrete} from './legend-types';
 import {tickFormat, tickValues} from './ticks';
-
+import {peek} from 'vega-util';
 import {
@@ -9,5 +9,5 @@ Quantile,
   tickFormat as spanFormat,
-  Time
+  Time,
+  UTC
 } from 'vega-scale';
-import {peek} from 'vega-util';
 
@@ -62,6 +62,6 @@ const symbols = {
 
-export function labelFormat(scale, count, type, specifier, formatType) {
-  const format = formats[scale.type] && formatType !== Time
+export function labelFormat(scale, count, type, specifier, formatType, noSkip) {
+  const format = formats[scale.type] && formatType !== Time && formatType !== UTC
     ? thresholdFormat(scale, specifier)
-    : tickFormat(scale, count, specifier, formatType);
+    : tickFormat(scale, count, specifier, formatType, noSkip);
 
@@ -68,0 +68,0 @@ return type === Symbols && isDiscreteRange(scale) ? formatRange(format)

src/LegendEntries.js

@@ -43,3 +43,3 @@ import {labelFormat, labelFraction, labelValues} from './labels';
       count = tickCount(scale, _.count == null ? 5 : _.count, _.minstep),
-      format = _.format || labelFormat(scale, count, type, _.formatSpecifier, _.formatType),
+      format = _.format || labelFormat(scale, count, type, _.formatSpecifier, _.formatType, !!_.values),
       values = _.values || labelValues(scale, count, type),
@@ -46,0 +46,0 @@ domain, fraction, size, offset, ellipsis;

src/ticks.js

@@ -1,8 +0,5 @@
-import {isLogarithmic, timeInterval, Time} from 'vega-scale';
+import {isLogarithmic, Time, UTC} from 'vega-scale';
+import {timeFormat, timeInterval, utcFormat, utcInterval} from 'vega-time';
 import {error, isNumber, isObject, isString, peek, span} from 'vega-util';
-import {timeFormat} from 'd3-time-format';
-import {
-  format as numberFormat,
-  formatSpecifier
-} from 'd3-format';
+import {format as numberFormat, formatSpecifier} from 'd3-format';
 
@@ -34,4 +31,5 @@ /**
   if (isString(count)) {
-    count = timeInterval(count, scale.type)
-          || error('Only time and utc scales accept interval strings.');
+    count = scale.type === Time ? timeInterval(count)
+      : scale.type == UTC ? utcInterval(count)
+      : error('Only time and utc scales accept interval strings.');
     if (step) count = count.every(step);
@@ -106,14 +104,17 @@ }
  * @param {string} [specifier] - The format specifier. Must be a legal d3
- *   specifier string (see https://github.com/d3/d3-format#formatSpecifier).
+ *   specifier string (see https://github.com/d3/d3-format#formatSpecifier) or
+ *   time multi-format specifier object.
  * @return {function(*):string} - The generated label formatter.
  */
-export function tickFormat(scale, count, specifier, formatType) {
-  var format = scale.tickFormat ? scale.tickFormat(count, specifier)
-    : specifier && formatType === Time ? timeFormat(specifier)
-    : specifier ? numberFormat(specifier)
-    : String;
+export function tickFormat(scale, count, specifier, formatType, noSkip) {
+  var type = scale.type,
+      format = (type === Time || formatType === Time) ? timeFormat(specifier)
+        : (type === UTC || formatType === UTC) ? utcFormat(specifier)
+        : scale.tickFormat ? scale.tickFormat(count, specifier)
+        : specifier ? numberFormat(specifier)
+        : String;
 
-  if (isLogarithmic(scale.type)) {
+  if (isLogarithmic(type)) {
     var logfmt = variablePrecision(specifier);
-    format = scale.bins ? logfmt : filter(format, logfmt);
+    format = noSkip || scale.bins ? logfmt : filter(format, logfmt);
   }
@@ -125,5 +126,3 @@
 function filter(sourceFormat, targetFormat) {
-  return function(_) {
-    return sourceFormat(_) ? targetFormat(_) : '';
-  };
+  return _ => sourceFormat(_) ? targetFormat(_) : '';
 }
@@ -130,0 +129,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

102960

increased by0.7%

Lines of code

2335

increased by0.09%

Dependency changes

• + Addedvega-time@^1.0.0

• + Addedd3-time-format@3.0.0(transitive)

• + Addedvega-scale@5.0.0(transitive)

• + Addedvega-time@1.1.0(transitive)

• - Removedd3-time-format@^2.1.3

• - Removedvega-scale@4.1.3(transitive)

• Updatedd3-array@^2.3.3

• Updatedvega-dataflow@^5.4.1

• Updatedvega-scale@^5.0.0

• Updatedvega-util@^1.12.0