@uwdata/mosaic-sql 0.12.1 → 0.13.0

package/src/transforms/m4.js

@@ -1,6 +1,7 @@
-import { Query } from '../ast/query.js';
+import { Query, isQuery } from '../ast/query.js';
 import { argmax, argmin, max, min } from '../functions/aggregate.js';
 import { int32 } from '../functions/cast.js';
+import { cte } from '../functions/cte.js';
 import { floor } from '../functions/numeric.js';
 
 /**
@@ -22,12 +23,20 @@ import { floor } from '../functions/numeric.js';
 export function m4(input, bin, x, y, groups = []) {
   const pixel = int32(floor(bin));
 
+  // Below, we treat input as a CTE when it is a query. In this case,
+  // we also request that the CTE be explicitly materialized.
+  const useCTE = isQuery(input);
+  const from = useCTE ? 'input' : input;
+  const query = useCTE
+    ? Query.with(cte(/** @type {string} */(from), input, true))
+    : Query;
+
   const q = (sel) => Query
-    .from(input)
+    .from(from)
     .select(sel)
     .groupby(pixel, groups);
 
-  return Query
+  return query
     .union(
       q([{ [x]: min(x), [y]: argmin(y, x) }, ...groups]),
       q([{ [x]: max(x), [y]: argmax(y, x) }, ...groups]),

package/src/types.ts

@@ -2,6 +2,7 @@ import { ColumnRefNode } from './ast/column-ref.js';
 import { ExprNode, SQLNode } from './ast/node.js';
 import { TableRefNode } from './ast/table-ref.js';
 import { Query } from './ast/query.js';
+import { WithClauseNode } from './ast/with.js';
 
 /**
  * Interface representing a dynamic parameter value.
@@ -80,7 +81,11 @@ export type SelectEntry =
 
 export type SelectExpr = MaybeArray<SelectEntry>;
 
-export type WithExpr = MaybeArray<Record<string, Query>>;
+export type WithEntry =
+  | WithClauseNode
+  | Record<string, Query>;
+
+export type WithExpr = MaybeArray<WithEntry>;
 
 export type FromEntry =
   | string

package/src/visit/visitors.js

@@ -1,4 +1,4 @@
-import { AGGREGATE, COLUMN_REF, FRAGMENT, PARAM, VERBATIM, WINDOW } from '../constants.js';
+import { AGGREGATE, COLUMN_PARAM, COLUMN_REF, FRAGMENT, PARAM, VERBATIM, WINDOW } from '../constants.js';
 import { aggregateNames, AggregateNode } from '../ast/aggregate.js';
 import { ColumnRefNode } from '../ast/column-ref.js';
 import { SQLNode } from '../ast/node.js';
@@ -82,7 +82,7 @@ export function collectAggregates(root) {
 export function collectColumns(root) {
   const cols = {};
   walk(root, (node) => {
-    if (node.type === COLUMN_REF) {
+    if (node.type === COLUMN_REF || node.type === COLUMN_PARAM) {
       cols[node] = node; // key on string-coerced node
     }
   });

package/vitest.config.ts

@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});