@prisma-next/sql-contract-psl 0.13.0-dev.17 → 0.13.0-dev.18

package/dist/provider.mjs

@@ -1,4 +1,4 @@
-import { t as interpretPslDocumentToSqlContract } from "./interpreter-He_PL0li.mjs";
+import { t as interpretPslDocumentToSqlContract } from "./interpreter-CQdQo427.mjs";
 import { ifDefined } from "@prisma-next/utils/defined";
 import { notOk, ok } from "@prisma-next/utils/result";
 import { parsePslDocument } from "@prisma-next/psl-parser";

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@prisma-next/sql-contract-psl",
-  "version": "0.13.0-dev.17",
+  "version": "0.13.0-dev.18",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
   "description": "PSL-to-SQL ContractIR interpreter for Prisma Next",
   "dependencies": {
-    "@prisma-next/config": "0.13.0-dev.17",
-    "@prisma-next/contract": "0.13.0-dev.17",
-    "@prisma-next/framework-components": "0.13.0-dev.17",
-    "@prisma-next/psl-parser": "0.13.0-dev.17",
-    "@prisma-next/sql-contract": "0.13.0-dev.17",
-    "@prisma-next/sql-contract-ts": "0.13.0-dev.17",
-    "@prisma-next/utils": "0.13.0-dev.17",
+    "@prisma-next/config": "0.13.0-dev.18",
+    "@prisma-next/contract": "0.13.0-dev.18",
+    "@prisma-next/framework-components": "0.13.0-dev.18",
+    "@prisma-next/psl-parser": "0.13.0-dev.18",
+    "@prisma-next/sql-contract": "0.13.0-dev.18",
+    "@prisma-next/sql-contract-ts": "0.13.0-dev.18",
+    "@prisma-next/utils": "0.13.0-dev.18",
     "pathe": "^2.0.3"
   },
   "devDependencies": {
-    "@prisma-next/contract-authoring": "0.13.0-dev.17",
-    "@prisma-next/test-utils": "0.13.0-dev.17",
-    "@prisma-next/tsconfig": "0.13.0-dev.17",
-    "@prisma-next/tsdown": "0.13.0-dev.17",
+    "@prisma-next/contract-authoring": "0.13.0-dev.18",
+    "@prisma-next/test-utils": "0.13.0-dev.18",
+    "@prisma-next/tsconfig": "0.13.0-dev.18",
+    "@prisma-next/tsdown": "0.13.0-dev.18",
     "arktype": "^2.2.0",
     "tsdown": "0.22.1",
     "typescript": "5.9.3",

package/src/interpreter.ts

@@ -709,6 +709,7 @@ function buildModelNodeFromPsl(input: BuildModelNodeInput): BuildModelNodeResult
     diagnostics,
     sourceId,
     scalarTypeDescriptors: input.scalarTypeDescriptors,
+    ...ifDefined('enum2Handles', input.enum2Handles),
   });
 
   const inlineIdFields = resolvedFields.filter((field) => field.isId);

package/src/psl-field-resolution.ts

@@ -1,14 +1,21 @@
 import type { ContractSourceDiagnostic } from '@prisma-next/config/config-types';
-import type { ColumnDefault, ExecutionMutationDefaultPhases } from '@prisma-next/contract/types';
+import type {
+  ColumnDefault,
+  ColumnDefaultLiteralInputValue,
+  ExecutionMutationDefaultPhases,
+} from '@prisma-next/contract/types';
 import type { AuthoringContributions } from '@prisma-next/framework-components/authoring';
 import type {
   ControlMutationDefaultRegistry,
   MutationDefaultGeneratorDescriptor,
 } from '@prisma-next/framework-components/control';
 import type { PslAttribute, PslField, PslModel } from '@prisma-next/psl-parser';
+import type { EnumTypeHandle } from '@prisma-next/sql-contract-ts/contract-builder';
+import { blindCast } from '@prisma-next/utils/casts';
 import { ifDefined } from '@prisma-next/utils/defined';
 import {
   getAttribute,
+  getPositionalArgumentEntry,
   lowerFirst,
   parseConstraintMapArgument,
   parseMapName,
@@ -21,6 +28,61 @@ import {
   resolveFieldTypeDescriptor,
 } from './psl-column-resolution';
 
+type LoweredFieldDefault = {
+  readonly defaultValue?: ColumnDefault;
+  readonly executionDefaults?: ExecutionMutationDefaultPhases;
+};
+
+function lowerEnum2DefaultForField(input: {
+  readonly modelName: string;
+  readonly fieldName: string;
+  readonly defaultAttribute: PslAttribute;
+  readonly enumHandle: EnumTypeHandle;
+  readonly sourceId: string;
+  readonly diagnostics: ContractSourceDiagnostic[];
+}): LoweredFieldDefault {
+  const expressionEntry = getPositionalArgumentEntry(input.defaultAttribute);
+  if (!expressionEntry) {
+    return {};
+  }
+
+  const raw = expressionEntry.value.trim();
+  const isQuotedString = /^(['"]).*\1$/.test(raw);
+  const isFunctionCall = raw.includes('(') && raw.endsWith(')');
+
+  if (isQuotedString || isFunctionCall) {
+    input.diagnostics.push({
+      code: 'PSL_ENUM2_DEFAULT_MUST_BE_MEMBER_NAME',
+      message: `Field "${input.modelName}.${input.fieldName}" @default on an enum2 field must name a member (e.g. @default(Low)), not a raw value or function.`,
+      sourceId: input.sourceId,
+      span: input.defaultAttribute.span,
+    });
+    return {};
+  }
+
+  const match = input.enumHandle.enumMembers.find((m) => m.name === raw);
+  if (!match) {
+    const validNames = input.enumHandle.enumMembers.map((m) => m.name).join(', ');
+    input.diagnostics.push({
+      code: 'PSL_ENUM2_UNKNOWN_DEFAULT_MEMBER',
+      message: `Field "${input.modelName}.${input.fieldName}" @default(${raw}) does not name a member of ${input.enumHandle.enumName}. Valid members: ${validNames}.`,
+      sourceId: input.sourceId,
+      span: input.defaultAttribute.span,
+    });
+    return {};
+  }
+
+  return {
+    defaultValue: {
+      kind: 'literal',
+      value: blindCast<
+        ColumnDefaultLiteralInputValue,
+        'enum member values are codec-validated JsonValue-compatible scalars'
+      >(match.value),
+    },
+  };
+}
+
 export type ResolvedField = {
   readonly field: PslField;
   readonly columnName: string;
@@ -76,6 +138,7 @@ export interface CollectResolvedFieldsInput {
   readonly diagnostics: ContractSourceDiagnostic[];
   readonly sourceId: string;
   readonly scalarTypeDescriptors: ReadonlyMap<string, ColumnDescriptor>;
+  readonly enum2Handles?: ReadonlyMap<string, EnumTypeHandle>;
 }
 
 const BUILTIN_FIELD_ATTRIBUTE_NAMES: ReadonlySet<string> = new Set([
@@ -225,6 +288,7 @@ export function collectResolvedFields(input: CollectResolvedFieldsInput): Resolv
     diagnostics,
     sourceId,
     scalarTypeDescriptors,
+    enum2Handles,
   } = input;
   const resolvedFields: ResolvedField[] = [];
 
@@ -350,17 +414,27 @@ export function collectResolvedFields(input: CollectResolvedFieldsInput): Resolv
       });
       continue;
     }
-    const loweredDefault = defaultAttribute
-      ? lowerDefaultForField({
-          modelName: model.name,
-          fieldName: field.name,
-          defaultAttribute,
-          columnDescriptor: descriptor,
-          generatorDescriptorById,
-          sourceId,
-          defaultFunctionRegistry,
-          diagnostics,
-        })
+    const enum2Handle = enum2Handles?.get(field.typeName);
+    const loweredDefault: LoweredFieldDefault = defaultAttribute
+      ? enum2Handle
+        ? lowerEnum2DefaultForField({
+            modelName: model.name,
+            fieldName: field.name,
+            defaultAttribute,
+            enumHandle: enum2Handle,
+            sourceId,
+            diagnostics,
+          })
+        : lowerDefaultForField({
+            modelName: model.name,
+            fieldName: field.name,
+            defaultAttribute,
+            columnDescriptor: descriptor,
+            generatorDescriptorById,
+            sourceId,
+            defaultFunctionRegistry,
+            diagnostics,
+          })
       : {};
     const loweredOnCreate = loweredDefault.executionDefaults?.onCreate;
     if (field.optional && loweredOnCreate) {