@prisma-next/sql-builder 0.12.0-dev.17 → 0.12.0-dev.2

package/src/runtime/mutation-impl.ts

@@ -12,7 +12,7 @@ import {
   InsertAst,
   ParamRef,
   ProjectionItem,
-  type TableSource,
+  TableSource,
   UpdateAst,
 } from '@prisma-next/sql-relational-core/ast';
 import type { SqlQueryPlan } from '@prisma-next/sql-relational-core/plan';
@@ -153,7 +153,6 @@ export class InsertQueryImpl<
   extends BuilderBase<QC['capabilities']>
   implements InsertQuery<QC, AvailableScope, RowType>
 {
-  readonly #tableSource: TableSource;
   readonly #tableName: string;
   readonly #table: StorageTable;
   readonly #scope: Scope;
@@ -163,7 +162,7 @@ export class InsertQueryImpl<
   readonly #annotations: ReadonlyMap<string, AnnotationValue<unknown, OperationKind>>;
 
   constructor(
-    tableSource: TableSource,
+    tableName: string,
     table: StorageTable,
     scope: Scope,
     rows: ReadonlyArray<Record<string, unknown>>,
@@ -173,8 +172,7 @@ export class InsertQueryImpl<
     annotations: ReadonlyMap<string, AnnotationValue<unknown, OperationKind>> = new Map(),
   ) {
     super(ctx);
-    this.#tableSource = tableSource;
-    this.#tableName = tableSource.name;
+    this.#tableName = tableName;
     this.#table = table;
     this.#scope = scope;
     this.#rows = rows;
@@ -194,7 +192,7 @@ export class InsertQueryImpl<
         newRowFields[col] = field;
       }
       return new InsertQueryImpl(
-        this.#tableSource,
+        this.#tableName,
         this.#table,
         this.#scope,
         this.#rows,
@@ -217,7 +215,7 @@ export class InsertQueryImpl<
     ...annotations: As & ValidAnnotations<'write', As>
   ): InsertQuery<QC, AvailableScope, RowType> {
     return new InsertQueryImpl(
-      this.#tableSource,
+      this.#tableName,
       this.#table,
       this.#scope,
       this.#rows,
@@ -240,7 +238,7 @@ export class InsertQueryImpl<
       buildParamValues(rowValues, this.#table, this.#tableName, 'create', this.ctx),
     );
 
-    let ast = InsertAst.into(this.#tableSource).withRows(paramRows);
+    let ast = InsertAst.into(TableSource.named(this.#tableName)).withRows(paramRows);
 
     if (this.#returningColumns.length > 0) {
       ast = ast.withReturning(
@@ -264,7 +262,6 @@ export class UpdateQueryImpl<
   extends BuilderBase<QC['capabilities']>
   implements UpdateQuery<QC, AvailableScope, RowType>
 {
-  readonly #tableSource: TableSource;
   readonly #tableName: string;
   readonly #scope: Scope;
   readonly #setExpressions: Record<string, AstExpression>;
@@ -274,7 +271,7 @@ export class UpdateQueryImpl<
   readonly #annotations: ReadonlyMap<string, AnnotationValue<unknown, OperationKind>>;
 
   constructor(
-    tableSource: TableSource,
+    tableName: string,
     scope: Scope,
     setExpressions: Record<string, AstExpression>,
     ctx: BuilderContext,
@@ -284,8 +281,7 @@ export class UpdateQueryImpl<
     annotations: ReadonlyMap<string, AnnotationValue<unknown, OperationKind>> = new Map(),
   ) {
     super(ctx);
-    this.#tableSource = tableSource;
-    this.#tableName = tableSource.name;
+    this.#tableName = tableName;
     this.#scope = scope;
     this.#setExpressions = setExpressions;
     this.#whereExprs = whereExprs;
@@ -299,7 +295,7 @@ export class UpdateQueryImpl<
     const fns = createFunctions(this.ctx.queryOperationTypes, this.ctx.rawCodecInferer);
     const result = (expr as ExpressionBuilder<Scope, QueryContext>)(fieldProxy, fns as never);
     return new UpdateQueryImpl(
-      this.#tableSource,
+      this.#tableName,
       this.#scope,
       this.#setExpressions,
       this.ctx,
@@ -321,7 +317,7 @@ export class UpdateQueryImpl<
         newRowFields[col] = field;
       }
       return new UpdateQueryImpl(
-        this.#tableSource,
+        this.#tableName,
         this.#scope,
         this.#setExpressions,
         this.ctx,
@@ -342,7 +338,7 @@ export class UpdateQueryImpl<
     ...annotations: As & ValidAnnotations<'write', As>
   ): UpdateQuery<QC, AvailableScope, RowType> {
     return new UpdateQueryImpl(
-      this.#tableSource,
+      this.#tableName,
       this.#scope,
       this.#setExpressions,
       this.ctx,
@@ -357,7 +353,7 @@ export class UpdateQueryImpl<
   }
 
   build(): SqlQueryPlan<ResolveRow<RowType, QC['codecTypes'], QC['resolvedColumnOutputTypes']>> {
-    let ast = UpdateAst.table(this.#tableSource)
+    let ast = UpdateAst.table(TableSource.named(this.#tableName))
       .withSet(this.#setExpressions)
       .withWhere(combineWhereExprs(this.#whereExprs));
 
@@ -383,7 +379,6 @@ export class DeleteQueryImpl<
   extends BuilderBase<QC['capabilities']>
   implements DeleteQuery<QC, AvailableScope, RowType>
 {
-  readonly #tableSource: TableSource;
   readonly #tableName: string;
   readonly #scope: Scope;
   readonly #whereCallbacks: readonly WhereCallback[];
@@ -392,7 +387,7 @@ export class DeleteQueryImpl<
   readonly #annotations: ReadonlyMap<string, AnnotationValue<unknown, OperationKind>>;
 
   constructor(
-    tableSource: TableSource,
+    tableName: string,
     scope: Scope,
     ctx: BuilderContext,
     whereCallbacks: readonly WhereCallback[] = [],
@@ -401,8 +396,7 @@ export class DeleteQueryImpl<
     annotations: ReadonlyMap<string, AnnotationValue<unknown, OperationKind>> = new Map(),
   ) {
     super(ctx);
-    this.#tableSource = tableSource;
-    this.#tableName = tableSource.name;
+    this.#tableName = tableName;
     this.#scope = scope;
     this.#whereCallbacks = whereCallbacks;
     this.#returningColumns = returningColumns;
@@ -412,7 +406,7 @@ export class DeleteQueryImpl<
 
   where(expr: ExpressionBuilder<AvailableScope, QC>): DeleteQuery<QC, AvailableScope, RowType> {
     return new DeleteQueryImpl(
-      this.#tableSource,
+      this.#tableName,
       this.#scope,
       this.ctx,
       [...this.#whereCallbacks, expr as unknown as WhereCallback],
@@ -433,7 +427,7 @@ export class DeleteQueryImpl<
         newRowFields[col] = field;
       }
       return new DeleteQueryImpl(
-        this.#tableSource,
+        this.#tableName,
         this.#scope,
         this.ctx,
         this.#whereCallbacks,
@@ -452,7 +446,7 @@ export class DeleteQueryImpl<
     ...annotations: As & ValidAnnotations<'write', As>
   ): DeleteQuery<QC, AvailableScope, RowType> {
     return new DeleteQueryImpl(
-      this.#tableSource,
+      this.#tableName,
       this.#scope,
       this.ctx,
       this.#whereCallbacks,
@@ -472,7 +466,7 @@ export class DeleteQueryImpl<
       ),
     );
 
-    let ast = DeleteAst.from(this.#tableSource).withWhere(whereExpr);
+    let ast = DeleteAst.from(TableSource.named(this.#tableName)).withWhere(whereExpr);
 
     if (this.#returningColumns.length > 0) {
       ast = ast.withReturning(

package/src/runtime/sql.ts

@@ -1,10 +1,9 @@
 import type { Contract } from '@prisma-next/contract/types';
-import type { SqlStorage } from '@prisma-next/sql-contract/types';
+import type { SqlStorage, StorageTable } from '@prisma-next/sql-contract/types';
 import type { RawCodecInferer } from '@prisma-next/sql-relational-core/expression';
 import type { ExecutionContext } from '@prisma-next/sql-relational-core/query-lane-context';
 import type { Db, TableProxyContract } from '../types/db';
 import type { BuilderContext } from './builder-base';
-import { resolveTableForFlatName } from './resolve-table';
 import { TableProxyImpl } from './table-proxy-impl';
 
 export interface SqlOptions<C extends Contract<SqlStorage> & TableProxyContract> {
@@ -12,6 +11,21 @@ export interface SqlOptions<C extends Contract<SqlStorage> & TableProxyContract>
   readonly rawCodecInferer: RawCodecInferer;
 }
 
+// Find a table by name across every declared namespace. Mirrors the
+// flat-DSL contract (db.<tableName>): the first namespace that declares
+// `name` wins. Name collisions across namespaces are a type-level error
+// at the DSL call site; landing the namespace-aware DSL is tracked
+// separately.
+function findTableAcrossNamespaces(storage: SqlStorage, name: string): StorageTable | undefined {
+  for (const ns of Object.values(storage.namespaces)) {
+    const tables = (ns as { tables?: Readonly<Record<string, StorageTable>> }).tables ?? {};
+    if (Object.hasOwn(tables, name)) {
+      return tables[name];
+    }
+  }
+  return undefined;
+}
+
 export function sql<C extends Contract<SqlStorage> & TableProxyContract>(
   options: SqlOptions<C>,
 ): Db<C> {
@@ -28,9 +42,9 @@ export function sql<C extends Contract<SqlStorage> & TableProxyContract>(
 
   return new Proxy({} as Db<C>, {
     get(_target, prop: string) {
-      const resolved = resolveTableForFlatName(context.contract.storage, prop);
-      if (resolved) {
-        return new TableProxyImpl(prop, resolved.table, prop, ctx, resolved.namespaceId);
+      const table = findTableAcrossNamespaces(context.contract.storage, prop);
+      if (table) {
+        return new TableProxyImpl(prop, table, prop, ctx);
       }
       return undefined;
     },

package/src/runtime/table-proxy-impl.ts

@@ -1,5 +1,5 @@
 import type { StorageTable } from '@prisma-next/sql-contract/types';
-import type { AnyFromSource, TableSource } from '@prisma-next/sql-relational-core/ast';
+import { type AnyFromSource, TableSource } from '@prisma-next/sql-relational-core/ast';
 import type {
   AggregateFunctions,
   Expression,
@@ -43,7 +43,6 @@ import {
   type UpdateSetCallback,
 } from './mutation-impl';
 import { SelectQueryImpl } from './query-impl';
-import { tableSourceForProxy } from './table-source-for-proxy';
 
 export class TableProxyImpl<
     C extends TableProxyContract,
@@ -62,23 +61,15 @@ export class TableProxyImpl<
 
   readonly #tableName: string;
   readonly #table: StorageTable;
-  readonly #namespaceId: string;
   readonly #fromSource: TableSource;
   readonly #scope: Scope;
 
-  constructor(
-    tableName: string,
-    table: StorageTable,
-    alias: string,
-    ctx: BuilderContext,
-    namespaceId: string,
-  ) {
+  constructor(tableName: string, table: StorageTable, alias: string, ctx: BuilderContext) {
     super(ctx);
     this.#tableName = tableName;
     this.#table = table;
-    this.#namespaceId = namespaceId;
     this.#scope = tableToScope(alias, table, { storage: ctx.storage, tableName });
-    this.#fromSource = tableSourceForProxy(tableName, alias, namespaceId);
+    this.#fromSource = TableSource.named(tableName, alias !== tableName ? alias : undefined);
   }
 
   lateralJoin = this._gate(
@@ -123,7 +114,7 @@ export class TableProxyImpl<
   as<NewAlias extends string>(
     newAlias: NewAlias,
   ): TableProxy<C, Name, NewAlias, RebindScope<AvailableScope, Alias, NewAlias>, QC> {
-    return new TableProxyImpl(this.#tableName, this.#table, newAlias, this.ctx, this.#namespaceId);
+    return new TableProxyImpl(this.#tableName, this.#table, newAlias, this.ctx);
   }
 
   select<Columns extends (keyof AvailableScope['topLevel'] & string)[]>(
@@ -174,7 +165,7 @@ export class TableProxyImpl<
   }
 
   insert(rows: ReadonlyArray<Record<string, unknown>>): InsertQuery<QC, AvailableScope, EmptyRow> {
-    return new InsertQueryImpl(this.#fromSource, this.#table, this.#scope, rows, this.ctx);
+    return new InsertQueryImpl(this.#tableName, this.#table, this.#scope, rows, this.ctx);
   }
 
   update(
@@ -199,7 +190,7 @@ export class TableProxyImpl<
         'update',
         this.ctx,
       );
-      return new UpdateQueryImpl(this.#fromSource, this.#scope, setExpressions, this.ctx);
+      return new UpdateQueryImpl(this.#tableName, this.#scope, setExpressions, this.ctx);
     }
     const setExpressions = buildParamValues(
       setOrCallback,
@@ -208,11 +199,11 @@ export class TableProxyImpl<
       'update',
       this.ctx,
     );
-    return new UpdateQueryImpl(this.#fromSource, this.#scope, setExpressions, this.ctx);
+    return new UpdateQueryImpl(this.#tableName, this.#scope, setExpressions, this.ctx);
   }
 
   delete(): DeleteQuery<QC, AvailableScope, EmptyRow> {
-    return new DeleteQueryImpl(this.#fromSource, this.#scope, this.ctx);
+    return new DeleteQueryImpl(this.#tableName, this.#scope, this.ctx);
   }
 
   #toJoined(): JoinedTables<QC, AvailableScope> {

package/src/types/db.ts

@@ -24,12 +24,12 @@ export type UnboundTables<C extends TableProxyContract> = {
   readonly [Name in TableNamesAcrossNamespaces<C>]: TableInAnyNamespace<C, Name>;
 };
 
-export type TableNamesAcrossNamespaces<C extends TableProxyContract> = {
+type TableNamesAcrossNamespaces<C extends TableProxyContract> = {
   [NSId in keyof C['storage']['namespaces']]: keyof C['storage']['namespaces'][NSId]['tables'] &
     string;
 }[keyof C['storage']['namespaces']];
 
-export type TableInAnyNamespace<C extends TableProxyContract, Name extends string> = {
+type TableInAnyNamespace<C extends TableProxyContract, Name extends string> = {
   [NSId in keyof C['storage']['namespaces']]: Name extends keyof C['storage']['namespaces'][NSId]['tables']
     ? C['storage']['namespaces'][NSId]['tables'][Name]
     : never;

package/src/types/table-proxy.ts

@@ -1,4 +1,4 @@
-import type { Contract, ContractModelDefinitions } from '@prisma-next/contract/types';
+import type { Contract, ContractModelsMap } from '@prisma-next/contract/types';
 import type {
   ExtractCodecTypes,
   ExtractFieldInputTypes,
@@ -22,24 +22,24 @@ import type { WithJoin, WithSelect } from './shared';
 
 type FindModelForTable<C, TableName extends string> = C extends Contract
   ? {
-      [M in keyof ContractModelDefinitions<C> & string]: ContractModelDefinitions<C>[M] extends {
+      [M in keyof ContractModelsMap<C> & string]: ContractModelsMap<C>[M] extends {
         readonly storage: { readonly table: TableName };
       }
         ? M
         : never;
-    }[keyof ContractModelDefinitions<C> & string]
+    }[keyof ContractModelsMap<C> & string]
   : never;
 
 type FindFieldForColumn<C, ModelName extends string, ColumnName extends string> = C extends Contract
-  ? ModelName extends keyof ContractModelDefinitions<C>
+  ? ModelName extends keyof ContractModelsMap<C>
     ? {
-        [F in keyof ContractModelDefinitions<C>[ModelName]['storage']['fields'] &
-          string]: ContractModelDefinitions<C>[ModelName]['storage']['fields'][F] extends {
+        [F in keyof ContractModelsMap<C>[ModelName]['storage']['fields'] &
+          string]: ContractModelsMap<C>[ModelName]['storage']['fields'][F] extends {
           readonly column: ColumnName;
         }
           ? F
           : never;
-      }[keyof ContractModelDefinitions<C>[ModelName]['storage']['fields'] & string]
+      }[keyof ContractModelsMap<C>[ModelName]['storage']['fields'] & string]
     : never
   : never;
 

package/src/runtime/resolve-table.ts

@@ -1,18 +0,0 @@
-import { resolveStorageTable } from '@prisma-next/sql-contract/resolve-storage-table';
-import type { SqlStorage, StorageTable } from '@prisma-next/sql-contract/types';
-
-export interface ResolvedTable {
-  readonly namespaceId: string;
-  readonly table: StorageTable;
-}
-
-export function resolveTableForFlatName(
-  storage: SqlStorage,
-  tableName: string,
-): ResolvedTable | undefined {
-  const resolved = resolveStorageTable(storage, tableName);
-  if (resolved === undefined) {
-    return undefined;
-  }
-  return resolved;
-}

package/src/runtime/table-source-for-proxy.ts

@@ -1,9 +0,0 @@
-import { TableSource } from '@prisma-next/sql-relational-core/ast';
-
-export function tableSourceForProxy(
-  tableName: string,
-  alias: string,
-  namespaceId: string,
-): TableSource {
-  return TableSource.named(tableName, alias !== tableName ? alias : undefined, namespaceId);
-}