@prisma-next/sql-lane 0.3.0-dev.31 → 0.3.0-dev.33

package/dist/utils/state.d.ts

@@ -1,5 +1,5 @@
 import type { TableRef } from '@prisma-next/sql-relational-core/ast';
-import type { AnyBinaryBuilder, AnyExpressionSource, AnyOrderBuilder, JoinOnPredicate } from '@prisma-next/sql-relational-core/types';
+import type { AnyBinaryBuilder, AnyExpressionSource, AnyOrderBuilder, AnyUnaryBuilder, JoinOnPredicate } from '@prisma-next/sql-relational-core/types';
 export interface ProjectionState {
     readonly aliases: string[];
     readonly columns: AnyExpressionSource[];
@@ -14,7 +14,7 @@ export interface IncludeState {
     readonly table: TableRef;
     readonly on: JoinOnPredicate;
     readonly childProjection: ProjectionState;
-    readonly childWhere?: AnyBinaryBuilder;
+    readonly childWhere?: AnyBinaryBuilder | AnyUnaryBuilder;
     readonly childOrderBy?: AnyOrderBuilder;
     readonly childLimit?: number;
 }
@@ -23,7 +23,7 @@ export interface BuilderState {
     joins?: ReadonlyArray<JoinState>;
     includes?: ReadonlyArray<IncludeState>;
     projection?: ProjectionState;
-    where?: AnyBinaryBuilder;
+    where?: AnyBinaryBuilder | AnyUnaryBuilder;
     orderBy?: AnyOrderBuilder;
     limit?: number;
 }

package/dist/utils/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/utils/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,eAAe,EAChB,MAAM,wCAAwC,CAAC;AAEhD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IACvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,YAAY,CAAC,EAAE,eAAe,CAAC;IACxC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/utils/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,eAAe,EAChB,MAAM,wCAAwC,CAAC;AAEhD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IACvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,GAAG,eAAe,CAAC;IACzD,QAAQ,CAAC,YAAY,CAAC,EAAE,eAAe,CAAC;IACxC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,KAAK,CAAC,EAAE,gBAAgB,GAAG,eAAe,CAAC;IAC3C,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@prisma-next/sql-lane",
-  "version": "0.3.0-dev.31",
+  "version": "0.3.0-dev.33",
   "type": "module",
   "sideEffects": false,
   "description": "Relational DSL and raw SQL helpers for Prisma Next",
   "dependencies": {
-    "@prisma-next/contract": "0.3.0-dev.31",
-    "@prisma-next/plan": "0.3.0-dev.31",
-    "@prisma-next/sql-contract": "0.3.0-dev.31",
-    "@prisma-next/sql-relational-core": "0.3.0-dev.31"
+    "@prisma-next/contract": "0.3.0-dev.33",
+    "@prisma-next/plan": "0.3.0-dev.33",
+    "@prisma-next/sql-contract": "0.3.0-dev.33",
+    "@prisma-next/sql-relational-core": "0.3.0-dev.33"
   },
   "devDependencies": {
     "@types/pg": "8.16.0",
@@ -16,10 +16,10 @@
     "tsup": "8.5.1",
     "typescript": "5.9.3",
     "vitest": "4.0.16",
-    "@prisma-next/sql-contract-ts": "0.3.0-dev.31",
-    "@prisma-next/sql-runtime": "0.3.0-dev.31",
-    "@prisma-next/tsconfig": "0.0.0",
-    "@prisma-next/test-utils": "0.0.1"
+    "@prisma-next/sql-contract-ts": "0.3.0-dev.33",
+    "@prisma-next/sql-runtime": "0.3.0-dev.33",
+    "@prisma-next/test-utils": "0.0.1",
+    "@prisma-next/tsconfig": "0.0.0"
   },
   "files": [
     "dist",

package/src/sql/include-builder.ts

@@ -1,11 +1,11 @@
 import type { ParamDescriptor } from '@prisma-next/contract/types';
 import type { SqlContract, SqlStorage, StorageColumn } from '@prisma-next/sql-contract/types';
 import type {
-  BinaryExpr,
   ColumnRef,
   IncludeAst,
   OperationExpr,
   TableRef,
+  WhereExpr,
 } from '@prisma-next/sql-relational-core/ast';
 import {
   createColumnRef,
@@ -205,7 +205,7 @@ export function buildIncludeAst(
       })()
     : undefined;
 
-  let childWhere: BinaryExpr | undefined;
+  let childWhere: WhereExpr | undefined;
   if (include.childWhere) {
     const whereResult = buildWhereExpr(
       contract,

package/src/sql/mutation-builder.ts

@@ -18,6 +18,7 @@ import type {
   InferReturningRow,
   ParamPlaceholder,
   SqlBuilderOptions,
+  UnaryBuilder,
 } from '@prisma-next/sql-relational-core/types';
 import { checkReturningCapability } from '../utils/capabilities';
 import {
@@ -48,7 +49,7 @@ export interface UpdateBuilder<
   CodecTypes extends Record<string, { readonly output: unknown }> = Record<string, never>,
   Row = unknown,
 > {
-  where(predicate: BinaryBuilder): UpdateBuilder<TContract, CodecTypes, Row>;
+  where(predicate: BinaryBuilder | UnaryBuilder): UpdateBuilder<TContract, CodecTypes, Row>;
   returning<const Columns extends readonly AnyColumnBuilder[]>(
     ...columns: Columns
   ): UpdateBuilder<TContract, CodecTypes, InferReturningRow<Columns>>;
@@ -60,7 +61,7 @@ export interface DeleteBuilder<
   CodecTypes extends Record<string, { readonly output: unknown }> = Record<string, never>,
   Row = unknown,
 > {
-  where(predicate: BinaryBuilder): DeleteBuilder<TContract, CodecTypes, Row>;
+  where(predicate: BinaryBuilder | UnaryBuilder): DeleteBuilder<TContract, CodecTypes, Row>;
   returning<const Columns extends readonly AnyColumnBuilder[]>(
     ...columns: Columns
   ): DeleteBuilder<TContract, CodecTypes, InferReturningRow<Columns>>;
@@ -206,7 +207,7 @@ export class UpdateBuilderImpl<
   private readonly context: QueryLaneContext<TContract>;
   private readonly table: TableRef;
   private readonly set: Record<string, ParamPlaceholder>;
-  private wherePredicate?: BinaryBuilder;
+  private wherePredicate?: BinaryBuilder | UnaryBuilder;
   private returningColumns: AnyColumnBuilder[] = [];
 
   constructor(
@@ -220,7 +221,7 @@ export class UpdateBuilderImpl<
     this.set = set;
   }
 
-  where(predicate: BinaryBuilder): UpdateBuilder<TContract, CodecTypes, Row> {
+  where(predicate: BinaryBuilder | UnaryBuilder): UpdateBuilder<TContract, CodecTypes, Row> {
     const builder = new UpdateBuilderImpl<TContract, CodecTypes, Row>(
       {
         context: this.context,
@@ -374,7 +375,7 @@ export class DeleteBuilderImpl<
   private readonly contract: TContract;
   private readonly context: QueryLaneContext<TContract>;
   private readonly table: TableRef;
-  private wherePredicate?: BinaryBuilder;
+  private wherePredicate?: BinaryBuilder | UnaryBuilder;
   private returningColumns: AnyColumnBuilder[] = [];
 
   constructor(options: SqlBuilderOptions<TContract>, table: TableRef) {
@@ -383,7 +384,7 @@ export class DeleteBuilderImpl<
     this.table = table;
   }
 
-  where(predicate: BinaryBuilder): DeleteBuilder<TContract, CodecTypes, Row> {
+  where(predicate: BinaryBuilder | UnaryBuilder): DeleteBuilder<TContract, CodecTypes, Row> {
     const builder = new DeleteBuilderImpl<TContract, CodecTypes, Row>(
       {
         context: this.context,

package/src/sql/plan.ts

@@ -111,12 +111,19 @@ export function buildMeta(args: MetaBuildArgs): PlanMeta {
       }
       // Add child WHERE columns if present
       if (include.childWhere) {
-        // childWhere.left is Expression (already converted at builder creation time)
-        collectRefsFromExpression(include.childWhere.left, refsColumns);
-        // Handle right side of child WHERE clause - can be ParamPlaceholder or ExpressionSource
-        const childWhereRight = include.childWhere.right;
-        if (isColumnBuilder(childWhereRight) || isExpressionBuilder(childWhereRight)) {
-          collectRefsFromExpressionSource(childWhereRight, refsColumns);
+        // Handle UnaryBuilder (e.g., NullCheckBuilder) - it only has 'expr' property
+        if (include.childWhere.kind === 'nullCheck') {
+          const expr: Expression = include.childWhere.expr;
+          collectRefsFromExpression(expr, refsColumns);
+        } else {
+          // BinaryBuilder - has 'left' and 'right' properties
+          // childWhere.left is Expression (already converted at builder creation time)
+          collectRefsFromExpression(include.childWhere.left, refsColumns);
+          // Handle right side of child WHERE clause - can be ParamPlaceholder or ExpressionSource
+          const childWhereRight = include.childWhere.right;
+          if (isColumnBuilder(childWhereRight) || isExpressionBuilder(childWhereRight)) {
+            collectRefsFromExpressionSource(childWhereRight, refsColumns);
+          }
         }
       }
       // Add child ORDER BY columns if present
@@ -128,28 +135,35 @@ export function buildMeta(args: MetaBuildArgs): PlanMeta {
   }
 
   if (args.where) {
-    // args.where.left is Expression (already converted at builder creation time)
-    const leftExpr: Expression = args.where.left;
-    if (isOperationExpr(leftExpr)) {
-      const allRefs = collectColumnRefs(leftExpr);
-      for (const ref of allRefs) {
-        refsColumns.set(`${ref.table}.${ref.column}`, {
-          table: ref.table,
-          column: ref.column,
+    // Handle UnaryBuilder (e.g., NullCheckBuilder) - it only has 'expr' property
+    if (args.where.kind === 'nullCheck') {
+      const expr: Expression = args.where.expr;
+      collectRefsFromExpression(expr, refsColumns);
+    } else {
+      // BinaryBuilder - has 'left' and 'right' properties
+      // args.where.left is Expression (already converted at builder creation time)
+      const leftExpr: Expression = args.where.left;
+      if (isOperationExpr(leftExpr)) {
+        const allRefs = collectColumnRefs(leftExpr);
+        for (const ref of allRefs) {
+          refsColumns.set(`${ref.table}.${ref.column}`, {
+            table: ref.table,
+            column: ref.column,
+          });
+        }
+      } else {
+        // leftExpr is ColumnRef
+        refsColumns.set(`${leftExpr.table}.${leftExpr.column}`, {
+          table: leftExpr.table,
+          column: leftExpr.column,
         });
       }
-    } else {
-      // leftExpr is ColumnRef
-      refsColumns.set(`${leftExpr.table}.${leftExpr.column}`, {
-        table: leftExpr.table,
-        column: leftExpr.column,
-      });
-    }
 
-    // Handle right side of WHERE clause - can be ParamPlaceholder or AnyExpressionSource
-    const whereRight = args.where.right;
-    if (isColumnBuilder(whereRight) || isExpressionBuilder(whereRight)) {
-      collectRefsFromExpressionSource(whereRight, refsColumns);
+      // Handle right side of WHERE clause - can be ParamPlaceholder or AnyExpressionSource
+      const whereRight = args.where.right;
+      if (isColumnBuilder(whereRight) || isExpressionBuilder(whereRight)) {
+        collectRefsFromExpressionSource(whereRight, refsColumns);
+      }
     }
   }
 

package/src/sql/predicate-builder.ts

@@ -1,8 +1,22 @@
 import type { ParamDescriptor } from '@prisma-next/contract/types';
 import type { SqlContract, SqlStorage, StorageColumn } from '@prisma-next/sql-contract/types';
-import type { BinaryExpr, Expression, ParamRef } from '@prisma-next/sql-relational-core/ast';
-import { createBinaryExpr, createParamRef } from '@prisma-next/sql-relational-core/ast';
-import type { BinaryBuilder, ParamPlaceholder } from '@prisma-next/sql-relational-core/types';
+import type {
+  Expression,
+  NullCheckExpr,
+  ParamRef,
+  WhereExpr,
+} from '@prisma-next/sql-relational-core/ast';
+import {
+  createBinaryExpr,
+  createNullCheckExpr,
+  createParamRef,
+} from '@prisma-next/sql-relational-core/ast';
+import type {
+  BinaryBuilder,
+  NullCheckBuilder,
+  ParamPlaceholder,
+  UnaryBuilder,
+} from '@prisma-next/sql-relational-core/types';
 import {
   isColumnBuilder,
   isExpressionBuilder,
@@ -16,18 +30,61 @@ import {
 } from '../utils/errors';
 
 export interface BuildWhereExprResult {
-  expr: BinaryExpr;
+  expr: WhereExpr;
   codecId: string | undefined;
   paramName: string;
 }
 
+/**
+ * Type guard to check if a builder is a NullCheckBuilder (unary).
+ */
+function isNullCheckBuilder(builder: BinaryBuilder | UnaryBuilder): builder is NullCheckBuilder {
+  return builder.kind === 'nullCheck';
+}
+
+/**
+ * Builds a NullCheckExpr from a NullCheckBuilder.
+ */
+function buildNullCheckExpr(
+  contract: SqlContract<SqlStorage>,
+  where: NullCheckBuilder,
+): NullCheckExpr {
+  const expr = where.expr;
+
+  // Validate column exists in contract if it's a ColumnRef
+  if (expr.kind === 'col') {
+    const { table, column } = expr;
+    const contractTable = contract.storage.tables[table];
+    if (!contractTable) {
+      errorUnknownTable(table);
+    }
+
+    const columnMeta: StorageColumn | undefined = contractTable.columns[column];
+    if (!columnMeta) {
+      errorUnknownColumn(column, table);
+    }
+  }
+
+  return createNullCheckExpr(expr, where.isNull);
+}
+
 export function buildWhereExpr(
   contract: SqlContract<SqlStorage>,
-  where: BinaryBuilder,
+  where: BinaryBuilder | UnaryBuilder,
   paramsMap: Record<string, unknown>,
   descriptors: ParamDescriptor[],
   values: unknown[],
 ): BuildWhereExprResult {
+  // Handle NullCheckBuilder (unary expression)
+  if (isNullCheckBuilder(where)) {
+    return {
+      expr: buildNullCheckExpr(contract, where),
+      codecId: undefined,
+      paramName: '',
+    };
+  }
+
+  // Handle BinaryBuilder (binary expression)
   let leftExpr: Expression;
   let codecId: string | undefined;
   let rightExpr: Expression | ParamRef;

package/src/sql/select-builder.ts

@@ -1,7 +1,6 @@
 import type { ParamDescriptor } from '@prisma-next/contract/types';
 import type { SqlContract, SqlStorage, StorageColumn } from '@prisma-next/sql-contract/types';
 import type {
-  BinaryExpr,
   ColumnRef,
   Direction,
   IncludeAst,
@@ -9,6 +8,7 @@ import type {
   JoinAst,
   OperationExpr,
   TableRef,
+  WhereExpr,
 } from '@prisma-next/sql-relational-core/ast';
 import {
   createJoinOnBuilder,
@@ -21,6 +21,7 @@ import type { QueryLaneContext } from '@prisma-next/sql-relational-core/query-la
 import type {
   AnyBinaryBuilder,
   AnyOrderBuilder,
+  AnyUnaryBuilder,
   BinaryBuilder,
   BuildOptions,
   InferNestedProjectionRow,
@@ -29,6 +30,7 @@ import type {
   NestedProjection,
   OrderBuilder,
   SqlBuilderOptions,
+  UnaryBuilder,
 } from '@prisma-next/sql-relational-core/types';
 import { isExpressionBuilder } from '@prisma-next/sql-relational-core/utils/guards';
 import type { ProjectionInput } from '../types/internal';
@@ -235,7 +237,9 @@ export class SelectBuilderImpl<
     );
   }
 
-  where(expr: AnyBinaryBuilder): SelectBuilderImpl<TContract, Row, CodecTypes, Includes> {
+  where(
+    expr: AnyBinaryBuilder | AnyUnaryBuilder,
+  ): SelectBuilderImpl<TContract, Row, CodecTypes, Includes> {
     return new SelectBuilderImpl<TContract, Row, CodecTypes, Includes>(
       {
         context: this.context,
@@ -376,7 +380,7 @@ export class SelectBuilderImpl<
       joins?: ReadonlyArray<JoinAst>;
       includes?: ReadonlyArray<IncludeAst>;
       project: ReadonlyArray<{ alias: string; expr: ColumnRef | IncludeRef | OperationExpr }>;
-      where?: BinaryExpr;
+      where?: WhereExpr;
       orderBy?: ReadonlyArray<{ expr: ColumnRef | OperationExpr; dir: Direction }>;
       limit?: number;
     });
@@ -397,7 +401,7 @@ export class SelectBuilderImpl<
       projection: ProjectionState;
       joins?: ReadonlyArray<JoinState>;
       includes?: ReadonlyArray<IncludeState>;
-      where?: BinaryBuilder;
+      where?: BinaryBuilder | UnaryBuilder;
       orderBy?: AnyOrderBuilder;
       paramDescriptors: ParamDescriptor[];
       paramCodecs?: Record<string, string>;

package/src/types/internal.ts

@@ -5,6 +5,7 @@ import type {
   AnyBinaryBuilder,
   AnyExpressionSource,
   AnyOrderBuilder,
+  AnyUnaryBuilder,
   NestedProjection,
 } from '@prisma-next/sql-relational-core/types';
 import type { ProjectionState } from '../utils/state';
@@ -31,10 +32,10 @@ export interface MetaBuildArgs {
       readonly right: unknown;
     };
     readonly childProjection: ProjectionState;
-    readonly childWhere?: AnyBinaryBuilder;
+    readonly childWhere?: AnyBinaryBuilder | AnyUnaryBuilder;
     readonly childOrderBy?: AnyOrderBuilder;
   }>;
-  readonly where?: AnyBinaryBuilder;
+  readonly where?: AnyBinaryBuilder | AnyUnaryBuilder;
   readonly orderBy?: AnyOrderBuilder;
   readonly paramDescriptors: ParamDescriptor[];
   readonly paramCodecs?: Record<string, string>;

package/src/utils/state.ts

@@ -3,6 +3,7 @@ import type {
   AnyBinaryBuilder,
   AnyExpressionSource,
   AnyOrderBuilder,
+  AnyUnaryBuilder,
   JoinOnPredicate,
 } from '@prisma-next/sql-relational-core/types';
 
@@ -22,7 +23,7 @@ export interface IncludeState {
   readonly table: TableRef;
   readonly on: JoinOnPredicate;
   readonly childProjection: ProjectionState;
-  readonly childWhere?: AnyBinaryBuilder;
+  readonly childWhere?: AnyBinaryBuilder | AnyUnaryBuilder;
   readonly childOrderBy?: AnyOrderBuilder;
   readonly childLimit?: number;
 }
@@ -32,7 +33,7 @@ export interface BuilderState {
   joins?: ReadonlyArray<JoinState>;
   includes?: ReadonlyArray<IncludeState>;
   projection?: ProjectionState;
-  where?: AnyBinaryBuilder;
+  where?: AnyBinaryBuilder | AnyUnaryBuilder;
   orderBy?: AnyOrderBuilder;
   limit?: number;
 }