@uwdata/mosaic-core 0.3.2 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-core",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Scalable and extensible linked data views.",
   "keywords": [
     "mosaic",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "^1.27.0",
-    "@uwdata/mosaic-sql": "^0.3.2",
+    "@uwdata/mosaic-sql": "^0.3.4",
     "apache-arrow": "^11.0.0"
   },
-  "gitHead": "788bb137cc402b472fc7e4d84844c78151707c82"
+  "gitHead": "faed78bc6264faa09a20b385601e03a9e1e15979"
 }

package/src/DataCubeIndexer.js

@@ -87,11 +87,15 @@ export class DataCubeIndexer {
         subqueryPushdown(subq, cols);
       }
 
+      // push orderby criteria to later cube queries
+      const order = query.orderby();
+      query.query.orderby = [];
+
       const sql = query.toString();
       const id = (fnv_hash(sql) >>> 0).toString(16);
       const table = `cube_index_${id}`;
       const result = mc.exec(create(table, sql, { temp }));
-      indices.set(client, { table, result, ...index });
+      indices.set(client, { table, result, order, ...index });
     }
   }
 
@@ -111,12 +115,13 @@ export class DataCubeIndexer {
       filter = this.activeView.predicate(this.selection.active.predicate);
     }
 
-    const { table, dims, aggr } = index;
+    const { table, dims, aggr, order = [] } = index;
     const query = Query
       .select(dims, aggr)
       .from(table)
       .groupby(dims)
-      .where(filter);
+      .where(filter)
+      .orderby(order);
     return this.mc.updateClient(client, query);
   }
 }

package/src/Selection.js

@@ -86,7 +86,7 @@ export 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.
    */
@@ -192,12 +192,16 @@ export 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);
   }
 }