@uwdata/mosaic-core 0.3.2 → 0.3.4

package/dist/mosaic-core.js

@@ -12494,11 +12494,13 @@ var DataCubeIndexer = class {
         const cols = Object.values(activeView.columns).map((c) => c.columns[0]);
         subqueryPushdown(subq, cols);
       }
+      const order = query.orderby();
+      query.query.orderby = [];
       const sql2 = query.toString();
       const id = (fnv_hash(sql2) >>> 0).toString(16);
       const table = `cube_index_${id}`;
       const result = mc.exec(create(table, sql2, { temp }));
-      indices.set(client, { table, result, ...index });
+      indices.set(client, { table, result, order, ...index });
     }
   }
   async update() {
@@ -12515,8 +12517,8 @@ var DataCubeIndexer = class {
     if (!filter) {
       filter = this.activeView.predicate(this.selection.active.predicate);
     }
-    const { table, dims, aggr } = index;
-    const query = Query.select(dims, aggr).from(table).groupby(dims).where(filter);
+    const { table, dims, aggr, order = [] } = index;
+    const query = Query.select(dims, aggr).from(table).groupby(dims).where(filter).orderby(order);
     return this.mc.updateClient(client, query);
   }
 };
@@ -13702,7 +13704,7 @@ var Selection = class _Selection extends Param {
   }
   /**
    * Create a clone of this Selection with clauses corresponding
-   * to provided source removed.
+   * to the provided source removed.
    * @param {*} source The clause source to remove.
    * @returns {this} A cloned and updated Selection.
    */
@@ -13793,12 +13795,16 @@ var Selection = class _Selection extends Param {
   /**
    * Return a selection query predicate for the given client.
    * @param {*} client The client whose data may be filtered.
+   * @param {boolean} [noSkip=false] Disable skipping of active
+   *  cross-filtered sources. If set true, the source of the active
+   *  clause in a cross-filtered selection will not be skipped.
    * @returns {*} The query predicate for filtering client data,
    *  based on the current state of this selection.
    */
-  predicate(client) {
+  predicate(client, noSkip = false) {
     const { clauses } = this;
-    return this._resolver.predicate(clauses, clauses.active, client);
+    const active = noSkip ? null : clauses.active;
+    return this._resolver.predicate(clauses, active, client);
   }
 };
 var SelectionResolver = class {