Refactor select improving spread (...obj) and enabling nested projection. (TanStack#389)

Co-authored-by: Kyle Mathews <mathews.kyle@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>

Author: 3 people

packages/db/src/query/builder/functions.ts

@@ -3,9 +3,12 @@ import { toExpression } from "./ref-proxy.js"
 import type { RefProxyFor } from "./types"
 import type { BasicExpression } from "../ir"
 import type { RefProxy } from "./ref-proxy.js"
-import type { Ref } from "./types.js"
+import type { RefLeaf } from "./types.js"
 
-type StringRef = Ref<string> | Ref<string | null> | Ref<string | undefined>
+type StringRef =
+  | RefLeaf<string>
+  | RefLeaf<string | null>
+  | RefLeaf<string | undefined>
 type StringRefProxy =
   | RefProxy<string>
   | RefProxy<string | null>
@@ -24,7 +27,7 @@ type StringLike =
 
 type ComparisonOperand<T> =
   | RefProxy<T>
-  | Ref<T>
+  | RefLeaf<T>
   | T
   | BasicExpression<T>
   | undefined
@@ -36,13 +39,13 @@ type ComparisonOperandPrimitive<T extends string | number | boolean> =
   | null
 
 // Helper type for any expression-like value
-type ExpressionLike = BasicExpression | RefProxy<any> | Ref<any> | any
+type ExpressionLike = BasicExpression | RefProxy<any> | RefLeaf<any> | any
 
 // Helper type to extract the underlying type from various expression types
 type ExtractType<T> =
   T extends RefProxy<infer U>
     ? U
-    : T extends Ref<infer U>
+    : T extends RefLeaf<infer U>
       ? U
       : T extends BasicExpression<infer U>
         ? U

packages/db/src/query/builder/index.ts

@@ -171,7 +171,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
     // Create a temporary context for the callback
     const currentAliases = this._getCurrentAliases()
     const newAliases = [...currentAliases, alias]
-    const refProxy = createRefProxy(newAliases) as RefProxyForContext<
+    const refProxy = createRefProxy(newAliases) as RefsForContext<
       MergeContextForJoinCallback<TContext, SchemaFromSource<TSource>>
     >
 
@@ -439,34 +439,7 @@ export class BaseQueryBuilder<TContext extends Context = Context> {
     const refProxy = createRefProxy(aliases) as RefsForContext<TContext>
     const refProxy = createRefProxy(aliases) as RefsForContext<TContext>
     const selectObject = callback(refProxy)
-
-    // Check if any tables were spread during the callback
-    const spreadSentinels = (refProxy as any).__spreadSentinels as Set<string>
-
-    // Convert the select object to use expressions, including spread sentinels
-    const select: Record<string, BasicExpression | Aggregate> = {}
-
-    // First, add spread sentinels for any tables that were spread
-    for (const spreadAlias of spreadSentinels) {
-      const sentinelKey = `__SPREAD_SENTINEL__${spreadAlias}`
-      select[sentinelKey] = toExpression(spreadAlias) // Use alias as a simple reference
-    }
-
-    // Then add the explicit select fields
-    for (const [key, value] of Object.entries(selectObject)) {
-      if (isRefProxy(value)) {
-        select[key] = toExpression(value)
-      } else if (
-        typeof value === `object` &&
-        value !== null &&
-        `type` in value &&
-        (value.type === `agg` || value.type === `func`)
-      ) {
-        select[key] = value as BasicExpression | Aggregate
-      } else {
-        select[key] = toExpression(value)
-      }
-    }
+    const select = buildNestedSelect(selectObject)
 
     return new BaseQueryBuilder({
       ...this.query,
@@ -899,4 +872,4 @@ export type ExtractContext<T> =
       : never
 
 // Export the types from types.ts for convenience
-export type { Context, Source, GetResult, Ref } from "./types.js"
+export type { Context, Source, GetResult, RefLeaf as Ref } from "./types.js"

packages/db/src/query/builder/ref-proxy.ts

@@ -1,6 +1,6 @@
 import { PropRef, Value } from "../ir.js"
 import type { BasicExpression } from "../ir.js"
-import type { Ref } from "./types.js"
+import type { RefLeaf } from "./types.js"
 
 export interface RefProxy<T = any> {
   /** @internal */
@@ -20,7 +20,7 @@ export type SingleRowRefProxy<T> =
     ? {
         [K in keyof T]: T[K] extends Record<string, any>
           ? SingleRowRefProxy<T[K]> & RefProxy<T[K]>
-          : Ref<T[K]>
+          : RefLeaf<T[K]>
       } & RefProxy<T>
     : RefProxy<T>