genesys-spark-chart-components 4.117.1 → 4.119.0

package/dist/esm/gux-visualization-beta.entry.js

@@ -1,5 +1,5 @@
 import { r as registerInstance, c as createEvent, h as h$1, g as getElement } from './index-d8134161.js';
-import { D as DEFAULT_LABEL_COLOR, a as DEFAULT_DOMAIN_COLOR, t as trackComponent } from './color-palette-2c4363f3.js';
+import { D as DEFAULT_LABEL_COLOR, a as DEFAULT_DOMAIN_COLOR, t as trackComponent } from './color-palette-7ac8a54e.js';
 
 // Note: This regex matches even invalid JSON strings, but since we’re
 // working on the output of `JSON.stringify` we know that only valid strings
@@ -314,7 +314,7 @@ function toNumber (_) {
 }
 
 const exp$2 = sign => x => sign * Math.exp(x);
-const log$5 = sign => x => Math.log(sign * x);
+const log$4 = sign => x => Math.log(sign * x);
 const symlog$1 = c => x => Math.sign(x) * Math.log1p(Math.abs(x / c));
 const symexp = c => x => Math.sign(x) * Math.expm1(Math.abs(x)) * c;
 const pow$4 = exponent => x => x < 0 ? -Math.pow(-x, exponent) : Math.pow(x, exponent);
@@ -329,7 +329,7 @@ function panLinear(domain, delta) {
 }
 function panLog(domain, delta) {
   var sign = Math.sign(domain[0]);
-  return pan(domain, delta, log$5(sign), exp$2(sign));
+  return pan(domain, delta, log$4(sign), exp$2(sign));
 }
 function panPow(domain, delta, exponent) {
   return pan(domain, delta, pow$4(exponent), pow$4(1 / exponent));
@@ -348,7 +348,7 @@ function zoomLinear(domain, anchor, scale) {
 }
 function zoomLog(domain, anchor, scale) {
   const sign = Math.sign(domain[0]);
-  return zoom$2(domain, anchor, scale, log$5(sign), exp$2(sign));
+  return zoom$2(domain, anchor, scale, log$4(sign), exp$2(sign));
 }
 function zoomPow(domain, anchor, scale, exponent) {
   return zoom$2(domain, anchor, scale, pow$4(exponent), pow$4(1 / exponent));
@@ -364,7 +364,7 @@ function utcquarter(date) {
   return 1 + ~~(new Date(date).getUTCMonth() / 3);
 }
 
-function array$6 (_) {
+function array$5 (_) {
   return _ != null ? isArray(_) ? _ : [_] : [];
 }
 
@@ -395,12 +395,12 @@ function isFunction (_) {
 const DESCENDING = 'descending';
 function compare$2 (fields, orders, opt) {
   opt = opt || {};
-  orders = array$6(orders) || [];
+  orders = array$5(orders) || [];
   const ord = [],
     get = [],
     fmap = {},
     gen = opt.comparator || comparator$1;
-  array$6(fields).forEach((f, i) => {
+  array$5(fields).forEach((f, i) => {
     if (f == null) return;
     ord.push(orders[i] === DESCENDING ? -1 : 1);
     get.push(f = isFunction(f) ? f : field$1(f, null, opt));
@@ -697,7 +697,7 @@ function isString (_) {
 
 function key (fields, flat, opt) {
   if (fields) {
-    fields = flat ? array$6(fields).map(f => f.replace(/\\(.)/g, '$1')) : array$6(fields);
+    fields = flat ? array$5(fields).map(f => f.replace(/\\(.)/g, '$1')) : array$5(fields);
   }
   const len = fields && fields.length,
     gen = opt && opt.get || getter$1,
@@ -759,7 +759,7 @@ function lruCache (maxsize) {
   };
 }
 
-function merge$4 (compare, array0, array1, output) {
+function merge$3 (compare, array0, array1, output) {
   const n0 = array0.length,
     n1 = array1.length;
   if (!n1) return array0;
@@ -1038,7 +1038,7 @@ function transform$3(transform) {
   };
 }
 
-function reverse$3(array, n) {
+function reverse$2(array, n) {
   var t, j = array.length, i = j - n;
   while (i < --j) t = array[i], array[i++] = array[j], array[j] = t;
 }
@@ -1069,7 +1069,7 @@ function object$1(topology, o) {
     for (var a = arcs[i < 0 ? ~i : i], k = 0, n = a.length; k < n; ++k) {
       points.push(transformPoint(a[k], k));
     }
-    if (i < 0) reverse$3(points, n);
+    if (i < 0) reverse$2(points, n);
   }
 
   function point(p) {
@@ -1687,11 +1687,11 @@ function* flatten(arrays) {
   }
 }
 
-function merge$3(arrays) {
+function merge$2(arrays) {
   return Array.from(flatten(arrays));
 }
 
-function range$6(start, stop, step) {
+function range$5(start, stop, step) {
   start = +start, stop = +stop, step = (n = arguments.length) < 2 ? (stop = start, start = 0, 1) : n < 3 ? 1 : +step;
 
   var i = -1,
@@ -2050,7 +2050,7 @@ function formatLocale$3(locale) {
 }
 
 var locale$4;
-var format$5;
+var format$4;
 var formatPrefix$1;
 
 defaultLocale$4({
@@ -2061,7 +2061,7 @@ defaultLocale$4({
 
 function defaultLocale$4(definition) {
   locale$4 = formatLocale$3(definition);
-  format$5 = locale$4.format;
+  format$4 = locale$4.format;
   formatPrefix$1 = locale$4.formatPrefix;
   return locale$4;
 }
@@ -2372,7 +2372,7 @@ const MILLISECONDS = 'milliseconds';
 const TIME_UNITS = [YEAR, QUARTER, MONTH, WEEK, DATE, DAY, DAYOFYEAR, HOURS, MINUTES, SECONDS, MILLISECONDS];
 const UNITS = TIME_UNITS.reduce((o, u, i) => (o[u] = 1 + i, o), {});
 function timeUnits(units) {
-  const u = array$6(units).slice(),
+  const u = array$5(units).slice(),
     m = {};
 
   // check validity
@@ -2610,14 +2610,14 @@ function timeOffset(unit, date, step) {
 function utcOffset(unit, date, step) {
   return offset$3(utcInterval(unit), date, step);
 }
-function sequence$2(ival, start, stop, step) {
+function sequence$1(ival, start, stop, step) {
   return ival ? ival.range(start, stop, step) : undefined;
 }
 function timeSequence(unit, start, stop, step) {
-  return sequence$2(timeInterval$1(unit), start, stop, step);
+  return sequence$1(timeInterval$1(unit), start, stop, step);
 }
 function utcSequence(unit, start, stop, step) {
-  return sequence$2(utcInterval(unit), start, stop, step);
+  return sequence$1(utcInterval(unit), start, stop, step);
 }
 
 const durationSecond$1 = 1000,
@@ -3530,10 +3530,10 @@ function formatUnixTimestampSeconds$1(d) {
 }
 
 var locale$3;
-var timeFormat$4;
-var timeParse$2;
-var utcFormat$3;
-var utcParse$2;
+var timeFormat$3;
+var timeParse$1;
+var utcFormat$2;
+var utcParse$1;
 
 defaultLocale$3({
   dateTime: "%x, %X",
@@ -3548,10 +3548,10 @@ defaultLocale$3({
 
 function defaultLocale$3(definition) {
   locale$3 = formatLocale$2(definition);
-  timeFormat$4 = locale$3.format;
-  timeParse$2 = locale$3.parse;
-  utcFormat$3 = locale$3.utcFormat;
-  utcParse$2 = locale$3.utcParse;
+  timeFormat$3 = locale$3.format;
+  timeParse$1 = locale$3.parse;
+  utcFormat$2 = locale$3.utcFormat;
+  utcParse$1 = locale$3.utcParse;
   return locale$3;
 }
 
@@ -3652,7 +3652,7 @@ let defaultNumberLocale;
 resetNumberFormatDefaultLocale();
 function resetNumberFormatDefaultLocale() {
   return defaultNumberLocale = numberLocale({
-    format: format$5,
+    format: format$4,
     formatPrefix: formatPrefix$1
   });
 }
@@ -3701,10 +3701,10 @@ let defaultTimeLocale;
 resetTimeFormatDefaultLocale();
 function resetTimeFormatDefaultLocale() {
   return defaultTimeLocale = timeLocale({
-    format: timeFormat$4,
-    parse: timeParse$2,
-    utcFormat: utcFormat$3,
-    utcParse: utcParse$2
+    format: timeFormat$3,
+    parse: timeParse$1,
+    utcFormat: utcFormat$2,
+    utcParse: utcParse$1
   });
 }
 function timeFormatLocale(definition) {
@@ -3999,7 +3999,7 @@ function topojson(data, format) {
 }
 topojson.responseType = 'json';
 
-const format$4 = {
+const format$3 = {
   dsv: dsv,
   csv: delimitedFormat(','),
   tsv: delimitedFormat('\t'),
@@ -4008,10 +4008,10 @@ const format$4 = {
 };
 function formats$1(name, reader) {
   if (arguments.length > 1) {
-    format$4[name] = reader;
+    format$3[name] = reader;
     return this;
   } else {
-    return has$1(format$4, name) ? format$4[name] : null;
+    return has$1(format$3, name) ? format$3[name] : null;
   }
 }
 function responseType(type) {
@@ -4188,7 +4188,7 @@ function rederive(t, d) {
  * @param {object} d - The new tuple that replaces the old.
  * @return {object} The new tuple.
  */
-function replace$2(t, d) {
+function replace$1(t, d) {
   return setid(d, tupleid(t));
 }
 
@@ -4221,14 +4221,14 @@ function changeset() {
   return {
     constructor: changeset,
     insert(t) {
-      const d = array$6(t),
+      const d = array$5(t),
         n = d.length;
       for (let i = 0; i < n; ++i) add.push(d[i]);
       return this;
     },
     remove(t) {
       const a = isFunction(t) ? remp : rem,
-        d = array$6(t),
+        d = array$5(t),
         n = d.length;
       for (let i = 0; i < n; ++i) a.push(d[i]);
       return this;
@@ -4560,7 +4560,7 @@ Operator.prototype = {
     for (name in params) {
       value = params[name];
       if (name === PULSE) {
-        array$6(value).forEach(op => {
+        array$5(value).forEach(op => {
           if (!(op instanceof Operator)) {
             error$1('Pulse parameters must be operator instances.');
           } else if (op !== this) {
@@ -4871,7 +4871,7 @@ function events$1 (source, type, filter, apply) {
   if (typeof source === 'string' && typeof document !== 'undefined') {
     sources = document.querySelectorAll(source);
   } else {
-    sources = array$6(source);
+    sources = array$5(source);
   }
   const n = sources.length;
   for (let i = 0; i < n; ++i) {
@@ -5124,7 +5124,7 @@ function materialize(data, filter) {
   visitArray(data, filter, _ => out.push(_));
   return out;
 }
-function filter$2(pulse, flags) {
+function filter$1(pulse, flags) {
   const map = {};
   pulse.visit(flags, t => {
     map[tupleid(t)] = 1;
@@ -5317,7 +5317,7 @@ Pulse.prototype = {
       src = this.source && this.source.length;
     if (src && src !== len) {
       this.mod = this.source;
-      if (len) this.filter(MOD$1, filter$2(this, ADD));
+      if (len) this.filter(MOD$1, filter$1(this, ADD));
     }
     return this;
   },
@@ -5434,7 +5434,7 @@ Pulse.prototype = {
     if (flags & REFLOW && src) {
       const sum = p.add.length + p.mod.length;
       if (sum === src.length) ; else if (sum) {
-        visitArray(src, filter$2(p, ADD_MOD), v);
+        visitArray(src, filter$1(p, ADD_MOD), v);
       } else {
         // if no add/rem/mod tuples, visit source
         visitArray(src, p.srcF, v);
@@ -6903,7 +6903,7 @@ function linear$2 (data, x, y) {
 
 // Adapted from d3-regression by Harry Stevens
 // License: https://github.com/HarryStevens/d3-regression/blob/master/LICENSE
-function log$4 (data, x, y) {
+function log$3 (data, x, y) {
   let X = 0,
     Y = 0,
     XY = 0,
@@ -7830,7 +7830,7 @@ inherits(Aggregate$1, Transform, {
       outputs = this._outputs = [],
       inputMap = {};
     function inputVisit(get) {
-      const fields = array$6(accessorFields(get)),
+      const fields = array$5(accessorFields(get)),
         n = fields.length;
       let i = 0,
         f;
@@ -7843,7 +7843,7 @@ inherits(Aggregate$1, Transform, {
     }
 
     // initialize group-by dimensions
-    this._dims = array$6(_.groupby);
+    this._dims = array$5(_.groupby);
     this._dnames = this._dims.map(d => {
       const dname = accessorName(d);
       inputVisit(d);
@@ -7940,7 +7940,7 @@ inherits(Aggregate$1, Transform, {
     for (let i = 0; i < n; ++i) {
       x[names[i]] = dims[i](t);
     }
-    return p ? replace$2(p.tuple, x) : ingest$1(x);
+    return p ? replace$1(p.tuple, x) : ingest$1(x);
   },
   clean() {
     const cells = this.value;
@@ -8175,7 +8175,7 @@ function SortedList (idFunc, source, input) {
         data.sort(compare);
       }
       if (add.length) {
-        data = compare ? merge$4(compare, data, add.sort(compare)) : data.concat(add);
+        data = compare ? merge$3(compare, data, add.sort(compare)) : data.concat(add);
         add = [];
       }
       return data;
@@ -9038,7 +9038,7 @@ function Field$1(params) {
 }
 inherits(Field$1, Operator);
 function update$3(_) {
-  return this.value && !_.modified() ? this.value : isArray(_.name) ? array$6(_.name).map(f => field$1(f)) : field$1(_.name, _.as);
+  return this.value && !_.modified() ? this.value : isArray(_.name) ? array$5(_.name).map(f => field$1(f)) : field$1(_.name, _.as);
 }
 
 /**
@@ -9723,7 +9723,7 @@ inherits(Load$1, Transform, {
     } else if (_.async) {
       // return promise for non-blocking async loading
       const p = df.request(_.url, _.format).then(res => {
-        this._pending = array$6(res.data);
+        this._pending = array$5(res.data);
         return df => df.touch(this);
       });
       return {
@@ -9731,7 +9731,7 @@ inherits(Load$1, Transform, {
       };
     } else {
       // return promise for synchronous loading
-      return df.request(_.url, _.format).then(res => output(this, pulse, array$6(res.data)));
+      return df.request(_.url, _.format).then(res => output(this, pulse, array$5(res.data)));
     }
   }
 });
@@ -10201,7 +10201,7 @@ inherits(Quantile$1, Transform, {
       names = (_.groupby || []).map(accessorName),
       values = [],
       step = _.step || 0.01,
-      p = _.probs || range$6(step / 2, 1 - EPSILON$2, step),
+      p = _.probs || range$5(step / 2, 1 - EPSILON$2, step),
       n = p.length;
     groups.forEach(g => {
       const q = quantiles(g, p);
@@ -10407,7 +10407,7 @@ inherits(Sequence, Transform, {
     const out = pulse.materialize().fork(pulse.MOD),
       as = _.as || 'data';
     out.rem = this.value ? pulse.rem.concat(this.value) : pulse.rem;
-    this.value = range$6(_.start, _.stop, _.step || 1).map(v => {
+    this.value = range$5(_.start, _.stop, _.step || 1).map(v => {
       const t = {};
       t[as] = v;
       return ingest$1(t);
@@ -10747,11 +10747,11 @@ function find$2(field, data, index) {
 const ValidWindowOps = Object.keys(WindowOps);
 
 function WindowState(_) {
-  const ops = array$6(_.ops),
-    fields = array$6(_.fields),
-    params = array$6(_.params),
-    aggregate_params = array$6(_.aggregate_params),
-    as = array$6(_.as),
+  const ops = array$5(_.ops),
+    fields = array$5(_.fields),
+    params = array$5(_.params),
+    aggregate_params = array$5(_.aggregate_params),
+    as = array$5(_.as),
     outputs = this.outputs = [],
     windows = this.windows = [],
     inputs = {},
@@ -10760,7 +10760,7 @@ function WindowState(_) {
     measures = [];
   let countOnly = true;
   function visitInputs(f) {
-    array$6(accessorFields(f)).forEach(_ => inputs[_] = 1);
+    array$5(accessorFields(f)).forEach(_ => inputs[_] = 1);
   }
   visitInputs(_.sort);
   ops.forEach((op, i) => {
@@ -11293,7 +11293,7 @@ function arcPadAngle(d) {
   return d && d.padAngle; // Note: optional!
 }
 
-function intersect$4(x0, y0, x1, y1, x2, y2, x3, y3) {
+function intersect$3(x0, y0, x1, y1, x2, y2, x3, y3) {
   var x10 = x1 - x0, y10 = y1 - y0,
       x32 = x3 - x2, y32 = y3 - y2,
       t = y32 * x10 - x32 * y10;
@@ -11427,7 +11427,7 @@ function arc$2$1() {
         // intersection fails, it’s probably because the arc is too small, so
         // disable the corner radius entirely.
         if (da < pi$3) {
-          if (oc = intersect$4(x01, y01, x00, y00, x11, y11, x10, y10)) {
+          if (oc = intersect$3(x01, y01, x00, y00, x11, y11, x10, y10)) {
             var ax = x01 - oc[0],
                 ay = y01 - oc[1],
                 bx = x11 - oc[0],
@@ -11538,7 +11538,7 @@ function arc$2$1() {
   return arc;
 }
 
-function array$5(x) {
+function array$4(x) {
   return typeof x === "object" && "length" in x
     ? x // Array, TypedArray, NodeList, array-like
     : Array.from(x); // Map, Set, iterable, string, or anything else
@@ -11596,7 +11596,7 @@ function line$2$1(x, y) {
 
   function line(data) {
     var i,
-        n = (data = array$5(data)).length,
+        n = (data = array$4(data)).length,
         d,
         defined0 = false,
         buffer;
@@ -11653,7 +11653,7 @@ function area$2$1(x0, y0, y1) {
     var i,
         j,
         k,
-        n = (data = array$5(data)).length,
+        n = (data = array$4(data)).length,
         d,
         defined0 = false,
         buffer,
@@ -13403,7 +13403,7 @@ function isNumberArray(x) {
   return ArrayBuffer.isView(x) && !(x instanceof DataView);
 }
 
-function array$4(a, b) {
+function array$3(a, b) {
   return (isNumberArray(b) ? numberArray : genericArray)(a, b);
 }
 
@@ -13830,7 +13830,7 @@ function quantize$2(interpolator, n) {
 const $$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   interpolate: interpolate$1$1,
-  interpolateArray: array$4,
+  interpolateArray: array$3,
   interpolateBasis: basis$1,
   interpolateBasisClosed: basisClosed,
   interpolateDate: date$1,
@@ -13918,7 +13918,7 @@ function polymap(domain, range, interpolate) {
   };
 }
 
-function copy$3(source, target) {
+function copy$2(source, target) {
   return target
       .domain(source.domain())
       .range(source.range())
@@ -14287,7 +14287,7 @@ function formatLocale$1(locale) {
 }
 
 var locale$1;
-var format$3;
+var format$2;
 var formatPrefix;
 
 defaultLocale$1({
@@ -14300,7 +14300,7 @@ defaultLocale$1({
 
 function defaultLocale$1(definition) {
   locale$1 = formatLocale$1(definition);
-  format$3 = locale$1.format;
+  format$2 = locale$1.format;
   formatPrefix = locale$1.formatPrefix;
   return locale$1;
 }
@@ -14342,7 +14342,7 @@ function tickFormat$1(start, stop, count, specifier) {
       break;
     }
   }
-  return format$3(specifier);
+  return format$2(specifier);
 }
 
 function linearish(scale) {
@@ -14403,7 +14403,7 @@ function linear() {
   var scale = continuous$1();
 
   scale.copy = function() {
-    return copy$3(scale, linear());
+    return copy$2(scale, linear());
   };
 
   initRange.apply(scale, arguments);
@@ -14563,7 +14563,7 @@ function loggish(transform) {
     if (specifier == null) specifier = base === 10 ? "s" : ",";
     if (typeof specifier !== "function") {
       if (!(base % 1) && (specifier = formatSpecifier(specifier)).precision == null) specifier.trim = true;
-      specifier = format$3(specifier);
+      specifier = format$2(specifier);
     }
     if (count === Infinity) return specifier;
     const k = Math.max(1, base * count / scale.ticks().length); // TODO fast estimate?
@@ -14584,9 +14584,9 @@ function loggish(transform) {
   return scale;
 }
 
-function log$3() {
+function log$2() {
   const scale = loggish(transformer$3()).domain([1, 10]);
-  scale.copy = () => copy$3(scale, log$3()).base(scale.base());
+  scale.copy = () => copy$2(scale, log$2()).base(scale.base());
   initRange.apply(scale, arguments);
   return scale;
 }
@@ -14617,7 +14617,7 @@ function symlog() {
   var scale = symlogish(transformer$3());
 
   scale.copy = function() {
-    return copy$3(scale, symlog()).constant(scale.constant());
+    return copy$2(scale, symlog()).constant(scale.constant());
   };
 
   return initRange.apply(scale, arguments);
@@ -14658,7 +14658,7 @@ function pow$2() {
   var scale = powish(transformer$3());
 
   scale.copy = function() {
-    return copy$3(scale, pow$2()).exponent(scale.exponent());
+    return copy$2(scale, pow$2()).exponent(scale.exponent());
   };
 
   initRange.apply(scale, arguments);
@@ -15830,8 +15830,8 @@ function formatUnixTimestampSeconds(d) {
 }
 
 var locale;
-var timeFormat$3;
-var utcFormat$2;
+var timeFormat$2;
+var utcFormat$1;
 
 defaultLocale({
   dateTime: "%x, %X",
@@ -15846,8 +15846,8 @@ defaultLocale({
 
 function defaultLocale(definition) {
   locale = formatLocale(definition);
-  timeFormat$3 = locale.format;
-  utcFormat$2 = locale.utcFormat;
+  timeFormat$2 = locale.format;
+  utcFormat$1 = locale.utcFormat;
   return locale;
 }
 
@@ -15907,18 +15907,18 @@ function calendar(ticks, tickInterval, year, month, week, day, hour, minute, sec
   };
 
   scale.copy = function() {
-    return copy$3(scale, calendar(ticks, tickInterval, year, month, week, day, hour, minute, second, format));
+    return copy$2(scale, calendar(ticks, tickInterval, year, month, week, day, hour, minute, second, format));
   };
 
   return scale;
 }
 
-function time$2() {
-  return initRange.apply(calendar(timeTicks, timeTickInterval, timeYear, timeMonth, timeSunday, timeDay, timeHour, timeMinute, second, timeFormat$3).domain([new Date(2000, 0, 1), new Date(2000, 0, 2)]), arguments);
+function time$1() {
+  return initRange.apply(calendar(timeTicks, timeTickInterval, timeYear, timeMonth, timeSunday, timeDay, timeHour, timeMinute, second, timeFormat$2).domain([new Date(2000, 0, 1), new Date(2000, 0, 2)]), arguments);
 }
 
 function utcTime() {
-  return initRange.apply(calendar(utcTicks, utcTickInterval, utcYear, utcMonth, utcSunday, utcDay, utcHour, utcMinute, second, utcFormat$2).domain([Date.UTC(2000, 0, 1), Date.UTC(2000, 0, 2)]), arguments);
+  return initRange.apply(calendar(utcTicks, utcTickInterval, utcYear, utcMonth, utcSunday, utcDay, utcHour, utcMinute, second, utcFormat$1).domain([Date.UTC(2000, 0, 1), Date.UTC(2000, 0, 2)]), arguments);
 }
 
 function transformer$2() {
@@ -15969,7 +15969,7 @@ function transformer$2() {
   };
 }
 
-function copy$2(source, target) {
+function copy$1(source, target) {
   return target
       .domain(source.domain())
       .interpolator(source.interpolator())
@@ -15981,7 +15981,7 @@ function sequential() {
   var scale = linearish(transformer$2()(identity$3));
 
   scale.copy = function() {
-    return copy$2(scale, sequential());
+    return copy$1(scale, sequential());
   };
 
   return initInterpolator.apply(scale, arguments);
@@ -15991,7 +15991,7 @@ function sequentialLog() {
   var scale = loggish(transformer$2()).domain([1, 10]);
 
   scale.copy = function() {
-    return copy$2(scale, sequentialLog()).base(scale.base());
+    return copy$1(scale, sequentialLog()).base(scale.base());
   };
 
   return initInterpolator.apply(scale, arguments);
@@ -16001,7 +16001,7 @@ function sequentialSymlog() {
   var scale = symlogish(transformer$2());
 
   scale.copy = function() {
-    return copy$2(scale, sequentialSymlog()).constant(scale.constant());
+    return copy$1(scale, sequentialSymlog()).constant(scale.constant());
   };
 
   return initInterpolator.apply(scale, arguments);
@@ -16011,7 +16011,7 @@ function sequentialPow() {
   var scale = powish(transformer$2());
 
   scale.copy = function() {
-    return copy$2(scale, sequentialPow()).exponent(scale.exponent());
+    return copy$1(scale, sequentialPow()).exponent(scale.exponent());
   };
 
   return initInterpolator.apply(scale, arguments);
@@ -16077,7 +16077,7 @@ function diverging() {
   var scale = linearish(transformer$1()(identity$3));
 
   scale.copy = function() {
-    return copy$2(scale, diverging());
+    return copy$1(scale, diverging());
   };
 
   return initInterpolator.apply(scale, arguments);
@@ -16087,7 +16087,7 @@ function divergingLog() {
   var scale = loggish(transformer$1()).domain([0.1, 1, 10]);
 
   scale.copy = function() {
-    return copy$2(scale, divergingLog()).base(scale.base());
+    return copy$1(scale, divergingLog()).base(scale.base());
   };
 
   return initInterpolator.apply(scale, arguments);
@@ -16097,7 +16097,7 @@ function divergingSymlog() {
   var scale = symlogish(transformer$1());
 
   scale.copy = function() {
-    return copy$2(scale, divergingSymlog()).constant(scale.constant());
+    return copy$1(scale, divergingSymlog()).constant(scale.constant());
   };
 
   return initInterpolator.apply(scale, arguments);
@@ -16107,7 +16107,7 @@ function divergingPow() {
   var scale = powish(transformer$1());
 
   scale.copy = function() {
-    return copy$2(scale, divergingPow()).exponent(scale.exponent());
+    return copy$1(scale, divergingPow()).exponent(scale.exponent());
   };
 
   return initInterpolator.apply(scale, arguments);
@@ -16243,7 +16243,7 @@ function band() {
       start = Math.round(start);
       bandwidth = Math.round(bandwidth);
     }
-    const values = range$6(n).map(i => start + step * i);
+    const values = range$5(n).map(i => start + step * i);
     return ordinalRange(reverse ? values.reverse() : values);
   }
   scale.domain = function (_) {
@@ -16378,7 +16378,7 @@ function numbers(_) {
   return map.call(_, toNumber);
 }
 
-const slice$3 = Array.prototype.slice;
+const slice$2 = Array.prototype.slice;
 
 function scaleBinOrdinal() {
   let domain = [],
@@ -16396,7 +16396,7 @@ function scaleBinOrdinal() {
   };
   scale.range = function (_) {
     if (arguments.length) {
-      range = slice$3.call(_);
+      range = slice$2.call(_);
       return scale;
     } else {
       return range.slice();
@@ -16438,7 +16438,7 @@ function create$2(type, constructor, metadata) {
     s.type = type;
     return registerScale(s);
   };
-  ctr.metadata = toSet(array$6(metadata));
+  ctr.metadata = toSet(array$5(metadata));
   return ctr;
 }
 
@@ -16458,7 +16458,7 @@ function create$2(type, constructor, metadata) {
  * - `"log"` - the scale performs a logarithmic transform of the continuous domain.
  * - `"temporal"` - the scale domain is defined over date-time values.
  */
-function scale$5(type, scale, metadata) {
+function scale$4(type, scale, metadata) {
   if (arguments.length > 1) {
     scales.set(type, create$2(type, scale, metadata));
     return this;
@@ -16468,42 +16468,42 @@ function scale$5(type, scale, metadata) {
 }
 
 // identity scale
-scale$5(Identity, identity$1);
+scale$4(Identity, identity$1);
 
 // continuous scales
-scale$5(Linear, linear, Continuous);
-scale$5(Log, log$3, [Continuous, Log]);
-scale$5(Pow, pow$2, Continuous);
-scale$5(Sqrt, sqrt$2, Continuous);
-scale$5(Symlog, symlog, Continuous);
-scale$5(Time, time$2, [Continuous, Temporal]);
-scale$5(UTC, utcTime, [Continuous, Temporal]);
+scale$4(Linear, linear, Continuous);
+scale$4(Log, log$2, [Continuous, Log]);
+scale$4(Pow, pow$2, Continuous);
+scale$4(Sqrt, sqrt$2, Continuous);
+scale$4(Symlog, symlog, Continuous);
+scale$4(Time, time$1, [Continuous, Temporal]);
+scale$4(UTC, utcTime, [Continuous, Temporal]);
 
 // sequential scales
-scale$5(Sequential, sequential, [Continuous, Interpolating]); // backwards compat
-scale$5(`${Sequential}-${Linear}`, sequential, [Continuous, Interpolating]);
-scale$5(`${Sequential}-${Log}`, sequentialLog, [Continuous, Interpolating, Log]);
-scale$5(`${Sequential}-${Pow}`, sequentialPow, [Continuous, Interpolating]);
-scale$5(`${Sequential}-${Sqrt}`, sequentialSqrt, [Continuous, Interpolating]);
-scale$5(`${Sequential}-${Symlog}`, sequentialSymlog, [Continuous, Interpolating]);
+scale$4(Sequential, sequential, [Continuous, Interpolating]); // backwards compat
+scale$4(`${Sequential}-${Linear}`, sequential, [Continuous, Interpolating]);
+scale$4(`${Sequential}-${Log}`, sequentialLog, [Continuous, Interpolating, Log]);
+scale$4(`${Sequential}-${Pow}`, sequentialPow, [Continuous, Interpolating]);
+scale$4(`${Sequential}-${Sqrt}`, sequentialSqrt, [Continuous, Interpolating]);
+scale$4(`${Sequential}-${Symlog}`, sequentialSymlog, [Continuous, Interpolating]);
 
 // diverging scales
-scale$5(`${Diverging}-${Linear}`, diverging, [Continuous, Interpolating]);
-scale$5(`${Diverging}-${Log}`, divergingLog, [Continuous, Interpolating, Log]);
-scale$5(`${Diverging}-${Pow}`, divergingPow, [Continuous, Interpolating]);
-scale$5(`${Diverging}-${Sqrt}`, divergingSqrt, [Continuous, Interpolating]);
-scale$5(`${Diverging}-${Symlog}`, divergingSymlog, [Continuous, Interpolating]);
+scale$4(`${Diverging}-${Linear}`, diverging, [Continuous, Interpolating]);
+scale$4(`${Diverging}-${Log}`, divergingLog, [Continuous, Interpolating, Log]);
+scale$4(`${Diverging}-${Pow}`, divergingPow, [Continuous, Interpolating]);
+scale$4(`${Diverging}-${Sqrt}`, divergingSqrt, [Continuous, Interpolating]);
+scale$4(`${Diverging}-${Symlog}`, divergingSymlog, [Continuous, Interpolating]);
 
 // discretizing scales
-scale$5(Quantile, quantile, [Discretizing, Quantile]);
-scale$5(Quantize, quantize$1, Discretizing);
-scale$5(Threshold, threshold, Discretizing);
+scale$4(Quantile, quantile, [Discretizing, Quantile]);
+scale$4(Quantize, quantize$1, Discretizing);
+scale$4(Threshold, threshold, Discretizing);
 
 // discrete scales
-scale$5(BinOrdinal, scaleBinOrdinal, [Discrete$1, Discretizing]);
-scale$5(Ordinal, ordinal, Discrete$1);
-scale$5(Band, band, Discrete$1);
-scale$5(Point, point$3, Discrete$1);
+scale$4(BinOrdinal, scaleBinOrdinal, [Discrete$1, Discretizing]);
+scale$4(Ordinal, ordinal, Discrete$1);
+scale$4(Band, band, Discrete$1);
+scale$4(Point, point$3, Discrete$1);
 function isValidScaleType(type) {
   return scales.has(type);
 }
@@ -16558,7 +16558,7 @@ function scaleFraction(scale$1, min, max) {
   } else {
     i = (t = scale$1.type).indexOf('-');
     t = i < 0 ? t : t.slice(i + 1);
-    s = scale$5(t)().domain([min, max]).range([0, 1]);
+    s = scale$4(t)().domain([min, max]).range([0, 1]);
     scaleProps.forEach(m => scale$1[m] ? s[m](scale$1[m]()) : 0);
     return s;
   }
@@ -16873,7 +16873,7 @@ function labelFraction(scale) {
   return value => (value - lo) / span;
 }
 
-function format$2(locale, scale, specifier, formatType) {
+function format$1(locale, scale, specifier, formatType) {
   const type = formatType || scale.type;
 
   // replace abbreviated time specifiers to improve screen reader experience
@@ -16885,7 +16885,7 @@ function format$2(locale, scale, specifier, formatType) {
 function domainCaption(locale, scale, opt) {
   opt = opt || {};
   const max = Math.max(3, opt.maxlen || 7),
-    fmt = format$2(locale, scale, opt.format, opt.formatType);
+    fmt = format$1(locale, scale, opt.format, opt.formatType);
 
   // if scale breaks domain into bins, describe boundaries
   if (isDiscretizing$1(scale.type)) {
@@ -17131,11 +17131,11 @@ const HalfSqrt3 = Math.sqrt(3) / 2;
 
 var segmentCache = {};
 var bezierCache = {};
-var join$2 = [].join;
+var join$1 = [].join;
 
 // Copied from Inkscape svgtopdf, thanks!
 function segments(x, y, rx, ry, large, sweep, rotateX, ox, oy) {
-  const key = join$2.call(arguments);
+  const key = join$1.call(arguments);
   if (segmentCache[key]) {
     return segmentCache[key];
   }
@@ -17185,7 +17185,7 @@ function segments(x, y, rx, ry, large, sweep, rotateX, ox, oy) {
   return segmentCache[key] = result;
 }
 function bezier(params) {
-  const key = join$2.call(params);
+  const key = join$1.call(params);
   if (bezierCache[key]) {
     return bezierCache[key];
   }
@@ -18590,7 +18590,7 @@ function translate$2(x, y) {
 function rotate(a) {
   return 'rotate(' + a + ')';
 }
-function scale$4(scaleX, scaleY) {
+function scale$3(scaleX, scaleY) {
   return 'scale(' + scaleX + ',' + scaleY + ')';
 }
 function translateItem(item) {
@@ -18600,7 +18600,7 @@ function rotateItem(item) {
   return translate$2(item.x || 0, item.y || 0) + (item.angle ? ' ' + rotate(item.angle) : '');
 }
 function transformItem(item) {
-  return translate$2(item.x || 0, item.y || 0) + (item.angle ? ' ' + rotate(item.angle) : '') + (item.scaleX || item.scaleY ? ' ' + scale$4(item.scaleX || 1, item.scaleY || 1) : '');
+  return translate$2(item.x || 0, item.y || 0) + (item.angle ? ' ' + rotate(item.angle) : '') + (item.scaleX || item.scaleY ? ' ' + scale$3(item.scaleX || 1, item.scaleY || 1) : '');
 }
 
 function markItemPath (type, shape, isect) {
@@ -20507,7 +20507,7 @@ function ariaGuide(mark, opt) {
   }
 }
 function titleCaption(item) {
-  return array$6(item.text).join(' ');
+  return array$5(item.text).join(' ');
 }
 function axisCaption(item) {
   const datum = item.datum,
@@ -20533,7 +20533,7 @@ function legendCaption(item) {
 }
 function extractTitle(item) {
   try {
-    return array$6(peek$1(item.items).items[0].text).join(' ');
+    return array$5(peek$1(item.items).items[0].text).join(' ');
   } catch (err) {
     return null;
   }
@@ -21766,7 +21766,7 @@ function renderModule(name, _) {
   }
 }
 
-function intersect$3(scene, bounds, filter) {
+function intersect$2(scene, bounds, filter) {
   const hits = [],
     // intersection results
     box = new Bounds().union(bounds),
@@ -22091,16 +22091,16 @@ const methods = {
   parity: items => items.filter((item, i) => i % 2 ? item.opacity = 0 : 1),
   greedy: (items, sep) => {
     let a;
-    return items.filter((b, i) => !i || !intersect$2(a.bounds, b.bounds, sep) ? (a = b, 1) : b.opacity = 0);
+    return items.filter((b, i) => !i || !intersect$1(a.bounds, b.bounds, sep) ? (a = b, 1) : b.opacity = 0);
   }
 };
 
 // compute bounding box intersection
 // including padding pixels of separation
-const intersect$2 = (a, b, sep) => sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2);
+const intersect$1 = (a, b, sep) => sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2);
 const hasOverlap = (items, pad) => {
   for (var i = 1, n = items.length, a = items[0].bounds, b; i < n; a = b, ++i) {
-    if (intersect$2(a, b = items[i].bounds, pad)) return true;
+    if (intersect$1(a, b = items[i].bounds, pad)) return true;
   }
 };
 const hasBounds = item => {
@@ -23688,7 +23688,7 @@ inherits(Pie, Transform, {
       n = values.length,
       a = start,
       k = (stop - start) / sum$1(values),
-      index = range$6(n),
+      index = range$5(n),
       i,
       t,
       v;
@@ -23731,7 +23731,7 @@ inherits(Scale$1, Transform, {
       scale$1 = this.value,
       key = scaleKey(_);
     if (!scale$1 || key !== scale$1.type) {
-      this.value = scale$1 = scale$5(key)();
+      this.value = scale$1 = scale$4(key)();
     }
     for (key in _) if (!SKIP$1[key]) {
       // padding is a scale property for band/point but not others
@@ -23851,7 +23851,7 @@ function configureBins(scale, _, count) {
     if (!step) error$1('Scale bins parameter missing step property.');
     if (start < lo) start = step * Math.ceil(lo / step);
     if (stop > hi) stop = step * Math.floor(hi / step);
-    bins = range$6(start, stop + step / 2, step);
+    bins = range$5(start, stop + step / 2, step);
   }
   if (bins) {
     // assign bin boundaries to scale instance
@@ -24121,7 +24121,7 @@ function partition$3(data, groupby, sort, field) {
   return groups;
 }
 
-const encode$2 = /*#__PURE__*/Object.freeze({
+const encode$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   axisticks: AxisTicks$1,
   datajoin: DataJoin$1,
@@ -24151,7 +24151,7 @@ var cos$1 = Math.cos;
 var ceil = Math.ceil;
 var exp = Math.exp;
 var hypot = Math.hypot;
-var log$2 = Math.log;
+var log$1 = Math.log;
 var pow$1 = Math.pow;
 var sin$1 = Math.sin;
 var sign = Math.sign || function(x) { return x > 0 ? 1 : x < 0 ? -1 : 0; };
@@ -24304,7 +24304,7 @@ function areaPoint$1(lambda, phi) {
   lambda0$1 = lambda, cosPhi0 = cosPhi, sinPhi0 = sinPhi;
 }
 
-function geoArea$1$1(object) {
+function geoArea$1(object) {
   areaSum$1 = new Adder();
   geoStream(object, areaStream$1);
   return areaSum$1 * 2;
@@ -24348,7 +24348,7 @@ var lambda0, phi0, lambda1, phi1, // bounds
     p0, // previous 3D point
     deltaSum,
     ranges,
-    range$5;
+    range$4;
 
 var boundsStream$2 = {
   point: boundsPoint$1,
@@ -24369,7 +24369,7 @@ var boundsStream$2 = {
     if (areaRingSum$1 < 0) lambda0 = -(lambda1 = 180), phi0 = -(phi1 = 90);
     else if (deltaSum > epsilon$3) phi1 = 90;
     else if (deltaSum < -epsilon$3) phi0 = -90;
-    range$5[0] = lambda0, range$5[1] = lambda1;
+    range$4[0] = lambda0, range$4[1] = lambda1;
   },
   sphere: function() {
     lambda0 = -(lambda1 = 180), phi0 = -(phi1 = 90);
@@ -24377,7 +24377,7 @@ var boundsStream$2 = {
 };
 
 function boundsPoint$1(lambda, phi) {
-  ranges.push(range$5 = [lambda0 = lambda, lambda1 = lambda]);
+  ranges.push(range$4 = [lambda0 = lambda, lambda1 = lambda]);
   if (phi < phi0) phi0 = phi;
   if (phi > phi1) phi1 = phi;
 }
@@ -24424,7 +24424,7 @@ function linePoint(lambda, phi) {
       }
     }
   } else {
-    ranges.push(range$5 = [lambda0 = lambda, lambda1 = lambda]);
+    ranges.push(range$4 = [lambda0 = lambda, lambda1 = lambda]);
   }
   if (phi < phi0) phi0 = phi;
   if (phi > phi1) phi1 = phi;
@@ -24436,7 +24436,7 @@ function boundsLineStart() {
 }
 
 function boundsLineEnd() {
-  range$5[0] = lambda0, range$5[1] = lambda1;
+  range$4[0] = lambda0, range$4[1] = lambda1;
   boundsStream$2.point = boundsPoint$1;
   p0 = null;
 }
@@ -24460,7 +24460,7 @@ function boundsRingEnd() {
   boundsRingPoint(lambda00$1, phi00$1);
   areaStream$1.lineEnd();
   if (abs$1(deltaSum) > epsilon$3) lambda0 = -(lambda1 = 180);
-  range$5[0] = lambda0, range$5[1] = lambda1;
+  range$4[0] = lambda0, range$4[1] = lambda1;
   p0 = null;
 }
 
@@ -24479,7 +24479,7 @@ function rangeContains(range, x) {
   return range[0] <= range[1] ? range[0] <= x && x <= range[1] : x < range[0] || range[1] < x;
 }
 
-function geoBounds$1$1(feature) {
+function geoBounds$1(feature) {
   var i, n, a, b, merged, deltaMax, delta;
 
   phi1 = lambda1 = -(lambda0 = phi0 = Infinity);
@@ -24509,7 +24509,7 @@ function geoBounds$1$1(feature) {
     }
   }
 
-  ranges = range$5 = null;
+  ranges = range$4 = null;
 
   return lambda0 === Infinity || phi0 === Infinity
       ? [[NaN, NaN], [NaN, NaN]]
@@ -24628,7 +24628,7 @@ function centroidRingPoint(lambda, phi) {
   centroidPointCartesian(x0$4, y0$4, z0);
 }
 
-function geoCentroid$1$1(object) {
+function geoCentroid$1(object) {
   W0 = W1 =
   X0$1 = Y0$1 = Z0$1 =
   X1$1 = Y1$1 = Z1$1 = 0;
@@ -24997,7 +24997,7 @@ function clip$1(pointVisible, clipLine, interpolate, start) {
         clip.point = point;
         clip.lineStart = lineStart;
         clip.lineEnd = lineEnd;
-        segments = merge$3(segments);
+        segments = merge$2(segments);
         var startInside = polygonContains(polygon, start);
         if (segments.length) {
           if (!polygonStarted) sink.polygonStart(), polygonStarted = true;
@@ -25509,7 +25509,7 @@ function clipRectangle(x0, y0, x1, y1) {
     function polygonEnd() {
       var startInside = polygonInside(),
           cleanInside = clean && startInside,
-          visible = (segments = merge$3(segments)).length;
+          visible = (segments = merge$2(segments)).length;
       if (cleanInside || visible) {
         stream.polygonStart();
         if (cleanInside) {
@@ -25584,12 +25584,12 @@ function clipRectangle(x0, y0, x1, y1) {
 }
 
 function graticuleX(y0, y1, dy) {
-  var y = range$6(y0, y1 - epsilon$3, dy).concat(y1);
+  var y = range$5(y0, y1 - epsilon$3, dy).concat(y1);
   return function(x) { return y.map(function(y) { return [x, y]; }); };
 }
 
 function graticuleY(x0, x1, dx) {
-  var x = range$6(x0, x1 - epsilon$3, dx).concat(x1);
+  var x = range$5(x0, x1 - epsilon$3, dx).concat(x1);
   return function(y) { return x.map(function(x) { return [x, y]; }); };
 }
 
@@ -25605,10 +25605,10 @@ function graticule() {
   }
 
   function lines() {
-    return range$6(ceil(X0 / DX) * DX, X1, DX).map(X)
-        .concat(range$6(ceil(Y0 / DY) * DY, Y1, DY).map(Y))
-        .concat(range$6(ceil(x0 / dx) * dx, x1, dx).filter(function(x) { return abs$1(x % DX) > epsilon$3; }).map(x))
-        .concat(range$6(ceil(y0 / dy) * dy, y1, dy).filter(function(y) { return abs$1(y % DY) > epsilon$3; }).map(y));
+    return range$5(ceil(X0 / DX) * DX, X1, DX).map(X)
+        .concat(range$5(ceil(Y0 / DY) * DY, Y1, DY).map(Y))
+        .concat(range$5(ceil(x0 / dx) * dx, x1, dx).filter(function(x) { return abs$1(x % DX) > epsilon$3; }).map(x))
+        .concat(range$5(ceil(y0 / dy) * dy, y1, dy).filter(function(y) { return abs$1(y % DY) > epsilon$3; }).map(y));
   }
 
   graticule.lines = function() {
@@ -26657,7 +26657,7 @@ function geoAzimuthalEquidistant() {
 }
 
 function mercatorRaw(lambda, phi) {
-  return [lambda, log$2(tan((halfPi$1 + phi) / 2))];
+  return [lambda, log$1(tan((halfPi$1 + phi) / 2))];
 }
 
 mercatorRaw.invert = function(x, y) {
@@ -26711,7 +26711,7 @@ function tany(y) {
 
 function conicConformalRaw(y0, y1) {
   var cy0 = cos$1(y0),
-      n = y0 === y1 ? sin$1(y0) : log$2(cy0 / cos$1(y1)) / log$2(tany(y1) / tany(y0)),
+      n = y0 === y1 ? sin$1(y0) : log$1(cy0 / cos$1(y1)) / log$1(tany(y1) / tany(y0)),
       f = cy0 * pow$1(tany(y0), n) / n;
 
   if (!n) return mercatorRaw;
@@ -26961,7 +26961,7 @@ function geoStereographic() {
 }
 
 function transverseMercatorRaw(lambda, phi) {
-  return [log$2(tan((halfPi$1 + phi) / 2)), -lambda];
+  return [log$1(tan((halfPi$1 + phi) / 2)), -lambda];
 }
 
 transverseMercatorRaw.invert = function(x, y) {
@@ -27311,7 +27311,7 @@ function quantize (k, nice, zero) {
       stop = ex[1],
       span = stop - start,
       step = nice ? tickStep(start, stop, k) : span / (k + 1);
-    return range$6(start + step, stop, step);
+    return range$5(start + step, stop, step);
   };
 }
 
@@ -27563,7 +27563,7 @@ function density2D () {
   };
   density.bandwidth = function (_) {
     if (!arguments.length) return bandwidth;
-    _ = array$6(_);
+    _ = array$5(_);
     if (_.length === 1) _ = [+_[0], +_[0]];
     if (_.length !== 2) error$1('invalid bandwidth');
     return bandwidth = _, density;
@@ -28193,7 +28193,7 @@ inherits(Graticule, Transform, {
     }
     t = gen();
     if (src.length) {
-      pulse.mod.push(replace$2(src[0], t));
+      pulse.mod.push(replace$1(src[0], t));
     } else {
       pulse.add.push(ingest$1(t));
     }
@@ -28390,14 +28390,14 @@ function set$2(proj, key, value) {
   if (isFunction(proj[key])) proj[key](value);
 }
 function collectGeoJSON(data) {
-  data = array$6(data);
+  data = array$5(data);
   return data.length === 1 ? data[0] : {
     type: FeatureCollection,
     features: data.reduce((a, f) => a.concat(featurize(f)), [])
   };
 }
 function featurize(f) {
-  return f.type === FeatureCollection ? f.features : array$6(f).filter(d => d != null).map(d => d.type === Feature ? d : {
+  return f.type === FeatureCollection ? f.features : array$5(f).filter(d => d != null).map(d => d.type === Feature ? d : {
     type: Feature,
     geometry: d
   });
@@ -29892,7 +29892,7 @@ function simulation(nodes, _) {
   return setup(sim, _, true).on('end', () => stopped = true);
 }
 function setup(sim, _, init, pulse) {
-  var f = array$6(_.forces),
+  var f = array$5(_.forces),
     i,
     n,
     p,
@@ -30286,7 +30286,7 @@ function lcg() {
   return () => (s = (a * s + c) % m) / m;
 }
 
-function array$3(x) {
+function array$2(x) {
   return typeof x === "object" && "length" in x
     ? x // Array, TypedArray, NodeList, array-like
     : Array.from(x); // Map, Set, iterable, string, or anything else
@@ -30469,7 +30469,7 @@ function Node(circle) {
 }
 
 function packSiblingsRandom(circles, random) {
-  if (!(n = (circles = array$3(circles)).length)) return 0;
+  if (!(n = (circles = array$2(circles)).length)) return 0;
 
   var a, b, c, n, aa, ca, i, j, k, sj, sk;
 
@@ -31374,7 +31374,7 @@ inherits(Nest, Transform, {
 
       // generate new tree structure
       this.value = tree = hierarchy({
-        values: array$6(_.keys).reduce((n, k) => {
+        values: array$5(_.keys).reduce((n, k) => {
           n.key(k);
           return n;
         }, nest()).entries(out.source)
@@ -32734,7 +32734,7 @@ inherits(Label$1, Transform, {
     const as = _.as || Output$1;
 
     // run label layout
-    labelLayout(pulse.materialize(pulse.SOURCE).source || [], _.size, _.sort, array$6(_.offset == null ? 1 : _.offset), array$6(_.anchor || Anchors), _.avoidMarks || [], _.avoidBaseMark !== false, _.lineAnchor || 'end', _.markIndex || 0, _.padding === undefined ? 0 : _.padding, _.method || 'naive').forEach(l => {
+    labelLayout(pulse.materialize(pulse.SOURCE).source || [], _.size, _.sort, array$5(_.offset == null ? 1 : _.offset), array$5(_.anchor || Anchors), _.avoidMarks || [], _.avoidBaseMark !== false, _.lineAnchor || 'end', _.markIndex || 0, _.padding === undefined ? 0 : _.padding, _.method || 'naive').forEach(l => {
       // write layout results to data stream
       const t = l.datum;
       t[as[0]] = l.x;
@@ -32853,7 +32853,7 @@ inherits(Loess, Transform, {
 const Methods = {
   constant: constant$4,
   linear: linear$2,
-  log: log$4,
+  log: log$3,
   exp: exp$1,
   pow: pow$3,
   quad: quad,
@@ -34939,7 +34939,7 @@ inherits(Wordcloud, Transform, {
     // create font size scaling function as needed
     if (range) {
       const fsize = fontSize,
-        sizeScale = scale$5('sqrt')().domain(extent(data, fsize)).range(range);
+        sizeScale = scale$4('sqrt')().domain(extent(data, fsize)).range(range);
       fontSize = x => sizeScale(fsize(x));
     }
     data.forEach(t => {
@@ -34985,8 +34985,8 @@ function Bitmaps() {
   let width = 8,
     data = [],
     seen = array32(0),
-    curr = array$2(0, width),
-    prev = array$2(0, width);
+    curr = array$1(0, width),
+    prev = array$1(0, width);
   return {
     data: () => data,
     seen: () => seen = lengthen(seen, data.length),
@@ -35042,8 +35042,8 @@ function Bitmaps() {
       const k = curr.length;
       if (n > k || m > width) {
         width = Math.max(m, width);
-        curr = array$2(n, width, curr);
-        prev = array$2(n, width);
+        curr = array$1(n, width, curr);
+        prev = array$1(n, width);
       }
     }
   };
@@ -35054,7 +35054,7 @@ function lengthen(array, length, copy) {
   copy.set(array);
   return copy;
 }
-function array$2(n, m, array) {
+function array$1(n, m, array) {
   const copy = (m < 0x101 ? array8 : m < 0x10001 ? array16 : array32)(n);
   if (array) copy.set(array);
   return copy;
@@ -35110,7 +35110,7 @@ function SortedIndex() {
       oldi = index;
       value = Array(n0 + n1);
       index = array32(n0 + n1);
-      merge$2(base, oldv, oldi, n0, addv, addi, n1, value, index);
+      merge$1(base, oldv, oldi, n0, addv, addi, n1, value, index);
     } else {
       if (base > 0) for (i = 0; i < n1; ++i) {
         addi[i] += base;
@@ -35174,7 +35174,7 @@ function sort$1(values, index) {
   });
   return permute(values, index);
 }
-function merge$2(base, value0, index0, n0, value1, index1, n1, value, index) {
+function merge$1(base, value0, index0, n0, value1, index1, n1, value, index) {
   let i0 = 0,
     i1 = 0,
     i;
@@ -37438,7 +37438,7 @@ function selectionResolve(name, op, isMulti, vl5) {
         resUnit = res[unit] || (res[unit] = []);
         types[field.field] = type = field.type.charAt(0);
         union = ops[`${type}_union`];
-        res[unit] = union(resUnit, array$6(values[j]));
+        res[unit] = union(resUnit, array$5(values[j]));
       }
 
       // If the same multi-selection is repeated over views and projected over
@@ -37449,7 +37449,7 @@ function selectionResolve(name, op, isMulti, vl5) {
       // a more human-friendly one.
       if (isMulti) {
         resUnit = multiRes[unit] || (multiRes[unit] = []);
-        resUnit.push(array$6(values).reduce((obj, curr, j) => (obj[fields[j].field] = curr, obj), {}));
+        resUnit.push(array$5(values).reduce((obj, curr, j) => (obj[fields[j].field] = curr, obj), {}));
       }
     } else {
       // Short circuit extensional selectionId stores which hold sorted IDs unique to each unit.
@@ -37532,15 +37532,15 @@ var ops = {
   }
 };
 
-const DataPrefix$2 = ':',
-  IndexPrefix$2 = '@';
+const DataPrefix$1 = ':',
+  IndexPrefix$1 = '@';
 function selectionVisitor(name, args, scope, params) {
   if (args[0].type !== Literal) error$1('First argument to selection functions must be a string literal.');
   const data = args[0].value,
     op = args.length >= 2 && peek$1(args).value,
     field = 'unit',
-    indexName = IndexPrefix$2 + field,
-    dataName = DataPrefix$2 + data;
+    indexName = IndexPrefix$1 + field,
+    dataName = DataPrefix$1 + data;
 
   // eslint-disable-next-line no-prototype-builtins
   if (op === Intersect && !has$1(params, indexName)) {
@@ -37553,16 +37553,16 @@ function selectionVisitor(name, args, scope, params) {
   }
 }
 
-function data$2(name) {
+function data$1(name) {
   const data = this.context.data[name];
   return data ? data.values.value : [];
 }
-function indata$1(name, field, value) {
+function indata(name, field, value) {
   const index = this.context.data[name]['index:' + field],
     entry = index ? index.value.get(value) : undefined;
   return entry ? entry.count : entry;
 }
-function setdata$1(name, tuples) {
+function setdata(name, tuples) {
   const df = this.context.dataflow,
     data = this.context.data[name],
     input = data.input;
@@ -37570,7 +37570,7 @@ function setdata$1(name, tuples) {
   return 1;
 }
 
-function encode$1 (item, name, retval) {
+function encode (item, name, retval) {
   if (item) {
     const df = this.context.dataflow,
       target = item.mark.source;
@@ -37579,47 +37579,47 @@ function encode$1 (item, name, retval) {
   return retval !== undefined ? retval : item;
 }
 
-const wrap$1 = method => function (value, spec) {
+const wrap = method => function (value, spec) {
   const locale = this.context.dataflow.locale();
   return value === null ? 'null' : locale[method](spec)(value);
 };
-const format$1 = wrap$1('format');
-const timeFormat$2 = wrap$1('timeFormat');
-const utcFormat$1 = wrap$1('utcFormat');
-const timeParse$1 = wrap$1('timeParse');
-const utcParse$1 = wrap$1('utcParse');
-const dateObj$1 = new Date(2000, 0, 1);
-function time$1(month, day, specifier) {
+const format = wrap('format');
+const timeFormat$1 = wrap('timeFormat');
+const utcFormat = wrap('utcFormat');
+const timeParse = wrap('timeParse');
+const utcParse = wrap('utcParse');
+const dateObj = new Date(2000, 0, 1);
+function time(month, day, specifier) {
   if (!Number.isInteger(month) || !Number.isInteger(day)) return '';
-  dateObj$1.setYear(2000);
-  dateObj$1.setMonth(month);
-  dateObj$1.setDate(day);
-  return timeFormat$2.call(this, dateObj$1, specifier);
+  dateObj.setYear(2000);
+  dateObj.setMonth(month);
+  dateObj.setDate(day);
+  return timeFormat$1.call(this, dateObj, specifier);
 }
-function monthFormat$1(month) {
-  return time$1.call(this, month, 1, '%B');
+function monthFormat(month) {
+  return time.call(this, month, 1, '%B');
 }
-function monthAbbrevFormat$1(month) {
-  return time$1.call(this, month, 1, '%b');
+function monthAbbrevFormat(month) {
+  return time.call(this, month, 1, '%b');
 }
-function dayFormat$1(day) {
-  return time$1.call(this, 0, 2 + day, '%A');
+function dayFormat(day) {
+  return time.call(this, 0, 2 + day, '%A');
 }
-function dayAbbrevFormat$1(day) {
-  return time$1.call(this, 0, 2 + day, '%a');
+function dayAbbrevFormat(day) {
+  return time.call(this, 0, 2 + day, '%a');
 }
 
-const DataPrefix$1 = ':';
-const IndexPrefix$1 = '@';
-const ScalePrefix$1 = '%';
-const SignalPrefix$1 = '$';
+const DataPrefix = ':';
+const IndexPrefix = '@';
+const ScalePrefix = '%';
+const SignalPrefix = '$';
 
-function dataVisitor$1(name, args, scope, params) {
+function dataVisitor(name, args, scope, params) {
   if (args[0].type !== Literal) {
     error$1('First argument to data functions must be a string literal.');
   }
   const data = args[0].value,
-    dataName = DataPrefix$1 + data;
+    dataName = DataPrefix + data;
   if (!has$1(dataName, params)) {
     try {
       params[dataName] = scope.getData(data).tuplesRef();
@@ -37628,29 +37628,29 @@ function dataVisitor$1(name, args, scope, params) {
     }
   }
 }
-function indataVisitor$1(name, args, scope, params) {
+function indataVisitor(name, args, scope, params) {
   if (args[0].type !== Literal) error$1('First argument to indata must be a string literal.');
   if (args[1].type !== Literal) error$1('Second argument to indata must be a string literal.');
   const data = args[0].value,
     field = args[1].value,
-    indexName = IndexPrefix$1 + field;
+    indexName = IndexPrefix + field;
   if (!has$1(indexName, params)) {
     params[indexName] = scope.getData(data).indataRef(scope, field);
   }
 }
-function scaleVisitor$1(name, args, scope, params) {
+function scaleVisitor(name, args, scope, params) {
   if (args[0].type === Literal) {
     // add scale dependency
-    addScaleDependency$1(scope, params, args[0].value);
+    addScaleDependency(scope, params, args[0].value);
   } else {
     // indirect scale lookup; add all scales as parameters
     for (name in scope.scales) {
-      addScaleDependency$1(scope, params, name);
+      addScaleDependency(scope, params, name);
     }
   }
 }
-function addScaleDependency$1(scope, params, name) {
-  const scaleName = ScalePrefix$1 + name;
+function addScaleDependency(scope, params, name) {
+  const scaleName = ScalePrefix + name;
   if (!has$1(params, scaleName)) {
     try {
       params[scaleName] = scope.scaleRef(name);
@@ -37660,27 +37660,27 @@ function addScaleDependency$1(scope, params, name) {
   }
 }
 
-function getScale$1(nameOrFunction, ctx) {
-  if (isFunction(nameOrFunction)) {
-    return nameOrFunction;
-  }
-  if (isString(nameOrFunction)) {
-    const maybeScale = ctx.scales[nameOrFunction];
+/**
+ * Name must be a string. Return undefined if the scale is not registered.
+ */
+function getScale(name, ctx) {
+  if (isString(name)) {
+    const maybeScale = ctx.scales[name];
     return maybeScale && isRegisteredScale(maybeScale.value) ? maybeScale.value : undefined;
   }
   return undefined;
 }
-function internalScaleFunctions$1(codegen, fnctx, visitors) {
+function internalScaleFunctions(codegen, fnctx, visitors) {
   // add helper method to the 'this' expression function context
   fnctx.__bandwidth = s => s && s.bandwidth ? s.bandwidth() : 0;
 
   // register AST visitors for internal scale functions
-  visitors._bandwidth = scaleVisitor$1;
-  visitors._range = scaleVisitor$1;
-  visitors._scale = scaleVisitor$1;
+  visitors._bandwidth = scaleVisitor;
+  visitors._range = scaleVisitor;
+  visitors._scale = scaleVisitor;
 
   // resolve scale reference directly to the signal hash argument
-  const ref = arg => '_[' + (arg.type === Literal ? $(ScalePrefix$1 + arg.value) : $(ScalePrefix$1) + '+' + codegen(arg)) + ']';
+  const ref = arg => '_[' + (arg.type === Literal ? $(ScalePrefix + arg.value) : $(ScalePrefix) + '+' + codegen(arg)) + ']';
 
   // define and return internal scale function code generators
   // these internal functions are called by mark encoders
@@ -37691,11 +37691,11 @@ function internalScaleFunctions$1(codegen, fnctx, visitors) {
   };
 }
 
-function geoMethod$1(methodName, globalMethod) {
+function geoMethod(methodName, globalMethod) {
   return function (projection, geojson, group) {
     if (projection) {
       // projection defined, use it
-      const p = getScale$1(projection, (group || this).context);
+      const p = getScale(projection, (group || this).context);
       return p && p.path[methodName](geojson);
     } else {
       // projection undefined, use global method
@@ -37703,15 +37703,15 @@ function geoMethod$1(methodName, globalMethod) {
     }
   };
 }
-const geoArea$1 = geoMethod$1('area', geoArea$1$1);
-const geoBounds$1 = geoMethod$1('bounds', geoBounds$1$1);
-const geoCentroid$1 = geoMethod$1('centroid', geoCentroid$1$1);
-function geoScale$1(projection, group) {
-  const p = getScale$1(projection, (group || this).context);
+const geoArea = geoMethod('area', geoArea$1);
+const geoBounds = geoMethod('bounds', geoBounds$1);
+const geoCentroid = geoMethod('centroid', geoCentroid$1);
+function geoScale(projection, group) {
+  const p = getScale(projection, (group || this).context);
   return p && p.scale();
 }
 
-function inScope$1 (item) {
+function inScope (item) {
   const group = this.context.group;
   let value = false;
   if (group) while (item) {
@@ -37724,7 +37724,7 @@ function inScope$1 (item) {
   return value;
 }
 
-function log$1(df, method, args) {
+function log(df, method, args) {
   try {
     df[method].apply(df, ['EXPRESSION'].concat([].slice.call(args)));
   } catch (err) {
@@ -37732,66 +37732,66 @@ function log$1(df, method, args) {
   }
   return args[args.length - 1];
 }
-function warn$2() {
-  return log$1(this.context.dataflow, 'warn', arguments);
+function warn$1() {
+  return log(this.context.dataflow, 'warn', arguments);
 }
-function info$1() {
-  return log$1(this.context.dataflow, 'info', arguments);
+function info() {
+  return log(this.context.dataflow, 'info', arguments);
 }
-function debug$2() {
-  return log$1(this.context.dataflow, 'debug', arguments);
+function debug$1() {
+  return log(this.context.dataflow, 'debug', arguments);
 }
 
 // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
-function channel_luminance_value$1(channelValue) {
+function channel_luminance_value(channelValue) {
   const val = channelValue / 255;
   if (val <= 0.03928) {
     return val / 12.92;
   }
   return Math.pow((val + 0.055) / 1.055, 2.4);
 }
-function luminance$1(color) {
+function luminance(color) {
   const c = rgb$1(color),
-    r = channel_luminance_value$1(c.r),
-    g = channel_luminance_value$1(c.g),
-    b = channel_luminance_value$1(c.b);
+    r = channel_luminance_value(c.r),
+    g = channel_luminance_value(c.g),
+    b = channel_luminance_value(c.b);
   return 0.2126 * r + 0.7152 * g + 0.0722 * b;
 }
 
 // https://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
-function contrast$1(color1, color2) {
-  const lum1 = luminance$1(color1),
-    lum2 = luminance$1(color2),
+function contrast(color1, color2) {
+  const lum1 = luminance(color1),
+    lum2 = luminance(color2),
     lumL = Math.max(lum1, lum2),
     lumD = Math.min(lum1, lum2);
   return (lumL + 0.05) / (lumD + 0.05);
 }
 
-function merge$1 () {
+function merge () {
   const args = [].slice.call(arguments);
   args.unshift({});
   return extend$1(...args);
 }
 
-function equal$1(a, b) {
-  return a === b || a !== a && b !== b ? true : isArray(a) ? isArray(b) && a.length === b.length ? equalArray$1(a, b) : false : isObject(a) && isObject(b) ? equalObject$1(a, b) : false;
+function equal(a, b) {
+  return a === b || a !== a && b !== b ? true : isArray(a) ? isArray(b) && a.length === b.length ? equalArray(a, b) : false : isObject(a) && isObject(b) ? equalObject(a, b) : false;
 }
-function equalArray$1(a, b) {
+function equalArray(a, b) {
   for (let i = 0, n = a.length; i < n; ++i) {
-    if (!equal$1(a[i], b[i])) return false;
+    if (!equal(a[i], b[i])) return false;
   }
   return true;
 }
-function equalObject$1(a, b) {
+function equalObject(a, b) {
   for (const key in a) {
-    if (!equal$1(a[key], b[key])) return false;
+    if (!equal(a[key], b[key])) return false;
   }
   return true;
 }
-function removePredicate$1(props) {
-  return _ => equalObject$1(props, _);
+function removePredicate(props) {
+  return _ => equalObject(props, _);
 }
-function modify$1 (name, insert, remove, toggle, modify, values) {
+function modify (name, insert, remove, toggle, modify, values) {
   const df = this.context.dataflow,
     data = this.context.data[name],
     input = data.input,
@@ -37812,14 +37812,14 @@ function modify$1 (name, insert, remove, toggle, modify, values) {
     }, true, 1);
   }
   if (remove) {
-    predicate = remove === true ? truthy : isArray(remove) || isTuple(remove) ? remove : removePredicate$1(remove);
+    predicate = remove === true ? truthy : isArray(remove) || isTuple(remove) ? remove : removePredicate(remove);
     changes.remove(predicate);
   }
   if (insert) {
     changes.insert(insert);
   }
   if (toggle) {
-    predicate = removePredicate$1(toggle);
+    predicate = removePredicate(toggle);
     if (input.value.some(predicate)) {
       changes.remove(predicate);
     } else {
@@ -37834,92 +37834,99 @@ function modify$1 (name, insert, remove, toggle, modify, values) {
   return 1;
 }
 
-function pinchDistance$1(event) {
+function pinchDistance(event) {
   const t = event.touches,
     dx = t[0].clientX - t[1].clientX,
     dy = t[0].clientY - t[1].clientY;
   return Math.hypot(dx, dy);
 }
-function pinchAngle$1(event) {
+function pinchAngle(event) {
   const t = event.touches;
   return Math.atan2(t[0].clientY - t[1].clientY, t[0].clientX - t[1].clientX);
 }
 
 // memoize accessor functions
-const accessors$1 = {};
-function pluck$1 (data, name) {
-  const accessor = accessors$1[name] || (accessors$1[name] = field$1(name));
+const accessors = {};
+function pluck (data, name) {
+  const accessor = accessors[name] || (accessors[name] = field$1(name));
   return isArray(data) ? data.map(accessor) : accessor(data);
 }
 
-function array$1(seq) {
+function array(seq) {
   return isArray(seq) || ArrayBuffer.isView(seq) ? seq : null;
 }
-function sequence$1(seq) {
-  return array$1(seq) || (isString(seq) ? seq : null);
+function sequence(seq) {
+  return array(seq) || (isString(seq) ? seq : null);
 }
-function join$1(seq) {
+function join(seq) {
   for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     args[_key - 1] = arguments[_key];
   }
-  return array$1(seq).join(...args);
+  return array(seq).join(...args);
 }
-function indexof$1(seq) {
+function indexof(seq) {
   for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
     args[_key2 - 1] = arguments[_key2];
   }
-  return sequence$1(seq).indexOf(...args);
+  return sequence(seq).indexOf(...args);
 }
-function lastindexof$1(seq) {
+function lastindexof(seq) {
   for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
     args[_key3 - 1] = arguments[_key3];
   }
-  return sequence$1(seq).lastIndexOf(...args);
+  return sequence(seq).lastIndexOf(...args);
 }
-function slice$2(seq) {
+function slice$1(seq) {
   for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
     args[_key4 - 1] = arguments[_key4];
   }
-  return sequence$1(seq).slice(...args);
+  return sequence(seq).slice(...args);
 }
-function replace$1(str, pattern, repl) {
+function replace(str, pattern, repl) {
   if (isFunction(repl)) error$1('Function argument passed to replace.');
   return String(str).replace(pattern, repl);
 }
-function reverse$2(seq) {
-  return array$1(seq).slice().reverse();
+function reverse$1(seq) {
+  return array(seq).slice().reverse();
+}
+function sort(seq) {
+  return array(seq).slice().sort(ascending$2);
 }
 
-function bandspace$1(count, paddingInner, paddingOuter) {
+function bandspace(count, paddingInner, paddingOuter) {
   return bandSpace(count || 0, paddingInner || 0, paddingOuter || 0);
 }
-function bandwidth$1(name, group) {
-  const s = getScale$1(name, (group || this).context);
+function bandwidth(name, group) {
+  const s = getScale(name, (group || this).context);
   return s && s.bandwidth ? s.bandwidth() : 0;
 }
-function copy$1(name, group) {
-  const s = getScale$1(name, (group || this).context);
+function copy(name, group) {
+  const s = getScale(name, (group || this).context);
   return s ? s.copy() : undefined;
 }
-function domain$3(name, group) {
-  const s = getScale$1(name, (group || this).context);
+function domain$2(name, group) {
+  const s = getScale(name, (group || this).context);
   return s ? s.domain() : [];
 }
-function invert$1(name, range, group) {
-  const s = getScale$1(name, (group || this).context);
+function invert(name, range, group) {
+  const s = getScale(name, (group || this).context);
   return !s ? undefined : isArray(range) ? (s.invertRange || s.invert)(range) : (s.invert || s.invertExtent)(range);
 }
-function range$4(name, group) {
-  const s = getScale$1(name, (group || this).context);
+function range$3(name, group) {
+  const s = getScale(name, (group || this).context);
   return s && s.range ? s.range() : [];
 }
-function scale$3(name, value, group) {
-  const s = getScale$1(name, (group || this).context);
+function scale$2(name, value, group) {
+  const s = getScale(name, (group || this).context);
   return s ? s(value) : undefined;
 }
 
-function scaleGradient$1 (scale, p0, p1, count, group) {
-  scale = getScale$1(scale, (group || this).context);
+/**
+ * Passing a function is only used for for testing.
+ * Outside of tests, the first argument should be a string.
+ */
+function scaleGradient (scaleOrFunction, p0, p1, count, group) {
+  let scale = typeof scaleOrFunction === 'string' ? getScale(scaleOrFunction, (group || this).context) : scaleOrFunction;
   const gradient = Gradient$1(p0, p1);
   let stops = scale.domain(),
     min = stops[0],
@@ -37927,7 +37934,7 @@ function scaleGradient$1 (scale, p0, p1, count, group) {
     fraction = identity$7;
   if (!(max - min)) {
     // expand scale if domain has zero span, fix #1479
-    scale = (scale.interpolator ? scale$5('sequential')().interpolator(scale.interpolator()) : scale$5('linear')().interpolate(scale.interpolate()).range(scale.range())).domain([min = 0, max = 1]);
+    scale = (scale.interpolator ? scale$4('sequential')().interpolator(scale.interpolator()) : scale$4('linear')().interpolate(scale.interpolate()).range(scale.range())).domain([min = 0, max = 1]);
   } else {
     fraction = scaleFraction(scale, min, max);
   }
@@ -37940,62 +37947,62 @@ function scaleGradient$1 (scale, p0, p1, count, group) {
   return gradient;
 }
 
-function geoShape$1(projection, geojson, group) {
-  const p = getScale$1(projection, (group || this).context);
+function geoShape(projection, geojson, group) {
+  const p = getScale(projection, (group || this).context);
   return function (context) {
     return p ? p.path.context(context)(geojson) : '';
   };
 }
-function pathShape$1(path) {
+function pathShape(path) {
   let p = null;
   return function (context) {
     return context ? pathRender(context, p = p || parse$3(path)) : path;
   };
 }
 
-const datum$1 = d => d.data;
-function treeNodes$1(name, context) {
-  const tree = data$2.call(context, name);
+const datum = d => d.data;
+function treeNodes(name, context) {
+  const tree = data$1.call(context, name);
   return tree.root && tree.root.lookup || {};
 }
-function treePath$1(name, source, target) {
-  const nodes = treeNodes$1(name, this),
+function treePath(name, source, target) {
+  const nodes = treeNodes(name, this),
     s = nodes[source],
     t = nodes[target];
-  return s && t ? s.path(t).map(datum$1) : undefined;
+  return s && t ? s.path(t).map(datum) : undefined;
 }
-function treeAncestors$1(name, node) {
-  const n = treeNodes$1(name, this)[node];
-  return n ? n.ancestors().map(datum$1) : undefined;
+function treeAncestors(name, node) {
+  const n = treeNodes(name, this)[node];
+  return n ? n.ancestors().map(datum) : undefined;
 }
 
-const _window$1 = () => typeof window !== 'undefined' && window || null;
-function screen$1() {
-  const w = _window$1();
+const _window = () => typeof window !== 'undefined' && window || null;
+function screen() {
+  const w = _window();
   return w ? w.screen : {};
 }
-function windowSize$1() {
-  const w = _window$1();
+function windowSize() {
+  const w = _window();
   return w ? [w.innerWidth, w.innerHeight] : [undefined, undefined];
 }
-function containerSize$1() {
+function containerSize() {
   const view = this.context.dataflow,
     el = view.container && view.container();
   return el ? [el.clientWidth, el.clientHeight] : [undefined, undefined];
 }
 
-function intersect$1 (b, opt, group) {
+function intersect (b, opt, group) {
   if (!b) return [];
   const [u, v] = b,
     box = new Bounds().set(u[0], u[1], v[0], v[1]),
     scene = group || this.context.dataflow.scenegraph().root;
-  return intersect$3(scene, box, filter$1(opt));
+  return intersect$2(scene, box, filter(opt));
 }
-function filter$1(opt) {
+function filter(opt) {
   let p = null;
   if (opt) {
-    const types = array$6(opt.marktype),
-      names = array$6(opt.markname);
+    const types = array$5(opt.marktype),
+      names = array$5(opt.markname);
     p = _ => (!types.length || types.some(t => _.marktype === t)) && (!names.length || names.some(s => _.name === s));
   }
   return p;
@@ -38010,9 +38017,9 @@ function filter$1(opt) {
  * @param {*} minDist the minimum distance, in pixels, that thenew point needs to be apart from the last point
  * @returns a new array containing the lasso with the new point
  */
-function lassoAppend$1(lasso, x, y) {
+function lassoAppend(lasso, x, y) {
   let minDist = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 5;
-  lasso = array$6(lasso);
+  lasso = array$5(lasso);
   const last = lasso[lasso.length - 1];
 
   // Add point to lasso if its the first point or distance to last point exceed minDist
@@ -38025,8 +38032,8 @@ function lassoAppend$1(lasso, x, y) {
  * @param {*} lasso the lasso in pixel space in the form [[x,y], [x,y], ...]
  * @returns the svg path command that draws the lasso
  */
-function lassoPath$1(lasso) {
-  return array$6(lasso).reduce((svg, _ref, i) => {
+function lassoPath(lasso) {
+  return array$5(lasso).reduce((svg, _ref, i) => {
     let [x, y] = _ref;
     return svg += i == 0 ? `M ${x},${y} ` : i === lasso.length - 1 ? ' Z' : `L ${x},${y} `;
   }, '');
@@ -38041,7 +38048,7 @@ function lassoPath$1(lasso) {
  *
  * @returns an array of vega scenegraph tuples
  */
-function intersectLasso$1(markname, pixelLasso, unit) {
+function intersectLasso(markname, pixelLasso, unit) {
   const {
     x,
     y,
@@ -38059,10 +38066,10 @@ function intersectLasso$1(markname, pixelLasso, unit) {
 
   // Translate bb against unit coordinates
   bb.translate(x, y);
-  const intersection = intersect$1([[bb.x1, bb.y1], [bb.x2, bb.y2]], markname, mark);
+  const intersection = intersect([[bb.x1, bb.y1], [bb.x2, bb.y2]], markname, mark);
 
   // Check every point against the lasso
-  return intersection.filter(tuple => pointInPolygon$1(tuple.x, tuple.y, pixelLasso));
+  return intersection.filter(tuple => pointInPolygon(tuple.x, tuple.y, pixelLasso));
 }
 
 /**
@@ -38075,7 +38082,7 @@ function intersectLasso$1(markname, pixelLasso, unit) {
  * @param {*} polygon a polygon in the form [[x,y], [x,y], ...]
  * @returns true if the point lies inside the polygon, false otherwise
  */
-function pointInPolygon$1(testx, testy, polygon) {
+function pointInPolygon(testx, testy, polygon) {
   let intersections = 0;
   for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
     const [prevX, prevY] = polygon[j];
@@ -38092,7 +38099,7 @@ function pointInPolygon$1(testx, testy, polygon) {
 }
 
 // Expression function context object
-const functionContext$1 = {
+const functionContext = {
   random() {
     return random();
   },
@@ -38130,18 +38137,19 @@ const functionContext$1 = {
   // suppress extra arguments
   toNumber,
   toString,
-  indexof: indexof$1,
-  join: join$1,
-  lastindexof: lastindexof$1,
-  replace: replace$1,
-  reverse: reverse$2,
-  slice: slice$2,
+  indexof,
+  join,
+  lastindexof,
+  replace,
+  reverse: reverse$1,
+  sort,
+  slice: slice$1,
   flush,
   lerp,
-  merge: merge$1,
+  merge,
   pad: pad$3,
   peek: peek$1,
-  pluck: pluck$1,
+  pluck,
   span,
   inrange,
   truncate: truncate$1,
@@ -38149,47 +38157,47 @@ const functionContext$1 = {
   lab: lab$1,
   hcl: hcl$2,
   hsl: hsl$2,
-  luminance: luminance$1,
-  contrast: contrast$1,
-  sequence: range$6,
-  format: format$1,
-  utcFormat: utcFormat$1,
-  utcParse: utcParse$1,
+  luminance,
+  contrast,
+  sequence: range$5,
+  format,
+  utcFormat,
+  utcParse,
   utcOffset,
   utcSequence,
-  timeFormat: timeFormat$2,
-  timeParse: timeParse$1,
+  timeFormat: timeFormat$1,
+  timeParse,
   timeOffset,
   timeSequence,
   timeUnitSpecifier,
-  monthFormat: monthFormat$1,
-  monthAbbrevFormat: monthAbbrevFormat$1,
-  dayFormat: dayFormat$1,
-  dayAbbrevFormat: dayAbbrevFormat$1,
+  monthFormat,
+  monthAbbrevFormat,
+  dayFormat,
+  dayAbbrevFormat,
   quarter,
   utcquarter,
   week,
   utcweek,
   dayofyear,
   utcdayofyear,
-  warn: warn$2,
-  info: info$1,
-  debug: debug$2,
+  warn: warn$1,
+  info,
+  debug: debug$1,
   extent(_) {
     return extent(_);
   },
   // suppress extra arguments
-  inScope: inScope$1,
-  intersect: intersect$1,
+  inScope,
+  intersect,
   clampRange,
-  pinchDistance: pinchDistance$1,
-  pinchAngle: pinchAngle$1,
-  screen: screen$1,
-  containerSize: containerSize$1,
-  windowSize: windowSize$1,
-  bandspace: bandspace$1,
-  setdata: setdata$1,
-  pathShape: pathShape$1,
+  pinchDistance,
+  pinchAngle,
+  screen,
+  containerSize,
+  windowSize,
+  bandspace,
+  setdata,
+  pathShape,
   panLinear,
   panLog,
   panPow,
@@ -38198,86 +38206,129 @@ const functionContext$1 = {
   zoomLog,
   zoomPow,
   zoomSymlog,
-  encode: encode$1,
-  modify: modify$1,
-  lassoAppend: lassoAppend$1,
-  lassoPath: lassoPath$1,
-  intersectLasso: intersectLasso$1
+  encode,
+  modify,
+  lassoAppend,
+  lassoPath,
+  intersectLasso
 };
-const eventFunctions$1 = ['view', 'item', 'group', 'xy', 'x', 'y'],
+const eventFunctions = ['view', 'item', 'group', 'xy', 'x', 'y'],
   // event functions
-  eventPrefix$1 = 'event.vega.',
+  eventPrefix = 'event.vega.',
   // event function prefix
-  thisPrefix$1 = 'this.',
+  thisPrefix = 'this.',
   // function context prefix
-  astVisitors$1 = {}; // AST visitors for dependency analysis
+  astVisitors = {}; // AST visitors for dependency analysis
 
 // export code generator parameters
-const codegenParams$1 = {
+const codegenParams = {
   forbidden: ['_'],
   allowed: ['datum', 'event', 'item'],
   fieldvar: 'datum',
-  globalvar: id => `_[${$(SignalPrefix$1 + id)}]`,
-  functions: buildFunctions$1,
+  globalvar: id => `_[${$(SignalPrefix + id)}]`,
+  functions: buildFunctions,
   constants: Constants$1,
-  visitors: astVisitors$1
+  visitors: astVisitors
 };
 
 // export code generator
-const codeGenerator$1 = codegen(codegenParams$1);
+const codeGenerator = codegen(codegenParams);
 
 // Build expression function registry
-function buildFunctions$1(codegen) {
+function buildFunctions(codegen) {
   const fn = Functions$1(codegen);
-  eventFunctions$1.forEach(name => fn[name] = eventPrefix$1 + name);
-  for (const name in functionContext$1) {
-    fn[name] = thisPrefix$1 + name;
+  eventFunctions.forEach(name => fn[name] = eventPrefix + name);
+  for (const name in functionContext) {
+    fn[name] = thisPrefix + name;
   }
-  extend$1(fn, internalScaleFunctions$1(codegen, functionContext$1, astVisitors$1));
+  extend$1(fn, internalScaleFunctions(codegen, functionContext, astVisitors));
   return fn;
 }
 
 // Register an expression function
-function expressionFunction$1(name, fn, visitor) {
+function expressionFunction(name, fn, visitor) {
   if (arguments.length === 1) {
-    return functionContext$1[name];
+    return functionContext[name];
   }
 
   // register with the functionContext
-  functionContext$1[name] = fn;
+  functionContext[name] = fn;
 
   // if there is an astVisitor register that, too
-  if (visitor) astVisitors$1[name] = visitor;
+  if (visitor) astVisitors[name] = visitor;
 
   // if the code generator has already been initialized,
   // we need to also register the function with it
-  if (codeGenerator$1) codeGenerator$1.functions[name] = thisPrefix$1 + name;
+  if (codeGenerator) codeGenerator.functions[name] = thisPrefix + name;
   return this;
 }
 
 // register expression functions with ast visitors
-expressionFunction$1('bandwidth', bandwidth$1, scaleVisitor$1);
-expressionFunction$1('copy', copy$1, scaleVisitor$1);
-expressionFunction$1('domain', domain$3, scaleVisitor$1);
-expressionFunction$1('range', range$4, scaleVisitor$1);
-expressionFunction$1('invert', invert$1, scaleVisitor$1);
-expressionFunction$1('scale', scale$3, scaleVisitor$1);
-expressionFunction$1('gradient', scaleGradient$1, scaleVisitor$1);
-expressionFunction$1('geoArea', geoArea$1, scaleVisitor$1);
-expressionFunction$1('geoBounds', geoBounds$1, scaleVisitor$1);
-expressionFunction$1('geoCentroid', geoCentroid$1, scaleVisitor$1);
-expressionFunction$1('geoShape', geoShape$1, scaleVisitor$1);
-expressionFunction$1('geoScale', geoScale$1, scaleVisitor$1);
-expressionFunction$1('indata', indata$1, indataVisitor$1);
-expressionFunction$1('data', data$2, dataVisitor$1);
-expressionFunction$1('treePath', treePath$1, dataVisitor$1);
-expressionFunction$1('treeAncestors', treeAncestors$1, dataVisitor$1);
+expressionFunction('bandwidth', bandwidth, scaleVisitor);
+expressionFunction('copy', copy, scaleVisitor);
+expressionFunction('domain', domain$2, scaleVisitor);
+expressionFunction('range', range$3, scaleVisitor);
+expressionFunction('invert', invert, scaleVisitor);
+expressionFunction('scale', scale$2, scaleVisitor);
+expressionFunction('gradient', scaleGradient, scaleVisitor);
+expressionFunction('geoArea', geoArea, scaleVisitor);
+expressionFunction('geoBounds', geoBounds, scaleVisitor);
+expressionFunction('geoCentroid', geoCentroid, scaleVisitor);
+expressionFunction('geoShape', geoShape, scaleVisitor);
+expressionFunction('geoScale', geoScale, scaleVisitor);
+expressionFunction('indata', indata, indataVisitor);
+expressionFunction('data', data$1, dataVisitor);
+expressionFunction('treePath', treePath, dataVisitor);
+expressionFunction('treeAncestors', treeAncestors, dataVisitor);
 
 // register Vega-Lite selection functions
-expressionFunction$1('vlSelectionTest', selectionTest, selectionVisitor);
-expressionFunction$1('vlSelectionIdTest', selectionIdTest, selectionVisitor);
-expressionFunction$1('vlSelectionResolve', selectionResolve, selectionVisitor);
-expressionFunction$1('vlSelectionTuples', selectionTuples);
+expressionFunction('vlSelectionTest', selectionTest, selectionVisitor);
+expressionFunction('vlSelectionIdTest', selectionIdTest, selectionVisitor);
+expressionFunction('vlSelectionResolve', selectionResolve, selectionVisitor);
+expressionFunction('vlSelectionTuples', selectionTuples);
+
+function parser (expr, scope) {
+  const params = {};
+
+  // parse the expression to an abstract syntax tree (ast)
+  let ast;
+  try {
+    expr = isString(expr) ? expr : $(expr) + '';
+    ast = parser$1(expr);
+  } catch (err) {
+    error$1('Expression parse error: ' + expr);
+  }
+
+  // analyze ast function calls for dependencies
+  ast.visit(node => {
+    if (node.type !== CallExpression) return;
+    const name = node.callee.name,
+      visit = codegenParams.visitors[name];
+    if (visit) visit(name, node.arguments, scope, params);
+  });
+
+  // perform code generation
+  const gen = codeGenerator(ast);
+
+  // collect signal dependencies
+  gen.globals.forEach(name => {
+    const signalName = SignalPrefix + name;
+    if (!has$1(params, signalName) && scope.getSignal(name)) {
+      params[signalName] = scope.signalRef(name);
+    }
+  });
+
+  // return generated expression code and dependencies
+  return {
+    $expr: extend$1({
+      code: gen.code
+    }, scope.options.ast ? {
+      ast
+    } : null),
+    $fields: gen.fields,
+    $params: params
+  };
+}
 
 /**
  * Parse a serialized dataflow specification.
@@ -38566,7 +38617,7 @@ function getCompare(_, ctx) {
   // As of Vega 5.5.3, $tupleid sort is no longer used.
   // Keep here for now for backwards compatibility.
   const k = 'c:' + _.$compare + '_' + _.$order,
-    c = array$6(_.$compare).map(_ => _ && _.$tupleid ? tupleid : _);
+    c = array$5(_.$compare).map(_ => _ && _.$tupleid ? tupleid : _);
   return ctx.fn[k] || (ctx.fn[k] = compare$2(c, _.$order, ctx.expr.codegen));
 }
 
@@ -38934,7 +38985,7 @@ function dataref(view, name) {
   }
   return data[name];
 }
-function data$1(name, values) {
+function data(name, values) {
   return arguments.length < 2 ? dataref(this, name).values.value : change.call(this, name, changeset().remove(truthy).insert(values));
 }
 function change(name, changes) {
@@ -39087,7 +39138,7 @@ function initializeEventConfig(config) {
 function trackEventListener(view, sources, type, handler) {
   view._eventListeners.push({
     type: type,
-    sources: array$6(sources),
+    sources: array$5(sources),
     handler: handler
   });
 }
@@ -39332,7 +39383,7 @@ function generate$1(bind, el, param, view) {
       input = radio;
       break;
     case 'range':
-      input = range$3;
+      input = range$2;
       break;
   }
   input(bind, wrapper, param, value);
@@ -39438,7 +39489,7 @@ function radio(bind, el, param, value) {
 /**
  * Generates a slider input element.
  */
-function range$3(bind, el, param, value) {
+function range$2(bind, el, param, value) {
   value = value !== undefined ? value : (+param.max + +param.min) / 2;
   const max = param.max != null ? param.max : Math.max(100, +value) || 100,
     min = param.min || Math.min(0, max, +value) || 0,
@@ -39635,10 +39686,10 @@ async function renderToSVG (scaleFactor) {
 }
 
 function runtime (view, spec, expr) {
-  return context(view, transforms, functionContext$1, expr).parse(spec);
+  return context(view, transforms, functionContext, expr).parse(spec);
 }
 
-function scale$2(name) {
+function scale$1(name) {
   var scales = this._runtime.scales;
   if (!has$1(scales, name)) {
     error$1('Unrecognized scale or projection: ' + name);
@@ -40136,12 +40187,12 @@ inherits(View$1, Dataflow, {
   finalize,
   hover,
   // -- DATA ----
-  data: data$1,
+  data,
   change,
   insert,
   remove,
   // -- SCALES --
-  scale: scale$2,
+  scale: scale$1,
   // -- INITIALIZATION ----
   initialize,
   // -- HEADLESS RENDERING ----
@@ -40155,783 +40206,6 @@ inherits(View$1, Dataflow, {
   _watchPixelRatio: watchPixelRatio
 });
 
-function data(name) {
-  const data = this.context.data[name];
-  return data ? data.values.value : [];
-}
-function indata(name, field, value) {
-  const index = this.context.data[name]['index:' + field],
-    entry = index ? index.value.get(value) : undefined;
-  return entry ? entry.count : entry;
-}
-function setdata(name, tuples) {
-  const df = this.context.dataflow,
-    data = this.context.data[name],
-    input = data.input;
-  df.pulse(input, df.changeset().remove(truthy).insert(tuples));
-  return 1;
-}
-
-function encode (item, name, retval) {
-  if (item) {
-    const df = this.context.dataflow,
-      target = item.mark.source;
-    df.pulse(target, df.changeset().encode(item, name));
-  }
-  return retval !== undefined ? retval : item;
-}
-
-const wrap = method => function (value, spec) {
-  const locale = this.context.dataflow.locale();
-  return value === null ? 'null' : locale[method](spec)(value);
-};
-const format = wrap('format');
-const timeFormat$1 = wrap('timeFormat');
-const utcFormat = wrap('utcFormat');
-const timeParse = wrap('timeParse');
-const utcParse = wrap('utcParse');
-const dateObj = new Date(2000, 0, 1);
-function time(month, day, specifier) {
-  if (!Number.isInteger(month) || !Number.isInteger(day)) return '';
-  dateObj.setYear(2000);
-  dateObj.setMonth(month);
-  dateObj.setDate(day);
-  return timeFormat$1.call(this, dateObj, specifier);
-}
-function monthFormat(month) {
-  return time.call(this, month, 1, '%B');
-}
-function monthAbbrevFormat(month) {
-  return time.call(this, month, 1, '%b');
-}
-function dayFormat(day) {
-  return time.call(this, 0, 2 + day, '%A');
-}
-function dayAbbrevFormat(day) {
-  return time.call(this, 0, 2 + day, '%a');
-}
-
-const DataPrefix = ':';
-const IndexPrefix = '@';
-const ScalePrefix = '%';
-const SignalPrefix = '$';
-
-function dataVisitor(name, args, scope, params) {
-  if (args[0].type !== Literal) {
-    error$1('First argument to data functions must be a string literal.');
-  }
-  const data = args[0].value,
-    dataName = DataPrefix + data;
-  if (!has$1(dataName, params)) {
-    try {
-      params[dataName] = scope.getData(data).tuplesRef();
-    } catch (err) {
-      // if data set does not exist, there's nothing to track
-    }
-  }
-}
-function indataVisitor(name, args, scope, params) {
-  if (args[0].type !== Literal) error$1('First argument to indata must be a string literal.');
-  if (args[1].type !== Literal) error$1('Second argument to indata must be a string literal.');
-  const data = args[0].value,
-    field = args[1].value,
-    indexName = IndexPrefix + field;
-  if (!has$1(indexName, params)) {
-    params[indexName] = scope.getData(data).indataRef(scope, field);
-  }
-}
-function scaleVisitor(name, args, scope, params) {
-  if (args[0].type === Literal) {
-    // add scale dependency
-    addScaleDependency(scope, params, args[0].value);
-  } else {
-    // indirect scale lookup; add all scales as parameters
-    for (name in scope.scales) {
-      addScaleDependency(scope, params, name);
-    }
-  }
-}
-function addScaleDependency(scope, params, name) {
-  const scaleName = ScalePrefix + name;
-  if (!has$1(params, scaleName)) {
-    try {
-      params[scaleName] = scope.scaleRef(name);
-    } catch (err) {
-      // TODO: error handling? warning?
-    }
-  }
-}
-
-/**
- * Name must be a string. Return undefined if the scale is not registered.
- */
-function getScale(name, ctx) {
-  if (isString(name)) {
-    const maybeScale = ctx.scales[name];
-    return maybeScale && isRegisteredScale(maybeScale.value) ? maybeScale.value : undefined;
-  }
-  return undefined;
-}
-function internalScaleFunctions(codegen, fnctx, visitors) {
-  // add helper method to the 'this' expression function context
-  fnctx.__bandwidth = s => s && s.bandwidth ? s.bandwidth() : 0;
-
-  // register AST visitors for internal scale functions
-  visitors._bandwidth = scaleVisitor;
-  visitors._range = scaleVisitor;
-  visitors._scale = scaleVisitor;
-
-  // resolve scale reference directly to the signal hash argument
-  const ref = arg => '_[' + (arg.type === Literal ? $(ScalePrefix + arg.value) : $(ScalePrefix) + '+' + codegen(arg)) + ']';
-
-  // define and return internal scale function code generators
-  // these internal functions are called by mark encoders
-  return {
-    _bandwidth: args => `this.__bandwidth(${ref(args[0])})`,
-    _range: args => `${ref(args[0])}.range()`,
-    _scale: args => `${ref(args[0])}(${codegen(args[1])})`
-  };
-}
-
-function geoMethod(methodName, globalMethod) {
-  return function (projection, geojson, group) {
-    if (projection) {
-      // projection defined, use it
-      const p = getScale(projection, (group || this).context);
-      return p && p.path[methodName](geojson);
-    } else {
-      // projection undefined, use global method
-      return globalMethod(geojson);
-    }
-  };
-}
-const geoArea = geoMethod('area', geoArea$1$1);
-const geoBounds = geoMethod('bounds', geoBounds$1$1);
-const geoCentroid = geoMethod('centroid', geoCentroid$1$1);
-function geoScale(projection, group) {
-  const p = getScale(projection, (group || this).context);
-  return p && p.scale();
-}
-
-function inScope (item) {
-  const group = this.context.group;
-  let value = false;
-  if (group) while (item) {
-    if (item === group) {
-      value = true;
-      break;
-    }
-    item = item.mark.group;
-  }
-  return value;
-}
-
-function log(df, method, args) {
-  try {
-    df[method].apply(df, ['EXPRESSION'].concat([].slice.call(args)));
-  } catch (err) {
-    df.warn(err);
-  }
-  return args[args.length - 1];
-}
-function warn$1() {
-  return log(this.context.dataflow, 'warn', arguments);
-}
-function info() {
-  return log(this.context.dataflow, 'info', arguments);
-}
-function debug$1() {
-  return log(this.context.dataflow, 'debug', arguments);
-}
-
-// https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
-function channel_luminance_value(channelValue) {
-  const val = channelValue / 255;
-  if (val <= 0.03928) {
-    return val / 12.92;
-  }
-  return Math.pow((val + 0.055) / 1.055, 2.4);
-}
-function luminance(color) {
-  const c = rgb$1(color),
-    r = channel_luminance_value(c.r),
-    g = channel_luminance_value(c.g),
-    b = channel_luminance_value(c.b);
-  return 0.2126 * r + 0.7152 * g + 0.0722 * b;
-}
-
-// https://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef
-function contrast(color1, color2) {
-  const lum1 = luminance(color1),
-    lum2 = luminance(color2),
-    lumL = Math.max(lum1, lum2),
-    lumD = Math.min(lum1, lum2);
-  return (lumL + 0.05) / (lumD + 0.05);
-}
-
-function merge () {
-  const args = [].slice.call(arguments);
-  args.unshift({});
-  return extend$1(...args);
-}
-
-function equal(a, b) {
-  return a === b || a !== a && b !== b ? true : isArray(a) ? isArray(b) && a.length === b.length ? equalArray(a, b) : false : isObject(a) && isObject(b) ? equalObject(a, b) : false;
-}
-function equalArray(a, b) {
-  for (let i = 0, n = a.length; i < n; ++i) {
-    if (!equal(a[i], b[i])) return false;
-  }
-  return true;
-}
-function equalObject(a, b) {
-  for (const key in a) {
-    if (!equal(a[key], b[key])) return false;
-  }
-  return true;
-}
-function removePredicate(props) {
-  return _ => equalObject(props, _);
-}
-function modify (name, insert, remove, toggle, modify, values) {
-  const df = this.context.dataflow,
-    data = this.context.data[name],
-    input = data.input,
-    stamp = df.stamp();
-  let changes = data.changes,
-    predicate,
-    key;
-  if (df._trigger === false || !(input.value.length || insert || toggle)) {
-    // nothing to do!
-    return 0;
-  }
-  if (!changes || changes.stamp < stamp) {
-    data.changes = changes = df.changeset();
-    changes.stamp = stamp;
-    df.runAfter(() => {
-      data.modified = true;
-      df.pulse(input, changes).run();
-    }, true, 1);
-  }
-  if (remove) {
-    predicate = remove === true ? truthy : isArray(remove) || isTuple(remove) ? remove : removePredicate(remove);
-    changes.remove(predicate);
-  }
-  if (insert) {
-    changes.insert(insert);
-  }
-  if (toggle) {
-    predicate = removePredicate(toggle);
-    if (input.value.some(predicate)) {
-      changes.remove(predicate);
-    } else {
-      changes.insert(toggle);
-    }
-  }
-  if (modify) {
-    for (key in values) {
-      changes.modify(modify, key, values[key]);
-    }
-  }
-  return 1;
-}
-
-function pinchDistance(event) {
-  const t = event.touches,
-    dx = t[0].clientX - t[1].clientX,
-    dy = t[0].clientY - t[1].clientY;
-  return Math.hypot(dx, dy);
-}
-function pinchAngle(event) {
-  const t = event.touches;
-  return Math.atan2(t[0].clientY - t[1].clientY, t[0].clientX - t[1].clientX);
-}
-
-// memoize accessor functions
-const accessors = {};
-function pluck (data, name) {
-  const accessor = accessors[name] || (accessors[name] = field$1(name));
-  return isArray(data) ? data.map(accessor) : accessor(data);
-}
-
-function array(seq) {
-  return isArray(seq) || ArrayBuffer.isView(seq) ? seq : null;
-}
-function sequence(seq) {
-  return array(seq) || (isString(seq) ? seq : null);
-}
-function join(seq) {
-  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    args[_key - 1] = arguments[_key];
-  }
-  return array(seq).join(...args);
-}
-function indexof(seq) {
-  for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-    args[_key2 - 1] = arguments[_key2];
-  }
-  return sequence(seq).indexOf(...args);
-}
-function lastindexof(seq) {
-  for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-    args[_key3 - 1] = arguments[_key3];
-  }
-  return sequence(seq).lastIndexOf(...args);
-}
-function slice$1(seq) {
-  for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-    args[_key4 - 1] = arguments[_key4];
-  }
-  return sequence(seq).slice(...args);
-}
-function replace(str, pattern, repl) {
-  if (isFunction(repl)) error$1('Function argument passed to replace.');
-  return String(str).replace(pattern, repl);
-}
-function reverse$1(seq) {
-  return array(seq).slice().reverse();
-}
-function sort(seq) {
-  return array(seq).slice().sort(ascending$2);
-}
-
-function bandspace(count, paddingInner, paddingOuter) {
-  return bandSpace(count || 0, paddingInner || 0, paddingOuter || 0);
-}
-function bandwidth(name, group) {
-  const s = getScale(name, (group || this).context);
-  return s && s.bandwidth ? s.bandwidth() : 0;
-}
-function copy(name, group) {
-  const s = getScale(name, (group || this).context);
-  return s ? s.copy() : undefined;
-}
-function domain$2(name, group) {
-  const s = getScale(name, (group || this).context);
-  return s ? s.domain() : [];
-}
-function invert(name, range, group) {
-  const s = getScale(name, (group || this).context);
-  return !s ? undefined : isArray(range) ? (s.invertRange || s.invert)(range) : (s.invert || s.invertExtent)(range);
-}
-function range$2(name, group) {
-  const s = getScale(name, (group || this).context);
-  return s && s.range ? s.range() : [];
-}
-function scale$1(name, value, group) {
-  const s = getScale(name, (group || this).context);
-  return s ? s(value) : undefined;
-}
-
-/**
- * Passing a function is only used for for testing.
- * Outside of tests, the first argument should be a string.
- */
-function scaleGradient (scaleOrFunction, p0, p1, count, group) {
-  let scale = typeof scaleOrFunction === 'string' ? getScale(scaleOrFunction, (group || this).context) : scaleOrFunction;
-  const gradient = Gradient$1(p0, p1);
-  let stops = scale.domain(),
-    min = stops[0],
-    max = peek$1(stops),
-    fraction = identity$7;
-  if (!(max - min)) {
-    // expand scale if domain has zero span, fix #1479
-    scale = (scale.interpolator ? scale$5('sequential')().interpolator(scale.interpolator()) : scale$5('linear')().interpolate(scale.interpolate()).range(scale.range())).domain([min = 0, max = 1]);
-  } else {
-    fraction = scaleFraction(scale, min, max);
-  }
-  if (scale.ticks) {
-    stops = scale.ticks(+count || 15);
-    if (min !== stops[0]) stops.unshift(min);
-    if (max !== peek$1(stops)) stops.push(max);
-  }
-  stops.forEach(_ => gradient.stop(fraction(_), scale(_)));
-  return gradient;
-}
-
-function geoShape(projection, geojson, group) {
-  const p = getScale(projection, (group || this).context);
-  return function (context) {
-    return p ? p.path.context(context)(geojson) : '';
-  };
-}
-function pathShape(path) {
-  let p = null;
-  return function (context) {
-    return context ? pathRender(context, p = p || parse$3(path)) : path;
-  };
-}
-
-const datum = d => d.data;
-function treeNodes(name, context) {
-  const tree = data.call(context, name);
-  return tree.root && tree.root.lookup || {};
-}
-function treePath(name, source, target) {
-  const nodes = treeNodes(name, this),
-    s = nodes[source],
-    t = nodes[target];
-  return s && t ? s.path(t).map(datum) : undefined;
-}
-function treeAncestors(name, node) {
-  const n = treeNodes(name, this)[node];
-  return n ? n.ancestors().map(datum) : undefined;
-}
-
-const _window = () => typeof window !== 'undefined' && window || null;
-function screen() {
-  const w = _window();
-  return w ? w.screen : {};
-}
-function windowSize() {
-  const w = _window();
-  return w ? [w.innerWidth, w.innerHeight] : [undefined, undefined];
-}
-function containerSize() {
-  const view = this.context.dataflow,
-    el = view.container && view.container();
-  return el ? [el.clientWidth, el.clientHeight] : [undefined, undefined];
-}
-
-function intersect (b, opt, group) {
-  if (!b) return [];
-  const [u, v] = b,
-    box = new Bounds().set(u[0], u[1], v[0], v[1]),
-    scene = group || this.context.dataflow.scenegraph().root;
-  return intersect$3(scene, box, filter(opt));
-}
-function filter(opt) {
-  let p = null;
-  if (opt) {
-    const types = array$6(opt.marktype),
-      names = array$6(opt.markname);
-    p = _ => (!types.length || types.some(t => _.marktype === t)) && (!names.length || names.some(s => _.name === s));
-  }
-  return p;
-}
-
-/**
- * Appends a new point to the lasso
- *
- * @param {*} lasso the lasso in pixel space
- * @param {*} x the x coordinate in pixel space
- * @param {*} y the y coordinate in pixel space
- * @param {*} minDist the minimum distance, in pixels, that thenew point needs to be apart from the last point
- * @returns a new array containing the lasso with the new point
- */
-function lassoAppend(lasso, x, y) {
-  let minDist = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 5;
-  lasso = array$6(lasso);
-  const last = lasso[lasso.length - 1];
-
-  // Add point to lasso if its the first point or distance to last point exceed minDist
-  return last === undefined || Math.hypot(last[0] - x, last[1] - y) > minDist ? [...lasso, [x, y]] : lasso;
-}
-
-/**
- * Generates a svg path command which draws a lasso
- *
- * @param {*} lasso the lasso in pixel space in the form [[x,y], [x,y], ...]
- * @returns the svg path command that draws the lasso
- */
-function lassoPath(lasso) {
-  return array$6(lasso).reduce((svg, _ref, i) => {
-    let [x, y] = _ref;
-    return svg += i == 0 ? `M ${x},${y} ` : i === lasso.length - 1 ? ' Z' : `L ${x},${y} `;
-  }, '');
-}
-
-/**
- * Inverts the lasso from pixel space to an array of vega scenegraph tuples
- *
- * @param {*} data the dataset
- * @param {*} pixelLasso the lasso in pixel space, [[x,y], [x,y], ...]
- * @param {*} unit the unit where the lasso is defined
- *
- * @returns an array of vega scenegraph tuples
- */
-function intersectLasso(markname, pixelLasso, unit) {
-  const {
-    x,
-    y,
-    mark
-  } = unit;
-  const bb = new Bounds().set(Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER, Number.MIN_SAFE_INTEGER, Number.MIN_SAFE_INTEGER);
-
-  // Get bounding box around lasso
-  for (const [px, py] of pixelLasso) {
-    if (px < bb.x1) bb.x1 = px;
-    if (px > bb.x2) bb.x2 = px;
-    if (py < bb.y1) bb.y1 = py;
-    if (py > bb.y2) bb.y2 = py;
-  }
-
-  // Translate bb against unit coordinates
-  bb.translate(x, y);
-  const intersection = intersect([[bb.x1, bb.y1], [bb.x2, bb.y2]], markname, mark);
-
-  // Check every point against the lasso
-  return intersection.filter(tuple => pointInPolygon(tuple.x, tuple.y, pixelLasso));
-}
-
-/**
- * Performs a test if a point is inside a polygon based on the idea from
- * https://wrf.ecse.rpi.edu/Research/Short_Notes/pnpoly.html
- *
- * This method will not need the same start/end point since it wraps around the edges of the array
- *
- * @param {*} test a point to test against
- * @param {*} polygon a polygon in the form [[x,y], [x,y], ...]
- * @returns true if the point lies inside the polygon, false otherwise
- */
-function pointInPolygon(testx, testy, polygon) {
-  let intersections = 0;
-  for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
-    const [prevX, prevY] = polygon[j];
-    const [x, y] = polygon[i];
-
-    // count intersections
-    if (y > testy != prevY > testy && testx < (prevX - x) * (testy - y) / (prevY - y) + x) {
-      intersections++;
-    }
-  }
-
-  // point is in polygon if intersection count is odd
-  return intersections & 1;
-}
-
-// Expression function context object
-const functionContext = {
-  random() {
-    return random();
-  },
-  // override default
-  cumulativeNormal,
-  cumulativeLogNormal,
-  cumulativeUniform,
-  densityNormal,
-  densityLogNormal,
-  densityUniform,
-  quantileNormal,
-  quantileLogNormal,
-  quantileUniform,
-  sampleNormal,
-  sampleLogNormal,
-  sampleUniform,
-  isArray,
-  isBoolean: isBoolean$2,
-  isDate: isDate$1,
-  isDefined(_) {
-    return _ !== undefined;
-  },
-  isNumber: isNumber$1,
-  isObject,
-  isRegExp,
-  isString,
-  isTuple,
-  isValid(_) {
-    return _ != null && _ === _;
-  },
-  toBoolean,
-  toDate(_) {
-    return toDate(_);
-  },
-  // suppress extra arguments
-  toNumber,
-  toString,
-  indexof,
-  join,
-  lastindexof,
-  replace,
-  reverse: reverse$1,
-  sort,
-  slice: slice$1,
-  flush,
-  lerp,
-  merge,
-  pad: pad$3,
-  peek: peek$1,
-  pluck,
-  span,
-  inrange,
-  truncate: truncate$1,
-  rgb: rgb$1,
-  lab: lab$1,
-  hcl: hcl$2,
-  hsl: hsl$2,
-  luminance,
-  contrast,
-  sequence: range$6,
-  format,
-  utcFormat,
-  utcParse,
-  utcOffset,
-  utcSequence,
-  timeFormat: timeFormat$1,
-  timeParse,
-  timeOffset,
-  timeSequence,
-  timeUnitSpecifier,
-  monthFormat,
-  monthAbbrevFormat,
-  dayFormat,
-  dayAbbrevFormat,
-  quarter,
-  utcquarter,
-  week,
-  utcweek,
-  dayofyear,
-  utcdayofyear,
-  warn: warn$1,
-  info,
-  debug: debug$1,
-  extent(_) {
-    return extent(_);
-  },
-  // suppress extra arguments
-  inScope,
-  intersect,
-  clampRange,
-  pinchDistance,
-  pinchAngle,
-  screen,
-  containerSize,
-  windowSize,
-  bandspace,
-  setdata,
-  pathShape,
-  panLinear,
-  panLog,
-  panPow,
-  panSymlog,
-  zoomLinear,
-  zoomLog,
-  zoomPow,
-  zoomSymlog,
-  encode,
-  modify,
-  lassoAppend,
-  lassoPath,
-  intersectLasso
-};
-const eventFunctions = ['view', 'item', 'group', 'xy', 'x', 'y'],
-  // event functions
-  eventPrefix = 'event.vega.',
-  // event function prefix
-  thisPrefix = 'this.',
-  // function context prefix
-  astVisitors = {}; // AST visitors for dependency analysis
-
-// export code generator parameters
-const codegenParams = {
-  forbidden: ['_'],
-  allowed: ['datum', 'event', 'item'],
-  fieldvar: 'datum',
-  globalvar: id => `_[${$(SignalPrefix + id)}]`,
-  functions: buildFunctions,
-  constants: Constants$1,
-  visitors: astVisitors
-};
-
-// export code generator
-const codeGenerator = codegen(codegenParams);
-
-// Build expression function registry
-function buildFunctions(codegen) {
-  const fn = Functions$1(codegen);
-  eventFunctions.forEach(name => fn[name] = eventPrefix + name);
-  for (const name in functionContext) {
-    fn[name] = thisPrefix + name;
-  }
-  extend$1(fn, internalScaleFunctions(codegen, functionContext, astVisitors));
-  return fn;
-}
-
-// Register an expression function
-function expressionFunction(name, fn, visitor) {
-  if (arguments.length === 1) {
-    return functionContext[name];
-  }
-
-  // register with the functionContext
-  functionContext[name] = fn;
-
-  // if there is an astVisitor register that, too
-  if (visitor) astVisitors[name] = visitor;
-
-  // if the code generator has already been initialized,
-  // we need to also register the function with it
-  if (codeGenerator) codeGenerator.functions[name] = thisPrefix + name;
-  return this;
-}
-
-// register expression functions with ast visitors
-expressionFunction('bandwidth', bandwidth, scaleVisitor);
-expressionFunction('copy', copy, scaleVisitor);
-expressionFunction('domain', domain$2, scaleVisitor);
-expressionFunction('range', range$2, scaleVisitor);
-expressionFunction('invert', invert, scaleVisitor);
-expressionFunction('scale', scale$1, scaleVisitor);
-expressionFunction('gradient', scaleGradient, scaleVisitor);
-expressionFunction('geoArea', geoArea, scaleVisitor);
-expressionFunction('geoBounds', geoBounds, scaleVisitor);
-expressionFunction('geoCentroid', geoCentroid, scaleVisitor);
-expressionFunction('geoShape', geoShape, scaleVisitor);
-expressionFunction('geoScale', geoScale, scaleVisitor);
-expressionFunction('indata', indata, indataVisitor);
-expressionFunction('data', data, dataVisitor);
-expressionFunction('treePath', treePath, dataVisitor);
-expressionFunction('treeAncestors', treeAncestors, dataVisitor);
-
-// register Vega-Lite selection functions
-expressionFunction('vlSelectionTest', selectionTest, selectionVisitor);
-expressionFunction('vlSelectionIdTest', selectionIdTest, selectionVisitor);
-expressionFunction('vlSelectionResolve', selectionResolve, selectionVisitor);
-expressionFunction('vlSelectionTuples', selectionTuples);
-
-function parser (expr, scope) {
-  const params = {};
-
-  // parse the expression to an abstract syntax tree (ast)
-  let ast;
-  try {
-    expr = isString(expr) ? expr : $(expr) + '';
-    ast = parser$1(expr);
-  } catch (err) {
-    error$1('Expression parse error: ' + expr);
-  }
-
-  // analyze ast function calls for dependencies
-  ast.visit(node => {
-    if (node.type !== CallExpression) return;
-    const name = node.callee.name,
-      visit = codegenParams.visitors[name];
-    if (visit) visit(name, node.arguments, scope, params);
-  });
-
-  // perform code generation
-  const gen = codeGenerator(ast);
-
-  // collect signal dependencies
-  gen.globals.forEach(name => {
-    const signalName = SignalPrefix + name;
-    if (!has$1(params, signalName) && scope.getSignal(name)) {
-      params[signalName] = scope.signalRef(name);
-    }
-  });
-
-  // return generated expression code and dependencies
-  return {
-    $expr: extend$1({
-      code: gen.code
-    }, scope.options.ast ? {
-      ast
-    } : null),
-    $fields: gen.fields,
-    $params: params
-  };
-}
-
 const VIEW = 'view',
   LBRACK = '[',
   RBRACK = ']',
@@ -41227,7 +40501,7 @@ function applyDefaults (encode, type, role, style, config) {
   }
 
   // resolve styles, apply with increasing precedence
-  array$6(style).forEach(name => {
+  array$5(style).forEach(name => {
     const props = config.style && config.style[name];
     for (const key in props) {
       if (!has(key, encode)) {
@@ -41609,7 +40883,7 @@ function parseUpdate (spec, scope, target) {
   }
 
   // separate event streams from signal updates
-  events = array$6(events).filter(s => s.signal || s.scale ? (sources.push(s), 0) : 1);
+  events = array$5(events).filter(s => s.signal || s.scale ? (sources.push(s), 0) : 1);
 
   // merge internal operator listeners
   if (sources.length > 1) {
@@ -42733,7 +42007,7 @@ function parseData$1 (from, group, scope) {
       if (!from.data) {
         op = parseTransform(extend$1({
           type: 'aggregate',
-          groupby: array$6(facet.groupby)
+          groupby: array$5(facet.groupby)
         }, facet.aggregate), scope);
         op.params.key = scope.keyRef(facet.groupby);
         op.params.pulse = getDataRef(facet, scope);
@@ -43503,7 +42777,7 @@ function analyze(data, scope, ops) {
     }
   } else if (data.source) {
     // derives from one or more other data sets
-    source = upstream = array$6(data.source).map(d => ref(scope.getData(d).output));
+    source = upstream = array$5(data.source).map(d => ref(scope.getData(d).output));
     output.push(null); // populate later
   }
 
@@ -44138,20 +43412,20 @@ function buildAxisEncode(_, spec) {
 }
 
 function parseScope (spec, scope, preprocessed) {
-  const signals = array$6(spec.signals),
-    scales = array$6(spec.scales);
+  const signals = array$5(spec.signals),
+    scales = array$5(spec.scales);
 
   // parse signal definitions, if not already preprocessed
   if (!preprocessed) signals.forEach(_ => parseSignal(_, scope));
 
   // parse cartographic projection definitions
-  array$6(spec.projections).forEach(_ => parseProjection$1(_, scope));
+  array$5(spec.projections).forEach(_ => parseProjection$1(_, scope));
 
   // initialize scale references
   scales.forEach(_ => initScale(_, scope));
 
   // parse data sources
-  array$6(spec.data).forEach(_ => parseData$2(_, scope));
+  array$5(spec.data).forEach(_ => parseData$2(_, scope));
 
   // parse scale definitions
   scales.forEach(_ => parseScale(_, scope));
@@ -44160,13 +43434,13 @@ function parseScope (spec, scope, preprocessed) {
   (preprocessed || signals).forEach(_ => parseSignalUpdates(_, scope));
 
   // parse axis definitions
-  array$6(spec.axes).forEach(_ => parseAxis$1(_, scope));
+  array$5(spec.axes).forEach(_ => parseAxis$1(_, scope));
 
   // parse mark definitions
-  array$6(spec.marks).forEach(_ => parseMark(_, scope));
+  array$5(spec.marks).forEach(_ => parseMark(_, scope));
 
   // parse legend definitions
-  array$6(spec.legends).forEach(_ => parseLegend$1(_, scope));
+  array$5(spec.legends).forEach(_ => parseLegend$1(_, scope));
 
   // parse title, if defined
   if (spec.title) parseTitle(spec.title, scope);
@@ -44280,7 +43554,7 @@ function collectSignals(spec, config) {
     map = {};
 
   // add spec signal array
-  array$6(spec.signals).forEach(s => {
+  array$5(spec.signals).forEach(s => {
     if (has$1(pre, s.name)) {
       // merge if built-in signal
       s = extend$1(pre[s.name], s);
@@ -44292,7 +43566,7 @@ function collectSignals(spec, config) {
   });
 
   // add config signal array
-  array$6(config.signals).forEach(s => {
+  array$5(config.signals).forEach(s => {
     if (!has$1(map, s.name) && !has$1(pre, s.name)) {
       // add to signal list if not already defined
       signals.push(s);
@@ -44484,8 +43758,8 @@ Scope.prototype = Subscope.prototype = {
   compareRef(cmp) {
     let signal = false;
     const check = _ => isSignal(_) ? (signal = true, this.signalRef(_.signal)) : isExpr$1(_) ? (signal = true, this.exprRef(_.expr)) : _;
-    const fields = array$6(cmp.field).map(check),
-      orders = array$6(cmp.order).map(check);
+    const fields = array$5(cmp.field).map(check),
+      orders = array$5(cmp.order).map(check);
     return signal ? ref(this.add(Compare({
       fields: fields,
       orders: orders
@@ -44495,7 +43769,7 @@ Scope.prototype = Subscope.prototype = {
     let signal = false;
     const check = _ => isSignal(_) ? (signal = true, ref(sig[_.signal])) : _;
     const sig = this.signals;
-    fields = array$6(fields).map(check);
+    fields = array$5(fields).map(check);
     return signal ? ref(this.add(Key({
       fields: fields,
       flat: flat
@@ -44897,11 +44171,11 @@ function parse (spec, config, options) {
   return parseView(spec, new Scope(config, options)).toRuntime();
 }
 
-var version$4 = "5.30.0";
+var version$4 = "5.31.0";
 
 // -- Transforms -----
 
-extend$1(transforms, tx, vtx, encode$2, geo, force, label, tree, reg, voronoi, wordcloud, xf);
+extend$1(transforms, tx, vtx, encode$1, geo, force, label, tree, reg, voronoi, wordcloud, xf);
 
 const vegaImport = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -44924,7 +44198,7 @@ const vegaImport = /*#__PURE__*/Object.freeze({
   interpolateColors: interpolateColors,
   interpolateRange: interpolateRange$1,
   quantizeInterpolator: quantizeInterpolator,
-  scale: scale$5,
+  scale: scale$4,
   scheme: scheme$1,
   projection: projection,
   View: View$1,
@@ -44933,7 +44207,7 @@ const vegaImport = /*#__PURE__*/Object.freeze({
   locale: locale$2,
   resetDefaultLocale: resetDefaultLocale,
   timeFormatLocale: timeFormatDefaultLocale,
-  expressionFunction: expressionFunction$1,
+  expressionFunction: expressionFunction,
   parse: parse,
   runtimeContext: context,
   codegenExpression: codegen,
@@ -44947,7 +44221,7 @@ const vegaImport = /*#__PURE__*/Object.freeze({
   accessor: accessor,
   accessorFields: accessorFields,
   accessorName: accessorName,
-  array: array$6,
+  array: array$5,
   ascending: ascending$2,
   clampRange: clampRange,
   compare: compare$2,
@@ -44979,7 +44253,7 @@ const vegaImport = /*#__PURE__*/Object.freeze({
   lerp: lerp,
   logger: logger,
   lruCache: lruCache,
-  merge: merge$4,
+  merge: merge$3,
   mergeConfig: mergeConfig,
   one: one$2,
   pad: pad$3,
@@ -45035,7 +44309,7 @@ const vegaImport = /*#__PURE__*/Object.freeze({
   regressionExp: exp$1,
   regressionLinear: linear$2,
   regressionLoess: loess,
-  regressionLog: log$4,
+  regressionLog: log$3,
   regressionPoly: poly,
   regressionPow: pow$3,
   regressionQuad: quad,
@@ -45071,7 +44345,7 @@ const vegaImport = /*#__PURE__*/Object.freeze({
   utcdayofyear: utcdayofyear,
   utcweek: utcweek,
   week: week,
-  format: format$4,
+  format: format$3,
   formats: formats$1,
   inferType: inferType,
   inferTypes: inferTypes,
@@ -45109,7 +44383,7 @@ const vegaImport = /*#__PURE__*/Object.freeze({
   font: font$1,
   fontFamily: fontFamily,
   fontSize: fontSize,
-  intersect: intersect$3,
+  intersect: intersect$2,
   intersectBoxLine: intersectBoxLine,
   intersectPath: intersectPath,
   intersectPoint: intersectPoint,
@@ -47028,7 +46302,7 @@ function getMarkStyleConfig(prop, mark, styleConfigIndex) {
     return getStyleConfig(prop, getStyles(mark), styleConfigIndex);
 }
 function getStyleConfig(p, styles, styleConfigIndex) {
-    styles = array$6(styles);
+    styles = array$5(styles);
     let value;
     for (const style of styles) {
         const styleConfig = styleConfigIndex[style];
@@ -47042,7 +46316,7 @@ function getStyleConfig(p, styles, styleConfigIndex) {
  * Return Vega sort parameters (tuple of field and order).
  */
 function sortParams(orderDef, fieldRefOption) {
-    return array$6(orderDef).reduce((s, orderChannelDef) => {
+    return array$5(orderDef).reduce((s, orderChannelDef) => {
         s.field.push(vgField(orderChannelDef, fieldRefOption));
         s.order.push(orderChannelDef.sort ?? 'ascending');
         return s;
@@ -47071,7 +46345,7 @@ function mergeTitle(title1, title2) {
         return title2;
     }
     else {
-        return [...array$6(title1), ...array$6(title2)].join(', ');
+        return [...array$5(title1), ...array$5(title2)].join(', ');
     }
 }
 function mergeTitleComponent(v1, v2) {
@@ -50183,7 +49457,7 @@ function initEncoding(encoding, mark, filled, config) {
                     }
                 }
                 // Array of fieldDefs for detail channel (or production rule)
-                normalizedEncoding[channel] = array$6(channelDef).reduce((defs, fieldDef) => {
+                normalizedEncoding[channel] = array$5(channelDef).reduce((defs, fieldDef) => {
                     if (!isFieldDef(fieldDef)) {
                         warn(emptyFieldDef(fieldDef, channel));
                     }
@@ -50228,7 +49502,7 @@ function fieldDefs(encoding) {
     for (const channel of keys(encoding)) {
         if (channelHasField(encoding, channel)) {
             const channelDef = encoding[channel];
-            const channelDefArray = array$6(channelDef);
+            const channelDefArray = array$5(channelDef);
             for (const def of channelDefArray) {
                 if (isFieldDef(def)) {
                     arr.push(def);
@@ -50318,7 +49592,7 @@ function pathGroupingFields(mark, encoding) {
             case KEY: {
                 const channelDef = encoding[channel];
                 if (isArray(channelDef) || isFieldDef(channelDef)) {
-                    for (const fieldDef of array$6(channelDef)) {
+                    for (const fieldDef of array$5(channelDef)) {
                         if (!fieldDef.aggregate) {
                             details.push(vgField(fieldDef, {}));
                         }
@@ -52147,7 +51421,7 @@ function stack(m, encoding) {
         // Ignore tooltip in stackBy (https://github.com/vega/vega-lite/issues/4001)
         if (channel !== 'tooltip' && channelHasField(encoding, channel)) {
             const channelDef = encoding[channel];
-            for (const cDef of array$6(channelDef)) {
+            for (const cDef of array$5(channelDef)) {
                 const fieldDef = getFieldDef(cDef);
                 if (fieldDef.aggregate) {
                     continue;
@@ -53917,7 +53191,7 @@ const project = {
         const type = selCmpt.type;
         const cfg = model.config.selection[type];
         const init = selDef.value !== undefined
-            ? array$6(selDef.value)
+            ? array$5(selDef.value)
             : null;
         // If no explicit projection (either fields or encodings) is specified, set some defaults.
         // If an initial value is set, try to infer projections.
@@ -54443,7 +53717,7 @@ const interval = {
                     warn(`${evt} is not an ordered event stream for interval selections.`);
                     continue;
                 }
-                const filters = array$6(((_a = evt.between[0]).filter ?? (_a.filter = [])));
+                const filters = array$5(((_a = evt.between[0]).filter ?? (_a.filter = [])));
                 if (!filters.includes(filterExpr)) {
                     filters.push(filterExpr);
                 }
@@ -54722,7 +53996,7 @@ function wrapCondition({ model, channelDef, vgChannel, invalidValueRef, mainRefF
     const condition = isConditionalDef(channelDef) && channelDef.condition;
     let valueRefs = [];
     if (condition) {
-        const conditions = array$6(condition);
+        const conditions = array$5(condition);
         valueRefs = conditions.map(c => {
             const conditionValueRef = mainRefFn(c);
             if (isConditionalParameter(c)) {
@@ -54840,7 +54114,7 @@ function tooltipData(encoding, stack, config, { reactiveGeom } = {}) {
                 type: encoding[mainChannel].type // for secondary field def, copy type from main channel
             };
         const title = fieldDef.title || defaultTitle(fieldDef, formatConfig);
-        const key = array$6(title).join(', ').replaceAll(/"/g, '\\"');
+        const key = array$5(title).join(', ').replaceAll(/"/g, '\\"');
         let value;
         if (isXorY(channel)) {
             const channel2 = channel === 'x' ? 'x2' : 'y2';
@@ -55947,14 +55221,14 @@ const legendBindings = {
         if (isObject(selDef.select) && (selDef.select.on || selDef.select.clear)) {
             const legendFilter = 'event.item && indexof(event.item.mark.role, "legend") < 0';
             for (const evt of selCmpt.events) {
-                evt.filter = array$6(evt.filter ?? []);
+                evt.filter = array$5(evt.filter ?? []);
                 if (!evt.filter.includes(legendFilter)) {
                     evt.filter.push(legendFilter);
                 }
             }
         }
         const evt = isLegendStreamBinding(selCmpt.bind) ? selCmpt.bind.legend : 'click';
-        const stream = isString(evt) ? eventSelector(evt, 'view') : array$6(evt);
+        const stream = isString(evt) ? eventSelector(evt, 'view') : array$5(evt);
         selCmpt.bind = { legend: { merge: stream } };
     },
     topLevelSignals: (model, selCmpt, signals) => {
@@ -56359,7 +55633,7 @@ function parseUnitSelection(model, selDefs) {
             type,
             init: def.value,
             bind: def.bind,
-            events: isString(defaults.on) ? eventSelector(defaults.on, 'scope') : array$6(duplicate(defaults.on))
+            events: isString(defaults.on) ? eventSelector(defaults.on, 'scope') : array$5(duplicate(defaults.on))
         });
         if (isTimerSelection(selCmpt)) {
             nTimerSelections++;
@@ -56499,7 +55773,7 @@ function assembleAxis(axisCmpt, kind, config, opt = { header: false }) {
         else if (isConditionalAxisValue(propValue)) {
             // deal with conditional axis value
             const { condition, ...valueOrSignalRef } = propValue;
-            const conditions = array$6(condition);
+            const conditions = array$5(condition);
             const propIndex = CONDITIONAL_AXIS_PROP_INDEX[prop];
             if (propIndex) {
                 const { vgProp, part } = propIndex;
@@ -56705,7 +55979,7 @@ function getAxisConfigStyle(axisConfigTypes, config) {
         // TODO: add special casing to add conditional value based on orient signal
         let style = config[configType]?.style;
         if (style) {
-            style = array$6(style);
+            style = array$5(style);
             for (const s of style) {
                 toMerge.push(config.style[s]);
             }
@@ -57544,7 +56818,7 @@ function getFirstConditionValue(channelDef) {
 }
 function getConditionValue(channelDef, reducer) {
     if (hasConditionalValueDef(channelDef)) {
-        return array$6(channelDef.condition).reduce(reducer, channelDef.value);
+        return array$5(channelDef.condition).reduce(reducer, channelDef.value);
     }
     else if (isValueDef(channelDef)) {
         return channelDef.value;
@@ -62679,7 +61953,7 @@ class LookupNode extends DataFlowNode {
         return new Set([this.transform.lookup]);
     }
     producedFields() {
-        return new Set(this.transform.as ? array$6(this.transform.as) : this.transform.from.fields);
+        return new Set(this.transform.as ? array$5(this.transform.as) : this.transform.from.fields);
     }
     hash() {
         return `Lookup ${hash({ transform: this.transform, secondary: this.secondary })}`;
@@ -62690,7 +61964,7 @@ class LookupNode extends DataFlowNode {
             // lookup a few fields and add create a flat output
             foreign = {
                 values: this.transform.from.fields,
-                ...(this.transform.as ? { as: array$6(this.transform.as) } : {})
+                ...(this.transform.as ? { as: array$5(this.transform.as) } : {})
             };
         }
         else {
@@ -65376,7 +64650,7 @@ class LayerModel extends Model {
     assembleGroupStyle() {
         const uniqueStyles = new Set();
         for (const child of this.children) {
-            for (const style of array$6(child.assembleGroupStyle())) {
+            for (const style of array$5(child.assembleGroupStyle())) {
                 uniqueStyles.add(style);
             }
         }