vega-encode - npm Package Compare versions

Comparing version 1.0.0-beta.19 to 1.0.0-beta.20

build/vega-encode.js

@@ -22,2 +22,20 @@ (function (global, factory) {
 /**
+ * Filter a set of candidate tick values, ensuring that only tick values
+ * that lie within the scale range are included.
+ * @param {Scale} scale - The scale for which to generate tick values.
+ * @param {Array<*>} ticks - The candidate tick values.
+ * @return {Array<*>} - The filtered tick values.
+ */
+function validTicks(scale$$1, ticks) {
+  var range$$1 = scale$$1.range(),
+      lo = range$$1[0],
+      hi = vegaUtil.peek(range$$1);
+  if (lo > hi) range$$1 = hi, hi = lo, lo = range$$1;
+
+  return ticks.filter(function(v) {
+    return !((v = scale$$1(v)) < lo || v > hi)
+  });
+}
+
+/**
  * Generate tick values for the given scale and approximate tick count or
@@ -140,3 +158,3 @@ * interval value. If the scale has a 'ticks' method, it will be used to
       format$$1 = _.format || tickFormat(scale$$1, count, _.formatSpecifier),
-      values = _.values || tickValues(scale$$1, count);
+      values = _.values ? validTicks(scale$$1, _.values) : tickValues(scale$$1, count);
 
@@ -143,0 +161,0 @@ if (ticks) out.rem = ticks;

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 e.type===ue?f(r,l(t)):r}function f(e,n){return function(t){return e(t)?n(t):""}}function l(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,null,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=Oe[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 A(e){var n=e.domain();return n.max=n.pop(),n}function O(e,n){return Oe[e.type]?b(n):D(n)}function b(e){return function(n,t,r){var a=r[t+1]||r.max||+(1/0),i=k(n,e),o=k(a,e);return i&&o?i+"–"+o:o?"< "+o:"≥ "+i}}function k(e,n){return isFinite(e)?n(e):null}function D(e){return function(n){return e(n)}}function T(e){n.Transform.call(this,[],e)}function E(e){return e.source.x}function w(e){return e.source.y}function F(e){return e.target.x}function R(e){return e.target.y}function z(e){n.Transform.call(this,{},e)}function C(e,n,t,r){return"M"+e+","+n+"L"+t+","+r}function q(e,n,t,r){return C(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=Math.sqrt(a*a+i*i)/2,u=180*Math.atan2(i,a)/Math.PI;return"M"+e+","+n+"A"+o+","+o+" "+u+" 0 1 "+t+","+r}function _(e,n,t,r){return L(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))}function I(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 P(e,n,t,r){return I(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))}function N(e,n,t,r){return"M"+e+","+n+"V"+r+"H"+t}function U(e,n,t,r){return"M"+e+","+n+"H"+t+"V"+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=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 Y(e,n,t,r){var a=(e+t)/2;return"M"+e+","+n+"C"+a+","+n+" "+a+","+r+" "+t+","+r}function j(e,n,t,r){var a=(n+r)/2;return"M"+e+","+n+"C"+e+","+a+" "+t+","+a+" "+t+","+r}function G(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 H(e){n.Transform.call(this,null,e)}function J(e){n.Transform.call(this,null,e),this.modified(!0)}function V(e,n,t){var r=B(e,n.domainRaw);if(r>-1)return r;var a,i,o=n.domain,u=n.zero||void 0===n.zero&&we[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 B(e,n){return n?(e.domain(n),n.length):-1}function W(e,n,r){var i=n.round||!1,u=n.range;if(null!=n.rangeStep)u=K(e.type,n,r);else if(n.scheme){if(u=Q(e.type,n,r),t.isFunction(u))return e.interpolator(u)}else if(u&&e.type===Me)return e.interpolator(o.interpolateRgbBasis($(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($(u,n.reverse))}function K(e,n,r){e!==le&&e!==ce&&t.error("Only band and point scales support rangeStep.");var i=(null!=n.paddingOuter?n.paddingOuter:n.padding)||0,o=e===ce?1:(null!=n.paddingInner?n.paddingInner:n.padding)||0;return[0,n.rangeStep*a.bandSpace(r,o,i)]}function Q(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===ve?r+1:e===ye?r-1:e===pe||e===he?+n.schemeCount||Ee:r,e===Me?Z(u,s,n.reverse):!s&&(i=a.scheme(o+"-"+r))?i:t.isFunction(u)?ee(Z(u,s),r):e===me?u:u.slice(0,r)}function Z(e,n,r){return t.isFunction(e)&&(n||r)?a.interpolateRange(e,$(n||[0,1],r)):e}function $(e,n){return n?e.slice().reverse():e}function ee(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 ne(e){n.Transform.call(this,null,e)}function te(e){n.Transform.call(this,null,e)}function re(e,n,t,r,a){for(var i,o=(n-e.sum)/2,u=e.length,s=0;s<u;++s)i=e[s],i[r]=o,i[a]=o+=Math.abs(t(i))}function ae(e,n,t,r,a){for(var i,o=1/e.sum,u=0,s=e.length,f=0,l=0;f<s;++f)i=e[f],i[r]=u,i[a]=u=o*(l+=Math.abs(t(i)))}function ie(e,n,t,r,a){for(var i,o,u=0,s=0,f=e.length,l=0;l<f;++l)o=e[l],i=t(o),i<0?(o[r]=s,o[a]=s+=i):(o[r]=u,o[a]=u+=i)}function oe(e,n,t,r){var a,i,o,u,s,f,l,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],f=n.map(p),l=a[f]||(m.push(a[f]=[]),a[f]),l.push(s);for(f=0,d=0,u=m.length;f<u;++f){for(l=m[f],i=0,c=0,o=l.length;i<o;++i)c+=Math.abs(r(l[i]));l.sum=c,c>d&&(d=c),t&&l.sort(t)}return m.max=d,m}var ue="log",se="pow",fe="sqrt",le="band",ce="point",de="linear",me="ordinal",pe="quantile",he="quantize",ve="threshold",ge="bin-linear",ye="bin-ordinal",Me="sequential",xe=t.inherits(m,n.Transform);xe.transform=function(e,t){if(this.value&&!e.modified())return t.StopPropagation;var r=t.fork(t.NO_SOURCE|t.NO_FIELDS),a=this.value,i=e.scale,o=e.count,f=e.format||s(i,o,e.formatSpecifier),l=e.values||u(i,o);return a&&(r.rem=a),a=l.map(function(e){return n.ingest({value:e,label:f(e)})}),e.extra&&a.push(n.ingest({extra:{value:a[0].value},label:""})),r.source=r.add=this.value=a,r};var Se=t.inherits(p,n.Transform);Se.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),s.lookup=function(e){return s.get(u(e))}),(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&&(t.datum=e,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)}),r.changed(r.ADD_MOD)&&i.modifies("datum"),e.clean&&s.empty>a.cleanThreshold&&a.runAfter(s.clean),i};var Ae=t.inherits(g,n.Transform);Ae.transform=function(e,n){var r=n.fork(n.ADD_REM),a=e.encoders,i=n.encode;if(t.isArray(i)){if(!r.changed()&&!i.every(function(e){return a[e]}))return n.StopPropagation;i=i[0]}var o="enter"===i,u=a.update||t.falsy,s=a.enter||t.falsy,f=a.exit||t.falsy,l=(i&&!o?a[i]:u)||t.falsy;if(n.changed(n.ADD)&&(n.visit(n.ADD,function(n){s(n,e),u(n,e),l!==t.falsy&&l!==u&&l(n,e)}),r.modifies(s.output),r.modifies(u.output),l!==t.falsy&&l!==u&&r.modifies(l.output)),n.changed(n.REM)&&f!==t.falsy&&(n.visit(n.REM,function(n){f(n,e)}),r.modifies(f.output)),o||l!==t.falsy){var c=n.MOD|(e.modified()?n.REFLOW:0);o?(n.visit(c,function(n){var t=s(n,e);(l(n,e)||t)&&r.mod.push(n)}),r.mod.length&&r.modifies(s.output)):n.visit(c,function(n){l(n,e)&&r.mod.push(n)}),r.mod.length&&r.modifies(l.output)}return r.changed()?r:n.StopPropagation};var Oe={};Oe[pe]=x,Oe[he]=M,Oe[ve]=S,Oe[ge]=A,Oe[ye]=A;var be=t.inherits(T,n.Transform);be.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,f="gradient"===e.type,l=e.scale,c=null==e.count?5:e.count,d=e.format||s(l,c,e.formatSpecifier),m=e.values||y(l,c,f);if(d=O(l,d),u&&(i.rem=u),f)var p=e.values?l.domain():m,h=a.scaleFraction(l,p[0],t.peek(p));else{var v,g=e.size;t.isFunction(g)?(e.values||0!==l(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 f?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 ke=t.fastmap({line:C,"line-radial":q,arc:L,"arc-radial":_,curve:I,"curve-radial":P,"orthogonal-horizontal":N,"orthogonal-vertical":U,"orthogonal-radial":X,"diagonal-horizontal":Y,"diagonal-vertical":j,"diagonal-radial":G}),De=t.inherits(z,n.Transform);De.transform=function(e,n){var r=e.sourceX||E,a=e.sourceY||w,i=e.targetX||F,o=e.targetY||R,u=e.as||"path",s=e.orient||"vertical",f=e.shape||"line",l=ke.get(f+"-"+s)||ke.get(f);return l||t.error("LinkPath unsupported type: "+e.shape+(e.orient?"-"+e.orient:"")),n.visit(n.SOURCE,function(e){e[u]=l(r(e),a(e),i(e),o(e))}),n.reflow(e.modified()).modifies(u)};var Te=t.inherits(H,n.Transform);Te.transform=function(e,n){var r,a,o,u=e.as||["startAngle","endAngle"],s=u[0],f=u[1],l=e.field||t.one,c=e.startAngle||0,d=null!=e.endAngle?e.endAngle:2*Math.PI,m=n.source,p=m.map(l),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[f]=v+=o*g;return this.value=p,n.reflow(e.modified()).modifies(u)};var Ee=5,we=t.toSet([de,se,fe]),Fe=t.toSet(["set","modified","clear","type","scheme","schemeExtent","schemeCount","domain","domainMin","domainMid","domainMax","domainRaw","nice","zero","range","rangeStep","round","reverse","interpolate","interpolateGamma"]),Re=t.inherits(J,n.Transform);Re.transform=function(e,n){var r,i=n.dataflow,o=this.value;o&&!e.modified("type")||(this.value=o=a.scale((e.type||de).toLowerCase())());for(r in e)Fe[r]||(t.isFunction(o[r])?o[r](e[r]):i.warn("Unsupported scale property: "+r));return W(o,e,V(o,e),i),n.fork(n.NO_SOURCE|n.NO_FIELDS)};var ze=t.inherits(ne,n.Transform);ze.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(e.sort),this.modified(t),n};var Ce="center",qe="normalize",Le=t.inherits(te,n.Transform);Le.transform=function(e,n){var r,a,i,o,u=e.as||["y0","y1"],s=u[0],f=u[1],l=e.field||t.one,c=e.offset===Ce?re:e.offset===qe?ae:ie;for(r=oe(n.source,e.groupby,e.sort,l),a=0,i=r.length,o=r.max;a<i;++a)c(r[a],o,l,s,f);return n.reflow(e.modified()).modifies(u)};var _e={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:"as",type:"string",default:"path"}]},Ie={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(_e,z),n.register(Ie,H),n.register(Pe,te),n.transform("AxisTicks",m),n.transform("DataJoin",p),n.transform("Encode",g),n.transform("LegendEntries",T),n.transform("Scale",J),n.transform("SortItems",ne),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){var r=e.range(),a=r[0],i=t.peek(r);return a>i&&(r=i,i=a,a=r),n.filter(function(n){return!((n=e(n))<a||n>i)})}function s(e,n){return e.ticks?e.ticks(n):e.domain()}function f(e,n,t){var r=e.tickFormat?e.tickFormat(n,t):String;return e.type===se?l(r,c(t)):r}function l(e,n){return function(t){return e(t)?n(t):""}}function c(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=m(i,o),a=r<i.length?i.slice(r):"";--r>o;)if("0"!==i[r]){++r;break}return i.slice(0,r)+a}}function m(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 p(e){n.Transform.call(this,null,e)}function h(e){n.Transform.call(this,null,e)}function v(){return n.ingest({})}function g(e){return e.exit}function y(e){n.Transform.call(this,null,e)}function M(e,n,t){if(t)return e.domain();var r=Oe[e.type];return r?r(e):s(e,n)}function x(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 S(e){var n=e.domain(),r=[n[0]].concat(e.quantiles());return r.max=t.peek(n),r}function A(e){var n=[-(1/0)].concat(e.domain());return n.max=+(1/0),n}function k(e){var n=e.domain();return n.max=n.pop(),n}function O(e,n){return Oe[e.type]?b(n):T(n)}function b(e){return function(n,t,r){var a=r[t+1]||r.max||+(1/0),i=D(n,e),o=D(a,e);return i&&o?i+"–"+o:o?"< "+o:"≥ "+i}}function D(e,n){return isFinite(e)?n(e):null}function T(e){return function(n){return e(n)}}function E(e){n.Transform.call(this,[],e)}function w(e){return e.source.x}function F(e){return e.source.y}function R(e){return e.target.x}function z(e){return e.target.y}function C(e){n.Transform.call(this,{},e)}function q(e,n,t,r){return"M"+e+","+n+"L"+t+","+r}function L(e,n,t,r){return q(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))}function _(e,n,t,r){var a=t-e,i=r-n,o=Math.sqrt(a*a+i*i)/2,u=180*Math.atan2(i,a)/Math.PI;return"M"+e+","+n+"A"+o+","+o+" "+u+" 0 1 "+t+","+r}function I(e,n,t,r){return _(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))}function P(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 N(e,n,t,r){return P(n*Math.cos(e),n*Math.sin(e),r*Math.cos(t),r*Math.sin(t))}function U(e,n,t,r){return"M"+e+","+n+"V"+r+"H"+t}function X(e,n,t,r){return"M"+e+","+n+"H"+t+"V"+r}function Y(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 j(e,n,t,r){var a=(e+t)/2;return"M"+e+","+n+"C"+a+","+n+" "+a+","+r+" "+t+","+r}function G(e,n,t,r){var a=(n+r)/2;return"M"+e+","+n+"C"+e+","+a+" "+t+","+a+" "+t+","+r}function H(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 J(e){n.Transform.call(this,null,e)}function V(e){n.Transform.call(this,null,e),this.modified(!0)}function B(e,n,t){var r=W(e,n.domainRaw);if(r>-1)return r;var a,i,o=n.domain,u=n.zero||void 0===n.zero&&Fe[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 W(e,n){return n?(e.domain(n),n.length):-1}function K(e,n,r){var i=n.round||!1,u=n.range;if(null!=n.rangeStep)u=Q(e.type,n,r);else if(n.scheme){if(u=Z(e.type,n,r),t.isFunction(u))return e.interpolator(u)}else if(u&&e.type===xe)return e.interpolator(o.interpolateRgbBasis(ee(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(ee(u,n.reverse))}function Q(e,n,r){e!==ce&&e!==de&&t.error("Only band and point scales support rangeStep.");var i=(null!=n.paddingOuter?n.paddingOuter:n.padding)||0,o=e===de?1:(null!=n.paddingInner?n.paddingInner:n.padding)||0;return[0,n.rangeStep*a.bandSpace(r,o,i)]}function Z(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===ge?r+1:e===Me?r-1:e===he||e===ve?+n.schemeCount||we:r,e===xe?$(u,s,n.reverse):!s&&(i=a.scheme(o+"-"+r))?i:t.isFunction(u)?ne($(u,s),r):e===pe?u:u.slice(0,r)}function $(e,n,r){return t.isFunction(e)&&(n||r)?a.interpolateRange(e,ee(n||[0,1],r)):e}function ee(e,n){return n?e.slice().reverse():e}function ne(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 te(e){n.Transform.call(this,null,e)}function re(e){n.Transform.call(this,null,e)}function ae(e,n,t,r,a){for(var i,o=(n-e.sum)/2,u=e.length,s=0;s<u;++s)i=e[s],i[r]=o,i[a]=o+=Math.abs(t(i))}function ie(e,n,t,r,a){for(var i,o=1/e.sum,u=0,s=e.length,f=0,l=0;f<s;++f)i=e[f],i[r]=u,i[a]=u=o*(l+=Math.abs(t(i)))}function oe(e,n,t,r,a){for(var i,o,u=0,s=0,f=e.length,l=0;l<f;++l)o=e[l],i=t(o),i<0?(o[r]=s,o[a]=s+=i):(o[r]=u,o[a]=u+=i)}function ue(e,n,t,r){var a,i,o,u,s,f,l,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],f=n.map(p),l=a[f]||(m.push(a[f]=[]),a[f]),l.push(s);for(f=0,d=0,u=m.length;f<u;++f){for(l=m[f],i=0,c=0,o=l.length;i<o;++i)c+=Math.abs(r(l[i]));l.sum=c,c>d&&(d=c),t&&l.sort(t)}return m.max=d,m}var se="log",fe="pow",le="sqrt",ce="band",de="point",me="linear",pe="ordinal",he="quantile",ve="quantize",ge="threshold",ye="bin-linear",Me="bin-ordinal",xe="sequential",Se=t.inherits(p,n.Transform);Se.transform=function(e,t){if(this.value&&!e.modified())return t.StopPropagation;var r=t.fork(t.NO_SOURCE|t.NO_FIELDS),a=this.value,i=e.scale,o=e.count,l=e.format||f(i,o,e.formatSpecifier),c=e.values?u(i,e.values):s(i,o);return a&&(r.rem=a),a=c.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 Ae=t.inherits(h,n.Transform);Ae.transform=function(e,r){var a=r.dataflow,i=r.fork(r.NO_SOURCE|r.NO_FIELDS),o=e.item||v,u=e.key||n.tupleid,s=this.value;return s||(r=r.addAll(),this.value=s=t.fastmap().test(g),s.lookup=function(e){return s.get(u(e))}),(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&&(t.datum=e,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)}),r.changed(r.ADD_MOD)&&i.modifies("datum"),e.clean&&s.empty>a.cleanThreshold&&a.runAfter(s.clean),i};var ke=t.inherits(y,n.Transform);ke.transform=function(e,n){var r=n.fork(n.ADD_REM),a=e.encoders,i=n.encode;if(t.isArray(i)){if(!r.changed()&&!i.every(function(e){return a[e]}))return n.StopPropagation;i=i[0]}var o="enter"===i,u=a.update||t.falsy,s=a.enter||t.falsy,f=a.exit||t.falsy,l=(i&&!o?a[i]:u)||t.falsy;if(n.changed(n.ADD)&&(n.visit(n.ADD,function(n){s(n,e),u(n,e),l!==t.falsy&&l!==u&&l(n,e)}),r.modifies(s.output),r.modifies(u.output),l!==t.falsy&&l!==u&&r.modifies(l.output)),n.changed(n.REM)&&f!==t.falsy&&(n.visit(n.REM,function(n){f(n,e)}),r.modifies(f.output)),o||l!==t.falsy){var c=n.MOD|(e.modified()?n.REFLOW:0);o?(n.visit(c,function(n){var t=s(n,e);(l(n,e)||t)&&r.mod.push(n)}),r.mod.length&&r.modifies(s.output)):n.visit(c,function(n){l(n,e)&&r.mod.push(n)}),r.mod.length&&r.modifies(l.output)}return r.changed()?r:n.StopPropagation};var Oe={};Oe[he]=S,Oe[ve]=x,Oe[ge]=A,Oe[ye]=k,Oe[Me]=k;var be=t.inherits(E,n.Transform);be.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,s="gradient"===e.type,l=e.scale,c=null==e.count?5:e.count,d=e.format||f(l,c,e.formatSpecifier),m=e.values||M(l,c,s);if(d=O(l,d),u&&(i.rem=u),s)var p=e.values?l.domain():m,h=a.scaleFraction(l,p[0],t.peek(p));else{var v,g=e.size;t.isFunction(g)?(e.values||0!==l(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 s?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 De=t.fastmap({line:q,"line-radial":L,arc:_,"arc-radial":I,curve:P,"curve-radial":N,"orthogonal-horizontal":U,"orthogonal-vertical":X,"orthogonal-radial":Y,"diagonal-horizontal":j,"diagonal-vertical":G,"diagonal-radial":H}),Te=t.inherits(C,n.Transform);Te.transform=function(e,n){var r=e.sourceX||w,a=e.sourceY||F,i=e.targetX||R,o=e.targetY||z,u=e.as||"path",s=e.orient||"vertical",f=e.shape||"line",l=De.get(f+"-"+s)||De.get(f);return l||t.error("LinkPath unsupported type: "+e.shape+(e.orient?"-"+e.orient:"")),n.visit(n.SOURCE,function(e){e[u]=l(r(e),a(e),i(e),o(e))}),n.reflow(e.modified()).modifies(u)};var Ee=t.inherits(J,n.Transform);Ee.transform=function(e,n){var r,a,o,u=e.as||["startAngle","endAngle"],s=u[0],f=u[1],l=e.field||t.one,c=e.startAngle||0,d=null!=e.endAngle?e.endAngle:2*Math.PI,m=n.source,p=m.map(l),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[f]=v+=o*g;return this.value=p,n.reflow(e.modified()).modifies(u)};var we=5,Fe=t.toSet([me,fe,le]),Re=t.toSet(["set","modified","clear","type","scheme","schemeExtent","schemeCount","domain","domainMin","domainMid","domainMax","domainRaw","nice","zero","range","rangeStep","round","reverse","interpolate","interpolateGamma"]),ze=t.inherits(V,n.Transform);ze.transform=function(e,n){var r,i=n.dataflow,o=this.value;o&&!e.modified("type")||(this.value=o=a.scale((e.type||me).toLowerCase())());for(r in e)Re[r]||(t.isFunction(o[r])?o[r](e[r]):i.warn("Unsupported scale property: "+r));return K(o,e,B(o,e),i),n.fork(n.NO_SOURCE|n.NO_FIELDS)};var Ce=t.inherits(te,n.Transform);Ce.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(e.sort),this.modified(t),n};var qe="center",Le="normalize",_e=t.inherits(re,n.Transform);_e.transform=function(e,n){var r,a,i,o,u=e.as||["y0","y1"],s=u[0],f=u[1],l=e.field||t.one,c=e.offset===qe?ae:e.offset===Le?ie:oe;for(r=ue(n.source,e.groupby,e.sort,l),a=0,i=r.length,o=r.max;a<i;++a)c(r[a],o,l,s,f);return n.reflow(e.modified()).modifies(u)};var Ie={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:"as",type:"string",default:"path"}]},Pe={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"]}]},Ne={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(Ie,C),n.register(Pe,J),n.register(Ne,re),n.transform("AxisTicks",p),n.transform("DataJoin",h),n.transform("Encode",y),n.transform("LegendEntries",E),n.transform("Scale",V),n.transform("SortItems",te),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.19",
+  "version": "1.0.0-beta.20",
   "description": "Visual encoding transforms for Vega dataflows.",
@@ -5,0 +5,0 @@ "keywords": [

src/AxisTicks.js

 import {Transform, ingest} from 'vega-dataflow';
 import {inherits} from 'vega-util';
-import {tickValues, tickFormat} from './ticks';
+import {tickValues, tickFormat, validTicks} from './ticks';
 
@@ -37,3 +37,3 @@ /**
       format = _.format || tickFormat(scale, count, _.formatSpecifier),
-      values = _.values || tickValues(scale, count);
+      values = _.values ? validTicks(scale, _.values) : tickValues(scale, count);
 
@@ -40,0 +40,0 @@ if (ticks) out.rem = ticks;

src/ticks.js

 import {Log} from './scale-types';
-
+import {peek} from 'vega-util';
 import {
@@ -9,2 +9,20 @@ format as numberFormat,
 /**
+ * Filter a set of candidate tick values, ensuring that only tick values
+ * that lie within the scale range are included.
+ * @param {Scale} scale - The scale for which to generate tick values.
+ * @param {Array<*>} ticks - The candidate tick values.
+ * @return {Array<*>} - The filtered tick values.
+ */
+export function validTicks(scale, ticks) {
+  var range = scale.range(),
+      lo = range[0],
+      hi = peek(range);
+  if (lo > hi) range = hi, hi = lo, lo = range;
+
+  return ticks.filter(function(v) {
+    return !((v = scale(v)) < lo || v > hi)
+  });
+}
+
+/**
  * Generate tick values for the given scale and approximate tick count or
@@ -11,0 +29,0 @@ * interval value. If the scale has a 'ticks' method, it will be used to

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

80683

increased by1.76%

Lines of code

1825

increased by1.84%

No dependency changes