@uwdata/mosaic-plot 0.12.2 → 0.14.0

package/dist/mosaic-plot.js

@@ -489,169 +489,9 @@ var Fixed = Symbol("Fixed");
 var Transient = Symbol("Transient");
 var Transform = Symbol("Transform");
 
-// ../core/src/util/throttle.js
-var NIL = {};
-function throttle(callback, debounce = false) {
-  let curr;
-  let next;
-  let pending = NIL;
-  function invoke(event) {
-    curr = callback(event).catch(() => {
-    }).finally(() => {
-      if (next) {
-        const { value } = next;
-        next = null;
-        invoke(value);
-      } else {
-        curr = null;
-      }
-    });
-  }
-  function enqueue(event) {
-    next = { event };
-  }
-  function process(event) {
-    curr ? enqueue(event) : invoke(event);
-  }
-  function delay(event) {
-    if (pending !== event) {
-      requestAnimationFrame(() => {
-        const e = pending;
-        pending = NIL;
-        process(e);
-      });
-    }
-    pending = event;
-  }
-  return debounce ? delay : process;
-}
-
-// ../core/src/MosaicClient.js
-var MosaicClient = class {
-  /**
-   * Constructor.
-   * @param {*} filterSelection An optional selection to interactively filter
-   *  this client's data. If provided, a coordinator will re-query and update
-   *  the client when the selection updates.
-   */
-  constructor(filterSelection) {
-    this._filterBy = filterSelection;
-    this._requestUpdate = throttle(() => this.requestQuery(), true);
-    this._coordinator = null;
-  }
-  /**
-   * Return this client's connected coordinator.
-   */
-  get coordinator() {
-    return this._coordinator;
-  }
-  /**
-   * Set this client's connected coordinator.
-   */
-  set coordinator(coordinator2) {
-    this._coordinator = coordinator2;
-  }
-  /**
-   * Return this client's filter selection.
-   */
-  get filterBy() {
-    return this._filterBy;
-  }
-  /**
-   * Return a boolean indicating if the client query can be sped up with
-   * materialized views of pre-aggregated data. Should return true if changes to
-   * the filterBy selection does not change the groupby domain of the client
-   * query.
-   */
-  get filterStable() {
-    return true;
-  }
-  /**
-   * Return an array of fields queried by this client.
-   * @returns {import('./types.js').FieldInfoRequest[] | null}
-   *  The fields to retrieve info for.
-   */
-  fields() {
-    return null;
-  }
-  /**
-   * Called by the coordinator to set the field info for this client.
-   * @param {import('./types.js').FieldInfo[]} info The field info result.
-   * @returns {this}
-   */
-  fieldInfo(info) {
-    return this;
-  }
-  /**
-   * Return a query specifying the data needed by this client.
-   * @param {*} [filter] The filtering criteria to apply in the query.
-   * @returns {*} The client query
-   */
-  query(filter3) {
-    return null;
-  }
-  /**
-   * Called by the coordinator to inform the client that a query is pending.
-   * @returns {this}
-   */
-  queryPending() {
-    return this;
-  }
-  /**
-   * Called by the coordinator to return a query result.
-   * @param {*} data The query result.
-   * @returns {this}
-   */
-  queryResult(data) {
-    return this;
-  }
-  /**
-   * Called by the coordinator to report a query execution error.
-   * @param {*} error
-   * @returns {this}
-   */
-  queryError(error) {
-    return this;
-  }
-  /**
-   * Request the coordinator to execute a query for this client.
-   * If an explicit query is not provided, the client query method will
-   * be called, filtered by the current filterBy selection.
-   * @returns {Promise}
-   */
-  requestQuery(query) {
-    const q = query || this.query(this.filterBy?.predicate(this));
-    return this._coordinator.requestQuery(this, q);
-  }
-  /**
-   * Request that the coordinator perform a throttled update of this client
-   * using the default query. Unlike requestQuery, for which every call will
-   * result in an executed query, multiple calls to requestUpdate may be
-   * consolidated into a single update.
-   */
-  requestUpdate() {
-    this._requestUpdate();
-  }
-  /**
-   * Reset this client, initiating new field info and query requests.
-   * @returns {Promise}
-   */
-  initialize() {
-    return this._coordinator.initializeClient(this);
-  }
-  /**
-   * Requests a client update.
-   * For example to (re-)render an interface component.
-   *
-   * @returns {this | Promise<any>}
-   */
-  update() {
-    return this;
-  }
-};
-
 // ../../node_modules/@uwdata/flechette/src/constants.js
 var MAGIC = Uint8Array.of(65, 82, 82, 79, 87, 49);
+var EOS = Uint8Array.of(255, 255, 255, 255, 0, 0, 0, 0);
 var Version = (
   /** @type {const} */
   {
@@ -3066,7 +2906,7 @@ function literalToSQL(value) {
     case "number":
       return Number.isFinite(value) ? `${value}` : "NULL";
     case "string":
-      return `'${value.replace(`'`, `''`)}'`;
+      return `'${value.replaceAll(`'`, `''`)}'`;
     case "boolean":
       return value ? "TRUE" : "FALSE";
     default:
@@ -5140,6 +4980,8 @@ function sufficientStatistics(node, preagg, avg2) {
       return sumExpr(preagg, node);
     case "avg":
       return avgExpr(preagg, node);
+    case "geomean":
+      return geomeanExpr(preagg, node);
     case "arg_max":
       return argmaxExpr(preagg, node);
     case "arg_min":
@@ -5223,6 +5065,12 @@ function avgExpr(preagg, node) {
   const { expr, name } = countExpr(preagg, node);
   return div(sum(mul(as, name)), expr);
 }
+function geomeanExpr(preagg, node) {
+  const x3 = node.args[0];
+  const expr = addStat(preagg, sum(ln(x3)), node);
+  const { expr: n } = countExpr(preagg, node);
+  return exp(div(sum(expr), n));
+}
 function argmaxExpr(preagg, node) {
   const expr = addStat(preagg, node);
   const maxy = addStat(preagg, max(node.args[1]), node);
@@ -6295,13 +6143,13 @@ var Coordinator = class {
   }
   /**
    * Issue a query for which no result (return value) is needed.
-   * @param {QueryType | QueryType[]} query The query or an array of queries.
+   * @param { import('./types.js').QueryType[] |
+   *  import('./types.js').QueryType} query The query or an array of queries.
    *  Each query should be either a Query builder object or a SQL string.
    * @param {object} [options] An options object.
    * @param {number} [options.priority] The query priority, defaults to
    *  `Priority.Normal`.
-   * @returns {QueryResult} A query result
-   *  promise.
+   * @returns {QueryResult} A query result promise.
    */
   exec(query, { priority = Priority.Normal } = {}) {
     query = Array.isArray(query) ? query.filter((x3) => x3).join(";\n") : query;
@@ -6310,8 +6158,8 @@ var Coordinator = class {
   /**
    * Issue a query to the backing database. The submitted query may be
    * consolidate with other queries and its results may be cached.
-   * @param {QueryType} query The query as either a Query builder object
-   *  or a SQL string.
+   * @param {import('./types.js').QueryType} query The query as either a Query
+   *  builder object or a SQL string.
    * @param {object} [options] An options object.
    * @param {'arrow' | 'json'} [options.type] The query result format type.
    * @param {boolean} [options.cache=true] If true, cache the query result
@@ -6333,8 +6181,8 @@ var Coordinator = class {
   /**
    * Issue a query to prefetch data for later use. The query result is cached
    * for efficient future access.
-   * @param {QueryType} query The query as either a Query builder object
-   *  or a SQL string.
+   * @param {import('./types.js').QueryType} query The query as either a Query
+   *  builder object or a SQL string.
    * @param {object} [options] An options object.
    * @param {'arrow' | 'json'} [options.type] The query result format type.
    * @returns {QueryResult} A query result promise.
@@ -6369,13 +6217,13 @@ var Coordinator = class {
    * Update client data by submitting the given query and returning the
    * data (or error) to the client.
    * @param {MosaicClient} client A Mosaic client.
-   * @param {QueryType} query The data query.
+   * @param {import('./types.js').QueryType} query The data query.
    * @param {number} [priority] The query priority.
    * @returns {Promise} A Promise that resolves upon completion of the update.
    */
   updateClient(client, query, priority = Priority.Normal) {
     client.queryPending();
-    return this.query(query, { priority }).then(
+    return client._pending = this.query(query, { priority }).then(
       (data) => client.queryResult(data).update(),
       (err) => {
         this._logger.error(err);
@@ -6388,7 +6236,7 @@ var Coordinator = class {
    * the client is simply updated. Otherwise `updateClient` is called. As a
    * side effect, this method clears the current preaggregator state.
    * @param {MosaicClient} client The client to update.
-   * @param {QueryType | null} [query] The query to issue.
+   * @param {import('./types.js').QueryType | null} [query] The query to issue.
    */
   requestQuery(client, query) {
     this.preaggregator.clear();
@@ -6405,7 +6253,7 @@ var Coordinator = class {
     }
     clients.add(client);
     client.coordinator = this;
-    this.initializeClient(client);
+    client._pending = this.initializeClient(client);
     connectSelection(this, client.filterBy, client);
   }
   async initializeClient(client) {
@@ -6413,6 +6261,7 @@ var Coordinator = class {
     if (fields?.length) {
       client.fieldInfo(await queryFieldInfo(this, fields));
     }
+    await client.prepare();
     return client.requestQuery();
   }
   /**
@@ -7032,6 +6881,179 @@ var SelectionResolver = class {
   }
 };
 
+// ../core/src/util/throttle.js
+var NIL = {};
+function throttle(callback, debounce = false) {
+  let curr;
+  let next;
+  let pending = NIL;
+  function invoke(event) {
+    curr = callback(event).catch(() => {
+    }).finally(() => {
+      if (next) {
+        const { value } = next;
+        next = null;
+        invoke(value);
+      } else {
+        curr = null;
+      }
+    });
+  }
+  function enqueue(event) {
+    next = { event };
+  }
+  function process(event) {
+    curr ? enqueue(event) : invoke(event);
+  }
+  function delay(event) {
+    if (pending !== event) {
+      requestAnimationFrame(() => {
+        const e = pending;
+        pending = NIL;
+        process(e);
+      });
+    }
+    pending = event;
+  }
+  return debounce ? delay : process;
+}
+
+// ../core/src/MosaicClient.js
+var MosaicClient = class {
+  /**
+   * Constructor.
+   * @param {*} filterSelection An optional selection to interactively filter
+   *  this client's data. If provided, a coordinator will re-query and update
+   *  the client when the selection updates.
+   */
+  constructor(filterSelection) {
+    this._filterBy = filterSelection;
+    this._requestUpdate = throttle(() => this.requestQuery(), true);
+    this._coordinator = null;
+    this._pending = Promise.resolve();
+  }
+  /**
+   * Return this client's connected coordinator.
+   */
+  get coordinator() {
+    return this._coordinator;
+  }
+  /**
+   * Set this client's connected coordinator.
+   */
+  set coordinator(coordinator2) {
+    this._coordinator = coordinator2;
+  }
+  /**
+   * Return a Promise that resolves once the client has updated.
+   */
+  get pending() {
+    return this._pending;
+  }
+  /**
+   * Return this client's filter selection.
+   */
+  get filterBy() {
+    return this._filterBy;
+  }
+  /**
+   * Return a boolean indicating if the client query can be sped up with
+   * materialized views of pre-aggregated data. Should return true if changes to
+   * the filterBy selection does not change the groupby domain of the client
+   * query.
+   */
+  get filterStable() {
+    return true;
+  }
+  /**
+   * Return an array of fields queried by this client.
+   * @returns {import('./types.js').FieldInfoRequest[] | null}
+   *  The fields to retrieve info for.
+   */
+  fields() {
+    return null;
+  }
+  /**
+   * Called by the coordinator to set the field info for this client.
+   * @param {import('./types.js').FieldInfo[]} info The field info result.
+   * @returns {this}
+   */
+  fieldInfo(info) {
+    return this;
+  }
+  /**
+   * Prepare the client before the query() method is called.
+   */
+  async prepare() {
+  }
+  /**
+   * Return a query specifying the data needed by this client.
+   * @param {*} [filter] The filtering criteria to apply in the query.
+   * @returns {*} The client query
+   */
+  query(filter3) {
+    return null;
+  }
+  /**
+   * Called by the coordinator to inform the client that a query is pending.
+   * @returns {this}
+   */
+  queryPending() {
+    return this;
+  }
+  /**
+   * Called by the coordinator to return a query result.
+   * @param {*} data The query result.
+   * @returns {this}
+   */
+  queryResult(data) {
+    return this;
+  }
+  /**
+   * Called by the coordinator to report a query execution error.
+   * @param {*} error
+   * @returns {this}
+   */
+  queryError(error) {
+    return this;
+  }
+  /**
+   * Request the coordinator to execute a query for this client.
+   * If an explicit query is not provided, the client query method will
+   * be called, filtered by the current filterBy selection.
+   * @returns {Promise}
+   */
+  requestQuery(query) {
+    const q = query || this.query(this.filterBy?.predicate(this));
+    return this._coordinator.requestQuery(this, q);
+  }
+  /**
+   * Request that the coordinator perform a throttled update of this client
+   * using the default query. Unlike requestQuery, for which every call will
+   * result in an executed query, multiple calls to requestUpdate may be
+   * consolidated into a single update.
+   */
+  requestUpdate() {
+    this._requestUpdate();
+  }
+  /**
+   * Reset this client, initiating new field info, call the prepare method, and query requests.
+   * @returns {Promise}
+   */
+  initialize() {
+    return this._coordinator.initializeClient(this);
+  }
+  /**
+   * Requests a client update.
+   * For example to (re-)render an interface component.
+   *
+   * @returns {this | Promise<any>}
+   */
+  update() {
+    return this;
+  }
+};
+
 // ../core/src/SelectionClause.js
 function clausePoint(field3, value, {
   source,
@@ -30999,6 +31021,9 @@ var DEFAULT_ATTRIBUTES = {
   marginBottom: 30
 };
 var Plot = class {
+  /**
+   * @param {HTMLElement} [element]
+   */
   constructor(element) {
     this.attributes = { ...DEFAULT_ATTRIBUTES };
     this.listeners = null;
@@ -31006,12 +31031,12 @@ var Plot = class {
     this.legends = [];
     this.marks = [];
     this.markset = null;
+    this.params = /* @__PURE__ */ new Map();
+    this.synch = synchronizer();
     this.element = element || document.createElement("div");
     this.element.setAttribute("class", "plot");
     this.element.style.display = "flex";
-    this.element.value = this;
-    this.params = /* @__PURE__ */ new Map();
-    this.synch = synchronizer();
+    Object.assign(this.element, { value: this });
   }
   margins() {
     return {
@@ -31386,7 +31411,7 @@ function markQuery(channels, table, skip = []) {
     const { channel, field: field3, as } = c4;
     if (skip.includes(channel)) continue;
     if (channel === "orderby") {
-      q.orderby(c4.value);
+      q.orderby(c4.value ?? field3);
     } else if (field3) {
       if (isAggregateExpression(field3)) {
         aggr = true;
@@ -31518,7 +31543,7 @@ var ConnectedMark = class extends Mark2 {
       const cols = q._select.map((c4) => c4.alias).filter((c4) => c4 !== as && c4 !== value);
       return m4(q, expr, as, value, cols);
     } else {
-      return q.orderby(field3);
+      return q.orderby(as);
     }
   }
 };
@@ -33678,12 +33703,13 @@ var Nearest = class {
       selection2.update(that.clause(void 0));
     });
     svg.addEventListener("pointerenter", (evt) => {
-      if (!evt.buttons) {
-        const v2 = this.channels.map(() => 0);
-        selection2.activate(this.clause(v2));
-      }
+      if (!evt.buttons) this.activate();
     });
   }
+  activate() {
+    const v2 = this.channels.map(() => 0);
+    this.selection.activate(this.clause(v2));
+  }
 };
 function calculateXY(svg, mark) {
   const { data: { columns } } = mark;
@@ -33779,7 +33805,7 @@ var PanZoom = class {
     this.svg = svg;
     if (this.initialized) return;
     else this.initialized = true;
-    const { panx, pany, mark: { plot: { element } }, xsel, ysel } = this;
+    const { panx, pany, mark: { plot: { element } } } = this;
     this.xscale = svg.scale("x");
     this.yscale = svg.scale("y");
     const rx = this.xscale.range.slice().sort(asc2);
@@ -33796,19 +33822,21 @@ var PanZoom = class {
       element.addEventListener("pointerenter", (evt) => {
         if (enter) return;
         else enter = true;
-        if (evt.buttons) return;
-        if (panx) {
-          const { xscale, xfield } = this;
-          xsel.activate(this.clause(xscale.domain, xfield, xscale));
-        }
-        if (pany) {
-          const { yscale, yfield } = this;
-          ysel.activate(this.clause(yscale.domain, yfield, yscale));
-        }
+        if (!evt.buttons) this.activate();
       });
       element.addEventListener("pointerleave", () => enter = false);
     }
   }
+  activate() {
+    if (this.panx) {
+      const { xscale, xfield } = this;
+      this.xsel.activate(this.clause(xscale.domain, xfield, xscale));
+    }
+    if (this.pany) {
+      const { yscale, yfield } = this;
+      this.ysel.activate(this.clause(yscale.domain, yfield, yscale));
+    }
+  }
 };
 function extent3(ext, defaultTrue, defaultFalse) {
   return ext ? Array.isArray(ext) ? ext : defaultTrue : defaultFalse;
@@ -34193,8 +34221,8 @@ var Toggle = class {
     channels,
     peers = true
   }) {
-    this.value = null;
     this.mark = mark;
+    this.value = null;
     this.selection = selection2;
     this.peers = peers;
     const fields = this.fields = [];
@@ -34246,10 +34274,12 @@ var Toggle = class {
       }
     });
     svg.addEventListener("pointerenter", (evt) => {
-      if (evt.buttons) return;
-      this.selection.activate(this.clause([this.fields.map(() => 0)]));
+      if (!evt.buttons) this.activate();
     });
   }
+  activate() {
+    this.selection.activate(this.clause([this.fields.map(() => 0)]));
+  }
 };
 function isTargetElement(groups2, node) {
   return groups2.some((g) => g.contains(node));