@prisma-next/sql-orm-client 0.9.0 → 0.10.0-dev.2

package/package.json

@@ -1,32 +1,32 @@
 {
   "name": "@prisma-next/sql-orm-client",
-  "version": "0.9.0",
+  "version": "0.10.0-dev.2",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
   "description": "ORM client for Prisma Next — fluent, type-safe model collections",
   "dependencies": {
-    "@prisma-next/contract": "0.9.0",
-    "@prisma-next/framework-components": "0.9.0",
-    "@prisma-next/operations": "0.9.0",
-    "@prisma-next/sql-contract": "0.9.0",
-    "@prisma-next/sql-operations": "0.9.0",
-    "@prisma-next/sql-relational-core": "0.9.0",
-    "@prisma-next/sql-runtime": "0.9.0",
-    "@prisma-next/utils": "0.9.0"
+    "@prisma-next/contract": "0.10.0-dev.2",
+    "@prisma-next/framework-components": "0.10.0-dev.2",
+    "@prisma-next/operations": "0.10.0-dev.2",
+    "@prisma-next/sql-contract": "0.10.0-dev.2",
+    "@prisma-next/sql-operations": "0.10.0-dev.2",
+    "@prisma-next/sql-relational-core": "0.10.0-dev.2",
+    "@prisma-next/sql-runtime": "0.10.0-dev.2",
+    "@prisma-next/utils": "0.10.0-dev.2"
   },
   "devDependencies": {
-    "@prisma-next/adapter-postgres": "0.9.0",
-    "@prisma-next/driver-postgres": "0.9.0",
-    "@prisma-next/cli": "0.9.0",
-    "@prisma-next/extension-pgvector": "0.9.0",
-    "@prisma-next/family-sql": "0.9.0",
-    "@prisma-next/ids": "0.9.0",
-    "@prisma-next/sql-contract-ts": "0.9.0",
-    "@prisma-next/target-postgres": "0.9.0",
-    "@prisma-next/test-utils": "0.9.0",
-    "@prisma-next/tsconfig": "0.9.0",
-    "@prisma-next/tsdown": "0.9.0",
+    "@prisma-next/adapter-postgres": "0.10.0-dev.2",
+    "@prisma-next/driver-postgres": "0.10.0-dev.2",
+    "@prisma-next/cli": "0.10.0-dev.2",
+    "@prisma-next/extension-pgvector": "0.10.0-dev.2",
+    "@prisma-next/family-sql": "0.10.0-dev.2",
+    "@prisma-next/ids": "0.10.0-dev.2",
+    "@prisma-next/sql-contract-ts": "0.10.0-dev.2",
+    "@prisma-next/target-postgres": "0.10.0-dev.2",
+    "@prisma-next/test-utils": "0.10.0-dev.2",
+    "@prisma-next/tsconfig": "0.10.0-dev.2",
+    "@prisma-next/tsdown": "0.10.0-dev.2",
     "@types/pg": "8.20.0",
     "pg": "8.20.0",
     "tsdown": "0.22.0",

package/src/collection-contract.ts

@@ -1,5 +1,6 @@
 import type { Contract, ContractFieldType } from '@prisma-next/contract/types';
-import type { SqlStorage } from '@prisma-next/sql-contract/types';
+import { UNBOUND_NAMESPACE_ID } from '@prisma-next/framework-components/ir';
+import type { SqlStorage, StorageTable } from '@prisma-next/sql-contract/types';
 import type { RelationCardinalityTag } from './types';
 
 type ModelStorageFields = Record<string, { column?: string }>;
@@ -29,6 +30,12 @@ export interface PolymorphismInfo {
   readonly mtiVariants: readonly PolymorphismVariantInfo[];
 }
 
+function unboundTable(contract: Contract<SqlStorage>, tableName: string): StorageTable | undefined {
+  return contract.storage.namespaces[UNBOUND_NAMESPACE_ID]?.tables[tableName] as
+    | StorageTable
+    | undefined;
+}
+
 function modelsOf(contract: Contract<SqlStorage>): ModelsMap {
   return contract.models as ModelsMap;
 }
@@ -303,7 +310,7 @@ export function resolveUpsertConflictColumns(
   }
 
   const tableName = resolveModelTableName(contract, modelName);
-  const primaryKeyColumns = contract.storage.tables[tableName]?.primaryKey?.columns ?? [];
+  const primaryKeyColumns = unboundTable(contract, tableName)?.primaryKey?.columns ?? [];
   return [...primaryKeyColumns];
 }
 
@@ -319,14 +326,14 @@ export function resolveModelTableName(contract: Contract<SqlStorage>, modelName:
 }
 
 export function resolvePrimaryKeyColumn(contract: Contract<SqlStorage>, tableName: string): string {
-  return contract.storage.tables[tableName]?.primaryKey?.columns[0] ?? 'id';
+  return unboundTable(contract, tableName)?.primaryKey?.columns[0] ?? 'id';
 }
 
 export function resolveRowIdentityColumns(
   contract: Contract<SqlStorage>,
   tableName: string,
 ): readonly string[] {
-  const table = contract.storage.tables[tableName];
+  const table = unboundTable(contract, tableName);
   if (!table) {
     return [];
   }

package/src/model-accessor.ts

@@ -1,5 +1,6 @@
 import type { Contract } from '@prisma-next/contract/types';
-import type { SqlStorage } from '@prisma-next/sql-contract/types';
+import { UNBOUND_NAMESPACE_ID } from '@prisma-next/framework-components/ir';
+import type { SqlStorage, StorageTable } from '@prisma-next/sql-contract/types';
 import type { SqlOperationEntry } from '@prisma-next/sql-operations';
 import {
   AndExpr,
@@ -126,7 +127,10 @@ function resolveColumn(
   tableName: string,
   columnName: string,
 ): { readonly codecId: string; readonly nullable: boolean } | undefined {
-  const column = contract.storage.tables?.[tableName]?.columns?.[columnName];
+  const table = contract.storage.namespaces[UNBOUND_NAMESPACE_ID]?.tables[tableName] as
+    | StorageTable
+    | undefined;
+  const column = table?.columns?.[columnName];
   if (!column) return undefined;
   return { codecId: column.codecId, nullable: column.nullable };
 }

package/src/query-plan-meta.ts

@@ -1,6 +1,7 @@
 import type { Contract, PlanMeta } from '@prisma-next/contract/types';
+import { UNBOUND_NAMESPACE_ID } from '@prisma-next/framework-components/ir';
 import type { AnnotationValue, OperationKind } from '@prisma-next/framework-components/runtime';
-import type { SqlStorage } from '@prisma-next/sql-contract/types';
+import type { SqlStorage, StorageTable } from '@prisma-next/sql-contract/types';
 import { type AnyQueryAst, collectOrderedParamRefs } from '@prisma-next/sql-relational-core/ast';
 import type { SqlQueryPlan } from '@prisma-next/sql-relational-core/plan';
 import { ifDefined } from '@prisma-next/utils/defined';
@@ -14,7 +15,9 @@ export function deriveParamsFromAst(ast: AnyQueryAst): {
 }
 
 export function resolveTableColumns(contract: Contract<SqlStorage>, tableName: string): string[] {
-  const table = contract.storage.tables[tableName];
+  const table = contract.storage.namespaces[UNBOUND_NAMESPACE_ID]?.tables[tableName] as
+    | StorageTable
+    | undefined;
   if (!table) {
     throw new Error(`Unknown table "${tableName}" in SQL ORM query planner`);
   }

package/src/query-plan-mutations.ts

@@ -1,5 +1,6 @@
 import type { Contract } from '@prisma-next/contract/types';
-import type { SqlStorage } from '@prisma-next/sql-contract/types';
+import { UNBOUND_NAMESPACE_ID } from '@prisma-next/framework-components/ir';
+import type { SqlStorage, StorageTable } from '@prisma-next/sql-contract/types';
 import {
   type AnyExpression,
   ColumnRef,
@@ -18,6 +19,12 @@ import { ifDefined } from '@prisma-next/utils/defined';
 import { buildOrmQueryPlan, deriveParamsFromAst, resolveTableColumns } from './query-plan-meta';
 import { combineWhereExprs } from './where-utils';
 
+function unboundTable(contract: Contract<SqlStorage>, tableName: string): StorageTable | undefined {
+  return contract.storage.namespaces[UNBOUND_NAMESPACE_ID]?.tables[tableName] as
+    | StorageTable
+    | undefined;
+}
+
 function buildReturningColumns(
   contract: Contract<SqlStorage>,
   tableName: string,
@@ -46,7 +53,7 @@ function toParamAssignments(
 } {
   const assignments: Record<string, ParamRef> = {};
 
-  const table = contract.storage.tables[tableName];
+  const table = unboundTable(contract, tableName);
   if (!table) {
     throw new Error(`Unknown table "${tableName}"`);
   }
@@ -89,7 +96,7 @@ function normalizeInsertRows(
     }
   }
 
-  const table = contract.storage.tables[tableName];
+  const table = unboundTable(contract, tableName);
   if (!table) {
     throw new Error(`Unknown table "${tableName}"`);
   }

package/src/types.ts

@@ -577,6 +577,16 @@ type FieldColumnName<
     : FieldName) &
   string;
 
+type NamespaceTableDef<TContract extends Contract<SqlStorage>, TableName extends string> = {
+  [K in keyof TContract['storage']['namespaces']]: TContract['storage']['namespaces'][K] extends {
+    readonly tables: infer Tables;
+  }
+    ? TableName extends keyof Tables
+      ? Tables[TableName]
+      : never
+    : never;
+}[keyof TContract['storage']['namespaces']];
+
 type ResolvedStorageColumn<
   TContract extends Contract<SqlStorage>,
   ModelName extends string,
@@ -584,15 +594,10 @@ type ResolvedStorageColumn<
 > =
   ModelTableName<TContract, ModelName> extends infer TableName extends string
     ? FieldColumnName<TContract, ModelName, FieldName> extends infer ColName extends string
-      ? TContract['storage']['tables'] extends Record<
-          string,
-          { readonly columns: Record<string, unknown> }
-        >
-        ? TableName extends keyof TContract['storage']['tables']
-          ? ColName extends keyof TContract['storage']['tables'][TableName]['columns']
-            ? TContract['storage']['tables'][TableName]['columns'][ColName] extends StorageColumn
-              ? TContract['storage']['tables'][TableName]['columns'][ColName]
-              : never
+      ? NamespaceTableDef<TContract, TableName> extends { readonly columns: infer Columns }
+        ? ColName extends keyof Columns
+          ? Columns[ColName] extends StorageColumn
+            ? Columns[ColName]
             : never
           : never
         : never
@@ -787,11 +792,7 @@ export type ResolvedCreateInput<
 
 type ModelStorageTableDef<TContract extends Contract<SqlStorage>, ModelName extends string> =
   ModelTableName<TContract, ModelName> extends infer TableName extends string
-    ? TContract['storage']['tables'] extends Record<string, unknown>
-      ? TableName extends keyof TContract['storage']['tables']
-        ? TContract['storage']['tables'][TableName]
-        : never
-      : never
+    ? NamespaceTableDef<TContract, TableName>
     : never;
 
 type PrimaryKeyConstraintColumns<TContract extends Contract<SqlStorage>, ModelName extends string> =
@@ -1112,7 +1113,7 @@ type HasForeignKeyForCols<
   FKs extends readonly unknown[],
   Cols extends readonly string[],
 > = FKs extends readonly [infer Head, ...infer Tail extends unknown[]]
-  ? Head extends { readonly columns: Cols }
+  ? Head extends { readonly source: { readonly columns: Cols } }
     ? true
     : HasForeignKeyForCols<Tail, Cols>
   : false;
@@ -1130,18 +1131,16 @@ type IsToOneRelationNullable<
   RelName extends string,
 > =
   ModelTableName<TContract, ModelName> extends infer TableName extends string
-    ? TableName extends keyof TContract['storage']['tables']
-      ? TContract['storage']['tables'][TableName] extends infer Table extends StorageTable
-        ? RelationsOf<TContract, ModelName> extends infer Rels extends Record<string, unknown>
-          ? RelName extends keyof Rels
-            ? RelationLocalFieldColumns<
-                TContract,
-                ModelName,
-                Rels[RelName]
-              > extends infer Cols extends readonly string[]
-              ? IsFkSideOfRelation<Table, Cols> extends true
-                ? AnyColumnNullable<Table['columns'], Cols>
-                : true
+    ? NamespaceTableDef<TContract, TableName> extends infer Table extends StorageTable
+      ? RelationsOf<TContract, ModelName> extends infer Rels extends Record<string, unknown>
+        ? RelName extends keyof Rels
+          ? RelationLocalFieldColumns<
+              TContract,
+              ModelName,
+              Rels[RelName]
+            > extends infer Cols extends readonly string[]
+            ? IsFkSideOfRelation<Table, Cols> extends true
+              ? AnyColumnNullable<Table['columns'], Cols>
               : true
             : true
           : true

package/src/where-binding.ts

@@ -1,5 +1,6 @@
 import type { Contract } from '@prisma-next/contract/types';
-import type { SqlStorage } from '@prisma-next/sql-contract/types';
+import { UNBOUND_NAMESPACE_ID } from '@prisma-next/framework-components/ir';
+import type { SqlStorage, StorageTable } from '@prisma-next/sql-contract/types';
 import {
   AndExpr,
   type AnyExpression,
@@ -122,7 +123,13 @@ function createParamRef(
   columnRef: ColumnRef,
   value: unknown,
 ): ParamRef {
-  if (!contract.storage.tables[columnRef.table]?.columns[columnRef.column]) {
+  if (
+    !(
+      contract.storage.namespaces[UNBOUND_NAMESPACE_ID]?.tables[columnRef.table] as
+        | StorageTable
+        | undefined
+    )?.columns[columnRef.column]
+  ) {
     throw new Error(`Unknown column "${columnRef.column}" in table "${columnRef.table}"`);
   }
   const codec = codecRefForStorageColumn(contract.storage, columnRef.table, columnRef.column);