@bicharts/chart-host 0.6.113 → 0.6.116

package/dist/{chunk-KY4FI2HA.mjs → chunk-QG5TENI3.mjs}

@@ -1,7 +1,7 @@
 /*! @bicharts/chart-host — Apache-2.0. Bundled reference data: GeoNames (https://www.geonames.org/) CC BY 4.0; Natural Earth and US Census/TIGER (public domain). Full text: NOTICE in this package. */
 
 // src/contract.ts
-var HOST_CONTRACT_VERSION = "1.23.0";
+var HOST_CONTRACT_VERSION = "1.24.0";
 var GEO_POINT_PRECISIONS = ["latlon", "city", "zip3", "state", "country"];
 var MARK_CLASS = "d3-mark";
 var LEGEND_MARK_CLASS = "d3-legend-mark";
@@ -22,6 +22,7 @@ var CONTAINER_SLOT_XF_CLEAR = "__llmXfClear";
 var CONTAINER_SLOT_INITIAL_XF_MARK = "__llmInitialXfMark";
 var CONTAINER_SLOT_UI_STATE = "__lchUiState";
 var CONTAINER_SLOT_SCROLL = "__lchScroll";
+var TABLE_SCROLLER_CLASS = "lch-table-body";
 var CONTAINER_SLOT_CLICKED_MARKS = "__lchClickedMarks";
 var VIEW_ONLY_UI_STATE_KEYS = Object.freeze(["camera", "llmZoom"]);
 function withoutViewOnlyKeys(bag) {
@@ -39,6 +40,7 @@ var ACTIVE_TICK_CLASS = "lch-tick-active";
 var DIM_OPACITY_VAR = "--lch-dim-opacity";
 var DIM_OPACITY_DEFAULT = 0.25;
 var DIM_OPACITY_MIN = 0.01;
+var CATEGORY_DELTA_E_FLOOR = 25;
 function chartOwnsTimeline(container) {
   return !!container && (!!container[CONTAINER_SLOT_XF_CLEAR] || !!container[CONTAINER_SLOT_ANIM_STOP]);
 }
@@ -96,6 +98,7 @@ export {
   CONTAINER_SLOT_INITIAL_XF_MARK,
   CONTAINER_SLOT_UI_STATE,
   CONTAINER_SLOT_SCROLL,
+  TABLE_SCROLLER_CLASS,
   CONTAINER_SLOT_CLICKED_MARKS,
   VIEW_ONLY_UI_STATE_KEYS,
   withoutViewOnlyKeys,
@@ -107,6 +110,7 @@ export {
   DIM_OPACITY_VAR,
   DIM_OPACITY_DEFAULT,
   DIM_OPACITY_MIN,
+  CATEGORY_DELTA_E_FLOOR,
   chartOwnsTimeline,
   periodTickSuppressesFeedback,
   ANIM_PLAY_SPEED_DEFAULT,

package/dist/{chunk-KGVNZR23.mjs → chunk-RLOIA7QK.mjs}

@@ -8,7 +8,7 @@ import {
   SELECTION_RULE_ATTR,
   SELECTION_RULE_CLICKED_MARKS,
   XFILTER_REFRESH_EVENT
-} from "./chunk-KY4FI2HA.mjs";
+} from "./chunk-QG5TENI3.mjs";
 
 // src/selection.ts
 function rowIdxsFromMark(el) {

package/dist/{chunk-IL5M7K6Z.mjs → chunk-TUZCM7SX.mjs}

@@ -4,7 +4,7 @@ import {
   gestureWasDrag,
   isInsideControl,
   rowIdxsFromMark
-} from "./chunk-KGVNZR23.mjs";
+} from "./chunk-RLOIA7QK.mjs";
 import {
   AXIS_FILTER_CLASS,
   CONTROL_CLASS,
@@ -12,7 +12,7 @@ import {
   MARK_CLASS,
   ROW_IDX_ATTR,
   SNAPSHOT_SVG_ATTR
-} from "./chunk-KY4FI2HA.mjs";
+} from "./chunk-QG5TENI3.mjs";
 
 // src/lasso.ts
 var LASSO_ROW_CAP = 5e3;

package/dist/{chunk-GTJG3SMD.mjs → chunk-VGJH63LZ.mjs}

@@ -1,7 +1,7 @@
 /*! @bicharts/chart-host — Apache-2.0. Bundled reference data: GeoNames (https://www.geonames.org/) CC BY 4.0; Natural Earth and US Census/TIGER (public domain). Full text: NOTICE in this package. */
 import {
   LASSO_KNOB_KEY
-} from "./chunk-IL5M7K6Z.mjs";
+} from "./chunk-TUZCM7SX.mjs";
 
 // src/controls.ts
 var isKnob = (key) => key !== LASSO_KNOB_KEY;

package/dist/{chunk-2KLFIGTQ.mjs → chunk-ZZBX5ZJ6.mjs}

@@ -43,6 +43,11 @@ function toKeys(input, width) {
   return input.length === width ? [input.slice()] : [];
 }
 var nextId = 0;
+var peersOf = /* @__PURE__ */ new WeakMap();
+var pickSubsOf = /* @__PURE__ */ new WeakMap();
+var firePick = (f) => {
+  for (const m of Array.from(peersOf.get(f) ?? [f])) for (const cb of Array.from(pickSubsOf.get(m) ?? [])) cb();
+};
 function createFilter(columns, opts = {}) {
   const cols = Array.isArray(columns) ? columns.slice() : [columns];
   if (!cols.length || cols.some((c) => typeof c !== "string" || !c)) {
@@ -71,7 +76,11 @@ function createFilter(columns, opts = {}) {
     rows = nextRows;
     reason = why;
     version++;
+    if (nextKeys.length) {
+      for (const p of Array.from(peersOf.get(filter) ?? [])) if (p !== filter && p.active) p.clear(why);
+    }
     for (const cb of Array.from(subs)) cb(filter, why);
+    firePick(filter);
   };
   const dedupe = (ks) => {
     const seen2 = /* @__PURE__ */ new Set();
@@ -94,6 +103,15 @@ function createFilter(columns, opts = {}) {
     const text = parts.filter(shown).map(String).join(" \u2192 ");
     return text || k.filter(shown).map(String).join(" \u2192 ");
   };
+  const partsOf = (k, more, names) => {
+    const s = keyString(k);
+    const pos = cols.map((c, i) => names.includes(c) && !isAnyValue(k[i]) ? i : -1).filter((i) => i >= 0);
+    const row = (more ?? []).find((r) => keyString(keyOfRow(r, cols)) === s) ?? seen.get(s);
+    const speaksFor = (d, j) => cols.includes(d) ? cols.indexOf(d) : display.length === cols.length ? j : -1;
+    const shown = (p) => p != null && p !== "" && !isAnyValue(p);
+    const text = row ? display.filter((d, j) => pos.includes(speaksFor(d, j))).map((d) => row[d]).filter(shown).map(String).join(" \u2192 ") : "";
+    return text || pos.map((i) => k[i]).filter(shown).map(String).join(" \u2192 ");
+  };
   let warnedKeep = false;
   const filter = {
     id: opts.id ?? `f${++nextId}`,
@@ -137,9 +155,9 @@ function createFilter(columns, opts = {}) {
     get text() {
       return keys.map((k) => displayOf(k)).join(", ");
     },
-    textOf(key, more) {
-      const k = Array.isArray(key) ? key : [key];
-      return displayOf(k.slice(0, cols.length), more);
+    textOf(key, more, parts) {
+      const k = (Array.isArray(key) ? key : [key]).slice(0, cols.length);
+      return parts && cols.some((c) => !parts.includes(c)) ? partsOf(k, more, parts) : displayOf(k, more);
     },
     get reason() {
       return reason;
@@ -198,8 +216,23 @@ function createFilter(columns, opts = {}) {
       return () => {
         subs.delete(cb);
       };
+    },
+    group: opts.group || null,
+    get pick() {
+      const peers = peersOf.get(filter);
+      if (!peers) return keys.length ? filter : null;
+      for (const p of peers) if (p.active) return p;
+      return null;
+    },
+    onPick(cb) {
+      pickSubs.add(cb);
+      return () => {
+        pickSubs.delete(cb);
+      };
     }
   };
+  const pickSubs = /* @__PURE__ */ new Set();
+  pickSubsOf.set(filter, pickSubs);
   return filter;
 }
 function createFilterScope() {
@@ -211,6 +244,43 @@ function createFilterScope() {
   const notify = () => {
     for (const cb of Array.from(subs)) cb(scope);
   };
+  const groups = /* @__PURE__ */ new Map();
+  const names = /* @__PURE__ */ new Map();
+  const nameFor = (f) => {
+    const taken = new Set(names.values());
+    let k = f.key, n = 1;
+    while (taken.has(k)) k = `${f.key}-${++n}`;
+    names.set(f, k);
+  };
+  const nameOf = (f) => names.get(f) ?? f.key;
+  const join = (f) => {
+    const name = f.group;
+    if (!name) return;
+    const members = groups.get(name) ?? /* @__PURE__ */ new Set();
+    const first = members.values().next().value;
+    if (first && first.columns.join("
") !== f.columns.join("
")) {
+      try {
+        console.warn(`[chart-host] filter "${f.label}" is keyed by ${f.columns.join(", ")} but its group "${name}" by ${first.columns.join(", ")}, so it stays out of the group: give one pick's filters the same key columns.`);
+      } catch {
+      }
+      return;
+    }
+    if (f.active && [...members].some((m) => m.active)) f.clear("page");
+    members.add(f);
+    groups.set(name, members);
+    peersOf.set(f, members);
+    firePick(f);
+  };
+  const leave = (f) => {
+    const members = f.group ? groups.get(f.group) : void 0;
+    if (!members?.has(f)) return;
+    members.delete(f);
+    peersOf.delete(f);
+    if (!members.size) groups.delete(f.group);
+    firePick(f);
+    const rest = members.values().next().value;
+    if (rest) firePick(rest);
+  };
   const scope = {
     get filters() {
       return list.slice();
@@ -226,7 +296,9 @@ function createFilterScope() {
     add(f) {
       if (!offs.has(f)) {
         list.push(f);
+        nameFor(f);
         offs.set(f, f.onChange(() => notify()));
+        join(f);
         notify();
       }
       return () => {
@@ -236,6 +308,8 @@ function createFilterScope() {
         offs.delete(f);
         const i = list.indexOf(f);
         if (i >= 0) list.splice(i, 1);
+        names.delete(f);
+        leave(f);
         notify();
       };
     },
@@ -248,6 +322,9 @@ function createFilterScope() {
         subs.delete(cb);
       };
     },
+    keyOf(f) {
+      return offs.has(f) ? nameOf(f) : null;
+    },
     get controls() {
       return ctl;
     },
@@ -269,7 +346,7 @@ function createFilterScope() {
     },
     save() {
       const view = { v: 1 };
-      for (const f of list) if (f.active) (view.filters ??= {})[f.key] = f.keys.map((k) => k.slice());
+      for (const f of list) if (f.active) (view.filters ??= {})[nameOf(f)] = f.keys.map((k) => k.slice());
       for (const [k, c] of ctl) {
         const values = c.values;
         if (Object.keys(values).length) (view.controls ??= {})[k] = { ...values };
@@ -278,10 +355,15 @@ function createFilterScope() {
     },
     restore(view) {
       if (!view || view.v !== 1) return;
+      const restored = /* @__PURE__ */ new Set();
       for (const f of list) {
-        const keys = view.filters?.[f.key];
-        if (keys && keys.length) f.set(keys, "page");
-        else f.clear("page");
+        const keys = view.filters?.[nameOf(f)];
+        const g = f.group && peersOf.get(f) ? f.group : null;
+        if (g && restored.has(g)) continue;
+        if (keys && keys.length) {
+          f.set(keys, "page");
+          if (g) restored.add(g);
+        } else f.clear("page");
       }
       for (const [k, c] of ctl) {
         const values = view.controls?.[k];
@@ -291,19 +373,47 @@ function createFilterScope() {
   };
   return scope;
 }
+function scopeFilterOf(src) {
+  if (!src || typeof src !== "object") return null;
+  if (Array.isArray(src.keys)) return src;
+  const f = src.filter;
+  return f && typeof f === "object" ? f : null;
+}
+var warnedTakes = /* @__PURE__ */ new Set();
 function filterScopeOf(filters) {
   const list = Array.isArray(filters) ? filters : filters ? [filters] : [];
-  const active = list.filter((f) => f && f.active);
   const values = [];
-  for (const f of active) {
+  const fields = [];
+  for (const src of list) {
+    const f = scopeFilterOf(src);
+    if (!f || !f.active) continue;
+    const entry = src === f ? null : src;
+    const takes = entry?.takes;
+    for (const c of takes ?? []) {
+      if (f.columns.includes(c) || warnedTakes.has(`${f.id}
${c}`)) continue;
+      warnedTakes.add(`${f.id}
${c}`);
+      try {
+        console.warn(`[chart-host] scopedBy: filter "${f.label}" isn't keyed by ${c} (its key: ${f.columns.join(", ")}), so its scope line can't take it - name the filter's own key columns in takes.`);
+      } catch {
+      }
+    }
+    const part = takes ? f.columns.filter((c) => takes.includes(c)) : f.columns;
+    const whole = part.length === f.columns.length;
+    if (!whole) {
+      const at = part.map((c) => f.columns.indexOf(c));
+      if (!at.length || f.keys.some((k) => at.every((i) => isAnyValue(k[i])))) continue;
+    }
+    let said = false;
     for (const k of f.keys) {
-      const t = f.textOf(k).trim();
+      const t = (whole ? f.textOf(k) : f.textOf(k, void 0, part)).trim();
+      if (t) said = true;
       if (t && !values.includes(t)) values.push(t);
     }
+    if (!whole && !said) continue;
+    const label = entry?.label || (whole || f.label !== f.columns.join(" / ") ? f.label : part.join(" / "));
+    if (label && !fields.includes(label)) fields.push(label);
   }
   if (!values.length) return void 0;
-  const fields = [];
-  for (const f of active) if (f.label && !fields.includes(f.label)) fields.push(f.label);
   return { field: fields.join(", "), values };
 }
 var LINKED_HOVER_CLASS = "bic-linked-hover";
@@ -339,18 +449,21 @@ var sortedEq = (a, b) => {
   return x.every((v, i) => v === y[i]);
 };
 function bindFilter(host, filter, opts) {
+  const pickOf = () => filter.pick ?? filter;
   const wanted = () => {
-    if (!filter.active) return [];
+    const src = pickOf();
+    if (!src.active) return [];
     const out = [];
     const n = opts.rowCount();
     for (let i = 0; i < n; i++) {
       const r = opts.rowAt(i);
-      if (r && filter.has(r)) out.push(i);
+      if (r && src.has(r)) out.push(i);
     }
     return out;
   };
   const hiddenKeys = () => {
-    if (!filter.active) return [];
+    const src = pickOf();
+    if (!src.active) return [];
     const carried = /* @__PURE__ */ new Set();
     const n = opts.rowCount();
     for (let i = 0; i < n; i++) {
@@ -364,7 +477,7 @@ function bindFilter(host, filter, opts) {
       }
       return false;
     };
-    return filter.keys.filter((k) => k.some(isAnyValue) ? !anyRowMatches(k) : !carried.has(keyString(k)));
+    return src.keys.filter((k) => k.some(isAnyValue) ? !anyRowMatches(k) : !carried.has(keyString(k)));
   };
   const paint = () => {
     const want = wanted();
@@ -379,7 +492,8 @@ function bindFilter(host, filter, opts) {
     if (source === "host") return;
     const keep = meta?.keepHidden ? hiddenKeys() : [];
     if (!idxs.length && !keep.length) {
-      if (filter.active) filter.clear("clear");
+      const src = pickOf();
+      if (src.active) src.clear("clear");
       return;
     }
     const rows = idxs.map((i) => opts.rowAt(i)).filter((r) => !!r);
@@ -389,8 +503,20 @@ function bindFilter(host, filter, opts) {
       filter.set([label], "click");
       return;
     }
+    const group = meta?.fromMark && !keep.length ? sharedKey(rows) : null;
+    if (group) {
+      filter.set([group], "click");
+      return;
+    }
     filter.selectRows(rows, "click", keep);
   });
+  const sharedKey = (rows) => {
+    const key = filter.columns.map((c) => {
+      const v = rows[0][c];
+      return rows.every((r) => keyString([r[c]]) === keyString([v])) ? v : ANY_VALUE;
+    });
+    return key.some(isAnyValue) && !key.every(isAnyValue) ? key : null;
+  };
   const labelKey = (rows) => {
     const n = opts.rowCount();
     const key = filter.columns.map((c) => {
@@ -404,7 +530,7 @@ function bindFilter(host, filter, opts) {
     });
     return key.some(isAnyValue) && !key.every(isAnyValue) ? key : null;
   };
-  const offFilter = filter.onChange(() => paint());
+  const offFilter = filter.onPick ? filter.onPick(() => paint()) : filter.onChange(() => paint());
   const el = opts.container ?? null;
   let offHoverDom = () => {
   };
@@ -486,6 +612,7 @@ export {
   isAnyValue,
   createFilter,
   createFilterScope,
+  scopeFilterOf,
   filterScopeOf,
   LINKED_HOVER_CLASS,
   payloadRowReader,

package/dist/dax.mjs

@@ -1,7 +1,7 @@
 /*! @bicharts/chart-host — Apache-2.0. Bundled reference data: GeoNames (https://www.geonames.org/) CC BY 4.0; Natural Earth and US Census/TIGER (public domain). Full text: NOTICE in this package. */
 import {
   isAnyValue
-} from "./chunk-2KLFIGTQ.mjs";
+} from "./chunk-ZZBX5ZJ6.mjs";
 import "./chunk-GHODWOAL.mjs";
 
 // src/dax.ts
@@ -64,9 +64,31 @@ ${tail}`.replace(/\n$/, "");
 function isFilter(x) {
   return !!x && typeof x === "object" && Array.isArray(x.keys) && typeof x.has === "function";
 }
+var HEADER = /^(?:'(?:[^']|'')*'|[^[\]']*)\[((?:[^\]]|\]\])+)\]$/;
+function columnName(header) {
+  const m = HEADER.exec(String(header ?? "").trim());
+  return m ? m[1].replace(/\]\]/g, "]") : String(header ?? "");
+}
+function queryRows(result) {
+  const table = result && "columns" in result ? result : result && "table" in result ? result.table : void 0;
+  if (!table || !Array.isArray(table.columns) || !Array.isArray(table.rows)) return [];
+  const bare = table.columns.map((c) => columnName(c?.name ?? ""));
+  const count = /* @__PURE__ */ new Map();
+  for (const b of bare) count.set(b, (count.get(b) ?? 0) + 1);
+  const names = bare.map((b, i) => (count.get(b) ?? 0) > 1 ? String(table.columns[i]?.name ?? b) : b);
+  return table.rows.map((r) => {
+    const o = {};
+    names.forEach((n, k) => {
+      o[n] = r?.[k];
+    });
+    return o;
+  });
+}
 export {
   calculateTable,
+  columnName,
   daxLiteral,
   filterQuery,
+  queryRows,
   treatAs
 };