@prisma-next/sql-contract-ts 0.11.0-dev.3 → 0.11.0-dev.31

package/package.json

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

package/src/build-contract.ts

@@ -16,6 +16,7 @@ import {
   type JsonValue,
   type StorageHashBase,
 } from '@prisma-next/contract/types';
+import { type CapabilityMatrix, mergeCapabilityMatrices } from '@prisma-next/contract-authoring';
 import type { CodecLookup } from '@prisma-next/framework-components/codec';
 import { type Namespace, UNBOUND_NAMESPACE_ID } from '@prisma-next/framework-components/ir';
 import { validateIndexTypes } from '@prisma-next/sql-contract/index-type-validation';
@@ -532,7 +533,7 @@ export function buildSqlContractFromDefinition(
       const nsInput: SqlNamespaceTablesInput = {
         id,
         tables: tablesByNamespace[id] ?? {},
-        ...ifDefined('types', enumTypes),
+        ...ifDefined('enum', enumTypes),
       };
       return [id, createNamespace ? createNamespace(nsInput) : nsInput];
     }),
@@ -578,8 +579,24 @@ export function buildSqlContractFromDefinition(
     }
   }
 
-  const capabilities: Record<string, Record<string, boolean>> = definition.capabilities || {};
-  const profileHash = computeProfileHash({ target, targetFamily, capabilities });
+  const extensionPackCapabilitySources = definition.extensionPacks
+    ? Object.values(definition.extensionPacks).map(
+        (pack) => pack.capabilities as CapabilityMatrix | undefined,
+      )
+    : [];
+  const capabilities = mergeCapabilityMatrices(
+    definition.target.capabilities as CapabilityMatrix | undefined,
+    ...extensionPackCapabilitySources,
+  );
+  // Internal `profileHash` computation is unchanged from `origin/main`: it
+  // continues to fingerprint the author-declared capability subset. With
+  // `capabilities` removed from the `defineContract` input that subset is
+  // now always empty, so the hash naturally stabilises at `hash({})`.
+  const profileHash = computeProfileHash({
+    target,
+    targetFamily,
+    capabilities: {},
+  });
 
   const executionWithHash = executionSection
     ? {

package/src/contract-builder.ts

@@ -53,7 +53,6 @@ type ContractDefinition<
   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,
   Naming extends ContractInput['naming'] | undefined,
   StorageHash extends string | undefined,
   ForeignKeyDefaults extends ForeignKeyDefaultsState | undefined,
@@ -65,7 +64,6 @@ type ContractDefinition<
   readonly naming?: Naming;
   readonly storageHash?: StorageHash;
   readonly foreignKeyDefaults?: ForeignKeyDefaults;
-  readonly capabilities?: Capabilities;
   readonly namespaces?: Namespaces;
   readonly createNamespace?: (input: SqlNamespaceTablesInput) => Namespace;
   readonly types?: Types;
@@ -77,7 +75,6 @@ type ContractScaffold<
   Family extends FamilyPackRef<string>,
   Target extends TargetPackRef<'sql', string>,
   ExtensionPacks extends Record<string, ExtensionPackRef<'sql', string>> | undefined,
-  Capabilities extends Record<string, Record<string, boolean>> | undefined,
   Naming extends ContractInput['naming'] | undefined,
   StorageHash extends string | undefined,
   ForeignKeyDefaults extends ForeignKeyDefaultsState | undefined,
@@ -89,7 +86,6 @@ type ContractScaffold<
   readonly naming?: Naming;
   readonly storageHash?: StorageHash;
   readonly foreignKeyDefaults?: ForeignKeyDefaults;
-  readonly capabilities?: Capabilities;
   readonly namespaces?: Namespaces;
   readonly createNamespace?: (input: SqlNamespaceTablesInput) => Namespace;
   readonly codecLookup?: CodecLookup;
@@ -305,7 +301,6 @@ export function defineContract<
   const ExtensionPacks extends
     | Record<string, ExtensionPackRef<'sql', string>>
     | undefined = undefined,
-  const Capabilities extends Record<string, Record<string, boolean>> | undefined = undefined,
   const Naming extends ContractInput['naming'] | undefined = undefined,
   const StorageHash extends string | undefined = undefined,
   const ForeignKeyDefaults extends ForeignKeyDefaultsState | undefined = undefined,
@@ -317,7 +312,6 @@ export function defineContract<
     Types,
     Models,
     ExtensionPacks,
-    Capabilities,
     Naming,
     StorageHash,
     ForeignKeyDefaults,
@@ -330,7 +324,6 @@ export function defineContract<
     Types,
     Models,
     ExtensionPacks,
-    Capabilities,
     Naming,
     StorageHash,
     ForeignKeyDefaults,
@@ -348,7 +341,6 @@ export function defineContract<
   const ExtensionPacks extends
     | Record<string, ExtensionPackRef<'sql', string>>
     | undefined = undefined,
-  const Capabilities extends Record<string, Record<string, boolean>> | undefined = undefined,
   const Naming extends ContractInput['naming'] | undefined = undefined,
   const StorageHash extends string | undefined = undefined,
   const ForeignKeyDefaults extends ForeignKeyDefaultsState | undefined = undefined,
@@ -358,7 +350,6 @@ export function defineContract<
     Family,
     Target,
     ExtensionPacks,
-    Capabilities,
     Naming,
     StorageHash,
     ForeignKeyDefaults,
@@ -372,7 +363,6 @@ export function defineContract<
     Types,
     Models,
     ExtensionPacks,
-    Capabilities,
     Naming,
     StorageHash,
     ForeignKeyDefaults,

package/src/contract-definition.ts

@@ -118,14 +118,13 @@ export interface ModelNode {
 export interface ContractDefinition {
   readonly target: TargetPackRef<'sql', string>;
   readonly extensionPacks?: Record<string, ExtensionPackRef<'sql', string>>;
-  readonly capabilities?: Record<string, Record<string, boolean>>;
   readonly storageHash?: string;
   readonly foreignKeyDefaults?: ForeignKeyDefaultsState;
   readonly storageTypes?: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>;
   /**
    * Enum types declared inside a named `namespace { enum … }` block,
    * keyed first by namespace id then by type name. These are routed to
-   * `storage.namespaces[nsId].types` rather than the implicit fallback
+   * `storage.namespaces[nsId].enum` rather than the implicit fallback
    * namespace used for top-level `storageTypes` enums.
    */
   readonly namespaceTypes?: Readonly<

package/src/contract-dsl.ts

@@ -1209,7 +1209,6 @@ export type ContractInput<
     >
   > = Record<never, never>,
   ExtensionPacks extends Record<string, ExtensionPackRef<'sql', string>> | undefined = undefined,
-  Capabilities extends Record<string, Record<string, boolean>> | undefined = undefined,
 > = {
   readonly family: Family;
   readonly target: Target;
@@ -1217,7 +1216,6 @@ export type ContractInput<
   readonly naming?: NamingConfig;
   readonly storageHash?: string;
   readonly foreignKeyDefaults?: ForeignKeyDefaultsState;
-  readonly capabilities?: Capabilities;
   /**
    * Declared namespace coordinates the contract recognises. Per-model
    * `namespace` references must reference an entry in this list (or the

package/src/contract-lowering.ts

@@ -708,7 +708,6 @@ export function buildContractDefinition(definition: ContractInput): ContractDefi
   return {
     target: definition.target,
     ...(definition.extensionPacks ? { extensionPacks: definition.extensionPacks } : {}),
-    ...(definition.capabilities ? { capabilities: definition.capabilities } : {}),
     ...(definition.storageHash ? { storageHash: definition.storageHash } : {}),
     ...(definition.foreignKeyDefaults ? { foreignKeyDefaults: definition.foreignKeyDefaults } : {}),
     ...(Object.keys(collection.storageTypes).length > 0

package/src/contract-types.ts

@@ -69,11 +69,35 @@ type DefinitionExtensionPacks<Definition> = Definition extends {
   ? Packs
   : Record<never, never>;
 
-type DefinitionCapabilities<Definition> = Definition extends {
-  readonly capabilities?: infer Capabilities extends Record<string, Record<string, boolean>>;
+type ExtractPackCapabilities<P> = P extends {
+  readonly capabilities?: infer Caps extends Record<string, Record<string, boolean>>;
 }
-  ? Capabilities
-  : undefined;
+  ? Caps
+  : never;
+
+type MergeExtensionPackCapabilities<Packs> =
+  Packs extends Record<string, unknown>
+    ? keyof Packs extends never
+      ? Record<string, never>
+      : UnionToIntersection<
+          {
+            [K in keyof Packs]: ExtractPackCapabilities<Packs[K]>;
+          }[keyof Packs]
+        >
+    : Record<string, never>;
+
+type Defaulted<T, Fallback> = [T] extends [never] ? Fallback : T;
+
+// Build-time capability derivation no longer reads an author-declared
+// `capabilities` block — that field was removed from the `defineContract`
+// input. The build-time matrix is the merge of the target pack's caps and
+// every extension pack's caps; adapter and driver caps are layered in by
+// `enrichContract` at CLI emit time.
+type DerivedCapabilities<Definition> = Defaulted<
+  ExtractPackCapabilities<DefinitionTarget<Definition>>,
+  Record<string, never>
+> &
+  MergeExtensionPackCapabilities<DefinitionExtensionPacks<Definition>>;
 
 type DefinitionTargetId<Definition> = Definition extends {
   readonly target: TargetPackRef<'sql', infer Target>;
@@ -561,14 +585,14 @@ type BuiltStorage<Definition> = {
       readonly id: '__unbound__';
       readonly kind: string;
       readonly tables: BuiltStorageTables<Definition>;
-      readonly types?: Readonly<Record<string, PostgresEnumStorageEntry>>;
+      readonly enum?: Readonly<Record<string, PostgresEnumStorageEntry>>;
     };
   } & {
     readonly [Ns in Exclude<DefinitionNamespaces<Definition>, '__unbound__'>]: {
       readonly id: Ns;
       readonly kind: string;
       readonly tables: Record<never, never>;
-      readonly types?: Readonly<Record<string, PostgresEnumStorageEntry>>;
+      readonly enum?: Readonly<Record<string, PostgresEnumStorageEntry>>;
     };
   };
 };
@@ -608,12 +632,7 @@ export type SqlContractResult<Definition> = ContractWithTypeMaps<
     readonly extensionPacks: keyof DefinitionExtensionPacks<Definition> extends never
       ? Record<string, never>
       : DefinitionExtensionPacks<Definition>;
-    readonly capabilities: DefinitionCapabilities<Definition> extends Record<
-      string,
-      Record<string, boolean>
-    >
-      ? DefinitionCapabilities<Definition>
-      : Record<string, Record<string, boolean>>;
+    readonly capabilities: DerivedCapabilities<Definition>;
   },
   TypeMaps<
     CodecTypesFromDefinition<Definition>,