@prisma-next/sql-contract-ts 0.14.0-dev.6 → 0.14.0-dev.60

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';
@@ -15,6 +18,7 @@ import {
   type ComposedAuthoringHelpers,
   createComposedAuthoringHelpers,
 } from './composed-authoring-helpers';
+import type { PackEntitiesInput } from './contract-definition';
 import {
   type ContractInput,
   type ContractModelBuilder,
@@ -68,11 +72,12 @@ 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;
   readonly enums?: Enums;
+  readonly packEntities?: PackEntitiesInput;
 };
 
 type ContractScaffold<
@@ -93,11 +98,12 @@ 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;
   readonly enums?: Enums;
+  readonly packEntities?: PackEntitiesInput;
 };
 
 type ContractFactory<
@@ -111,6 +117,7 @@ type ContractFactory<
   readonly types?: Types;
   readonly models?: Models;
   readonly enums?: Enums;
+  readonly packEntities?: PackEntitiesInput;
 };
 
 function validateTargetPackRef(
@@ -314,11 +321,12 @@ 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;
   readonly enums?: Record<string, EnumTypeHandle>;
+  readonly packEntities?: PackEntitiesInput;
 };
 
 // A bare `Record<string, EnumTypeHandle>` (no literal keys) is the widened
@@ -342,6 +350,60 @@ type WithFamilyTarget<
   T extends TargetPackRef<'sql', string>,
 > = Input & { readonly family: F; readonly target: T };
 
+// Deep-merges packEntities authored on the scaffold definition with those
+// returned from the factory callback — three levels deep (namespace, kind,
+// name), unlike `enums`' flat shallow merge, since a factory-declared
+// namespace/kind must not silently drop a scaffold-declared sibling entry
+// under the same namespace or kind. A same-name key present on both sides is
+// only merged when it is the identical entity instance; two *different*
+// entities of the same namespace/kind/name is a collision (the emitted
+// entry could reflect only one), rejected here the same way
+// `mergeCollectedPackEntities` in `build-contract.ts` rejects it.
+function mergePackEntityNames(
+  namespaceId: string,
+  kind: string,
+  a: Readonly<Record<string, unknown>> | undefined,
+  b: Readonly<Record<string, unknown>> | undefined,
+): Readonly<Record<string, unknown>> {
+  if (a !== undefined && b !== undefined) {
+    for (const [name, entity] of Object.entries(b)) {
+      const existing = a[name];
+      if (existing !== undefined && existing !== entity) {
+        throw new Error(
+          `defineContract: two different "${kind}" entities named "${name}" in namespace "${namespaceId}" — a factory-returned pack entity conflicts with a scaffold-declared one; pack-entity names must be unique per namespace.`,
+        );
+      }
+    }
+  }
+  return { ...(a ?? {}), ...(b ?? {}) };
+}
+
+function mergePackEntityKinds(
+  namespaceId: string,
+  a: Readonly<Record<string, Readonly<Record<string, unknown>>>> | undefined,
+  b: Readonly<Record<string, Readonly<Record<string, unknown>>>> | undefined,
+): Readonly<Record<string, Readonly<Record<string, unknown>>>> {
+  const kinds = new Set([...Object.keys(a ?? {}), ...Object.keys(b ?? {})]);
+  const result: Record<string, Readonly<Record<string, unknown>>> = {};
+  for (const kind of kinds) {
+    result[kind] = mergePackEntityNames(namespaceId, kind, a?.[kind], b?.[kind]);
+  }
+  return result;
+}
+
+function mergePackEntities(
+  a: PackEntitiesInput | undefined,
+  b: PackEntitiesInput | undefined,
+): PackEntitiesInput | undefined {
+  if (a === undefined && b === undefined) return undefined;
+  const namespaces = new Set([...Object.keys(a ?? {}), ...Object.keys(b ?? {})]);
+  const result: Record<string, Readonly<Record<string, Readonly<Record<string, unknown>>>>> = {};
+  for (const namespaceId of namespaces) {
+    result[namespaceId] = mergePackEntityKinds(namespaceId, a?.[namespaceId], b?.[namespaceId]);
+  }
+  return result;
+}
+
 /**
  * Shared builder that assembles a SqlContract with pre-bound family and target.
  * Extension wrappers keep their own public overloads and delegate their impl body here;
@@ -387,6 +449,7 @@ export function buildBoundContract<
     readonly types?: Record<string, StorageTypeInstance>;
     readonly models?: Record<string, ModelLike>;
     readonly enums?: Record<string, EnumTypeHandle>;
+    readonly packEntities?: PackEntitiesInput;
   },
 >(
   family: F,
@@ -412,6 +475,7 @@ export function buildBoundContract(
         readonly types?: Record<string, StorageTypeInstance>;
         readonly models?: Record<string, ModelLike>;
         readonly enums?: Record<string, EnumTypeHandle>;
+        readonly packEntities?: PackEntitiesInput;
       })
     | undefined,
 ) {
@@ -426,11 +490,13 @@ export function buildBoundContract(
       }),
     );
     const mergedEnums = { ...(definition.enums ?? {}), ...built.enums };
+    const mergedPackEntities = mergePackEntities(definition.packEntities, built.packEntities);
     return buildContractFromDsl({
       ...full,
       ...ifDefined('types', built.types),
       ...ifDefined('models', built.models),
       ...ifDefined('enums', Object.keys(mergedEnums).length > 0 ? mergedEnums : undefined),
+      ...ifDefined('packEntities', mergedPackEntities),
     });
   }
 

package/src/contract-definition.ts

@@ -6,16 +6,30 @@ 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';
 
 export type { ExecutionMutationDefaultPhases };
 
+/**
+ * An author-declared, namespace-scoped pack entity attachment: namespace id →
+ * entity kind (the discriminator the target/extension pack registered its
+ * `AuthoringContributions.entityTypes` descriptor under, e.g. `native_enum`)
+ * → entity name → the lowered entity instance. Generic on purpose — neither
+ * the framework nor `contract-ts` names a specific entity kind here; the
+ * shape mirrors `SqlNamespaceInput.entries` (`entries.<kind>[name]`), just
+ * namespace-nested so an author can target any declared namespace (default
+ * or named), not only the contract's default namespace.
+ */
+export type PackEntitiesInput = Readonly<
+  Record<string, Readonly<Record<string, Readonly<Record<string, unknown>>>>>
+>;
+
 export interface FieldNode {
   readonly fieldName: string;
   readonly columnName: string;
@@ -175,8 +189,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[];
   /**
@@ -185,4 +199,13 @@ export interface ContractDefinition {
    * default namespace.
    */
   readonly enums?: Record<string, EnumTypeHandle>;
+  /**
+   * Author-declared pack entities, keyed by namespace then entity kind then
+   * name. Each entity lowers into `storage.namespaces[ns].entries.<kind>`;
+   * when the registered entity-type descriptor's factory output implements
+   * the `SqlValueSetDerivingEntityTypeOutput.deriveValueSet` hook, the
+   * derived value-set also folds into `entries.valueSet`, mirroring how
+   * `enums` flows there.
+   */
+  readonly packEntities?: PackEntitiesInput;
 }

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, 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 +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;
@@ -1516,6 +1583,15 @@ export type ContractInput<
    * default namespace. Fields reference the enum via `field.namedType(handle)`.
    */
   readonly enums?: Record<string, import('./enum-type').EnumTypeHandle>;
+  /**
+   * Author-declared pack entities, keyed by namespace id then entity kind
+   * then name — e.g. `{ auth: { native_enum: { AalLevel: <entity> } } }`.
+   * Each entity lowers into `storage.namespaces[ns].entries.<kind>`; when its
+   * registered entity-type descriptor derives a value-set, that also folds
+   * into `entries.valueSet`, mirroring how `enums` flows there. Generic on
+   * purpose — neither this type nor the assembler names a specific kind.
+   */
+  readonly packEntities?: import('./contract-definition').PackEntitiesInput;
 };
 
 export function model<

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 } : {}),
@@ -877,10 +878,13 @@ export function buildContractDefinition(definition: ContractInput): ContractDefi
       ? { storageTypes: collection.storageTypes }
       : {}),
     ...(definition.namespaces ? { namespaces: definition.namespaces } : {}),
-    ...(definition.createNamespace ? { createNamespace: definition.createNamespace } : {}),
+    createNamespace: definition.createNamespace,
     ...(definition.enums && Object.keys(definition.enums).length > 0
       ? { enums: definition.enums }
       : {}),
+    ...(definition.packEntities && Object.keys(definition.packEntities).length > 0
+      ? { packEntities: definition.packEntities }
+      : {}),
     models,
   };
 }