@uwdata/mosaic-sql 0.15.0 → 0.16.2

package/dist/types/ast/select.d.ts

@@ -19,4 +19,4 @@ export class SelectClauseNode extends SQLNode {
     readonly alias: string;
 }
 import { SQLNode } from './node.js';
-import { ExprNode } from './node.js';
+import type { ExprNode } from './node.js';

package/dist/types/ast/window.d.ts

@@ -172,7 +172,7 @@ export class WindowFrameNode extends SQLNode {
 export type FrameExtent = [any, any] | ParamLike;
 import { SQLNode } from './node.js';
 import { ExprNode } from './node.js';
-import { AggregateNode } from './aggregate.js';
+import type { AggregateNode } from './aggregate.js';
 import type { ExprVarArgs } from '../types.js';
 import { FunctionNode } from './function.js';
 import type { WindowFunctionName } from '../types.js';

package/dist/types/ast/with.d.ts

@@ -29,4 +29,4 @@ export class WithClauseNode extends SQLNode {
     readonly materialized: boolean | null;
 }
 import { SQLNode } from './node.js';
-import { Query } from './query.js';
+import type { Query } from './query.js';

package/dist/types/functions/column.d.ts

@@ -7,5 +7,5 @@
  */
 export function column(name: string | ParamLike, table?: string | string[] | TableRefNode): ColumnRefNode;
 import type { ParamLike } from '../types.js';
-import { TableRefNode } from '../ast/table-ref.js';
+import type { TableRefNode } from '../ast/table-ref.js';
 import type { ColumnRefNode } from '../ast/column-ref.js';

package/dist/types/functions/cte.d.ts

@@ -9,5 +9,5 @@
  * @returns {WithClauseNode}
  */
 export function cte(name: string, query: Query, materialized?: boolean | null): WithClauseNode;
-import { Query } from '../ast/query.js';
+import type { Query } from '../ast/query.js';
 import { WithClauseNode } from '../ast/with.js';

package/dist/types/visit/rewrite.d.ts

@@ -1,10 +1,10 @@
 /**
  * Rewrite a SQL expression, based on a map of nodes to replace.
- * This method updates the expression in place.
+ * This method copies nodes as needed; it does not modify the input node.
  * @param {ExprNode} node The root AST node of the expression.
  * @param {Map<ExprNode, ExprNode>} map The rewrite map.
  *  When encountered, key nodes are replaced by value nodes.
  * @returns {ExprNode}
  */
 export function rewrite(node: ExprNode, map: Map<ExprNode, ExprNode>): ExprNode;
-import { ExprNode } from '../ast/node.js';
+import type { ExprNode } from '../ast/node.js';

package/dist/types/visit/visitors.d.ts

@@ -28,7 +28,7 @@ export function collectColumns(root: SQLNode): ColumnRefNode[];
  * @returns {ParamLike[]}
  */
 export function collectParams(root: SQLNode): ParamLike[];
-import { SQLNode } from '../ast/node.js';
-import { AggregateNode } from '../ast/aggregate.js';
-import { ColumnRefNode } from '../ast/column-ref.js';
+import type { SQLNode } from '../ast/node.js';
+import type { AggregateNode } from '../ast/aggregate.js';
+import type { ColumnRefNode } from '../ast/column-ref.js';
 import type { ParamLike } from '../types.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-sql",
-  "version": "0.15.0",
+  "version": "0.16.2",
   "description": "SQL query construction and analysis.",
   "keywords": [
     "sql",
@@ -27,5 +27,5 @@
     "tsc": "tsc -p jsconfig.json",
     "prepublishOnly": "npm run test && npm run lint && npm run build"
   },
-  "gitHead": "671ad1ba86749a8435bd4aa7e722e2a8553f2cb0"
+  "gitHead": "26d2719f4bcab471d2831145e1f03f39f3509869"
 }

package/src/ast/select.js

@@ -1,7 +1,8 @@
+/** @import { ExprNode } from './node.js' */
 import { SELECT_CLAUSE } from '../constants.js';
 import { quoteIdentifier } from '../util/string.js';
 import { ColumnRefNode } from './column-ref.js';
-import { ExprNode, SQLNode } from './node.js';
+import { SQLNode } from './node.js';
 
 export class SelectClauseNode extends SQLNode {
   /**

package/src/ast/window.js

@@ -1,4 +1,5 @@
 /**
+ * @import { AggregateNode } from './aggregate.js'
  * @import { ExprVarArgs, WindowFunctionName } from '../types.js'
  * @import { ParamLike } from '../types.js'
  */
@@ -6,7 +7,6 @@ import { WINDOW, WINDOW_CLAUSE, WINDOW_DEF, WINDOW_FRAME } from '../constants.js
 import { exprList } from '../util/function.js';
 import { quoteIdentifier } from '../util/string.js';
 import { isParamLike } from '../util/type-check.js';
-import { AggregateNode } from './aggregate.js';
 import { FunctionNode } from './function.js';
 import { ExprNode, isNode, SQLNode } from './node.js';
 import { ParamNode } from './param.js';

package/src/ast/with.js

@@ -1,6 +1,6 @@
+/** @import { Query } from './query.js' */
 import { WITH_CLAUSE } from '../constants.js';
 import { SQLNode } from './node.js';
-import { Query } from './query.js';
 
 export class WithClauseNode extends SQLNode {
   /**

package/src/functions/column.js

@@ -1,11 +1,11 @@
 /**
  * @import { ColumnRefNode } from '../ast/column-ref.js'
+ * @import { TableRefNode } from '../ast/table-ref.js'
  * @import { ParamLike } from '../types.js'
  */
 import { ColumnParamNode } from '../ast/column-param.js';
 import { ColumnNameRefNode } from '../ast/column-ref.js';
 import { ParamNode } from '../ast/param.js';
-import { TableRefNode } from '../ast/table-ref.js';
 import { asTableRef } from '../util/ast.js';
 import { isParamLike } from '../util/type-check.js';
 

package/src/functions/cte.js

@@ -1,4 +1,4 @@
-import { Query } from '../ast/query.js';
+/** @import { Query } from '../ast/query.js' */
 import { WithClauseNode } from '../ast/with.js';
 
 /**

package/src/visit/rewrite.js

@@ -1,9 +1,10 @@
-import { ExprNode, isNode } from '../ast/node.js';
+/** @import { ExprNode } from '../ast/node.js' */
+import { isNode } from '../ast/node.js';
 import { recurse } from './recurse.js';
 
 /**
  * Rewrite a SQL expression, based on a map of nodes to replace.
- * This method updates the expression in place.
+ * This method copies nodes as needed; it does not modify the input node.
  * @param {ExprNode} node The root AST node of the expression.
  * @param {Map<ExprNode, ExprNode>} map The rewrite map.
  *  When encountered, key nodes are replaced by value nodes.
@@ -15,18 +16,30 @@ export function rewrite(node, map) {
   } else if (isNode(node)) {
     const props = recurse[node.type];
     const n = props?.length ?? 0;
-    for (let i = 0; i < n; ++i) {
-      const prop = props[i];
-      const child = node[prop];
-      if (Array.isArray(child)) {
-        const m = child.length;
-        for (let j = 0; j < m; ++j) {
-          child[j] = rewrite(child[j], map);
+    if (n > 0) {
+      node = cloneNode(node);
+      for (let i = 0; i < n; ++i) {
+        const prop = props[i];
+        const child = node[prop];
+        if (Array.isArray(child)) {
+          const m = child.length;
+          for (let j = 0; j < m; ++j) {
+            child[j] = rewrite(child[j], map);
+          }
+        } else if (child) {
+          node[prop] = rewrite(child, map);
         }
-      } else if (child) {
-        node[prop] = rewrite(child, map);
       }
     }
   }
   return node;
 }
+
+// TODO: consider typed node.clone() methods
+function cloneNode(node) {
+  const clone = new node.constructor();
+  for (const key in node) {
+    clone[key] = node[key];
+  }
+  return clone;
+}

package/src/visit/visitors.js

@@ -1,11 +1,12 @@
 /**
+ * @import { AggregateNode } from '../ast/aggregate.js'
+ * @import { ColumnRefNode } from '../ast/column-ref.js'
+ * @import { SQLNode } from '../ast/node.js'
  * @import { ParamNode } from '../ast/param.js'
  * @import { ParamLike } from '../types.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';
+import { aggregateNames } from '../ast/aggregate.js';
 import { walk } from './walk.js';
 
 // regexp to match valid aggregate function names