@tanstack/db 0.1.11 → 0.2.0

package/src/query/builder/types.ts

@@ -1,8 +1,37 @@
 import type { CollectionImpl } from "../../collection.js"
-import type { Aggregate, BasicExpression, OrderByDirection } from "../ir.js"
+import type {
+  Aggregate,
+  BasicExpression,
+  Func,
+  OrderByDirection,
+  PropRef,
+  Value,
+} from "../ir.js"
 import type { QueryBuilder } from "./index.js"
 import type { ResolveType } from "../../types.js"
 
+/**
+ * Context - The central state container for query builder operations
+ *
+ * This interface tracks all the information needed to build and type-check queries:
+ *
+ * **Schema Management**:
+ * - `baseSchema`: The original tables/collections from the `from()` clause
+ * - `schema`: Current available tables (expands with joins, contracts with subqueries)
+ *
+ * **Query State**:
+ * - `fromSourceName`: Which table was used in `from()` - needed for optionality logic
+ * - `hasJoins`: Whether any joins have been added (affects result type inference)
+ * - `joinTypes`: Maps table aliases to their join types for optionality calculations
+ *
+ * **Result Tracking**:
+ * - `result`: The final shape after `select()` - undefined until select is called
+ *
+ * The context evolves through the query builder chain:
+ * 1. `from()` sets baseSchema and schema to the same thing
+ * 2. `join()` expands schema and sets hasJoins/joinTypes
+ * 3. `select()` sets result to the projected shape
+ */
 export interface Context {
   // The collections available in the base schema
   baseSchema: ContextSchema
@@ -21,20 +50,57 @@ export interface Context {
   result?: any
 }
 
+/**
+ * ContextSchema - The shape of available tables/collections in a query context
+ *
+ * This is simply a record mapping table aliases to their TypeScript types.
+ * It evolves as the query progresses:
+ * - Initial: Just the `from()` table
+ * - After joins: Includes all joined tables with proper optionality
+ * - In subqueries: May be a subset of the outer query's schema
+ */
 export type ContextSchema = Record<string, unknown>
 
+/**
+ * Source - Input definition for query builder `from()` clause
+ *
+ * Maps table aliases to either:
+ * - `CollectionImpl`: A database collection/table
+ * - `QueryBuilder`: A subquery that can be used as a table
+ *
+ * Example: `{ users: usersCollection, orders: ordersCollection }`
+ */
 export type Source = {
   [alias: string]: CollectionImpl<any, any> | QueryBuilder<Context>
 }
 
-// Helper type to infer collection type from CollectionImpl
-// This uses ResolveType directly to ensure consistency with collection creation logic
+/**
+ * InferCollectionType - Extracts the TypeScript type from a CollectionImpl
+ *
+ * This helper ensures we get the same type that would be used when creating
+ * the collection itself. It uses the internal `ResolveType` logic to maintain
+ * consistency between collection creation and query type inference.
+ *
+ * The complex generic parameters extract:
+ * - U: The base document type
+ * - TSchema: The schema definition
+ * - The resolved type combines these with any transforms
+ */
 export type InferCollectionType<T> =
   T extends CollectionImpl<infer U, any, any, infer TSchema, any>
     ? ResolveType<U, TSchema, U>
     : never
 
-// Helper type to create schema from source
+/**
+ * SchemaFromSource - Converts a Source definition into a ContextSchema
+ *
+ * This transforms the input to `from()` into the schema format used throughout
+ * the query builder. For each alias in the source:
+ * - Collections → their inferred TypeScript type
+ * - Subqueries → their result type (what they would return if executed)
+ *
+ * The `Prettify` wrapper ensures clean type display in IDEs.
+ */
 export type SchemaFromSource<T extends Source> = Prettify<{
   [K in keyof T]: T[K] extends CollectionImpl<any, any, any, any, any>
     ? InferCollectionType<T[K]>
@@ -43,49 +109,217 @@ export type SchemaFromSource<T extends Source> = Prettify<{
       : never
 }>
 
-// Helper type to get all aliases from a context
+/**
+ * GetAliases - Extracts all table aliases available in a query context
+ *
+ * Simple utility type that returns the keys of the schema, representing
+ * all table/collection aliases that can be referenced in the current query.
+ */
 export type GetAliases<TContext extends Context> = keyof TContext[`schema`]
 
-// Callback type for where/having clauses
+/**
+ * WhereCallback - Type for where/having clause callback functions
+ *
+ * These callbacks receive a `refs` object containing RefProxy instances for
+ * all available tables. The callback should return a boolean expression
+ * that will be used to filter query results.
+ *
+ * Example: `(refs) => eq(refs.users.age, 25)`
+ */
 export type WhereCallback<TContext extends Context> = (
-  refs: RefProxyForContext<TContext>
+  refs: RefsForContext<TContext>
 ) => any
 
-// Callback return type for select clauses
-export type SelectObject<
-  T extends Record<
-    string,
-    BasicExpression | Aggregate | RefProxy | RefProxyFor<any>
-  > = Record<string, BasicExpression | Aggregate | RefProxy | RefProxyFor<any>>,
-> = T
-
-// Helper type to get the result type from a select object
-export type ResultTypeFromSelect<TSelectObject> = {
-  [K in keyof TSelectObject]: TSelectObject[K] extends RefProxy<infer T>
-    ? T
-    : TSelectObject[K] extends BasicExpression<infer T>
-      ? T
-      : TSelectObject[K] extends Aggregate<infer T>
-        ? T
-        : TSelectObject[K] extends RefProxyFor<infer T>
+/**
+ * SelectValue - Union of all valid values in a select clause
+ *
+ * This type defines what can be used as values in the object passed to `select()`.
+ *
+ * **Core Expression Types**:
+ * - `BasicExpression`: Function calls like `upper(users.name)`
+ * - `Aggregate`: Aggregations like `count()`, `avg()`
+ * - `RefProxy/Ref`: Direct field references like `users.name`
+ *
+ * **JavaScript Literals** (for constant values in projections):
+ * - `string`: String literals like `'active'`, `'N/A'`
+ * - `number`: Numeric literals like `0`, `42`, `3.14`
+ * - `boolean`: Boolean literals `true`, `false`
+ * - `null`: Explicit null values
+ *
+ * **Advanced Features**:
+ * - `undefined`: Allows optional projection values
+ * - `{ [key: string]: SelectValue }`: Nested object projection
+ *
+ * The clean Ref type ensures no internal properties are visible to users.
+ *
+ * Examples:
+ * ```typescript
+ * select({
+ *   id: users.id,
+ *   name: users.name,
+ *   status: 'active',        // string literal
+ *   priority: 1,             // number literal
+ *   verified: true,          // boolean literal
+ *   notes: null,             // explicit null
+ *   profile: {
+ *     name: users.name,
+ *     email: users.email
+ *   }
+ * })
+ * ```
+ */
+type SelectValue =
+  | BasicExpression
+  | Aggregate
+  | Ref
+  | RefLeaf<any>
+  | string // String literals
+  | number // Numeric literals
+  | boolean // Boolean literals
+  | null // Explicit null
+  | undefined // Optional values
+  | { [key: string]: SelectValue }
+  | Array<RefLeaf<any>>
+
+// Recursive shape for select objects allowing nested projections
+type SelectShape = { [key: string]: SelectValue | SelectShape }
+
+/**
+ * SelectObject - Wrapper type for select clause objects
+ *
+ * This ensures that objects passed to `select()` have valid SelectValue types
+ * for all their properties. It's a simple wrapper that provides better error
+ * messages when invalid selections are attempted.
+ */
+export type SelectObject<T extends SelectShape = SelectShape> = T
+
+/**
+ * ResultTypeFromSelect - Infers the result type from a select object
+ *
+ * This complex type transforms the input to `select()` into the actual TypeScript
+ * type that the query will return. It handles all the different kinds of values
+ * that can appear in a select clause:
+ *
+ * **Ref/RefProxy Extraction**:
+ * - `RefProxy<T>` → `T`: Extracts the underlying type
+ * - `Ref<T> | undefined` → `T | undefined`: Preserves optionality
+ * - `Ref<T> | null` → `T | null`: Preserves nullability
+ *
+ * **Expression Types**:
+ * - `BasicExpression<T>` → `T`: Function results like `upper()` → `string`
+ * - `Aggregate<T>` → `T`: Aggregation results like `count()` → `number`
+ *
+ * **JavaScript Literals** (pass through as-is):
+ * - `string` → `string`: String literals remain strings
+ * - `number` → `number`: Numeric literals remain numbers
+ * - `boolean` → `boolean`: Boolean literals remain booleans
+ * - `null` → `null`: Explicit null remains null
+ * - `undefined` → `undefined`: Direct undefined values
+ *
+ * **Nested Objects** (recursive):
+ * - Plain objects are recursively processed to handle nested projections
+ * - RefProxy objects are detected and their types extracted
+ *
+ * Example transformation:
+ * ```typescript
+ * // Input:
+ * { id: Ref<number>, name: Ref<string>, status: 'active', count: 42, profile: { bio: Ref<string> } }
+ *
+ * // Output:
+ * { id: number, name: string, status: 'active', count: 42, profile: { bio: string } }
+ * ```
+ */
+export type ResultTypeFromSelect<TSelectObject> = WithoutRefBrand<
+  Prettify<{
+    [K in keyof TSelectObject]: NeedsExtraction<TSelectObject[K]> extends true
+      ? ExtractExpressionType<TSelectObject[K]>
+      : TSelectObject[K] extends Ref<infer _T>
+        ? ExtractRef<TSelectObject[K]>
+        : TSelectObject[K] extends RefLeaf<infer T>
           ? T
-          : TSelectObject[K] extends undefined
-            ? undefined
-            : TSelectObject[K] extends { __type: infer U }
-              ? U
-              : never
-}
+          : TSelectObject[K] extends RefLeaf<infer T> | undefined
+            ? T | undefined
+            : TSelectObject[K] extends RefLeaf<infer T> | null
+              ? T | null
+              : TSelectObject[K] extends Ref<infer _T> | undefined
+                ? ExtractRef<TSelectObject[K]> | undefined
+                : TSelectObject[K] extends Ref<infer _T> | null
+                  ? ExtractRef<TSelectObject[K]> | null
+                  : TSelectObject[K] extends Aggregate<infer T>
+                    ? T
+                    : TSelectObject[K] extends
+                          | string
+                          | number
+                          | boolean
+                          | null
+                          | undefined
+                      ? TSelectObject[K]
+                      : TSelectObject[K] extends Record<string, any>
+                        ? ResultTypeFromSelect<TSelectObject[K]>
+                        : never
+  }>
+>
+
+// Extract Ref or subobject with a spread or a Ref
+type ExtractRef<T> = Prettify<ResultTypeFromSelect<WithoutRefBrand<T>>>
+
+// Helper type to extract the underlying type from various expression types
+type ExtractExpressionType<T> =
+  T extends PropRef<infer U>
+    ? U
+    : T extends Value<infer U>
+      ? U
+      : T extends Func<infer U>
+        ? U
+        : T extends Aggregate<infer U>
+          ? U
+          : T extends BasicExpression<infer U>
+            ? U
+            : T
+
+// Helper type to check if a type needs expression type extraction
+type NeedsExtraction<T> = T extends
+  | PropRef<any>
+  | Value<any>
+  | Func<any>
+  | Aggregate<any>
+  | BasicExpression<any>
+  ? true
+  : false
 
-// Callback type for orderBy clauses
+/**
+ * OrderByCallback - Type for orderBy clause callback functions
+ *
+ * Similar to WhereCallback, these receive refs for all available tables
+ * and should return expressions that will be used for sorting.
+ *
+ * Example: `(refs) => refs.users.createdAt`
+ */
 export type OrderByCallback<TContext extends Context> = (
-  refs: RefProxyForContext<TContext>
+  refs: RefsForContext<TContext>
 ) => any
 
+/**
+ * OrderByOptions - Configuration for orderBy operations
+ *
+ * Combines direction and null handling with string-specific sorting options.
+ * The intersection with StringSortOpts allows for either simple lexical sorting
+ * or locale-aware sorting with customizable options.
+ */
 export type OrderByOptions = {
   direction?: OrderByDirection
   nulls?: `first` | `last`
 } & StringSortOpts
 
+/**
+ * StringSortOpts - Options for string sorting behavior
+ *
+ * This discriminated union allows for two types of string sorting:
+ * - **Lexical**: Simple character-by-character comparison (default)
+ * - **Locale**: Locale-aware sorting with optional customization
+ *
+ * The union ensures that locale options are only available when locale sorting is selected.
+ */
 export type StringSortOpts =
   | {
       stringSort?: `lexical`
@@ -96,6 +330,13 @@ export type StringSortOpts =
       localeOptions?: object
     }
 
+/**
+ * CompareOptions - Final resolved options for comparison operations
+ *
+ * This is the internal type used after all orderBy options have been resolved
+ * to their concrete values. Unlike OrderByOptions, all fields are required
+ * since defaults have been applied.
+ */
 export type CompareOptions = {
   direction: OrderByDirection
   nulls: `first` | `last`
@@ -104,91 +345,219 @@ export type CompareOptions = {
   localeOptions?: object
 }
 
-// Callback type for groupBy clauses
+/**
+ * GroupByCallback - Type for groupBy clause callback functions
+ *
+ * These callbacks receive refs for all available tables and should return
+ * expressions that will be used for grouping query results.
+ *
+ * Example: `(refs) => refs.orders.status`
+ */
 export type GroupByCallback<TContext extends Context> = (
-  refs: RefProxyForContext<TContext>
+  refs: RefsForContext<TContext>
 ) => any
 
-// Callback type for join on clauses
+/**
+ * JoinOnCallback - Type for join condition callback functions
+ *
+ * These callbacks receive refs for all available tables (including the newly
+ * joined table) and should return a boolean expression defining the join condition.
+ *
+ * Important: The newly joined table is NOT marked as optional in this callback,
+ * even for left/right/full joins, because optionality is applied AFTER the join
+ * condition is evaluated.
+ *
+ * Example: `(refs) => eq(refs.users.id, refs.orders.userId)`
+ */
 export type JoinOnCallback<TContext extends Context> = (
-  refs: RefProxyForContext<TContext>
+  refs: RefsForContext<TContext>
 ) => any
 
-// Type for creating RefProxy objects based on context
-export type RefProxyForContext<TContext extends Context> = {
-  [K in keyof TContext[`schema`]]: RefProxyFor<TContext[`schema`][K]>
+/**
+ * RefProxyForContext - Creates ref proxies for all tables/collections in a query context
+ *
+ * This is the main entry point for creating ref objects in query builder callbacks.
+ * It handles optionality by placing undefined/null OUTSIDE the RefProxy to enable
+ * JavaScript's optional chaining operator (?.):
+ *
+ * Examples:
+ * - Required field: `RefProxy<User>` → user.name works
+ * - Optional field: `RefProxy<User> | undefined` → user?.name works
+ * - Nullable field: `RefProxy<User> | null` → user?.name works
+ * - Both optional and nullable: `RefProxy<User> | undefined` → user?.name works
+ *
+ * The key insight is that `RefProxy<User | undefined>` would NOT allow `user?.name`
+ * because the undefined is "inside" the proxy, but `RefProxy<User> | undefined`
+ * does allow it because the undefined is "outside" the proxy.
+ *
+ * The logic prioritizes optional chaining by always placing `undefined` outside when
+ * a type is both optional and nullable (e.g., `string | null | undefined`).
+ */
+export type RefsForContext<TContext extends Context> = {
+  [K in keyof TContext[`schema`]]: IsNonExactOptional<
+    TContext[`schema`][K]
+  > extends true
+    ? IsNonExactNullable<TContext[`schema`][K]> extends true
+      ? // T is both non-exact optional and non-exact nullable (e.g., string | null | undefined)
+        // Extract the non-undefined and non-null part and place undefined outside
+        Ref<NonNullable<TContext[`schema`][K]>> | undefined
+      : // T is optional (T | undefined) but not exactly undefined, and not nullable
+        // Extract the non-undefined part and place undefined outside
+        Ref<NonUndefined<TContext[`schema`][K]>> | undefined
+    : IsNonExactNullable<TContext[`schema`][K]> extends true
+      ? // T is nullable (T | null) but not exactly null, and not optional
+        // Extract the non-null part and place null outside
+        Ref<NonNull<TContext[`schema`][K]>> | null
+      : // T is exactly undefined, exactly null, or neither optional nor nullable
+        // Wrap in RefProxy as-is (includes exact undefined, exact null, and normal types)
+        Ref<TContext[`schema`][K]>
 }
 
+/**
+ * Type Detection Helpers
+ *
+ * These helpers distinguish between different kinds of optionality/nullability:
+ * - IsExactlyUndefined: T is literally `undefined` (not `string | undefined`)
+ * - IsOptional: T includes undefined (like `string | undefined`)
+ * - IsExactlyNull: T is literally `null` (not `string | null`)
+ * - IsNullable: T includes null (like `string | null`)
+ * - IsNonExactOptional: T includes undefined but is not exactly undefined
+ * - IsNonExactNullable: T includes null but is not exactly null
+ *
+ * The [T] extends [undefined] pattern prevents distributive conditional types,
+ * ensuring we check the exact type rather than distributing over union members.
+ */
+
 // Helper type to check if T is exactly undefined
 type IsExactlyUndefined<T> = [T] extends [undefined] ? true : false
 
+// Helper type to check if T is exactly null
+type IsExactlyNull<T> = [T] extends [null] ? true : false
+
 // Helper type to check if T includes undefined (is optional)
 type IsOptional<T> = undefined extends T ? true : false
 
+// Helper type to check if T includes null (is nullable)
+type IsNullable<T> = null extends T ? true : false
+
+// Helper type to check if T is optional but not exactly undefined
+type IsNonExactOptional<T> =
+  IsOptional<T> extends true
+    ? IsExactlyUndefined<T> extends false
+      ? true
+      : false
+    : false
+
+// Helper type to check if T is nullable but not exactly null
+type IsNonExactNullable<T> =
+  IsNullable<T> extends true
+    ? IsExactlyNull<T> extends false
+      ? true
+      : false
+    : false
+
+/**
+ * Type Extraction Helpers
+ *
+ * These helpers extract the "useful" part of a type by removing null/undefined:
+ * - NonUndefined: `string | undefined` → `string` (preserves null if present)
+ * - NonNull: `string | null` → `string` (preserves undefined if present)
+ *
+ * These are used when we need to handle optional and nullable types separately.
+ * For cases where both null and undefined should be removed, use TypeScript's
+ * built-in NonNullable<T> instead.
+ */
+
 // Helper type to extract non-undefined type
 type NonUndefined<T> = T extends undefined ? never : T
 
-// Helper type to create RefProxy for a specific type with optionality passthrough
-// This is used to create the RefProxy object that is used in the query builder.
-// Much of the complexity here is due to the fact that we need to handle optionality
-// from joins. A left join will make the joined table optional, a right join will make
-// the main table optional etc. This is applied to the schema, with the new namespaced
-// source being `SourceType | undefined`.
-// We then follow this through the ref proxy system so that accessing a property on
-// and optional source will itsself be optional.
-// If for example we join in `joinedTable` with a left join, then
-// `where(({ joinedTable }) => joinedTable.name === `John`)`
-// we want the the type of `name` to be `RefProxy<string | undefined>` to indicate that
-// the `name` property is optional, as the joinedTable is also optional.
-export type RefProxyFor<T> = OmitRefProxy<
-  IsExactlyUndefined<T> extends true
-    ? // T is exactly undefined
-      RefProxy<T>
-    : IsOptional<T> extends true
-      ? // T is optional (T | undefined) but not exactly undefined
-        NonUndefined<T> extends Record<string, any>
-        ? {
-            [K in keyof NonUndefined<T>]-?: NonUndefined<T>[K] extends Record<
-              string,
-              any
-            >
-              ? RefProxyFor<NonUndefined<T>[K]> &
-                  RefProxy<NonUndefined<T>[K] | undefined>
-              : RefProxy<NonUndefined<T>[K] | undefined>
-          } & RefProxy<T>
-        : RefProxy<T>
-      : // T is not optional
-        T extends Record<string, any>
-        ? {
-            // Make all properties required, but for optional ones, include undefined in the RefProxy type
-            [K in keyof T]-?: undefined extends T[K]
-              ? T[K] extends Record<string, any>
-                ? RefProxyFor<T[K]> & RefProxy<T[K]>
-                : RefProxy<T[K]>
-              : T[K] extends Record<string, any>
-                ? RefProxyFor<T[K]> & RefProxy<T[K]>
-                : RefProxy<T[K]>
-          } & RefProxy<T>
-        : RefProxy<T>
->
-
-// This is the public type that is exported from the query builder
-// and is used when constructing reusable query callbacks.
-export type Ref<T> = RefProxyFor<T>
-
-type OmitRefProxy<T> = Omit<T, `__refProxy` | `__path` | `__type`>
-
-// The core RefProxy interface
-export interface RefProxy<T = any> {
-  /** @internal */
-  readonly __refProxy: true
-  /** @internal */
-  readonly __path: Array<string>
-  /** @internal */
-  readonly __type: T
-}
-
-// Helper type to apply join optionality immediately when merging contexts
+// Helper type to extract non-null type
+type NonNull<T> = T extends null ? never : T
+
+/**
+ * Ref - The user-facing ref interface for the query builder
+ *
+ * This is a clean type that represents a reference to a value in the query,
+ * designed for optimal IDE experience without internal implementation details.
+ * It provides a recursive interface that allows nested property access while
+ * preserving optionality and nullability correctly.
+ *
+ * When spread in select clauses, it correctly produces the underlying data type
+ * without Ref wrappers, enabling clean spread operations.
+ *
+ * Example usage:
+ * ```typescript
+ * // Clean interface - no internal properties visible
+ * const users: Ref<{ id: number; profile?: { bio: string } }> = { ... }
+ * users.id // Ref<number> - clean display
+ * users.profile?.bio // Ref<string> - nested optional access works
+ *
+ * // Spread operations work cleanly:
+ * select(({ user }) => ({ ...user })) // Returns User type, not Ref types
+ * ```
+ */
+export type Ref<T = any> = {
+  [K in keyof T]: IsNonExactOptional<T[K]> extends true
+    ? IsNonExactNullable<T[K]> extends true
+      ? // Both optional and nullable
+        NonNullable<T[K]> extends Record<string, any>
+        ? Ref<NonNullable<T[K]>> | undefined
+        : RefLeaf<NonNullable<T[K]>> | undefined
+      : // Optional only
+        NonUndefined<T[K]> extends Record<string, any>
+        ? Ref<NonUndefined<T[K]>> | undefined
+        : RefLeaf<NonUndefined<T[K]>> | undefined
+    : IsNonExactNullable<T[K]> extends true
+      ? // Nullable only
+        NonNull<T[K]> extends Record<string, any>
+        ? Ref<NonNull<T[K]>> | null
+        : RefLeaf<NonNull<T[K]>> | null
+      : // Required
+        T[K] extends Record<string, any>
+        ? Ref<T[K]>
+        : RefLeaf<T[K]>
+} & RefLeaf<T>
+
+/**
+ * Ref - The user-facing ref type with clean IDE display
+ *
+ * An opaque branded type that represents a reference to a value in a query.
+ * This shows as `Ref<T>` in the IDE without exposing internal structure.
+ *
+ * Example usage:
+ * - Ref<number> displays as `Ref<number>` in IDE
+ * - Ref<string> displays as `Ref<string>` in IDE
+ * - No internal properties like __refProxy, __path, __type are visible
+ */
+declare const RefBrand: unique symbol
+export type RefLeaf<T = any> = { readonly [RefBrand]?: T }
+
+// Helper type to remove RefBrand from objects
+type WithoutRefBrand<T> =
+  T extends Record<string, any> ? Omit<T, typeof RefBrand> : T
+
+/**
+ * MergeContextWithJoinType - Creates a new context after a join operation
+ *
+ * This is the core type that handles the complex logic of merging schemas
+ * when tables are joined, applying the correct optionality based on join type.
+ *
+ * **Key Responsibilities**:
+ * 1. **Schema Merging**: Combines existing schema with newly joined tables
+ * 2. **Optionality Logic**: Applies join-specific optionality rules:
+ *    - `LEFT JOIN`: New table becomes optional
+ *    - `RIGHT JOIN`: Existing tables become optional
+ *    - `FULL JOIN`: Both existing and new become optional
+ *    - `INNER JOIN`: No tables become optional
+ * 3. **State Tracking**: Updates hasJoins and joinTypes for future operations
+ *
+ * **Context Evolution**:
+ * - `baseSchema`: Unchanged (always the original `from()` tables)
+ * - `schema`: Expanded with new tables and proper optionality
+ * - `hasJoins`: Set to true
+ * - `joinTypes`: Updated to track this join type
+ * - `result`: Preserved from previous operations
+ */
 export type MergeContextWithJoinType<
   TContext extends Context,
   TNewSchema extends ContextSchema,
@@ -213,7 +582,31 @@ export type MergeContextWithJoinType<
   result: TContext[`result`]
 }
 
-// Helper type to apply join optionality when merging new schema
+/**
+ * ApplyJoinOptionalityToMergedSchema - Applies optionality rules when merging schemas
+ *
+ * This type implements the SQL join optionality semantics:
+ *
+ * **For Existing Tables**:
+ * - `RIGHT JOIN` or `FULL JOIN`: Main table (from fromSourceName) becomes optional
+ * - Other join types: Existing tables keep their current optionality
+ * - Previously joined tables: Keep their already-applied optionality
+ *
+ * **For New Tables**:
+ * - `LEFT JOIN` or `FULL JOIN`: New table becomes optional
+ * - `INNER JOIN` or `RIGHT JOIN`: New table remains required
+ *
+ * **Examples**:
+ * ```sql
+ * FROM users LEFT JOIN orders  -- orders becomes optional
+ * FROM users RIGHT JOIN orders -- users becomes optional
+ * FROM users FULL JOIN orders  -- both become optional
+ * FROM users INNER JOIN orders -- both remain required
+ * ```
+ *
+ * The intersection (&) ensures both existing and new schemas are merged
+ * into a single type while preserving all table references.
+ */
 export type ApplyJoinOptionalityToMergedSchema<
   TExistingSchema extends ContextSchema,
   TNewSchema extends ContextSchema,
@@ -237,7 +630,31 @@ export type ApplyJoinOptionalityToMergedSchema<
       TNewSchema[K]
 }
 
-// Helper type to get the result type from a context
+/**
+ * GetResult - Determines the final result type of a query
+ *
+ * This type implements the logic for what a query returns based on its current state:
+ *
+ * **Priority Order**:
+ * 1. **Explicit Result**: If `select()` was called, use the projected type
+ * 2. **Join Query**: If joins exist, return all tables with proper optionality
+ * 3. **Single Table**: Return just the main table from `from()`
+ *
+ * **Examples**:
+ * ```typescript
+ * // Single table query:
+ * from({ users }).where(...) // → User[]
+ *
+ * // Join query without select:
+ * from({ users }).leftJoin({ orders }, ...) // → { users: User, orders: Order | undefined }[]
+ *
+ * // Query with select:
+ * from({ users }).select({ id: users.id, name: users.name }) // → { id: number, name: string }[]
+ * ```
+ *
+ * The `Prettify` wrapper ensures clean type display in IDEs by flattening
+ * complex intersection types into readable object types.
+ */
 export type GetResult<TContext extends Context> = Prettify<
   TContext[`result`] extends object
     ? TContext[`result`]
@@ -248,7 +665,22 @@ export type GetResult<TContext extends Context> = Prettify<
         TContext[`schema`][TContext[`fromSourceName`]]
 >
 
-// Helper type to apply join optionality to the schema based on joinTypes
+/**
+ * ApplyJoinOptionalityToSchema - Legacy helper for complex join scenarios
+ *
+ * This type was designed to handle complex scenarios with multiple joins
+ * where the optionality of tables might be affected by subsequent joins.
+ * Currently used in advanced join logic, but most cases are handled by
+ * the simpler `ApplyJoinOptionalityToMergedSchema`.
+ *
+ * **Logic**:
+ * 1. **Main Table**: Becomes optional if ANY right or full join exists in the chain
+ * 2. **Joined Tables**: Check their specific join type for optionality
+ * 3. **Complex Cases**: Handle scenarios where subsequent joins affect earlier tables
+ *
+ * This is primarily used for edge cases and may be simplified in future versions
+ * as the simpler merge-based approach covers most real-world scenarios.
+ */
 export type ApplyJoinOptionalityToSchema<
   TSchema extends ContextSchema,
   TJoinTypes extends Record<string, string>,
@@ -275,7 +707,19 @@ export type ApplyJoinOptionalityToSchema<
       : TSchema[K]
 }
 
-// Helper type to check if a table becomes optional due to subsequent joins
+/**
+ * IsTableMadeOptionalBySubsequentJoins - Checks if later joins affect table optionality
+ *
+ * This helper determines if a table that was initially required becomes optional
+ * due to joins that happen later in the query chain.
+ *
+ * **Current Implementation**:
+ * - Main table: Becomes optional if any right/full joins exist
+ * - Joined tables: Not affected by subsequent joins (simplified model)
+ *
+ * This is a conservative approach that may be extended in the future to handle
+ * more complex join interaction scenarios.
+ */
 type IsTableMadeOptionalBySubsequentJoins<
   TTableAlias extends string | number | symbol,
   TJoinTypes extends Record<string, string>,
@@ -286,7 +730,24 @@ type IsTableMadeOptionalBySubsequentJoins<
   : // Joined tables are not affected by subsequent joins in our current implementation
     false
 
-// Helper type to check if any join has one of the specified types
+/**
+ * HasJoinType - Utility to check if any join in a chain matches target types
+ *
+ * This type searches through all recorded join types to see if any match
+ * the specified target types. It's used to implement logic like "becomes optional
+ * if ANY right or full join exists in the chain".
+ *
+ * **How it works**:
+ * 1. Maps over all join types, checking each against target types
+ * 2. Creates a union of boolean results
+ * 3. Uses `true extends Union` pattern to check if any were true
+ *
+ * **Example**:
+ * ```typescript
+ * HasJoinType<{ orders: 'left', products: 'right' }, 'right' | 'full'>
+ * // → true (because products is a right join)
+ * ```
+ */
 export type HasJoinType<
   TJoinTypes extends Record<string, string>,
   TTargetTypes extends string,
@@ -296,20 +757,71 @@ export type HasJoinType<
   ? true
   : false
 
-// Helper type to merge contexts (for joins) - backward compatibility
-export type MergeContext<
+/**
+ * MergeContextForJoinCallback - Special context for join condition callbacks
+ *
+ * This type creates a context specifically for the `onCallback` parameter of join operations.
+ * The key difference from `MergeContextWithJoinType` is that NO optionality is applied here.
+ *
+ * **Why No Optionality?**
+ * In SQL, join conditions are evaluated BEFORE optionality is determined. Both tables
+ * must be treated as available (non-optional) within the join condition itself.
+ * Optionality is only applied to the result AFTER the join logic executes.
+ *
+ * **Example**:
+ * ```typescript
+ * .from({ users })
+ * .leftJoin({ orders }, ({ users, orders }) => {
+ *   // users is NOT optional here - we can access users.id directly
+ *   // orders is NOT optional here - we can access orders.userId directly
+ *   return eq(users.id, orders.userId)
+ * })
+ * .where(({ orders }) => {
+ *   // NOW orders is optional because it's after the LEFT JOIN
+ *   return orders?.status === 'pending'
+ * })
+ * ```
+ *
+ * The simple intersection (&) merges schemas without any optionality transformation.
+ */
+export type MergeContextForJoinCallback<
   TContext extends Context,
   TNewSchema extends ContextSchema,
-> = MergeContextWithJoinType<TContext, TNewSchema, `left`>
+> = {
+  baseSchema: TContext[`baseSchema`]
+  // Merge schemas without applying join optionality - both are non-optional in join condition
+  schema: TContext[`schema`] & TNewSchema
+  fromSourceName: TContext[`fromSourceName`]
+  hasJoins: true
+  joinTypes: TContext[`joinTypes`] extends Record<string, any>
+    ? TContext[`joinTypes`]
+    : {}
+  result: TContext[`result`]
+}
 
-// Helper type for updating context with result type
+/**
+ * WithResult - Updates a context with a new result type after select()
+ *
+ * This utility type is used internally when the `select()` method is called
+ * to update the context with the projected result type. It preserves all
+ * other context properties while replacing the `result` field.
+ *
+ * **Usage**:
+ * When `select()` is called, the query builder uses this type to create
+ * a new context where `result` contains the shape of the selected fields.
+ *
+ * The double `Prettify` ensures both the overall context and the nested
+ * result type display cleanly in IDEs.
+ */
 export type WithResult<TContext extends Context, TResult> = Prettify<
   Omit<TContext, `result`> & {
     result: Prettify<TResult>
   }
 >
 
-// Helper type to simplify complex types for better editor hints
+/**
+ * Prettify - Utility type for clean IDE display
+ */
 export type Prettify<T> = {
   [K in keyof T]: T[K]
 } & {}