@uwdata/mosaic-sql 0.23.0 → 0.24.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-sql",
-  "version": "0.23.0",
+  "version": "0.24.2",
   "description": "SQL query construction and analysis.",
   "keywords": [
     "sql",
@@ -29,5 +29,5 @@
     "test": "vitest run",
     "prepublishOnly": "pnpm run test && pnpm run lint && tsc --build"
   },
-  "gitHead": "8d153a15b9b1c69130d5384ecd59aa634e3f90b3"
+  "gitHead": "d4d41a3275dbd6bc7995e1d1a82b0be18769bbca"
 }

package/src/ast/index.ts

@@ -0,0 +1,31 @@
+export { AggregateNode, aggregateNames, isAggregateFunction } from './aggregate.js';
+export { BetweenOpNode, NotBetweenOpNode } from './between-op.js'
+export { BinaryOpNode } from './binary-op.js';
+export { CaseNode, WhenNode } from './case.js';
+export { CastNode } from './cast.js';
+export { CollateNode } from './collate.js';
+export { ColumnParamNode, isColumnParam } from './column-param.js';
+export { ColumnRefNode, ColumnNameRefNode, isColumnRef } from './column-ref.js';
+export { FragmentNode } from './fragment.js';
+export { FromClauseNode } from './from.js';
+export { FunctionNode } from './function.js';
+export { InOpNode } from './in-op.js';
+export { IntervalNode } from './interval.js';
+export { JoinNode, type JoinType, type JoinVariant } from './join.js';
+export { ListNode } from './list.js';
+export { LiteralNode } from './literal.js';
+export { LogicalOpNode, AndNode, OrNode } from './logical-op.js';
+export { SQLNode, ExprNode, isNode } from './node.js';
+export { OrderByNode } from './order-by.js';
+export { ParamNode } from './param.js';
+export { CreateQuery, type CreateTableOptions, CreateSchemaQuery, type CreateSchemaOptions, DescribeQuery, Query, SelectQuery, SetOperation, isCreateQuery, isCreateSchemaQuery, isDescribeQuery, isQuery, isSelectQuery } from './query.js';
+export { SampleClauseNode } from './sample.js';
+export { ScalarSubqueryNode } from './subquery.js';
+export { SelectClauseNode } from './select.js';
+export { TableRefNode, isTableRef } from './table-ref.js';
+export { UnaryOpNode, UnaryPostfixOpNode } from './unary-op.js';
+export { UnnestNode } from './unnest.js';
+export { VerbatimNode } from './verbatim.js';
+export { WindowClauseNode, WindowDefNode, WindowFunctionNode, WindowNode } from './window.js';
+export { WindowFrameNode, WindowFrameExprNode, type FrameExclude, type FrameExtent, type FrameScope, type FrameType, type FrameValue } from './window-frame.js';
+export { WithClauseNode } from './with.js';

package/src/ast/query.ts

@@ -216,6 +216,15 @@ export class Query extends ExprNode {
     return this;
   }
 
+  /**
+   * Set ORDER BY expressions, replacing any prior expressions.
+   * @param expr Expressions to add.
+   */
+  setOrderby(...expr: OrderByExpr[]): this {
+    this._orderby = [];
+    return this.orderby(...expr);
+  }
+
   /**
    * Set the query result LIMIT as a percentage value.
    * @param value The limit percentage value.
@@ -452,11 +461,17 @@ export class SelectQuery extends Query {
    * Add WINDOW definitions.
    * @param expr Window definitions to add.
    */
-  window(...expr: (Record<string, WindowDefNode> | null)[]): this {
+  window(...expr: (Record<string, WindowDefNode> | WindowClauseNode | WindowClauseNode[] | null)[]): this {
     const list: WindowClauseNode[] = [];
     expr.flat().forEach(e => {
-      if (e != null) for (const name in e) {
-        list.push(new WindowClauseNode(unquote(name)!, e[name]));
+      if (e == null) {
+        return;
+      } else if (e instanceof WindowClauseNode) {
+        list.push(e);
+      } else {
+        for (const name in e) {
+          list.push(new WindowClauseNode(unquote(name)!, e[name]));
+        }
       }
     });
     this._window = this._window.concat(list);

package/src/index.ts

@@ -1,37 +1,7 @@
 // Initialize default visitor
 import './init.js';
 
-export { AggregateNode, aggregateNames, isAggregateFunction } from './ast/aggregate.js';
-export { BetweenOpNode, NotBetweenOpNode } from './ast/between-op.js'
-export { BinaryOpNode } from './ast/binary-op.js';
-export { CaseNode, WhenNode } from './ast/case.js';
-export { CastNode } from './ast/cast.js';
-export { CollateNode } from './ast/collate.js';
-export { ColumnParamNode, isColumnParam } from './ast/column-param.js';
-export { ColumnRefNode, ColumnNameRefNode, isColumnRef } from './ast/column-ref.js';
-export { FragmentNode } from './ast/fragment.js';
-export { FromClauseNode } from './ast/from.js';
-export { FunctionNode } from './ast/function.js';
-export { InOpNode } from './ast/in-op.js';
-export { IntervalNode } from './ast/interval.js';
-export { JoinNode, type JoinType, type JoinVariant } from './ast/join.js';
-export { ListNode } from './ast/list.js';
-export { LiteralNode } from './ast/literal.js';
-export { LogicalOpNode, AndNode, OrNode } from './ast/logical-op.js';
-export { SQLNode, ExprNode, isNode } from './ast/node.js';
-export { OrderByNode } from './ast/order-by.js';
-export { ParamNode } from './ast/param.js';
-export { CreateQuery, type CreateTableOptions, CreateSchemaQuery, type CreateSchemaOptions, DescribeQuery, Query, SelectQuery, SetOperation, isCreateQuery, isCreateSchemaQuery, isDescribeQuery, isQuery, isSelectQuery } from './ast/query.js';
-export { SampleClauseNode } from './ast/sample.js';
-export { ScalarSubqueryNode } from './ast/subquery.js';
-export { SelectClauseNode } from './ast/select.js';
-export { TableRefNode, isTableRef } from './ast/table-ref.js';
-export { UnaryOpNode, UnaryPostfixOpNode } from './ast/unary-op.js';
-export { UnnestNode } from './ast/unnest.js';
-export { VerbatimNode } from './ast/verbatim.js';
-export { WindowClauseNode, WindowDefNode, WindowFunctionNode, WindowNode } from './ast/window.js';
-export { WindowFrameNode, WindowFrameExprNode, type FrameExclude, type FrameExtent, type FrameScope, type FrameType, type FrameValue } from './ast/window-frame.js';
-export { WithClauseNode } from './ast/with.js';
+export * from './ast/index.js';
 
 export { argmax, argmin, arrayAgg, avg, corr, count, covariance, covarPop, entropy, first, geomean, kurtosis, mad, max, median, min, mode, last, product, quantile, regrAvgX, regrAvgY, regrCount, regrIntercept, regrR2, regrSXX, regrSXY, regrSYY, regrSlope, skewness, stddev, stddevPop, stringAgg, sum, variance, varPop } from './functions/aggregate.js';
 export { cond } from './functions/case.js';

package/src/visit/codegen/duckdb.ts

@@ -45,7 +45,7 @@ import {
   isNode,
   isQuery,
   isTableRef
-} from '../../index.js';
+} from '../../ast/index.js';
 import { quoteIdentifier } from '../../util/string.js';
 import { literalToSQL } from '../../ast/literal.js';
 import { SQLCodeGenerator } from './sql.js';

package/src/visit/visitors.ts

@@ -31,11 +31,10 @@ function hasVerbatimAggregate(s: string) {
  */
 export function isAggregateExpression(root: SQLNode) {
   let agg = 0;
-  walk(root, (node) => {
+  walk(root, (node, parent) => {
     switch (node.type) {
-      case WINDOW:
-        return -1; // aggs can't include windows
       case AGGREGATE:
+        if (parent?.type === WINDOW) break;
         agg |= 1;
         return -1;
       case FRAGMENT:
@@ -65,8 +64,8 @@ export function isAggregateExpression(root: SQLNode) {
  */
 export function collectAggregates(root: SQLNode) {
   const aggs = new Set<AggregateNode>();
-  walk(root, (node) => {
-    if (node.type === AGGREGATE) {
+  walk(root, (node, parent) => {
+    if (node.type === AGGREGATE && parent?.type !== WINDOW) {
       aggs.add(node as AggregateNode);
     }
   });

package/src/visit/walk.ts

@@ -15,7 +15,7 @@ export type VisitorResult = boolean | number | null | undefined | void;
 /**
  * SQL AST traversal callback function.
  */
-export type VisitorCallback = (node: SQLNode) => VisitorResult;
+export type VisitorCallback = (node: SQLNode, parent?: SQLNode) => VisitorResult;
 
 /**
  * Perform a traversal of a SQL expression AST.
@@ -23,8 +23,17 @@ export type VisitorCallback = (node: SQLNode) => VisitorResult;
  * @param visit Visitor callback function.
  */
 export function walk(node: unknown, visit: VisitorCallback): VisitorResult {
+  return _walk(node, undefined, visit);
+}
+
+/**
+ * Perform a traversal of a SQL expression AST.
+ * @param node Root node for AST traversal.
+ * @param visit Visitor callback function.
+ */
+function _walk(node: unknown, parent: SQLNode | undefined, visit: VisitorCallback): VisitorResult {
   if (!isNode(node)) return;
-  const result = visit(node);
+  const result = visit(node, parent);
   if (result) return result;
 
   const props = recurse[node.type];
@@ -35,11 +44,11 @@ export function walk(node: unknown, visit: VisitorCallback): VisitorResult {
     if (Array.isArray(value)) {
       const m = value.length;
       for (let j = 0; j < m; ++j) {
-        if (value[j] && Number(walk(value[j], visit)) < 0) {
+        if (value[j] && Number(_walk(value[j], node, visit)) < 0) {
           return result;
         }
       }
-    } else if (value && Number(walk(value, visit)) < 0) {
+    } else if (value && Number(_walk(value, node, visit)) < 0) {
       return -1;
     }
   }