@prisma-next/sql-contract-ts 0.14.0-dev.65 → 0.14.0-dev.67

package/package.json

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

package/src/authoring-type-utils.ts

@@ -2,6 +2,7 @@ import type {
   AuthoringArgumentDescriptor,
   AuthoringFieldPresetDescriptor,
 } from '@prisma-next/framework-components/authoring';
+import type { ColumnTypeDescriptor } from '@prisma-next/framework-components/codec';
 import type { ScalarFieldBuilder, ScalarFieldState } from './contract-dsl';
 
 export type UnionToIntersection<U> = (U extends unknown ? (value: U) => void : never) extends (
@@ -114,9 +115,11 @@ export type FieldBuilderFromPresetDescriptor<
   ConstraintName extends string | undefined = undefined,
 > = ScalarFieldBuilder<
   ScalarFieldState<
-    ResolveTemplateValue<Descriptor['output']['codecId'], Args> extends string
-      ? ResolveTemplateValue<Descriptor['output']['codecId'], Args>
-      : string,
+    ColumnTypeDescriptor<
+      ResolveTemplateValue<Descriptor['output']['codecId'], Args> extends string
+        ? ResolveTemplateValue<Descriptor['output']['codecId'], Args>
+        : string
+    >,
     undefined,
     ResolveTemplateValue<Descriptor['output']['nullable'], Args> extends true ? true : false,
     undefined,

package/src/contract-dsl.ts

@@ -40,7 +40,7 @@ type NamedConstraintNameSpec<Name extends string = string> = {
 };
 
 export type ScalarFieldState<
-  CodecId extends string = string,
+  Descriptor extends ColumnTypeDescriptor = ColumnTypeDescriptor,
   TypeRef extends NamedStorageTypeRef | undefined = undefined,
   Nullable extends boolean = boolean,
   ColumnName extends string | undefined = string | undefined,
@@ -49,7 +49,7 @@ export type ScalarFieldState<
   Many extends boolean = false,
 > = {
   readonly kind: 'scalar';
-  readonly descriptor?: (ColumnTypeDescriptor & { readonly codecId: CodecId }) | undefined;
+  readonly descriptor?: Descriptor | undefined;
   readonly typeRef?: TypeRef | undefined;
   readonly nullable: Nullable;
   readonly columnName?: ColumnName | undefined;
@@ -63,7 +63,7 @@ export type ScalarFieldState<
 
 type AnyScalarFieldState = {
   readonly kind: 'scalar';
-  readonly descriptor?: (ColumnTypeDescriptor & { readonly codecId: string }) | undefined;
+  readonly descriptor?: ColumnTypeDescriptor | undefined;
   readonly typeRef?: NamedStorageTypeRef | undefined;
   readonly nullable: boolean;
   readonly columnName?: string | undefined;
@@ -76,7 +76,7 @@ type AnyScalarFieldState = {
 
 type HasNamedConstraintId<State extends AnyScalarFieldState> =
   State extends ScalarFieldState<
-    string,
+    ColumnTypeDescriptor,
     NamedStorageTypeRef | undefined,
     boolean,
     string | undefined,
@@ -91,7 +91,7 @@ type HasNamedConstraintId<State extends AnyScalarFieldState> =
 
 type HasNamedConstraintUnique<State extends AnyScalarFieldState> =
   State extends ScalarFieldState<
-    string,
+    ColumnTypeDescriptor,
     NamedStorageTypeRef | undefined,
     boolean,
     string | undefined,
@@ -118,7 +118,7 @@ type ApplyFieldSqlSpec<
   Spec extends FieldSqlSpecForState<State>,
 > =
   State extends ScalarFieldState<
-    infer CodecId,
+    infer Descriptor,
     infer TypeRef,
     infer Nullable,
     infer ColumnName,
@@ -127,7 +127,7 @@ type ApplyFieldSqlSpec<
     infer Many
   >
     ? ScalarFieldState<
-        CodecId,
+        Descriptor,
         TypeRef,
         Nullable,
         Spec extends { readonly column: infer NextColumn extends string } ? NextColumn : ColumnName,
@@ -158,7 +158,6 @@ function toColumnDefault(value: ColumnDefaultLiteralInputValue | ColumnDefault):
   return { kind: 'literal', value };
 }
 
-// Chaining methods use `as unknown as <ConditionalType>` because TypeScript cannot narrow generic conditional return types through object spread. The runtime values are correct — the casts bridge the gap between the spread result and the compile-time conditional type that encodes the state transition.
 export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFieldState> {
   declare readonly __state: State;
 
@@ -176,7 +175,7 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
 
   optional(): ScalarFieldBuilder<
     State extends ScalarFieldState<
-      infer CodecId,
+      infer Descriptor,
       infer TypeRef,
       boolean,
       infer ColumnName,
@@ -184,30 +183,35 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer UniqueSpec,
       infer Many
     >
-      ? ScalarFieldState<CodecId, TypeRef, true, ColumnName, IdSpec, UniqueSpec, Many>
+      ? ScalarFieldState<Descriptor, TypeRef, true, ColumnName, IdSpec, UniqueSpec, Many>
       : AnyScalarFieldState
   > {
-    return new ScalarFieldBuilder({
-      ...this.state,
-      nullable: true,
-    } as unknown as State extends ScalarFieldState<
-      infer CodecId,
-      infer TypeRef,
-      boolean,
-      infer ColumnName,
-      infer IdSpec,
-      infer UniqueSpec,
-      infer Many
-    >
-      ? ScalarFieldState<CodecId, TypeRef, true, ColumnName, IdSpec, UniqueSpec, Many>
-      : AnyScalarFieldState);
+    return new ScalarFieldBuilder(
+      blindCast<
+        State extends ScalarFieldState<
+          infer Descriptor,
+          infer TypeRef,
+          boolean,
+          infer ColumnName,
+          infer IdSpec,
+          infer UniqueSpec,
+          infer Many
+        >
+          ? ScalarFieldState<Descriptor, TypeRef, true, ColumnName, IdSpec, UniqueSpec, Many>
+          : AnyScalarFieldState,
+        'object spread does not narrow the generic State conditional; runtime shape is correct'
+      >({
+        ...this.state,
+        nullable: true,
+      }),
+    );
   }
 
   column<ColumnName extends string>(
     name: ColumnName,
   ): ScalarFieldBuilder<
     State extends ScalarFieldState<
-      infer CodecId,
+      infer Descriptor,
       infer TypeRef,
       infer Nullable,
       string | undefined,
@@ -215,28 +219,33 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer UniqueSpec,
       infer Many
     >
-      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, Many>
+      ? ScalarFieldState<Descriptor, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, Many>
       : AnyScalarFieldState
   > {
-    return new ScalarFieldBuilder({
-      ...this.state,
-      columnName: name,
-    } as unknown as State extends ScalarFieldState<
-      infer CodecId,
-      infer TypeRef,
-      infer Nullable,
-      string | undefined,
-      infer IdSpec,
-      infer UniqueSpec,
-      infer Many
-    >
-      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, Many>
-      : AnyScalarFieldState);
+    return new ScalarFieldBuilder(
+      blindCast<
+        State extends ScalarFieldState<
+          infer Descriptor,
+          infer TypeRef,
+          infer Nullable,
+          string | undefined,
+          infer IdSpec,
+          infer UniqueSpec,
+          infer Many
+        >
+          ? ScalarFieldState<Descriptor, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, Many>
+          : AnyScalarFieldState,
+        'object spread does not narrow the generic State conditional; runtime shape is correct'
+      >({
+        ...this.state,
+        columnName: name,
+      }),
+    );
   }
 
   many(): ScalarFieldBuilder<
     State extends ScalarFieldState<
-      infer CodecId,
+      infer Descriptor,
       infer TypeRef,
       infer Nullable,
       infer ColumnName,
@@ -244,13 +253,13 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer UniqueSpec,
       boolean
     >
-      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, true>
+      ? ScalarFieldState<Descriptor, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, true>
       : AnyScalarFieldState
   > {
     return new ScalarFieldBuilder(
       blindCast<
         State extends ScalarFieldState<
-          infer CodecId,
+          infer Descriptor,
           infer TypeRef,
           infer Nullable,
           infer ColumnName,
@@ -258,7 +267,7 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
           infer UniqueSpec,
           boolean
         >
-          ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, true>
+          ? ScalarFieldState<Descriptor, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, true>
           : AnyScalarFieldState,
         'object spread does not narrow the generic State conditional; runtime shape is correct'
       >({
@@ -286,7 +295,7 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
     options?: NamedConstraintSpec<Name>,
   ): ScalarFieldBuilder<
     State extends ScalarFieldState<
-      infer CodecId,
+      infer Descriptor,
       infer TypeRef,
       infer Nullable,
       infer ColumnName,
@@ -295,7 +304,7 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Many
     >
       ? ScalarFieldState<
-          CodecId,
+          Descriptor,
           TypeRef,
           Nullable,
           ColumnName,
@@ -305,35 +314,40 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
         >
       : AnyScalarFieldState
   > {
-    return new ScalarFieldBuilder({
-      ...this.state,
-      id: options?.name ? { name: options.name } : {},
-    } as unknown as State extends ScalarFieldState<
-      infer CodecId,
-      infer TypeRef,
-      infer Nullable,
-      infer ColumnName,
-      NamedConstraintSpec | undefined,
-      infer UniqueSpec,
-      infer Many
-    >
-      ? ScalarFieldState<
-          CodecId,
-          TypeRef,
-          Nullable,
-          ColumnName,
-          NamedConstraintSpec<Name>,
-          UniqueSpec,
-          Many
+    return new ScalarFieldBuilder(
+      blindCast<
+        State extends ScalarFieldState<
+          infer Descriptor,
+          infer TypeRef,
+          infer Nullable,
+          infer ColumnName,
+          NamedConstraintSpec | undefined,
+          infer UniqueSpec,
+          infer Many
         >
-      : AnyScalarFieldState);
+          ? ScalarFieldState<
+              Descriptor,
+              TypeRef,
+              Nullable,
+              ColumnName,
+              NamedConstraintSpec<Name>,
+              UniqueSpec,
+              Many
+            >
+          : AnyScalarFieldState,
+        'object spread does not narrow the generic State conditional; runtime shape is correct'
+      >({
+        ...this.state,
+        id: options?.name ? { name: options.name } : {},
+      }),
+    );
   }
 
   unique<const Name extends string | undefined = undefined>(
     options?: NamedConstraintSpec<Name>,
   ): ScalarFieldBuilder<
     State extends ScalarFieldState<
-      infer CodecId,
+      infer Descriptor,
       infer TypeRef,
       infer Nullable,
       infer ColumnName,
@@ -342,7 +356,7 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Many
     >
       ? ScalarFieldState<
-          CodecId,
+          Descriptor,
           TypeRef,
           Nullable,
           ColumnName,
@@ -352,28 +366,33 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
         >
       : AnyScalarFieldState
   > {
-    return new ScalarFieldBuilder({
-      ...this.state,
-      unique: options?.name ? { name: options.name } : {},
-    } as unknown as State extends ScalarFieldState<
-      infer CodecId,
-      infer TypeRef,
-      infer Nullable,
-      infer ColumnName,
-      infer IdSpec,
-      NamedConstraintSpec | undefined,
-      infer Many
-    >
-      ? ScalarFieldState<
-          CodecId,
-          TypeRef,
-          Nullable,
-          ColumnName,
-          IdSpec,
-          NamedConstraintSpec<Name>,
-          Many
+    return new ScalarFieldBuilder(
+      blindCast<
+        State extends ScalarFieldState<
+          infer Descriptor,
+          infer TypeRef,
+          infer Nullable,
+          infer ColumnName,
+          infer IdSpec,
+          NamedConstraintSpec | undefined,
+          infer Many
         >
-      : AnyScalarFieldState);
+          ? ScalarFieldState<
+              Descriptor,
+              TypeRef,
+              Nullable,
+              ColumnName,
+              IdSpec,
+              NamedConstraintSpec<Name>,
+              Many
+            >
+          : AnyScalarFieldState,
+        'object spread does not narrow the generic State conditional; runtime shape is correct'
+      >({
+        ...this.state,
+        unique: options?.name ? { name: options.name } : {},
+      }),
+    );
   }
 
   sql<const Spec extends FieldSqlSpecForState<State>>(
@@ -391,12 +410,17 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       );
     }
 
-    return new ScalarFieldBuilder({
-      ...this.state,
-      ...(spec.column ? { columnName: spec.column } : {}),
-      ...(idSpec ? { id: { name: idSpec.name } } : {}),
-      ...(uniqueSpec ? { unique: { name: uniqueSpec.name } } : {}),
-    } as unknown as ApplyFieldSqlSpec<State, Spec>);
+    return new ScalarFieldBuilder(
+      blindCast<
+        ApplyFieldSqlSpec<State, Spec>,
+        'conditional object spread does not narrow ApplyFieldSqlSpec; runtime shape is correct'
+      >({
+        ...this.state,
+        ...(spec.column ? { columnName: spec.column } : {}),
+        ...(idSpec ? { id: { name: idSpec.name } } : {}),
+        ...(uniqueSpec ? { unique: { name: uniqueSpec.name } } : {}),
+      }),
+    );
   }
 
   build(): State {
@@ -406,7 +430,12 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
 
 export class EnumScalarFieldBuilder<
   Handle extends EnumTypeHandle,
-  State extends AnyScalarFieldState = ScalarFieldState<Handle['codecId'], Handle, false, undefined>,
+  State extends AnyScalarFieldState = ScalarFieldState<
+    ColumnTypeDescriptor,
+    Handle,
+    false,
+    undefined
+  >,
 > extends ScalarFieldBuilder<State> {
   readonly #handle: Handle;
 
@@ -436,7 +465,7 @@ export class EnumScalarFieldBuilder<
 
 function columnField<Descriptor extends ColumnTypeDescriptor>(
   descriptor: Descriptor,
-): ScalarFieldBuilder<ScalarFieldState<Descriptor['codecId'], undefined, false, undefined>> {
+): ScalarFieldBuilder<ScalarFieldState<Descriptor, undefined, false, undefined>> {
   return new ScalarFieldBuilder({
     kind: 'scalar',
     descriptor,
@@ -446,7 +475,7 @@ function columnField<Descriptor extends ColumnTypeDescriptor>(
 
 function generatedField<Descriptor extends ColumnTypeDescriptor>(
   spec: GeneratedFieldSpec & { readonly type: Descriptor },
-): ScalarFieldBuilder<ScalarFieldState<Descriptor['codecId'], undefined, false, undefined>> {
+): ScalarFieldBuilder<ScalarFieldState<Descriptor, undefined, false, undefined>> {
   return new ScalarFieldBuilder({
     kind: 'scalar',
     descriptor: {
@@ -460,10 +489,12 @@ function generatedField<Descriptor extends ColumnTypeDescriptor>(
 
 function namedTypeField<TypeRef extends string>(
   typeRef: TypeRef,
-): ScalarFieldBuilder<ScalarFieldState<string, TypeRef, false, undefined>>;
+): ScalarFieldBuilder<ScalarFieldState<ColumnTypeDescriptor, TypeRef, false, undefined>>;
 function namedTypeField<TypeRef extends StorageTypeInstance>(
   typeRef: TypeRef,
-): ScalarFieldBuilder<ScalarFieldState<TypeRef['codecId'], TypeRef, false, undefined>>;
+): ScalarFieldBuilder<
+  ScalarFieldState<ColumnTypeDescriptor<TypeRef['codecId']>, TypeRef, false, undefined>
+>;
 function namedTypeField<Handle extends EnumTypeHandle>(
   typeRef: Handle,
 ): EnumScalarFieldBuilder<Handle>;
@@ -471,7 +502,7 @@ function namedTypeField(typeRef: NamedStorageTypeRef): ScalarFieldBuilder {
   if (isEnumTypeHandle(typeRef)) {
     return new EnumScalarFieldBuilder(
       blindCast<
-        ScalarFieldState<string, typeof typeRef, false, undefined>,
+        ScalarFieldState<ColumnTypeDescriptor, typeof typeRef, false, undefined>,
         'literal object lacks explicit many; cast to the full ScalarFieldState so optional() conditional resolves Many = false'
       >({
         kind: 'scalar',

package/src/contract-types.ts

@@ -695,6 +695,31 @@ type EnumValueUnion<FieldState> = [FieldTypeRefOf<FieldState>] extends [
     : Values[number]
   : never;
 
+// The member-value literal tuple carried on a descriptor's `entityRef.entity`
+// (e.g. a target's native-enum entity), or `never` when the descriptor has no
+// entityRef, its entity has no `members`, or `members` is widened to
+// `readonly string[]` — this is checked with non-optional property shapes so
+// a descriptor genuinely lacking `entityRef` fails the structural match
+// instead of matching vacuously through the framework type's optional slot.
+type DescriptorEntityMembers<Descriptor> = Descriptor extends {
+  readonly entityRef: {
+    readonly entity: { readonly members: infer Members extends readonly string[] };
+  };
+}
+  ? Members
+  : never;
+
+// The value-set member union for a descriptor-carried entity (the type-level
+// mirror of the runtime's generic `deriveValueSetFromEntity` fold), or
+// `never` for a field with no descriptor, a descriptor with no entityRef.entity,
+// or a widened (non-literal) members tuple — mirroring `EnumValueUnion`'s
+// erasure guard.
+type DescriptorValueSetUnion<FieldState> = [FieldDescriptorOf<FieldState>] extends [never]
+  ? never
+  : readonly string[] extends DescriptorEntityMembers<FieldDescriptorOf<FieldState>>
+    ? never
+    : DescriptorEntityMembers<FieldDescriptorOf<FieldState>>[number];
+
 // The codec's `output` / `input` JS type for a field's column, before
 // nullability. `unknown` when the codec is not in the definition's codec map.
 type CodecChannelType<
@@ -711,19 +736,27 @@ type CodecChannelType<
     : unknown
   : unknown;
 
-// A field's read/write JS type: the enum value union when the field is
-// enum-typed, otherwise the codec channel type, with column nullability applied.
+// The literal value union for a field: the enum-typed union takes precedence
+// (matching today's behavior), falling back to the descriptor-carried
+// value-set union; `never` when neither applies.
+type FieldValueUnion<FieldState> = [EnumValueUnion<FieldState>] extends [never]
+  ? DescriptorValueSetUnion<FieldState>
+  : EnumValueUnion<FieldState>;
+
+// A field's read/write JS type: the value union (enum or descriptor value-set)
+// when the field carries one, otherwise the codec channel type, with column
+// nullability applied.
 type FieldChannelType<
   Definition,
   ModelName extends ModelNames<Definition>,
   FieldName extends ModelFieldNames<Definition, ModelName>,
   Channel extends 'output' | 'input',
 > =
-  | ([EnumValueUnion<ModelFieldState<Definition, ModelName, FieldName>>] extends [never]
+  | ([FieldValueUnion<ModelFieldState<Definition, ModelName, FieldName>>] extends [never]
       ? CodecChannelType<Definition, ModelName, FieldName, Channel>
       : StorageColumnManyOf<ModelStorageColumn<Definition, ModelName, FieldName>> extends true
-        ? ReadonlyArray<EnumValueUnion<ModelFieldState<Definition, ModelName, FieldName>>>
-        : EnumValueUnion<ModelFieldState<Definition, ModelName, FieldName>>)
+        ? ReadonlyArray<FieldValueUnion<ModelFieldState<Definition, ModelName, FieldName>>>
+        : FieldValueUnion<ModelFieldState<Definition, ModelName, FieldName>>)
   | (FieldNullableOf<ModelFieldState<Definition, ModelName, FieldName>> extends true
       ? null
       : never);