vega-encode - npm Package Compare versions

Comparing version 1.0.0-beta.9 to 1.0.0-beta.10

build/vega-encode.js

@@ -7,2 +7,14 @@ (function (global, factory) {
 
+var Log = 'log';
+var Pow = 'pow';
+var Sqrt = 'sqrt';
+var Band = 'band';
+var Point = 'point';
+var Linear = 'linear';
+var Ordinal = 'ordinal';
+var Quantile = 'quantile';
+var Quantize = 'quantize';
+var Threshold = 'threshold';
+var Sequential = 'sequential';
+
 /**
@@ -40,3 +52,3 @@ * Generate tick values for the given scale and approximate tick count or
 
-  return (scale$$1.type === 'log')
+  return (scale$$1.type === Log)
     ? filter(format$$1, variablePrecision(specifier))
@@ -284,2 +296,60 @@ : format$$1;
 
+var discrete = {}
+discrete[Quantile] = quantile;
+discrete[Quantize] = quantize;
+discrete[Threshold] = threshold;
+
+function labelValues(scale$$1, count, gradient) {
+  if (gradient) return scale$$1.domain();
+  var values = discrete[scale$$1.type];
+  return values ? values(scale$$1) : tickValues(scale$$1, count);
+}
+
+function quantize(scale$$1) {
+  var domain = scale$$1.domain(),
+      x0 = domain[0],
+      x1 = vegaUtil.peek(domain),
+      n = scale$$1.range().length,
+      values = new Array(n),
+      i = 0;
+
+  values[0] = x0;
+  while (++i < n) values[i] = (i * x1 - (i - n) * x0) / n;
+  return values.max = x1, values;
+}
+
+function quantile(scale$$1) {
+  var domain = scale$$1.domain(),
+      values = [domain[0]].concat(scale$$1.quantiles());
+  return values.max = vegaUtil.peek(domain), values;
+}
+
+function threshold(scale$$1) {
+  var values = [-Infinity].concat(scale$$1.domain());
+  return values.max = +Infinity, values;
+}
+
+function labelFormat(scale$$1, format$$1) {
+  return discrete[scale$$1.type] ? formatRange(format$$1) : formatPoint(format$$1);
+}
+
+function formatRange(format$$1) {
+  return function(value, index, array) {
+    var limit = array[index + 1] || array.max || +Infinity,
+        lo = formatValue(value, format$$1),
+        hi = formatValue(limit, format$$1);
+    return lo && hi ? lo + '\u2013' + hi : hi ? '< ' + hi : '\u2265 ' + lo;
+  };
+}
+
+function formatValue(value, format$$1) {
+  return isFinite(value) ? format$$1(value) : null;
+}
+
+function formatPoint(format$$1) {
+  return function(value) {
+    return format$$1(value);
+  };
+}
+
 /**
@@ -319,4 +389,5 @@ * Generates legend entries for visualizing a scale.
       format$$1 = _.format || tickFormat(scale$$1, count, _.formatSpecifier),
-      values = _.values || (grad ? scale$$1.domain() : tickValues(scale$$1, count));
+      values = _.values || labelValues(scale$$1, count, grad);
 
+  format$$1 = labelFormat(scale$$1, format$$1);
   if (items) out.rem = items;
@@ -345,3 +416,8 @@
   items = values.map(function(value, index) {
-    var t = vegaDataflow.ingest({index: index, label: format$$1(value), value: value});
+    var t = vegaDataflow.ingest({
+      index: index,
+      label: format$$1(value, index, values),
+      value: value
+    });
+
     if (grad) {
@@ -540,14 +616,8 @@ t.perc = fraction(value);
 
-var BAND = 'band';
-var POINT = 'point';
-var QUANTILE = 'quantile';
-var QUANTIZE = 'quantize';
-var THRESHOLD = 'threshold';
-var SEQUENTIAL = 'sequential';
-var DEFAULT_QUANTUM_COUNT = 7;
+var DEFAULT_COUNT = 5;
 
-var INCLUDE_ZERO = vegaUtil.toSet(['linear', 'pow', 'sqrt']);
+var INCLUDE_ZERO = vegaUtil.toSet([Linear, Pow, Sqrt]);
 
 var SKIP = vegaUtil.toSet([
-  'set', 'modified', 'clear', 'type', 'scheme', 'schemeExtent',
+  'set', 'modified', 'clear', 'type', 'scheme', 'schemeExtent', 'schemeCount',
   'domain', 'domainMin', 'domainMid', 'domainMax', 'domainRaw', 'nice', 'zero',
@@ -575,3 +645,3 @@ 'range', 'rangeStep', 'round', 'reverse', 'interpolate', 'interpolateGamma'
   if (!scale$$1 || _.modified('type')) {
-    this.value = scale$$1 = vegaScale.scale((_.type || 'linear').toLowerCase())();
+    this.value = scale$$1 = vegaScale.scale((_.type || Linear).toLowerCase())();
   }
@@ -650,3 +720,3 @@
   // given a range array for a sequential scale, convert to interpolator
-  else if (range$$1 && scale$$1.type === SEQUENTIAL) {
+  else if (range$$1 && scale$$1.type === Sequential) {
     return scale$$1.interpolator(d3Interpolate.interpolateRgbBasis(flip(range$$1, _.reverse)));
@@ -668,3 +738,3 @@ }
 function configureRangeStep(type, _, count) {
-  if (type !== BAND && type !== POINT) {
+  if (type !== Band && type !== Point) {
     vegaUtil.error('Only band and point scales support rangeStep.');
@@ -675,3 +745,3 @@ }
   var outer = (_.paddingOuter != null ? _.paddingOuter : _.padding) || 0,
-      inner = type === POINT ? 1
+      inner = type === Point ? 1
             : ((_.paddingInner != null ? _.paddingInner : _.padding) || 0);
@@ -692,11 +762,11 @@ return [0, _.rangeStep * vegaScale.bandSpace(count, inner, outer)];
   // determine size for potential discrete range
-  count = (type === THRESHOLD) ? count + 1
-    : (type === QUANTILE || type === QUANTIZE) ? DEFAULT_QUANTUM_COUNT
+  count = (type === Threshold) ? count + 1
+    : (type === Quantile || type === Quantize) ? (+_.schemeCount || DEFAULT_COUNT)
     : count;
 
   // adjust and/or quantize scheme as appropriate
-  return type === SEQUENTIAL ? adjustScheme(scheme$$1, extent, _.reverse)
+  return type === Sequential ? adjustScheme(scheme$$1, extent, _.reverse)
     : !extent && (discrete = vegaScale.scheme(name + '-' + count)) ? discrete
-    : vegaUtil.isFunction(scheme$$1) ? quantize(adjustScheme(scheme$$1, extent), count)
-    : scheme$$1;
+    : vegaUtil.isFunction(scheme$$1) ? quantize$1(adjustScheme(scheme$$1, extent), count)
+    : type === Ordinal ? scheme$$1 : scheme$$1.slice(0, count);
 }
@@ -714,3 +784,3 @@
 
-function quantize(interpolator, count) {
+function quantize$1(interpolator, count) {
   var samples = new Array(count),
@@ -717,0 +787,0 @@ n = (count - 1) || 1;

build/vega-encode.min.js

@@ -1,1 +0,1 @@
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("vega-dataflow"),require("vega-util"),require("d3-format"),require("vega-scale"),require("d3-array"),require("d3-interpolate")):"function"==typeof define&&define.amd?define(["exports","vega-dataflow","vega-util","d3-format","vega-scale","d3-array","d3-interpolate"],n):n(e.vega=e.vega||{},e.vega,e.vega,e.d3,e.vega,e.d3,e.d3)}(this,function(e,n,t,r,a,i,o){"use strict";function u(e,n){return e.ticks?e.ticks(n):e.domain()}function s(e,n,t){var r=e.tickFormat?e.tickFormat(n,t):String;return"log"===e.type?l(r,f(t)):r}function l(e,n){return function(t){return e(t)?n(t):""}}function f(e){var n=r.formatSpecifier(e||",");if(null==n.precision){switch(n.precision=12,n.type){case"%":n.precision-=2;break;case"e":n.precision-=1}return d(r.format(n),r.format(".1f")(1)[1])}return r.format(n)}function d(e,n){return function(t){var r,a,i=e(t),o=i.indexOf(n);if(o<0)return i;for(r=c(i,o),a=r<i.length?i.slice(r):"";--r>o;)if("0"!==i[r]){++r;break}return i.slice(0,r)+a}}function c(e,n){var t,r=e.lastIndexOf("e");if(r>0)return r;for(r=e.length;--r>n;)if(t=e.charCodeAt(r),t>=48&&t<=57)return r+1}function m(e){n.Transform.call(this,[],e)}function p(e){n.Transform.call(this,null,e)}function h(){return n.ingest({})}function v(e){return e.exit}function g(e){n.Transform.call(this,null,e)}function y(e){n.Transform.call(this,[],e)}function M(e){return e.source.x}function x(e){return e.source.y}function S(e){return e.target.x}function O(e){return e.target.y}function k(e){n.Transform.call(this,{},e)}function A(e,n,t,r){return"M"+e+","+n+"L"+t+","+r}function E(e,n,t,r){return A(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))}function T(e,n,t,r){var a=t-e,i=r-n,o=.2*(a+i),u=.2*(i-a);return"M"+e+","+n+"C"+(e+o)+","+(n+u)+" "+(t+u)+","+(r-o)+" "+t+","+r}function b(e,n,t,r){return T(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))}function w(e,n,t,r){return"M"+e+","+n+"V"+r+"H"+t}function D(e,n,t,r){return"M"+e+","+n+"H"+t+"V"+r}function R(e,n,t,r){var a=Math.cos(e),i=Math.sin(e),o=Math.cos(t),u=Math.sin(t),s=Math.abs(t-e)>Math.PI?t<=e:t>e;return"M"+n*a+","+n*i+"A"+n+","+n+" 0 0,"+(s?1:0)+" "+n*o+","+n*u+"L"+r*o+","+r*u}function z(e,n,t,r){var a=(e+t)/2;return"M"+e+","+n+"C"+a+","+n+" "+a+","+r+" "+t+","+r}function F(e,n,t,r){var a=(n+r)/2;return"M"+e+","+n+"C"+e+","+a+" "+t+","+a+" "+t+","+r}function C(e,n,t,r){var a=Math.cos(e),i=Math.sin(e),o=Math.cos(t),u=Math.sin(t),s=(n+r)/2;return"M"+n*a+","+n*i+"C"+s*a+","+s*i+" "+s*o+","+s*u+" "+r*o+","+r*u}function L(e){n.Transform.call(this,null,e)}function _(e){n.Transform.call(this,null,e),this.modified(!0)}function q(e,n,t){var r=I(e,n.domainRaw);if(r>-1)return r;var a,i,o=n.domain,u=n.zero||void 0===n.zero&&oe[e.type];return o?((u||null!=n.domainMin||null!=n.domainMax||null!=n.domainMid)&&(a=(o=o.slice()).length-1||1,u&&(o[0]>0&&(o[0]=0),o[a]<0&&(o[a]=0)),null!=n.domainMin&&(o[0]=n.domainMin),null!=n.domainMax&&(o[a]=n.domainMax),null!=n.domainMid&&(i=n.domainMid,(i<o[0]||i>o[a])&&t.warn("Scale domainMid exceeds domain min or max.",i),o.splice(a,0,i))),e.domain(o),n.nice&&e.nice&&e.nice(n.nice!==!0&&+n.nice||null),o.length):0}function I(e,n){return n?(e.domain(n),n.length):-1}function N(e,n,r){var i=n.round||!1,u=n.range;if(null!=n.rangeStep)u=P(e.type,n,r);else if(n.scheme){if(u=U(e.type,n,r),t.isFunction(u))return e.interpolator(u)}else if(u&&e.type===ae)return e.interpolator(o.interpolateRgbBasis(Y(u,n.reverse)));u&&n.interpolate&&e.interpolate?e.interpolate(a.interpolate(n.interpolate,n.interpolateGamma)):t.isFunction(e.round)?e.round(i):t.isFunction(e.rangeRound)&&e.interpolate(i?o.interpolateRound:o.interpolate),u&&e.range(Y(u,n.reverse))}function P(e,n,r){e!==$&&e!==ee&&t.error("Only band and point scales support rangeStep.");var i=(null!=n.paddingOuter?n.paddingOuter:n.padding)||0,o=e===ee?1:(null!=n.paddingInner?n.paddingInner:n.padding)||0;return[0,n.rangeStep*a.bandSpace(r,o,i)]}function U(e,n,r){var i,o=n.scheme.toLowerCase(),u=a.scheme(o),s=n.schemeExtent;return u||t.error("Unrecognized scheme name: "+n.scheme),r=e===re?r+1:e===ne||e===te?ie:r,e===ae?X(u,s,n.reverse):!s&&(i=a.scheme(o+"-"+r))?i:t.isFunction(u)?j(X(u,s),r):u}function X(e,n,r){return t.isFunction(e)&&(n||r)?a.interpolateRange(e,Y(n||[0,1],r)):e}function Y(e,n){return n?e.slice().reverse():e}function j(e,n){for(var t=new Array(n),r=n-1||1,a=0;a<n;++a)t[a]=e(a/r);return t}function G(e){n.Transform.call(this,null,e)}function H(e,n,t,r){var a,i,o,u,s,l,f,d,c,m=[],p=function(e){return e(s)};if(null==n)m.push(e.slice());else for(a={},i=0,o=e.length;i<o;++i)s=e[i],l=n.map(p),f=a[l]||(m.push(a[l]=[]),a[l]),f.push(s);for(l=0,c=0,u=m.length;l<u;++l){for(f=m[l],i=0,d=0,o=f.length;i<o;++i)d+=r(f[i]);f.sum=d,d>c&&(c=d),t&&f.sort(t)}return m.max=c,m}var J=t.inherits(m,n.Transform);J.transform=function(e,t){if(null!=this.value&&!e.modified())return t.StopPropagation;var r=t.fork(t.NO_SOURCE|t.NO_FIELDS),a=this.value,i=e.scale,o=null==e.count?10:e.count,l=e.format||s(i,o,e.formatSpecifier),f=e.values||u(i,o);return a&&(r.rem=a),a=f.map(function(e){return n.ingest({value:e,label:l(e)})}),e.extra&&a.push(n.ingest({extra:{value:a[0].value},label:""})),r.source=r.add=this.value=a,r};var V=t.inherits(p,n.Transform);V.transform=function(e,r){var a=r.dataflow,i=r.fork(r.NO_SOURCE|r.NO_FIELDS),o=e.item||h,u=e.key||n.tupleid,s=this.value;return s||(r=r.addAll(),this.value=s=t.fastmap().test(v)),(e.modified("key")||r.modified(u))&&t.error("DataJoin does not support modified key function or fields."),r.visit(r.ADD,function(e){var n=u(e),t=s.get(n);t?(t.exit?(--s.empty,i.add):i.mod).push(t):(s.set(n,t=o(e)),i.add.push(t)),t.datum=e,t.exit=!1}),r.visit(r.MOD,function(e){var n=u(e),t=s.get(n);t&&i.mod.push(t)}),r.visit(r.REM,function(e){var n=u(e),t=s.get(n);e!==t.datum||t.exit||(i.rem.push(t),t.exit=!0,++s.empty)}),e.clean&&s.empty>a.cleanThreshold&&a.runAfter(s.clean),i};var B=t.inherits(g,n.Transform);B.transform=function(e,n){var r=n.fork(n.ADD_REM),a=n.encode,i="enter"===a,o=e.encoders.update||t.falsy,u=e.encoders.enter||t.falsy,s=e.encoders.exit||t.falsy,l=(a&&!i?e.encoders[a]:o)||t.falsy;if(n.changed(n.ADD)&&(n.visit(n.ADD,function(n){u(n,e),o(n,e),l!==t.falsy&&l!==o&&l(n,e)}),r.modifies(u.output),r.modifies(o.output),l!==t.falsy&&l!==o&&r.modifies(l.output)),n.changed(n.REM)&&s!==t.falsy&&(n.visit(n.REM,function(n){s(n,e)}),r.modifies(s.output)),i||l!==t.falsy){var f=n.MOD|(e.modified()?n.REFLOW:0);i?(n.visit(f,function(n){var t=u(n,e);(l(n,e)||t)&&r.mod.push(n)}),r.mod.length&&r.modifies(u.output)):n.visit(f,function(n){l(n,e)&&r.mod.push(n)}),r.mod.length&&r.modifies(l.output)}return r};var W=t.inherits(y,n.Transform);W.transform=function(e,r){if(null!=this.value&&!e.modified())return r.StopPropagation;var i=r.fork(r.NO_SOURCE|r.NO_FIELDS),o=0,l=this.value,f="gradient"===e.type,d=e.scale,c=null==e.count?5:e.count,m=e.format||s(d,c,e.formatSpecifier),p=e.values||(f?d.domain():u(d,c));if(l&&(i.rem=l),f)var h=e.values?d.domain():p,v=a.scaleFraction(d,h[0],t.peek(h));else{var g,y=e.size;t.isFunction(y)?(e.values||0!==d(p[0])||(p=p.slice(1)),g=p.reduce(function(n,t){return Math.max(n,y(t,e))},0)):y=t.constant(g=y||8)}return l=p.map(function(t,r){var a=n.ingest({index:r,label:m(t),value:t});return f?a.perc=v(t):(a.offset=g,a.size=y(t,e),a.total=Math.round(o),o+=a.size),a}),i.source=i.add=this.value=l,i};var K=t.fastmap({line:A,"line-radial":E,curve:T,"curve-radial":b,"orthogonal-horizontal":w,"orthogonal-vertical":D,"orthogonal-radial":R,"diagonal-horizontal":z,"diagonal-vertical":F,"diagonal-radial":C}),Q=t.inherits(k,n.Transform);Q.transform=function(e,n){var r=e.sourceX||M,a=e.sourceY||x,i=e.targetX||S,o=e.targetY||O,u=e.as||"path",s=e.orient||"vertical",l=e.shape||"line",f=K.get(l+"-"+s)||K.get(l);return f||t.error("LinkPath unsupported type: "+e.shape+"-"+e.orient),n.visit(n.SOURCE,function(e){e[u]=f(r(e),a(e),i(e),o(e))}),n.reflow(e.modified()).modifies(u)};var Z=t.inherits(L,n.Transform);Z.transform=function(e,n){var r,a,o,u=e.as||["startAngle","endAngle"],s=u[0],l=u[1],f=e.field||t.one,d=e.startAngle||0,c=null!=e.endAngle?e.endAngle:2*Math.PI,m=n.source,p=m.map(f),h=p.length,v=d,g=(c-d)/i.sum(p),y=i.range(h);for(e.sort&&y.sort(function(e,n){return p[e]-p[n]}),r=0;r<h;++r)o=p[y[r]],a=m[y[r]],a[s]=v,a[l]=v+=o*g;return this.value=p,n.reflow(e.modified()).modifies(u)};var $="band",ee="point",ne="quantile",te="quantize",re="threshold",ae="sequential",ie=7,oe=t.toSet(["linear","pow","sqrt"]),ue=t.toSet(["set","modified","clear","type","scheme","schemeExtent","domain","domainMin","domainMid","domainMax","domainRaw","nice","zero","range","rangeStep","round","reverse","interpolate","interpolateGamma"]),se=t.inherits(_,n.Transform);se.transform=function(e,n){var r,i=n.dataflow,o=this.value;o&&!e.modified("type")||(this.value=o=a.scale((e.type||"linear").toLowerCase())());for(r in e)ue[r]||(t.isFunction(o[r])?o[r](e[r]):i.warn("Unsupported scale property: "+r));return N(o,e,q(o,e),i),n.fork(n.NO_SOURCE|n.NO_FIELDS)};var le="center",fe="normalize",de=t.inherits(G,n.Transform);de.transform=function(e,n){var t,r,a,i,o,u,s,l,f,d,c,m,p,h=e.as||["y0","y1"],v=h[0],g=h[1],y=e.field,M=e.offset;for(t=H(n.source,e.groupby,e.sort,y),a=0,o=t.length,s=t.max;a<o;++a)for(r=t[a],l=M===le?(s-r.sum)/2:0,f=M===fe?1/r.sum:1,m=l,p=0,i=0,u=r.length;i<u;++i)d=r[i],c=m,p+=y(d),m=f*p+l,d[v]=c,d[g]=m;return n.reflow(e.modified()).modifies(h)};var ce={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","curve","diagonal","orthogonal"]},{name:"as",type:"string",default:"path"}]},me={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"]}]},pe={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:["y0","y1"]}]};n.register(ce,k),n.register(me,L),n.register(pe,G),n.transform("AxisTicks",m),n.transform("DataJoin",p),n.transform("Encode",g),n.transform("LegendEntries",y),n.transform("Scale",_),e.transform=n.transform,e.definition=n.definition,e.scale=a.scale,e.scheme=a.scheme,Object.defineProperty(e,"__esModule",{value:!0})});
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("vega-dataflow"),require("vega-util"),require("d3-format"),require("vega-scale"),require("d3-array"),require("d3-interpolate")):"function"==typeof define&&define.amd?define(["exports","vega-dataflow","vega-util","d3-format","vega-scale","d3-array","d3-interpolate"],n):n(e.vega=e.vega||{},e.vega,e.vega,e.d3,e.vega,e.d3,e.d3)}(this,function(e,n,t,r,a,i,o){"use strict";function u(e,n){return e.ticks?e.ticks(n):e.domain()}function s(e,n,t){var r=e.tickFormat?e.tickFormat(n,t):String;return e.type===ee?l(r,f(t)):r}function l(e,n){return function(t){return e(t)?n(t):""}}function f(e){var n=r.formatSpecifier(e||",");if(null==n.precision){switch(n.precision=12,n.type){case"%":n.precision-=2;break;case"e":n.precision-=1}return c(r.format(n),r.format(".1f")(1)[1])}return r.format(n)}function c(e,n){return function(t){var r,a,i=e(t),o=i.indexOf(n);if(o<0)return i;for(r=d(i,o),a=r<i.length?i.slice(r):"";--r>o;)if("0"!==i[r]){++r;break}return i.slice(0,r)+a}}function d(e,n){var t,r=e.lastIndexOf("e");if(r>0)return r;for(r=e.length;--r>n;)if(t=e.charCodeAt(r),t>=48&&t<=57)return r+1}function m(e){n.Transform.call(this,[],e)}function p(e){n.Transform.call(this,null,e)}function h(){return n.ingest({})}function v(e){return e.exit}function g(e){n.Transform.call(this,null,e)}function y(e,n,t){if(t)return e.domain();var r=pe[e.type];return r?r(e):u(e,n)}function M(e){var n=e.domain(),r=n[0],a=t.peek(n),i=e.range().length,o=new Array(i),u=0;for(o[0]=r;++u<i;)o[u]=(u*a-(u-i)*r)/i;return o.max=a,o}function x(e){var n=e.domain(),r=[n[0]].concat(e.quantiles());return r.max=t.peek(n),r}function S(e){var n=[-(1/0)].concat(e.domain());return n.max=+(1/0),n}function O(e,n){return pe[e.type]?k(n):E(n)}function k(e){return function(n,t,r){var a=r[t+1]||r.max||+(1/0),i=A(n,e),o=A(a,e);return i&&o?i+"–"+o:o?"< "+o:"≥ "+i}}function A(e,n){return isFinite(e)?n(e):null}function E(e){return function(n){return e(n)}}function T(e){n.Transform.call(this,[],e)}function b(e){return e.source.x}function w(e){return e.source.y}function D(e){return e.target.x}function F(e){return e.target.y}function R(e){n.Transform.call(this,{},e)}function z(e,n,t,r){return"M"+e+","+n+"L"+t+","+r}function C(e,n,t,r){return z(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))}function L(e,n,t,r){var a=t-e,i=r-n,o=.2*(a+i),u=.2*(i-a);return"M"+e+","+n+"C"+(e+o)+","+(n+u)+" "+(t+u)+","+(r-o)+" "+t+","+r}function q(e,n,t,r){return L(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))}function _(e,n,t,r){return"M"+e+","+n+"V"+r+"H"+t}function I(e,n,t,r){return"M"+e+","+n+"H"+t+"V"+r}function N(e,n,t,r){var a=Math.cos(e),i=Math.sin(e),o=Math.cos(t),u=Math.sin(t),s=Math.abs(t-e)>Math.PI?t<=e:t>e;return"M"+n*a+","+n*i+"A"+n+","+n+" 0 0,"+(s?1:0)+" "+n*o+","+n*u+"L"+r*o+","+r*u}function P(e,n,t,r){var a=(e+t)/2;return"M"+e+","+n+"C"+a+","+n+" "+a+","+r+" "+t+","+r}function U(e,n,t,r){var a=(n+r)/2;return"M"+e+","+n+"C"+e+","+a+" "+t+","+a+" "+t+","+r}function X(e,n,t,r){var a=Math.cos(e),i=Math.sin(e),o=Math.cos(t),u=Math.sin(t),s=(n+r)/2;return"M"+n*a+","+n*i+"C"+s*a+","+s*i+" "+s*o+","+s*u+" "+r*o+","+r*u}function Y(e){n.Transform.call(this,null,e)}function j(e){n.Transform.call(this,null,e),this.modified(!0)}function G(e,n,t){var r=H(e,n.domainRaw);if(r>-1)return r;var a,i,o=n.domain,u=n.zero||void 0===n.zero&&xe[e.type];return o?((u||null!=n.domainMin||null!=n.domainMax||null!=n.domainMid)&&(a=(o=o.slice()).length-1||1,u&&(o[0]>0&&(o[0]=0),o[a]<0&&(o[a]=0)),null!=n.domainMin&&(o[0]=n.domainMin),null!=n.domainMax&&(o[a]=n.domainMax),null!=n.domainMid&&(i=n.domainMid,(i<o[0]||i>o[a])&&t.warn("Scale domainMid exceeds domain min or max.",i),o.splice(a,0,i))),e.domain(o),n.nice&&e.nice&&e.nice(n.nice!==!0&&+n.nice||null),o.length):0}function H(e,n){return n?(e.domain(n),n.length):-1}function J(e,n,r){var i=n.round||!1,u=n.range;if(null!=n.rangeStep)u=V(e.type,n,r);else if(n.scheme){if(u=B(e.type,n,r),t.isFunction(u))return e.interpolator(u)}else if(u&&e.type===fe)return e.interpolator(o.interpolateRgbBasis(K(u,n.reverse)));u&&n.interpolate&&e.interpolate?e.interpolate(a.interpolate(n.interpolate,n.interpolateGamma)):t.isFunction(e.round)?e.round(i):t.isFunction(e.rangeRound)&&e.interpolate(i?o.interpolateRound:o.interpolate),u&&e.range(K(u,n.reverse))}function V(e,n,r){e!==re&&e!==ae&&t.error("Only band and point scales support rangeStep.");var i=(null!=n.paddingOuter?n.paddingOuter:n.padding)||0,o=e===ae?1:(null!=n.paddingInner?n.paddingInner:n.padding)||0;return[0,n.rangeStep*a.bandSpace(r,o,i)]}function B(e,n,r){var i,o=n.scheme.toLowerCase(),u=a.scheme(o),s=n.schemeExtent;return u||t.error("Unrecognized scheme name: "+n.scheme),r=e===le?r+1:e===ue||e===se?+n.schemeCount||Me:r,e===fe?W(u,s,n.reverse):!s&&(i=a.scheme(o+"-"+r))?i:t.isFunction(u)?Q(W(u,s),r):e===oe?u:u.slice(0,r)}function W(e,n,r){return t.isFunction(e)&&(n||r)?a.interpolateRange(e,K(n||[0,1],r)):e}function K(e,n){return n?e.slice().reverse():e}function Q(e,n){for(var t=new Array(n),r=n-1||1,a=0;a<n;++a)t[a]=e(a/r);return t}function Z(e){n.Transform.call(this,null,e)}function $(e,n,t,r){var a,i,o,u,s,l,f,c,d,m=[],p=function(e){return e(s)};if(null==n)m.push(e.slice());else for(a={},i=0,o=e.length;i<o;++i)s=e[i],l=n.map(p),f=a[l]||(m.push(a[l]=[]),a[l]),f.push(s);for(l=0,d=0,u=m.length;l<u;++l){for(f=m[l],i=0,c=0,o=f.length;i<o;++i)c+=r(f[i]);f.sum=c,c>d&&(d=c),t&&f.sort(t)}return m.max=d,m}var ee="log",ne="pow",te="sqrt",re="band",ae="point",ie="linear",oe="ordinal",ue="quantile",se="quantize",le="threshold",fe="sequential",ce=t.inherits(m,n.Transform);ce.transform=function(e,t){if(null!=this.value&&!e.modified())return t.StopPropagation;var r=t.fork(t.NO_SOURCE|t.NO_FIELDS),a=this.value,i=e.scale,o=null==e.count?10:e.count,l=e.format||s(i,o,e.formatSpecifier),f=e.values||u(i,o);return a&&(r.rem=a),a=f.map(function(e){return n.ingest({value:e,label:l(e)})}),e.extra&&a.push(n.ingest({extra:{value:a[0].value},label:""})),r.source=r.add=this.value=a,r};var de=t.inherits(p,n.Transform);de.transform=function(e,r){var a=r.dataflow,i=r.fork(r.NO_SOURCE|r.NO_FIELDS),o=e.item||h,u=e.key||n.tupleid,s=this.value;return s||(r=r.addAll(),this.value=s=t.fastmap().test(v)),(e.modified("key")||r.modified(u))&&t.error("DataJoin does not support modified key function or fields."),r.visit(r.ADD,function(e){var n=u(e),t=s.get(n);t?(t.exit?(--s.empty,i.add):i.mod).push(t):(s.set(n,t=o(e)),i.add.push(t)),t.datum=e,t.exit=!1}),r.visit(r.MOD,function(e){var n=u(e),t=s.get(n);t&&i.mod.push(t)}),r.visit(r.REM,function(e){var n=u(e),t=s.get(n);e!==t.datum||t.exit||(i.rem.push(t),t.exit=!0,++s.empty)}),e.clean&&s.empty>a.cleanThreshold&&a.runAfter(s.clean),i};var me=t.inherits(g,n.Transform);me.transform=function(e,n){var r=n.fork(n.ADD_REM),a=n.encode,i="enter"===a,o=e.encoders.update||t.falsy,u=e.encoders.enter||t.falsy,s=e.encoders.exit||t.falsy,l=(a&&!i?e.encoders[a]:o)||t.falsy;if(n.changed(n.ADD)&&(n.visit(n.ADD,function(n){u(n,e),o(n,e),l!==t.falsy&&l!==o&&l(n,e)}),r.modifies(u.output),r.modifies(o.output),l!==t.falsy&&l!==o&&r.modifies(l.output)),n.changed(n.REM)&&s!==t.falsy&&(n.visit(n.REM,function(n){s(n,e)}),r.modifies(s.output)),i||l!==t.falsy){var f=n.MOD|(e.modified()?n.REFLOW:0);i?(n.visit(f,function(n){var t=u(n,e);(l(n,e)||t)&&r.mod.push(n)}),r.mod.length&&r.modifies(u.output)):n.visit(f,function(n){l(n,e)&&r.mod.push(n)}),r.mod.length&&r.modifies(l.output)}return r};var pe={};pe[ue]=x,pe[se]=M,pe[le]=S;var he=t.inherits(T,n.Transform);he.transform=function(e,r){if(null!=this.value&&!e.modified())return r.StopPropagation;var i=r.fork(r.NO_SOURCE|r.NO_FIELDS),o=0,u=this.value,l="gradient"===e.type,f=e.scale,c=null==e.count?5:e.count,d=e.format||s(f,c,e.formatSpecifier),m=e.values||y(f,c,l);if(d=O(f,d),u&&(i.rem=u),l)var p=e.values?f.domain():m,h=a.scaleFraction(f,p[0],t.peek(p));else{var v,g=e.size;t.isFunction(g)?(e.values||0!==f(m[0])||(m=m.slice(1)),v=m.reduce(function(n,t){return Math.max(n,g(t,e))},0)):g=t.constant(v=g||8)}return u=m.map(function(t,r){var a=n.ingest({index:r,label:d(t,r,m),value:t});return l?a.perc=h(t):(a.offset=v,a.size=g(t,e),a.total=Math.round(o),o+=a.size),a}),i.source=i.add=this.value=u,i};var ve=t.fastmap({line:z,"line-radial":C,curve:L,"curve-radial":q,"orthogonal-horizontal":_,"orthogonal-vertical":I,"orthogonal-radial":N,"diagonal-horizontal":P,"diagonal-vertical":U,"diagonal-radial":X}),ge=t.inherits(R,n.Transform);ge.transform=function(e,n){var r=e.sourceX||b,a=e.sourceY||w,i=e.targetX||D,o=e.targetY||F,u=e.as||"path",s=e.orient||"vertical",l=e.shape||"line",f=ve.get(l+"-"+s)||ve.get(l);return f||t.error("LinkPath unsupported type: "+e.shape+"-"+e.orient),n.visit(n.SOURCE,function(e){e[u]=f(r(e),a(e),i(e),o(e))}),n.reflow(e.modified()).modifies(u)};var ye=t.inherits(Y,n.Transform);ye.transform=function(e,n){var r,a,o,u=e.as||["startAngle","endAngle"],s=u[0],l=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,v=c,g=(d-c)/i.sum(p),y=i.range(h);for(e.sort&&y.sort(function(e,n){return p[e]-p[n]}),r=0;r<h;++r)o=p[y[r]],a=m[y[r]],a[s]=v,a[l]=v+=o*g;return this.value=p,n.reflow(e.modified()).modifies(u)};var Me=5,xe=t.toSet([ie,ne,te]),Se=t.toSet(["set","modified","clear","type","scheme","schemeExtent","schemeCount","domain","domainMin","domainMid","domainMax","domainRaw","nice","zero","range","rangeStep","round","reverse","interpolate","interpolateGamma"]),Oe=t.inherits(j,n.Transform);Oe.transform=function(e,n){var r,i=n.dataflow,o=this.value;o&&!e.modified("type")||(this.value=o=a.scale((e.type||ie).toLowerCase())());for(r in e)Se[r]||(t.isFunction(o[r])?o[r](e[r]):i.warn("Unsupported scale property: "+r));return J(o,e,G(o,e),i),n.fork(n.NO_SOURCE|n.NO_FIELDS)};var ke="center",Ae="normalize",Ee=t.inherits(Z,n.Transform);Ee.transform=function(e,n){var t,r,a,i,o,u,s,l,f,c,d,m,p,h=e.as||["y0","y1"],v=h[0],g=h[1],y=e.field,M=e.offset;for(t=$(n.source,e.groupby,e.sort,y),a=0,o=t.length,s=t.max;a<o;++a)for(r=t[a],l=M===ke?(s-r.sum)/2:0,f=M===Ae?1/r.sum:1,m=l,p=0,i=0,u=r.length;i<u;++i)c=r[i],d=m,p+=y(c),m=f*p+l,c[v]=d,c[g]=m;return n.reflow(e.modified()).modifies(h)};var Te={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","curve","diagonal","orthogonal"]},{name:"as",type:"string",default:"path"}]},be={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"]}]},we={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:["y0","y1"]}]};n.register(Te,R),n.register(be,Y),n.register(we,Z),n.transform("AxisTicks",m),n.transform("DataJoin",p),n.transform("Encode",g),n.transform("LegendEntries",T),n.transform("Scale",j),e.transform=n.transform,e.definition=n.definition,e.scale=a.scale,e.scheme=a.scheme,Object.defineProperty(e,"__esModule",{value:!0})});

package.json

 {
   "name": "vega-encode",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-beta.10",
   "description": "Visual encoding transforms for Vega dataflows.",
@@ -5,0 +5,0 @@ "keywords": [

src/LegendEntries.js

 import {Transform, ingest} from 'vega-dataflow';
 import {scaleFraction} from 'vega-scale';
 import {constant, inherits, isFunction, peek} from 'vega-util';
-import {tickValues, tickFormat} from './ticks';
+import {labelValues, labelFormat} from './labels';
+import {tickFormat} from './ticks';
 
@@ -40,4 +41,5 @@ /**
       format = _.format || tickFormat(scale, count, _.formatSpecifier),
-      values = _.values || (grad ? scale.domain() : tickValues(scale, count));
+      values = _.values || labelValues(scale, count, grad);
 
+  format = labelFormat(scale, format);
   if (items) out.rem = items;
@@ -66,3 +68,8 @@
   items = values.map(function(value, index) {
-    var t = ingest({index: index, label: format(value), value: value});
+    var t = ingest({
+      index: index,
+      label: format(value, index, values),
+      value: value
+    });
+
     if (grad) {
@@ -69,0 +76,0 @@ t.perc = fraction(value);

src/Scale.js

@@ -5,2 +5,8 @@ import {Transform} from 'vega-dataflow';
 import {
+  Ordinal, Band, Point,
+  Linear, Pow, Sqrt, Sequential,
+  Quantile, Quantize, Threshold
+} from './scale-types';
+
+import {
   bandSpace,
@@ -19,14 +25,8 @@ interpolateRange,
 
-var BAND = 'band',
-    POINT = 'point',
-    QUANTILE = 'quantile',
-    QUANTIZE = 'quantize',
-    THRESHOLD = 'threshold',
-    SEQUENTIAL = 'sequential',
-    DEFAULT_QUANTUM_COUNT = 7;
+var DEFAULT_COUNT = 5;
 
-var INCLUDE_ZERO = toSet(['linear', 'pow', 'sqrt']);
+var INCLUDE_ZERO = toSet([Linear, Pow, Sqrt]);
 
 var SKIP = toSet([
-  'set', 'modified', 'clear', 'type', 'scheme', 'schemeExtent',
+  'set', 'modified', 'clear', 'type', 'scheme', 'schemeExtent', 'schemeCount',
   'domain', 'domainMin', 'domainMid', 'domainMax', 'domainRaw', 'nice', 'zero',
@@ -54,3 +54,3 @@ 'range', 'rangeStep', 'round', 'reverse', 'interpolate', 'interpolateGamma'
   if (!scale || _.modified('type')) {
-    this.value = scale = getScale((_.type || 'linear').toLowerCase())();
+    this.value = scale = getScale((_.type || Linear).toLowerCase())();
   }
@@ -129,3 +129,3 @@
   // given a range array for a sequential scale, convert to interpolator
-  else if (range && scale.type === SEQUENTIAL) {
+  else if (range && scale.type === Sequential) {
     return scale.interpolator(interpolateRgbBasis(flip(range, _.reverse)));
@@ -147,3 +147,3 @@ }
 function configureRangeStep(type, _, count) {
-  if (type !== BAND && type !== POINT) {
+  if (type !== Band && type !== Point) {
     error('Only band and point scales support rangeStep.');
@@ -154,3 +154,3 @@ }
   var outer = (_.paddingOuter != null ? _.paddingOuter : _.padding) || 0,
-      inner = type === POINT ? 1
+      inner = type === Point ? 1
             : ((_.paddingInner != null ? _.paddingInner : _.padding) || 0);
@@ -171,11 +171,11 @@ return [0, _.rangeStep * bandSpace(count, inner, outer)];
   // determine size for potential discrete range
-  count = (type === THRESHOLD) ? count + 1
-    : (type === QUANTILE || type === QUANTIZE) ? DEFAULT_QUANTUM_COUNT
+  count = (type === Threshold) ? count + 1
+    : (type === Quantile || type === Quantize) ? (+_.schemeCount || DEFAULT_COUNT)
     : count;
 
   // adjust and/or quantize scheme as appropriate
-  return type === SEQUENTIAL ? adjustScheme(scheme, extent, _.reverse)
+  return type === Sequential ? adjustScheme(scheme, extent, _.reverse)
     : !extent && (discrete = getScheme(name + '-' + count)) ? discrete
     : isFunction(scheme) ? quantize(adjustScheme(scheme, extent), count)
-    : scheme;
+    : type === Ordinal ? scheme : scheme.slice(0, count);
 }
@@ -182,0 +182,0 @@

src/ticks.js

@@ -0,1 +1,3 @@
+import {Log} from './scale-types';
+
 import {
@@ -38,3 +40,3 @@ format as numberFormat,
 
-  return (scale.type === 'log')
+  return (scale.type === Log)
     ? filter(format, variablePrecision(specifier))
@@ -41,0 +43,0 @@ : format;

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

71781

increased by6.96%

Number of package files

22

increased by10%

Lines of code

1605

increased by8.52%

Worsened metrics

Number of downloads

138030

decreased by-1.58%

No dependency changes