@prisma/orm-family-sql 8.0.0-rc.14-dev.16 → 8.0.0-rc.14-dev.17

package/dist/contract-prisma7__provider.mjs

@@ -1,9 +1,10 @@
 import { d as validateSqlStorageConsistency, l as validateModelStorageReferences } from "./validators-DvzOZLel.mjs";
 import { t as deriveValueSetFromEntity } from "./value-set-derivation-hook-Di9JZ0X7.mjs";
 import { n as buildSqlContractFromDefinition, t as applySqlSpecifierControlPolicy } from "./derived-checks-C_y1rk6O-DdqjzGNy.mjs";
-import { c as resolveFieldTypeDescriptor, i as indexFkRelations, n as buildEntityTypesByDiscriminator, o as normalizeReferentialAction, r as entryForTag, s as readDataTypeDefault, t as applyBackrelationCandidates } from "./interpreter-CkCfPqup-DF7bZvNM.mjs";
+import { d as instantiateFieldTypeConstructor, o as entryForTag, v as readDataTypeDefault } from "./psl-field-resolution-_o74AUE4-CKYNRnzL.mjs";
+import { a as normalizeReferentialAction, n as buildEntityTypesByDiscriminator, r as indexFkRelations, t as applyBackrelationCandidates } from "./interpreter-C8cP92FD-Co9RsuUU.mjs";
 import { isStructuredError } from "@prisma/orm-framework/utils/structured-error";
-import { collectScalarTypeConstructors, instantiateAuthoringEntityType } from "@prisma/orm-framework/components/authoring";
+import { getAuthoringTypeConstructor, instantiateAuthoringEntityType } from "@prisma/orm-framework/components/authoring";
 import { InternalError } from "@prisma/orm-framework/utils/internal-error";
 import { ifDefined } from "@prisma/orm-framework/utils/defined";
 import { blindCast } from "@prisma/orm-framework/utils/casts";
@@ -12,7 +13,7 @@ import { readFile, readdir, stat } from "node:fs/promises";
 import { ArrayLiteralAst, BooleanLiteralExprAst, FunctionCallAst, IdentifierAst, NumberLiteralExprAst, PathExprAst, StringLiteralExprAst, dottedPathsIn, parse, printSyntax } from "@prisma/orm-framework/psl-parser/syntax";
 import { notOk, ok } from "@prisma/orm-framework/utils/result";
 import { basename, dirname, extname, join, normalize } from "pathe";
-import { buildSymbolTable, createPslDiagnosticCollector, keywordPslSpan, nodePslSpan, readResolvedAttribute, readResolvedAttributes } from "@prisma/orm-framework/psl-parser";
+import { buildSymbolTable, createPslDiagnosticCollector, diagnosticSource, keywordPslSpan, nodePslSpan, readResolvedAttribute, readResolvedAttributes } from "@prisma/orm-framework/psl-parser";
 import { fkRelationPairKey } from "@prisma/orm-framework/psl-parser/interpret";
 //#region ../../../2-sql/2-authoring/contract-prisma7/dist/provider.mjs
 function prisma7Diagnostic(code, message, sourceId, span) {
@@ -921,7 +922,6 @@ function synthesizeJunction(requester, partner, naming, diagnostics) {
 	};
 }
 const SUMMARY = "Prisma 7 schema interpretation failed";
-const EMPTY_DESCRIPTORS = /* @__PURE__ */ new Map();
 function attributeText(attribute) {
 	const args = attribute.args.map((arg) => arg.kind === "named" ? `${arg.name}: ${arg.value}` : arg.value);
 	return args.length === 0 ? `@${attribute.name}` : `@${attribute.name}(${args.join(", ")})`;
@@ -1060,7 +1060,6 @@ function interpretPrisma7Documents(input) {
 	}
 	const namespaceEntities = lowerNativeEnums(enums, input, diagnostics);
 	const modelNames = /* @__PURE__ */ new Set([...models.map((model) => model.symbol.name), ...ignoredModels]);
-	const scalarColumnDescriptors = collectScalarTypeConstructors(input.authoringContributions.type);
 	const composedExtensions = new Set(input.composedExtensions);
 	const builds = /* @__PURE__ */ new Map();
 	for (const declaration of models) {
@@ -1083,7 +1082,6 @@ function interpretPrisma7Documents(input) {
 				ignoredModels,
 				enums,
 				namespaceEntities,
-				scalarColumnDescriptors,
 				composedExtensions,
 				input,
 				diagnostics
@@ -1568,32 +1566,24 @@ function readField(args) {
 			span
 		};
 	}
-	const namespaceExtensionEntities = args.namespaceEntities.get(model.namespaceId);
+	const typeConstructor = getAuthoringTypeConstructor(input.authoringContributions, call.path);
+	if (typeConstructor === void 0) {
+		diagnostics.push(prisma7Diagnostic("PSL.PRISMA7_UNSUPPORTED_TYPE", `${label} type "${field.typeName}" could not be resolved against target "${binding.target.targetId}".`, sourceId, field.span));
+		return;
+	}
 	const typeDiagnostics = createPslDiagnosticCollector(model.sources);
-	const resolved = resolveFieldTypeDescriptor({
-		field: {
-			...field,
-			typeConstructor: call
-		},
-		enumTypeDescriptors: EMPTY_DESCRIPTORS,
-		namedTypeDescriptors: EMPTY_DESCRIPTORS,
-		scalarColumnDescriptors: args.scalarColumnDescriptors,
-		authoringContributions: input.authoringContributions,
-		composedExtensions: args.composedExtensions,
-		familyId: binding.target.familyId,
-		targetId: binding.target.targetId,
+	const resolved = instantiateFieldTypeConstructor({
+		call,
+		descriptor: typeConstructor,
 		diagnostics: typeDiagnostics,
-		sources: model.sources,
+		source: diagnosticSource(model.sources, field.node.syntax),
 		entityLabel: label,
 		namespaceId: model.namespaceId,
-		...ifDefined("namespaceExtensionEntities", namespaceExtensionEntities),
+		namespaceExtensionEntities: args.namespaceEntities.get(model.namespaceId),
 		codecLookup: input.codecLookup
 	});
 	diagnostics.push(...typeDiagnostics.toExternal());
-	if (!resolved.ok) {
-		if (!resolved.alreadyReported) diagnostics.push(prisma7Diagnostic("PSL.PRISMA7_UNSUPPORTED_TYPE", `${label} type "${field.typeName}" could not be resolved against target "${binding.target.targetId}".`, sourceId, field.span));
-		return;
-	}
+	if (!resolved.ok) return;
 	const updatedAtGeneratorId = updatedAt === void 0 ? void 0 : binding.updatedAtGeneratorId(resolved.descriptor.codecId);
 	if (updatedAt !== void 0 && updatedAtGeneratorId === void 0) {
 		const withoutUpdatedAt = defaultAttribute !== void 0 && givesColumnDefault(defaultAttribute) ? `. Its ${attributeText(defaultAttribute)} still sets the value on create, and neither client changes it on update.` : field.optional ? ", but neither client then fills the value, so it stays empty unless a client writes it, and updates leave it unchanged." : ", but neither client then fills the value, so both require it on create and leave it unchanged on update.";