@prisma-next/sql-contract 0.3.0-dev.124 → 0.3.0-dev.126

package/dist/factories.d.mts

@@ -1,4 +1,4 @@
-import { D as SqlStorage, N as UniqueConstraint, O as StorageColumn, T as SqlMappings, _ as PrimaryKey, f as Index, k as StorageTable, l as ForeignKey, m as ModelField, p as ModelDefinition, u as ForeignKeyOptions, w as SqlContract } from "./types-mnqqP_Au.mjs";
+import { A as SqlStorage, I as UniqueConstraint, M as StorageTable, T as SqlMappings, _ as PrimaryKey, f as Index, j as StorageColumn, l as ForeignKey, m as ModelField, p as ModelDefinition, u as ForeignKeyOptions, w as SqlContract } from "./types-CB821Pqa.mjs";
 import { ExecutionHashBase, ProfileHashBase, StorageHashBase } from "@prisma-next/contract/types";
 
 //#region src/factories.d.ts

package/dist/{types-mnqqP_Au.d.mts → types-CB821Pqa.d.mts}

@@ -1,4 +1,4 @@
-import { ColumnDefault, ContractBase, ExecutionHashBase, ExecutionSection, ProfileHashBase, StorageHashBase } from "@prisma-next/contract/types";
+import { ColumnDefault, ContractBase, DomainRelationOn, ExecutionHashBase, ExecutionSection, ProfileHashBase, StorageHashBase } from "@prisma-next/contract/types";
 
 //#region src/types.d.ts
 
@@ -113,6 +113,21 @@ type ModelDefinition = {
   readonly storage: ModelStorage;
   readonly fields: Record<string, ModelField>;
   readonly relations: Record<string, unknown>;
+  readonly owner?: string;
+};
+type SqlModelFieldStorage = {
+  readonly column: string;
+  readonly codecId?: string;
+  readonly nullable?: boolean;
+};
+type SqlModelStorage = {
+  readonly table: string;
+  readonly fields: Record<string, SqlModelFieldStorage>;
+};
+type SqlRelation = {
+  readonly to: string;
+  readonly cardinality: '1:1' | '1:N' | 'N:1';
+  readonly on: DomainRelationOn;
 };
 type SqlMappings = {
   readonly modelToTable?: Record<string, string>;
@@ -164,10 +179,9 @@ type QueryOperationTypesOf<T> = [T] extends [never] ? Record<string, never> : T
 } ? Q extends Record<string, unknown> ? Q : Record<string, never> : Record<string, never>;
 type TypeMapsPhantomKey = '__@prisma-next/sql-contract/typeMaps@__';
 type ContractWithTypeMaps<TContract, TTypeMaps> = TContract & { readonly [K in TypeMapsPhantomKey]?: TTypeMaps };
-type SqlContract<S extends SqlStorage = SqlStorage, M extends Record<string, unknown> = Record<string, unknown>, R extends Record<string, unknown> = Record<string, unknown>, Map extends SqlMappings = SqlMappings, TStorageHash extends StorageHashBase<string> = StorageHashBase<string>, TExecutionHash extends ExecutionHashBase<string> = ExecutionHashBase<string>, TProfileHash extends ProfileHashBase<string> = ProfileHashBase<string>> = ContractBase<TStorageHash, TExecutionHash, TProfileHash> & {
+type SqlContract<S extends SqlStorage = SqlStorage, M extends Record<string, unknown> = Record<string, unknown>, R extends Record<string, unknown> = Record<string, unknown>, Map extends SqlMappings = SqlMappings, TStorageHash extends StorageHashBase<string> = StorageHashBase<string>, TExecutionHash extends ExecutionHashBase<string> = ExecutionHashBase<string>, TProfileHash extends ProfileHashBase<string> = ProfileHashBase<string>> = ContractBase<TStorageHash, TExecutionHash, TProfileHash, M> & {
   readonly targetFamily: string;
   readonly storage: S;
-  readonly models: M;
   readonly relations: R;
   readonly mappings: Map;
   readonly execution?: ExecutionSection;
@@ -179,5 +193,5 @@ type ExtractQueryOperationTypes<T> = QueryOperationTypesOf<ExtractTypeMapsFromCo
 type ResolveCodecTypes<TContract, TTypeMaps> = [TTypeMaps] extends [never] ? ExtractCodecTypes<TContract> : CodecTypesOf<TTypeMaps>;
 type ResolveOperationTypes<TContract, TTypeMaps> = [TTypeMaps] extends [never] ? ExtractOperationTypes<TContract> : OperationTypesOf<TTypeMaps>;
 //#endregion
-export { StorageTypeInstance as A, ResolveOperationTypes as C, SqlStorage as D, SqlQueryOperationTypes as E, TypeMapsPhantomKey as M, UniqueConstraint as N, StorageColumn as O, applyFkDefaults as P, ResolveCodecTypes as S, SqlMappings as T, PrimaryKey as _, ExtractCodecTypes as a, QueryOperationTypesOf as b, ExtractTypeMapsFromContract as c, ForeignKeyReferences as d, Index as f, OperationTypesOf as g, ModelStorage as h, DEFAULT_FK_INDEX as i, TypeMaps as j, StorageTable as k, ForeignKey as l, ModelField as m, ContractWithTypeMaps as n, ExtractOperationTypes as o, ModelDefinition as p, DEFAULT_FK_CONSTRAINT as r, ExtractQueryOperationTypes as s, CodecTypesOf as t, ForeignKeyOptions as u, QueryOperationTypeEntry as v, SqlContract as w, ReferentialAction as x, QueryOperationTypesBase as y };
-//# sourceMappingURL=types-mnqqP_Au.d.mts.map
+export { SqlStorage as A, ResolveOperationTypes as C, SqlModelStorage as D, SqlModelFieldStorage as E, TypeMapsPhantomKey as F, UniqueConstraint as I, applyFkDefaults as L, StorageTable as M, StorageTypeInstance as N, SqlQueryOperationTypes as O, TypeMaps as P, ResolveCodecTypes as S, SqlMappings as T, PrimaryKey as _, ExtractCodecTypes as a, QueryOperationTypesOf as b, ExtractTypeMapsFromContract as c, ForeignKeyReferences as d, Index as f, OperationTypesOf as g, ModelStorage as h, DEFAULT_FK_INDEX as i, StorageColumn as j, SqlRelation as k, ForeignKey as l, ModelField as m, ContractWithTypeMaps as n, ExtractOperationTypes as o, ModelDefinition as p, DEFAULT_FK_CONSTRAINT as r, ExtractQueryOperationTypes as s, CodecTypesOf as t, ForeignKeyOptions as u, QueryOperationTypeEntry as v, SqlContract as w, ReferentialAction as x, QueryOperationTypesBase as y };
+//# sourceMappingURL=types-CB821Pqa.d.mts.map

package/dist/types-CB821Pqa.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types-CB821Pqa.d.mts","names":[],"sources":["../src/types.ts"],"sourcesContent":[],"mappings":"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"}

package/dist/types-DRR5stkj.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"types-DRR5stkj.mjs","names":[],"sources":["../src/types.ts"],"sourcesContent":["import type {\n  ColumnDefault,\n  ContractBase,\n  ExecutionHashBase,\n  ExecutionSection,\n  ProfileHashBase,\n  StorageHashBase,\n} from '@prisma-next/contract/types';\n\n/**\n * A column definition in storage.\n *\n * `typeParams` is optional because most columns use non-parameterized types.\n * Columns with parameterized types can either inline `typeParams` or reference\n * a named {@link StorageTypeInstance} via `typeRef`.\n */\nexport type StorageColumn = {\n  readonly nativeType: string;\n  readonly codecId: string;\n  readonly nullable: boolean;\n  /**\n   * Opaque, codec-owned JS/type parameters.\n   * The codec that owns `codecId` defines the shape and semantics.\n   * Mutually exclusive with `typeRef`.\n   */\n  readonly typeParams?: Record<string, unknown>;\n  /**\n   * Reference to a named type instance in `storage.types`.\n   * Mutually exclusive with `typeParams`.\n   */\n  readonly typeRef?: string;\n  /**\n   * Default value for the column.\n   * Can be a literal value or database function.\n   */\n  readonly default?: ColumnDefault;\n};\n\nexport type PrimaryKey = {\n  readonly columns: readonly string[];\n  readonly name?: string;\n};\n\nexport type UniqueConstraint = {\n  readonly columns: readonly string[];\n  readonly name?: string;\n};\n\nexport type Index = {\n  readonly columns: readonly string[];\n  readonly name?: string;\n  /**\n   * Optional access method identifier.\n   * Extension-specific methods are represented as strings and interpreted\n   * by the owning extension package.\n   */\n  readonly using?: string;\n  /**\n   * Optional extension-owned index configuration payload.\n   */\n  readonly config?: Record<string, unknown>;\n};\n\nexport type ForeignKeyReferences = {\n  readonly table: string;\n  readonly columns: readonly string[];\n};\n\nexport type ReferentialAction = 'noAction' | 'restrict' | 'cascade' | 'setNull' | 'setDefault';\n\nexport type ForeignKeyOptions = {\n  readonly name?: string;\n  readonly onDelete?: ReferentialAction;\n  readonly onUpdate?: ReferentialAction;\n};\n\nexport type ForeignKey = {\n  readonly columns: readonly string[];\n  readonly references: ForeignKeyReferences;\n  readonly name?: string;\n  readonly onDelete?: ReferentialAction;\n  readonly onUpdate?: ReferentialAction;\n  /** Whether to emit FK constraint DDL (ALTER TABLE … ADD CONSTRAINT … FOREIGN KEY). */\n  readonly constraint: boolean;\n  /** Whether to emit a backing index for the FK columns. */\n  readonly index: boolean;\n};\n\nexport type StorageTable = {\n  readonly columns: Record<string, StorageColumn>;\n  readonly primaryKey?: PrimaryKey;\n  readonly uniques: ReadonlyArray<UniqueConstraint>;\n  readonly indexes: ReadonlyArray<Index>;\n  readonly foreignKeys: ReadonlyArray<ForeignKey>;\n};\n\n/**\n * A named, parameterized type instance.\n * These are registered in `storage.types` for reuse across columns\n * and to enable ergonomic schema surfaces like `schema.types.MyType`.\n *\n * Unlike {@link StorageColumn}, `typeParams` is required here because\n * `StorageTypeInstance` exists specifically to define reusable parameterized types.\n * A type instance without parameters would be redundant—columns can reference\n * the codec directly via `codecId`.\n */\nexport type StorageTypeInstance = {\n  readonly codecId: string;\n  readonly nativeType: string;\n  readonly typeParams: Record<string, unknown>;\n};\n\nexport type SqlStorage = {\n  readonly tables: Record<string, StorageTable>;\n  /**\n   * Named type instances for parameterized/custom types.\n   * Columns can reference these via `typeRef`.\n   */\n  readonly types?: Record<string, StorageTypeInstance>;\n};\n\nexport type ModelField = {\n  readonly column: string;\n};\n\nexport type ModelStorage = {\n  readonly table: string;\n};\n\nexport type ModelDefinition = {\n  readonly storage: ModelStorage;\n  readonly fields: Record<string, ModelField>;\n  readonly relations: Record<string, unknown>;\n};\n\nexport type SqlMappings = {\n  readonly modelToTable?: Record<string, string>;\n  readonly tableToModel?: Record<string, string>;\n  readonly fieldToColumn?: Record<string, Record<string, string>>;\n  readonly columnToField?: Record<string, Record<string, string>>;\n};\n\nexport const DEFAULT_FK_CONSTRAINT = true;\nexport const DEFAULT_FK_INDEX = true;\n\nexport function applyFkDefaults(\n  fk: { constraint?: boolean | undefined; index?: boolean | undefined },\n  overrideDefaults?: { constraint?: boolean | undefined; index?: boolean | undefined },\n): { constraint: boolean; index: boolean } {\n  return {\n    constraint: fk.constraint ?? overrideDefaults?.constraint ?? DEFAULT_FK_CONSTRAINT,\n    index: fk.index ?? overrideDefaults?.index ?? DEFAULT_FK_INDEX,\n  };\n}\n\nexport type TypeMaps<\n  TCodecTypes extends Record<string, { output: unknown }> = Record<string, never>,\n  TOperationTypes extends Record<string, unknown> = Record<string, never>,\n  TQueryOperationTypes extends Record<string, unknown> = Record<string, never>,\n> = {\n  readonly codecTypes: TCodecTypes;\n  readonly operationTypes: TOperationTypes;\n  readonly queryOperationTypes: TQueryOperationTypes;\n};\n\nexport type CodecTypesOf<T> = [T] extends [never]\n  ? Record<string, never>\n  : T extends { readonly codecTypes: infer C }\n    ? C extends Record<string, { output: unknown }>\n      ? C\n      : Record<string, never>\n    : Record<string, never>;\n\nexport type OperationTypesOf<T> = [T] extends [never]\n  ? Record<string, never>\n  : T extends { readonly operationTypes: infer O }\n    ? O extends Record<string, unknown>\n      ? O\n      : Record<string, never>\n    : Record<string, never>;\n\nexport type QueryOperationTypeEntry = {\n  readonly args: readonly { readonly codecId: string; readonly nullable: boolean }[];\n  readonly returns: { readonly codecId: string; readonly nullable: boolean };\n};\n\nexport type SqlQueryOperationTypes<T extends Record<string, QueryOperationTypeEntry>> = T;\n\nexport type QueryOperationTypesBase = Record<string, QueryOperationTypeEntry>;\n\nexport type QueryOperationTypesOf<T> = [T] extends [never]\n  ? Record<string, never>\n  : T extends { readonly queryOperationTypes: infer Q }\n    ? Q extends Record<string, unknown>\n      ? Q\n      : Record<string, never>\n    : Record<string, never>;\n\nexport type TypeMapsPhantomKey = '__@prisma-next/sql-contract/typeMaps@__';\n\nexport type ContractWithTypeMaps<TContract, TTypeMaps> = TContract & {\n  readonly [K in TypeMapsPhantomKey]?: TTypeMaps;\n};\n\nexport type SqlContract<\n  S extends SqlStorage = SqlStorage,\n  M extends Record<string, unknown> = Record<string, unknown>,\n  R extends Record<string, unknown> = Record<string, unknown>,\n  Map extends SqlMappings = SqlMappings,\n  TStorageHash extends StorageHashBase<string> = StorageHashBase<string>,\n  TExecutionHash extends ExecutionHashBase<string> = ExecutionHashBase<string>,\n  TProfileHash extends ProfileHashBase<string> = ProfileHashBase<string>,\n> = ContractBase<TStorageHash, TExecutionHash, TProfileHash> & {\n  readonly targetFamily: string;\n  readonly storage: S;\n  readonly models: M;\n  readonly relations: R;\n  readonly mappings: Map;\n  readonly execution?: ExecutionSection;\n};\n\nexport type ExtractTypeMapsFromContract<T> = TypeMapsPhantomKey extends keyof T\n  ? NonNullable<T[TypeMapsPhantomKey & keyof T]>\n  : never;\n\nexport type ExtractCodecTypes<T> = CodecTypesOf<ExtractTypeMapsFromContract<T>>;\nexport type ExtractOperationTypes<T> = OperationTypesOf<ExtractTypeMapsFromContract<T>>;\nexport type ExtractQueryOperationTypes<T> = QueryOperationTypesOf<ExtractTypeMapsFromContract<T>>;\n\nexport type ResolveCodecTypes<TContract, TTypeMaps> = [TTypeMaps] extends [never]\n  ? ExtractCodecTypes<TContract>\n  : CodecTypesOf<TTypeMaps>;\n\nexport type ResolveOperationTypes<TContract, TTypeMaps> = [TTypeMaps] extends [never]\n  ? ExtractOperationTypes<TContract>\n  : OperationTypesOf<TTypeMaps>;\n"],"mappings":";AA8IA,MAAa,wBAAwB;AACrC,MAAa,mBAAmB;AAEhC,SAAgB,gBACd,IACA,kBACyC;AACzC,QAAO;EACL,YAAY,GAAG,cAAc,kBAAkB,cAAc;EAC7D,OAAO,GAAG,SAAS,kBAAkB,SAAS;EAC/C"}
+{"version":3,"file":"types-DRR5stkj.mjs","names":[],"sources":["../src/types.ts"],"sourcesContent":["import type {\n  ColumnDefault,\n  ContractBase,\n  DomainRelationOn,\n  ExecutionHashBase,\n  ExecutionSection,\n  ProfileHashBase,\n  StorageHashBase,\n} from '@prisma-next/contract/types';\n\n/**\n * A column definition in storage.\n *\n * `typeParams` is optional because most columns use non-parameterized types.\n * Columns with parameterized types can either inline `typeParams` or reference\n * a named {@link StorageTypeInstance} via `typeRef`.\n */\nexport type StorageColumn = {\n  readonly nativeType: string;\n  readonly codecId: string;\n  readonly nullable: boolean;\n  /**\n   * Opaque, codec-owned JS/type parameters.\n   * The codec that owns `codecId` defines the shape and semantics.\n   * Mutually exclusive with `typeRef`.\n   */\n  readonly typeParams?: Record<string, unknown>;\n  /**\n   * Reference to a named type instance in `storage.types`.\n   * Mutually exclusive with `typeParams`.\n   */\n  readonly typeRef?: string;\n  /**\n   * Default value for the column.\n   * Can be a literal value or database function.\n   */\n  readonly default?: ColumnDefault;\n};\n\nexport type PrimaryKey = {\n  readonly columns: readonly string[];\n  readonly name?: string;\n};\n\nexport type UniqueConstraint = {\n  readonly columns: readonly string[];\n  readonly name?: string;\n};\n\nexport type Index = {\n  readonly columns: readonly string[];\n  readonly name?: string;\n  /**\n   * Optional access method identifier.\n   * Extension-specific methods are represented as strings and interpreted\n   * by the owning extension package.\n   */\n  readonly using?: string;\n  /**\n   * Optional extension-owned index configuration payload.\n   */\n  readonly config?: Record<string, unknown>;\n};\n\nexport type ForeignKeyReferences = {\n  readonly table: string;\n  readonly columns: readonly string[];\n};\n\nexport type ReferentialAction = 'noAction' | 'restrict' | 'cascade' | 'setNull' | 'setDefault';\n\nexport type ForeignKeyOptions = {\n  readonly name?: string;\n  readonly onDelete?: ReferentialAction;\n  readonly onUpdate?: ReferentialAction;\n};\n\nexport type ForeignKey = {\n  readonly columns: readonly string[];\n  readonly references: ForeignKeyReferences;\n  readonly name?: string;\n  readonly onDelete?: ReferentialAction;\n  readonly onUpdate?: ReferentialAction;\n  /** Whether to emit FK constraint DDL (ALTER TABLE … ADD CONSTRAINT … FOREIGN KEY). */\n  readonly constraint: boolean;\n  /** Whether to emit a backing index for the FK columns. */\n  readonly index: boolean;\n};\n\nexport type StorageTable = {\n  readonly columns: Record<string, StorageColumn>;\n  readonly primaryKey?: PrimaryKey;\n  readonly uniques: ReadonlyArray<UniqueConstraint>;\n  readonly indexes: ReadonlyArray<Index>;\n  readonly foreignKeys: ReadonlyArray<ForeignKey>;\n};\n\n/**\n * A named, parameterized type instance.\n * These are registered in `storage.types` for reuse across columns\n * and to enable ergonomic schema surfaces like `schema.types.MyType`.\n *\n * Unlike {@link StorageColumn}, `typeParams` is required here because\n * `StorageTypeInstance` exists specifically to define reusable parameterized types.\n * A type instance without parameters would be redundant—columns can reference\n * the codec directly via `codecId`.\n */\nexport type StorageTypeInstance = {\n  readonly codecId: string;\n  readonly nativeType: string;\n  readonly typeParams: Record<string, unknown>;\n};\n\nexport type SqlStorage = {\n  readonly tables: Record<string, StorageTable>;\n  /**\n   * Named type instances for parameterized/custom types.\n   * Columns can reference these via `typeRef`.\n   */\n  readonly types?: Record<string, StorageTypeInstance>;\n};\n\nexport type ModelField = {\n  readonly column: string;\n};\n\nexport type ModelStorage = {\n  readonly table: string;\n};\n\nexport type ModelDefinition = {\n  readonly storage: ModelStorage;\n  readonly fields: Record<string, ModelField>;\n  readonly relations: Record<string, unknown>;\n  readonly owner?: string;\n};\n\nexport type SqlModelFieldStorage = {\n  readonly column: string;\n  readonly codecId?: string;\n  readonly nullable?: boolean;\n};\n\nexport type SqlModelStorage = {\n  readonly table: string;\n  readonly fields: Record<string, SqlModelFieldStorage>;\n};\n\nexport type SqlRelation = {\n  readonly to: string;\n  readonly cardinality: '1:1' | '1:N' | 'N:1';\n  readonly on: DomainRelationOn;\n};\n\nexport type SqlMappings = {\n  readonly modelToTable?: Record<string, string>;\n  readonly tableToModel?: Record<string, string>;\n  readonly fieldToColumn?: Record<string, Record<string, string>>;\n  readonly columnToField?: Record<string, Record<string, string>>;\n};\n\nexport const DEFAULT_FK_CONSTRAINT = true;\nexport const DEFAULT_FK_INDEX = true;\n\nexport function applyFkDefaults(\n  fk: { constraint?: boolean | undefined; index?: boolean | undefined },\n  overrideDefaults?: { constraint?: boolean | undefined; index?: boolean | undefined },\n): { constraint: boolean; index: boolean } {\n  return {\n    constraint: fk.constraint ?? overrideDefaults?.constraint ?? DEFAULT_FK_CONSTRAINT,\n    index: fk.index ?? overrideDefaults?.index ?? DEFAULT_FK_INDEX,\n  };\n}\n\nexport type TypeMaps<\n  TCodecTypes extends Record<string, { output: unknown }> = Record<string, never>,\n  TOperationTypes extends Record<string, unknown> = Record<string, never>,\n  TQueryOperationTypes extends Record<string, unknown> = Record<string, never>,\n> = {\n  readonly codecTypes: TCodecTypes;\n  readonly operationTypes: TOperationTypes;\n  readonly queryOperationTypes: TQueryOperationTypes;\n};\n\nexport type CodecTypesOf<T> = [T] extends [never]\n  ? Record<string, never>\n  : T extends { readonly codecTypes: infer C }\n    ? C extends Record<string, { output: unknown }>\n      ? C\n      : Record<string, never>\n    : Record<string, never>;\n\nexport type OperationTypesOf<T> = [T] extends [never]\n  ? Record<string, never>\n  : T extends { readonly operationTypes: infer O }\n    ? O extends Record<string, unknown>\n      ? O\n      : Record<string, never>\n    : Record<string, never>;\n\nexport type QueryOperationTypeEntry = {\n  readonly args: readonly { readonly codecId: string; readonly nullable: boolean }[];\n  readonly returns: { readonly codecId: string; readonly nullable: boolean };\n};\n\nexport type SqlQueryOperationTypes<T extends Record<string, QueryOperationTypeEntry>> = T;\n\nexport type QueryOperationTypesBase = Record<string, QueryOperationTypeEntry>;\n\nexport type QueryOperationTypesOf<T> = [T] extends [never]\n  ? Record<string, never>\n  : T extends { readonly queryOperationTypes: infer Q }\n    ? Q extends Record<string, unknown>\n      ? Q\n      : Record<string, never>\n    : Record<string, never>;\n\nexport type TypeMapsPhantomKey = '__@prisma-next/sql-contract/typeMaps@__';\n\nexport type ContractWithTypeMaps<TContract, TTypeMaps> = TContract & {\n  readonly [K in TypeMapsPhantomKey]?: TTypeMaps;\n};\n\nexport type SqlContract<\n  S extends SqlStorage = SqlStorage,\n  M extends Record<string, unknown> = Record<string, unknown>,\n  R extends Record<string, unknown> = Record<string, unknown>,\n  Map extends SqlMappings = SqlMappings,\n  TStorageHash extends StorageHashBase<string> = StorageHashBase<string>,\n  TExecutionHash extends ExecutionHashBase<string> = ExecutionHashBase<string>,\n  TProfileHash extends ProfileHashBase<string> = ProfileHashBase<string>,\n> = ContractBase<TStorageHash, TExecutionHash, TProfileHash, M> & {\n  readonly targetFamily: string;\n  readonly storage: S;\n  readonly relations: R;\n  readonly mappings: Map;\n  readonly execution?: ExecutionSection;\n};\n\nexport type ExtractTypeMapsFromContract<T> = TypeMapsPhantomKey extends keyof T\n  ? NonNullable<T[TypeMapsPhantomKey & keyof T]>\n  : never;\n\nexport type ExtractCodecTypes<T> = CodecTypesOf<ExtractTypeMapsFromContract<T>>;\nexport type ExtractOperationTypes<T> = OperationTypesOf<ExtractTypeMapsFromContract<T>>;\nexport type ExtractQueryOperationTypes<T> = QueryOperationTypesOf<ExtractTypeMapsFromContract<T>>;\n\nexport type ResolveCodecTypes<TContract, TTypeMaps> = [TTypeMaps] extends [never]\n  ? ExtractCodecTypes<TContract>\n  : CodecTypesOf<TTypeMaps>;\n\nexport type ResolveOperationTypes<TContract, TTypeMaps> = [TTypeMaps] extends [never]\n  ? ExtractOperationTypes<TContract>\n  : OperationTypesOf<TTypeMaps>;\n"],"mappings":";AAiKA,MAAa,wBAAwB;AACrC,MAAa,mBAAmB;AAEhC,SAAgB,gBACd,IACA,kBACyC;AACzC,QAAO;EACL,YAAY,GAAG,cAAc,kBAAkB,cAAc;EAC7D,OAAO,GAAG,SAAS,kBAAkB,SAAS;EAC/C"}

package/dist/types.d.mts

@@ -1,2 +1,2 @@
-import { A as StorageTypeInstance, C as ResolveOperationTypes, D as SqlStorage, E as SqlQueryOperationTypes, M as TypeMapsPhantomKey, N as UniqueConstraint, O as StorageColumn, P as applyFkDefaults, S as ResolveCodecTypes, T as SqlMappings, _ as PrimaryKey, a as ExtractCodecTypes, b as QueryOperationTypesOf, c as ExtractTypeMapsFromContract, d as ForeignKeyReferences, f as Index, g as OperationTypesOf, h as ModelStorage, i as DEFAULT_FK_INDEX, j as TypeMaps, k as StorageTable, l as ForeignKey, m as ModelField, n as ContractWithTypeMaps, o as ExtractOperationTypes, p as ModelDefinition, r as DEFAULT_FK_CONSTRAINT, s as ExtractQueryOperationTypes, t as CodecTypesOf, u as ForeignKeyOptions, v as QueryOperationTypeEntry, w as SqlContract, x as ReferentialAction, y as QueryOperationTypesBase } from "./types-mnqqP_Au.mjs";
-export { type CodecTypesOf, type ContractWithTypeMaps, DEFAULT_FK_CONSTRAINT, DEFAULT_FK_INDEX, type ExtractCodecTypes, type ExtractOperationTypes, type ExtractQueryOperationTypes, type ExtractTypeMapsFromContract, type ForeignKey, type ForeignKeyOptions, type ForeignKeyReferences, type Index, type ModelDefinition, type ModelField, type ModelStorage, type OperationTypesOf, type PrimaryKey, type QueryOperationTypeEntry, type QueryOperationTypesBase, type QueryOperationTypesOf, type ReferentialAction, type ResolveCodecTypes, type ResolveOperationTypes, type SqlContract, type SqlMappings, type SqlQueryOperationTypes, type SqlStorage, type StorageColumn, type StorageTable, type StorageTypeInstance, type TypeMaps, type TypeMapsPhantomKey, type UniqueConstraint, applyFkDefaults };
+import { A as SqlStorage, C as ResolveOperationTypes, D as SqlModelStorage, E as SqlModelFieldStorage, F as TypeMapsPhantomKey, I as UniqueConstraint, L as applyFkDefaults, M as StorageTable, N as StorageTypeInstance, O as SqlQueryOperationTypes, P as TypeMaps, S as ResolveCodecTypes, T as SqlMappings, _ as PrimaryKey, a as ExtractCodecTypes, b as QueryOperationTypesOf, c as ExtractTypeMapsFromContract, d as ForeignKeyReferences, f as Index, g as OperationTypesOf, h as ModelStorage, i as DEFAULT_FK_INDEX, j as StorageColumn, k as SqlRelation, l as ForeignKey, m as ModelField, n as ContractWithTypeMaps, o as ExtractOperationTypes, p as ModelDefinition, r as DEFAULT_FK_CONSTRAINT, s as ExtractQueryOperationTypes, t as CodecTypesOf, u as ForeignKeyOptions, v as QueryOperationTypeEntry, w as SqlContract, x as ReferentialAction, y as QueryOperationTypesBase } from "./types-CB821Pqa.mjs";
+export { type CodecTypesOf, type ContractWithTypeMaps, DEFAULT_FK_CONSTRAINT, DEFAULT_FK_INDEX, type ExtractCodecTypes, type ExtractOperationTypes, type ExtractQueryOperationTypes, type ExtractTypeMapsFromContract, type ForeignKey, type ForeignKeyOptions, type ForeignKeyReferences, type Index, type ModelDefinition, type ModelField, type ModelStorage, type OperationTypesOf, type PrimaryKey, type QueryOperationTypeEntry, type QueryOperationTypesBase, type QueryOperationTypesOf, type ReferentialAction, type ResolveCodecTypes, type ResolveOperationTypes, type SqlContract, type SqlMappings, type SqlModelFieldStorage, type SqlModelStorage, type SqlQueryOperationTypes, type SqlRelation, type SqlStorage, type StorageColumn, type StorageTable, type StorageTypeInstance, type TypeMaps, type TypeMapsPhantomKey, type UniqueConstraint, applyFkDefaults };

package/dist/validate.d.mts

@@ -1,4 +1,4 @@
-import { D as SqlStorage, O as StorageColumn, w as SqlContract } from "./types-mnqqP_Au.mjs";
+import { A as SqlStorage, j as StorageColumn, w as SqlContract } from "./types-CB821Pqa.mjs";
 import "@prisma-next/contract/types";
 
 //#region src/validate.d.ts

package/dist/validate.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.mts","names":[],"sources":["../src/validate.ts"],"sourcesContent":[],"mappings":";;;;iBAuFgB,cAAA,SAAuB;AAAvB,iBAkCA,sBAlCuB,CAAa,UAkCH,WAlCG,CAkCS,UAlCT,CAAA,CAAA,CAAA,QAAA,EAkCgC,CAlChC,CAAA,EAkCoC,CAlCpC;AAkCpC,iBAqDA,iBAAA,CArDsB,QAAA,EAAA,OAAA,CAAA,EAqDgB,WArDhB,CAqD4B,UArD5B,CAAA;AAAuB,iBAwI7C,gBAxI6C,CAAA,kBAwIV,WAxIU,CAwIE,UAxIF,CAAA,CAAA,CAAA,KAAA,EAAA,OAAA,CAAA,EA0I1D,SA1I0D"}
+{"version":3,"file":"validate.d.mts","names":[],"sources":["../src/validate.ts"],"sourcesContent":[],"mappings":";;;;iBAgGgB,cAAA,SAAuB;AAAvB,iBAkCA,sBAlCuB,CAAa,UAkCH,WAlCG,CAkCS,UAlCT,CAAA,CAAA,CAAA,QAAA,EAkCgC,CAlChC,CAAA,EAkCoC,CAlCpC;AAkCpC,iBAmVA,iBAAA,CAnVsB,QAAA,EAAA,OAAA,CAAA,EAmVgB,WAnVhB,CAmV4B,UAnV5B,CAAA;AAAuB,iBA2Z7C,gBA3Z6C,CAAA,kBA2ZV,WA3ZU,CA2ZE,UA3ZF,CAAA,CAAA,CAAA,KAAA,EAAA,OAAA,CAAA,EA6Z1D,SA7Z0D"}

package/dist/validate.mjs

@@ -1,6 +1,7 @@
 import { r as applyFkDefaults } from "./types-DRR5stkj.mjs";
-import { d as validateStorageSemantics, l as validateSqlContract } from "./validators-DuHeCiKZ.mjs";
+import { d as validateStorageSemantics, l as validateSqlContract } from "./validators-CNxeypbZ.mjs";
 import { isTaggedBigInt, isTaggedRaw } from "@prisma-next/contract/types";
+import { validateContractDomain } from "@prisma-next/contract/validate-domain";
 
 //#region src/construct.ts
 function computeDefaultMappings(models) {
@@ -75,14 +76,22 @@ function stripGenerated(obj) {
 function constructContract(input) {
 	const existingMappings = input.mappings;
 	const mappings = mergeMappings(computeDefaultMappings(input.models), existingMappings);
+	const stripped = stripGenerated(input);
 	return {
-		...stripGenerated(input),
-		mappings
+		...stripped,
+		mappings,
+		roots: stripped.roots
 	};
 }
 
 //#endregion
 //#region src/validate.ts
+function extractDomainShape(contract) {
+	return {
+		roots: contract.roots,
+		models: contract.models
+	};
+}
 function validateContractLogic(contract) {
 	const tableNames = new Set(Object.keys(contract.storage.tables));
 	for (const [tableName, table] of Object.entries(contract.storage.tables)) {
@@ -164,65 +173,216 @@ function decodeContractDefaults(contract) {
 		}
 	};
 }
-function normalizeContract(contract) {
-	if (typeof contract !== "object" || contract === null) return contract;
-	const contractObj = contract;
-	let normalizedStorage = contractObj["storage"];
-	if (normalizedStorage && typeof normalizedStorage === "object" && normalizedStorage !== null) {
-		const storage = normalizedStorage;
-		const tables = storage["tables"];
-		if (tables) {
-			const normalizedTables = {};
-			for (const [tableName, table] of Object.entries(tables)) {
-				const tableObj = table;
-				const columns = tableObj["columns"];
-				if (columns) {
-					const normalizedColumns = {};
-					for (const [columnName, column] of Object.entries(columns)) {
-						const columnObj = column;
-						normalizedColumns[columnName] = {
-							...columnObj,
-							nullable: columnObj["nullable"] ?? false
-						};
-					}
-					const normalizedForeignKeys = (tableObj["foreignKeys"] ?? []).map((fk) => ({
-						...fk,
-						...applyFkDefaults({
-							constraint: typeof fk["constraint"] === "boolean" ? fk["constraint"] : void 0,
-							index: typeof fk["index"] === "boolean" ? fk["index"] : void 0
-						})
-					}));
-					normalizedTables[tableName] = {
-						...tableObj,
-						columns: normalizedColumns,
-						uniques: tableObj["uniques"] ?? [],
-						indexes: tableObj["indexes"] ?? [],
-						foreignKeys: normalizedForeignKeys
-					};
-				} else normalizedTables[tableName] = tableObj;
+function normalizeStorage(contractObj) {
+	const normalizedStorage = contractObj["storage"];
+	if (!normalizedStorage || typeof normalizedStorage !== "object") return normalizedStorage;
+	const storage = normalizedStorage;
+	const tables = storage["tables"];
+	if (!tables) return storage;
+	const normalizedTables = {};
+	for (const [tableName, table] of Object.entries(tables)) {
+		const tableObj = table;
+		const columns = tableObj["columns"];
+		if (columns) {
+			const normalizedColumns = {};
+			for (const [columnName, column] of Object.entries(columns)) {
+				const columnObj = column;
+				normalizedColumns[columnName] = {
+					...columnObj,
+					nullable: columnObj["nullable"] ?? false
+				};
 			}
-			normalizedStorage = {
-				...storage,
-				tables: normalizedTables
+			const normalizedForeignKeys = (tableObj["foreignKeys"] ?? []).map((fk) => ({
+				...fk,
+				...applyFkDefaults({
+					constraint: typeof fk["constraint"] === "boolean" ? fk["constraint"] : void 0,
+					index: typeof fk["index"] === "boolean" ? fk["index"] : void 0
+				})
+			}));
+			normalizedTables[tableName] = {
+				...tableObj,
+				columns: normalizedColumns,
+				uniques: tableObj["uniques"] ?? [],
+				indexes: tableObj["indexes"] ?? [],
+				foreignKeys: normalizedForeignKeys
 			};
+		} else normalizedTables[tableName] = tableObj;
+	}
+	return {
+		...storage,
+		tables: normalizedTables
+	};
+}
+function detectFormat(models) {
+	for (const model of Object.values(models)) {
+		const fields = model["fields"];
+		if (!fields) continue;
+		for (const field of Object.values(fields)) {
+			if ("column" in field) return "old";
+			if ("codecId" in field) return "new";
 		}
 	}
-	let normalizedModels = contractObj["models"];
-	if (normalizedModels && typeof normalizedModels === "object" && normalizedModels !== null) {
-		const models = normalizedModels;
-		const normalizedModelsObj = {};
-		for (const [modelName, model] of Object.entries(models)) {
-			const modelObj = model;
-			normalizedModelsObj[modelName] = {
-				...modelObj,
-				relations: modelObj["relations"] ?? {}
+	return "old";
+}
+function buildColumnToFieldMap(fields, modelName) {
+	const map = {};
+	for (const [fieldName, field] of Object.entries(fields)) {
+		const col = field["column"];
+		if (!col) continue;
+		if (Object.hasOwn(map, col)) throw new Error(`Model "${modelName}" has duplicate column mapping: fields "${map[col]}" and "${fieldName}" both map to column "${col}"`);
+		map[col] = fieldName;
+	}
+	return map;
+}
+function enrichOldFormatModels(models, storageObj, topRelations) {
+	const roots = {};
+	const tableToModel = {};
+	for (const [modelName, model] of Object.entries(models)) {
+		const tableName = model["storage"]?.["table"];
+		if (tableName) {
+			if (!model["owner"]) roots[modelName] = modelName;
+			tableToModel[tableName] = modelName;
+		}
+	}
+	const enrichedModels = {};
+	for (const [modelName, model] of Object.entries(models)) {
+		const fields = model["fields"] ?? {};
+		const modelStorage = model["storage"];
+		const tableName = modelStorage?.["table"];
+		const storageColumns = (tableName ? storageObj.tables[tableName] : void 0)?.["columns"] ?? {};
+		const enrichedFields = {};
+		const modelStorageFields = {};
+		const hasStorageColumns = Object.keys(storageColumns).length > 0;
+		for (const [fieldName, field] of Object.entries(fields)) {
+			const colName = field["column"];
+			const storageCol = storageColumns[colName];
+			if (!storageCol && hasStorageColumns && colName) throw new Error(`Model "${modelName}" field "${fieldName}" references non-existent column "${colName}" in table "${tableName}"`);
+			enrichedFields[fieldName] = {
+				...field,
+				nullable: storageCol?.["nullable"] ?? false,
+				codecId: storageCol?.["codecId"] ?? ""
 			};
+			modelStorageFields[fieldName] = { column: colName };
 		}
-		normalizedModels = normalizedModelsObj;
+		const enrichedStorage = {
+			...modelStorage ?? {},
+			fields: modelStorageFields
+		};
+		enrichedModels[modelName] = {
+			...model,
+			fields: enrichedFields,
+			storage: enrichedStorage,
+			relations: model["relations"] ?? {}
+		};
+	}
+	for (const [tableName, tableRels] of Object.entries(topRelations)) {
+		const modelName = tableToModel[tableName];
+		if (!modelName) continue;
+		const existingModel = enrichedModels[modelName];
+		if (!existingModel) continue;
+		const existingRels = existingModel["relations"] ?? {};
+		const targetColumnToField = {};
+		const modelRelations = { ...existingRels };
+		for (const [relName, rel] of Object.entries(tableRels)) {
+			const on = rel["on"];
+			const parentCols = on?.["parentCols"] ?? [];
+			const childCols = on?.["childCols"] ?? [];
+			const toModel = rel["to"];
+			const sourceColToField = buildColumnToFieldMap(existingModel["fields"] ?? {}, modelName);
+			if (!targetColumnToField[toModel]) {
+				const targetModelObj = enrichedModels[toModel];
+				if (targetModelObj) targetColumnToField[toModel] = buildColumnToFieldMap(targetModelObj["fields"] ?? {}, toModel);
+				else targetColumnToField[toModel] = {};
+			}
+			const targetColToField = targetColumnToField[toModel] ?? {};
+			const localFields = parentCols.map((c) => sourceColToField[c] ?? c);
+			const targetFields = childCols.map((c) => targetColToField[c] ?? c);
+			modelRelations[relName] = {
+				to: toModel,
+				cardinality: rel["cardinality"],
+				on: {
+					localFields,
+					targetFields
+				}
+			};
+		}
+		enrichedModels[modelName] = {
+			...existingModel,
+			relations: modelRelations
+		};
 	}
 	return {
+		enrichedModels,
+		roots
+	};
+}
+function enrichNewFormatModels(models) {
+	const enrichedModels = {};
+	const topRelations = {};
+	const modelToTable = {};
+	for (const [modelName, model] of Object.entries(models)) {
+		const tableName = model["storage"]?.["table"];
+		if (tableName) modelToTable[modelName] = tableName;
+	}
+	for (const [modelName, model] of Object.entries(models)) {
+		const fields = model["fields"] ?? {};
+		const storageFields = model["storage"]?.["fields"] ?? {};
+		const enrichedFields = {};
+		for (const [fieldName, field] of Object.entries(fields)) {
+			const column = storageFields[fieldName]?.["column"];
+			enrichedFields[fieldName] = column ? {
+				...field,
+				column
+			} : { ...field };
+		}
+		enrichedModels[modelName] = {
+			...model,
+			fields: enrichedFields,
+			relations: model["relations"] ?? {}
+		};
+		const modelRels = model["relations"] ?? {};
+		const tableName = modelToTable[modelName];
+		if (!tableName) continue;
+		for (const [relName, rel] of Object.entries(modelRels)) {
+			const on = rel["on"];
+			if (!on) continue;
+			const toModel = rel["to"];
+			if (!modelToTable[toModel]) continue;
+			const sourceFields = enrichedFields;
+			const targetModelObj = models[toModel];
+			const targetFields = targetModelObj?.["fields"] ?? {};
+			const targetStorageFields = (targetModelObj?.["storage"])?.["fields"] ?? {};
+			const parentCols = (on.localFields ?? []).map((f) => {
+				return storageFields[f]?.["column"] ?? sourceFields[f]?.["column"] ?? f;
+			});
+			const childCols = (on.targetFields ?? []).map((f) => {
+				return targetStorageFields[f]?.["column"] ?? targetFields[f]?.["column"] ?? f;
+			});
+			if (!topRelations[tableName]) topRelations[tableName] = {};
+			topRelations[tableName][relName] = {
+				to: toModel,
+				cardinality: rel["cardinality"],
+				on: {
+					parentCols,
+					childCols
+				}
+			};
+		}
+	}
+	return {
+		enrichedModels,
+		topRelations
+	};
+}
+function normalizeContract(contract) {
+	if (typeof contract !== "object" || contract === null) return contract;
+	const contractObj = contract;
+	const normalizedStorage = normalizeStorage(contractObj);
+	const rawModels = contractObj["models"];
+	if (!rawModels || typeof rawModels !== "object" || rawModels === null) return {
 		...contractObj,
-		models: normalizedModels,
+		roots: contractObj["roots"] ?? {},
+		models: rawModels ?? {},
 		relations: contractObj["relations"] ?? {},
 		storage: normalizedStorage,
 		extensionPacks: contractObj["extensionPacks"] ?? {},
@@ -230,9 +390,42 @@ function normalizeContract(contract) {
 		meta: contractObj["meta"] ?? {},
 		sources: contractObj["sources"] ?? {}
 	};
+	const modelsObj = rawModels;
+	const format = detectFormat(modelsObj);
+	let normalizedModels;
+	let roots;
+	let topRelations;
+	if (format === "new") {
+		const result = enrichNewFormatModels(modelsObj);
+		normalizedModels = result.enrichedModels;
+		topRelations = {
+			...contractObj["relations"] ?? {},
+			...result.topRelations
+		};
+		roots = contractObj["roots"] ?? {};
+	} else {
+		const storageObj = { tables: (normalizedStorage && typeof normalizedStorage === "object" ? normalizedStorage : {})["tables"] ?? {} };
+		const existingRelations = contractObj["relations"] ?? {};
+		const result = enrichOldFormatModels(modelsObj, storageObj, existingRelations);
+		normalizedModels = result.enrichedModels;
+		roots = result.roots;
+		topRelations = existingRelations;
+	}
+	return {
+		...contractObj,
+		roots,
+		models: normalizedModels,
+		relations: topRelations,
+		storage: normalizedStorage,
+		extensionPacks: contractObj["extensionPacks"] ?? {},
+		capabilities: contractObj["capabilities"] ?? {},
+		meta: contractObj["meta"] ?? {},
+		sources: contractObj["sources"] ?? {}
+	};
 }
 function validateContract(value) {
 	const structurallyValid = validateSqlContract(normalizeContract(value));
+	validateContractDomain(extractDomainShape(structurallyValid));
 	validateContractLogic(structurallyValid);
 	const semanticErrors = validateStorageSemantics(structurallyValid.storage);
 	if (semanticErrors.length > 0) throw new Error(`Contract semantic validation failed: ${semanticErrors.join("; ")}`);