@prisma-next/sql-contract-ts 0.14.0-dev.2 → 0.14.0-dev.20

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@prisma-next/sql-contract-ts",
-  "version": "0.14.0-dev.2",
+  "version": "0.14.0-dev.20",
   "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.2",
-    "@prisma-next/contract": "0.14.0-dev.2",
-    "@prisma-next/contract-authoring": "0.14.0-dev.2",
-    "@prisma-next/framework-components": "0.14.0-dev.2",
-    "@prisma-next/sql-contract": "0.14.0-dev.2",
-    "@prisma-next/utils": "0.14.0-dev.2",
+    "@prisma-next/config": "0.14.0-dev.20",
+    "@prisma-next/contract": "0.14.0-dev.20",
+    "@prisma-next/contract-authoring": "0.14.0-dev.20",
+    "@prisma-next/framework-components": "0.14.0-dev.20",
+    "@prisma-next/sql-contract": "0.14.0-dev.20",
+    "@prisma-next/utils": "0.14.0-dev.20",
     "arktype": "^2.2.0",
     "pathe": "^2.0.3",
     "ts-toolbelt": "^9.6.0"
   },
   "devDependencies": {
-    "@prisma-next/test-utils": "0.14.0-dev.2",
-    "@prisma-next/tsconfig": "0.14.0-dev.2",
+    "@prisma-next/test-utils": "0.14.0-dev.20",
+    "@prisma-next/tsconfig": "0.14.0-dev.20",
     "@types/pg": "8.20.0",
     "pg": "8.21.0",
-    "@prisma-next/tsdown": "0.14.0-dev.2",
+    "@prisma-next/tsdown": "0.14.0-dev.20",
     "tsdown": "0.22.1",
     "typescript": "5.9.3",
     "vitest": "4.1.8"

package/src/config-types.ts

@@ -31,6 +31,7 @@ export function emptyContract(options: {
 }): ContractConfig {
   return {
     source: {
+      sourceFormat: 'typescript',
       load: async () => {
         const built = buildSqlContractFromDefinition({ target: options.target, models: [] });
         return ok(applySpecifierDefaultControlPolicy(built, options.defaultControlPolicy));
@@ -47,6 +48,7 @@ export function typescriptContract(
 ): ContractConfig {
   return {
     source: {
+      sourceFormat: 'typescript',
       load: async () =>
         ok(applySpecifierDefaultControlPolicy(contract, options?.defaultControlPolicy)),
     },
@@ -63,6 +65,7 @@ export function typescriptContractFromPath(
 ): ContractConfig {
   return {
     source: {
+      sourceFormat: 'typescript',
       inputs: [contractPath],
       load: async (context) => {
         const [absolutePath] = context.resolvedInputs;

package/src/contract-dsl.ts

@@ -43,6 +43,7 @@ export type ScalarFieldState<
   ColumnName extends string | undefined = string | undefined,
   IdSpec extends NamedConstraintSpec | undefined = undefined,
   UniqueSpec extends NamedConstraintSpec | undefined = undefined,
+  Many extends boolean = false,
 > = {
   readonly kind: 'scalar';
   readonly descriptor?: (ColumnTypeDescriptor & { readonly codecId: CodecId }) | undefined;
@@ -51,6 +52,7 @@ export type ScalarFieldState<
   readonly columnName?: ColumnName | undefined;
   readonly default?: ColumnDefault | undefined;
   readonly executionDefaults?: ExecutionMutationDefaultPhases | undefined;
+  readonly many?: Many extends true ? true : undefined;
 } & (IdSpec extends NamedConstraintSpec ? { readonly id: IdSpec } : { readonly id?: undefined }) &
   (UniqueSpec extends NamedConstraintSpec
     ? { readonly unique: UniqueSpec }
@@ -64,6 +66,7 @@ type AnyScalarFieldState = {
   readonly columnName?: string | undefined;
   readonly default?: ColumnDefault | undefined;
   readonly executionDefaults?: ExecutionMutationDefaultPhases | undefined;
+  readonly many?: boolean | undefined;
   readonly id?: NamedConstraintSpec | undefined;
   readonly unique?: NamedConstraintSpec | undefined;
 };
@@ -75,7 +78,8 @@ type HasNamedConstraintId<State extends AnyScalarFieldState> =
     boolean,
     string | undefined,
     infer IdSpec,
-    NamedConstraintSpec | undefined
+    NamedConstraintSpec | undefined,
+    boolean
   >
     ? IdSpec extends NamedConstraintSpec
       ? true
@@ -89,7 +93,8 @@ type HasNamedConstraintUnique<State extends AnyScalarFieldState> =
     boolean,
     string | undefined,
     NamedConstraintSpec | undefined,
-    infer UniqueSpec
+    infer UniqueSpec,
+    boolean
   >
     ? UniqueSpec extends NamedConstraintSpec
       ? true
@@ -115,7 +120,8 @@ type ApplyFieldSqlSpec<
     infer Nullable,
     infer ColumnName,
     infer IdSpec,
-    infer UniqueSpec
+    infer UniqueSpec,
+    infer Many
   >
     ? ScalarFieldState<
         CodecId,
@@ -131,9 +137,10 @@ type ApplyFieldSqlSpec<
           ? UniqueSpec extends NamedConstraintSpec
             ? NamedConstraintSpec<UniqueName>
             : UniqueSpec
-          : UniqueSpec
+          : UniqueSpec,
+        Many
       >
-    : never;
+    : AnyScalarFieldState;
 
 export type GeneratedFieldSpec = {
   readonly type: ColumnTypeDescriptor;
@@ -171,10 +178,11 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       boolean,
       infer ColumnName,
       infer IdSpec,
-      infer UniqueSpec
+      infer UniqueSpec,
+      infer Many
     >
-      ? ScalarFieldState<CodecId, TypeRef, true, ColumnName, IdSpec, UniqueSpec>
-      : never
+      ? ScalarFieldState<CodecId, TypeRef, true, ColumnName, IdSpec, UniqueSpec, Many>
+      : AnyScalarFieldState
   > {
     return new ScalarFieldBuilder({
       ...this.state,
@@ -185,10 +193,11 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       boolean,
       infer ColumnName,
       infer IdSpec,
-      infer UniqueSpec
+      infer UniqueSpec,
+      infer Many
     >
-      ? ScalarFieldState<CodecId, TypeRef, true, ColumnName, IdSpec, UniqueSpec>
-      : never);
+      ? ScalarFieldState<CodecId, TypeRef, true, ColumnName, IdSpec, UniqueSpec, Many>
+      : AnyScalarFieldState);
   }
 
   column<ColumnName extends string>(
@@ -200,10 +209,11 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Nullable,
       string | undefined,
       infer IdSpec,
-      infer UniqueSpec
+      infer UniqueSpec,
+      infer Many
     >
-      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec>
-      : never
+      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, Many>
+      : AnyScalarFieldState
   > {
     return new ScalarFieldBuilder({
       ...this.state,
@@ -214,10 +224,45 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Nullable,
       string | undefined,
       infer IdSpec,
-      infer UniqueSpec
+      infer UniqueSpec,
+      infer Many
+    >
+      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, Many>
+      : AnyScalarFieldState);
+  }
+
+  many(): ScalarFieldBuilder<
+    State extends ScalarFieldState<
+      infer CodecId,
+      infer TypeRef,
+      infer Nullable,
+      infer ColumnName,
+      infer IdSpec,
+      infer UniqueSpec,
+      boolean
     >
-      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec>
-      : never);
+      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, true>
+      : AnyScalarFieldState
+  > {
+    return new ScalarFieldBuilder(
+      blindCast<
+        State extends ScalarFieldState<
+          infer CodecId,
+          infer TypeRef,
+          infer Nullable,
+          infer ColumnName,
+          infer IdSpec,
+          infer UniqueSpec,
+          boolean
+        >
+          ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, UniqueSpec, true>
+          : AnyScalarFieldState,
+        'object spread does not narrow the generic State conditional; runtime shape is correct'
+      >({
+        ...this.state,
+        many: true,
+      }),
+    );
   }
 
   default(value: ColumnDefaultLiteralInputValue | ColumnDefault): ScalarFieldBuilder<State> {
@@ -243,7 +288,8 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Nullable,
       infer ColumnName,
       NamedConstraintSpec | undefined,
-      infer UniqueSpec
+      infer UniqueSpec,
+      infer Many
     >
       ? ScalarFieldState<
           CodecId,
@@ -251,9 +297,10 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
           Nullable,
           ColumnName,
           NamedConstraintSpec<Name>,
-          UniqueSpec
+          UniqueSpec,
+          Many
         >
-      : never
+      : AnyScalarFieldState
   > {
     return new ScalarFieldBuilder({
       ...this.state,
@@ -264,7 +311,8 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Nullable,
       infer ColumnName,
       NamedConstraintSpec | undefined,
-      infer UniqueSpec
+      infer UniqueSpec,
+      infer Many
     >
       ? ScalarFieldState<
           CodecId,
@@ -272,9 +320,10 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
           Nullable,
           ColumnName,
           NamedConstraintSpec<Name>,
-          UniqueSpec
+          UniqueSpec,
+          Many
         >
-      : never);
+      : AnyScalarFieldState);
   }
 
   unique<const Name extends string | undefined = undefined>(
@@ -286,10 +335,19 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Nullable,
       infer ColumnName,
       infer IdSpec,
-      NamedConstraintSpec | undefined
+      NamedConstraintSpec | undefined,
+      infer Many
     >
-      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, NamedConstraintSpec<Name>>
-      : never
+      ? ScalarFieldState<
+          CodecId,
+          TypeRef,
+          Nullable,
+          ColumnName,
+          IdSpec,
+          NamedConstraintSpec<Name>,
+          Many
+        >
+      : AnyScalarFieldState
   > {
     return new ScalarFieldBuilder({
       ...this.state,
@@ -300,10 +358,19 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Nullable,
       infer ColumnName,
       infer IdSpec,
-      NamedConstraintSpec | undefined
+      NamedConstraintSpec | undefined,
+      infer Many
     >
-      ? ScalarFieldState<CodecId, TypeRef, Nullable, ColumnName, IdSpec, NamedConstraintSpec<Name>>
-      : never);
+      ? ScalarFieldState<
+          CodecId,
+          TypeRef,
+          Nullable,
+          ColumnName,
+          IdSpec,
+          NamedConstraintSpec<Name>,
+          Many
+        >
+      : AnyScalarFieldState);
   }
 
   sql<const Spec extends FieldSqlSpecForState<State>>(
@@ -400,11 +467,14 @@ function namedTypeField<Handle extends EnumTypeHandle>(
 function namedTypeField(typeRef: NamedStorageTypeRef): ScalarFieldBuilder {
   if (isEnumTypeHandle(typeRef)) {
     return new EnumScalarFieldBuilder(
-      {
+      blindCast<
+        ScalarFieldState<string, typeof typeRef, false, undefined>,
+        'literal object lacks explicit many; cast to the full ScalarFieldState so optional() conditional resolves Many = false'
+      >({
         kind: 'scalar',
         typeRef,
         nullable: false,
-      },
+      }),
       typeRef,
     );
   }

package/src/contract-lowering.ts

@@ -727,6 +727,7 @@ function resolveModelNode(
       columnName,
       descriptor,
       nullable: fieldState.nullable,
+      ...(fieldState.many === true ? { many: true } : {}),
       ...(fieldState.default ? { default: fieldState.default } : {}),
       ...(fieldState.executionDefaults ? { executionDefaults: fieldState.executionDefaults } : {}),
       ...(enumHandle !== undefined ? { enumTypeHandle: enumHandle } : {}),

package/src/contract-types.ts

@@ -21,10 +21,10 @@ import type { UnionToIntersection } from './authoring-type-utils';
 import type { AttributeStageIdFieldNames, FieldStateOf, ScalarFieldBuilder } from './contract-dsl';
 import type { EnumTypeHandle } from './enum-type';
 
-export type ExtractCodecTypesFromPack<P> = P extends { __codecTypes?: infer C }
-  ? C extends Record<string, { output: unknown }>
-    ? C
-    : Record<string, never>
+export type ExtractCodecTypesFromPack<P> = P extends {
+  __codecTypes?: infer C extends Record<string, { output: unknown }>;
+}
+  ? C
   : Record<string, never>;
 
 export type MergeExtensionCodecTypes<Packs extends Record<string, unknown>> = UnionToIntersection<
@@ -279,6 +279,8 @@ type FieldNullableOf<FieldState> = FieldState extends {
   ? Nullable
   : boolean;
 
+type FieldManyOf<FieldState> = FieldState extends { readonly many?: true } ? true : false;
+
 type FieldColumnOverrideOf<FieldState> = Present<
   FieldState extends { readonly columnName?: infer ColumnName } ? ColumnName : never
 >;
@@ -471,15 +473,17 @@ type StorageColumn<
   NativeType extends string,
   TypeRef extends string | undefined = undefined,
   TypeParams extends Record<string, unknown> | undefined = undefined,
+  Many extends boolean = false,
 > = {
   readonly nativeType: NativeType;
   readonly codecId: CodecId;
   readonly nullable: Nullable;
   readonly default?: ColumnDefault;
-} & (TypeRef extends string ? { readonly typeRef: TypeRef } : Record<string, never>) &
+} & (TypeRef extends string ? { readonly typeRef: TypeRef } : Record<never, never>) &
   (TypeParams extends Record<string, unknown>
     ? { readonly typeParams: TypeParams }
-    : Record<string, never>);
+    : Record<never, never>) &
+  (Many extends true ? { readonly many: true } : Record<never, never>);
 
 type ModelStorageColumn<
   Definition,
@@ -496,7 +500,8 @@ type ModelStorageColumn<
           ResolveFieldDescriptor<Definition, ModelFieldState<Definition, ModelName, FieldName>>
         >,
         ResolveFieldColumnTypeRef<Definition, ModelFieldState<Definition, ModelName, FieldName>>,
-        ResolveFieldColumnTypeParams<Definition, ModelFieldState<Definition, ModelName, FieldName>>
+        ResolveFieldColumnTypeParams<Definition, ModelFieldState<Definition, ModelName, FieldName>>,
+        FieldManyOf<ModelFieldState<Definition, ModelName, FieldName>>
       >
     : never;
 
@@ -677,6 +682,8 @@ type BuiltStorage<Definition> = {
   };
 };
 
+type StorageColumnManyOf<Col> = Col extends { readonly many: true } ? true : false;
+
 // The enum value union for an enum-typed field, or `never` for a non-enum
 // field. The field's `typeRef` carries the authored `EnumTypeHandle`, whose
 // `Values` tuple preserves the literal member values (text or numeric).
@@ -698,7 +705,9 @@ type CodecChannelType<
 > = ModelStorageColumn<Definition, ModelName, FieldName>['codecId'] extends infer Id extends
   keyof CodecTypesFromDefinition<Definition>
   ? CodecTypesFromDefinition<Definition>[Id] extends { readonly [K in Channel]: infer T }
-    ? T
+    ? StorageColumnManyOf<ModelStorageColumn<Definition, ModelName, FieldName>> extends true
+      ? ReadonlyArray<T>
+      : T
     : unknown
   : unknown;
 
@@ -712,7 +721,9 @@ type FieldChannelType<
 > =
   | ([EnumValueUnion<ModelFieldState<Definition, ModelName, FieldName>>] extends [never]
       ? CodecChannelType<Definition, ModelName, FieldName, Channel>
-      : EnumValueUnion<ModelFieldState<Definition, ModelName, FieldName>>)
+      : StorageColumnManyOf<ModelStorageColumn<Definition, ModelName, FieldName>> extends true
+        ? ReadonlyArray<EnumValueUnion<ModelFieldState<Definition, ModelName, FieldName>>>
+        : EnumValueUnion<ModelFieldState<Definition, ModelName, FieldName>>)
   | (FieldNullableOf<ModelFieldState<Definition, ModelName, FieldName>> extends true
       ? null
       : never);
@@ -735,6 +746,17 @@ type FieldChannelTypes<Definition, Channel extends 'output' | 'input'> = {
   };
 };
 
+type StorageColumnChannelTypes<Definition, Channel extends 'output' | 'input'> = {
+  readonly [Ns in DefaultStorageNamespaceId<Definition>]: {
+    readonly [ModelName in ModelNames<Definition> as BuiltModelTableName<Definition, ModelName>]: {
+      readonly [FieldName in ModelFieldNames<Definition, ModelName> as BuiltModelColumnMappings<
+        Definition,
+        ModelName
+      >[FieldName]['column']]: FieldChannelType<Definition, ModelName, FieldName, Channel>;
+    };
+  };
+};
+
 export type SqlContractResult<Definition> = ContractWithTypeMaps<
   Omit<Contract<BuiltStorage<Definition>>, 'domain'> & {
     readonly target: DefinitionTargetId<Definition>;
@@ -754,6 +776,8 @@ export type SqlContractResult<Definition> = ContractWithTypeMaps<
     CodecTypesFromDefinition<Definition>,
     Record<string, never>,
     FieldChannelTypes<Definition, 'output'>,
-    FieldChannelTypes<Definition, 'input'>
+    FieldChannelTypes<Definition, 'input'>,
+    StorageColumnChannelTypes<Definition, 'output'>,
+    StorageColumnChannelTypes<Definition, 'input'>
   >
 >;