@prisma-next/sql-contract-ts 0.14.0-dev.5 → 0.14.0-dev.50

package/package.json

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

package/src/authoring-helper-runtime.ts

@@ -63,7 +63,7 @@ export function createTypeHelpersFromNamespace(
       continue;
     }
 
-    helpers[key] = createTypeHelpersFromNamespace(value as AuthoringTypeNamespace, currentPath);
+    helpers[key] = createTypeHelpersFromNamespace(value, currentPath);
   }
 
   return helpers;
@@ -133,11 +133,7 @@ export function createFieldHelpersFromNamespace(
       continue;
     }
 
-    helpers[key] = createFieldHelpersFromNamespace(
-      value as AuthoringFieldNamespace,
-      createLeafHelper,
-      currentPath,
-    );
+    helpers[key] = createFieldHelpersFromNamespace(value, createLeafHelper, currentPath);
   }
 
   return helpers;

package/src/build-contract.ts

@@ -33,9 +33,8 @@ import {
 } from '@prisma-next/sql-contract/index-types';
 import {
   applyFkDefaults,
-  buildSqlNamespace,
   type CheckConstraintInput,
-  type SqlNamespaceTablesInput,
+  type SqlNamespaceInput,
   SqlStorage,
   type SqlStorageInput,
   type StorageColumn,
@@ -74,10 +73,23 @@ function encodeColumnDefault(
   defaultInput: ColumnDefault,
   codecId: string,
   codecLookup?: CodecLookup,
+  many = false,
 ): ColumnDefault {
   if (defaultInput.kind === 'function') {
     return { kind: 'function', expression: defaultInput.expression };
   }
+  if (many) {
+    if (!Array.isArray(defaultInput.value)) {
+      throw new Error(
+        `Literal default on a list column must be an array; received ${typeof defaultInput.value}. ` +
+          'A scalar default on a list field must be rejected at the authoring surface.',
+      );
+    }
+    return {
+      kind: 'literal',
+      value: defaultInput.value.map((element) => encodeViaCodec(element, codecId, codecLookup)),
+    };
+  }
   return {
     kind: 'literal',
     value: encodeViaCodec(defaultInput.value, codecId, codecLookup),
@@ -235,28 +247,28 @@ function buildStorageColumn(
     };
   }
 
-  if (field.many) {
-    return {
-      nativeType: JSONB_NATIVE_TYPE,
-      codecId: JSONB_CODEC_ID,
-      nullable: field.nullable,
-    };
-  }
-
   const codecId = field.descriptor.codecId;
   const encodedDefault =
     field.default !== undefined
-      ? encodeColumnDefault(field.default, codecId, codecLookup)
+      ? encodeColumnDefault(field.default, codecId, codecLookup, field.many === true)
       : undefined;
 
+  // `storageValueSetRef` (derived from an `enumTypeHandle`) takes precedence
+  // when present — the established domain-enum path. `field.descriptor.valueSet`
+  // is the fallback: set by an entity-ref type constructor (e.g. `pg.enum(Ref)`)
+  // that resolved the field's type against a value-set-deriving entity with no
+  // domain enum involved. A field carries at most one of the two in practice.
+  const valueSet = storageValueSetRef ?? field.descriptor.valueSet;
+
   return {
     nativeType: field.descriptor.nativeType,
     codecId,
     nullable: field.nullable,
+    ...(field.many ? { many: true as const } : {}),
     ...ifDefined('typeParams', field.descriptor.typeParams),
     ...ifDefined('default', encodedDefault),
     ...ifDefined('typeRef', field.descriptor.typeRef),
-    ...ifDefined('valueSet', storageValueSetRef),
+    ...ifDefined('valueSet', valueSet),
   };
 }
 
@@ -308,18 +320,15 @@ function ensureUnboundNamespaceSlot(
   if (Object.hasOwn(namespaces, UNBOUND_NAMESPACE_ID)) {
     return namespaces;
   }
-  const unboundInput: SqlNamespaceTablesInput = {
+  const unboundInput: SqlNamespaceInput = {
     id: UNBOUND_NAMESPACE_ID,
     entries: { table: {} },
   };
-  const unbound = createNamespace ? createNamespace(unboundInput) : buildSqlNamespace(unboundInput);
-  return blindCast<
-    SqlStorageInput['namespaces'],
-    'createNamespace may return a target namespace concretion; the unbound slot matches SqlNamespace at runtime'
-  >({
+  const unbound = createNamespace(unboundInput);
+  return {
     [UNBOUND_NAMESPACE_ID]: unbound,
     ...namespaces,
-  });
+  };
 }
 
 export function buildSqlContractFromDefinition(
@@ -375,6 +384,7 @@ export function buildSqlContractFromDefinition(
     const fieldToColumn: Record<string, string> = {};
     const domainFields: Record<string, ContractField> = {};
     const domainFieldRefs: Record<string, DomainFieldRef> = {};
+    const checksForTable: CheckConstraintInput[] = [];
 
     for (const field of semanticModel.fields) {
       const executionDefaultPhases =
@@ -421,6 +431,25 @@ export function buildSqlContractFromDefinition(
       columns[field.columnName] = column;
       fieldToColumn[field.fieldName] = field.columnName;
 
+      // A domain enum (`storageValueSetRef`, from an `enumType()` handle) is
+      // stored as a plain scalar column (`text`, `int4`, …) with no native
+      // type of its own to enforce membership, so it needs an explicit
+      // CHECK — scalar or array, since a `text[]` array has no element-level
+      // enforcement either. A value set resolved by an entity-ref type
+      // constructor (`field.descriptor.valueSet`, e.g. `pg.enum(Ref)`) binds
+      // the column to a codec/native-type pairing that IS the storage-level
+      // enforcement (a Postgres native enum type, or another target's
+      // equivalent) — including array columns, since the target enforces
+      // membership on every element of a native-typed array — so no CHECK
+      // for those.
+      if (column.valueSet !== undefined && storageValueSetRef !== undefined) {
+        checksForTable.push({
+          name: `${tableName}_${field.columnName}_check`,
+          column: field.columnName,
+          valueSet: column.valueSet,
+        });
+      }
+
       domainFields[field.fieldName] = buildDomainField(field, column, domainValueSetRef);
 
       if (isValueObjectField(field)) {
@@ -511,15 +540,6 @@ export function buildSqlContractFromDefinition(
     // materialised onto the base `ModelNode`, so the variant builds a domain
     // model (below) but no storage table of its own.
     if (!semanticModel.sharesBaseTable) {
-      const checksForTable: CheckConstraintInput[] = Object.entries(columns).flatMap(
-        ([columnName, col]) => {
-          const valueSet = col.valueSet;
-          return valueSet === undefined
-            ? []
-            : [{ name: `${tableName}_${columnName}_check`, column: columnName, valueSet }];
-        },
-      );
-
       const tableInput: StorageTableInput = {
         columns,
         ...ifDefined('control', semanticModel.control),
@@ -729,25 +749,20 @@ export function buildSqlContractFromDefinition(
   }
 
   const { createNamespace } = definition;
-  const namespaces = blindCast<
-    SqlStorageInput['namespaces'],
-    'contract authoring materialises each namespace coordinate from the model set and explicit namespace list'
-  >(
-    Object.fromEntries(
-      [...namespaceCoordinateIds].sort().map((id) => {
-        const valueSetEntries = storageValueSetsByNs[id];
-        const nsInput: SqlNamespaceTablesInput = {
-          id,
-          entries: {
-            table: tablesByNamespace[id] ?? {},
-            ...(valueSetEntries !== undefined && Object.keys(valueSetEntries).length > 0
-              ? { valueSet: valueSetEntries }
-              : {}),
-          },
-        };
-        return [id, createNamespace ? createNamespace(nsInput) : buildSqlNamespace(nsInput)];
-      }),
-    ),
+  const namespaces: SqlStorageInput['namespaces'] = Object.fromEntries(
+    [...namespaceCoordinateIds].sort().map((id) => {
+      const valueSetEntries = storageValueSetsByNs[id];
+      const nsInput: SqlNamespaceInput = {
+        id,
+        entries: {
+          table: tablesByNamespace[id] ?? {},
+          ...(valueSetEntries !== undefined && Object.keys(valueSetEntries).length > 0
+            ? { valueSet: valueSetEntries }
+            : {}),
+        },
+      };
+      return [id, createNamespace(nsInput)];
+    }),
   );
   const storageWithoutHash = {
     ...(Object.keys(documentTypes).length > 0 ? { types: documentTypes } : {}),

package/src/composed-authoring-helpers.ts

@@ -13,9 +13,6 @@ import type {
 } from '@prisma-next/framework-components/authoring';
 import {
   assertNoCrossRegistryCollisions,
-  isAuthoringEntityTypeDescriptor,
-  isAuthoringFieldPresetDescriptor,
-  isAuthoringTypeConstructorDescriptor,
   mergeAuthoringNamespaces,
 } from '@prisma-next/framework-components/authoring';
 import type {
@@ -183,7 +180,7 @@ function composeTypeNamespace(components: readonly AuthoringComponent[]): Author
   for (const component of components) {
     const ns = extractTypeNamespace(component);
     if (Object.keys(ns).length > 0) {
-      mergeAuthoringNamespaces(merged, ns, [], isAuthoringTypeConstructorDescriptor, 'type');
+      mergeAuthoringNamespaces(merged, ns, [], 'typeConstructor', 'type');
     }
   }
   return merged as AuthoringTypeNamespace;
@@ -194,7 +191,7 @@ function composeFieldNamespace(components: readonly AuthoringComponent[]): Autho
   for (const component of components) {
     const ns = extractFieldNamespace(component);
     if (Object.keys(ns).length > 0) {
-      mergeAuthoringNamespaces(merged, ns, [], isAuthoringFieldPresetDescriptor, 'field');
+      mergeAuthoringNamespaces(merged, ns, [], 'fieldPreset', 'field');
     }
   }
   return merged as AuthoringFieldNamespace;
@@ -207,7 +204,7 @@ function composeEntityNamespace(
   for (const component of components) {
     const ns = extractEntitiesNamespace(component);
     if (Object.keys(ns).length > 0) {
-      mergeAuthoringNamespaces(merged, ns, [], isAuthoringEntityTypeDescriptor, 'entity');
+      mergeAuthoringNamespaces(merged, ns, [], 'entity', 'entity');
     }
   }
   return merged as AuthoringEntityTypeNamespace;

package/src/config-types.ts

@@ -3,6 +3,7 @@ import type { ContractConfig } from '@prisma-next/config/config-types';
 import { applySpecifierDefaultControlPolicy } from '@prisma-next/contract/apply-specifier-default-control-policy';
 import type { Contract, ControlPolicy } from '@prisma-next/contract/types';
 import type { TargetPackRef } from '@prisma-next/framework-components/components';
+import type { SqlNamespaceBase, SqlNamespaceInput } from '@prisma-next/sql-contract/types';
 import { ifDefined } from '@prisma-next/utils/defined';
 import { ok } from '@prisma-next/utils/result';
 import { extname } from 'pathe';
@@ -27,13 +28,18 @@ export interface TypeScriptContractSpecifierOptions {
 export function emptyContract(options: {
   readonly output?: string;
   readonly target: TargetPackRef<'sql', string>;
+  readonly createNamespace: (input: SqlNamespaceInput) => SqlNamespaceBase;
   readonly defaultControlPolicy?: ControlPolicy;
 }): ContractConfig {
   return {
     source: {
       sourceFormat: 'typescript',
       load: async () => {
-        const built = buildSqlContractFromDefinition({ target: options.target, models: [] });
+        const built = buildSqlContractFromDefinition({
+          target: options.target,
+          createNamespace: options.createNamespace,
+          models: [],
+        });
         return ok(applySpecifierDefaultControlPolicy(built, options.defaultControlPolicy));
       },
     },

package/src/contract-builder.ts

@@ -6,8 +6,11 @@ import type {
   FamilyPackRef,
   TargetPackRef,
 } from '@prisma-next/framework-components/components';
-import type { Namespace } from '@prisma-next/framework-components/ir';
-import type { SqlNamespaceTablesInput, StorageTypeInstance } from '@prisma-next/sql-contract/types';
+import type {
+  SqlNamespaceBase,
+  SqlNamespaceInput,
+  StorageTypeInstance,
+} from '@prisma-next/sql-contract/types';
 import { blindCast } from '@prisma-next/utils/casts';
 import { ifDefined } from '@prisma-next/utils/defined';
 import { buildSqlContractFromDefinition } from './build-contract';
@@ -68,7 +71,7 @@ type ContractDefinition<
   readonly foreignKeyDefaults?: ForeignKeyDefaults;
   readonly defaultControlPolicy?: ControlPolicy;
   readonly namespaces?: Namespaces;
-  readonly createNamespace?: (input: SqlNamespaceTablesInput) => Namespace;
+  readonly createNamespace: (input: SqlNamespaceInput) => SqlNamespaceBase;
   readonly types?: Types;
   readonly models?: Models;
   readonly codecLookup?: CodecLookup;
@@ -93,7 +96,7 @@ type ContractScaffold<
   readonly foreignKeyDefaults?: ForeignKeyDefaults;
   readonly defaultControlPolicy?: ControlPolicy;
   readonly namespaces?: Namespaces;
-  readonly createNamespace?: (input: SqlNamespaceTablesInput) => Namespace;
+  readonly createNamespace: (input: SqlNamespaceInput) => SqlNamespaceBase;
   readonly types?: never;
   readonly models?: never;
   readonly codecLookup?: CodecLookup;
@@ -314,7 +317,7 @@ type BoundDefinitionInput<
   readonly foreignKeyDefaults?: ForeignKeyDefaults;
   readonly defaultControlPolicy?: ControlPolicy;
   readonly namespaces?: Namespaces;
-  readonly createNamespace?: (input: SqlNamespaceTablesInput) => Namespace;
+  readonly createNamespace: (input: SqlNamespaceInput) => SqlNamespaceBase;
   readonly types?: Types;
   readonly models?: Models;
   readonly codecLookup?: CodecLookup;

package/src/contract-definition.ts

@@ -6,10 +6,10 @@ import type {
 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 { Namespace } from '@prisma-next/framework-components/ir';
 import type {
   ReferentialAction,
-  SqlNamespaceTablesInput,
+  SqlNamespaceBase,
+  SqlNamespaceInput,
   StorageTypeInstance,
 } from '@prisma-next/sql-contract/types';
 import type { EnumTypeHandle } from './enum-type';
@@ -175,8 +175,8 @@ export interface ContractDefinition {
    * `SqlStorage.namespaces` together with `createNamespace`.
    */
   readonly namespaces?: readonly string[];
-  /** Target-supplied factory that materialises a `Namespace` concretion for a declared namespace coordinate. */
-  readonly createNamespace?: (input: SqlNamespaceTablesInput) => Namespace;
+  /** Target-supplied factory that materialises a `SqlNamespaceBase` concretion for a declared namespace coordinate. */
+  readonly createNamespace: (input: SqlNamespaceInput) => SqlNamespaceBase;
   readonly models: readonly ModelNode[];
   readonly valueObjects?: readonly ValueObjectNode[];
   /**

package/src/contract-dsl.ts

@@ -15,8 +15,11 @@ import type {
   FamilyPackRef,
   TargetPackRef,
 } from '@prisma-next/framework-components/components';
-import type { Namespace } from '@prisma-next/framework-components/ir';
-import type { SqlNamespaceTablesInput, StorageTypeInstance } from '@prisma-next/sql-contract/types';
+import type {
+  SqlNamespaceBase,
+  SqlNamespaceInput,
+  StorageTypeInstance,
+} from '@prisma-next/sql-contract/types';
 import { blindCast } from '@prisma-next/utils/casts';
 import { ifDefined } from '@prisma-next/utils/defined';
 import type { NamedConstraintSpec } from './authoring-type-utils';
@@ -43,6 +46,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 +55,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 +69,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 +81,8 @@ type HasNamedConstraintId<State extends AnyScalarFieldState> =
     boolean,
     string | undefined,
     infer IdSpec,
-    NamedConstraintSpec | undefined
+    NamedConstraintSpec | undefined,
+    boolean
   >
     ? IdSpec extends NamedConstraintSpec
       ? true
@@ -89,7 +96,8 @@ type HasNamedConstraintUnique<State extends AnyScalarFieldState> =
     boolean,
     string | undefined,
     NamedConstraintSpec | undefined,
-    infer UniqueSpec
+    infer UniqueSpec,
+    boolean
   >
     ? UniqueSpec extends NamedConstraintSpec
       ? true
@@ -115,7 +123,8 @@ type ApplyFieldSqlSpec<
     infer Nullable,
     infer ColumnName,
     infer IdSpec,
-    infer UniqueSpec
+    infer UniqueSpec,
+    infer Many
   >
     ? ScalarFieldState<
         CodecId,
@@ -131,9 +140,10 @@ type ApplyFieldSqlSpec<
           ? UniqueSpec extends NamedConstraintSpec
             ? NamedConstraintSpec<UniqueName>
             : UniqueSpec
-          : UniqueSpec
+          : UniqueSpec,
+        Many
       >
-    : never;
+    : AnyScalarFieldState;
 
 export type GeneratedFieldSpec = {
   readonly type: ColumnTypeDescriptor;
@@ -171,10 +181,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 +196,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 +212,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 +227,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>
-      : never);
+      ? 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, 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 +291,8 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Nullable,
       infer ColumnName,
       NamedConstraintSpec | undefined,
-      infer UniqueSpec
+      infer UniqueSpec,
+      infer Many
     >
       ? ScalarFieldState<
           CodecId,
@@ -251,9 +300,10 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
           Nullable,
           ColumnName,
           NamedConstraintSpec<Name>,
-          UniqueSpec
+          UniqueSpec,
+          Many
         >
-      : never
+      : AnyScalarFieldState
   > {
     return new ScalarFieldBuilder({
       ...this.state,
@@ -264,7 +314,8 @@ export class ScalarFieldBuilder<State extends AnyScalarFieldState = AnyScalarFie
       infer Nullable,
       infer ColumnName,
       NamedConstraintSpec | undefined,
-      infer UniqueSpec
+      infer UniqueSpec,
+      infer Many
     >
       ? ScalarFieldState<
           CodecId,
@@ -272,9 +323,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 +338,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 +361,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 +470,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,
     );
   }
@@ -1487,7 +1560,7 @@ export type ContractInput<
    */
   readonly namespaces?: readonly string[];
   /**
-   * Target-supplied factory that materialises a `Namespace` concretion
+   * Target-supplied factory that materialises a `SqlNamespaceBase` concretion
    * for a declared namespace coordinate. The SQL family layer is
    * target-agnostic and cannot import concretions like
    * `PostgresSchema` or `SqliteUnboundDatabase`; the factory is the
@@ -1499,14 +1572,8 @@ export type ContractInput<
    * `StorageTable.namespaceId` referenced by a model, and the
    * framework `UNBOUND_NAMESPACE_ID` sentinel (always present so the
    * late-bound slot stays available regardless of authoring choices).
-   *
-   * When omitted, the family layer falls back to its placeholder
-   * `SqlUnboundNamespace` singleton for the unbound slot and rejects
-   * any non-unbound coordinate — single-namespace contracts authored
-   * before targets ship their factory stay byte-stable; multi-namespace
-   * contracts must pass the factory through.
    */
-  readonly createNamespace?: (input: SqlNamespaceTablesInput) => Namespace;
+  readonly createNamespace: (input: SqlNamespaceInput) => SqlNamespaceBase;
   readonly types?: Types;
   readonly models?: Models;
   readonly codecLookup?: CodecLookup;