@uwdata/vgplot 0.6.1 → 0.7.1

package/dist/vgplot.js

@@ -12884,6 +12884,15 @@ var Query = class _Query {
   static except(...queries) {
     return new SetOperation("EXCEPT", queries.flat());
   }
+  static describe(query) {
+    const q2 = query.clone();
+    const { clone, toString } = q2;
+    return Object.assign(q2, {
+      describe: true,
+      clone: () => _Query.describe(clone.call(q2)),
+      toString: () => `DESCRIBE ${toString.call(q2)}`
+    });
+  }
   constructor() {
     this.query = {
       with: [],
@@ -13118,6 +13127,7 @@ var Query = class _Query {
   }
   toString() {
     const {
+      with: cte,
       select: select2,
       distinct: distinct2,
       from: from2,
@@ -13129,8 +13139,7 @@ var Query = class _Query {
       qualify,
       orderby,
       limit,
-      offset: offset2,
-      with: cte
+      offset: offset2
     } = this.query;
     const sql2 = [];
     if (cte.length) {
@@ -13252,6 +13261,9 @@ var SetOperation = class _SetOperation {
 function isQuery(value) {
   return value instanceof Query || value instanceof SetOperation;
 }
+function isDescribeQuery(value) {
+  return isQuery(value) && value.describe;
+}
 function unquote(s2) {
   return isDoubleQuoted(s2) ? s2.slice(1, -1) : s2;
 }
@@ -13433,131 +13445,6 @@ function toDuckDBValue(value) {
   }
 }
 
-// ../core/src/util/js-type.js
-function jsType(type2) {
-  switch (type2) {
-    case "BIGINT":
-    case "HUGEINT":
-    case "INTEGER":
-    case "SMALLINT":
-    case "TINYINT":
-    case "UBIGINT":
-    case "UINTEGER":
-    case "USMALLINT":
-    case "UTINYINT":
-    case "DOUBLE":
-    case "FLOAT":
-    case "REAL":
-    case "DECIMAL":
-      return "number";
-    case "DATE":
-    case "TIMESTAMP":
-    case "TIMESTAMPTZ":
-    case "TIMESTAMP WITH TIME ZONE":
-    case "TIME":
-    case "TIMESTAMP_NS":
-      return "date";
-    case "BOOLEAN":
-      return "boolean";
-    case "VARCHAR":
-    case "UUID":
-      return "string";
-    case "LIST":
-      return "array";
-    case "BLOB":
-    case "STRUCT":
-    case "MAP":
-      return "object";
-    default:
-      throw new Error(`Unsupported type: ${type2}`);
-  }
-}
-
-// ../core/src/util/summarize.js
-var Count = "count";
-var Nulls = "nulls";
-var Max = "max";
-var Min = "min";
-var Distinct = "distinct";
-var statMap = {
-  [Count]: count,
-  [Distinct]: (column3) => count(column3).distinct(),
-  [Max]: max,
-  [Min]: min,
-  [Nulls]: (column3) => count().where(isNull(column3))
-};
-function summarize({ table: table3, column: column3 }, stats) {
-  return Query.from(table3).select(stats.map((s2) => [s2, statMap[s2](column3)]));
-}
-
-// ../core/src/Catalog.js
-var object = () => /* @__PURE__ */ Object.create(null);
-var Catalog = class {
-  constructor(coordinator2) {
-    this.mc = coordinator2;
-    this.clear();
-  }
-  clear() {
-    this.tables = object();
-  }
-  tableInfo(table3) {
-    const cache = this.tables;
-    if (cache[table3]) {
-      return cache[table3];
-    }
-    const infoPromise = getTableInfo(this.mc, table3).catch((err) => {
-      cache[table3] = null;
-      throw err;
-    });
-    return cache[table3] = infoPromise;
-  }
-  async fieldInfo({ table: table3, column: column3, stats }) {
-    const tableInfo = await this.tableInfo(table3);
-    const colInfo = tableInfo[column3];
-    if (colInfo == null)
-      return;
-    if (!stats?.length)
-      return colInfo;
-    const result = await this.mc.query(
-      summarize(colInfo, stats),
-      { persist: true }
-    );
-    const info = { ...colInfo, ...Array.from(result)[0] };
-    for (const key in info) {
-      const value = info[key];
-      if (typeof value === "bigint") {
-        info[key] = Number(value);
-      }
-    }
-    return info;
-  }
-  async queryFields(fields) {
-    const list = await resolveFields(this, fields);
-    const data = await Promise.all(list.map((f2) => this.fieldInfo(f2)));
-    return data.filter((x4) => x4);
-  }
-};
-async function getTableInfo(mc, table3) {
-  const result = await mc.query(
-    `DESCRIBE ${asRelation(table3)}`,
-    { type: "json", cache: false }
-  );
-  const columns = object();
-  for (const entry of result) {
-    columns[entry.column_name] = {
-      table: table3,
-      column: entry.column_name,
-      sqlType: entry.column_type,
-      type: jsType(entry.column_type),
-      nullable: entry.null === "YES"
-    };
-  }
-  return columns;
-}
-async function resolveFields(catalog, list) {
-  return list.length === 1 && list[0].column === "*" ? Object.values(await catalog.tableInfo(list[0].table)) : list;
-}
-
 // ../core/src/util/hash.js
 function fnv_hash(v3) {
   let a3 = 2166136261;
@@ -13917,7 +13804,7 @@ function consolidate(group3, enqueue, record) {
         type: "arrow",
         cache: false,
         record: false,
-        query: consolidatedQuery(group3, record)
+        query: group3.query = consolidatedQuery(group3, record)
       },
       result: group3.result = queryResult()
     });
@@ -13965,7 +13852,7 @@ function consolidatedQuery(group3, record) {
   return query.$select(Array.from(fields.values()));
 }
 async function processResults(group3, cache) {
-  const { maps, result } = group3;
+  const { maps, query, result } = group3;
   if (!maps)
     return;
   let data;
@@ -13977,25 +13864,33 @@ async function processResults(group3, cache) {
     }
     return;
   }
+  const describe = isDescribeQuery(query);
   group3.forEach(({ entry }, index2) => {
     const { request, result: result2 } = entry;
-    const projected = projectResult(data, maps[index2]);
+    const map4 = maps[index2];
+    const extract = describe && map4 ? filterResult(data, map4) : map4 ? projectResult(data, map4) : data;
     if (request.cache) {
-      cache.set(String(request.query), projected);
+      cache.set(String(request.query), extract);
     }
-    result2.fulfill(projected);
+    result2.fulfill(extract);
   });
 }
 function projectResult(data, map4) {
-  if (map4) {
-    const cols = {};
-    for (const [name2, as] of map4) {
-      cols[as] = data.getChild(name2);
+  const cols = {};
+  for (const [name2, as] of map4) {
+    cols[as] = data.getChild(name2);
+  }
+  return new data.constructor(cols);
+}
+function filterResult(data, map4) {
+  const lookup = new Map(map4);
+  const result = [];
+  for (const d of data) {
+    if (lookup.has(d.column_name)) {
+      result.push({ ...d, column_name: lookup.get(d.column_name) });
     }
-    return new data.constructor(cols);
-  } else {
-    return data;
   }
+  return result;
 }
 
 // ../core/src/util/cache.js
@@ -14242,6 +14137,197 @@ function QueryManager() {
   };
 }
 
+// ../core/src/util/js-type.js
+function jsType(type2) {
+  switch (type2) {
+    case "BIGINT":
+    case "HUGEINT":
+    case "INTEGER":
+    case "SMALLINT":
+    case "TINYINT":
+    case "UBIGINT":
+    case "UINTEGER":
+    case "USMALLINT":
+    case "UTINYINT":
+    case "DOUBLE":
+    case "FLOAT":
+    case "REAL":
+      return "number";
+    case "DATE":
+    case "TIMESTAMP":
+    case "TIMESTAMPTZ":
+    case "TIMESTAMP WITH TIME ZONE":
+    case "TIME":
+    case "TIMESTAMP_NS":
+      return "date";
+    case "BOOLEAN":
+      return "boolean";
+    case "VARCHAR":
+    case "UUID":
+      return "string";
+    case "ARRAY":
+    case "LIST":
+      return "array";
+    case "BLOB":
+    case "STRUCT":
+    case "MAP":
+    case "GEOMETRY":
+      return "object";
+    default:
+      if (type2.startsWith("DECIMAL")) {
+        return "number";
+      } else if (type2.startsWith("STRUCT") || type2.startsWith("MAP")) {
+        return "object";
+      } else if (type2.endsWith("]")) {
+        return "array";
+      }
+      throw new Error(`Unsupported type: ${type2}`);
+  }
+}
+
+// ../core/src/util/convert-arrow.js
+var INTEGER = 2;
+var FLOAT = 3;
+var DECIMAL = 7;
+var TIMESTAMP = 10;
+function isArrowTable(values2) {
+  return typeof values2?.getChild === "function";
+}
+function convertArrowArrayType(type2) {
+  switch (type2.typeId) {
+    case INTEGER:
+    case FLOAT:
+    case DECIMAL:
+      return Float64Array;
+    default:
+      return Array;
+  }
+}
+function convertArrowValue(type2) {
+  const { typeId } = type2;
+  if (typeId === TIMESTAMP) {
+    return (v3) => v3 == null ? v3 : new Date(v3);
+  }
+  if (typeId === INTEGER && type2.bitWidth >= 64) {
+    return (v3) => v3 == null ? v3 : Number(v3);
+  }
+  if (typeId === DECIMAL) {
+    const scale3 = 1 / Math.pow(10, type2.scale);
+    return (v3) => v3 == null ? v3 : decimalToNumber(v3, scale3);
+  }
+  return (v3) => v3;
+}
+function convertArrowColumn(column3) {
+  const { type: type2 } = column3;
+  const { typeId } = type2;
+  if (typeId === TIMESTAMP) {
+    const size = column3.length;
+    const array3 = new Array(size);
+    for (let row = 0; row < size; ++row) {
+      const v3 = column3.get(row);
+      array3[row] = v3 == null ? null : new Date(v3);
+    }
+    return array3;
+  }
+  if (typeId === INTEGER && type2.bitWidth >= 64) {
+    const size = column3.length;
+    const array3 = new Float64Array(size);
+    for (let row = 0; row < size; ++row) {
+      const v3 = column3.get(row);
+      array3[row] = v3 == null ? NaN : Number(v3);
+    }
+    return array3;
+  }
+  if (typeId === DECIMAL) {
+    const scale3 = 1 / Math.pow(10, type2.scale);
+    const size = column3.length;
+    const array3 = new Float64Array(size);
+    for (let row = 0; row < size; ++row) {
+      const v3 = column3.get(row);
+      array3[row] = v3 == null ? NaN : decimalToNumber(v3, scale3);
+    }
+    return array3;
+  }
+  return column3.toArray();
+}
+var BASE32 = Array.from(
+  { length: 8 },
+  (_2, i) => Math.pow(2, i * 32)
+);
+function decimalToNumber(v3, scale3) {
+  const n = v3.length;
+  let x4 = 0;
+  if (v3.signed && (v3[n - 1] | 0) < 0) {
+    for (let i = 0; i < n; ++i) {
+      x4 += ~v3[i] * BASE32[i];
+    }
+    x4 = -(x4 + 1);
+  } else {
+    for (let i = 0; i < n; ++i) {
+      x4 += v3[i] * BASE32[i];
+    }
+  }
+  return x4 * scale3;
+}
+
+// ../core/src/util/field-info.js
+var Count = "count";
+var Nulls = "nulls";
+var Max = "max";
+var Min = "min";
+var Distinct = "distinct";
+var statMap = {
+  [Count]: count,
+  [Distinct]: (column3) => count(column3).distinct(),
+  [Max]: max,
+  [Min]: min,
+  [Nulls]: (column3) => count().where(isNull(column3))
+};
+function summarize(table3, column3, stats) {
+  return Query.from(table3).select(Array.from(stats, (s2) => [s2, statMap[s2](column3)]));
+}
+async function queryFieldInfo(mc, fields) {
+  if (fields.length === 1 && `${fields[0].column}` === "*") {
+    return getTableInfo(mc, fields[0].table);
+  } else {
+    return (await Promise.all(fields.map((f2) => getFieldInfo(mc, f2)))).filter((x4) => x4);
+  }
+}
+async function getFieldInfo(mc, { table: table3, column: column3, stats }) {
+  const q2 = Query.from({ source: table3 }).select({ column: column3 }).groupby(column3.aggregate ? sql`ALL` : []);
+  const [desc2] = Array.from(await mc.query(Query.describe(q2)));
+  const info = {
+    table: table3,
+    column: `${column3}`,
+    sqlType: desc2.column_type,
+    type: jsType(desc2.column_type),
+    nullable: desc2.null === "YES"
+  };
+  if (!(stats?.length || stats?.size))
+    return info;
+  const result = await mc.query(
+    summarize(table3, column3, stats),
+    { persist: true }
+  );
+  for (let i = 0; i < result.numCols; ++i) {
+    const { name: name2 } = result.schema.fields[i];
+    const child = result.getChildAt(i);
+    const convert = convertArrowValue(child.type);
+    info[name2] = convert(child.get(0));
+  }
+  return info;
+}
+async function getTableInfo(mc, table3) {
+  const result = await mc.query(`DESCRIBE ${asRelation(table3)}`);
+  return Array.from(result).map((desc2) => ({
+    table: table3,
+    column: desc2.column_name,
+    sqlType: desc2.column_type,
+    type: jsType(desc2.column_type),
+    nullable: desc2.null === "YES"
+  }));
+}
+
 // ../core/src/util/void-logger.js
 function voidLogger() {
   return {
@@ -14274,7 +14360,6 @@ var Coordinator = class {
       logger = console,
       manager = QueryManager()
     } = options;
-    this.catalog = new Catalog(this);
     this.manager = manager;
     this.logger(logger);
     this.configure(options);
@@ -14293,7 +14378,7 @@ var Coordinator = class {
     this.manager.consolidate(consolidate2);
     this.indexes = indexes2;
   }
-  clear({ clients = true, cache = true, catalog = false } = {}) {
+  clear({ clients = true, cache = true } = {}) {
     this.manager.clear();
     if (clients) {
       this.clients?.forEach((client) => this.disconnect(client));
@@ -14303,8 +14388,6 @@ var Coordinator = class {
     }
     if (cache)
       this.manager.cache().clear();
-    if (catalog)
-      this.catalog.clear();
   }
   databaseConnector(db) {
     return this.manager.connector(db);
@@ -14357,7 +14440,7 @@ var Coordinator = class {
    * @param {import('./MosaicClient.js').MosaicClient} client the client to disconnect
    */
   async connect(client) {
-    const { catalog, clients, filterGroups, indexes: indexes2 } = this;
+    const { clients, filterGroups, indexes: indexes2 } = this;
     if (clients.has(client)) {
       throw new Error("Client already connected.");
     }
@@ -14365,7 +14448,7 @@ var Coordinator = class {
     client.coordinator = this;
     const fields = client.fields();
     if (fields?.length) {
-      client.fieldInfo(await catalog.queryFields(fields));
+      client.fieldInfo(await queryFieldInfo(this, fields));
     }
     const filter3 = client.filterBy;
     if (filter3) {
@@ -26211,7 +26294,7 @@ var C = () => (async (s2) => {
     return false;
   }
 })(new Uint8Array([0, 97, 115, 109, 1, 0, 0, 0, 1, 4, 1, 96, 0, 0, 3, 2, 1, 0, 5, 4, 1, 3, 1, 1, 10, 11, 1, 9, 0, 65, 0, 254, 16, 2, 0, 26, 11]));
-var _ = { name: "@duckdb/duckdb-wasm", version: "1.28.1-dev106.0", description: "DuckDB powered by WebAssembly", license: "MIT", repository: { type: "git", url: "https://github.com/duckdb/duckdb-wasm.git" }, keywords: ["sql", "duckdb", "relational", "database", "data", "query", "wasm", "analytics", "olap", "arrow", "parquet", "json", "csv"], dependencies: { "apache-arrow": "^14.0.1" }, devDependencies: { "@types/emscripten": "^1.39.10", "@types/jasmine": "^5.1.4", "@typescript-eslint/eslint-plugin": "^6.18.0", "@typescript-eslint/parser": "^6.18.0", esbuild: "^0.20.0", eslint: "^8.56.0", "eslint-plugin-jasmine": "^4.1.3", "eslint-plugin-react": "^7.33.2", "fast-glob": "^3.3.2", jasmine: "^5.1.0", "jasmine-core": "^5.1.1", "jasmine-spec-reporter": "^7.0.0", "js-sha256": "^0.11.0", karma: "^6.4.2", "karma-chrome-launcher": "^3.2.0", "karma-coverage": "^2.2.1", "karma-firefox-launcher": "^2.1.2", "karma-jasmine": "^5.1.0", "karma-jasmine-html-reporter": "^2.1.0", "karma-sourcemap-loader": "^0.4.0", "karma-spec-reporter": "^0.0.36", "make-dir": "^4.0.0", nyc: "^15.1.0", prettier: "^3.2.4", puppeteer: "^21.7.0", rimraf: "^5.0.5", s3rver: "^3.7.1", typedoc: "^0.25.7", typescript: "^5.3.3", "wasm-feature-detect": "^1.6.1", "web-worker": "^1.2.0" }, scripts: { "build:debug": "node bundle.mjs debug && tsc --emitDeclarationOnly", "build:release": "node bundle.mjs release && tsc --emitDeclarationOnly", docs: "typedoc", report: "node ./coverage.mjs", "test:node": "node --enable-source-maps ../../node_modules/jasmine/bin/jasmine ./dist/tests-node.cjs", "test:node:debug": "node --inspect-brk --enable-source-maps ../../node_modules/jasmine/bin/jasmine ./dist/tests-node.cjs", "test:node:coverage": "nyc -r json --report-dir ./coverage/node node ../../node_modules/jasmine/bin/jasmine ./dist/tests-node.cjs", "test:firefox": "karma start ./karma/tests-firefox.cjs", "test:chrome": "karma start ./karma/tests-chrome.cjs", "test:chrome:eh": "karma start ./karma/tests-chrome-eh.cjs", "test:chrome:coverage": "karma start ./karma/tests-chrome-coverage.cjs", "test:browser": "karma start ./karma/tests-all.cjs", "test:browser:debug": "karma start ./karma/tests-debug.cjs", test: "npm run test:chrome && npm run test:node", "test:coverage": "npm run test:chrome:coverage && npm run test:node:coverage && npm run report", lint: "eslint src test" }, files: ["dist", "!dist/types/test"], main: "dist/duckdb-browser.cjs", module: "dist/duckdb-browser.mjs", types: "dist/duckdb-browser.d.ts", jsdelivr: "dist/duckdb-browser.cjs", unpkg: "dist/duckdb-browser.mjs", sideEffects: false, browser: { fs: false, path: false, perf_hooks: false, os: false, worker_threads: false }, exports: { "./dist/duckdb-mvp.wasm": "./dist/duckdb-mvp.wasm", "./dist/duckdb-eh.wasm": "./dist/duckdb-eh.wasm", "./dist/duckdb-coi.wasm": "./dist/duckdb-coi.wasm", "./dist/duckdb-browser": "./dist/duckdb-browser.mjs", "./dist/duckdb-browser.cjs": "./dist/duckdb-browser.cjs", "./dist/duckdb-browser.mjs": "./dist/duckdb-browser.mjs", "./dist/duckdb-browser-blocking": "./dist/duckdb-browser-blocking.mjs", "./dist/duckdb-browser-blocking.mjs": "./dist/duckdb-browser-blocking.mjs", "./dist/duckdb-browser-blocking.cjs": "./dist/duckdb-browser-blocking.cjs", "./dist/duckdb-browser-coi.pthread.worker.js": "./dist/duckdb-browser-coi.pthread.worker.js", "./dist/duckdb-browser-coi.worker.js": "./dist/duckdb-browser-coi.worker.js", "./dist/duckdb-browser-eh.worker.js": "./dist/duckdb-browser-eh.worker.js", "./dist/duckdb-browser-mvp.worker.js": "./dist/duckdb-browser-mvp.worker.js", "./dist/duckdb-node": "./dist/duckdb-node.cjs", "./dist/duckdb-node.cjs": "./dist/duckdb-node.cjs", "./dist/duckdb-node-blocking": "./dist/duckdb-node-blocking.cjs", "./dist/duckdb-node-blocking.cjs": "./dist/duckdb-node-blocking.cjs", "./dist/duckdb-node-eh.worker.cjs": "./dist/duckdb-node-eh.worker.cjs", "./dist/duckdb-node-mvp.worker.cjs": "./dist/duckdb-node-mvp.worker.cjs", "./blocking": { browser: { types: "./dist/duckdb-browser-blocking.d.ts", import: "./dist/duckdb-browser-blocking.mjs", require: "./dist/duckdb-browser-blocking.cjs" }, node: { types: "./dist/duckdb-node-blocking.d.ts", require: "./dist/duckdb-node-blocking.cjs", import: "./dist/duckdb-node-blocking.cjs" }, types: "./dist/duckdb-browser-blocking.d.ts", import: "./dist/duckdb-browser-blocking.mjs", require: "./dist/duckdb-browser-blocking.cjs" }, ".": { browser: { types: "./dist/duckdb-browser.d.ts", import: "./dist/duckdb-browser.mjs", require: "./dist/duckdb-browser.cjs" }, node: { types: "./dist/duckdb-node.d.ts", import: "./dist/duckdb-node.cjs", require: "./dist/duckdb-node.cjs" }, types: "./dist/duckdb-browser.d.ts", import: "./dist/duckdb-browser.mjs", require: "./dist/duckdb-browser.cjs" } } };
+var _ = { name: "@duckdb/duckdb-wasm", version: "1.28.1-dev99.0", description: "DuckDB powered by WebAssembly", license: "MIT", repository: { type: "git", url: "https://github.com/duckdb/duckdb-wasm.git" }, keywords: ["sql", "duckdb", "relational", "database", "data", "query", "wasm", "analytics", "olap", "arrow", "parquet", "json", "csv"], dependencies: { "apache-arrow": "^14.0.1" }, devDependencies: { "@types/emscripten": "^1.39.10", "@types/jasmine": "^5.1.4", "@typescript-eslint/eslint-plugin": "^6.18.0", "@typescript-eslint/parser": "^6.18.0", esbuild: "^0.19.10", eslint: "^8.56.0", "eslint-plugin-jasmine": "^4.1.3", "eslint-plugin-react": "^7.33.2", "fast-glob": "^3.3.2", jasmine: "^5.1.0", "jasmine-core": "^5.1.1", "jasmine-spec-reporter": "^7.0.0", "js-sha256": "^0.10.1", karma: "^6.4.2", "karma-chrome-launcher": "^3.2.0", "karma-coverage": "^2.2.1", "karma-firefox-launcher": "^2.1.2", "karma-jasmine": "^5.1.0", "karma-jasmine-html-reporter": "^2.1.0", "karma-sourcemap-loader": "^0.4.0", "karma-spec-reporter": "^0.0.36", "make-dir": "^4.0.0", nyc: "^15.1.0", prettier: "^3.2.2", puppeteer: "^21.7.0", rimraf: "^5.0.5", s3rver: "^3.7.1", typedoc: "^0.25.7", typescript: "^5.3.3", "wasm-feature-detect": "^1.6.1", "web-worker": "^1.2.0" }, scripts: { "build:debug": "node bundle.mjs debug && tsc --emitDeclarationOnly", "build:release": "node bundle.mjs release && tsc --emitDeclarationOnly", docs: "typedoc", report: "node ./coverage.mjs", "test:node": "node --enable-source-maps ../../node_modules/jasmine/bin/jasmine ./dist/tests-node.cjs", "test:node:debug": "node --inspect-brk --enable-source-maps ../../node_modules/jasmine/bin/jasmine ./dist/tests-node.cjs", "test:node:coverage": "nyc -r json --report-dir ./coverage/node node ../../node_modules/jasmine/bin/jasmine ./dist/tests-node.cjs", "test:firefox": "karma start ./karma/tests-firefox.cjs", "test:chrome": "karma start ./karma/tests-chrome.cjs", "test:chrome:eh": "karma start ./karma/tests-chrome-eh.cjs", "test:chrome:coverage": "karma start ./karma/tests-chrome-coverage.cjs", "test:browser": "karma start ./karma/tests-all.cjs", "test:browser:debug": "karma start ./karma/tests-debug.cjs", test: "npm run test:chrome && npm run test:node", "test:coverage": "npm run test:chrome:coverage && npm run test:node:coverage && npm run report", lint: "eslint src test" }, files: ["dist", "!dist/types/test"], main: "dist/duckdb-browser.cjs", module: "dist/duckdb-browser.mjs", types: "dist/duckdb-browser.d.ts", jsdelivr: "dist/duckdb-browser.cjs", unpkg: "dist/duckdb-browser.mjs", sideEffects: false, browser: { fs: false, path: false, perf_hooks: false, os: false, worker_threads: false }, exports: { "./dist/duckdb-mvp.wasm": "./dist/duckdb-mvp.wasm", "./dist/duckdb-eh.wasm": "./dist/duckdb-eh.wasm", "./dist/duckdb-coi.wasm": "./dist/duckdb-coi.wasm", "./dist/duckdb-browser": "./dist/duckdb-browser.mjs", "./dist/duckdb-browser.cjs": "./dist/duckdb-browser.cjs", "./dist/duckdb-browser.mjs": "./dist/duckdb-browser.mjs", "./dist/duckdb-browser-blocking": "./dist/duckdb-browser-blocking.mjs", "./dist/duckdb-browser-blocking.mjs": "./dist/duckdb-browser-blocking.mjs", "./dist/duckdb-browser-blocking.cjs": "./dist/duckdb-browser-blocking.cjs", "./dist/duckdb-browser-coi.pthread.worker.js": "./dist/duckdb-browser-coi.pthread.worker.js", "./dist/duckdb-browser-coi.worker.js": "./dist/duckdb-browser-coi.worker.js", "./dist/duckdb-browser-eh.worker.js": "./dist/duckdb-browser-eh.worker.js", "./dist/duckdb-browser-mvp.worker.js": "./dist/duckdb-browser-mvp.worker.js", "./dist/duckdb-node": "./dist/duckdb-node.cjs", "./dist/duckdb-node.cjs": "./dist/duckdb-node.cjs", "./dist/duckdb-node-blocking": "./dist/duckdb-node-blocking.cjs", "./dist/duckdb-node-blocking.cjs": "./dist/duckdb-node-blocking.cjs", "./dist/duckdb-node-eh.worker.cjs": "./dist/duckdb-node-eh.worker.cjs", "./dist/duckdb-node-mvp.worker.cjs": "./dist/duckdb-node-mvp.worker.cjs", "./blocking": { browser: { types: "./dist/duckdb-browser-blocking.d.ts", import: "./dist/duckdb-browser-blocking.mjs", require: "./dist/duckdb-browser-blocking.cjs" }, node: { types: "./dist/duckdb-node-blocking.d.ts", require: "./dist/duckdb-node-blocking.cjs", import: "./dist/duckdb-node-blocking.cjs" }, types: "./dist/duckdb-browser-blocking.d.ts", import: "./dist/duckdb-browser-blocking.mjs", require: "./dist/duckdb-browser-blocking.cjs" }, ".": { browser: { types: "./dist/duckdb-browser.d.ts", import: "./dist/duckdb-browser.mjs", require: "./dist/duckdb-browser.cjs" }, node: { types: "./dist/duckdb-node.d.ts", import: "./dist/duckdb-node.cjs", require: "./dist/duckdb-node.cjs" }, types: "./dist/duckdb-browser.d.ts", import: "./dist/duckdb-browser.mjs", require: "./dist/duckdb-browser.cjs" } } };
 var W = _.name;
 var v = _.version;
 var I = _.version.split(".");
@@ -33464,46 +33547,46 @@ function streamGeometry(geometry, stream) {
   }
 }
 var streamObjectType = {
-  Feature: function(object2, stream) {
-    streamGeometry(object2.geometry, stream);
+  Feature: function(object, stream) {
+    streamGeometry(object.geometry, stream);
   },
-  FeatureCollection: function(object2, stream) {
-    var features = object2.features, i = -1, n = features.length;
+  FeatureCollection: function(object, stream) {
+    var features = object.features, i = -1, n = features.length;
     while (++i < n)
       streamGeometry(features[i].geometry, stream);
   }
 };
 var streamGeometryType = {
-  Sphere: function(object2, stream) {
+  Sphere: function(object, stream) {
     stream.sphere();
   },
-  Point: function(object2, stream) {
-    object2 = object2.coordinates;
-    stream.point(object2[0], object2[1], object2[2]);
+  Point: function(object, stream) {
+    object = object.coordinates;
+    stream.point(object[0], object[1], object[2]);
   },
-  MultiPoint: function(object2, stream) {
-    var coordinates = object2.coordinates, i = -1, n = coordinates.length;
+  MultiPoint: function(object, stream) {
+    var coordinates = object.coordinates, i = -1, n = coordinates.length;
     while (++i < n)
-      object2 = coordinates[i], stream.point(object2[0], object2[1], object2[2]);
+      object = coordinates[i], stream.point(object[0], object[1], object[2]);
   },
-  LineString: function(object2, stream) {
-    streamLine(object2.coordinates, stream, 0);
+  LineString: function(object, stream) {
+    streamLine(object.coordinates, stream, 0);
   },
-  MultiLineString: function(object2, stream) {
-    var coordinates = object2.coordinates, i = -1, n = coordinates.length;
+  MultiLineString: function(object, stream) {
+    var coordinates = object.coordinates, i = -1, n = coordinates.length;
     while (++i < n)
       streamLine(coordinates[i], stream, 0);
   },
-  Polygon: function(object2, stream) {
-    streamPolygon(object2.coordinates, stream);
+  Polygon: function(object, stream) {
+    streamPolygon(object.coordinates, stream);
   },
-  MultiPolygon: function(object2, stream) {
-    var coordinates = object2.coordinates, i = -1, n = coordinates.length;
+  MultiPolygon: function(object, stream) {
+    var coordinates = object.coordinates, i = -1, n = coordinates.length;
     while (++i < n)
       streamPolygon(coordinates[i], stream);
   },
-  GeometryCollection: function(object2, stream) {
-    var geometries = object2.geometries, i = -1, n = geometries.length;
+  GeometryCollection: function(object, stream) {
+    var geometries = object.geometries, i = -1, n = geometries.length;
     while (++i < n)
       streamGeometry(geometries[i], stream);
   }
@@ -33522,11 +33605,11 @@ function streamPolygon(coordinates, stream) {
     streamLine(coordinates[i], stream, 1);
   stream.polygonEnd();
 }
-function stream_default(object2, stream) {
-  if (object2 && streamObjectType.hasOwnProperty(object2.type)) {
-    streamObjectType[object2.type](object2, stream);
+function stream_default(object, stream) {
+  if (object && streamObjectType.hasOwnProperty(object.type)) {
+    streamObjectType[object.type](object, stream);
   } else {
-    streamGeometry(object2, stream);
+    streamGeometry(object, stream);
   }
 }
 
@@ -33650,12 +33733,12 @@ function centroidRingPoint(lambda, phi) {
   Z1 += w * (z0 + (z0 = z2));
   centroidPointCartesian(x0, y0, z0);
 }
-function centroid_default(object2) {
+function centroid_default(object) {
   W0 = W1 = X0 = Y0 = Z0 = X1 = Y1 = Z1 = 0;
   X22 = new Adder();
   Y22 = new Adder();
   Z2 = new Adder();
-  stream_default(object2, centroidStream);
+  stream_default(object, centroidStream);
   var x4 = +X22, y4 = +Y22, z2 = +Z2, m2 = hypot(x4, y4, z2);
   if (m2 < epsilon22) {
     x4 = X1, y4 = Y1, z2 = Z1;
@@ -34839,28 +34922,28 @@ function appendRound2(digits) {
 // ../../node_modules/d3-geo/src/path/index.js
 function path_default(projection3, context) {
   let digits = 3, pointRadius = 4.5, projectionStream, contextStream;
-  function path2(object2) {
-    if (object2) {
+  function path2(object) {
+    if (object) {
       if (typeof pointRadius === "function")
         contextStream.pointRadius(+pointRadius.apply(this, arguments));
-      stream_default(object2, projectionStream(contextStream));
+      stream_default(object, projectionStream(contextStream));
     }
     return contextStream.result();
   }
-  path2.area = function(object2) {
-    stream_default(object2, projectionStream(area_default2));
+  path2.area = function(object) {
+    stream_default(object, projectionStream(area_default2));
     return area_default2.result();
   };
-  path2.measure = function(object2) {
-    stream_default(object2, projectionStream(measure_default));
+  path2.measure = function(object) {
+    stream_default(object, projectionStream(measure_default));
     return measure_default.result();
   };
-  path2.bounds = function(object2) {
-    stream_default(object2, projectionStream(bounds_default));
+  path2.bounds = function(object) {
+    stream_default(object, projectionStream(bounds_default));
     return bounds_default.result();
   };
-  path2.centroid = function(object2) {
-    stream_default(object2, projectionStream(centroid_default2));
+  path2.centroid = function(object) {
+    stream_default(object, projectionStream(centroid_default2));
     return centroid_default2.result();
   };
   path2.projection = function(_2) {
@@ -34941,37 +35024,37 @@ TransformStream.prototype = {
 };
 
 // ../../node_modules/d3-geo/src/projection/fit.js
-function fit(projection3, fitBounds, object2) {
+function fit(projection3, fitBounds, object) {
   var clip = projection3.clipExtent && projection3.clipExtent();
   projection3.scale(150).translate([0, 0]);
   if (clip != null)
     projection3.clipExtent(null);
-  stream_default(object2, projection3.stream(bounds_default));
+  stream_default(object, projection3.stream(bounds_default));
   fitBounds(bounds_default.result());
   if (clip != null)
     projection3.clipExtent(clip);
   return projection3;
 }
-function fitExtent(projection3, extent4, object2) {
+function fitExtent(projection3, extent4, object) {
   return fit(projection3, function(b2) {
     var w = extent4[1][0] - extent4[0][0], h2 = extent4[1][1] - extent4[0][1], k3 = Math.min(w / (b2[1][0] - b2[0][0]), h2 / (b2[1][1] - b2[0][1])), x4 = +extent4[0][0] + (w - k3 * (b2[1][0] + b2[0][0])) / 2, y4 = +extent4[0][1] + (h2 - k3 * (b2[1][1] + b2[0][1])) / 2;
     projection3.scale(150 * k3).translate([x4, y4]);
-  }, object2);
+  }, object);
 }
-function fitSize(projection3, size, object2) {
-  return fitExtent(projection3, [[0, 0], size], object2);
+function fitSize(projection3, size, object) {
+  return fitExtent(projection3, [[0, 0], size], object);
 }
-function fitWidth(projection3, width2, object2) {
+function fitWidth(projection3, width2, object) {
   return fit(projection3, function(b2) {
     var w = +width2, k3 = w / (b2[1][0] - b2[0][0]), x4 = (w - k3 * (b2[1][0] + b2[0][0])) / 2, y4 = -k3 * b2[0][1];
     projection3.scale(150 * k3).translate([x4, y4]);
-  }, object2);
+  }, object);
 }
-function fitHeight(projection3, height2, object2) {
+function fitHeight(projection3, height2, object) {
   return fit(projection3, function(b2) {
     var h2 = +height2, k3 = h2 / (b2[1][1] - b2[0][1]), x4 = -k3 * b2[0][0], y4 = (h2 - k3 * (b2[1][1] + b2[0][1])) / 2;
     projection3.scale(150 * k3).translate([x4, y4]);
-  }, object2);
+  }, object);
 }
 
 // ../../node_modules/d3-geo/src/projection/resample.js
@@ -35143,17 +35226,17 @@ function projectionMutator(projectAt) {
   projection3.precision = function(_2) {
     return arguments.length ? (projectResample = resample_default(projectTransform, delta2 = _2 * _2), reset()) : sqrt(delta2);
   };
-  projection3.fitExtent = function(extent4, object2) {
-    return fitExtent(projection3, extent4, object2);
+  projection3.fitExtent = function(extent4, object) {
+    return fitExtent(projection3, extent4, object);
   };
-  projection3.fitSize = function(size, object2) {
-    return fitSize(projection3, size, object2);
+  projection3.fitSize = function(size, object) {
+    return fitSize(projection3, size, object);
   };
-  projection3.fitWidth = function(width2, object2) {
-    return fitWidth(projection3, width2, object2);
+  projection3.fitWidth = function(width2, object) {
+    return fitWidth(projection3, width2, object);
   };
-  projection3.fitHeight = function(height2, object2) {
-    return fitHeight(projection3, height2, object2);
+  projection3.fitHeight = function(height2, object) {
+    return fitHeight(projection3, height2, object);
   };
   function recenter() {
     var center2 = scaleTranslateRotate(k3, 0, 0, sx, sy, alpha).apply(null, project2(lambda, phi)), transform3 = scaleTranslateRotate(k3, x4 - center2[0], y4 - center2[1], sx, sy, alpha);
@@ -35294,17 +35377,17 @@ function albersUsa_default() {
     hawaiiPoint = hawaii.translate([x4 - 0.205 * k3, y4 + 0.212 * k3]).clipExtent([[x4 - 0.214 * k3 + epsilon6, y4 + 0.166 * k3 + epsilon6], [x4 - 0.115 * k3 - epsilon6, y4 + 0.234 * k3 - epsilon6]]).stream(pointStream);
     return reset();
   };
-  albersUsa.fitExtent = function(extent4, object2) {
-    return fitExtent(albersUsa, extent4, object2);
+  albersUsa.fitExtent = function(extent4, object) {
+    return fitExtent(albersUsa, extent4, object);
   };
-  albersUsa.fitSize = function(size, object2) {
-    return fitSize(albersUsa, size, object2);
+  albersUsa.fitSize = function(size, object) {
+    return fitSize(albersUsa, size, object);
   };
-  albersUsa.fitWidth = function(width2, object2) {
-    return fitWidth(albersUsa, width2, object2);
+  albersUsa.fitWidth = function(width2, object) {
+    return fitWidth(albersUsa, width2, object);
   };
-  albersUsa.fitHeight = function(height2, object2) {
-    return fitHeight(albersUsa, height2, object2);
+  albersUsa.fitHeight = function(height2, object) {
+    return fitHeight(albersUsa, height2, object);
   };
   function reset() {
     cache = cacheStream = null;
@@ -37779,6 +37862,9 @@ var Accent_default = colors_default("7fc97fbeaed4fdc086ffff99386cb0f0027fbf5b176
 // ../../node_modules/d3-scale-chromatic/src/categorical/Dark2.js
 var Dark2_default = colors_default("1b9e77d95f027570b3e7298a66a61ee6ab02a6761d666666");
 
+// ../../node_modules/d3-scale-chromatic/src/categorical/observable10.js
+var observable10_default = colors_default("4269d0efb118ff725c6cc5b03ca951ff8ab7a463f297bbf59c6b4e9498a0");
+
 // ../../node_modules/d3-scale-chromatic/src/categorical/Paired.js
 var Paired_default = colors_default("a6cee31f78b4b2df8a33a02cfb9a99e31a1cfdbf6fff7f00cab2d66a3d9affff99b15928");
 
@@ -39989,6 +40075,15 @@ function parse(string2, fallback) {
   return new Date(string2);
 }
 
+// ../../node_modules/@observablehq/plot/src/order.js
+function orderof(values2) {
+  if (values2 == null)
+    return;
+  const first3 = values2[0];
+  const last2 = values2[values2.length - 1];
+  return descending(first3, last2);
+}
+
 // ../../node_modules/@observablehq/plot/src/time.js
 var durationSecond2 = 1e3;
 var durationMinute2 = durationSecond2 * 60;
@@ -40582,13 +40677,6 @@ function maybeAnchor(value, name2) {
 function maybeFrameAnchor(value = "middle") {
   return maybeAnchor(value, "frameAnchor");
 }
-function orderof(values2) {
-  if (values2 == null)
-    return;
-  const first3 = values2[0];
-  const last2 = values2[values2.length - 1];
-  return descending(first3, last2);
-}
 function inherit2(options = {}, ...rest) {
   let o = options;
   for (const defaults23 of rest) {
@@ -40625,6 +40713,15 @@ function named2(things) {
 function maybeNamed(things) {
   return isIterable3(things) ? named2(things) : things;
 }
+function maybeClip(clip) {
+  if (clip === true)
+    clip = "frame";
+  else if (clip === false)
+    clip = null;
+  else if (clip != null)
+    clip = keyword(clip, "clip", ["frame", "sphere"]);
+  return clip;
+}
 
 // ../../node_modules/@observablehq/plot/src/scales/index.js
 var position = Symbol("position");
@@ -40944,6 +41041,8 @@ function groupn(x4, y4, {
                 extent4.x = x5;
               if (Y3)
                 extent4.y = y5;
+              if (G)
+                extent4.z = f2;
               if (filter3 && !filter3.reduce(g2, extent4))
                 continue;
               groupFacet.push(i++);
@@ -41042,10 +41141,7 @@ function maybeEvaluator(name2, reduce, inputs, asReduce = maybeReduce) {
   };
 }
 function maybeGroup(I2, X3) {
-  return X3 ? sort(
-    group(I2, (i) => X3[i]),
-    first2
-  ) : [[, I2]];
+  return X3 ? group(I2, (i) => X3[i]) : [[, I2]];
 }
 function maybeReduce(reduce, value, fallback = invalidReduce) {
   if (reduce == null)
@@ -41117,6 +41213,8 @@ function maybeGroupReduceFallback(reduce) {
       return reduceX;
     case "y":
       return reduceY;
+    case "z":
+      return reduceZ;
   }
   throw new Error(`invalid group reduce: ${reduce}`);
 }
@@ -41227,6 +41325,11 @@ var reduceY = {
     return y4;
   }
 };
+var reduceZ = {
+  reduceIndex(I2, X3, { z: z2 }) {
+    return z2;
+  }
+};
 function find2(test) {
   if (typeof test !== "function")
     throw new Error(`invalid test function: ${test}`);
@@ -41403,48 +41506,14 @@ function getSource(channels, key) {
   return channel.source === null ? null : channel;
 }
 
-// ../../node_modules/@observablehq/plot/src/memoize.js
-function memoize1(compute) {
-  let cacheValue, cacheKeys;
-  return (...keys) => {
-    if (cacheKeys?.length !== keys.length || cacheKeys.some((k3, i) => k3 !== keys[i])) {
-      cacheKeys = keys;
-      cacheValue = compute(...keys);
-    }
-    return cacheValue;
-  };
-}
-
-// ../../node_modules/@observablehq/plot/src/format.js
-var numberFormat = memoize1((locale3) => {
-  return new Intl.NumberFormat(locale3);
-});
-var monthFormat = memoize1((locale3, month) => {
-  return new Intl.DateTimeFormat(locale3, { timeZone: "UTC", ...month && { month } });
-});
-var weekdayFormat = memoize1((locale3, weekday) => {
-  return new Intl.DateTimeFormat(locale3, { timeZone: "UTC", ...weekday && { weekday } });
-});
-function formatNumber(locale3 = "en-US") {
-  const format3 = numberFormat(locale3);
-  return (i) => i != null && !isNaN(i) ? format3.format(i) : void 0;
-}
-function formatMonth(locale3 = "en-US", format3 = "short") {
-  const fmt = monthFormat(locale3, format3);
-  return (i) => i != null && !isNaN(i = +new Date(Date.UTC(2e3, +i))) ? fmt.format(i) : void 0;
-}
-function formatWeekday(locale3 = "en-US", format3 = "short") {
-  const fmt = weekdayFormat(locale3, format3);
-  return (i) => i != null && !isNaN(i = +new Date(Date.UTC(2001, 0, +i))) ? fmt.format(i) : void 0;
-}
-function formatIsoDate(date2) {
-  return format2(date2, "Invalid Date");
+// ../../node_modules/@observablehq/plot/src/context.js
+function createContext(options = {}) {
+  const { document: document2 = typeof window !== "undefined" ? window.document : void 0, clip } = options;
+  return { document: document2, clip: maybeClip(clip) };
 }
-function formatAuto(locale3 = "en-US") {
-  const number7 = formatNumber(locale3);
-  return (v3) => (v3 instanceof Date ? formatIsoDate : typeof v3 === "number" ? number7 : string)(v3);
+function create3(name2, { document: document2 }) {
+  return select_default2(creator_default(name2).call(document2.documentElement));
 }
-var formatDefault = formatAuto();
 
 // ../../node_modules/@observablehq/plot/src/warnings.js
 var warnings = 0;
@@ -41463,387 +41532,6 @@ function warn(message) {
   ++warnings;
 }
 
-// ../../node_modules/@observablehq/plot/src/style.js
-var offset = (typeof window !== "undefined" ? window.devicePixelRatio > 1 : typeof it === "undefined") ? 0 : 0.5;
-var nextClipId = 0;
-function getClipId() {
-  return `plot-clip-${++nextClipId}`;
-}
-function styles(mark2, {
-  title,
-  href,
-  ariaLabel: variaLabel,
-  ariaDescription,
-  ariaHidden,
-  target,
-  fill,
-  fillOpacity,
-  stroke,
-  strokeWidth,
-  strokeOpacity,
-  strokeLinejoin,
-  strokeLinecap,
-  strokeMiterlimit,
-  strokeDasharray,
-  strokeDashoffset,
-  opacity: opacity2,
-  mixBlendMode,
-  imageFilter,
-  paintOrder,
-  pointerEvents,
-  shapeRendering,
-  channels
-}, {
-  ariaLabel: cariaLabel,
-  fill: defaultFill = "currentColor",
-  fillOpacity: defaultFillOpacity,
-  stroke: defaultStroke = "none",
-  strokeOpacity: defaultStrokeOpacity,
-  strokeWidth: defaultStrokeWidth,
-  strokeLinecap: defaultStrokeLinecap,
-  strokeLinejoin: defaultStrokeLinejoin,
-  strokeMiterlimit: defaultStrokeMiterlimit,
-  paintOrder: defaultPaintOrder
-}) {
-  if (defaultFill === null) {
-    fill = null;
-    fillOpacity = null;
-  }
-  if (defaultStroke === null) {
-    stroke = null;
-    strokeOpacity = null;
-  }
-  if (isNoneish(defaultFill)) {
-    if (!isNoneish(defaultStroke) && (!isNoneish(fill) || channels?.fill))
-      defaultStroke = "none";
-  } else {
-    if (isNoneish(defaultStroke) && (!isNoneish(stroke) || channels?.stroke))
-      defaultFill = "none";
-  }
-  const [vfill, cfill] = maybeColorChannel(fill, defaultFill);
-  const [vfillOpacity, cfillOpacity] = maybeNumberChannel(fillOpacity, defaultFillOpacity);
-  const [vstroke, cstroke] = maybeColorChannel(stroke, defaultStroke);
-  const [vstrokeOpacity, cstrokeOpacity] = maybeNumberChannel(strokeOpacity, defaultStrokeOpacity);
-  const [vopacity, copacity] = maybeNumberChannel(opacity2);
-  if (!isNone(cstroke)) {
-    if (strokeWidth === void 0)
-      strokeWidth = defaultStrokeWidth;
-    if (strokeLinecap === void 0)
-      strokeLinecap = defaultStrokeLinecap;
-    if (strokeLinejoin === void 0)
-      strokeLinejoin = defaultStrokeLinejoin;
-    if (strokeMiterlimit === void 0 && !isRound(strokeLinejoin))
-      strokeMiterlimit = defaultStrokeMiterlimit;
-    if (!isNone(cfill) && paintOrder === void 0)
-      paintOrder = defaultPaintOrder;
-  }
-  const [vstrokeWidth, cstrokeWidth] = maybeNumberChannel(strokeWidth);
-  if (defaultFill !== null) {
-    mark2.fill = impliedString(cfill, "currentColor");
-    mark2.fillOpacity = impliedNumber(cfillOpacity, 1);
-  }
-  if (defaultStroke !== null) {
-    mark2.stroke = impliedString(cstroke, "none");
-    mark2.strokeWidth = impliedNumber(cstrokeWidth, 1);
-    mark2.strokeOpacity = impliedNumber(cstrokeOpacity, 1);
-    mark2.strokeLinejoin = impliedString(strokeLinejoin, "miter");
-    mark2.strokeLinecap = impliedString(strokeLinecap, "butt");
-    mark2.strokeMiterlimit = impliedNumber(strokeMiterlimit, 4);
-    mark2.strokeDasharray = impliedString(strokeDasharray, "none");
-    mark2.strokeDashoffset = impliedString(strokeDashoffset, "0");
-  }
-  mark2.target = string(target);
-  mark2.ariaLabel = string(cariaLabel);
-  mark2.ariaDescription = string(ariaDescription);
-  mark2.ariaHidden = string(ariaHidden);
-  mark2.opacity = impliedNumber(copacity, 1);
-  mark2.mixBlendMode = impliedString(mixBlendMode, "normal");
-  mark2.imageFilter = impliedString(imageFilter, "none");
-  mark2.paintOrder = impliedString(paintOrder, "normal");
-  mark2.pointerEvents = impliedString(pointerEvents, "auto");
-  mark2.shapeRendering = impliedString(shapeRendering, "auto");
-  return {
-    title: { value: title, optional: true, filter: null },
-    href: { value: href, optional: true, filter: null },
-    ariaLabel: { value: variaLabel, optional: true, filter: null },
-    fill: { value: vfill, scale: "auto", optional: true },
-    fillOpacity: { value: vfillOpacity, scale: "auto", optional: true },
-    stroke: { value: vstroke, scale: "auto", optional: true },
-    strokeOpacity: { value: vstrokeOpacity, scale: "auto", optional: true },
-    strokeWidth: { value: vstrokeWidth, optional: true },
-    opacity: { value: vopacity, scale: "auto", optional: true }
-  };
-}
-function applyTitle(selection2, L2) {
-  if (L2)
-    selection2.filter((i) => nonempty(L2[i])).append("title").call(applyText, L2);
-}
-function applyTitleGroup(selection2, L2) {
-  if (L2)
-    selection2.filter(([i]) => nonempty(L2[i])).append("title").call(applyTextGroup, L2);
-}
-function applyText(selection2, T) {
-  if (T)
-    selection2.text((i) => formatDefault(T[i]));
-}
-function applyTextGroup(selection2, T) {
-  if (T)
-    selection2.text(([i]) => formatDefault(T[i]));
-}
-function applyChannelStyles(selection2, { target, tip: tip2 }, {
-  ariaLabel: AL,
-  title: T,
-  fill: F2,
-  fillOpacity: FO,
-  stroke: S2,
-  strokeOpacity: SO,
-  strokeWidth: SW,
-  opacity: O2,
-  href: H2
-}) {
-  if (AL)
-    applyAttr(selection2, "aria-label", (i) => AL[i]);
-  if (F2)
-    applyAttr(selection2, "fill", (i) => F2[i]);
-  if (FO)
-    applyAttr(selection2, "fill-opacity", (i) => FO[i]);
-  if (S2)
-    applyAttr(selection2, "stroke", (i) => S2[i]);
-  if (SO)
-    applyAttr(selection2, "stroke-opacity", (i) => SO[i]);
-  if (SW)
-    applyAttr(selection2, "stroke-width", (i) => SW[i]);
-  if (O2)
-    applyAttr(selection2, "opacity", (i) => O2[i]);
-  if (H2)
-    applyHref(selection2, (i) => H2[i], target);
-  if (!tip2)
-    applyTitle(selection2, T);
-}
-function applyGroupedChannelStyles(selection2, { target, tip: tip2 }, {
-  ariaLabel: AL,
-  title: T,
-  fill: F2,
-  fillOpacity: FO,
-  stroke: S2,
-  strokeOpacity: SO,
-  strokeWidth: SW,
-  opacity: O2,
-  href: H2
-}) {
-  if (AL)
-    applyAttr(selection2, "aria-label", ([i]) => AL[i]);
-  if (F2)
-    applyAttr(selection2, "fill", ([i]) => F2[i]);
-  if (FO)
-    applyAttr(selection2, "fill-opacity", ([i]) => FO[i]);
-  if (S2)
-    applyAttr(selection2, "stroke", ([i]) => S2[i]);
-  if (SO)
-    applyAttr(selection2, "stroke-opacity", ([i]) => SO[i]);
-  if (SW)
-    applyAttr(selection2, "stroke-width", ([i]) => SW[i]);
-  if (O2)
-    applyAttr(selection2, "opacity", ([i]) => O2[i]);
-  if (H2)
-    applyHref(selection2, ([i]) => H2[i], target);
-  if (!tip2)
-    applyTitleGroup(selection2, T);
-}
-function groupAesthetics({
-  ariaLabel: AL,
-  title: T,
-  fill: F2,
-  fillOpacity: FO,
-  stroke: S2,
-  strokeOpacity: SO,
-  strokeWidth: SW,
-  opacity: O2,
-  href: H2
-}, { tip: tip2 }) {
-  return [AL, tip2 ? void 0 : T, F2, FO, S2, SO, SW, O2, H2].filter((c4) => c4 !== void 0);
-}
-function groupZ2(I2, Z3, z2) {
-  const G = group(I2, (i) => Z3[i]);
-  if (z2 === void 0 && G.size > 1 + I2.length >> 1) {
-    warn(
-      `Warning: the implicit z channel has high cardinality. This may occur when the fill or stroke channel is associated with quantitative data rather than ordinal or categorical data. You can suppress this warning by setting the z option explicitly; if this data represents a single series, set z to null.`
-    );
-  }
-  return G.values();
-}
-function* groupIndex(I2, position3, mark2, channels) {
-  const { z: z2 } = mark2;
-  const { z: Z3 } = channels;
-  const A5 = groupAesthetics(channels, mark2);
-  const C3 = [...position3, ...A5];
-  for (const G of Z3 ? groupZ2(I2, Z3, z2) : [I2]) {
-    let Ag;
-    let Gg;
-    out:
-      for (const i of G) {
-        for (const c4 of C3) {
-          if (!defined(c4[i])) {
-            if (Gg)
-              Gg.push(-1);
-            continue out;
-          }
-        }
-        if (Ag === void 0) {
-          if (Gg)
-            yield Gg;
-          Ag = A5.map((c4) => keyof2(c4[i])), Gg = [i];
-          continue;
-        }
-        Gg.push(i);
-        for (let j2 = 0; j2 < A5.length; ++j2) {
-          const k3 = keyof2(A5[j2][i]);
-          if (k3 !== Ag[j2]) {
-            yield Gg;
-            Ag = A5.map((c4) => keyof2(c4[i])), Gg = [i];
-            continue out;
-          }
-        }
-      }
-    if (Gg)
-      yield Gg;
-  }
-}
-function maybeClip(clip) {
-  if (clip === true)
-    clip = "frame";
-  else if (clip === false)
-    clip = null;
-  else if (clip != null)
-    clip = keyword(clip, "clip", ["frame", "sphere"]);
-  return clip;
-}
-function applyClip(selection2, mark2, dimensions, context) {
-  let clipUrl;
-  const { clip = context.clip } = mark2;
-  switch (clip) {
-    case "frame": {
-      const { width: width2, height: height2, marginLeft: marginLeft2, marginRight: marginRight2, marginTop: marginTop2, marginBottom: marginBottom2 } = dimensions;
-      const id2 = getClipId();
-      clipUrl = `url(#${id2})`;
-      selection2 = create3("svg:g", context).call(
-        (g2) => g2.append("svg:clipPath").attr("id", id2).append("rect").attr("x", marginLeft2).attr("y", marginTop2).attr("width", width2 - marginRight2 - marginLeft2).attr("height", height2 - marginTop2 - marginBottom2)
-      ).each(function() {
-        this.appendChild(selection2.node());
-        selection2.node = () => this;
-      });
-      break;
-    }
-    case "sphere": {
-      const { projection: projection3 } = context;
-      if (!projection3)
-        throw new Error(`the "sphere" clip option requires a projection`);
-      const id2 = getClipId();
-      clipUrl = `url(#${id2})`;
-      selection2.append("clipPath").attr("id", id2).append("path").attr("d", path_default(projection3)({ type: "Sphere" }));
-      break;
-    }
-  }
-  applyAttr(selection2, "aria-label", mark2.ariaLabel);
-  applyAttr(selection2, "aria-description", mark2.ariaDescription);
-  applyAttr(selection2, "aria-hidden", mark2.ariaHidden);
-  applyAttr(selection2, "clip-path", clipUrl);
-}
-function applyIndirectStyles(selection2, mark2, dimensions, context) {
-  applyClip(selection2, mark2, dimensions, context);
-  applyAttr(selection2, "fill", mark2.fill);
-  applyAttr(selection2, "fill-opacity", mark2.fillOpacity);
-  applyAttr(selection2, "stroke", mark2.stroke);
-  applyAttr(selection2, "stroke-width", mark2.strokeWidth);
-  applyAttr(selection2, "stroke-opacity", mark2.strokeOpacity);
-  applyAttr(selection2, "stroke-linejoin", mark2.strokeLinejoin);
-  applyAttr(selection2, "stroke-linecap", mark2.strokeLinecap);
-  applyAttr(selection2, "stroke-miterlimit", mark2.strokeMiterlimit);
-  applyAttr(selection2, "stroke-dasharray", mark2.strokeDasharray);
-  applyAttr(selection2, "stroke-dashoffset", mark2.strokeDashoffset);
-  applyAttr(selection2, "shape-rendering", mark2.shapeRendering);
-  applyAttr(selection2, "filter", mark2.imageFilter);
-  applyAttr(selection2, "paint-order", mark2.paintOrder);
-  const { pointerEvents = context.pointerSticky === false ? "none" : void 0 } = mark2;
-  applyAttr(selection2, "pointer-events", pointerEvents);
-}
-function applyDirectStyles(selection2, mark2) {
-  applyStyle(selection2, "mix-blend-mode", mark2.mixBlendMode);
-  applyAttr(selection2, "opacity", mark2.opacity);
-}
-function applyHref(selection2, href, target) {
-  selection2.each(function(i) {
-    const h2 = href(i);
-    if (h2 != null) {
-      const a3 = this.ownerDocument.createElementNS(namespaces_default.svg, "a");
-      a3.setAttribute("fill", "inherit");
-      a3.setAttributeNS(namespaces_default.xlink, "href", h2);
-      if (target != null)
-        a3.setAttribute("target", target);
-      this.parentNode.insertBefore(a3, this).appendChild(this);
-    }
-  });
-}
-function applyAttr(selection2, name2, value) {
-  if (value != null)
-    selection2.attr(name2, value);
-}
-function applyStyle(selection2, name2, value) {
-  if (value != null)
-    selection2.style(name2, value);
-}
-function applyTransform(selection2, mark2, { x: x4, y: y4 }, tx = offset, ty = offset) {
-  tx += mark2.dx;
-  ty += mark2.dy;
-  if (x4?.bandwidth)
-    tx += x4.bandwidth() / 2;
-  if (y4?.bandwidth)
-    ty += y4.bandwidth() / 2;
-  if (tx || ty)
-    selection2.attr("transform", `translate(${tx},${ty})`);
-}
-function impliedString(value, impliedValue) {
-  if ((value = string(value)) !== impliedValue)
-    return value;
-}
-function impliedNumber(value, impliedValue) {
-  if ((value = number5(value)) !== impliedValue)
-    return value;
-}
-var validClassName = /^-?([_a-z]|[\240-\377]|\\[0-9a-f]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])([_a-z0-9-]|[\240-\377]|\\[0-9a-f]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])*$/i;
-function maybeClassName(name2) {
-  if (name2 === void 0)
-    return "plot-d6a7b5";
-  name2 = `${name2}`;
-  if (!validClassName.test(name2))
-    throw new Error(`invalid class name: ${name2}`);
-  return name2;
-}
-function applyInlineStyles(selection2, style2) {
-  if (typeof style2 === "string") {
-    selection2.property("style", style2);
-  } else if (style2 != null) {
-    for (const element of selection2) {
-      Object.assign(element.style, style2);
-    }
-  }
-}
-function applyFrameAnchor({ frameAnchor }, { width: width2, height: height2, marginTop: marginTop2, marginRight: marginRight2, marginBottom: marginBottom2, marginLeft: marginLeft2 }) {
-  return [
-    /left$/.test(frameAnchor) ? marginLeft2 : /right$/.test(frameAnchor) ? width2 - marginRight2 : (marginLeft2 + width2 - marginRight2) / 2,
-    /^top/.test(frameAnchor) ? marginTop2 : /^bottom/.test(frameAnchor) ? height2 - marginBottom2 : (marginTop2 + height2 - marginBottom2) / 2
-  ];
-}
-
-// ../../node_modules/@observablehq/plot/src/context.js
-function createContext(options = {}) {
-  const { document: document2 = typeof window !== "undefined" ? window.document : void 0, clip } = options;
-  return { document: document2, clip: maybeClip(clip) };
-}
-function create3(name2, { document: document2 }) {
-  return select_default2(creator_default(name2).call(document2.documentElement));
-}
-
 // ../../node_modules/@observablehq/plot/src/projection.js
 var pi4 = Math.PI;
 var tau5 = 2 * pi4;
@@ -42082,29 +41770,17 @@ function getGeometryChannels(channel) {
     sphere() {
     }
   };
-  for (const object2 of channel.value)
-    stream_default(object2, sink);
+  for (const object of channel.value)
+    stream_default(object, sink);
   return [x4, y4];
 }
 
 // ../../node_modules/@observablehq/plot/src/scales/schemes.js
-var schemeObservable10 = [
-  "#4269d0",
-  "#efb118",
-  "#ff725c",
-  "#6cc5b0",
-  "#3ca951",
-  "#ff8ab7",
-  "#a463f2",
-  "#97bbf5",
-  "#9c6b4e",
-  "#9498a0"
-];
 var categoricalSchemes = /* @__PURE__ */ new Map([
   ["accent", Accent_default],
   ["category10", category10_default],
   ["dark2", Dark2_default],
-  ["observable10", schemeObservable10],
+  ["observable10", observable10_default],
   ["paired", Paired_default],
   ["pastel1", Pastel1_default],
   ["pastel2", Pastel2_default],
@@ -43246,6 +42922,412 @@ function exposeScale({ scale: scale3, type: type2, domain, range: range3, interp
   };
 }
 
+// ../../node_modules/@observablehq/plot/src/memoize.js
+function memoize1(compute) {
+  let cacheValue, cacheKeys;
+  return (...keys) => {
+    if (cacheKeys?.length !== keys.length || cacheKeys.some((k3, i) => k3 !== keys[i])) {
+      cacheKeys = keys;
+      cacheValue = compute(...keys);
+    }
+    return cacheValue;
+  };
+}
+
+// ../../node_modules/@observablehq/plot/src/format.js
+var numberFormat = memoize1((locale3) => {
+  return new Intl.NumberFormat(locale3);
+});
+var monthFormat = memoize1((locale3, month) => {
+  return new Intl.DateTimeFormat(locale3, { timeZone: "UTC", ...month && { month } });
+});
+var weekdayFormat = memoize1((locale3, weekday) => {
+  return new Intl.DateTimeFormat(locale3, { timeZone: "UTC", ...weekday && { weekday } });
+});
+function formatNumber(locale3 = "en-US") {
+  const format3 = numberFormat(locale3);
+  return (i) => i != null && !isNaN(i) ? format3.format(i) : void 0;
+}
+function formatMonth(locale3 = "en-US", format3 = "short") {
+  const fmt = monthFormat(locale3, format3);
+  return (i) => i != null && !isNaN(i = +new Date(Date.UTC(2e3, +i))) ? fmt.format(i) : void 0;
+}
+function formatWeekday(locale3 = "en-US", format3 = "short") {
+  const fmt = weekdayFormat(locale3, format3);
+  return (i) => i != null && !isNaN(i = +new Date(Date.UTC(2001, 0, +i))) ? fmt.format(i) : void 0;
+}
+function formatIsoDate(date2) {
+  return format2(date2, "Invalid Date");
+}
+function formatAuto(locale3 = "en-US") {
+  const number7 = formatNumber(locale3);
+  return (v3) => (v3 instanceof Date ? formatIsoDate : typeof v3 === "number" ? number7 : string)(v3);
+}
+var formatDefault = formatAuto();
+
+// ../../node_modules/@observablehq/plot/src/style.js
+var offset = (typeof window !== "undefined" ? window.devicePixelRatio > 1 : typeof it === "undefined") ? 0 : 0.5;
+var nextClipId = 0;
+function getClipId() {
+  return `plot-clip-${++nextClipId}`;
+}
+function styles(mark2, {
+  title,
+  href,
+  ariaLabel: variaLabel,
+  ariaDescription,
+  ariaHidden,
+  target,
+  fill,
+  fillOpacity,
+  stroke,
+  strokeWidth,
+  strokeOpacity,
+  strokeLinejoin,
+  strokeLinecap,
+  strokeMiterlimit,
+  strokeDasharray,
+  strokeDashoffset,
+  opacity: opacity2,
+  mixBlendMode,
+  imageFilter,
+  paintOrder,
+  pointerEvents,
+  shapeRendering,
+  channels
+}, {
+  ariaLabel: cariaLabel,
+  fill: defaultFill = "currentColor",
+  fillOpacity: defaultFillOpacity,
+  stroke: defaultStroke = "none",
+  strokeOpacity: defaultStrokeOpacity,
+  strokeWidth: defaultStrokeWidth,
+  strokeLinecap: defaultStrokeLinecap,
+  strokeLinejoin: defaultStrokeLinejoin,
+  strokeMiterlimit: defaultStrokeMiterlimit,
+  paintOrder: defaultPaintOrder
+}) {
+  if (defaultFill === null) {
+    fill = null;
+    fillOpacity = null;
+  }
+  if (defaultStroke === null) {
+    stroke = null;
+    strokeOpacity = null;
+  }
+  if (isNoneish(defaultFill)) {
+    if (!isNoneish(defaultStroke) && (!isNoneish(fill) || channels?.fill))
+      defaultStroke = "none";
+  } else {
+    if (isNoneish(defaultStroke) && (!isNoneish(stroke) || channels?.stroke))
+      defaultFill = "none";
+  }
+  const [vfill, cfill] = maybeColorChannel(fill, defaultFill);
+  const [vfillOpacity, cfillOpacity] = maybeNumberChannel(fillOpacity, defaultFillOpacity);
+  const [vstroke, cstroke] = maybeColorChannel(stroke, defaultStroke);
+  const [vstrokeOpacity, cstrokeOpacity] = maybeNumberChannel(strokeOpacity, defaultStrokeOpacity);
+  const [vopacity, copacity] = maybeNumberChannel(opacity2);
+  if (!isNone(cstroke)) {
+    if (strokeWidth === void 0)
+      strokeWidth = defaultStrokeWidth;
+    if (strokeLinecap === void 0)
+      strokeLinecap = defaultStrokeLinecap;
+    if (strokeLinejoin === void 0)
+      strokeLinejoin = defaultStrokeLinejoin;
+    if (strokeMiterlimit === void 0 && !isRound(strokeLinejoin))
+      strokeMiterlimit = defaultStrokeMiterlimit;
+    if (!isNone(cfill) && paintOrder === void 0)
+      paintOrder = defaultPaintOrder;
+  }
+  const [vstrokeWidth, cstrokeWidth] = maybeNumberChannel(strokeWidth);
+  if (defaultFill !== null) {
+    mark2.fill = impliedString(cfill, "currentColor");
+    mark2.fillOpacity = impliedNumber(cfillOpacity, 1);
+  }
+  if (defaultStroke !== null) {
+    mark2.stroke = impliedString(cstroke, "none");
+    mark2.strokeWidth = impliedNumber(cstrokeWidth, 1);
+    mark2.strokeOpacity = impliedNumber(cstrokeOpacity, 1);
+    mark2.strokeLinejoin = impliedString(strokeLinejoin, "miter");
+    mark2.strokeLinecap = impliedString(strokeLinecap, "butt");
+    mark2.strokeMiterlimit = impliedNumber(strokeMiterlimit, 4);
+    mark2.strokeDasharray = impliedString(strokeDasharray, "none");
+    mark2.strokeDashoffset = impliedString(strokeDashoffset, "0");
+  }
+  mark2.target = string(target);
+  mark2.ariaLabel = string(cariaLabel);
+  mark2.ariaDescription = string(ariaDescription);
+  mark2.ariaHidden = string(ariaHidden);
+  mark2.opacity = impliedNumber(copacity, 1);
+  mark2.mixBlendMode = impliedString(mixBlendMode, "normal");
+  mark2.imageFilter = impliedString(imageFilter, "none");
+  mark2.paintOrder = impliedString(paintOrder, "normal");
+  mark2.pointerEvents = impliedString(pointerEvents, "auto");
+  mark2.shapeRendering = impliedString(shapeRendering, "auto");
+  return {
+    title: { value: title, optional: true, filter: null },
+    href: { value: href, optional: true, filter: null },
+    ariaLabel: { value: variaLabel, optional: true, filter: null },
+    fill: { value: vfill, scale: "auto", optional: true },
+    fillOpacity: { value: vfillOpacity, scale: "auto", optional: true },
+    stroke: { value: vstroke, scale: "auto", optional: true },
+    strokeOpacity: { value: vstrokeOpacity, scale: "auto", optional: true },
+    strokeWidth: { value: vstrokeWidth, optional: true },
+    opacity: { value: vopacity, scale: "auto", optional: true }
+  };
+}
+function applyTitle(selection2, L2) {
+  if (L2)
+    selection2.filter((i) => nonempty(L2[i])).append("title").call(applyText, L2);
+}
+function applyTitleGroup(selection2, L2) {
+  if (L2)
+    selection2.filter(([i]) => nonempty(L2[i])).append("title").call(applyTextGroup, L2);
+}
+function applyText(selection2, T) {
+  if (T)
+    selection2.text((i) => formatDefault(T[i]));
+}
+function applyTextGroup(selection2, T) {
+  if (T)
+    selection2.text(([i]) => formatDefault(T[i]));
+}
+function applyChannelStyles(selection2, { target, tip: tip2 }, {
+  ariaLabel: AL,
+  title: T,
+  fill: F2,
+  fillOpacity: FO,
+  stroke: S2,
+  strokeOpacity: SO,
+  strokeWidth: SW,
+  opacity: O2,
+  href: H2
+}) {
+  if (AL)
+    applyAttr(selection2, "aria-label", (i) => AL[i]);
+  if (F2)
+    applyAttr(selection2, "fill", (i) => F2[i]);
+  if (FO)
+    applyAttr(selection2, "fill-opacity", (i) => FO[i]);
+  if (S2)
+    applyAttr(selection2, "stroke", (i) => S2[i]);
+  if (SO)
+    applyAttr(selection2, "stroke-opacity", (i) => SO[i]);
+  if (SW)
+    applyAttr(selection2, "stroke-width", (i) => SW[i]);
+  if (O2)
+    applyAttr(selection2, "opacity", (i) => O2[i]);
+  if (H2)
+    applyHref(selection2, (i) => H2[i], target);
+  if (!tip2)
+    applyTitle(selection2, T);
+}
+function applyGroupedChannelStyles(selection2, { target, tip: tip2 }, {
+  ariaLabel: AL,
+  title: T,
+  fill: F2,
+  fillOpacity: FO,
+  stroke: S2,
+  strokeOpacity: SO,
+  strokeWidth: SW,
+  opacity: O2,
+  href: H2
+}) {
+  if (AL)
+    applyAttr(selection2, "aria-label", ([i]) => AL[i]);
+  if (F2)
+    applyAttr(selection2, "fill", ([i]) => F2[i]);
+  if (FO)
+    applyAttr(selection2, "fill-opacity", ([i]) => FO[i]);
+  if (S2)
+    applyAttr(selection2, "stroke", ([i]) => S2[i]);
+  if (SO)
+    applyAttr(selection2, "stroke-opacity", ([i]) => SO[i]);
+  if (SW)
+    applyAttr(selection2, "stroke-width", ([i]) => SW[i]);
+  if (O2)
+    applyAttr(selection2, "opacity", ([i]) => O2[i]);
+  if (H2)
+    applyHref(selection2, ([i]) => H2[i], target);
+  if (!tip2)
+    applyTitleGroup(selection2, T);
+}
+function groupAesthetics({
+  ariaLabel: AL,
+  title: T,
+  fill: F2,
+  fillOpacity: FO,
+  stroke: S2,
+  strokeOpacity: SO,
+  strokeWidth: SW,
+  opacity: O2,
+  href: H2
+}, { tip: tip2 }) {
+  return [AL, tip2 ? void 0 : T, F2, FO, S2, SO, SW, O2, H2].filter((c4) => c4 !== void 0);
+}
+function groupZ2(I2, Z3, z2) {
+  const G = group(I2, (i) => Z3[i]);
+  if (z2 === void 0 && G.size > 1 + I2.length >> 1) {
+    warn(
+      `Warning: the implicit z channel has high cardinality. This may occur when the fill or stroke channel is associated with quantitative data rather than ordinal or categorical data. You can suppress this warning by setting the z option explicitly; if this data represents a single series, set z to null.`
+    );
+  }
+  return G.values();
+}
+function* groupIndex(I2, position3, mark2, channels) {
+  const { z: z2 } = mark2;
+  const { z: Z3 } = channels;
+  const A5 = groupAesthetics(channels, mark2);
+  const C3 = [...position3, ...A5];
+  for (const G of Z3 ? groupZ2(I2, Z3, z2) : [I2]) {
+    let Ag;
+    let Gg;
+    out:
+      for (const i of G) {
+        for (const c4 of C3) {
+          if (!defined(c4[i])) {
+            if (Gg)
+              Gg.push(-1);
+            continue out;
+          }
+        }
+        if (Ag === void 0) {
+          if (Gg)
+            yield Gg;
+          Ag = A5.map((c4) => keyof2(c4[i])), Gg = [i];
+          continue;
+        }
+        Gg.push(i);
+        for (let j2 = 0; j2 < A5.length; ++j2) {
+          const k3 = keyof2(A5[j2][i]);
+          if (k3 !== Ag[j2]) {
+            yield Gg;
+            Ag = A5.map((c4) => keyof2(c4[i])), Gg = [i];
+            continue out;
+          }
+        }
+      }
+    if (Gg)
+      yield Gg;
+  }
+}
+function applyClip(selection2, mark2, dimensions, context) {
+  let clipUrl;
+  const { clip = context.clip } = mark2;
+  switch (clip) {
+    case "frame": {
+      const { width: width2, height: height2, marginLeft: marginLeft2, marginRight: marginRight2, marginTop: marginTop2, marginBottom: marginBottom2 } = dimensions;
+      const id2 = getClipId();
+      clipUrl = `url(#${id2})`;
+      selection2 = create3("svg:g", context).call(
+        (g2) => g2.append("svg:clipPath").attr("id", id2).append("rect").attr("x", marginLeft2).attr("y", marginTop2).attr("width", width2 - marginRight2 - marginLeft2).attr("height", height2 - marginTop2 - marginBottom2)
+      ).each(function() {
+        this.appendChild(selection2.node());
+        selection2.node = () => this;
+      });
+      break;
+    }
+    case "sphere": {
+      const { projection: projection3 } = context;
+      if (!projection3)
+        throw new Error(`the "sphere" clip option requires a projection`);
+      const id2 = getClipId();
+      clipUrl = `url(#${id2})`;
+      selection2.append("clipPath").attr("id", id2).append("path").attr("d", path_default(projection3)({ type: "Sphere" }));
+      break;
+    }
+  }
+  applyAttr(selection2, "aria-label", mark2.ariaLabel);
+  applyAttr(selection2, "aria-description", mark2.ariaDescription);
+  applyAttr(selection2, "aria-hidden", mark2.ariaHidden);
+  applyAttr(selection2, "clip-path", clipUrl);
+}
+function applyIndirectStyles(selection2, mark2, dimensions, context) {
+  applyClip(selection2, mark2, dimensions, context);
+  applyAttr(selection2, "fill", mark2.fill);
+  applyAttr(selection2, "fill-opacity", mark2.fillOpacity);
+  applyAttr(selection2, "stroke", mark2.stroke);
+  applyAttr(selection2, "stroke-width", mark2.strokeWidth);
+  applyAttr(selection2, "stroke-opacity", mark2.strokeOpacity);
+  applyAttr(selection2, "stroke-linejoin", mark2.strokeLinejoin);
+  applyAttr(selection2, "stroke-linecap", mark2.strokeLinecap);
+  applyAttr(selection2, "stroke-miterlimit", mark2.strokeMiterlimit);
+  applyAttr(selection2, "stroke-dasharray", mark2.strokeDasharray);
+  applyAttr(selection2, "stroke-dashoffset", mark2.strokeDashoffset);
+  applyAttr(selection2, "shape-rendering", mark2.shapeRendering);
+  applyAttr(selection2, "filter", mark2.imageFilter);
+  applyAttr(selection2, "paint-order", mark2.paintOrder);
+  const { pointerEvents = context.pointerSticky === false ? "none" : void 0 } = mark2;
+  applyAttr(selection2, "pointer-events", pointerEvents);
+}
+function applyDirectStyles(selection2, mark2) {
+  applyStyle(selection2, "mix-blend-mode", mark2.mixBlendMode);
+  applyAttr(selection2, "opacity", mark2.opacity);
+}
+function applyHref(selection2, href, target) {
+  selection2.each(function(i) {
+    const h2 = href(i);
+    if (h2 != null) {
+      const a3 = this.ownerDocument.createElementNS(namespaces_default.svg, "a");
+      a3.setAttribute("fill", "inherit");
+      a3.setAttributeNS(namespaces_default.xlink, "href", h2);
+      if (target != null)
+        a3.setAttribute("target", target);
+      this.parentNode.insertBefore(a3, this).appendChild(this);
+    }
+  });
+}
+function applyAttr(selection2, name2, value) {
+  if (value != null)
+    selection2.attr(name2, value);
+}
+function applyStyle(selection2, name2, value) {
+  if (value != null)
+    selection2.style(name2, value);
+}
+function applyTransform(selection2, mark2, { x: x4, y: y4 }, tx = offset, ty = offset) {
+  tx += mark2.dx;
+  ty += mark2.dy;
+  if (x4?.bandwidth)
+    tx += x4.bandwidth() / 2;
+  if (y4?.bandwidth)
+    ty += y4.bandwidth() / 2;
+  if (tx || ty)
+    selection2.attr("transform", `translate(${tx},${ty})`);
+}
+function impliedString(value, impliedValue) {
+  if ((value = string(value)) !== impliedValue)
+    return value;
+}
+function impliedNumber(value, impliedValue) {
+  if ((value = number5(value)) !== impliedValue)
+    return value;
+}
+var validClassName = /^-?([_a-z]|[\240-\377]|\\[0-9a-f]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])([_a-z0-9-]|[\240-\377]|\\[0-9a-f]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])*$/i;
+function maybeClassName(name2) {
+  if (name2 === void 0)
+    return "plot-d6a7b5";
+  name2 = `${name2}`;
+  if (!validClassName.test(name2))
+    throw new Error(`invalid class name: ${name2}`);
+  return name2;
+}
+function applyInlineStyles(selection2, style2) {
+  if (typeof style2 === "string") {
+    selection2.property("style", style2);
+  } else if (style2 != null) {
+    for (const element of selection2) {
+      Object.assign(element.style, style2);
+    }
+  }
+}
+function applyFrameAnchor({ frameAnchor }, { width: width2, height: height2, marginTop: marginTop2, marginRight: marginRight2, marginBottom: marginBottom2, marginLeft: marginLeft2 }) {
+  return [
+    /left$/.test(frameAnchor) ? marginLeft2 : /right$/.test(frameAnchor) ? width2 - marginRight2 : (marginLeft2 + width2 - marginRight2) / 2,
+    /^top/.test(frameAnchor) ? marginTop2 : /^bottom/.test(frameAnchor) ? height2 - marginBottom2 : (marginTop2 + height2 - marginBottom2) / 2
+  ];
+}
+
 // ../../node_modules/@observablehq/plot/src/dimensions.js
 function createDimensions(scales2, marks2, options = {}) {
   let marginTopDefault = 0.5 - offset, marginRightDefault = 0.5 + offset, marginBottomDefault = 0.5 + offset, marginLeftDefault = 0.5 - offset;
@@ -44989,19 +45071,28 @@ function axisTickKy(k3, anchor, data, {
   y: y4 = k3 === "y" ? void 0 : null,
   ...options
 }) {
-  return axisMark(vectorY, k3, anchor, `${k3}-axis tick`, data, {
-    strokeWidth,
-    strokeLinecap,
-    strokeLinejoin,
-    facetAnchor,
-    frameAnchor,
-    y: y4,
-    ...options,
-    dx: anchor === "left" ? +dx - offset + +insetLeft : +dx + offset - insetRight,
-    anchor: "start",
-    length: tickSize,
-    shape: anchor === "left" ? shapeTickLeft : shapeTickRight
-  });
+  return axisMark(
+    vectorY,
+    k3,
+    data,
+    {
+      ariaLabel: `${k3}-axis tick`,
+      ariaHidden: true
+    },
+    {
+      strokeWidth,
+      strokeLinecap,
+      strokeLinejoin,
+      facetAnchor,
+      frameAnchor,
+      y: y4,
+      ...options,
+      dx: anchor === "left" ? +dx - offset + +insetLeft : +dx + offset - insetRight,
+      anchor: "start",
+      length: tickSize,
+      shape: anchor === "left" ? shapeTickLeft : shapeTickRight
+    }
+  );
 }
 function axisTickKx(k3, anchor, data, {
   strokeWidth = 1,
@@ -45017,19 +45108,28 @@ function axisTickKx(k3, anchor, data, {
   x: x4 = k3 === "x" ? void 0 : null,
   ...options
 }) {
-  return axisMark(vectorX, k3, anchor, `${k3}-axis tick`, data, {
-    strokeWidth,
-    strokeLinejoin,
-    strokeLinecap,
-    facetAnchor,
-    frameAnchor,
-    x: x4,
-    ...options,
-    dy: anchor === "bottom" ? +dy - offset - insetBottom : +dy + offset + +insetTop,
-    anchor: "start",
-    length: tickSize,
-    shape: anchor === "bottom" ? shapeTickBottom : shapeTickTop
-  });
+  return axisMark(
+    vectorX,
+    k3,
+    data,
+    {
+      ariaLabel: `${k3}-axis tick`,
+      ariaHidden: true
+    },
+    {
+      strokeWidth,
+      strokeLinejoin,
+      strokeLinecap,
+      facetAnchor,
+      frameAnchor,
+      x: x4,
+      ...options,
+      dy: anchor === "bottom" ? +dy - offset - insetBottom : +dy + offset + +insetTop,
+      anchor: "start",
+      length: tickSize,
+      shape: anchor === "bottom" ? shapeTickBottom : shapeTickTop
+    }
+  );
 }
 function axisTextKy(k3, anchor, data, {
   facetAnchor = anchor + (k3 === "y" ? "-empty" : ""),
@@ -45051,9 +45151,8 @@ function axisTextKy(k3, anchor, data, {
   return axisMark(
     textY,
     k3,
-    anchor,
-    `${k3}-axis tick label`,
     data,
+    { ariaLabel: `${k3}-axis tick label` },
     {
       facetAnchor,
       frameAnchor,
@@ -45094,9 +45193,8 @@ function axisTextKx(k3, anchor, data, {
   return axisMark(
     textX,
     k3,
-    anchor,
-    `${k3}-axis tick label`,
     data,
+    { ariaLabel: `${k3}-axis tick label` },
     {
       facetAnchor,
       frameAnchor,
@@ -45140,7 +45238,7 @@ function gridKy(k3, anchor, data, {
   x2: x22 = anchor === "right" ? x4 : null,
   ...options
 }) {
-  return axisMark(ruleY, k3, anchor, `${k3}-grid`, data, { y: y4, x1: x12, x2: x22, ...gridDefaults(options) });
+  return axisMark(ruleY, k3, data, { ariaLabel: `${k3}-grid`, ariaHidden: true }, { y: y4, x1: x12, x2: x22, ...gridDefaults(options) });
 }
 function gridKx(k3, anchor, data, {
   x: x4 = k3 === "x" ? void 0 : null,
@@ -45149,7 +45247,7 @@ function gridKx(k3, anchor, data, {
   y2: y22 = anchor === "bottom" ? y4 : null,
   ...options
 }) {
-  return axisMark(ruleX, k3, anchor, `${k3}-grid`, data, { x: x4, y1: y12, y2: y22, ...gridDefaults(options) });
+  return axisMark(ruleX, k3, data, { ariaLabel: `${k3}-grid`, ariaHidden: true }, { x: x4, y1: y12, y2: y22, ...gridDefaults(options) });
 }
 function gridDefaults({
   color: color3 = "currentColor",
@@ -45194,7 +45292,7 @@ function labelOptions({
     initializer: initializer2
   };
 }
-function axisMark(mark2, k3, anchor, ariaLabel, data, options, initialize) {
+function axisMark(mark2, k3, data, properties, options, initialize) {
   let channels;
   function axisInitializer(data2, facets, _channels, scales2, dimensions, context) {
     const initializeFacets = data2 == null && (k3 === "fx" || k3 === "fy");
@@ -45266,7 +45364,8 @@ function axisMark(mark2, k3, anchor, ariaLabel, data, options, initialize) {
   } else {
     channels = {};
   }
-  m2.ariaLabel = ariaLabel;
+  if (properties !== void 0)
+    Object.assign(m2, properties);
   if (m2.clip === void 0)
     m2.clip = false;
   return m2;
@@ -46695,6 +46794,8 @@ function binn(bx, by, gx, gy, {
         for (const [f2, I2] of maybeGroup(facet, G)) {
           for (const [k4, g2] of maybeGroup(I2, K3)) {
             for (const [b2, extent4] of bin3(g2)) {
+              if (G)
+                extent4.z = f2;
               if (filter3 && !filter3.reduce(b2, extent4))
                 continue;
               groupFacet.push(i++);
@@ -46714,7 +46815,7 @@ function binn(bx, by, gx, gy, {
               for (const o of outputs)
                 o.reduce(b2, extent4);
               if (sort3)
-                sort3.reduce(b2);
+                sort3.reduce(b2, extent4);
             }
           }
         }
@@ -46881,6 +46982,8 @@ function maybeBinReduceFallback(reduce) {
       return reduceY1;
     case "y2":
       return reduceY22;
+    case "z":
+      return reduceZ;
   }
   throw new Error(`invalid bin reduce: ${reduce}`);
 }
@@ -51551,13 +51654,13 @@ var attributeMap = /* @__PURE__ */ new Map([
   ["projectionInsetBottom", "projection.insetBottom"],
   ["projectionClip", "projection.clip"]
 ]);
-function setProperty(object2, path2, value) {
+function setProperty(object, path2, value) {
   for (let i = 0; i < path2.length; ++i) {
     const key = path2[i];
     if (i === path2.length - 1) {
-      object2[key] = value;
+      object[key] = value;
     } else {
-      object2 = object2[key] || (object2[key] = {});
+      object = object[key] || (object[key] = {});
     }
   }
 }
@@ -51627,16 +51730,16 @@ function setSymbolAttributes(plot3, svg, attributes2, symbols3) {
 }
 function inferLabels(spec, plot3) {
   const { marks: marks2 } = plot3;
-  inferLabel("x", spec, marks2, ["x", "x1", "x2"]);
-  inferLabel("y", spec, marks2, ["y", "y1", "y2"]);
+  inferLabel("x", spec, marks2);
+  inferLabel("y", spec, marks2);
   inferLabel("fx", spec, marks2);
   inferLabel("fy", spec, marks2);
 }
-function inferLabel(key, spec, marks2, channels = [key]) {
+function inferLabel(key, spec, marks2) {
   const scale3 = spec[key] || {};
   if (scale3.axis === null || scale3.label !== void 0)
     return;
-  const fields = marks2.map((mark2) => mark2.channelField(channels)?.field);
+  const fields = marks2.map((mark2) => mark2.channelField(key)?.field);
   if (fields.every((x4) => x4 == null))
     return;
   let candCol;
@@ -51649,7 +51752,7 @@ function inferLabel(key, spec, marks2, channels = [key]) {
     } else if (candCol === void 0 && candLabel === void 0) {
       candCol = column3;
       candLabel = label2;
-      type2 = getType(marks2[i].data, channels) || "number";
+      type2 = getType(marks2[i].data, key) || "number";
     } else if (candLabel !== label2) {
       candLabel = void 0;
     } else if (candCol !== column3) {
@@ -51691,13 +51794,11 @@ function annotateMarks(svg, indices) {
     }
   }
 }
-function getType(data, channels) {
+function getType(data, channel) {
   for (const row of data) {
-    for (let j2 = 0; j2 < channels.length; ++j2) {
-      const v3 = row[channels[j2]];
-      if (v3 != null) {
-        return v3 instanceof Date ? "date" : typeof v3;
-      }
+    const v3 = row[channel] ?? row[channel + "1"] ?? row[channel + "2"];
+    if (v3 != null) {
+      return v3 instanceof Date ? "date" : typeof v3;
     }
   }
 }
@@ -51900,49 +52001,6 @@ function isSymbol2(value) {
   return symbols2.has(`${value}`.toLowerCase());
 }
 
-// ../plot/src/marks/util/arrow.js
-var INTEGER = 2;
-var FLOAT = 3;
-var DECIMAL = 7;
-var TIMESTAMP = 10;
-function isArrowTable(values2) {
-  return typeof values2?.getChild === "function";
-}
-function convertArrowType(type2) {
-  switch (type2.typeId) {
-    case INTEGER:
-    case FLOAT:
-    case DECIMAL:
-      return Float64Array;
-    default:
-      return Array;
-  }
-}
-function convertArrow(type2) {
-  const { typeId } = type2;
-  if (typeId === TIMESTAMP) {
-    return (v3) => v3 == null ? v3 : new Date(v3);
-  }
-  if (typeId === INTEGER && type2.bitWidth >= 64) {
-    return (v3) => v3 == null ? v3 : Number(v3);
-  }
-  return (v3) => v3;
-}
-function convertArrowColumn(column3) {
-  const { type: type2 } = column3;
-  const { typeId } = type2;
-  if (typeId === INTEGER && type2.bitWidth >= 64) {
-    const size = column3.length;
-    const array3 = new Float64Array(size);
-    for (let row = 0; row < size; ++row) {
-      const v3 = column3.get(row);
-      array3[row] = v3 == null ? NaN : Number(v3);
-    }
-    return array3;
-  }
-  return column3.toArray();
-}
-
 // ../plot/src/marks/util/to-data-array.js
 function toDataArray(data) {
   return isArrowTable(data) ? arrowToObjects(data) : data;
@@ -51958,7 +52016,7 @@ function arrowToObjects(data) {
     for (let j2 = 0; j2 < numCols; ++j2) {
       const child = batch.getChildAt(j2);
       const { name: name2, type: type2 } = schema.fields[j2];
-      const valueOf = convertArrow(type2);
+      const valueOf = convertArrowValue(type2);
       for (let o = k3, i = 0; i < numRows; ++i, ++o) {
         objects[o][name2] = valueOf(child.get(i));
       }
@@ -52043,17 +52101,15 @@ var Mark2 = class extends MosaicClient {
   hasOwnData() {
     return this.source == null || isDataArray(this.source);
   }
+  hasFieldInfo() {
+    return !!this._fieldInfo;
+  }
   channel(channel) {
     return this.channels.find((c4) => c4.channel === channel);
   }
-  channelField(...channels) {
-    const list = channels.flat();
-    for (const channel of list) {
-      const c4 = this.channel(channel);
-      if (c4?.field)
-        return c4;
-    }
-    return null;
+  channelField(channel, { exact } = {}) {
+    const c4 = exact ? this.channel(channel) : this.channels.find((c5) => c5.channel.startsWith(channel));
+    return c4?.field ? c4 : null;
   }
   fields() {
     if (this.hasOwnData())
@@ -52061,26 +52117,25 @@ var Mark2 = class extends MosaicClient {
     const { source: { table: table3 }, channels, reqs } = this;
     const fields = /* @__PURE__ */ new Map();
     for (const { channel, field: field2 } of channels) {
-      const column3 = field2?.column;
-      if (!column3) {
+      if (!field2)
         continue;
-      } else if (field2.stats?.length || reqs[channel]) {
-        if (!fields.has(column3))
-          fields.set(column3, /* @__PURE__ */ new Set());
-        const entry = fields.get(column3);
-        reqs[channel]?.forEach((s2) => entry.add(s2));
-        field2.stats?.forEach((s2) => entry.add(s2));
-      }
+      const stats = field2.stats?.stats || [];
+      const key = field2.stats?.column ?? field2;
+      const entry = fields.get(key) ?? fields.set(key, /* @__PURE__ */ new Set()).get(key);
+      stats.forEach((s2) => entry.add(s2));
+      reqs[channel]?.forEach((s2) => entry.add(s2));
     }
-    return Array.from(fields, ([column3, stats]) => {
-      return { table: table3, column: column3, stats: Array.from(stats) };
-    });
+    return Array.from(fields, ([c4, s2]) => ({ table: table3, column: c4, stats: s2 }));
   }
   fieldInfo(info) {
-    this.stats = info.reduce(
-      (o, d) => (o[d.column] = d, o),
-      /* @__PURE__ */ Object.create(null)
-    );
+    const lookup = Object.fromEntries(info.map((x4) => [x4.column, x4]));
+    for (const entry of this.channels) {
+      const { field: field2 } = entry;
+      if (field2) {
+        Object.assign(entry, lookup[field2.stats?.column ?? field2]);
+      }
+    }
+    this._fieldInfo = true;
     return this;
   }
   query(filter3 = []) {
@@ -52148,8 +52203,7 @@ function channelScale(mark2, channel) {
   const { plot: plot3 } = mark2;
   let scaleType = plot3.getAttribute(`${channel}Scale`);
   if (!scaleType) {
-    const { field: field2 } = mark2.channelField(channel, `${channel}1`, `${channel}2`);
-    const { type: type2 } = mark2.stats[field2.column];
+    const { type: type2 } = mark2.channelField(channel);
     scaleType = type2 === "date" ? "time" : "linear";
   }
   const options = { type: scaleType };
@@ -52187,15 +52241,13 @@ var xext = { x: ["min", "max"] };
 var yext = { y: ["min", "max"] };
 var xyext = { ...xext, ...yext };
 function plotExtent(mark2, filter3, channel, domainAttr, niceAttr) {
-  const { plot: plot3, stats } = mark2;
+  const { plot: plot3 } = mark2;
   const domain = plot3.getAttribute(domainAttr);
   const nice3 = plot3.getAttribute(niceAttr);
   if (Array.isArray(domain) && !domain[Transient]) {
     return domain;
   } else {
-    const { field: field2 } = mark2.channelField(channel);
-    const { column: column3 } = field2;
-    const { min: min5, max: max4 } = stats[column3];
+    const { column: column3, min: min5, max: max4 } = mark2.channelField(channel);
     const dom = filteredExtent(filter3, column3) || (nice3 ? linear2().domain([min5, max4]).nice().domain() : [min5, max4]);
     if (domain !== Fixed)
       dom[Transient] = true;
@@ -52215,7 +52267,7 @@ function filteredExtent(filter3, column3) {
   let lo;
   let hi;
   const visitor = (type2, clause) => {
-    if (type2 === "BETWEEN" && clause.field.column === column3) {
+    if (type2 === "BETWEEN" && `${clause.field}` === column3) {
       const { range: range3 } = clause;
       if (range3 && (lo == null || range3[0] < lo))
         lo = range3[0];
@@ -52235,26 +52287,23 @@ function filteredExtent(filter3, column3) {
 var ConnectedMark = class extends Mark2 {
   constructor(type2, source, encodings) {
     const dim = type2.endsWith("X") ? "y" : type2.endsWith("Y") ? "x" : null;
-    const req = { [dim]: ["min", "max"] };
+    const req = dim ? { [dim]: ["min", "max"] } : void 0;
     super(type2, source, encodings, req);
     this.dim = dim;
   }
   query(filter3 = []) {
-    const { plot: plot3, dim, source, stats } = this;
+    const { plot: plot3, dim, source } = this;
     const { optimize = true } = source.options || {};
     const q2 = super.query(filter3);
     if (!dim)
       return q2;
     const ortho = dim === "x" ? "y" : "x";
-    const value = this.channelField(ortho)?.as;
-    const { field: field2, as } = this.channelField(dim);
-    const { type: type2 } = stats[field2.column];
+    const value = this.channelField(ortho, { exact: true })?.as;
+    const { field: field2, as, type: type2, min: min5, max: max4 } = this.channelField(dim);
     const isContinuous = type2 === "date" || type2 === "number";
     if (optimize && isContinuous && value) {
-      const { column: column3 } = field2;
-      const { max: max4, min: min5 } = stats[column3];
       const size = dim === "x" ? plot3.innerWidth() : plot3.innerHeight();
-      const [lo, hi] = filteredExtent(filter3, column3) || [min5, max4];
+      const [lo, hi] = filteredExtent(filter3, field2) || [min5, max4];
       const [expr] = binExpr(this, dim, size, [lo, hi], 1, as);
       const cols = q2.select().map((c4) => c4.as).filter((c4) => c4 !== as && c4 !== value);
       return m4(q2, expr, as, value, cols);
@@ -52276,17 +52325,10 @@ function m4(input3, bin3, x4, y4, cols = []) {
 
 // ../plot/src/marks/util/grid.js
 function arrayType(values2, name2 = "density") {
-  if (isArrowTable(values2)) {
-    return convertArrowType(values2.getChild(name2).type);
-  } else {
-    return typeof values2[0][name2] === "number" ? Float64Array : Array;
-  }
+  return isArrowTable(values2) ? convertArrowArrayType(values2.getChild(name2).type) : typeof values2[0]?.[name2] === "number" ? Float64Array : Array;
 }
-function grid1d(n, values2) {
-  const Type5 = arrayType(values2);
-  return valuesToGrid(new Type5(n), values2);
-}
-function valuesToGrid(grid2, values2, name2 = "density") {
+function grid1d(n, values2, name2 = "density") {
+  const grid2 = new (arrayType(values2))(n);
   if (isArrowTable(values2)) {
     const numRows = values2.numRows;
     if (numRows === 0)
@@ -52785,7 +52827,7 @@ var Grid2DMark = class extends Mark2 {
   }
   setPlot(plot3, index2) {
     const update2 = () => {
-      if (this.stats)
+      if (this.hasFieldInfo())
         this.requestUpdate();
     };
     plot3.addAttributeListener("domainX", update2);
@@ -53130,7 +53172,7 @@ var RasterMark = class extends Grid2DMark {
   }
   setPlot(plot3, index2) {
     const update2 = () => {
-      if (this.stats)
+      if (this.hasFieldInfo())
         this.rasterize();
     };
     plot3.addAttributeListener("schemeColor", update2);
@@ -53331,9 +53373,12 @@ var DenseLineMark = class extends RasterMark {
 function stripXY(mark2, filter3) {
   if (Array.isArray(filter3) && !filter3.length)
     return filter3;
-  const xc = mark2.channelField("x").field.column;
-  const yc = mark2.channelField("y").field.column;
-  const test = (p2) => p2.op !== "BETWEEN" || p2.field.column !== xc && p2.field.column !== yc;
+  const { column: xc } = mark2.channelField("x");
+  const { column: yc } = mark2.channelField("y");
+  const test = (p2) => {
+    const col = `${p2.field}`;
+    return p2.op !== "BETWEEN" || col !== xc && col !== yc;
+  };
   const filterAnd = (p2) => p2.op === "AND" ? and(p2.children.filter((c4) => test(c4))) : p2;
   return Array.isArray(filter3) ? filter3.filter((p2) => test(p2)).map((p2) => filterAnd(p2)) : filterAnd(filter3);
 }
@@ -53622,7 +53667,7 @@ var RasterTileMark = class extends Grid2DMark {
   }
   setPlot(plot3, index2) {
     const update2 = () => {
-      if (this.stats)
+      if (this.hasFieldInfo())
         this.rasterize();
     };
     plot3.addAttributeListener("schemeColor", update2);
@@ -54171,8 +54216,8 @@ function closeTo(a3, b2) {
 }
 
 // ../plot/src/interactors/util/get-field.js
-function getField(mark2, channels) {
-  const field2 = mark2.channelField(channels)?.field;
+function getField(mark2, channel) {
+  const field2 = mark2.channelField(channel)?.field;
   return field2?.basis || field2;
 }
 
@@ -54206,7 +54251,7 @@ var Interval1D = class {
     this.pixelSize = pixelSize || 1;
     this.selection = selection2;
     this.peers = peers;
-    this.field = field2 || getField(mark2, [channel, channel + "1", channel + "2"]);
+    this.field = field2 || getField(mark2, channel);
     this.style = style2 && sanitizeStyles(style2);
     this.brush = channel === "y" ? brushY2() : brushX2();
     this.brush.on("brush end", ({ selection: selection3 }) => this.publish(selection3));
@@ -54274,8 +54319,8 @@ var Interval2D = class {
     this.pixelSize = pixelSize || 1;
     this.selection = selection2;
     this.peers = peers;
-    this.xfield = xfield || getField(mark2, ["x", "x1", "x2"]);
-    this.yfield = yfield || getField(mark2, ["y", "y1", "y2"]);
+    this.xfield = xfield || getField(mark2, "x");
+    this.yfield = yfield || getField(mark2, "y");
     this.style = style2 && sanitizeStyles(style2);
     this.brush = brush2();
     this.brush.on("brush end", ({ selection: selection3 }) => this.publish(selection3));
@@ -54411,8 +54456,8 @@ var PanZoom = class {
     this.mark = mark2;
     this.xsel = x4;
     this.ysel = y4;
-    this.xfield = xfield || getField(mark2, ["x", "x1", "x2"]);
-    this.yfield = yfield || getField(mark2, ["y", "y1", "y2"]);
+    this.xfield = xfield || getField(mark2, "x");
+    this.yfield = yfield || getField(mark2, "y");
     this.zoom = extent3(zoom2, [0, Infinity], [1, 1]);
     this.panx = this.xsel && panx;
     this.pany = this.ysel && pany;
@@ -54641,8 +54686,10 @@ function findMark({ marks: marks2 }, channel) {
   if (channels == null)
     return null;
   for (let i = marks2.length - 1; i > -1; --i) {
-    if (marks2[i].channelField(channels)) {
-      return marks2[i];
+    for (const channel2 of channels) {
+      if (marks2[i].channelField(channel2, { exact: true })) {
+        return marks2[i];
+      }
     }
   }
   return null;
@@ -54671,7 +54718,7 @@ function binField(mark2, channel, column3, options) {
     column: column3,
     label: column3,
     get stats() {
-      return ["min", "max"];
+      return { column: column3, stats: ["min", "max"] };
     },
     get columns() {
       return [column3];
@@ -54681,7 +54728,7 @@ function binField(mark2, channel, column3, options) {
     },
     toString() {
       const { apply: apply2, sqlApply, sqlInvert } = channelScale(mark2, channel);
-      const { min: min5, max: max4 } = mark2.stats[column3];
+      const { min: min5, max: max4 } = mark2.channelField(channel);
       const b2 = bins(apply2(min5), apply2(max4), options);
       const col = sqlApply(column3);
       const base = b2.min === 0 ? col : `(${col} - ${b2.min})`;
@@ -55550,8 +55597,8 @@ function attributes(values2) {
     }
   };
 }
-function margins(object2) {
-  const { top: top2, bottom: bottom2, left: left2, right: right2 } = object2;
+function margins(object) {
+  const { top: top2, bottom: bottom2, left: left2, right: right2 } = object;
   const attr = {};
   if (top2 !== void 0)
     attr.marginTop = top2;