@prisma-next/sql-contract-psl 0.8.0 → 0.9.0-dev.1

package/src/interpreter.ts

@@ -11,9 +11,10 @@ import type {
 } from '@prisma-next/contract/types';
 import type {
   AuthoringContributions,
-  AuthoringTypeConstructorDescriptor,
+  AuthoringEntityContext,
+  AuthoringEntityTypeDescriptor,
 } from '@prisma-next/framework-components/authoring';
-import { instantiateAuthoringTypeConstructor } from '@prisma-next/framework-components/authoring';
+import { instantiateAuthoringEntityType } from '@prisma-next/framework-components/authoring';
 import type { ExtensionPackRef, TargetPackRef } from '@prisma-next/framework-components/components';
 import type {
   ControlMutationDefaultRegistry,
@@ -29,7 +30,11 @@ import type {
   PslModel,
   PslNamedTypeDeclaration,
 } from '@prisma-next/psl-parser';
-import type { StorageTypeInstance } from '@prisma-next/sql-contract/types';
+import {
+  isPostgresEnumStorageEntry,
+  type PostgresEnumStorageEntry,
+  type StorageTypeInstance,
+} from '@prisma-next/sql-contract/types';
 import {
   buildSqlContractFromDefinition,
   type ForeignKeyNode,
@@ -55,7 +60,7 @@ import {
 import type { ColumnDescriptor } from './psl-column-resolution';
 import {
   checkUncomposedNamespace,
-  getAuthoringTypeConstructor,
+  getAuthoringEntity,
   instantiatePslTypeConstructor,
   reportUncomposedNamespace,
   resolveDbNativeTypeAttribute,
@@ -158,17 +163,40 @@ function mapParserDiagnostics(document: ParsePslDocumentResult): ContractSourceD
 interface ProcessEnumDeclarationsInput {
   readonly enums: readonly PslEnum[];
   readonly sourceId: string;
-  readonly enumTypeConstructor: AuthoringTypeConstructorDescriptor | undefined;
+  readonly enumEntityDescriptor: AuthoringEntityTypeDescriptor | undefined;
+  readonly entityContext: AuthoringEntityContext;
   readonly diagnostics: ContractSourceDiagnostic[];
 }
 
 function processEnumDeclarations(input: ProcessEnumDeclarationsInput): {
-  readonly storageTypes: Record<string, StorageTypeInstance>;
+  readonly storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>;
   readonly enumTypeDescriptors: Map<string, ColumnDescriptor>;
 } {
-  const storageTypes: Record<string, StorageTypeInstance> = {};
+  const storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry> = {};
   const enumTypeDescriptors = new Map<string, ColumnDescriptor>();
 
+  if (input.enums.length === 0) {
+    return { storageTypes, enumTypeDescriptors };
+  }
+
+  if (!input.enumEntityDescriptor) {
+    // The PSL `enum X { … }` syntax only resolves when the active
+    // pack composition contributes an `enum` entity-type factory (the
+    // Postgres target pack does so today via
+    // `authoring.entityTypes.enum`). Without the contribution we
+    // surface a diagnostic per declaration rather than silently
+    // swallowing the syntax.
+    for (const enumDeclaration of input.enums) {
+      input.diagnostics.push({
+        code: 'PSL_UNSUPPORTED_NAMED_TYPE_BASE',
+        message: `Enum "${enumDeclaration.name}" requires the active target pack to contribute an enum entity-type helper`,
+        sourceId: input.sourceId,
+        span: enumDeclaration.span,
+      });
+    }
+    return { storageTypes, enumTypeDescriptors };
+  }
+
   for (const enumDeclaration of input.enums) {
     const nativeType = parseMapName({
       attribute: getAttribute(enumDeclaration.attributes, 'map'),
@@ -178,29 +206,29 @@ function processEnumDeclarations(input: ProcessEnumDeclarationsInput): {
       entityLabel: `Enum "${enumDeclaration.name}"`,
       span: enumDeclaration.span,
     });
-    const enumStorageType = input.enumTypeConstructor
-      ? instantiateAuthoringTypeConstructor(input.enumTypeConstructor, [
-          nativeType,
-          enumDeclaration.values.map((value) => value.name),
-        ])
-      : {
-          codecId: 'pg/enum@1',
-          nativeType,
-          typeParams: { values: enumDeclaration.values.map((value) => value.name) },
-        };
+    const values = enumDeclaration.values.map((value) => value.name);
+    const constructed = instantiateAuthoringEntityType(
+      'enum',
+      input.enumEntityDescriptor,
+      [{ name: enumDeclaration.name, nativeType, values }],
+      input.entityContext,
+    );
+    if (!isPostgresEnumStorageEntry(constructed)) {
+      input.diagnostics.push({
+        code: 'PSL_UNSUPPORTED_NAMED_TYPE_BASE',
+        message: `Enum "${enumDeclaration.name}": enum entity-type factory must return a PostgresEnumStorageEntry-shaped value (kind: 'postgres-enum')`,
+        sourceId: input.sourceId,
+        span: enumDeclaration.span,
+      });
+      continue;
+    }
     const descriptor: ColumnDescriptor = {
-      codecId: enumStorageType.codecId,
-      nativeType: enumStorageType.nativeType,
+      codecId: constructed.codecId,
+      nativeType: constructed.nativeType,
       typeRef: enumDeclaration.name,
     };
     enumTypeDescriptors.set(enumDeclaration.name, descriptor);
-    storageTypes[enumDeclaration.name] = {
-      codecId: enumStorageType.codecId,
-      nativeType: enumStorageType.nativeType,
-      typeParams: enumStorageType.typeParams ?? {
-        values: enumDeclaration.values.map((value) => value.name),
-      },
-    };
+    storageTypes[enumDeclaration.name] = constructed;
   }
 
   return { storageTypes, enumTypeDescriptors };
@@ -282,10 +310,10 @@ function validateNamedTypeAttributes(input: {
 }
 
 function resolveNamedTypeDeclarations(input: ResolveNamedTypeDeclarationsInput): {
-  readonly storageTypes: Record<string, StorageTypeInstance>;
+  readonly storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry>;
   readonly namedTypeDescriptors: Map<string, ColumnDescriptor>;
 } {
-  const storageTypes: Record<string, StorageTypeInstance> = {};
+  const storageTypes: Record<string, StorageTypeInstance | PostgresEnumStorageEntry> = {};
   const namedTypeDescriptors = new Map<string, ColumnDescriptor>();
 
   for (const declaration of input.declarations) {
@@ -336,6 +364,7 @@ function resolveNamedTypeDeclarations(input: ResolveNamedTypeDeclarationsInput):
         toNamedTypeFieldDescriptor(declaration.name, storageType),
       );
       storageTypes[declaration.name] = {
+        kind: 'codec-instance',
         codecId: storageType.codecId,
         nativeType: storageType.nativeType,
         typeParams: storageType.typeParams ?? {},
@@ -401,6 +430,7 @@ function resolveNamedTypeDeclarations(input: ResolveNamedTypeDeclarationsInput):
         toNamedTypeFieldDescriptor(declaration.name, descriptor),
       );
       storageTypes[declaration.name] = {
+        kind: 'codec-instance',
         codecId: descriptor.codecId,
         nativeType: descriptor.nativeType,
         typeParams: descriptor.typeParams ?? {},
@@ -411,6 +441,7 @@ function resolveNamedTypeDeclarations(input: ResolveNamedTypeDeclarationsInput):
     const descriptor = toNamedTypeFieldDescriptor(declaration.name, baseDescriptor);
     namedTypeDescriptors.set(declaration.name, descriptor);
     storageTypes[declaration.name] = {
+      kind: 'codec-instance',
       codecId: baseDescriptor.codecId,
       nativeType: baseDescriptor.nativeType,
       typeParams: {},
@@ -1284,7 +1315,11 @@ export function interpretPslDocumentToSqlContract(
   const enumResult = processEnumDeclarations({
     enums,
     sourceId,
-    enumTypeConstructor: getAuthoringTypeConstructor(input.authoringContributions, ['enum']),
+    enumEntityDescriptor: getAuthoringEntity(input.authoringContributions, ['enum']),
+    entityContext: {
+      family: input.target.familyId,
+      target: input.target.targetId,
+    },
     diagnostics,
   });
 

package/src/psl-column-resolution.ts

@@ -2,6 +2,7 @@ import type { ContractSourceDiagnostic } from '@prisma-next/config/config-types'
 import type { ColumnDefault, ExecutionMutationDefaultPhases } from '@prisma-next/contract/types';
 import type {
   AuthoringContributions,
+  AuthoringEntityTypeDescriptor,
   AuthoringFieldPresetDescriptor,
   AuthoringTypeConstructorDescriptor,
 } from '@prisma-next/framework-components/authoring';
@@ -9,6 +10,7 @@ import {
   hasRegisteredFieldNamespace,
   instantiateAuthoringFieldPreset,
   instantiateAuthoringTypeConstructor,
+  isAuthoringEntityTypeDescriptor,
   isAuthoringFieldPresetDescriptor,
   isAuthoringTypeConstructorDescriptor,
   validateAuthoringHelperArguments,
@@ -71,6 +73,33 @@ export function getAuthoringTypeConstructor(
   return isAuthoringTypeConstructorDescriptor(current) ? current : undefined;
 }
 
+/**
+ * Walks `authoringContributions.entityTypes` segment-by-segment and returns
+ * the entity type descriptor at the resolved path, or `undefined` if no
+ * descriptor is registered.
+ *
+ * Used by the PSL interpreter to dispatch declarative entity-shaped
+ * declarations (`enum`, future `namespace { … }`, …) through the
+ * pack entity-type mechanism — the descriptor's `factory` (or
+ * `template`) materialises the IR-class instance without the
+ * interpreter knowing target-specific construction.
+ */
+export function getAuthoringEntity(
+  contributions: AuthoringContributions | undefined,
+  path: readonly string[],
+): AuthoringEntityTypeDescriptor | undefined {
+  let current: unknown = contributions?.entityTypes;
+
+  for (const segment of path) {
+    if (typeof current !== 'object' || current === null || Array.isArray(current)) {
+      return undefined;
+    }
+    current = (current as Record<string, unknown>)[segment];
+  }
+
+  return isAuthoringEntityTypeDescriptor(current) ? current : undefined;
+}
+
 /**
  * Walks `authoringContributions.field` segment-by-segment and returns the field-preset descriptor at the resolved path, or `undefined` if no descriptor is registered.
  *