@prisma-next/sql-contract-ts 0.8.0 → 0.9.0-dev.2

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@prisma-next/sql-contract-ts",
-  "version": "0.8.0",
+  "version": "0.9.0-dev.2",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
   "description": "SQL-specific TypeScript contract authoring surface for Prisma Next",
   "dependencies": {
-    "@prisma-next/config": "0.8.0",
-    "@prisma-next/contract": "0.8.0",
-    "@prisma-next/contract-authoring": "0.8.0",
-    "@prisma-next/framework-components": "0.8.0",
-    "@prisma-next/sql-contract": "0.8.0",
-    "@prisma-next/utils": "0.8.0",
+    "@prisma-next/config": "0.9.0-dev.2",
+    "@prisma-next/contract": "0.9.0-dev.2",
+    "@prisma-next/contract-authoring": "0.9.0-dev.2",
+    "@prisma-next/framework-components": "0.9.0-dev.2",
+    "@prisma-next/sql-contract": "0.9.0-dev.2",
+    "@prisma-next/utils": "0.9.0-dev.2",
     "arktype": "^2.1.29",
     "pathe": "^2.0.3",
     "ts-toolbelt": "^9.6.0"
   },
   "devDependencies": {
-    "@prisma-next/test-utils": "0.8.0",
-    "@prisma-next/tsconfig": "0.8.0",
+    "@prisma-next/test-utils": "0.9.0-dev.2",
+    "@prisma-next/tsconfig": "0.9.0-dev.2",
     "@types/pg": "8.20.0",
     "pg": "8.20.0",
-    "@prisma-next/tsdown": "0.8.0",
+    "@prisma-next/tsdown": "0.9.0-dev.2",
     "tsdown": "0.22.0",
     "typescript": "5.9.3",
     "vitest": "4.1.5"

package/src/authoring-helper-runtime.ts

@@ -9,7 +9,7 @@ import {
   isAuthoringTypeConstructorDescriptor,
   validateAuthoringHelperArguments,
 } from '@prisma-next/framework-components/authoring';
-import type { StorageTypeInstance } from '@prisma-next/sql-contract/types';
+import { type StorageTypeInstance, toStorageTypeInstance } from '@prisma-next/sql-contract/types';
 
 export type RuntimeNamedConstraintSpec = {
   readonly name?: string;
@@ -51,9 +51,14 @@ export function createTypeHelpersFromNamespace(
 
     if (isAuthoringTypeConstructorDescriptor(value)) {
       const helperPath = currentPath.join('.');
-      helpers[key] = (...args: readonly unknown[]) => {
+      helpers[key] = (...args: readonly unknown[]): StorageTypeInstance => {
         validateAuthoringHelperArguments(helperPath, value.args, args);
-        return instantiateAuthoringTypeConstructor(value, args) as StorageTypeInstance;
+        const triple = instantiateAuthoringTypeConstructor(value, args);
+        return toStorageTypeInstance({
+          codecId: triple.codecId,
+          nativeType: triple.nativeType,
+          typeParams: triple.typeParams ?? {},
+        });
       };
       continue;
     }

package/src/build-contract.ts

@@ -17,6 +17,7 @@ import {
   type StorageHashBase,
 } from '@prisma-next/contract/types';
 import type { CodecLookup } from '@prisma-next/framework-components/codec';
+import { UNSPECIFIED_NAMESPACE_ID } from '@prisma-next/framework-components/ir';
 import { validateIndexTypes } from '@prisma-next/sql-contract/index-type-validation';
 import {
   createIndexTypeRegistry,
@@ -25,10 +26,14 @@ import {
 } from '@prisma-next/sql-contract/index-types';
 import {
   applyFkDefaults,
-  type SqlStorage,
+  isPostgresEnumStorageEntry,
+  type PostgresEnumStorageEntry,
+  SqlStorage,
+  SqlUnspecifiedNamespace,
   type StorageColumn,
   type StorageTable,
   type StorageTypeInstance,
+  toStorageTypeInstance,
 } from '@prisma-next/sql-contract/types';
 import { validateStorageSemantics } from '@prisma-next/sql-contract/validators';
 import { ifDefined } from '@prisma-next/utils/defined';
@@ -387,15 +392,37 @@ export function buildSqlContractFromDefinition(
 
   // --- Assemble contract ---
 
-  const storageTypes = (definition.storageTypes ?? {}) as Record<string, StorageTypeInstance>;
+  // Normalise raw codec-triple inputs to the `kind: 'codec-instance'`
+  // discriminator shape before hashing so the storageHash matches the
+  // persisted JSON envelope produced from the SqlStorage class instance
+  // (which always carries the discriminator).
+  const rawStorageTypes = (definition.storageTypes ?? {}) as Record<
+    string,
+    StorageTypeInstance | PostgresEnumStorageEntry
+  >;
+  const storageTypes = Object.fromEntries(
+    Object.entries(rawStorageTypes).map(([name, entry]) => {
+      if (isPostgresEnumStorageEntry(entry)) return [name, entry];
+      if ((entry as { kind?: unknown }).kind === 'codec-instance') return [name, entry];
+      return [
+        name,
+        toStorageTypeInstance({
+          codecId: entry.codecId,
+          nativeType: entry.nativeType,
+          typeParams: (entry as { typeParams?: Record<string, unknown> }).typeParams ?? {},
+        }),
+      ];
+    }),
+  );
   const storageWithoutHash = {
     tables: storageTables,
     types: storageTypes,
+    namespaces: { [UNSPECIFIED_NAMESPACE_ID]: SqlUnspecifiedNamespace.instance },
   };
   const storageHash: StorageHashBase<string> = definition.storageHash
     ? coreHash(definition.storageHash)
     : computeStorageHash({ target, targetFamily, storage: storageWithoutHash });
-  const storage: SqlStorage = { ...storageWithoutHash, storageHash };
+  const storage = new SqlStorage({ ...storageWithoutHash, storageHash });
 
   const executionSection =
     executionDefaults.length > 0

package/src/composed-authoring-helpers.ts

@@ -1,11 +1,19 @@
+import {
+  createEntityHelpersFromNamespace,
+  type EntityHelpersFromNamespace,
+  type ExtractAuthoringNamespaceFromPack,
+  type MergeExtensionAuthoringNamespaces,
+} from '@prisma-next/contract-authoring';
 import type {
   AuthoringArgumentDescriptor,
+  AuthoringEntityTypeNamespace,
   AuthoringFieldNamespace,
   AuthoringTypeConstructorDescriptor,
   AuthoringTypeNamespace,
 } from '@prisma-next/framework-components/authoring';
 import {
   assertNoCrossRegistryCollisions,
+  isAuthoringEntityTypeDescriptor,
   isAuthoringFieldPresetDescriptor,
   isAuthoringTypeConstructorDescriptor,
   mergeAuthoringNamespaces,
@@ -24,7 +32,6 @@ import type {
   FieldHelpersFromNamespace,
   ResolveTemplateValue,
   TupleFromArgumentDescriptors,
-  UnionToIntersection,
 } from './authoring-type-utils';
 import type {
   AnyRelationBuilder,
@@ -35,44 +42,40 @@ import type {
 import { buildFieldPreset, field, model, rel } from './contract-dsl';
 import type { MergeExtensionIndexTypes } from './contract-types';
 
-type ExtractTypeNamespaceFromPack<Pack> = Pack extends {
-  readonly authoring?: { readonly type?: infer Namespace extends AuthoringTypeNamespace };
-}
-  ? Namespace
-  : Record<never, never>;
+type ExtractTypeNamespaceFromPack<Pack> = ExtractAuthoringNamespaceFromPack<
+  Pack,
+  'type',
+  Record<never, never>
+>;
+type ExtractFieldNamespaceFromPack<Pack> = ExtractAuthoringNamespaceFromPack<
+  Pack,
+  'field',
+  Record<never, never>
+>;
+type ExtractEntitiesNamespaceFromPack<Pack> = ExtractAuthoringNamespaceFromPack<
+  Pack,
+  'entityTypes',
+  Record<never, never>
+>;
 
-type ExtractFieldNamespaceFromPack<Pack> = Pack extends {
-  readonly authoring?: { readonly field?: infer Namespace extends AuthoringFieldNamespace };
-}
-  ? Namespace
-  : Record<never, never>;
-
-type MergeExtensionTypeNamespaces<ExtensionPacks> =
-  ExtensionPacks extends Record<string, unknown>
-    ? keyof ExtensionPacks extends never
-      ? Record<never, never>
-      : UnionToIntersection<
-          {
-            [K in keyof ExtensionPacks]: ExtractTypeNamespaceFromPack<ExtensionPacks[K]>;
-          }[keyof ExtensionPacks]
-        >
-    : Record<never, never>;
-
-type MergeExtensionFieldNamespaces<ExtensionPacks> =
-  ExtensionPacks extends Record<string, unknown>
-    ? keyof ExtensionPacks extends never
-      ? Record<never, never>
-      : UnionToIntersection<
-          {
-            [K in keyof ExtensionPacks]: ExtractFieldNamespaceFromPack<ExtensionPacks[K]>;
-          }[keyof ExtensionPacks]
-        >
-    : Record<never, never>;
+type MergeExtensionTypeNamespaces<ExtensionPacks> = MergeExtensionAuthoringNamespaces<
+  ExtensionPacks,
+  'type'
+>;
+type MergeExtensionFieldNamespaces<ExtensionPacks> = MergeExtensionAuthoringNamespaces<
+  ExtensionPacks,
+  'field'
+>;
+type MergeExtensionEntityNamespaces<ExtensionPacks> = MergeExtensionAuthoringNamespaces<
+  ExtensionPacks,
+  'entityTypes'
+>;
 
 type StorageTypeFromDescriptor<
   Descriptor extends AuthoringTypeConstructorDescriptor,
   Args extends readonly unknown[],
 > = {
+  readonly kind: 'codec-instance';
   readonly codecId: ResolveTemplateValue<Descriptor['output']['codecId'], Args>;
   readonly nativeType: ResolveTemplateValue<Descriptor['output']['nativeType'], Args>;
 } & (Descriptor['output'] extends {
@@ -81,7 +84,7 @@ type StorageTypeFromDescriptor<
   ? {
       readonly typeParams: ResolveTemplateValue<TypeParams, Args>;
     }
-  : Record<never, never>);
+  : { readonly typeParams: Record<never, never> });
 
 type TypeHelperFunction<Descriptor extends AuthoringTypeConstructorDescriptor> =
   Descriptor extends { readonly args: infer Args extends readonly AuthoringArgumentDescriptor[] }
@@ -131,7 +134,11 @@ export type ComposedAuthoringHelpers<
   Family extends FamilyPackRef<string>,
   Target extends TargetPackRef<'sql', string>,
   ExtensionPacks extends Record<string, ExtensionPackRef<'sql', string>> | undefined,
-> = {
+> = EntityHelpersFromNamespace<
+  ExtractEntitiesNamespaceFromPack<Family> &
+    ExtractEntitiesNamespaceFromPack<Target> &
+    MergeExtensionEntityNamespaces<ExtensionPacks>
+> & {
   readonly field: CoreFieldHelpers &
     FieldHelpersFromNamespace<
       ExtractFieldNamespaceFromPack<Family> &
@@ -157,8 +164,17 @@ function extractFieldNamespace<Pack>(pack: Pack): ExtractFieldNamespaceFromPack<
     {}) as ExtractFieldNamespaceFromPack<Pack>;
 }
 
+function extractEntitiesNamespace<Pack>(pack: Pack): ExtractEntitiesNamespaceFromPack<Pack> {
+  return ((pack as { readonly authoring?: { readonly entityTypes?: unknown } }).authoring
+    ?.entityTypes ?? {}) as ExtractEntitiesNamespaceFromPack<Pack>;
+}
+
 type AuthoringComponent = {
-  readonly authoring?: { readonly type?: unknown; readonly field?: unknown };
+  readonly authoring?: {
+    readonly type?: unknown;
+    readonly field?: unknown;
+    readonly entityTypes?: unknown;
+  };
 };
 
 function composeTypeNamespace(components: readonly AuthoringComponent[]): AuthoringTypeNamespace {
@@ -183,6 +199,39 @@ function composeFieldNamespace(components: readonly AuthoringComponent[]): Autho
   return merged as AuthoringFieldNamespace;
 }
 
+function composeEntityNamespace(
+  components: readonly AuthoringComponent[],
+): AuthoringEntityTypeNamespace {
+  const merged: Record<string, unknown> = {};
+  for (const component of components) {
+    const ns = extractEntitiesNamespace(component);
+    if (Object.keys(ns).length > 0) {
+      mergeAuthoringNamespaces(merged, ns, [], isAuthoringEntityTypeDescriptor, 'entity');
+    }
+  }
+  return merged as AuthoringEntityTypeNamespace;
+}
+
+/**
+ * Reserved top-level keys on the composed helpers surface — the
+ * built-in `model` / `rel` helpers, the `field` / `type` namespace
+ * objects. Pack-contributed entity types are flattened to the same
+ * top-level shape (e.g. `helpers.enum({...})`), so a pack cannot
+ * contribute an entity type whose name collides with one of these
+ * reserved keys without silently overwriting at runtime. Detect the
+ * collision at compose time and fail loudly with a guidance message.
+ */
+const RESERVED_HELPER_KEYS: readonly string[] = ['field', 'model', 'rel', 'type'];
+
+function assertNoBuiltInEntityCollisions(namespace: AuthoringEntityTypeNamespace): void {
+  const collisions = Object.keys(namespace).filter((name) => RESERVED_HELPER_KEYS.includes(name));
+  if (collisions.length > 0) {
+    throw new Error(
+      `Pack-contributed entity type(s) ${collisions.map((c) => `"${c}"`).join(', ')} collide with the reserved built-in helper key(s) on the composed helpers surface. Reserved keys: ${RESERVED_HELPER_KEYS.map((k) => `"${k}"`).join(', ')}.`,
+    );
+  }
+}
+
 function createComposedFieldHelpers(
   fieldNamespace: AuthoringFieldNamespace,
 ): CoreFieldHelpers & Record<string, unknown> {
@@ -237,11 +286,16 @@ export function createComposedAuthoringHelpers<
 
   const typeNamespace = composeTypeNamespace(components);
   const fieldNamespace = composeFieldNamespace(components);
+  const entityNamespace = composeEntityNamespace(components);
   // Mirrors the call in `assembleAuthoringContributions`: PSL composes via
   // `createControlStack`, the TS DSL composes here. Both seams need the guard.
-  assertNoCrossRegistryCollisions(typeNamespace, fieldNamespace);
+  assertNoCrossRegistryCollisions(typeNamespace, fieldNamespace, entityNamespace);
+  assertNoBuiltInEntityCollisions(entityNamespace);
 
   return {
+    ...createEntityHelpersFromNamespace(entityNamespace, {
+      ctx: { family: options.family.familyId, target: options.target.targetId },
+    }),
     field: createComposedFieldHelpers(fieldNamespace),
     model,
     rel,

package/src/contract-builder.ts

@@ -5,7 +5,10 @@ import type {
   FamilyPackRef,
   TargetPackRef,
 } from '@prisma-next/framework-components/components';
-import type { StorageTypeInstance } from '@prisma-next/sql-contract/types';
+import type {
+  PostgresEnumStorageEntry,
+  StorageTypeInstance,
+} from '@prisma-next/sql-contract/types';
 import { buildSqlContractFromDefinition } from './build-contract';
 import {
   type ComposedAuthoringHelpers,
@@ -44,7 +47,7 @@ type ModelLike = {
 type ContractDefinition<
   Family extends FamilyPackRef<string>,
   Target extends TargetPackRef<'sql', string>,
-  Types extends Record<string, StorageTypeInstance>,
+  Types extends Record<string, StorageTypeInstance | PostgresEnumStorageEntry>,
   Models extends Record<string, ModelLike>,
   ExtensionPacks extends Record<string, ExtensionPackRef<'sql', string>> | undefined,
   Capabilities extends Record<string, Record<string, boolean>> | undefined,
@@ -86,7 +89,7 @@ type ContractScaffold<
 type ContractFactory<
   Family extends FamilyPackRef<string>,
   Target extends TargetPackRef<'sql', string>,
-  Types extends Record<string, StorageTypeInstance>,
+  Types extends Record<string, StorageTypeInstance | PostgresEnumStorageEntry>,
   Models extends Record<string, ModelLike>,
   ExtensionPacks extends Record<string, ExtensionPackRef<'sql', string>> | undefined,
 > = (helpers: ComposedAuthoringHelpers<Family, Target, ExtensionPacks>) => {
@@ -159,7 +162,10 @@ function buildContractFromDsl(
 export function defineContract<
   const Family extends FamilyPackRef<string>,
   const Target extends TargetPackRef<'sql', string>,
-  const Types extends Record<string, StorageTypeInstance> = Record<never, never>,
+  const Types extends Record<string, StorageTypeInstance | PostgresEnumStorageEntry> = Record<
+    never,
+    never
+  >,
   const Models extends Record<string, ModelLike> = Record<never, never>,
   const ExtensionPacks extends
     | Record<string, ExtensionPackRef<'sql', string>>
@@ -196,7 +202,10 @@ export function defineContract<
 export function defineContract<
   const Family extends FamilyPackRef<string>,
   const Target extends TargetPackRef<'sql', string>,
-  const Types extends Record<string, StorageTypeInstance> = Record<never, never>,
+  const Types extends Record<string, StorageTypeInstance | PostgresEnumStorageEntry> = Record<
+    never,
+    never
+  >,
   const Models extends Record<string, ModelLike> = Record<never, never>,
   const ExtensionPacks extends
     | Record<string, ExtensionPackRef<'sql', string>>
@@ -234,7 +243,7 @@ export function defineContract(
   factory?: ContractFactory<
     FamilyPackRef<string>,
     TargetPackRef<'sql', string>,
-    Record<string, StorageTypeInstance>,
+    Record<string, StorageTypeInstance | PostgresEnumStorageEntry>,
     Record<string, ModelLike>,
     Record<string, ExtensionPackRef<'sql', string>> | undefined
   >,

package/src/contract-definition.ts

@@ -2,7 +2,11 @@ import type { ColumnDefault, ExecutionMutationDefaultPhases } from '@prisma-next
 import type { ForeignKeyDefaultsState } from '@prisma-next/contract-authoring';
 import type { ColumnTypeDescriptor } from '@prisma-next/framework-components/codec';
 import type { ExtensionPackRef, TargetPackRef } from '@prisma-next/framework-components/components';
-import type { ReferentialAction, StorageTypeInstance } from '@prisma-next/sql-contract/types';
+import type {
+  PostgresEnumStorageEntry,
+  ReferentialAction,
+  StorageTypeInstance,
+} from '@prisma-next/sql-contract/types';
 
 export type { ExecutionMutationDefaultPhases };
 
@@ -97,7 +101,7 @@ export interface ContractDefinition {
   readonly capabilities?: Record<string, Record<string, boolean>>;
   readonly storageHash?: string;
   readonly foreignKeyDefaults?: ForeignKeyDefaultsState;
-  readonly storageTypes?: Record<string, StorageTypeInstance>;
+  readonly storageTypes?: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>;
   readonly models: readonly ModelNode[];
   readonly valueObjects?: readonly ValueObjectNode[];
 }

package/src/contract-dsl.ts

@@ -14,7 +14,10 @@ import type {
   FamilyPackRef,
   TargetPackRef,
 } from '@prisma-next/framework-components/components';
-import type { StorageTypeInstance } from '@prisma-next/sql-contract/types';
+import type {
+  PostgresEnumStorageEntry,
+  StorageTypeInstance,
+} from '@prisma-next/sql-contract/types';
 import { ifDefined } from '@prisma-next/utils/defined';
 import type { NamedConstraintSpec } from './authoring-type-utils';
 
@@ -25,7 +28,7 @@ export type NamingConfig = {
   readonly columns?: NamingStrategy;
 };
 
-type NamedStorageTypeRef = string | StorageTypeInstance;
+type NamedStorageTypeRef = string | StorageTypeInstance | PostgresEnumStorageEntry;
 
 type NamedConstraintNameSpec<Name extends string = string> = {
   readonly name: Name;
@@ -349,6 +352,9 @@ function namedTypeField<TypeRef extends string>(
 function namedTypeField<TypeRef extends StorageTypeInstance>(
   typeRef: TypeRef,
 ): ScalarFieldBuilder<ScalarFieldState<TypeRef['codecId'], TypeRef, false, undefined>>;
+function namedTypeField<TypeRef extends PostgresEnumStorageEntry>(
+  typeRef: TypeRef,
+): ScalarFieldBuilder<ScalarFieldState<string, TypeRef, false, undefined>>;
 function namedTypeField(
   typeRef: NamedStorageTypeRef,
 ): ScalarFieldBuilder<ScalarFieldState<string, NamedStorageTypeRef, false, undefined>> {

package/src/contract-lowering.ts

@@ -1,5 +1,9 @@
 import type { ColumnTypeDescriptor } from '@prisma-next/framework-components/codec';
-import type { StorageTypeInstance } from '@prisma-next/sql-contract/types';
+import {
+  isPostgresEnumStorageEntry,
+  type PostgresEnumStorageEntry,
+  type StorageTypeInstance,
+} from '@prisma-next/sql-contract/types';
 import { ifDefined } from '@prisma-next/utils/defined';
 import type {
   ContractDefinition,
@@ -52,15 +56,15 @@ type RuntimeModelSpec = {
 };
 
 type RuntimeCollection = {
-  readonly storageTypes: Record<string, StorageTypeInstance>;
+  readonly storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>;
   readonly models: Record<string, RuntimeModel>;
   readonly modelSpecs: ReadonlyMap<string, RuntimeModelSpec>;
 };
 
 function buildStorageTypeReverseLookup(
-  storageTypes: Record<string, StorageTypeInstance>,
-): ReadonlyMap<StorageTypeInstance, string> {
-  const lookup = new Map<StorageTypeInstance, string>();
+  storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>,
+): ReadonlyMap<StorageTypeInstance | PostgresEnumStorageEntry, string> {
+  const lookup = new Map<StorageTypeInstance | PostgresEnumStorageEntry, string>();
   for (const [key, instance] of Object.entries(storageTypes)) {
     lookup.set(instance, key);
   }
@@ -71,8 +75,8 @@ function resolveFieldDescriptor(
   modelName: string,
   fieldName: string,
   fieldState: FieldStateOf<ScalarFieldBuilder>,
-  storageTypes: Record<string, StorageTypeInstance>,
-  storageTypeReverseLookup: ReadonlyMap<StorageTypeInstance, string>,
+  storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>,
+  storageTypeReverseLookup: ReadonlyMap<StorageTypeInstance | PostgresEnumStorageEntry, string>,
 ): ColumnTypeDescriptor {
   if ('descriptor' in fieldState && fieldState.descriptor) {
     return fieldState.descriptor;
@@ -82,7 +86,9 @@ function resolveFieldDescriptor(
     const typeRef =
       typeof fieldState.typeRef === 'string'
         ? fieldState.typeRef
-        : storageTypeReverseLookup.get(fieldState.typeRef as StorageTypeInstance);
+        : storageTypeReverseLookup.get(
+            fieldState.typeRef as StorageTypeInstance | PostgresEnumStorageEntry,
+          );
 
     if (!typeRef) {
       throw new Error(
@@ -97,8 +103,11 @@ function resolveFieldDescriptor(
       );
     }
 
+    const codecId = isPostgresEnumStorageEntry(referencedType)
+      ? referencedType.codecId
+      : referencedType.codecId;
     return {
-      codecId: referencedType.codecId,
+      codecId,
       nativeType: referencedType.nativeType,
       typeRef,
     };
@@ -538,8 +547,8 @@ function resolveForeignKeyNodes(
 function resolveModelNode(
   spec: RuntimeModelSpec,
   allSpecs: ReadonlyMap<string, RuntimeModelSpec>,
-  storageTypes: Record<string, StorageTypeInstance>,
-  storageTypeReverseLookup: ReadonlyMap<StorageTypeInstance, string>,
+  storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>,
+  storageTypeReverseLookup: ReadonlyMap<StorageTypeInstance | PostgresEnumStorageEntry, string>,
 ): ModelNode {
   const fields: FieldNode[] = [];
 
@@ -607,7 +616,10 @@ function resolveModelNode(
 }
 
 function collectRuntimeModelSpecs(definition: ContractInput): RuntimeCollection {
-  const storageTypes = { ...(definition.types ?? {}) } as Record<string, StorageTypeInstance>;
+  const storageTypes = { ...(definition.types ?? {}) } as Record<
+    string,
+    StorageTypeInstance | PostgresEnumStorageEntry
+  >;
   const models = { ...(definition.models ?? {}) } as Record<string, RuntimeModel>;
 
   emitTypedNamedTypeFallbackWarnings(models, storageTypes);

package/src/contract-types.ts

@@ -5,10 +5,12 @@ import type {
   StorageHashBase,
 } from '@prisma-next/contract/types';
 import type { ExtensionPackRef, TargetPackRef } from '@prisma-next/framework-components/components';
+import type { Namespace } from '@prisma-next/framework-components/ir';
 import type { IndexTypeRegistration } from '@prisma-next/sql-contract/index-types';
 import type {
   ContractWithTypeMaps,
   Index,
+  PostgresEnumStorageEntry,
   ReferentialAction,
   StorageTypeInstance,
   TypeMaps,
@@ -108,7 +110,10 @@ type DefinitionModels<Definition> = Definition extends {
 type DefinitionTypes<Definition> = Definition extends {
   readonly types?: unknown;
 }
-  ? Present<Definition['types']> extends Record<string, StorageTypeInstance>
+  ? Present<Definition['types']> extends Record<
+      string,
+      StorageTypeInstance | PostgresEnumStorageEntry
+    >
     ? Present<Definition['types']>
     : Record<never, never>
   : Record<never, never>;
@@ -272,7 +277,10 @@ type DescriptorTypeRef<Descriptor> = Descriptor extends {
   ? TypeRef
   : undefined;
 
-type LookupNamedStorageTypeKeyByValue<Definition, TypeRef extends StorageTypeInstance> = {
+type LookupNamedStorageTypeKeyByValue<
+  Definition,
+  TypeRef extends StorageTypeInstance | PostgresEnumStorageEntry,
+> = {
   [TypeName in keyof DefinitionTypes<Definition> & string]: [TypeRef] extends [
     DefinitionTypes<Definition>[TypeName],
   ]
@@ -284,7 +292,7 @@ type LookupNamedStorageTypeKeyByValue<Definition, TypeRef extends StorageTypeIns
 
 type ResolveNamedStorageTypeKey<Definition, TypeRef> = TypeRef extends string
   ? TypeRef
-  : TypeRef extends StorageTypeInstance
+  : TypeRef extends StorageTypeInstance | PostgresEnumStorageEntry
     ? [LookupNamedStorageTypeKeyByValue<Definition, TypeRef>] extends [never]
       ? string
       : LookupNamedStorageTypeKeyByValue<Definition, TypeRef>
@@ -517,6 +525,7 @@ type BuiltStorage<Definition> = {
   readonly storageHash: StorageHashBase<string>;
   readonly tables: BuiltStorageTables<Definition>;
   readonly types: DefinitionTypes<Definition>;
+  readonly namespaces: Readonly<Record<string, Namespace>>;
 };
 
 type FieldOutputType<

package/src/contract-warnings.ts

@@ -1,4 +1,7 @@
-import type { StorageTypeInstance } from '@prisma-next/sql-contract/types';
+import type {
+  PostgresEnumStorageEntry,
+  StorageTypeInstance,
+} from '@prisma-next/sql-contract/types';
 import {
   type ContractModelBuilder,
   type ModelAttributesSpec,
@@ -25,7 +28,7 @@ type RuntimeModelSpec = {
 };
 
 type RuntimeCollection = {
-  readonly storageTypes: Record<string, StorageTypeInstance>;
+  readonly storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>;
   readonly models: Record<string, RuntimeModel>;
   readonly modelSpecs: ReadonlyMap<string, RuntimeModelSpec>;
 };
@@ -133,7 +136,7 @@ function formatFallbackWarning(location: string, current: string, suggested: str
 
 export function emitTypedNamedTypeFallbackWarnings(
   models: Record<string, RuntimeModel>,
-  storageTypes: Record<string, StorageTypeInstance>,
+  storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>,
 ): void {
   const warnings: string[] = [];
   const warnedFields = new Set<string>();