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

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@prisma-next/sql-contract-ts",
-  "version": "0.5.0-dev.6",
+  "version": "0.5.0-dev.60",
+  "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
   "description": "SQL-specific TypeScript contract authoring surface for Prisma Next",
@@ -8,12 +9,12 @@
     "arktype": "^2.1.25",
     "pathe": "^2.0.3",
     "ts-toolbelt": "^9.6.0",
-    "@prisma-next/contract": "0.5.0-dev.6",
-    "@prisma-next/sql-contract": "0.5.0-dev.6",
-    "@prisma-next/framework-components": "0.5.0-dev.6",
-    "@prisma-next/config": "0.5.0-dev.6",
-    "@prisma-next/contract-authoring": "0.5.0-dev.6",
-    "@prisma-next/utils": "0.5.0-dev.6"
+    "@prisma-next/config": "0.5.0-dev.60",
+    "@prisma-next/contract-authoring": "0.5.0-dev.60",
+    "@prisma-next/contract": "0.5.0-dev.60",
+    "@prisma-next/sql-contract": "0.5.0-dev.60",
+    "@prisma-next/framework-components": "0.5.0-dev.60",
+    "@prisma-next/utils": "0.5.0-dev.60"
   },
   "devDependencies": {
     "@types/pg": "8.16.0",
@@ -22,8 +23,8 @@
     "typescript": "5.9.3",
     "vitest": "4.0.17",
     "@prisma-next/test-utils": "0.0.1",
-    "@prisma-next/tsconfig": "0.0.0",
-    "@prisma-next/tsdown": "0.0.0"
+    "@prisma-next/tsdown": "0.0.0",
+    "@prisma-next/tsconfig": "0.0.0"
   },
   "files": [
     "dist",

package/src/build-contract.ts

@@ -13,7 +13,6 @@ import {
   type ContractValueObject,
   coreHash,
   type ExecutionMutationDefault,
-  type ExecutionMutationDefaultValue,
   type JsonValue,
   type StorageHashBase,
 } from '@prisma-next/contract/types';
@@ -198,15 +197,19 @@ export function buildSqlContractFromDefinition(
     const domainFieldRefs: Record<string, DomainFieldRef> = {};
 
     for (const field of semanticModel.fields) {
-      if (field.executionDefault) {
+      const executionDefaultPhases =
+        field.executionDefaults?.onCreate || field.executionDefaults?.onUpdate
+          ? field.executionDefaults
+          : undefined;
+      if (executionDefaultPhases) {
         if (field.default !== undefined) {
           throw new Error(
-            `Field "${semanticModel.modelName}.${field.fieldName}" cannot define both default and executionDefault.`,
+            `Field "${semanticModel.modelName}.${field.fieldName}" cannot define both default and executionDefaults.`,
           );
         }
         if (field.nullable) {
           throw new Error(
-            `Field "${semanticModel.modelName}.${field.fieldName}" cannot be nullable when executionDefault is present.`,
+            `Field "${semanticModel.modelName}.${field.fieldName}" cannot be nullable when executionDefaults are present.`,
           );
         }
       }
@@ -227,28 +230,15 @@ export function buildSqlContractFromDefinition(
         domainFieldRefs[field.fieldName] = { kind: 'scalar', many: true };
       }
 
-      if ('executionDefault' in field && field.executionDefault) {
+      if (executionDefaultPhases) {
         executionDefaults.push({
           ref: { table: tableName, column: field.columnName },
-          onCreate: field.executionDefault as ExecutionMutationDefaultValue,
+          ...ifDefined('onCreate', executionDefaultPhases.onCreate),
+          ...ifDefined('onUpdate', executionDefaultPhases.onUpdate),
         });
       }
     }
 
-    if (semanticModel.id) {
-      const fieldsByColumnName = new Map(
-        semanticModel.fields.map((field) => [field.columnName, field]),
-      );
-      for (const columnName of semanticModel.id.columns) {
-        const field = fieldsByColumnName.get(columnName);
-        if (field?.nullable) {
-          throw new Error(
-            `Model "${semanticModel.modelName}" uses nullable field "${field.fieldName}" in its identity.`,
-          );
-        }
-      }
-    }
-
     const foreignKeys = (semanticModel.foreignKeys ?? []).map((fk) => {
       const targetModel = assertKnownTargetModel(
         modelsByName,

package/src/composed-authoring-helpers.ts

@@ -5,8 +5,10 @@ import type {
   AuthoringTypeNamespace,
 } from '@prisma-next/framework-components/authoring';
 import {
+  assertNoCrossRegistryCollisions,
   isAuthoringFieldPresetDescriptor,
   isAuthoringTypeConstructorDescriptor,
+  mergeAuthoringNamespaces,
 } from '@prisma-next/framework-components/authoring';
 import type {
   ExtensionPackRef,
@@ -121,54 +123,6 @@ function extractFieldNamespace<Pack>(pack: Pack): ExtractFieldNamespaceFromPack<
     {}) as ExtractFieldNamespaceFromPack<Pack>;
 }
 
-function mergeHelperNamespaces(
-  target: Record<string, unknown>,
-  source: Record<string, unknown>,
-  path: readonly string[],
-  leafGuard: (value: unknown) => boolean,
-  label: string,
-): void {
-  const assertSafePath = (currentPath: readonly string[]) => {
-    const blockedSegment = currentPath.find(
-      (segment) => segment === '__proto__' || segment === 'constructor' || segment === 'prototype',
-    );
-    if (blockedSegment) {
-      throw new Error(
-        `Invalid authoring ${label} helper "${currentPath.join('.')}". Helper path segments must not use "${blockedSegment}".`,
-      );
-    }
-  };
-
-  for (const [key, sourceValue] of Object.entries(source)) {
-    const currentPath = [...path, key];
-    assertSafePath(currentPath);
-    const hasExistingValue = Object.hasOwn(target, key);
-    const existingValue = hasExistingValue ? target[key] : undefined;
-
-    if (!hasExistingValue) {
-      target[key] = sourceValue;
-      continue;
-    }
-
-    const existingIsLeaf = leafGuard(existingValue);
-    const sourceIsLeaf = leafGuard(sourceValue);
-
-    if (existingIsLeaf || sourceIsLeaf) {
-      throw new Error(
-        `Duplicate authoring ${label} helper "${currentPath.join('.')}". Helper names must be unique across composed packs.`,
-      );
-    }
-
-    mergeHelperNamespaces(
-      existingValue as Record<string, unknown>,
-      sourceValue as Record<string, unknown>,
-      currentPath,
-      leafGuard,
-      label,
-    );
-  }
-}
-
 type AuthoringComponent = {
   readonly authoring?: { readonly type?: unknown; readonly field?: unknown };
 };
@@ -178,7 +132,7 @@ function composeTypeNamespace(components: readonly AuthoringComponent[]): Author
   for (const component of components) {
     const ns = extractTypeNamespace(component);
     if (Object.keys(ns).length > 0) {
-      mergeHelperNamespaces(merged, ns, [], isAuthoringTypeConstructorDescriptor, 'type');
+      mergeAuthoringNamespaces(merged, ns, [], isAuthoringTypeConstructorDescriptor, 'type');
     }
   }
   return merged as AuthoringTypeNamespace;
@@ -189,17 +143,17 @@ function composeFieldNamespace(components: readonly AuthoringComponent[]): Autho
   for (const component of components) {
     const ns = extractFieldNamespace(component);
     if (Object.keys(ns).length > 0) {
-      mergeHelperNamespaces(merged, ns, [], isAuthoringFieldPresetDescriptor, 'field');
+      mergeAuthoringNamespaces(merged, ns, [], isAuthoringFieldPresetDescriptor, 'field');
     }
   }
   return merged as AuthoringFieldNamespace;
 }
 
 function createComposedFieldHelpers(
-  components: readonly AuthoringComponent[],
+  fieldNamespace: AuthoringFieldNamespace,
 ): CoreFieldHelpers & Record<string, unknown> {
   const helperNamespace = createFieldHelpersFromNamespace(
-    composeFieldNamespace(components),
+    fieldNamespace,
     ({ helperPath, descriptor }) =>
       createFieldPresetHelper({
         helperPath,
@@ -247,10 +201,16 @@ export function createComposedAuthoringHelpers<
     ...extensionValues,
   ];
 
+  const typeNamespace = composeTypeNamespace(components);
+  const fieldNamespace = composeFieldNamespace(components);
+  // Mirrors the call in `assembleAuthoringContributions`: PSL composes via
+  // `createControlStack`, the TS DSL composes here. Both seams need the guard.
+  assertNoCrossRegistryCollisions(typeNamespace, fieldNamespace);
+
   return {
-    field: createComposedFieldHelpers(components),
+    field: createComposedFieldHelpers(fieldNamespace),
     model,
     rel,
-    type: createTypeHelpersFromNamespace(composeTypeNamespace(components)),
+    type: createTypeHelpersFromNamespace(typeNamespace),
   } as ComposedAuthoringHelpers<Family, Target, ExtensionPacks>;
 }

package/src/contract-definition.ts

@@ -1,4 +1,4 @@
-import type { ColumnDefault, ExecutionMutationDefaultValue } from '@prisma-next/contract/types';
+import type { ColumnDefault, ExecutionMutationDefaultPhases } from '@prisma-next/contract/types';
 import type {
   ColumnTypeDescriptor,
   ForeignKeyDefaultsState,
@@ -6,13 +6,15 @@ import type {
 import type { ExtensionPackRef, TargetPackRef } from '@prisma-next/framework-components/components';
 import type { ReferentialAction, StorageTypeInstance } from '@prisma-next/sql-contract/types';
 
+export type { ExecutionMutationDefaultPhases };
+
 export interface FieldNode {
   readonly fieldName: string;
   readonly columnName: string;
   readonly descriptor: ColumnTypeDescriptor;
   readonly nullable: boolean;
   readonly default?: ColumnDefault;
-  readonly executionDefault?: ExecutionMutationDefaultValue;
+  readonly executionDefaults?: ExecutionMutationDefaultPhases;
   readonly many?: boolean;
 }
 
@@ -71,7 +73,7 @@ export interface ValueObjectFieldNode {
   readonly valueObjectName: string;
   readonly nullable: boolean;
   readonly default?: ColumnDefault;
-  readonly executionDefault?: ExecutionMutationDefaultValue;
+  readonly executionDefaults?: ExecutionMutationDefaultPhases;
   readonly many?: boolean;
 }
 

package/src/contract-dsl.ts

@@ -1,8 +1,10 @@
 import type {
   ColumnDefault,
   ColumnDefaultLiteralInputValue,
+  ExecutionMutationDefaultPhases,
   ExecutionMutationDefaultValue,
 } from '@prisma-next/contract/types';
+import { isColumnDefault } from '@prisma-next/contract/types';
 import type {
   ColumnTypeDescriptor,
   ForeignKeyDefaultsState,
@@ -46,7 +48,7 @@ export type ScalarFieldState<
   readonly nullable: Nullable;
   readonly columnName?: ColumnName | undefined;
   readonly default?: ColumnDefault | undefined;
-  readonly executionDefault?: ExecutionMutationDefaultValue | undefined;
+  readonly executionDefaults?: ExecutionMutationDefaultPhases | undefined;
 } & (IdSpec extends NamedConstraintSpec ? { readonly id: IdSpec } : { readonly id?: undefined }) &
   (UniqueSpec extends NamedConstraintSpec
     ? { readonly unique: UniqueSpec }
@@ -59,7 +61,7 @@ type AnyScalarFieldState = {
   readonly nullable: boolean;
   readonly columnName?: string | undefined;
   readonly default?: ColumnDefault | undefined;
-  readonly executionDefault?: ExecutionMutationDefaultValue | undefined;
+  readonly executionDefaults?: ExecutionMutationDefaultPhases | undefined;
   readonly id?: NamedConstraintSpec | undefined;
   readonly unique?: NamedConstraintSpec | undefined;
 };
@@ -136,12 +138,6 @@ export type GeneratedFieldSpec = {
   readonly generated: ExecutionMutationDefaultValue;
 };
 
-function isColumnDefault(value: unknown): value is ColumnDefault {
-  if (typeof value !== 'object' || value === null) return false;
-  const kind = (value as { kind?: unknown }).kind;
-  return kind === 'literal' || kind === 'function';
-}
-
 function toColumnDefault(value: ColumnDefaultLiteralInputValue | ColumnDefault): ColumnDefault {
   if (isColumnDefault(value)) {
     return value;
@@ -348,7 +344,7 @@ function generatedField<Descriptor extends ColumnTypeDescriptor>(
       ...(spec.typeParams ? { typeParams: spec.typeParams } : {}),
     },
     nullable: false,
-    executionDefault: spec.generated,
+    executionDefaults: { onCreate: spec.generated },
   });
 }
 
@@ -379,11 +375,8 @@ export function buildFieldPreset(
     kind: 'scalar',
     descriptor: preset.descriptor,
     nullable: preset.nullable,
-    ...ifDefined('default', preset.default as ColumnDefault | undefined),
-    ...ifDefined(
-      'executionDefault',
-      preset.executionDefault as ExecutionMutationDefaultValue | undefined,
-    ),
+    ...ifDefined('default', preset.default),
+    ...ifDefined('executionDefaults', preset.executionDefaults),
     ...(preset.id
       ? {
           id: namedConstraintOptions?.name ? { name: namedConstraintOptions.name } : {},

package/src/contract-lowering.ts

@@ -562,7 +562,7 @@ function resolveModelNode(
       descriptor,
       nullable: fieldState.nullable,
       ...(fieldState.default ? { default: fieldState.default } : {}),
-      ...(fieldState.executionDefault ? { executionDefault: fieldState.executionDefault } : {}),
+      ...(fieldState.executionDefaults ? { executionDefaults: fieldState.executionDefaults } : {}),
     });
   }