genesys-spark-chart-components 4.81.2 → 4.82.0

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const index$2 = require('./index-95713c33.js');
-const colorPalette = require('./color-palette-f1720978.js');
+const colorPalette = require('./color-palette-aa165953.js');
 
 /*!
  * https://github.com/Starcounter-Jack/JSON-Patch
@@ -1517,7 +1517,7 @@ function lerp (array, frac) {
 const DEFAULT_MAX_SIZE = 10000;
 
 // adapted from https://github.com/dominictarr/hashlru/ (MIT License)
-function lruCache$1 (maxsize) {
+function lruCache (maxsize) {
   maxsize = +maxsize || DEFAULT_MAX_SIZE;
   let curr, prev, size;
   const clear = () => {
@@ -5006,14 +5006,14 @@ function changeset() {
   };
 }
 
-const CACHE$1 = '_:mod:_';
+const CACHE = '_:mod:_';
 
 /**
  * Hash that tracks modifications to assigned values.
  * Callers *must* use the set method to update values.
  */
 function Parameters() {
-  Object.defineProperty(this, CACHE$1, {
+  Object.defineProperty(this, CACHE, {
     writable: true,
     value: {}
   });
@@ -5033,7 +5033,7 @@ Parameters.prototype = {
   set(name, index, value, force) {
     const o = this,
       v = o[name],
-      mod = o[CACHE$1];
+      mod = o[CACHE];
     if (index != null && index >= 0) {
       if (v[index] !== value || force) {
         v[index] = value;
@@ -5057,7 +5057,7 @@ Parameters.prototype = {
    * @return {boolean} - Returns true if a queried parameter was modified.
    */
   modified(name, index) {
-    const mod = this[CACHE$1];
+    const mod = this[CACHE];
     if (!arguments.length) {
       for (const k in mod) {
         if (mod[k]) return true;
@@ -5076,7 +5076,7 @@ Parameters.prototype = {
    * all parameters are considered unmodified.
    */
   clear() {
-    this[CACHE$1] = {};
+    this[CACHE] = {};
     return this;
   }
 };
@@ -10626,7 +10626,7 @@ function aggregateParams(_, pulse) {
     key: _.key,
     groupby: _.groupby,
     ops: keys.map(() => op),
-    fields: keys.map(k => get$5(k, key, value, fields)),
+    fields: keys.map(k => get$4(k, key, value, fields)),
     as: keys.map(k => k + ''),
     modified: _.modified.bind(_)
   };
@@ -10634,7 +10634,7 @@ function aggregateParams(_, pulse) {
 
 // Generate aggregate field accessor.
 // Output NaN for non-existent values; aggregator will ignore!
-function get$5(k, key, value, fields) {
+function get$4(k, key, value, fields) {
   return accessor(d => key(d) === k ? value(d) : NaN, fields, k + '');
 }
 
@@ -16130,12 +16130,12 @@ function labelFormat(locale, scale, count, type, specifier, formatType, noSkip)
   return type === SymbolLegend && isDiscreteRange(scale) ? formatRange(format) : type === DiscreteLegend ? formatDiscrete(format) : formatPoint(format);
 }
 const formatRange = format => (value, index, array) => {
-  const limit = get$4(array[index + 1], get$4(array.max, +Infinity)),
+  const limit = get$3(array[index + 1], get$3(array.max, +Infinity)),
     lo = formatValue$2(value, format),
     hi = formatValue$2(limit, format);
   return lo && hi ? lo + ' \u2013 ' + hi : hi ? '< ' + hi : '\u2265 ' + lo;
 };
-const get$4 = (value, dflt) => value != null ? value : dflt;
+const get$3 = (value, dflt) => value != null ? value : dflt;
 const formatDiscrete = format => (value, index) => index ? format(value) : null;
 const formatPoint = format => value => format(value);
 const formatValue$2 = (value, format) => Number.isFinite(value) ? format(value) : null;
@@ -16207,18 +16207,18 @@ function gradientRef(g, defs, base) {
   if (!id) {
     id = g.id = 'gradient_' + gradient_id++;
     if (type === 'radial') {
-      g.x1 = get$3(g.x1, 0.5);
-      g.y1 = get$3(g.y1, 0.5);
-      g.r1 = get$3(g.r1, 0);
-      g.x2 = get$3(g.x2, 0.5);
-      g.y2 = get$3(g.y2, 0.5);
-      g.r2 = get$3(g.r2, 0.5);
+      g.x1 = get$2(g.x1, 0.5);
+      g.y1 = get$2(g.y1, 0.5);
+      g.r1 = get$2(g.r1, 0);
+      g.x2 = get$2(g.x2, 0.5);
+      g.y2 = get$2(g.y2, 0.5);
+      g.r2 = get$2(g.r2, 0.5);
       prefix = patternPrefix;
     } else {
-      g.x1 = get$3(g.x1, 0);
-      g.y1 = get$3(g.y1, 0);
-      g.x2 = get$3(g.x2, 1);
-      g.y2 = get$3(g.y2, 0);
+      g.x1 = get$2(g.x1, 0);
+      g.y1 = get$2(g.y1, 0);
+      g.x2 = get$2(g.x2, 1);
+      g.y2 = get$2(g.y2, 0);
     }
   }
 
@@ -16228,7 +16228,7 @@ function gradientRef(g, defs, base) {
   // return url reference
   return 'url(' + (base || '') + '#' + prefix + id + ')';
 }
-function get$3(val, def) {
+function get$2(val, def) {
   return val != null ? val : def;
 }
 function Gradient$1 (p0, p1) {
@@ -18424,7 +18424,7 @@ var shape = markItemPath('shape', shape$1);
 var symbol = markItemPath('symbol', symbol$1, intersectPoint);
 
 // memoize text width measurement
-const widthCache = lruCache$1();
+const widthCache = lruCache();
 var textMetrics = {
   height: fontSize,
   measureWidth: measureWidth,
@@ -21643,7 +21643,7 @@ function bboxFull(item) {
   const b = item.bounds.clone();
   return b.empty() ? b.set(0, 0, 0, 0) : b.translate(-(item.x || 0), -(item.y || 0));
 }
-function get$2(opt, key, d) {
+function get$1(opt, key, d) {
   const v = isObject(opt) ? opt[key] : opt;
   return v != null ? v : d !== undefined ? d : 0;
 }
@@ -21654,10 +21654,10 @@ function gridLayout(view, groups, opt) {
   var dirty = !opt.nodirty,
     bbox = opt.bounds === Flush ? bboxFlush : bboxFull,
     bounds = tempBounds.set(0, 0, 0, 0),
-    alignCol = get$2(opt.align, Column),
-    alignRow = get$2(opt.align, Row),
-    padCol = get$2(opt.padding, Column),
-    padRow = get$2(opt.padding, Row),
+    alignCol = get$1(opt.align, Column),
+    alignRow = get$1(opt.align, Row),
+    padCol = get$1(opt.padding, Column),
+    padRow = get$1(opt.padding, Row),
     ncols = opt.columns || groups.length,
     nrows = ncols <= 0 ? 1 : Math.ceil(groups.length / ncols),
     n = groups.length,
@@ -21774,7 +21774,7 @@ function gridLayout(view, groups, opt) {
   }
 
   // perform horizontal centering
-  if (alignCol && get$2(opt.center, Column) && nrows > 1) {
+  if (alignCol && get$1(opt.center, Column) && nrows > 1) {
     for (i = 0; i < n; ++i) {
       b = alignCol === All ? xMax : xExtent[i % ncols];
       x = b - boxes[i].x2 - groups[i].x - dx[i];
@@ -21783,7 +21783,7 @@ function gridLayout(view, groups, opt) {
   }
 
   // perform vertical centering
-  if (alignRow && get$2(opt.center, Row) && ncols !== 1) {
+  if (alignRow && get$1(opt.center, Row) && ncols !== 1) {
     for (i = 0; i < n; ++i) {
       b = alignRow === All ? yMax : yExtent[~~(i / ncols)];
       y = b - boxes[i].y2 - groups[i].y - dy[i];
@@ -21795,16 +21795,16 @@ function gridLayout(view, groups, opt) {
   for (i = 0; i < n; ++i) {
     bounds.union(boxes[i].translate(dx[i], dy[i]));
   }
-  x = get$2(opt.anchor, X$1);
-  y = get$2(opt.anchor, Y$1);
-  switch (get$2(opt.anchor, Column)) {
+  x = get$1(opt.anchor, X$1);
+  y = get$1(opt.anchor, Y$1);
+  switch (get$1(opt.anchor, Column)) {
     case End$1:
       x -= bounds.width();
       break;
     case Middle$1:
       x -= bounds.width() / 2;
   }
-  switch (get$2(opt.anchor, Row)) {
+  switch (get$1(opt.anchor, Row)) {
     case End$1:
       y -= bounds.height();
       break;
@@ -21852,43 +21852,43 @@ function trellisLayout(view, group, opt) {
 
   // perform row header layout
   if (views.rowheaders) {
-    band = get$2(opt.headerBand, Row, null);
-    x = layoutHeaders(view, views.rowheaders, groups, ncols, nrows, -get$2(off, 'rowHeader'), min, 0, bbox, 'x1', 0, ncols, 1, band);
+    band = get$1(opt.headerBand, Row, null);
+    x = layoutHeaders(view, views.rowheaders, groups, ncols, nrows, -get$1(off, 'rowHeader'), min, 0, bbox, 'x1', 0, ncols, 1, band);
   }
 
   // perform column header layout
   if (views.colheaders) {
-    band = get$2(opt.headerBand, Column, null);
-    y = layoutHeaders(view, views.colheaders, groups, ncols, ncols, -get$2(off, 'columnHeader'), min, 1, bbox, 'y1', 0, 1, ncols, band);
+    band = get$1(opt.headerBand, Column, null);
+    y = layoutHeaders(view, views.colheaders, groups, ncols, ncols, -get$1(off, 'columnHeader'), min, 1, bbox, 'y1', 0, 1, ncols, band);
   }
 
   // perform row footer layout
   if (views.rowfooters) {
-    band = get$2(opt.footerBand, Row, null);
-    x2 = layoutHeaders(view, views.rowfooters, groups, ncols, nrows, get$2(off, 'rowFooter'), max, 0, bbox, 'x2', ncols - 1, ncols, 1, band);
+    band = get$1(opt.footerBand, Row, null);
+    x2 = layoutHeaders(view, views.rowfooters, groups, ncols, nrows, get$1(off, 'rowFooter'), max, 0, bbox, 'x2', ncols - 1, ncols, 1, band);
   }
 
   // perform column footer layout
   if (views.colfooters) {
-    band = get$2(opt.footerBand, Column, null);
-    y2 = layoutHeaders(view, views.colfooters, groups, ncols, ncols, get$2(off, 'columnFooter'), max, 1, bbox, 'y2', cells - ncols, 1, ncols, band);
+    band = get$1(opt.footerBand, Column, null);
+    y2 = layoutHeaders(view, views.colfooters, groups, ncols, ncols, get$1(off, 'columnFooter'), max, 1, bbox, 'y2', cells - ncols, 1, ncols, band);
   }
 
   // perform row title layout
   if (views.rowtitle) {
-    anchor = get$2(opt.titleAnchor, Row);
-    offset = get$2(off, 'rowTitle');
+    anchor = get$1(opt.titleAnchor, Row);
+    offset = get$1(off, 'rowTitle');
     offset = anchor === End$1 ? x2 + offset : x - offset;
-    band = get$2(opt.titleBand, Row, 0.5);
+    band = get$1(opt.titleBand, Row, 0.5);
     layoutTitle(view, views.rowtitle, offset, 0, bounds, band);
   }
 
   // perform column title layout
   if (views.coltitle) {
-    anchor = get$2(opt.titleAnchor, Column);
-    offset = get$2(off, 'columnTitle');
+    anchor = get$1(opt.titleAnchor, Column);
+    offset = get$1(off, 'columnTitle');
     offset = anchor === End$1 ? y2 + offset : y - offset;
-    band = get$2(opt.titleBand, Column, 0.5);
+    band = get$1(opt.titleBand, Column, 0.5);
     layoutTitle(view, views.coltitle, offset, 1, bounds, band);
   }
 }
@@ -28402,7 +28402,7 @@ Dispatch.prototype = dispatch.prototype = {
 
     // If no callback was specified, return the callback of the given type and name.
     if (arguments.length < 2) {
-      while (++i < n) if ((t = (typename = T[i]).type) && (t = get$1(_[t], typename.name))) return t;
+      while (++i < n) if ((t = (typename = T[i]).type) && (t = get(_[t], typename.name))) return t;
       return;
     }
 
@@ -28432,7 +28432,7 @@ Dispatch.prototype = dispatch.prototype = {
   }
 };
 
-function get$1(type, name) {
+function get(type, name) {
   for (var i = 0, n = type.length, c; i < n; ++i) {
     if ((c = type[i]).name === name) {
       return c.value;
@@ -29468,7 +29468,7 @@ function hierarchy(data, children) {
     children = objectChildren;
   }
 
-  var root = new Node$2(data),
+  var root = new Node$1(data),
       node,
       nodes = [root],
       child,
@@ -29480,7 +29480,7 @@ function hierarchy(data, children) {
     if ((childs = children(node.data)) && (n = (childs = Array.from(childs)).length)) {
       node.children = childs;
       for (i = n - 1; i >= 0; --i) {
-        nodes.push(child = childs[i] = new Node$2(childs[i]));
+        nodes.push(child = childs[i] = new Node$1(childs[i]));
         child.parent = node;
         child.depth = node.depth + 1;
       }
@@ -29513,15 +29513,15 @@ function computeHeight(node) {
   while ((node = node.parent) && (node.height < ++height));
 }
 
-function Node$2(data) {
+function Node$1(data) {
   this.data = data;
   this.depth =
   this.height = 0;
   this.parent = null;
 }
 
-Node$2.prototype = hierarchy.prototype = {
-  constructor: Node$2,
+Node$1.prototype = hierarchy.prototype = {
+  constructor: Node$1,
   count: node_count,
   each: node_each,
   eachAfter: node_eachAfter,
@@ -29743,7 +29743,7 @@ function score(node) {
   return dx * dx + dy * dy;
 }
 
-function Node$1(circle) {
+function Node(circle) {
   this._ = circle;
   this.next = null;
   this.previous = null;
@@ -29766,14 +29766,14 @@ function packSiblingsRandom(circles, random) {
   place(b, a, c = circles[2]);
 
   // Initialize the front-chain using the first three circles a, b and c.
-  a = new Node$1(a), b = new Node$1(b), c = new Node$1(c);
+  a = new Node(a), b = new Node(b), c = new Node(c);
   a.next = c.previous = b;
   b.next = a.previous = c;
   c.next = b.previous = a;
 
   // Attempt to place each remaining circle…
   pack: for (i = 3; i < n; ++i) {
-    place(a._, b._, c = circles[i]), c = new Node$1(c);
+    place(a._, b._, c = circles[i]), c = new Node(c);
 
     // Find the closest intersecting circle on the front-chain, if any.
     // “Closeness” is determined by linear distance along the front-chain.
@@ -30012,7 +30012,7 @@ function stratify() {
     }
 
     for (i = 0, n = nodes.length; i < n; ++i) {
-      d = nodes[i], node = nodes[i] = new Node$2(d);
+      d = nodes[i], node = nodes[i] = new Node$1(d);
       if ((nodeId = currentId(d, i, data)) != null && (nodeId += "")) {
         nodeKey = node.id = nodeId;
         nodeByKey.set(nodeKey, nodeByKey.has(nodeKey) ? ambiguous : node);
@@ -30178,7 +30178,7 @@ function TreeNode(node, i) {
   this.i = i; // number
 }
 
-TreeNode.prototype = Object.create(Node$2.prototype);
+TreeNode.prototype = Object.create(Node$1.prototype);
 
 function treeRoot(root) {
   var tree = new TreeNode(root, 0),
@@ -38251,7 +38251,7 @@ function change(name, changes) {
   dataset.modified = true;
   return this.pulse(dataset.input, changes);
 }
-function insert$1(name, _) {
+function insert(name, _) {
   return change.call(this, name, changeset().insert(_));
 }
 function remove(name, _) {
@@ -39444,7 +39444,7 @@ inherits(View$1, Dataflow, {
   // -- DATA ----
   data,
   change,
-  insert: insert$1,
+  insert,
   remove,
   // -- SCALES --
   scale: scale$1,
@@ -39956,7 +39956,7 @@ function parseSignal (signal, scope) {
   }
 }
 
-function Entry$1(type, value, params, parent) {
+function Entry(type, value, params, parent) {
   this.id = -1;
   this.type = type;
   this.value = value;
@@ -39964,7 +39964,7 @@ function Entry$1(type, value, params, parent) {
   if (parent) this.parent = parent;
 }
 function entry(type, value, params, parent) {
-  return new Entry$1(type, value, params, parent);
+  return new Entry(type, value, params, parent);
 }
 function operator(value, params) {
   return entry('operator', value, params);
@@ -42910,7 +42910,7 @@ Scope.prototype = Subscope.prototype = {
     return op;
   },
   proxy(op) {
-    const vref = op instanceof Entry$1 ? ref(op) : op;
+    const vref = op instanceof Entry ? ref(op) : op;
     return this.add(Proxy({
       value: vref
     }));
@@ -43063,7 +43063,7 @@ Scope.prototype = Subscope.prototype = {
     if (this.hasOwnSignal(name)) {
       error('Duplicate signal name: ' + $(name));
     }
-    const op = value instanceof Entry$1 ? value : this.add(operator(value));
+    const op = value instanceof Entry ? value : this.add(operator(value));
     return this.signals[name] = op;
   },
   getSignal(name) {
@@ -43505,7 +43505,7 @@ const vegaImport = /*#__PURE__*/Object.freeze({
     key: key,
     lerp: lerp,
     logger: logger,
-    lruCache: lruCache$1,
+    lruCache: lruCache,
     merge: merge$3,
     mergeConfig: mergeConfig,
     one: one$2,
@@ -43965,7 +43965,7 @@ var expression$1 = {
 
 const name$1 = "vega-lite";
 const author$1 = "Dominik Moritz, Kanit \"Ham\" Wongsuphasawat, Arvind Satyanarayan, Jeffrey Heer";
-const version$3 = "5.19.0";
+const version$3 = "5.21.0";
 const collaborators = [
 	"Kanit Wongsuphasawat (http://kanitw.yellowpigz.com)",
 	"Dominik Moritz (https://www.domoritz.de)",
@@ -44043,50 +44043,50 @@ const bugs = {
 	url: "https://github.com/vega/vega-lite/issues"
 };
 const devDependencies$1 = {
-	"@babel/core": "^7.24.7",
-	"@babel/preset-env": "^7.24.7",
+	"@babel/core": "^7.24.9",
+	"@babel/preset-env": "^7.25.0",
 	"@babel/preset-typescript": "^7.24.7",
 	"@release-it/conventional-changelog": "^8.0.1",
 	"@rollup/plugin-alias": "^5.1.0",
 	"@rollup/plugin-babel": "^6.0.4",
-	"@rollup/plugin-commonjs": "^25.0.7",
+	"@rollup/plugin-commonjs": "^26.0.1",
 	"@rollup/plugin-json": "^6.1.0",
 	"@rollup/plugin-node-resolve": "^15.2.3",
 	"@rollup/plugin-terser": "^0.4.4",
 	"@types/d3": "^7.4.3",
 	"@types/jest": "^29.5.12",
 	"@types/pako": "^2.0.3",
-	"@typescript-eslint/eslint-plugin": "^7.13.0",
-	"@typescript-eslint/parser": "^7.13.0",
-	ajv: "^8.16.0",
-	"ajv-formats": "^2.1.1",
+	"@typescript-eslint/eslint-plugin": "^7.17.0",
+	"@typescript-eslint/parser": "^7.17.0",
+	ajv: "^8.17.1",
+	"ajv-formats": "^3.0.1",
 	cheerio: "^1.0.0-rc.12",
-	"conventional-changelog-cli": "^4.1.0",
+	"conventional-changelog-cli": "^5.0.0",
 	d3: "^7.9.0",
 	"del-cli": "^5.1.0",
 	eslint: "^8.57.0",
 	"eslint-config-prettier": "^9.1.0",
 	"eslint-plugin-jest": "^27.9.0",
-	"eslint-plugin-prettier": "^5.1.3",
+	"eslint-plugin-prettier": "^5.2.1",
 	"fast-json-stable-stringify": "~2.1.0",
-	"highlight.js": "^11.9.0",
+	"highlight.js": "^11.10.0",
 	jest: "^29.7.0",
 	"jest-dev-server": "^10.0.0",
 	mkdirp: "^3.0.1",
 	pako: "^2.1.0",
-	prettier: "^3.3.2",
+	prettier: "^3.3.3",
 	puppeteer: "^15.0.0",
-	"release-it": "17.2.1",
-	rollup: "^4.18.0",
+	"release-it": "17.6.0",
+	rollup: "^4.19.1",
 	"rollup-plugin-bundle-size": "^1.0.3",
 	serve: "^14.2.3",
-	terser: "^5.31.1",
-	"ts-jest": "^29.1.4",
-	"ts-json-schema-generator": "^1.5.0",
-	typescript: "~5.4.5",
+	terser: "^5.31.3",
+	"ts-jest": "^29.2.3",
+	"ts-json-schema-generator": "^2.3.0",
+	typescript: "~5.5.4",
 	"vega-cli": "^5.28.0",
 	"vega-datasets": "^2.8.1",
-	"vega-embed": "^6.25.0",
+	"vega-embed": "^6.26.0",
 	"vega-tooltip": "^0.34.0",
 	"yaml-front-matter": "^4.1.1"
 };
@@ -44094,7 +44094,7 @@ const dependencies$1 = {
 	"json-stringify-pretty-compact": "~3.0.0",
 	tslib: "~2.6.3",
 	"vega-event-selector": "~3.0.1",
-	"vega-expression": "~5.1.0",
+	"vega-expression": "~5.1.1",
 	"vega-util": "~1.17.2",
 	yargs: "~17.7.2"
 };
@@ -44132,13 +44132,13 @@ const pkg$1 = {
 };
 
 function isLogicalOr(op) {
-    return !!op.or;
+    return hasProperty(op, 'or');
 }
 function isLogicalAnd(op) {
-    return !!op.and;
+    return hasProperty(op, 'and');
 }
 function isLogicalNot(op) {
-    return !!op.not;
+    return hasProperty(op, 'not');
 }
 function forEachLeaf(op, fn) {
     if (isLogicalNot(op)) {
@@ -44355,7 +44355,9 @@ function isEmpty(obj) {
 }
 // This is a stricter version of Object.keys but with better types. See https://github.com/Microsoft/TypeScript/pull/12253#issuecomment-263132208
 const keys = Object.keys;
+// Stricter version from https://github.com/microsoft/TypeScript/issues/51572#issuecomment-1319153323
 const vals = Object.values;
+// Stricter version from https://github.com/microsoft/TypeScript/issues/51572#issuecomment-1319153323
 const entries$1 = Object.entries;
 function isBoolean(b) {
     return b === true || b === false;
@@ -44462,12 +44464,7 @@ function accessPathDepth(path) {
  * This is a replacement for chained || for numeric properties or properties that respect null so that 0 will be included.
  */
 function getFirstDefined(...args) {
-    for (const arg of args) {
-        if (arg !== undefined) {
-            return arg;
-        }
-    }
-    return undefined;
+    return args.find(a => a !== undefined);
 }
 // variable used to generate id
 let idCounter = 42;
@@ -44537,19 +44534,19 @@ function deepEqual(a, b) {
         if (a instanceof Map && b instanceof Map) {
             if (a.size !== b.size)
                 return false;
-            for (i of a.entries())
-                if (!b.has(i[0]))
+            for (const e of a.entries())
+                if (!b.has(e[0]))
                     return false;
-            for (i of a.entries())
-                if (!deepEqual(i[1], b.get(i[0])))
+            for (const e of a.entries())
+                if (!deepEqual(e[1], b.get(e[0])))
                     return false;
             return true;
         }
         if (a instanceof Set && b instanceof Set) {
             if (a.size !== b.size)
                 return false;
-            for (i of a.entries())
-                if (!b.has(i[0]))
+            for (const e of a.entries())
+                if (!b.has(e[0]))
                     return false;
             return true;
         }
@@ -44634,6 +44631,16 @@ function stringify$1(data) {
         return `{${out}}`;
     })(data);
 }
+/**
+ * Check if the input object has the property and it's not undefined.
+ *
+ * @param object the object
+ * @param property the property to search
+ * @returns if the object has the property and it's not undefined.
+ */
+function hasProperty(obj, key) {
+    return isObject(obj) && has$1(obj, key) && obj[key] !== undefined;
+}
 
 /*
  * Constants and utilities for encoding channels (Visual variables)
@@ -44695,7 +44702,7 @@ const POLAR_POSITION_CHANNEL_INDEX = {
     radius2: 1
 };
 function isPolarPositionChannel(c) {
-    return c in POLAR_POSITION_CHANNEL_INDEX;
+    return has$1(POLAR_POSITION_CHANNEL_INDEX, c);
 }
 const GEO_POSIITON_CHANNEL_INDEX = {
     longitude: 1,
@@ -44716,7 +44723,7 @@ function getPositionChannelFromLatLong(channel) {
     }
 }
 function isGeoPositionChannel(c) {
-    return c in GEO_POSIITON_CHANNEL_INDEX;
+    return has$1(GEO_POSIITON_CHANNEL_INDEX, c);
 }
 const GEOPOSITION_CHANNELS = keys(GEO_POSIITON_CHANNEL_INDEX);
 const UNIT_CHANNEL_INDEX = {
@@ -44765,10 +44772,10 @@ const CHANNELS = keys(CHANNEL_INDEX);
 const { order: _o, detail: _d, tooltip: _tt1, ...SINGLE_DEF_CHANNEL_INDEX } = CHANNEL_INDEX;
 const { row: _r, column: _c, facet: _f, ...SINGLE_DEF_UNIT_CHANNEL_INDEX } = SINGLE_DEF_CHANNEL_INDEX;
 function isSingleDefUnitChannel(str) {
-    return !!SINGLE_DEF_UNIT_CHANNEL_INDEX[str];
+    return has$1(SINGLE_DEF_UNIT_CHANNEL_INDEX, str);
 }
 function isChannel(str) {
-    return !!CHANNEL_INDEX[str];
+    return has$1(CHANNEL_INDEX, str);
 }
 const SECONDARY_RANGE_CHANNEL = [X2, Y2, LATITUDE2, LONGITUDE2, THETA2, RADIUS2];
 function isSecondaryRangeChannel(c) {
@@ -44902,7 +44909,7 @@ const POSITION_SCALE_CHANNEL_INDEX = {
 };
 const POSITION_SCALE_CHANNELS = keys(POSITION_SCALE_CHANNEL_INDEX);
 function isXorY(channel) {
-    return channel in POSITION_SCALE_CHANNEL_INDEX;
+    return has$1(POSITION_SCALE_CHANNEL_INDEX, channel);
 }
 const POLAR_POSITION_SCALE_CHANNEL_INDEX = {
     theta: 1,
@@ -44914,7 +44921,7 @@ function getPositionScaleChannel(sizeType) {
 }
 const OFFSET_SCALE_CHANNEL_INDEX = { xOffset: 1, yOffset: 1 };
 function isXorYOffset(channel) {
-    return channel in OFFSET_SCALE_CHANNEL_INDEX;
+    return has$1(OFFSET_SCALE_CHANNEL_INDEX, channel);
 }
 // NON_POSITION_SCALE_CHANNEL = SCALE_CHANNELS without position / offset
 const { 
@@ -44926,7 +44933,7 @@ text: _t, tooltip: _tt, href: _hr, url: _u, description: _al,
 detail: _dd, key: _k, order: _oo, ...NONPOSITION_SCALE_CHANNEL_INDEX } = NONPOSITION_CHANNEL_INDEX;
 const NONPOSITION_SCALE_CHANNELS = keys(NONPOSITION_SCALE_CHANNEL_INDEX);
 function isNonPositionScaleChannel(channel) {
-    return !!NONPOSITION_CHANNEL_INDEX[channel];
+    return has$1(NONPOSITION_CHANNEL_INDEX, channel);
 }
 /**
  * @returns whether Vega supports legends for a particular channel
@@ -44958,7 +44965,7 @@ const SCALE_CHANNEL_INDEX = {
 /** List of channels with scales */
 const SCALE_CHANNELS = keys(SCALE_CHANNEL_INDEX);
 function isScaleChannel(channel) {
-    return !!SCALE_CHANNEL_INDEX[channel];
+    return has$1(SCALE_CHANNEL_INDEX, channel);
 }
 /**
  * Return whether a channel supports a particular mark type.
@@ -45160,13 +45167,13 @@ const MULTIDOMAIN_SORT_OP_INDEX = {
     max: 1
 };
 function isArgminDef(a) {
-    return !!a && !!a['argmin'];
+    return hasProperty(a, 'argmin');
 }
 function isArgmaxDef(a) {
-    return !!a && !!a['argmax'];
+    return hasProperty(a, 'argmax');
 }
 function isAggregateOp(a) {
-    return isString(a) && !!AGGREGATE_OP_INDEX[a];
+    return isString(a) && has$1(AGGREGATE_OP_INDEX, a);
 }
 const COUNTING_OPS = new Set([
     'count',
@@ -45229,7 +45236,7 @@ function isBinParams(bin) {
     return isObject(bin);
 }
 function isParameterExtent(extent) {
-    return extent?.['param'];
+    return hasProperty(extent, 'param');
 }
 function autoMaxBins(channel) {
     switch (channel) {
@@ -45255,7 +45262,7 @@ function autoMaxBins(channel) {
 }
 
 function isExprRef(o) {
-    return !!o?.expr;
+    return hasProperty(o, 'expr');
 }
 function replaceExprRef(index, { level } = { level: 0 }) {
     const props = keys(index || {});
@@ -45307,26 +45314,26 @@ function isText(v) {
 }
 
 function isSignalRef(o) {
-    return !!o?.signal;
+    return hasProperty(o, 'signal');
 }
 function isVgRangeStep(range) {
-    return !!range['step'];
+    return hasProperty(range, 'step');
 }
 function isDataRefUnionedDomain(domain) {
     if (!isArray(domain)) {
-        return 'fields' in domain && !('data' in domain);
+        return hasProperty(domain, 'fields') && !hasProperty(domain, 'data');
     }
     return false;
 }
 function isFieldRefUnionDomain(domain) {
     if (!isArray(domain)) {
-        return 'fields' in domain && 'data' in domain;
+        return hasProperty(domain, 'fields') && hasProperty(domain, 'data');
     }
     return false;
 }
 function isDataRefDomain(domain) {
     if (!isArray(domain)) {
-        return 'field' in domain && 'data' in domain;
+        return hasProperty(domain, 'field') && hasProperty(domain, 'data');
     }
     return false;
 }
@@ -45487,7 +45494,7 @@ function getStyles(mark) {
 }
 function getMarkPropOrConfig(channel, mark, config, opt = {}) {
     const { vgChannel, ignoreVgConfig } = opt;
-    if (vgChannel && mark[vgChannel] !== undefined) {
+    if (vgChannel && hasProperty(mark, vgChannel)) {
         return mark[vgChannel];
     }
     else if (mark[channel] !== undefined) {
@@ -45503,9 +45510,10 @@ function getMarkPropOrConfig(channel, mark, config, opt = {}) {
  * Otherwise, return general mark specific config.
  */
 function getMarkConfig(channel, mark, config, { vgChannel } = {}) {
+    const cfg = getMarkStyleConfig(channel, mark, config.style);
     return getFirstDefined(
     // style config has highest precedence
-    vgChannel ? getMarkStyleConfig(channel, mark, config.style) : undefined, getMarkStyleConfig(channel, mark, config.style), 
+    vgChannel ? cfg : undefined, cfg, 
     // then mark-specific config
     vgChannel ? config[mark.type][vgChannel] : undefined, config[mark.type][channel], // Need to cast because MarkDef doesn't perfectly match with AnyMarkConfig, but if the type isn't available, we'll get nothing here, which is fine
     // If there is vgChannel, skip vl channel.
@@ -45521,7 +45529,7 @@ function getStyleConfig(p, styles, styleConfigIndex) {
     let value;
     for (const style of styles) {
         const styleConfig = styleConfigIndex[style];
-        if (styleConfig && styleConfig[p] !== undefined) {
+        if (hasProperty(styleConfig, p)) {
             value = styleConfig[p];
         }
     }
@@ -45856,7 +45864,7 @@ function debug$2(...args) {
 function isDateTime(o) {
     if (o && isObject(o)) {
         for (const part of TIMEUNIT_PARTS) {
-            if (part in o) {
+            if (hasProperty(o, part)) {
                 return true;
             }
         }
@@ -46058,7 +46066,7 @@ const LOCAL_SINGLE_TIMEUNIT_INDEX = {
 };
 const TIMEUNIT_PARTS = keys(LOCAL_SINGLE_TIMEUNIT_INDEX);
 function isLocalSingleTimeUnit(timeUnit) {
-    return !!LOCAL_SINGLE_TIMEUNIT_INDEX[timeUnit];
+    return has$1(LOCAL_SINGLE_TIMEUNIT_INDEX, timeUnit);
 }
 function isBinnedTimeUnit(timeUnit) {
     if (isObject(timeUnit)) {
@@ -46235,7 +46243,7 @@ const DATE_PARTS = {
     milliseconds: 1
 };
 function isDatePart(timeUnit) {
-    return !!DATE_PARTS[timeUnit];
+    return has$1(DATE_PARTS, timeUnit);
 }
 function getDateTimePartAndStep(timeUnit, step = 1) {
     if (isDatePart(timeUnit)) {
@@ -46253,7 +46261,7 @@ function getDateTimePartAndStep(timeUnit, step = 1) {
 }
 
 function isSelectionPredicate(predicate) {
-    return predicate?.['param'];
+    return hasProperty(predicate, 'param');
 }
 function isFieldEqualPredicate(predicate) {
     return !!predicate?.field && predicate.equal !== undefined;
@@ -46341,7 +46349,7 @@ function fieldFilterExpression(predicate, useInRange = true) {
         return fieldValidPredicate(fieldExpr$1, predicate.valid);
     }
     else if (isFieldRangePredicate(predicate)) {
-        const { range } = predicate;
+        const { range } = replaceExprRef(predicate);
         const lower = isSignalRef(range) ? { signal: `${range.signal}[0]` } : range[0];
         const upper = isSignalRef(range) ? { signal: `${range.signal}[1]` } : range[1];
         if (lower !== null && upper !== null && useInRange) {
@@ -46560,6 +46568,7 @@ const defaultScaleConfig = {
     pointPadding: 0.5,
     barBandPaddingInner: 0.1,
     rectBandPaddingInner: 0,
+    tickBandPaddingInner: 0.25,
     bandWithNestedOffsetPaddingInner: 0.2,
     bandWithNestedOffsetPaddingOuter: 0.2,
     minBandSize: 2,
@@ -46576,13 +46585,13 @@ const defaultScaleConfig = {
     zero: true
 };
 function isExtendedScheme(scheme) {
-    return !isString(scheme) && !!scheme['name'];
+    return !isString(scheme) && hasProperty(scheme, 'name');
 }
 function isParameterDomain(domain) {
-    return domain?.['param'];
+    return hasProperty(domain, 'param');
 }
 function isDomainUnionWith(domain) {
-    return domain?.['unionWith'];
+    return hasProperty(domain, 'unionWith');
 }
 function isFieldRange(range) {
     return isObject(range) && 'field' in range;
@@ -46802,11 +46811,11 @@ function isPathMark(m) {
     return ['line', 'area', 'trail'].includes(m);
 }
 function isRectBasedMark(m) {
-    return ['rect', 'bar', 'image', 'arc' /* arc is rect/interval in polar coordinate */].includes(m);
+    return ['rect', 'bar', 'image', 'arc', 'tick' /* arc is rect/interval in polar coordinate */].includes(m);
 }
 const PRIMITIVE_MARKS = new Set(keys(Mark));
 function isMarkDef(mark) {
-    return mark['type'];
+    return hasProperty(mark, 'type');
 }
 const STROKE_CONFIG = [
     'stroke',
@@ -46830,12 +46839,18 @@ const VL_ONLY_MARK_CONFIG_INDEX = {
     timeUnitBandPosition: 1
 };
 const VL_ONLY_MARK_CONFIG_PROPERTIES = keys(VL_ONLY_MARK_CONFIG_INDEX);
+const VL_ONLY_RECT_CONFIG = [
+    'binSpacing',
+    'continuousBandSize',
+    'discreteBandSize',
+    'minBandSize'
+];
 const VL_ONLY_MARK_SPECIFIC_CONFIG_PROPERTY_INDEX = {
     area: ['line', 'point'],
-    bar: ['binSpacing', 'continuousBandSize', 'discreteBandSize', 'minBandSize'],
-    rect: ['binSpacing', 'continuousBandSize', 'discreteBandSize', 'minBandSize'],
+    bar: VL_ONLY_RECT_CONFIG,
+    rect: VL_ONLY_RECT_CONFIG,
     line: ['point'],
-    tick: ['bandSize', 'thickness']
+    tick: ['bandSize', 'thickness', ...VL_ONLY_RECT_CONFIG]
 };
 const defaultMarkConfig = {
     color: '#4c78a8',
@@ -46861,26 +46876,25 @@ const MARK_CONFIG_INDEX = {
 };
 const MARK_CONFIGS = keys(MARK_CONFIG_INDEX);
 function isRelativeBandSize(o) {
-    return o && o['band'] != undefined;
+    return hasProperty(o, 'band');
 }
 const BAR_CORNER_RADIUS_INDEX = {
     horizontal: ['cornerRadiusTopRight', 'cornerRadiusBottomRight'],
     vertical: ['cornerRadiusTopLeft', 'cornerRadiusTopRight']
 };
 const DEFAULT_RECT_BAND_SIZE = 5;
-const defaultBarConfig = {
-    binSpacing: 1,
-    continuousBandSize: DEFAULT_RECT_BAND_SIZE,
-    minBandSize: 0.25,
-    timeUnitBandPosition: 0.5
-};
 const defaultRectConfig = {
     binSpacing: 0,
     continuousBandSize: DEFAULT_RECT_BAND_SIZE,
     minBandSize: 0.25,
     timeUnitBandPosition: 0.5
 };
+const defaultBarConfig = {
+    ...defaultRectConfig,
+    binSpacing: 1
+};
 const defaultTickConfig = {
+    ...defaultRectConfig,
     thickness: 1
 };
 function getMarkType(m) {
@@ -47114,7 +47128,7 @@ function midPoint({ channel, channelDef, channel2Def, markDef, config, scaleName
             {
                 offset,
                 // For band, to get mid point, need to offset by half of the band
-                band: scaleType === 'band' ? bandPosition ?? channelDef.bandPosition ?? 0.5 : undefined
+                band: scaleType === 'band' ? (bandPosition ?? channelDef.bandPosition ?? 0.5) : undefined
             });
         }
         else if (isValueDef(channelDef)) {
@@ -47380,33 +47394,33 @@ const SORT_BY_CHANNEL_INDEX = {
     text: 1
 };
 function isSortByChannel(c) {
-    return c in SORT_BY_CHANNEL_INDEX;
+    return has$1(SORT_BY_CHANNEL_INDEX, c);
 }
 function isSortByEncoding(sort) {
-    return !!sort?.['encoding'];
+    return hasProperty(sort, 'encoding');
 }
 function isSortField(sort) {
-    return sort && (sort['op'] === 'count' || !!sort['field']);
+    return sort && (sort.op === 'count' || hasProperty(sort, 'field'));
 }
 function isSortArray(sort) {
     return sort && isArray(sort);
 }
 
 function isFacetMapping(f) {
-    return 'row' in f || 'column' in f;
+    return hasProperty(f, 'row') || hasProperty(f, 'column');
 }
 function isFacetFieldDef(channelDef) {
-    return !!channelDef && 'header' in channelDef;
+    return hasProperty(channelDef, 'header');
 }
 function isFacetSpec(spec) {
-    return 'facet' in spec;
+    return hasProperty(spec, 'facet');
 }
 
 function isConditionalParameter(c) {
-    return c['param'];
+    return hasProperty(c, 'param');
 }
 function isRepeatRef(field) {
-    return field && !isString(field) && 'repeat' in field;
+    return !isString(field) && hasProperty(field, 'repeat');
 }
 function toFieldDefBase(fieldDef) {
     const { field, timeUnit, bin, aggregate } = fieldDef;
@@ -47418,7 +47432,7 @@ function toFieldDefBase(fieldDef) {
     };
 }
 function isSortableFieldDef(fieldDef) {
-    return 'sort' in fieldDef;
+    return hasProperty(fieldDef, 'sort');
 }
 function getBandPosition({ fieldDef, fieldDef2, markDef: mark, config }) {
     if (isFieldOrDatumDef(fieldDef) && fieldDef.bandPosition !== undefined) {
@@ -47474,10 +47488,10 @@ function hasBandEnd(fieldDef, fieldDef2, markDef, config) {
     return false;
 }
 function isOrderOnlyDef(orderDef) {
-    return orderDef && !!orderDef.sort && !orderDef['field'];
+    return hasProperty(orderDef, 'sort') && !hasProperty(orderDef, 'field');
 }
 function isConditionalDef(channelDef) {
-    return channelDef && 'condition' in channelDef;
+    return hasProperty(channelDef, 'condition');
 }
 /**
  * Return if a channelDef is a ConditionalValueDef with ConditionFieldDef
@@ -47495,14 +47509,13 @@ function hasConditionalValueDef(channelDef) {
     return !!condition && (isArray(condition) || isValueDef(condition));
 }
 function isFieldDef(channelDef) {
-    // TODO: we can't use field in channelDef here as it's somehow failing runtime test
-    return channelDef && (!!channelDef['field'] || channelDef['aggregate'] === 'count');
+    return hasProperty(channelDef, 'field') || channelDef?.aggregate === 'count';
 }
 function channelDefType(channelDef) {
     return channelDef?.['type'];
 }
 function isDatumDef(channelDef) {
-    return channelDef && 'datum' in channelDef;
+    return hasProperty(channelDef, 'datum');
 }
 function isContinuousFieldOrDatumDef(cd) {
     // TODO: make datum support DateTime object
@@ -47519,29 +47532,31 @@ function isFieldOrDatumDef(channelDef) {
     return isFieldDef(channelDef) || isDatumDef(channelDef);
 }
 function isTypedFieldDef(channelDef) {
-    return channelDef && ('field' in channelDef || channelDef['aggregate'] === 'count') && 'type' in channelDef;
+    return (channelDef &&
+        (hasProperty(channelDef, 'field') || channelDef['aggregate'] === 'count') &&
+        hasProperty(channelDef, 'type'));
 }
 function isValueDef(channelDef) {
-    return channelDef && 'value' in channelDef && 'value' in channelDef;
+    return hasProperty(channelDef, 'value');
 }
 function isScaleFieldDef(channelDef) {
-    return channelDef && ('scale' in channelDef || 'sort' in channelDef);
+    return hasProperty(channelDef, 'scale') || hasProperty(channelDef, 'sort');
 }
 function isPositionFieldOrDatumDef(channelDef) {
-    return channelDef && ('axis' in channelDef || 'stack' in channelDef || 'impute' in channelDef);
+    return hasProperty(channelDef, 'axis') || hasProperty(channelDef, 'stack') || hasProperty(channelDef, 'impute');
 }
 function isMarkPropFieldOrDatumDef(channelDef) {
-    return channelDef && 'legend' in channelDef;
+    return hasProperty(channelDef, 'legend');
 }
 function isStringFieldOrDatumDef(channelDef) {
-    return channelDef && ('format' in channelDef || 'formatType' in channelDef);
+    return hasProperty(channelDef, 'format') || hasProperty(channelDef, 'formatType');
 }
 function toStringFieldDef(fieldDef) {
     // omit properties that don't exist in string field defs
     return omit(fieldDef, ['legend', 'axis', 'header', 'scale']);
 }
 function isOpFieldDef(fieldDef) {
-    return 'op' in fieldDef;
+    return hasProperty(fieldDef, 'op');
 }
 /**
  * Get a Vega field reference from a Vega-Lite field def.
@@ -47663,12 +47678,7 @@ function functionalTitleFormatter(fieldDef) {
     }
     const timeUnitParams = timeUnit && !isBinnedTimeUnit(timeUnit) ? normalizeTimeUnit(timeUnit) : undefined;
     const fn = aggregate || timeUnitParams?.unit || (timeUnitParams?.maxbins && 'timeunit') || (isBinning(bin) && 'bin');
-    if (fn) {
-        return `${fn.toUpperCase()}(${field})`;
-    }
-    else {
-        return field;
-    }
+    return fn ? `${fn.toUpperCase()}(${field})` : field;
 }
 const defaultTitleFormatter = (fieldDef, config) => {
     switch (config.fieldTitle) {
@@ -47900,7 +47910,7 @@ function initFieldDef(fd, channel, { compositeMark = false } = {}) {
                 sort: { encoding: sort }
             };
         }
-        const sub = sort.substr(1);
+        const sub = sort.substring(1);
         if (sort.charAt(0) === '-' && isSortByChannel(sub)) {
             return {
                 ...fieldDef,
@@ -48358,7 +48368,7 @@ const AXIS_PROPERTIES_INDEX = {
     encoding: 1
 };
 function isAxisProperty(prop) {
-    return !!AXIS_PROPERTIES_INDEX[prop];
+    return has$1(AXIS_PROPERTIES_INDEX, prop);
 }
 const AXIS_CONFIGS_INDEX = {
     axis: 1,
@@ -48387,7 +48397,7 @@ const AXIS_CONFIGS_INDEX = {
 const AXIS_CONFIGS = keys(AXIS_CONFIGS_INDEX);
 
 function isUnitSpec(spec) {
-    return 'mark' in spec;
+    return hasProperty(spec, 'mark');
 }
 
 class CompositeMarkNormalizer {
@@ -48844,7 +48854,7 @@ function filterTooltipWithAggregatedField(oldEncoding) {
         }
     }
     else {
-        if (tooltip['aggregate']) {
+        if (tooltip.aggregate) {
             filteredEncoding.tooltip = tooltip;
         }
         else {
@@ -49312,7 +49322,7 @@ function normalizeErrorBar(spec, { config }) {
         encoding: normalizeEncoding(spec.encoding, config)
     };
     const { transform, continuousAxisChannelDef, continuousAxis, encodingWithoutContinuousAxis, ticksOrient, markDef, outerSpec, tooltipEncoding } = errorBarParams(spec, ERRORBAR, config);
-    delete encodingWithoutContinuousAxis['size'];
+    delete encodingWithoutContinuousAxis.size;
     const makeErrorBarPart = makeCompositeAggregatePartFactory(markDef, continuousAxis, continuousAxisChannelDef, encodingWithoutContinuousAxis, config.errorbar);
     const thickness = markDef.thickness;
     const size = markDef.size;
@@ -49892,13 +49902,13 @@ function isAnyConcatSpec(spec) {
     return isVConcatSpec(spec) || isHConcatSpec(spec) || isConcatSpec(spec);
 }
 function isConcatSpec(spec) {
-    return 'concat' in spec;
+    return hasProperty(spec, 'concat');
 }
 function isVConcatSpec(spec) {
-    return 'vconcat' in spec;
+    return hasProperty(spec, 'vconcat');
 }
 function isHConcatSpec(spec) {
-    return 'hconcat' in spec;
+    return hasProperty(spec, 'hconcat');
 }
 
 function getStepFor({ step, offsetIsDiscrete }) {
@@ -49910,10 +49920,10 @@ function getStepFor({ step, offsetIsDiscrete }) {
     }
 }
 function isStep(size) {
-    return isObject(size) && size['step'] !== undefined;
+    return hasProperty(size, 'step');
 }
 function isFrameMixins(o) {
-    return o['view'] || o['width'] || o['height'];
+    return hasProperty(o, 'view') || hasProperty(o, 'width') || hasProperty(o, 'height');
 }
 const DEFAULT_SPACING = 20;
 const COMPOSITION_LAYOUT_INDEX = {
@@ -50348,7 +50358,9 @@ function stripAndRedirectConfig(config) {
     redirectTitleConfig(config);
     // Remove empty config objects.
     for (const prop in config) {
+        // @ts-ignore
         if (isObject(config[prop]) && isEmpty(config[prop])) {
+            // @ts-ignore
             delete config[prop];
         }
     }
@@ -50386,7 +50398,9 @@ function redirectTitleConfig(config) {
 }
 function redirectConfigToStyleConfig(config, prop, // string = composite mark
 toProp, compositeMarkPart) {
-    const propConfig = compositeMarkPart ? config[prop][compositeMarkPart] : config[prop];
+    const propConfig = compositeMarkPart
+        ? config[prop][compositeMarkPart]
+        : config[prop];
     if (prop === 'view') {
         toProp = 'cell'; // View's default style is "cell"
     }
@@ -50405,14 +50419,14 @@ toProp, compositeMarkPart) {
 }
 
 function isLayerSpec(spec) {
-    return 'layer' in spec;
+    return hasProperty(spec, 'layer');
 }
 
 function isRepeatSpec(spec) {
-    return 'repeat' in spec;
+    return hasProperty(spec, 'repeat');
 }
 function isLayerRepeatSpec(spec) {
-    return !isArray(spec.repeat) && spec.repeat['layer'];
+    return !isArray(spec.repeat) && hasProperty(spec.repeat, 'layer');
 }
 
 class SpecMapper {
@@ -50493,7 +50507,7 @@ const STACK_OFFSET_INDEX = {
     normalize: 1
 };
 function isStackOffset(s) {
-    return s in STACK_OFFSET_INDEX;
+    return has$1(STACK_OFFSET_INDEX, s);
 }
 const STACKABLE_MARKS = new Set([ARC, BAR, AREA, RULE, POINT, CIRCLE, SQUARE, LINE, TEXT, TICK]);
 const STACK_BY_DEFAULT_MARKS = new Set([BAR, AREA, ARC]);
@@ -51093,7 +51107,7 @@ function replaceRepeaterInChannelDef(channelDef, repeater) {
 function replaceRepeaterInMapping(mapping, repeater) {
     const out = {};
     for (const channel in mapping) {
-        if (has$1(mapping, channel)) {
+        if (hasProperty(mapping, channel)) {
             const channelDef = mapping[channel];
             if (isArray(channelDef)) {
                 // array cannot have condition
@@ -51420,70 +51434,70 @@ function mergeProjection(opt) {
 }
 
 function isFilter(t) {
-    return 'filter' in t;
+    return hasProperty(t, 'filter');
 }
 function isImputeSequence(t) {
-    return t?.['stop'] !== undefined;
+    return hasProperty(t, 'stop');
 }
 function isLookup(t) {
-    return 'lookup' in t;
+    return hasProperty(t, 'lookup');
 }
 function isLookupData(from) {
-    return 'data' in from;
+    return hasProperty(from, 'data');
 }
 function isLookupSelection(from) {
-    return 'param' in from;
+    return hasProperty(from, 'param');
 }
 function isPivot(t) {
-    return 'pivot' in t;
+    return hasProperty(t, 'pivot');
 }
 function isDensity(t) {
-    return 'density' in t;
+    return hasProperty(t, 'density');
 }
 function isQuantile(t) {
-    return 'quantile' in t;
+    return hasProperty(t, 'quantile');
 }
 function isRegression(t) {
-    return 'regression' in t;
+    return hasProperty(t, 'regression');
 }
 function isLoess(t) {
-    return 'loess' in t;
+    return hasProperty(t, 'loess');
 }
 function isSample(t) {
-    return 'sample' in t;
+    return hasProperty(t, 'sample');
 }
 function isWindow(t) {
-    return 'window' in t;
+    return hasProperty(t, 'window');
 }
 function isJoinAggregate(t) {
-    return 'joinaggregate' in t;
+    return hasProperty(t, 'joinaggregate');
 }
 function isFlatten(t) {
-    return 'flatten' in t;
+    return hasProperty(t, 'flatten');
 }
 function isCalculate(t) {
-    return 'calculate' in t;
+    return hasProperty(t, 'calculate');
 }
 function isBin(t) {
-    return 'bin' in t;
+    return hasProperty(t, 'bin');
 }
 function isImpute(t) {
-    return 'impute' in t;
+    return hasProperty(t, 'impute');
 }
 function isTimeUnit(t) {
-    return 'timeUnit' in t;
+    return hasProperty(t, 'timeUnit');
 }
 function isAggregate(t) {
-    return 'aggregate' in t;
+    return hasProperty(t, 'aggregate');
 }
 function isStack(t) {
-    return 'stack' in t;
+    return hasProperty(t, 'stack');
 }
 function isFold(t) {
-    return 'fold' in t;
+    return hasProperty(t, 'fold');
 }
 function isExtent(t) {
-    return 'extent' in t && !('density' in t) && !('regression' in t);
+    return hasProperty(t, 'extent') && !hasProperty(t, 'density') && !hasProperty(t, 'regression');
 }
 function normalizeTransform(transform) {
     return transform.map(t => {
@@ -51707,7 +51721,7 @@ function normalizeGenericSpec(spec, config = {}) {
     return topLevelSelectionNormalizer.map(coreNormalizer.map(selectionCompatNormalizer.map(spec, normParams), normParams), normParams);
 }
 function _normalizeAutoSize(autosize) {
-    return isString(autosize) ? { type: autosize } : autosize ?? {};
+    return isString(autosize) ? { type: autosize } : (autosize ?? {});
 }
 /**
  * Normalize autosize and deal with width or height == "container".
@@ -51766,7 +51780,7 @@ function normalizeAutoSize(spec, sizeInfo, config) {
 }
 
 function isFitType(autoSizeType) {
-    return autoSizeType === 'fit' || autoSizeType === 'fit-x' || autoSizeType === 'fit-y';
+    return ['fit', 'fit-x', 'fit-y'].includes(autoSizeType);
 }
 function getFitType(sizeType) {
     return sizeType ? `fit-${getPositionScaleChannel(sizeType)}` : 'fit';
@@ -51930,25 +51944,25 @@ class AncestorParse extends Split {
 }
 
 function isUrlData(data) {
-    return 'url' in data;
+    return hasProperty(data, 'url');
 }
 function isInlineData(data) {
-    return 'values' in data;
+    return hasProperty(data, 'values');
 }
 function isNamedData(data) {
-    return 'name' in data && !isUrlData(data) && !isInlineData(data) && !isGenerator(data);
+    return hasProperty(data, 'name') && !isUrlData(data) && !isInlineData(data) && !isGenerator(data);
 }
 function isGenerator(data) {
     return data && (isSequenceGenerator(data) || isSphereGenerator(data) || isGraticuleGenerator(data));
 }
 function isSequenceGenerator(data) {
-    return 'sequence' in data;
+    return hasProperty(data, 'sequence');
 }
 function isSphereGenerator(data) {
-    return 'sphere' in data;
+    return hasProperty(data, 'sphere');
 }
 function isGraticuleGenerator(data) {
-    return 'graticule' in data;
+    return hasProperty(data, 'graticule');
 }
 var DataSourceType;
 (function (DataSourceType) {
@@ -52684,9 +52698,9 @@ const scaleBindings = {
         // state is captured by the top-level signals that we insert and "push
         // outer" to from within the units. We need to reassemble this state into
         // the top-level named signal, except no single selCmpt has a global view.
-        const namedSg = signals.filter(s => s.name === selCmpt.name)[0];
+        const namedSg = signals.find(s => s.name === selCmpt.name);
         let update = namedSg.update;
-        if (update.indexOf(VL_SELECTION_RESOLVE) >= 0) {
+        if (update.includes(VL_SELECTION_RESOLVE)) {
             namedSg.update = `{${bound
                 .map(proj => `${$(replacePathInField(proj.field))}: ${proj.signals.data}`)
                 .join(', ')}}`;
@@ -52749,7 +52763,7 @@ const interval = {
                     continue;
                 }
                 const filters = array$5(((_a = evt.between[0]).filter ?? (_a.filter = [])));
-                if (filters.indexOf(filterExpr) < 0) {
+                if (!filters.includes(filterExpr)) {
                     filters.push(filterExpr);
                 }
             }
@@ -52919,7 +52933,10 @@ const interval = {
         const vgStroke = keys(stroke).reduce((def, k) => {
             def[k] = [
                 {
-                    test: [x !== undefined && `${xvname}[0] !== ${xvname}[1]`, y !== undefined && `${yvname}[0] !== ${yvname}[1]`]
+                    test: [
+                        x !== undefined && `${xvname}[0] !== ${xvname}[1]`,
+                        y !== undefined && `${yvname}[0] !== ${yvname}[1]`
+                    ]
                         .filter(t => t)
                         .join(' && '),
                     value: stroke[k]
@@ -53186,7 +53203,7 @@ function tooltip(model, opt = {}) {
 }
 function tooltipData(encoding, stack, config, { reactiveGeom } = {}) {
     const formatConfig = { ...config, ...config.tooltipFormat };
-    const toSkip = {};
+    const toSkip = new Set();
     const expr = reactiveGeom ? 'datum.datum' : 'datum';
     const tuples = [];
     function add(fDef, channel) {
@@ -53208,7 +53225,7 @@ function tooltipData(encoding, stack, config, { reactiveGeom } = {}) {
                 const endField = vgField(fieldDef2, { expr });
                 const { format, formatType } = getFormatMixins(fieldDef);
                 value = binFormatExpression(startField, endField, format, formatType, formatConfig);
-                toSkip[channel2] = true;
+                toSkip.add(channel2);
             }
         }
         if ((isXorY(channel) || channel === THETA || channel === RADIUS) &&
@@ -53238,7 +53255,7 @@ function tooltipData(encoding, stack, config, { reactiveGeom } = {}) {
     });
     const out = {};
     for (const { channel, key, value } of tuples) {
-        if (!toSkip[channel] && !out[key]) {
+        if (!toSkip.has(channel) && !out[key]) {
             out[key] = value;
         }
     }
@@ -53273,7 +53290,7 @@ function ariaRoleDescription(model) {
     if (ariaRoleDesc != null) {
         return { ariaRoleDescription: { value: ariaRoleDesc } };
     }
-    return mark in VG_MARK_INDEX ? {} : { ariaRoleDescription: { value: mark } };
+    return has$1(VG_MARK_INDEX, mark) ? {} : { ariaRoleDescription: { value: mark } };
 }
 function description$1(model) {
     const { encoding, markDef, config, stack } = model;
@@ -53318,14 +53335,19 @@ function nonPosition(channel, model, opt = {}) {
     const { markDef, encoding, config } = model;
     const { vgChannel } = opt;
     let { defaultRef, defaultValue } = opt;
+    const channelDef = encoding[channel];
     if (defaultRef === undefined) {
         // prettier-ignore
-        defaultValue ?? (defaultValue = getMarkPropOrConfig(channel, markDef, config, { vgChannel, ignoreVgConfig: true }));
+        defaultValue ?? (defaultValue = getMarkPropOrConfig(channel, markDef, config, {
+            vgChannel,
+            // If there is no conditonal def, we ignore vgConfig so the output spec is concise.
+            // However, if there is a conditional def, we must include vgConfig so the default is respected.
+            ignoreVgConfig: !isConditionalDef(channelDef)
+        }));
         if (defaultValue !== undefined) {
             defaultRef = signalOrValueRef(defaultValue);
         }
     }
-    const channelDef = encoding[channel];
     const commonProps = {
         markDef,
         config,
@@ -53415,6 +53437,7 @@ function zindex(model) {
 function positionOffset({ channel: baseChannel, markDef, encoding = {}, model, bandPosition }) {
     const channel = `${baseChannel}Offset`; // Need to cast as the type can't be inferred automatically
     const defaultValue = markDef[channel];
+    // FIXME: remove as any
     const channelDef = encoding[channel];
     if ((channel === 'xOffset' || channel === 'yOffset') && channelDef) {
         const ref = midPoint({
@@ -53589,6 +53612,7 @@ function vgAlignedPositionChannel(channel, markDef, config, defaultAlign = 'midd
     else {
         alignExcludingSignal = align;
     }
+    // FIXME: remove as any
     if (channel === 'x') {
         return ALIGNED_X_CHANNEL[alignExcludingSignal || (defaultAlign === 'top' ? 'left' : 'center')];
     }
@@ -53735,9 +53759,12 @@ function rectPosition(model, channel) {
     const scale = model.getScaleComponent(channel);
     const scaleType = scale ? scale.get('type') : undefined;
     const orient = markDef.orient;
-    const hasSizeDef = encoding[sizeChannel] ?? encoding.size ?? getMarkPropOrConfig('size', markDef, config, { vgChannel: sizeChannel });
+    const hasSizeDef = encoding[sizeChannel] ??
+        encoding.size ??
+        getMarkPropOrConfig('size', markDef, config, { vgChannel: sizeChannel });
     const offsetScaleChannel = getOffsetChannel(channel);
-    const isBarBand = mark === 'bar' && (channel === 'x' ? orient === 'vertical' : orient === 'horizontal');
+    const isBarOrTickBand = (mark === 'bar' && (channel === 'x' ? orient === 'vertical' : orient === 'horizontal')) ||
+        (mark === 'tick' && (channel === 'y' ? orient === 'vertical' : orient === 'horizontal'));
     // x, x2, and width -- we must specify two of these in all conditions
     if (isFieldDef(channelDef) &&
         (isBinning(channelDef.bin) || isBinned(channelDef.bin) || (channelDef.timeUnit && !channelDef2)) &&
@@ -53751,7 +53778,7 @@ function rectPosition(model, channel) {
             model
         });
     }
-    else if (((isFieldOrDatumDef(channelDef) && hasDiscreteDomain(scaleType)) || isBarBand) && !channelDef2) {
+    else if (((isFieldOrDatumDef(channelDef) && hasDiscreteDomain(scaleType)) || isBarOrTickBand) && !channelDef2) {
         return positionAndSize(channelDef, channel, model);
     }
     else {
@@ -53796,8 +53823,8 @@ function defaultSizeRef(sizeChannel, scaleName, scale, config, bandSize, hasFiel
         }
     }
     if (!hasFieldDef) {
-        const { bandPaddingInner, barBandPaddingInner, rectBandPaddingInner } = config.scale;
-        const padding = getFirstDefined(bandPaddingInner, mark === 'bar' ? barBandPaddingInner : rectBandPaddingInner); // this part is like paddingInner in scale.ts
+        const { bandPaddingInner, barBandPaddingInner, rectBandPaddingInner, tickBandPaddingInner } = config.scale;
+        const padding = getFirstDefined(bandPaddingInner, mark === 'tick' ? tickBandPaddingInner : mark === 'bar' ? barBandPaddingInner : rectBandPaddingInner); // this part is like paddingInner in scale.ts
         if (isSignalRef(padding)) {
             return { signal: `(1 - (${padding.signal})) * ${sizeChannel}` };
         }
@@ -53821,8 +53848,12 @@ function positionAndSize(fieldDef, channel, model) {
     const offsetScaleChannel = getOffsetChannel(channel);
     const offsetScaleName = model.scaleName(offsetScaleChannel);
     const offsetScale = model.getScaleComponent(getOffsetScaleChannel(channel));
-    // use "size" channel for bars, if there is orient and the channel matches the right orientation
-    const useVlSizeChannel = (orient === 'horizontal' && channel === 'y') || (orient === 'vertical' && channel === 'x');
+    const useVlSizeChannel = 
+    // Always uses size channel for ticks, because tick only calls rectPosition() for the size channel
+    markDef.type === 'tick' ||
+        // use "size" channel for bars, if there is orient and the channel matches the right orientation
+        (orient === 'horizontal' && channel === 'y') ||
+        (orient === 'vertical' && channel === 'x');
     // Use size encoding / mark property / config if it exists
     let sizeMixins;
     if (encoding.size || markDef.size) {
@@ -53940,7 +53971,7 @@ function rectBinPosition({ fieldDef, fieldDef2, channel, model }) {
     const bandSize = getBandSize({ channel, fieldDef, markDef, config, scaleType });
     const axis = model.component.axes[channel]?.[0];
     const axisTranslate = axis?.get('translate') ?? 0.5; // vega default is 0.5
-    const spacing = isXorY(channel) ? getMarkPropOrConfig('binSpacing', markDef, config) ?? 0 : 0;
+    const spacing = isXorY(channel) ? (getMarkPropOrConfig('binSpacing', markDef, config) ?? 0) : 0;
     const channel2 = getSecondaryRangeChannel(channel);
     const vgChannel = getVgPositionChannel(channel);
     const vgChannel2 = getVgPositionChannel(channel2);
@@ -54039,7 +54070,7 @@ function colorRef(channel, valueRef) {
 }
 function markDefProperties(mark, ignore) {
     return VG_MARK_CONFIGS.reduce((m, prop) => {
-        if (!ALWAYS_IGNORE.has(prop) && mark[prop] !== undefined && ignore[prop] !== 'ignore') {
+        if (!ALWAYS_IGNORE.has(prop) && hasProperty(mark, prop) && ignore[prop] !== 'ignore') {
             m[prop] = signalOrValueRef(mark[prop]);
         }
         return m;
@@ -54139,7 +54170,7 @@ const nearest = {
             if (name === model.component.mark[0].name) {
                 index = i;
             }
-            else if (name.indexOf(VORONOI) >= 0) {
+            else if (name.includes(VORONOI)) {
                 exists = true;
             }
         });
@@ -54189,7 +54220,7 @@ const inputBindings = {
     signals: (model, selCmpt, signals) => {
         const name = selCmpt.name;
         const proj = selCmpt.project;
-        const signal = signals.filter(s => s.name === name + TUPLE)[0];
+        const signal = signals.find(s => s.name === name + TUPLE);
         const fields = name + TUPLE_FIELDS;
         const values = proj.items.map(p => varName(`${name}_${p.field}`));
         const valid = values.map(v => `${v} !== null`).join(' && ');
@@ -54432,7 +54463,7 @@ function onDelta$1(model, selCmpt, proj, size, signals) {
     const delta = name + DELTA$1;
     const channel = proj.channel;
     const boundScales = scaleBindings.defined(selCmpt);
-    const signal = signals.filter(s => s.name === proj.signals[boundScales ? 'data' : 'visual'])[0];
+    const signal = signals.find(s => s.name === proj.signals[boundScales ? 'data' : 'visual']);
     const sizeSg = model.getSizeSignalRef(size).signal;
     const scaleCmpt = model.getScaleComponent(channel);
     const scaleType = scaleCmpt && scaleCmpt.get('type');
@@ -54517,7 +54548,7 @@ function onDelta(model, selCmpt, proj, size, signals) {
     const name = selCmpt.name;
     const channel = proj.channel;
     const boundScales = scaleBindings.defined(selCmpt);
-    const signal = signals.filter(s => s.name === proj.signals[boundScales ? 'data' : 'visual'])[0];
+    const signal = signals.find(s => s.name === proj.signals[boundScales ? 'data' : 'visual']);
     const sizeSg = model.getSizeSignalRef(size).signal;
     const scaleCmpt = model.getScaleComponent(channel);
     const scaleType = scaleCmpt && scaleCmpt.get('type');
@@ -54687,7 +54718,7 @@ function parseUnitSelection(model, selDefs) {
                 continue;
             }
             if (key === 'mark') {
-                defaults[key] = { ...cfg[key], ...defaults[key] };
+                defaults.mark = { ...cfg.mark, ...defaults.mark };
             }
             if (defaults[key] === undefined || defaults[key] === true) {
                 defaults[key] = duplicate(cfg[key] ?? defaults[key]);
@@ -54740,8 +54771,8 @@ function parseSelectionPredicate(model, pred, dfnode, datum = 'datum') {
 }
 function parseSelectionExtent(model, name, extent) {
     const vname = varName(name);
-    const encoding = extent['encoding'];
-    let field = extent['field'];
+    const encoding = extent.encoding;
+    let field = extent.field;
     let selCmpt;
     try {
         selCmpt = model.getSelectionComponent(vname, name);
@@ -54819,7 +54850,8 @@ function assembleAxis(axisCmpt, kind, config, opt = { header: false }) {
     if (disable) {
         return undefined;
     }
-    for (const prop in axis) {
+    for (const p in axis) {
+        const prop = p;
         const propType = AXIS_PROPERTY_TYPE[prop];
         const propValue = axis[prop];
         if (propType && propType !== kind && propType !== 'both') {
@@ -54865,6 +54897,7 @@ function assembleAxis(axisCmpt, kind, config, opt = { header: false }) {
             const propIndex = CONDITIONAL_AXIS_PROP_INDEX[prop];
             if (propIndex) {
                 const { vgProp, part } = propIndex;
+                // FIXME: remove as any
                 setAxisEncode(axis, part, vgProp, propValue);
                 delete axis[prop];
             } // else do nothing since the property already supports signal
@@ -55745,28 +55778,26 @@ function symbols(symbolsSpec, { fieldOrDatumDef, model, channel, legendCmpt, leg
     const symbolOpacity = legendCmpt.get('symbolOpacity') ?? config.legend.symbolOpacity;
     const symbolFillColor = legendCmpt.get('symbolFillColor') ?? config.legend.symbolFillColor;
     const symbolStrokeColor = legendCmpt.get('symbolStrokeColor') ?? config.legend.symbolStrokeColor;
-    const opacity = symbolOpacity === undefined ? getMaxValue(encoding.opacity) ?? markDef.opacity : undefined;
+    const opacity = symbolOpacity === undefined ? (getMaxValue(encoding.opacity) ?? markDef.opacity) : undefined;
     if (out.fill) {
         // for fill legend, we don't want any fill in symbol
         if (channel === 'fill' || (filled && channel === COLOR)) {
             delete out.fill;
         }
-        else {
-            if (out.fill['field']) {
-                // For others, set fill to some opaque value (or nothing if a color is already set)
-                if (symbolFillColor) {
-                    delete out.fill;
-                }
-                else {
-                    out.fill = signalOrValueRef(config.legend.symbolBaseFillColor ?? 'black');
-                    out.fillOpacity = signalOrValueRef(opacity ?? 1);
-                }
+        else if (hasProperty(out.fill, 'field')) {
+            // For others, set fill to some opaque value (or nothing if a color is already set)
+            if (symbolFillColor) {
+                delete out.fill;
             }
-            else if (isArray(out.fill)) {
-                const fill = getFirstConditionValue(encoding.fill ?? encoding.color) ?? markDef.fill ?? (filled && markDef.color);
-                if (fill) {
-                    out.fill = signalOrValueRef(fill);
-                }
+            else {
+                out.fill = signalOrValueRef(config.legend.symbolBaseFillColor ?? 'black');
+                out.fillOpacity = signalOrValueRef(opacity ?? 1);
+            }
+        }
+        else if (isArray(out.fill)) {
+            const fill = getFirstConditionValue(encoding.fill ?? encoding.color) ?? markDef.fill ?? (filled && markDef.color);
+            if (fill) {
+                out.fill = signalOrValueRef(fill);
             }
         }
     }
@@ -55774,16 +55805,14 @@ function symbols(symbolsSpec, { fieldOrDatumDef, model, channel, legendCmpt, leg
         if (channel === 'stroke' || (!filled && channel === COLOR)) {
             delete out.stroke;
         }
-        else {
-            if (out.stroke['field'] || symbolStrokeColor) {
-                // For others, remove stroke field
-                delete out.stroke;
-            }
-            else if (isArray(out.stroke)) {
-                const stroke = getFirstDefined(getFirstConditionValue(encoding.stroke || encoding.color), markDef.stroke, filled ? markDef.color : undefined);
-                if (stroke) {
-                    out.stroke = { value: stroke };
-                }
+        else if (hasProperty(out.stroke, 'field') || symbolStrokeColor) {
+            // For others, remove stroke field
+            delete out.stroke;
+        }
+        else if (isArray(out.stroke)) {
+            const stroke = getFirstDefined(getFirstConditionValue(encoding.stroke || encoding.color), markDef.stroke, filled ? markDef.color : undefined);
+            if (stroke) {
+                out.stroke = { value: stroke };
             }
         }
     }
@@ -56134,6 +56163,7 @@ function parseLegendForChannel(model, channel) {
     const legendEncode = {};
     const legendEncodeParams = { fieldOrDatumDef, model, channel, legendCmpt, legendType };
     for (const part of ['labels', 'legend', 'title', 'symbols', 'gradient', 'entries']) {
+        // FIXME: remove as any (figure out what legendEncoding.entries is)
         const legendEncodingPart = guideEncodeEntry(legendEncoding[part] ?? {}, model);
         const value = part in legendEncodeRules
             ? legendEncodeRules[part](legendEncodingPart, legendEncodeParams) // apply rule
@@ -56530,7 +56560,7 @@ function rangeFormula(model, fieldDef, channel, config) {
     if (binRequiresRange(fieldDef, channel)) {
         // read format from axis or legend, if there is no format then use config.numberFormat
         const guide = isUnitModel(model)
-            ? model.axis(channel) ?? model.legend(channel) ?? {}
+            ? (model.axis(channel) ?? model.legend(channel) ?? {})
             : {};
         const startField = vgField(fieldDef, { expr: 'datum' });
         const endField = vgField(fieldDef, { expr: 'datum', binSuffix: 'end' });
@@ -56805,6 +56835,7 @@ class AggregateNode extends DataFlowNode {
         return new AggregateNode(parent, dims, meas);
     }
     static makeFromTransform(parent, t) {
+        var _a;
         const dims = new Set();
         const meas = {};
         for (const s of t.aggregate) {
@@ -56816,7 +56847,8 @@ class AggregateNode extends DataFlowNode {
                 }
                 else {
                     meas[field] ?? (meas[field] = {});
-                    meas[field][op] = new Set([as ? as : vgField(s, { forAs: true })]);
+                    (_a = meas[field])[op] ?? (_a[op] = new Set());
+                    meas[field][op].add(as ? as : vgField(s, { forAs: true }));
                 }
             }
         }
@@ -57176,10 +57208,11 @@ function getImplicitFromFilterTransform(transform) {
                 val = signalRefOrValue(filter.gte);
             }
             else if (isFieldRangePredicate(filter)) {
+                // FIXME: remove as any
                 val = filter.range[0];
             }
             else if (isFieldOneOfPredicate(filter)) {
-                val = (filter.oneOf ?? filter['in'])[0];
+                val = (filter.oneOf ?? filter.in)[0];
             } // else -- for filter expression, we can't infer anything
             if (val) {
                 if (isDateTime(val)) {
@@ -58822,8 +58855,8 @@ function parseSelectionDomain(model, channel) {
     const scale = model.component.scales[channel];
     const spec = model.specifiedScales[channel].domain;
     const bin = model.fieldDef(channel)?.bin;
-    const domain = isParameterDomain(spec) && spec;
-    const extent = isBinParams(bin) && isParameterExtent(bin.extent) && bin.extent;
+    const domain = isParameterDomain(spec) ? spec : undefined;
+    const extent = isBinParams(bin) && isParameterExtent(bin.extent) ? bin.extent : undefined;
     if (domain || extent) {
         // As scale parsing occurs before selection parsing, we cannot set
         // domainRaw directly. So instead, we store the selectionExtent on
@@ -58995,7 +59028,7 @@ function mergeDomains(domains) {
     }
     // only keep sort properties that work with unioned domains
     const unionDomainSorts = unique(sorts.map(s => {
-        if (isBoolean(s) || !('op' in s) || (isString(s.op) && s.op in MULTIDOMAIN_SORT_OP_INDEX)) {
+        if (isBoolean(s) || !('op' in s) || (isString(s.op) && has$1(MULTIDOMAIN_SORT_OP_INDEX, s.op))) {
             return s;
         }
         warn(domainSortDropped(s));
@@ -59680,7 +59713,7 @@ function parseUnitScaleProperty(model, property) {
         }
         if (supportedByScaleType && channelIncompatability === undefined) {
             if (specifiedValue !== undefined) {
-                const timeUnit = fieldOrDatumDef['timeUnit'];
+                const timeUnit = fieldOrDatumDef.timeUnit;
                 const type = fieldOrDatumDef.type;
                 switch (property) {
                     // domainMax/Min to signal if the value is a datetime object
@@ -59698,7 +59731,7 @@ function parseUnitScaleProperty(model, property) {
                 }
             }
             else {
-                const value = property in scaleRules
+                const value = hasProperty(scaleRules, property)
                     ? scaleRules[property]({
                         model,
                         channel,
@@ -59837,11 +59870,11 @@ function paddingInner(paddingValue, channel, mark, scaleType, scaleConfig, hasNe
         // Padding is only set for X and Y by default.
         // Basically it doesn't make sense to add padding for color and size.
         // paddingOuter would only be called if it's a band scale, just return the default for bandScale.
-        const { bandPaddingInner, barBandPaddingInner, rectBandPaddingInner, bandWithNestedOffsetPaddingInner } = scaleConfig;
+        const { bandPaddingInner, barBandPaddingInner, rectBandPaddingInner, tickBandPaddingInner, bandWithNestedOffsetPaddingInner } = scaleConfig;
         if (hasNestedOffsetScale) {
             return bandWithNestedOffsetPaddingInner;
         }
-        return getFirstDefined(bandPaddingInner, mark === 'bar' ? barBandPaddingInner : rectBandPaddingInner);
+        return getFirstDefined(bandPaddingInner, mark === 'bar' ? barBandPaddingInner : mark === 'tick' ? tickBandPaddingInner : rectBandPaddingInner);
     }
     else if (isXorYOffset(channel)) {
         if (scaleType === ScaleType.BAND) {
@@ -59985,8 +60018,8 @@ function defaultType(channel, fieldDef, mark, hasNestedOffsetScale) {
                 return 'ordinal';
             }
             if (isXorY(channel) || isXorYOffset(channel)) {
-                if (contains(['rect', 'bar', 'image', 'rule'], mark.type)) {
-                    // The rect/bar mark should fit into a band.
+                if (contains(['rect', 'bar', 'image', 'rule', 'tick'], mark.type)) {
+                    // The rect/bar/tick mark should fit into a band.
                     // For rule, using band scale to make rule align with axis ticks better https://github.com/vega/vega-lite/issues/3429
                     return 'band';
                 }
@@ -60072,7 +60105,7 @@ function parseUnitScaleCore(model) {
         if (fieldOrDatumDef && mark === GEOSHAPE && channel === SHAPE && fieldOrDatumDef.type === GEOJSON) {
             continue;
         }
-        let specifiedScale = fieldOrDatumDef && fieldOrDatumDef['scale'];
+        let specifiedScale = fieldOrDatumDef && fieldOrDatumDef.scale;
         if (fieldOrDatumDef && specifiedScale !== null && specifiedScale !== false) {
             specifiedScale ?? (specifiedScale = {});
             const hasNestedOffsetScale = channelHasNestedOffsetScale(encoding, channel);
@@ -61619,7 +61652,7 @@ class FacetModel extends ModelWithField {
         return facetFieldDef;
     }
     channelHasField(channel) {
-        return !!this.facet[channel];
+        return hasProperty(this.facet, channel);
     }
     fieldDef(channel) {
         return this.facet[channel];
@@ -61950,14 +61983,14 @@ function findSource(data, sources) {
         if (data.name && other.hasName() && data.name !== other.dataName) {
             continue;
         }
-        const formatMesh = data['format']?.mesh;
+        const formatMesh = data.format?.mesh;
         const otherFeature = otherData.format?.feature;
         // feature and mesh are mutually exclusive
         if (formatMesh && otherFeature) {
             continue;
         }
         // we have to extract the same feature or mesh
-        const formatFeature = data['format']?.feature;
+        const formatFeature = data.format?.feature;
         if ((formatFeature || otherFeature) && formatFeature !== otherFeature) {
             continue;
         }
@@ -63086,7 +63119,8 @@ const tick = {
     encodeEntry: (model) => {
         const { config, markDef } = model;
         const orient = markDef.orient;
-        const vgSizeChannel = orient === 'horizontal' ? 'width' : 'height';
+        const vgSizeAxisChannel = orient === 'horizontal' ? 'x' : 'y';
+        const vgThicknessAxisChannel = orient === 'horizontal' ? 'y' : 'x';
         const vgThicknessChannel = orient === 'horizontal' ? 'height' : 'width';
         return {
             ...baseEncodeEntry(model, {
@@ -63097,35 +63131,15 @@ const tick = {
                 size: 'ignore',
                 theta: 'ignore'
             }),
-            ...pointPosition('x', model, { defaultPos: 'mid', vgChannel: 'xc' }),
-            ...pointPosition('y', model, { defaultPos: 'mid', vgChannel: 'yc' }),
-            // size / thickness => width / height
-            ...nonPosition('size', model, {
-                defaultValue: defaultSize(model),
-                vgChannel: vgSizeChannel
+            ...rectPosition(model, vgSizeAxisChannel),
+            ...pointPosition(vgThicknessAxisChannel, model, {
+                defaultPos: 'mid',
+                vgChannel: vgThicknessAxisChannel === 'y' ? 'yc' : 'xc'
             }),
             [vgThicknessChannel]: signalOrValueRef(getMarkPropOrConfig('thickness', markDef, config))
         };
     }
 };
-function defaultSize(model) {
-    const { config, markDef } = model;
-    const { orient } = markDef;
-    const vgSizeChannel = orient === 'horizontal' ? 'width' : 'height';
-    const scale = model.getScaleComponent(orient === 'horizontal' ? 'x' : 'y');
-    const markPropOrConfig = getMarkPropOrConfig('size', markDef, config, { vgChannel: vgSizeChannel }) ?? config.tick.bandSize;
-    if (markPropOrConfig !== undefined) {
-        return markPropOrConfig;
-    }
-    else {
-        const scaleRange = scale ? scale.get('range') : undefined;
-        if (scaleRange && isVgRangeStep(scaleRange) && isNumber$1(scaleRange.step)) {
-            return (scaleRange.step * 3) / 4;
-        }
-        const defaultViewStep = getViewConfigDiscreteStep(config.view, vgSizeChannel);
-        return (defaultViewStep * 3) / 4;
-    }
-}
 
 const markCompiler = {
     arc,
@@ -63958,7 +63972,8 @@ const vegaLiteImport = /*#__PURE__*/Object.freeze({
     normalizeAngle: normalizeAngle,
     isNumeric: isNumeric,
     deepEqual: deepEqual,
-    stringify: stringify$1
+    stringify: stringify$1,
+    hasProperty: hasProperty
 });
 
 function e(e){const[n,r]=/schema\/([\w-]+)\/([\w\.\-]+)\.json$/g.exec(e).slice(1,3);return {library:n,version:r}}
@@ -65273,657 +65288,39 @@ function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
 
-var iterator;
-var hasRequiredIterator;
-function requireIterator() {
-  if (hasRequiredIterator) return iterator;
-  hasRequiredIterator = 1;
-  iterator = function (Yallist) {
-    Yallist.prototype[Symbol.iterator] = function* () {
-      for (let walker = this.head; walker; walker = walker.next) {
-        yield walker.value;
-      }
-    };
-  };
-  return iterator;
-}
-
-var yallist = Yallist$1;
-Yallist$1.Node = Node;
-Yallist$1.create = Yallist$1;
-function Yallist$1(list) {
-  var self = this;
-  if (!(self instanceof Yallist$1)) {
-    self = new Yallist$1();
-  }
-  self.tail = null;
-  self.head = null;
-  self.length = 0;
-  if (list && typeof list.forEach === 'function') {
-    list.forEach(function (item) {
-      self.push(item);
-    });
-  } else if (arguments.length > 0) {
-    for (var i = 0, l = arguments.length; i < l; i++) {
-      self.push(arguments[i]);
-    }
-  }
-  return self;
-}
-Yallist$1.prototype.removeNode = function (node) {
-  if (node.list !== this) {
-    throw new Error('removing node which does not belong to this list');
-  }
-  var next = node.next;
-  var prev = node.prev;
-  if (next) {
-    next.prev = prev;
-  }
-  if (prev) {
-    prev.next = next;
-  }
-  if (node === this.head) {
-    this.head = next;
-  }
-  if (node === this.tail) {
-    this.tail = prev;
-  }
-  node.list.length--;
-  node.next = null;
-  node.prev = null;
-  node.list = null;
-  return next;
-};
-Yallist$1.prototype.unshiftNode = function (node) {
-  if (node === this.head) {
-    return;
-  }
-  if (node.list) {
-    node.list.removeNode(node);
-  }
-  var head = this.head;
-  node.list = this;
-  node.next = head;
-  if (head) {
-    head.prev = node;
-  }
-  this.head = node;
-  if (!this.tail) {
-    this.tail = node;
-  }
-  this.length++;
-};
-Yallist$1.prototype.pushNode = function (node) {
-  if (node === this.tail) {
-    return;
-  }
-  if (node.list) {
-    node.list.removeNode(node);
-  }
-  var tail = this.tail;
-  node.list = this;
-  node.prev = tail;
-  if (tail) {
-    tail.next = node;
-  }
-  this.tail = node;
-  if (!this.head) {
-    this.head = node;
-  }
-  this.length++;
-};
-Yallist$1.prototype.push = function () {
-  for (var i = 0, l = arguments.length; i < l; i++) {
-    push(this, arguments[i]);
-  }
-  return this.length;
-};
-Yallist$1.prototype.unshift = function () {
-  for (var i = 0, l = arguments.length; i < l; i++) {
-    unshift(this, arguments[i]);
-  }
-  return this.length;
-};
-Yallist$1.prototype.pop = function () {
-  if (!this.tail) {
-    return undefined;
-  }
-  var res = this.tail.value;
-  this.tail = this.tail.prev;
-  if (this.tail) {
-    this.tail.next = null;
-  } else {
-    this.head = null;
-  }
-  this.length--;
-  return res;
-};
-Yallist$1.prototype.shift = function () {
-  if (!this.head) {
-    return undefined;
-  }
-  var res = this.head.value;
-  this.head = this.head.next;
-  if (this.head) {
-    this.head.prev = null;
-  } else {
-    this.tail = null;
-  }
-  this.length--;
-  return res;
-};
-Yallist$1.prototype.forEach = function (fn, thisp) {
-  thisp = thisp || this;
-  for (var walker = this.head, i = 0; walker !== null; i++) {
-    fn.call(thisp, walker.value, i, this);
-    walker = walker.next;
-  }
-};
-Yallist$1.prototype.forEachReverse = function (fn, thisp) {
-  thisp = thisp || this;
-  for (var walker = this.tail, i = this.length - 1; walker !== null; i--) {
-    fn.call(thisp, walker.value, i, this);
-    walker = walker.prev;
-  }
-};
-Yallist$1.prototype.get = function (n) {
-  for (var i = 0, walker = this.head; walker !== null && i < n; i++) {
-    // abort out of the list early if we hit a cycle
-    walker = walker.next;
-  }
-  if (i === n && walker !== null) {
-    return walker.value;
-  }
-};
-Yallist$1.prototype.getReverse = function (n) {
-  for (var i = 0, walker = this.tail; walker !== null && i < n; i++) {
-    // abort out of the list early if we hit a cycle
-    walker = walker.prev;
-  }
-  if (i === n && walker !== null) {
-    return walker.value;
-  }
-};
-Yallist$1.prototype.map = function (fn, thisp) {
-  thisp = thisp || this;
-  var res = new Yallist$1();
-  for (var walker = this.head; walker !== null;) {
-    res.push(fn.call(thisp, walker.value, this));
-    walker = walker.next;
-  }
-  return res;
-};
-Yallist$1.prototype.mapReverse = function (fn, thisp) {
-  thisp = thisp || this;
-  var res = new Yallist$1();
-  for (var walker = this.tail; walker !== null;) {
-    res.push(fn.call(thisp, walker.value, this));
-    walker = walker.prev;
-  }
-  return res;
-};
-Yallist$1.prototype.reduce = function (fn, initial) {
-  var acc;
-  var walker = this.head;
-  if (arguments.length > 1) {
-    acc = initial;
-  } else if (this.head) {
-    walker = this.head.next;
-    acc = this.head.value;
-  } else {
-    throw new TypeError('Reduce of empty list with no initial value');
-  }
-  for (var i = 0; walker !== null; i++) {
-    acc = fn(acc, walker.value, i);
-    walker = walker.next;
-  }
-  return acc;
-};
-Yallist$1.prototype.reduceReverse = function (fn, initial) {
-  var acc;
-  var walker = this.tail;
-  if (arguments.length > 1) {
-    acc = initial;
-  } else if (this.tail) {
-    walker = this.tail.prev;
-    acc = this.tail.value;
-  } else {
-    throw new TypeError('Reduce of empty list with no initial value');
-  }
-  for (var i = this.length - 1; walker !== null; i--) {
-    acc = fn(acc, walker.value, i);
-    walker = walker.prev;
-  }
-  return acc;
-};
-Yallist$1.prototype.toArray = function () {
-  var arr = new Array(this.length);
-  for (var i = 0, walker = this.head; walker !== null; i++) {
-    arr[i] = walker.value;
-    walker = walker.next;
-  }
-  return arr;
-};
-Yallist$1.prototype.toArrayReverse = function () {
-  var arr = new Array(this.length);
-  for (var i = 0, walker = this.tail; walker !== null; i++) {
-    arr[i] = walker.value;
-    walker = walker.prev;
-  }
-  return arr;
-};
-Yallist$1.prototype.slice = function (from, to) {
-  to = to || this.length;
-  if (to < 0) {
-    to += this.length;
-  }
-  from = from || 0;
-  if (from < 0) {
-    from += this.length;
-  }
-  var ret = new Yallist$1();
-  if (to < from || to < 0) {
-    return ret;
-  }
-  if (from < 0) {
-    from = 0;
-  }
-  if (to > this.length) {
-    to = this.length;
-  }
-  for (var i = 0, walker = this.head; walker !== null && i < from; i++) {
-    walker = walker.next;
-  }
-  for (; walker !== null && i < to; i++, walker = walker.next) {
-    ret.push(walker.value);
-  }
-  return ret;
-};
-Yallist$1.prototype.sliceReverse = function (from, to) {
-  to = to || this.length;
-  if (to < 0) {
-    to += this.length;
-  }
-  from = from || 0;
-  if (from < 0) {
-    from += this.length;
-  }
-  var ret = new Yallist$1();
-  if (to < from || to < 0) {
-    return ret;
-  }
-  if (from < 0) {
-    from = 0;
-  }
-  if (to > this.length) {
-    to = this.length;
-  }
-  for (var i = this.length, walker = this.tail; walker !== null && i > to; i--) {
-    walker = walker.prev;
-  }
-  for (; walker !== null && i > from; i--, walker = walker.prev) {
-    ret.push(walker.value);
-  }
-  return ret;
-};
-Yallist$1.prototype.splice = function (start, deleteCount, ...nodes) {
-  if (start > this.length) {
-    start = this.length - 1;
-  }
-  if (start < 0) {
-    start = this.length + start;
-  }
-  for (var i = 0, walker = this.head; walker !== null && i < start; i++) {
-    walker = walker.next;
-  }
-  var ret = [];
-  for (var i = 0; walker && i < deleteCount; i++) {
-    ret.push(walker.value);
-    walker = this.removeNode(walker);
-  }
-  if (walker === null) {
-    walker = this.tail;
-  }
-  if (walker !== this.head && walker !== this.tail) {
-    walker = walker.prev;
-  }
-  for (var i = 0; i < nodes.length; i++) {
-    walker = insert(this, walker, nodes[i]);
-  }
-  return ret;
-};
-Yallist$1.prototype.reverse = function () {
-  var head = this.head;
-  var tail = this.tail;
-  for (var walker = head; walker !== null; walker = walker.prev) {
-    var p = walker.prev;
-    walker.prev = walker.next;
-    walker.next = p;
-  }
-  this.head = tail;
-  this.tail = head;
-  return this;
-};
-function insert(self, node, value) {
-  var inserted = node === self.head ? new Node(value, null, node, self) : new Node(value, node, node.next, self);
-  if (inserted.next === null) {
-    self.tail = inserted;
-  }
-  if (inserted.prev === null) {
-    self.head = inserted;
-  }
-  self.length++;
-  return inserted;
-}
-function push(self, item) {
-  self.tail = new Node(item, self.tail, null, self);
-  if (!self.head) {
-    self.head = self.tail;
-  }
-  self.length++;
-}
-function unshift(self, item) {
-  self.head = new Node(item, null, self.head, self);
-  if (!self.tail) {
-    self.tail = self.head;
-  }
-  self.length++;
-}
-function Node(value, prev, next, list) {
-  if (!(this instanceof Node)) {
-    return new Node(value, prev, next, list);
-  }
-  this.list = list;
-  this.value = value;
-  if (prev) {
-    prev.next = this;
-    this.prev = prev;
-  } else {
-    this.prev = null;
-  }
-  if (next) {
-    next.prev = this;
-    this.next = next;
-  } else {
-    this.next = null;
-  }
-}
-try {
-  // add if support for Symbol.iterator is present
-  requireIterator()(Yallist$1);
-} catch (er) {}
-
-// A linked list to keep track of recently-used-ness
-const Yallist = yallist;
-const MAX = Symbol('max');
-const LENGTH = Symbol('length');
-const LENGTH_CALCULATOR = Symbol('lengthCalculator');
-const ALLOW_STALE = Symbol('allowStale');
-const MAX_AGE = Symbol('maxAge');
-const DISPOSE = Symbol('dispose');
-const NO_DISPOSE_ON_SET = Symbol('noDisposeOnSet');
-const LRU_LIST = Symbol('lruList');
-const CACHE = Symbol('cache');
-const UPDATE_AGE_ON_GET = Symbol('updateAgeOnGet');
-const naiveLength = () => 1;
-
-// lruList is a yallist where the head is the youngest
-// item, and the tail is the oldest.  the list contains the Hit
-// objects as the entries.
-// Each Hit object has a reference to its Yallist.Node.  This
-// never changes.
-//
-// cache is a Map (or PseudoMap) that matches the keys to
-// the Yallist.Node object.
 class LRUCache {
-  constructor(options) {
-    if (typeof options === 'number') options = {
-      max: options
-    };
-    if (!options) options = {};
-    if (options.max && (typeof options.max !== 'number' || options.max < 0)) throw new TypeError('max must be a non-negative number');
-    // Kind of weird to have a default max of Infinity, but oh well.
-    this[MAX] = options.max || Infinity;
-    const lc = options.length || naiveLength;
-    this[LENGTH_CALCULATOR] = typeof lc !== 'function' ? naiveLength : lc;
-    this[ALLOW_STALE] = options.stale || false;
-    if (options.maxAge && typeof options.maxAge !== 'number') throw new TypeError('maxAge must be a number');
-    this[MAX_AGE] = options.maxAge || 0;
-    this[DISPOSE] = options.dispose;
-    this[NO_DISPOSE_ON_SET] = options.noDisposeOnSet || false;
-    this[UPDATE_AGE_ON_GET] = options.updateAgeOnGet || false;
-    this.reset();
-  }
-
-  // resize the cache when the max changes.
-  set max(mL) {
-    if (typeof mL !== 'number' || mL < 0) throw new TypeError('max must be a non-negative number');
-    this[MAX] = mL || Infinity;
-    trim(this);
-  }
-  get max() {
-    return this[MAX];
-  }
-  set allowStale(allowStale) {
-    this[ALLOW_STALE] = !!allowStale;
-  }
-  get allowStale() {
-    return this[ALLOW_STALE];
-  }
-  set maxAge(mA) {
-    if (typeof mA !== 'number') throw new TypeError('maxAge must be a non-negative number');
-    this[MAX_AGE] = mA;
-    trim(this);
-  }
-  get maxAge() {
-    return this[MAX_AGE];
-  }
-
-  // resize the cache when the lengthCalculator changes.
-  set lengthCalculator(lC) {
-    if (typeof lC !== 'function') lC = naiveLength;
-    if (lC !== this[LENGTH_CALCULATOR]) {
-      this[LENGTH_CALCULATOR] = lC;
-      this[LENGTH] = 0;
-      this[LRU_LIST].forEach(hit => {
-        hit.length = this[LENGTH_CALCULATOR](hit.value, hit.key);
-        this[LENGTH] += hit.length;
-      });
-    }
-    trim(this);
-  }
-  get lengthCalculator() {
-    return this[LENGTH_CALCULATOR];
-  }
-  get length() {
-    return this[LENGTH];
-  }
-  get itemCount() {
-    return this[LRU_LIST].length;
-  }
-  rforEach(fn, thisp) {
-    thisp = thisp || this;
-    for (let walker = this[LRU_LIST].tail; walker !== null;) {
-      const prev = walker.prev;
-      forEachStep(this, fn, walker, thisp);
-      walker = prev;
-    }
-  }
-  forEach(fn, thisp) {
-    thisp = thisp || this;
-    for (let walker = this[LRU_LIST].head; walker !== null;) {
-      const next = walker.next;
-      forEachStep(this, fn, walker, thisp);
-      walker = next;
-    }
-  }
-  keys() {
-    return this[LRU_LIST].toArray().map(k => k.key);
-  }
-  values() {
-    return this[LRU_LIST].toArray().map(k => k.value);
-  }
-  reset() {
-    if (this[DISPOSE] && this[LRU_LIST] && this[LRU_LIST].length) {
-      this[LRU_LIST].forEach(hit => this[DISPOSE](hit.key, hit.value));
-    }
-    this[CACHE] = new Map(); // hash of items by key
-    this[LRU_LIST] = new Yallist(); // list of items in order of use recency
-    this[LENGTH] = 0; // length of items in the list
-  }
-  dump() {
-    return this[LRU_LIST].map(hit => isStale(this, hit) ? false : {
-      k: hit.key,
-      v: hit.value,
-      e: hit.now + (hit.maxAge || 0)
-    }).toArray().filter(h => h);
-  }
-  dumpLru() {
-    return this[LRU_LIST];
-  }
-  set(key, value, maxAge) {
-    maxAge = maxAge || this[MAX_AGE];
-    if (maxAge && typeof maxAge !== 'number') throw new TypeError('maxAge must be a number');
-    const now = maxAge ? Date.now() : 0;
-    const len = this[LENGTH_CALCULATOR](value, key);
-    if (this[CACHE].has(key)) {
-      if (len > this[MAX]) {
-        del(this, this[CACHE].get(key));
-        return false;
-      }
-      const node = this[CACHE].get(key);
-      const item = node.value;
-
-      // dispose of the old one before overwriting
-      // split out into 2 ifs for better coverage tracking
-      if (this[DISPOSE]) {
-        if (!this[NO_DISPOSE_ON_SET]) this[DISPOSE](key, item.value);
-      }
-      item.now = now;
-      item.maxAge = maxAge;
-      item.value = value;
-      this[LENGTH] += len - item.length;
-      item.length = len;
-      this.get(key);
-      trim(this);
-      return true;
-    }
-    const hit = new Entry(key, value, len, now, maxAge);
-
-    // oversized objects fall out of cache automatically.
-    if (hit.length > this[MAX]) {
-      if (this[DISPOSE]) this[DISPOSE](key, value);
-      return false;
-    }
-    this[LENGTH] += hit.length;
-    this[LRU_LIST].unshift(hit);
-    this[CACHE].set(key, this[LRU_LIST].head);
-    trim(this);
-    return true;
-  }
-  has(key) {
-    if (!this[CACHE].has(key)) return false;
-    const hit = this[CACHE].get(key).value;
-    return !isStale(this, hit);
+  constructor() {
+    this.max = 1000;
+    this.map = new Map();
   }
   get(key) {
-    return get(this, key, true);
-  }
-  peek(key) {
-    return get(this, key, false);
-  }
-  pop() {
-    const node = this[LRU_LIST].tail;
-    if (!node) return null;
-    del(this, node);
-    return node.value;
-  }
-  del(key) {
-    del(this, this[CACHE].get(key));
-  }
-  load(arr) {
-    // reset the cache
-    this.reset();
-    const now = Date.now();
-    // A previous serialized cache has the most recent items first
-    for (let l = arr.length - 1; l >= 0; l--) {
-      const hit = arr[l];
-      const expiresAt = hit.e || 0;
-      if (expiresAt === 0)
-        // the item was created without expiration in a non aged cache
-        this.set(hit.k, hit.v);else {
-        const maxAge = expiresAt - now;
-        // dont add already expired items
-        if (maxAge > 0) {
-          this.set(hit.k, hit.v, maxAge);
-        }
-      }
+    const value = this.map.get(key);
+    if (value === undefined) {
+      return undefined;
+    } else {
+      // Remove the key from the map and add it to the end
+      this.map.delete(key);
+      this.map.set(key, value);
+      return value;
     }
   }
-  prune() {
-    this[CACHE].forEach((value, key) => get(this, key, false));
+  delete(key) {
+    return this.map.delete(key);
   }
-}
-const get = (self, key, doUse) => {
-  const node = self[CACHE].get(key);
-  if (node) {
-    const hit = node.value;
-    if (isStale(self, hit)) {
-      del(self, node);
-      if (!self[ALLOW_STALE]) return undefined;
-    } else {
-      if (doUse) {
-        if (self[UPDATE_AGE_ON_GET]) node.value.now = Date.now();
-        self[LRU_LIST].unshiftNode(node);
+  set(key, value) {
+    const deleted = this.delete(key);
+    if (!deleted && value !== undefined) {
+      // If cache is full, delete the least recently used item
+      if (this.map.size >= this.max) {
+        const firstKey = this.map.keys().next().value;
+        this.delete(firstKey);
       }
+      this.map.set(key, value);
     }
-    return hit.value;
-  }
-};
-const isStale = (self, hit) => {
-  if (!hit || !hit.maxAge && !self[MAX_AGE]) return false;
-  const diff = Date.now() - hit.now;
-  return hit.maxAge ? diff > hit.maxAge : self[MAX_AGE] && diff > self[MAX_AGE];
-};
-const trim = self => {
-  if (self[LENGTH] > self[MAX]) {
-    for (let walker = self[LRU_LIST].tail; self[LENGTH] > self[MAX] && walker !== null;) {
-      // We know that we're about to delete this one, and also
-      // what the next least recently used key will be, so just
-      // go ahead and set it now.
-      const prev = walker.prev;
-      del(self, walker);
-      walker = prev;
-    }
-  }
-};
-const del = (self, node) => {
-  if (node) {
-    const hit = node.value;
-    if (self[DISPOSE]) self[DISPOSE](hit.key, hit.value);
-    self[LENGTH] -= hit.length;
-    self[CACHE].delete(hit.key);
-    self[LRU_LIST].removeNode(node);
+    return this;
   }
-};
-class Entry {
-  constructor(key, value, length, now, maxAge) {
-    this.key = key;
-    this.value = value;
-    this.length = length;
-    this.now = now;
-    this.maxAge = maxAge || 0;
-  }
-}
-const forEachStep = (self, fn, node, thisp) => {
-  let hit = node.value;
-  if (isStale(self, hit)) {
-    del(self, node);
-    if (!self[ALLOW_STALE]) hit = undefined;
-  }
-  if (hit) fn.call(thisp, hit.value, hit.key, self);
-};
-var lruCache = LRUCache;
+}
+var lrucache = LRUCache;
 
 // parse out just the options we care about
 const looseOption = Object.freeze({
@@ -66287,7 +65684,7 @@ let SemVer$1 = class SemVer {
     do {
       const a = this.build[i];
       const b = other.build[i];
-      debug('prerelease compare', i, a, b);
+      debug('build compare', i, a, b);
       if (a === undefined && b === undefined) {
         return 0;
       } else if (b === undefined) {
@@ -66789,10 +66186,8 @@ function requireRange() {
     }
   }
   range = Range;
-  const LRU = lruCache;
-  const cache = new LRU({
-    max: 1000
-  });
+  const LRU = lrucache;
+  const cache = new LRU();
   const parseOptions = parseOptions_1;
   const Comparator = requireComparator();
   const debug = debug_1;
@@ -67020,7 +66415,8 @@ function requireRange() {
   // 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
   // 1.2.3 - 3.4 => >=1.2.0 <3.5.0-0 Any 3.4.x will do
   // 1.2 - 3.4 => >=1.2.0 <3.5.0-0
-  const hyphenReplace = incPr => ($0, from, fM, fm, fp, fpr, fb, to, tM, tm, tp, tpr, tb) => {
+  // TODO build?
+  const hyphenReplace = incPr => ($0, from, fM, fm, fp, fpr, fb, to, tM, tm, tp, tpr) => {
     if (isX(fM)) {
       from = '';
     } else if (isX(fm)) {
@@ -67637,9 +67033,9 @@ async function _embed(el, spec, opts = {}, loader) {
       editorLink.addEventListener('click', function (e) {
         post(window, editorUrl, {
           config: config,
-          mode,
+          mode: patch ? 'vega' : mode,
           renderer,
-          spec: jsonStringifyPrettyCompact(spec)
+          spec: jsonStringifyPrettyCompact(patch ? vgSpec : spec)
         });
         e.preventDefault();
       });