squirreling 0.9.0 → 0.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squirreling",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Squirreling Async SQL Engine",
   "author": "Hyperparam",
   "homepage": "https://hyperparam.app",
@@ -40,7 +40,7 @@
     "@types/node": "25.2.3",
     "@vitest/coverage-v8": "4.0.18",
     "eslint": "9.39.2",
-    "eslint-plugin-jsdoc": "62.5.5",
+    "eslint-plugin-jsdoc": "62.6.0",
     "typescript": "5.9.3",
     "vitest": "4.0.18"
   }

package/src/execute/aggregates.js

@@ -1,6 +1,7 @@
+import { derivedAlias } from '../expression/alias.js'
 import { evaluateExpr } from '../expression/evaluate.js'
-import { defaultDerivedAlias, stringify } from './utils.js'
 import { executePlan } from './execute.js'
+import { stringify } from './utils.js'
 
 /**
  * @import { AsyncCells, AsyncRow, ExecuteContext, SelectColumn } from '../types.js'
@@ -31,7 +32,7 @@ function projectAggregateColumns(selectColumns, group, context) {
         }
       }
     } else if (col.kind === 'derived') {
-      const alias = col.alias ?? defaultDerivedAlias(col.expr)
+      const alias = col.alias ?? derivedAlias(col.expr)
       columns.push(alias)
       cells[alias] = () => evaluateExpr({
         node: col.expr,

package/src/execute/execute.js

@@ -1,12 +1,13 @@
 import { memorySource } from '../backend/dataSource.js'
 import { tableNotFoundError } from '../executionErrors.js'
+import { derivedAlias } from '../expression/alias.js'
 import { evaluateExpr } from '../expression/evaluate.js'
 import { parseSql } from '../parse/parse.js'
 import { planSql } from '../plan/plan.js'
 import { executeHashAggregate, executeScalarAggregate } from './aggregates.js'
 import { executeHashJoin, executeNestedLoopJoin, executePositionalJoin } from './join.js'
 import { executeSort } from './sort.js'
-import { defaultDerivedAlias, stableRowKey } from './utils.js'
+import { stableRowKey } from './utils.js'
 
 /**
  * @import { AsyncCells, AsyncDataSource, AsyncRow, ExecuteContext, ExecuteSqlOptions, ExprNode, SelectStatement } from '../types.js'
@@ -207,7 +208,7 @@ async function* executeProject(plan, context) {
           cells[key] = row.cells[key]
         }
       } else if (col.kind === 'derived') {
-        const alias = col.alias ?? defaultDerivedAlias(col.expr)
+        const alias = col.alias ?? derivedAlias(col.expr)
         columns.push(alias)
         cells[alias] = () => evaluateExpr({
           node: col.expr,

package/src/execute/utils.js

@@ -1,5 +1,5 @@
 /**
- * @import { AsyncCells, AsyncRow, ExprNode, OrderByItem, SqlPrimitive } from '../types.js'
+ * @import { AsyncCells, AsyncRow, OrderByItem, SqlPrimitive } from '../types.js'
  */
 
 /**
@@ -57,45 +57,6 @@ export async function collect(asyncRows) {
   return results
 }
 
-/**
- * Generates a default alias for a derived column expression
- *
- * @param {ExprNode} expr - the expression node
- * @returns {string} the generated alias
- */
-export function defaultDerivedAlias(expr) {
-  if (expr.type === 'identifier') {
-    // For qualified names like 'users.name', use just the column part as alias
-    if (expr.name.includes('.')) {
-      return expr.name.split('.').pop()
-    }
-    return expr.name
-  }
-  if (expr.type === 'literal') {
-    return String(expr.value)
-  }
-  if (expr.type === 'cast') {
-    return defaultDerivedAlias(expr.expr) + '_as_' + expr.toType
-  }
-  if (expr.type === 'unary') {
-    return expr.op + '_' + defaultDerivedAlias(expr.argument)
-  }
-  if (expr.type === 'binary') {
-    return defaultDerivedAlias(expr.left) + '_' + expr.op + '_' + defaultDerivedAlias(expr.right)
-  }
-  if (expr.type === 'function') {
-    // Handle aggregate functions with star (COUNT(*) -> count_all)
-    if (expr.args.length === 1 && expr.args[0].type === 'identifier' && expr.args[0].name === '*') {
-      return expr.name.toLowerCase() + '_all'
-    }
-    return expr.name.toLowerCase() + '_' + expr.args.map(defaultDerivedAlias).join('_')
-  }
-  if (expr.type === 'interval') {
-    return `interval_${expr.value}_${expr.unit.toLowerCase()}`
-  }
-  return 'expr'
-}
-
 /**
  * @param {SqlPrimitive} value
  * @returns {string}

package/src/expression/alias.js

@@ -0,0 +1,42 @@
+/**
+ * @import { ExprNode } from '../types.js'
+ */
+
+/**
+ * Generates a default alias for a derived column expression
+ *
+ * @param {ExprNode} expr - the expression node
+ * @returns {string} the generated alias
+ */
+export function derivedAlias(expr) {
+  if (expr.type === 'identifier') {
+    // For qualified names like 'users.name', use just the column part as alias
+    if (expr.name.includes('.')) {
+      return expr.name.split('.').pop()
+    }
+    return expr.name
+  }
+  if (expr.type === 'literal') {
+    return String(expr.value)
+  }
+  if (expr.type === 'cast') {
+    return derivedAlias(expr.expr) + '_as_' + expr.toType
+  }
+  if (expr.type === 'unary') {
+    return expr.op + '_' + derivedAlias(expr.argument)
+  }
+  if (expr.type === 'binary') {
+    return derivedAlias(expr.left) + '_' + expr.op + '_' + derivedAlias(expr.right)
+  }
+  if (expr.type === 'function') {
+    // Handle aggregate functions with star (COUNT(*) -> count_all)
+    if (expr.args.length === 1 && expr.args[0].type === 'identifier' && expr.args[0].name === '*') {
+      return expr.name.toLowerCase() + '_all'
+    }
+    return expr.name.toLowerCase() + '_' + expr.args.map(derivedAlias).join('_')
+  }
+  if (expr.type === 'interval') {
+    return `interval_${expr.value}_${expr.unit.toLowerCase()}`
+  }
+  return 'expr'
+}

package/src/expression/evaluate.js

@@ -1,9 +1,10 @@
 import { executeSelect } from '../execute/execute.js'
-import { defaultDerivedAlias, stringify } from '../execute/utils.js'
+import { stringify } from '../execute/utils.js'
 import { columnNotFoundError, invalidContextError } from '../executionErrors.js'
 import { unknownFunctionError } from '../parseErrors.js'
 import { isAggregateFunc, isMathFunc, isRegexpFunc, isStringFunc } from '../validation.js'
 import { aggregateError, argValueError, castError } from '../validationErrors.js'
+import { derivedAlias } from './alias.js'
 import { applyBinaryOp } from './binary.js'
 import { applyIntervalToDate } from './date.js'
 import { evaluateMathFunc } from './math.js'
@@ -104,9 +105,9 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
       if (!rows) {
         // Aggregate function used outside of aggregate context
         // This is only allowed if same aggregate was in the SELECT list
-        const derivedAlias = defaultDerivedAlias(node)
-        if (row.columns.includes(derivedAlias)) {
-          return row.cells[derivedAlias]()
+        const alias = derivedAlias(node)
+        if (row.columns.includes(alias)) {
+          return row.cells[alias]()
         } else {
           throw aggregateError({
             funcName,

package/src/index.d.ts

@@ -1,4 +1,4 @@
-import type { AsyncDataSource, AsyncRow, ExecuteContext, ExecuteSqlOptions, ParseSqlOptions, PlanSqlOptions, QueryPlan, SelectStatement, SqlPrimitive, Token } from './types.js'
+import type { AsyncDataSource, AsyncRow, ExecuteContext, ExecuteSqlOptions, ExprNode, ParseSqlOptions, PlanSqlOptions, QueryPlan, SelectStatement, SqlPrimitive, Token } from './types.js'
 export type {
   AsyncCells,
   AsyncDataSource,
@@ -76,3 +76,12 @@ export function tokenizeSql(sql: string): Token[]
 export function collect<T>(asyncGen: AsyncGenerator<AsyncRow>): Promise<Record<string, SqlPrimitive>[]>
 
 export function cachedDataSource(source: AsyncDataSource): AsyncDataSource
+
+/**
+ * Generates a default alias for a derived column expression.
+ * Useful for generating column names pre-execution.
+ *
+ * @param expr - the expression node
+ * @returns the generated alias
+ */
+export function derivedAlias(expr: ExprNode): string

package/src/index.js

@@ -4,3 +4,4 @@ export { planSql } from './plan/plan.js'
 export { tokenizeSql } from './parse/tokenize.js'
 export { collect } from './execute/utils.js'
 export { cachedDataSource } from './backend/dataSource.js'
+export { derivedAlias } from './expression/alias.js'

package/src/types.d.ts

@@ -228,12 +228,6 @@ export type ExprNode =
   | SubqueryNode
   | IntervalNode
 
-export interface StarColumn {
-  kind: 'star'
-  table?: string
-  alias?: string
-}
-
 export type AggregateFunc = 'COUNT' | 'SUM' | 'AVG' | 'MIN' | 'MAX' | 'JSON_ARRAYAGG' | 'STDDEV_SAMP' | 'STDDEV_POP'
 
 export type MathFunc =
@@ -276,6 +270,11 @@ export type StringFunc =
   | 'RIGHT'
   | 'INSTR'
 
+export interface StarColumn {
+  kind: 'star'
+  table?: string
+}
+
 export interface DerivedColumn {
   kind: 'derived'
   expr: ExprNode