@prisma/orm-family-sql 8.0.0-rc.11-dev.32 → 8.0.0-rc.11-dev.34

package/dist/{interpreter-9Ru2E-MH-CQdWmnh8.mjs → interpreter-C8N5eRW1-LGv-WI9y.mjs}

@@ -1,6 +1,6 @@
 import { t as deriveValueSetFromEntity } from "./value-set-derivation-hook-Di9JZ0X7.mjs";
 import { n as buildSqlContractFromDefinition } from "./derived-checks-DGjY5t7S-DofD5V_2.mjs";
-import { a as interpretFieldAttribute, i as findModelAttributeNode, n as fieldSpecContext, o as interpretModelAttribute, r as findFieldAttributeNode, s as sqlAttributeSpecs, t as PSL_CHECK_ON_STI_VARIANT } from "./sql-attribute-specs-CHSP1wKs-D5T2TZQ8.mjs";
+import { a as interpretFieldAttribute, i as findModelAttributeNode, n as fieldSpecContext, o as interpretModelAttribute, r as findFieldAttributeNode, s as sqlAttributeSpecs, t as PSL_CHECK_ON_STI_VARIANT } from "./sql-attribute-specs-DAEpjrWl-C0kmaUJt.mjs";
 import { t as defaultTableName } from "./default-table-name-BfFY8qYR-lHNcVmY5.mjs";
 import { structuredError } from "@prisma/orm-framework/utils/structured-error";
 import { hasRegisteredFieldNamespace, instantiateAuthoringEntityType, instantiateAuthoringFieldPreset, instantiateAuthoringTypeConstructor, isAuthoringEntityTypeDescriptor, isAuthoringFieldPresetDescriptor, isAuthoringModelAttributeDescriptor, isAuthoringPslBlockDescriptor, isAuthoringTypeConstructorDescriptor, validateAuthoringHelperArguments } from "@prisma/orm-framework/components/authoring";
@@ -9,13 +9,13 @@ import { InternalError } from "@prisma/orm-framework/utils/internal-error";
 import { crossRef } from "@prisma/orm-framework/contract/types";
 import { ifDefined } from "@prisma/orm-framework/utils/defined";
 import { blindCast } from "@prisma/orm-framework/utils/casts";
-import { findBlockDescriptor, keywordPslSpan, nodePslSpan } from "@prisma/orm-framework/psl-parser";
 import { resolveToOneRelationNullable } from "@prisma/orm-framework/contract-authoring";
 import { assertDefined, invariant } from "@prisma/orm-framework/utils/assertions";
 import { describeTaggedLiteralFailure } from "@prisma/orm-framework/components/control";
 import { notOk, ok } from "@prisma/orm-framework/utils/result";
+import { createPslDiagnosticCollector, diagnosticSource, findBlockDescriptor, keywordPslSpan, nodePslSpan } from "@prisma/orm-framework/psl-parser";
 import { consumeInvalidFkPairing, fkRelationPairKey, requiredOneToOneBackrelationDiagnostic } from "@prisma/orm-framework/psl-parser/interpret";
-//#region ../../../2-sql/2-authoring/contract-psl/dist/interpreter-9Ru2E-MH.mjs
+//#region ../../../2-sql/2-authoring/contract-psl/dist/interpreter-C8N5eRW1.mjs
 function contractError(code, message, options) {
 	return structuredError(code, message, options);
 }
@@ -47,8 +47,7 @@ function mapFieldNamesToColumns(input) {
 			input.diagnostics.push({
 				code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 				message: `${input.entityLabel} references unknown field "${input.modelName}.${fieldName}"`,
-				sourceId: input.sourceId,
-				span: input.span
+				...input.source.at(input.span)
 			});
 			return;
 		}
@@ -65,18 +64,24 @@ function formatSupportedFunctionList(registry) {
 }
 function lowerDefaultFunctionWithRegistry(input) {
 	const entry = input.registry.get(input.call.fn);
-	if (entry) return entry.lower({
-		call: input.call,
-		context: input.context
-	});
+	if (entry) {
+		const result = entry.lower({
+			call: input.call,
+			context: input.context
+		});
+		return result.ok ? result : {
+			...result,
+			kind: "external"
+		};
+	}
 	const supportedFunctionList = formatSupportedFunctionList(input.registry);
 	return {
 		ok: false,
+		kind: "owned",
 		diagnostic: {
 			code: "PSL_UNKNOWN_DEFAULT_FUNCTION",
 			message: `Default function "${input.call.fn}" is not supported in SQL PSL provider v1. Supported functions: ${supportedFunctionList}.`,
-			sourceId: input.context.sourceId,
-			span: input.call.span
+			...input.source.at(input.call.span)
 		}
 	};
 }
@@ -326,8 +331,7 @@ function pushInvalidPslHelperArgument(input) {
 	input.diagnostics.push({
 		code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 		message: `${input.entityLabel} ${input.helperLabel} ${input.message}`,
-		sourceId: input.sourceId,
-		span: input.span
+		...input.source.at(input.span)
 	});
 }
 function mapPslHelperArgs(input) {
@@ -336,7 +340,7 @@ function mapPslHelperArgs(input) {
 	const namedArgs = input.args.filter((arg) => arg.kind === "named");
 	if (positionalArgs.length > input.descriptors.length) return pushInvalidPslHelperArgument({
 		diagnostics: input.diagnostics,
-		sourceId: input.sourceId,
+		source: input.source,
 		span: input.span,
 		entityLabel: input.entityLabel,
 		helperLabel: input.helperLabel,
@@ -346,7 +350,7 @@ function mapPslHelperArgs(input) {
 		const descriptor = input.descriptors[index];
 		if (!descriptor) return pushInvalidPslHelperArgument({
 			diagnostics: input.diagnostics,
-			sourceId: input.sourceId,
+			source: input.source,
 			span: argument.span,
 			entityLabel: input.entityLabel,
 			helperLabel: input.helperLabel,
@@ -355,7 +359,7 @@ function mapPslHelperArgs(input) {
 		const value = parsePslAuthoringArgumentValue(descriptor, argument.value);
 		if (value === INVALID_AUTHORING_ARGUMENT) return pushInvalidPslHelperArgument({
 			diagnostics: input.diagnostics,
-			sourceId: input.sourceId,
+			source: input.source,
 			span: argument.span,
 			entityLabel: input.entityLabel,
 			helperLabel: input.helperLabel,
@@ -367,7 +371,7 @@ function mapPslHelperArgs(input) {
 		const descriptorIndex = input.descriptors.findIndex((descriptor) => descriptor.name === argument.name);
 		if (descriptorIndex < 0) return pushInvalidPslHelperArgument({
 			diagnostics: input.diagnostics,
-			sourceId: input.sourceId,
+			source: input.source,
 			span: argument.span,
 			entityLabel: input.entityLabel,
 			helperLabel: input.helperLabel,
@@ -375,7 +379,7 @@ function mapPslHelperArgs(input) {
 		});
 		if (mappedArgs[descriptorIndex] !== void 0) return pushInvalidPslHelperArgument({
 			diagnostics: input.diagnostics,
-			sourceId: input.sourceId,
+			source: input.source,
 			span: argument.span,
 			entityLabel: input.entityLabel,
 			helperLabel: input.helperLabel,
@@ -384,7 +388,7 @@ function mapPslHelperArgs(input) {
 		const descriptor = input.descriptors[descriptorIndex];
 		if (!descriptor) return pushInvalidPslHelperArgument({
 			diagnostics: input.diagnostics,
-			sourceId: input.sourceId,
+			source: input.source,
 			span: argument.span,
 			entityLabel: input.entityLabel,
 			helperLabel: input.helperLabel,
@@ -393,7 +397,7 @@ function mapPslHelperArgs(input) {
 		const value = parsePslAuthoringArgumentValue(descriptor, argument.value);
 		if (value === INVALID_AUTHORING_ARGUMENT) return pushInvalidPslHelperArgument({
 			diagnostics: input.diagnostics,
-			sourceId: input.sourceId,
+			source: input.source,
 			span: argument.span,
 			entityLabel: input.entityLabel,
 			helperLabel: input.helperLabel,
@@ -477,8 +481,7 @@ function reportUncomposedNamespace(input) {
 	input.diagnostics.push({
 		code: "PSL_EXTENSION_NAMESPACE_NOT_COMPOSED",
 		message: `${input.subjectLabel} uses unrecognized namespace "${input.namespace}". Add extension pack "${input.namespace}" to extensions in prisma.config.ts.`,
-		sourceId: input.sourceId,
-		span: input.span,
+		...input.source.at(input.span),
 		data: {
 			namespace: input.namespace,
 			suggestedPack: input.namespace
@@ -492,8 +495,7 @@ function reportUnknownFieldPreset(input) {
 	input.diagnostics.push({
 		code: "PSL_UNKNOWN_FIELD_PRESET",
 		message: `${input.entityLabel} references unknown field preset "${input.helperPath}". Check the spelling against the available presets in the "${input.namespace}" namespace.`,
-		sourceId: input.sourceId,
-		span: input.span,
+		...input.source.at(input.span),
 		data: {
 			namespace: input.namespace,
 			helperPath: input.helperPath
@@ -508,7 +510,7 @@ function instantiatePslTypeConstructor(input) {
 		helperLabel: `constructor "${helperPath}"`,
 		span: input.call.span,
 		diagnostics: input.diagnostics,
-		sourceId: input.sourceId,
+		source: input.source,
 		entityLabel: input.entityLabel
 	});
 	if (!args) return;
@@ -520,8 +522,7 @@ function instantiatePslTypeConstructor(input) {
 		input.diagnostics.push({
 			code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 			message: `${input.entityLabel} constructor "${helperPath}" ${message}`,
-			sourceId: input.sourceId,
-			span: input.call.span
+			...input.source.at(input.call.span)
 		});
 		return;
 	}
@@ -530,8 +531,7 @@ function pushUnsupportedTypeConstructorDiagnostic(input) {
 	input.diagnostics.push({
 		code: input.code,
 		message: input.message,
-		sourceId: input.sourceId,
-		span: input.span
+		...input.source.at(input.span)
 	});
 }
 function resolvePslTypeConstructorDescriptor(input) {
@@ -546,7 +546,7 @@ function resolvePslTypeConstructorDescriptor(input) {
 		reportUncomposedNamespace({
 			subjectLabel: `Type constructor "${input.call.path.join(".")}"`,
 			namespace: uncomposedNamespace,
-			sourceId: input.sourceId,
+			source: input.source,
 			span: input.call.span,
 			diagnostics: input.diagnostics
 		});
@@ -554,7 +554,7 @@ function resolvePslTypeConstructorDescriptor(input) {
 	}
 	return pushUnsupportedTypeConstructorDiagnostic({
 		diagnostics: input.diagnostics,
-		sourceId: input.sourceId,
+		source: input.source,
 		span: input.call.span,
 		code: input.unsupportedCode,
 		message: input.unsupportedMessage
@@ -573,7 +573,7 @@ function instantiateFieldPreset(input) {
 		helperLabel: `preset "${helperPath}"`,
 		span: input.call.span,
 		diagnostics: input.diagnostics,
-		sourceId: input.sourceId,
+		source: input.source,
 		entityLabel: input.entityLabel
 	});
 	if (!args) return;
@@ -597,8 +597,7 @@ function instantiateFieldPreset(input) {
 		input.diagnostics.push({
 			code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 			message: `${input.entityLabel} preset "${helperPath}" ${message}`,
-			sourceId: input.sourceId,
-			span: input.call.span
+			...input.source.at(input.call.span)
 		});
 		return;
 	}
@@ -636,8 +635,7 @@ function resolveEntityRefTypeConstructorCall(input) {
 		input.diagnostics.push({
 			code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 			message: `${input.entityLabel} type constructor "${helperPath}" expects exactly one positional argument naming the referenced entity`,
-			sourceId: input.sourceId,
-			span: input.call.span
+			...input.source.at(input.call.span)
 		});
 		return {
 			ok: false,
@@ -648,8 +646,7 @@ function resolveEntityRefTypeConstructorCall(input) {
 		input.diagnostics.push({
 			code: "PSL_UNKNOWN_ENTITY_REF",
 			message: `${input.entityLabel} type constructor "${helperPath}(${ref})" does not resolve — no entity named "${ref}" was found in namespace "${input.namespaceId ?? "(unspecified)"}"`,
-			sourceId: input.sourceId,
-			span: input.call.span
+			...input.source.at(input.call.span)
 		});
 		return {
 			ok: false,
@@ -671,8 +668,7 @@ function resolveEntityRefTypeConstructorCall(input) {
 		input.diagnostics.push({
 			code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 			message: `${input.entityLabel} type constructor "${helperPath}(${ref})" resolves to a value-set-typed entity, but the field has no resolvable namespace to scope the value-set ref to`,
-			sourceId: input.sourceId,
-			span: input.call.span
+			...input.source.at(input.call.span)
 		});
 		return {
 			ok: false,
@@ -696,6 +692,7 @@ function resolveEntityRefTypeConstructorCall(input) {
 	};
 }
 function resolveFieldTypeDescriptor(input) {
+	const source = diagnosticSource(input.sources, input.field.node.syntax);
 	if (input.field.malformedType) return {
 		ok: false,
 		alreadyReported: true
@@ -707,7 +704,7 @@ function resolveFieldTypeDescriptor(input) {
 				call: input.field.typeConstructor,
 				descriptor: presetDescriptor,
 				diagnostics: input.diagnostics,
-				sourceId: input.sourceId,
+				source,
 				entityLabel: input.entityLabel
 			});
 			if (!instantiated) return {
@@ -737,7 +734,7 @@ function resolveFieldTypeDescriptor(input) {
 			namespaceExtensionEntities: input.namespaceExtensionEntities,
 			codecLookup: input.codecLookup,
 			diagnostics: input.diagnostics,
-			sourceId: input.sourceId,
+			source,
 			entityLabel: input.entityLabel
 		});
 		if (!typeDescriptor && namespacePrefix && hasRegisteredFieldNamespace(input.authoringContributions, namespacePrefix)) {
@@ -745,7 +742,7 @@ function resolveFieldTypeDescriptor(input) {
 				entityLabel: input.entityLabel,
 				namespace: namespacePrefix,
 				helperPath,
-				sourceId: input.sourceId,
+				source,
 				span: input.field.typeConstructor.span,
 				diagnostics: input.diagnostics
 			});
@@ -761,7 +758,7 @@ function resolveFieldTypeDescriptor(input) {
 			familyId: input.familyId,
 			targetId: input.targetId,
 			diagnostics: input.diagnostics,
-			sourceId: input.sourceId,
+			source,
 			unsupportedCode: "PSL_UNSUPPORTED_FIELD_TYPE",
 			unsupportedMessage: `${input.entityLabel} type constructor "${helperPath}" is not supported in SQL PSL provider v1`
 		});
@@ -773,7 +770,7 @@ function resolveFieldTypeDescriptor(input) {
 			call: input.field.typeConstructor,
 			descriptor,
 			diagnostics: input.diagnostics,
-			sourceId: input.sourceId,
+			source,
 			entityLabel: input.entityLabel
 		});
 		if (!instantiated) return {
@@ -799,21 +796,21 @@ const TAGGED_LITERAL_CANONICALIZATION_CODES = {
 	nul: "PSL_TAGGED_LITERAL_NUL",
 	"too-large": "PSL_TAGGED_LITERAL_TOO_LARGE"
 };
-function lowerTaggedLiteral(literal, registry, context) {
+function lowerTaggedLiteral(literal, registry, context, source) {
 	const reject = (code, message) => ({
 		ok: false,
+		kind: "owned",
 		diagnostic: {
 			code,
 			message,
-			sourceId: context.sourceId,
-			span: literal.span
+			...source.at(literal.span)
 		}
 	});
 	const entry = registry.get(literal.tag);
 	if (entry === void 0) return reject("PSL_UNKNOWN_DEFAULT_LITERAL_TAG", `Unknown literal tag "${literal.tag}". Known tags: ${[...registry.keys()].join(", ")}.`);
 	const { canonicalization } = literal;
 	if (!canonicalization.ok) return reject(TAGGED_LITERAL_CANONICALIZATION_CODES[canonicalization.reason], describeTaggedLiteralFailure(canonicalization.reason));
-	return entry.lower({
+	const result = entry.lower({
 		literal: {
 			tag: literal.tag,
 			body: canonicalization.body,
@@ -821,10 +818,15 @@ function lowerTaggedLiteral(literal, registry, context) {
 		},
 		context
 	});
+	return result.ok ? result : {
+		...result,
+		kind: "external"
+	};
 }
 function lowerDefaultForField(input) {
 	const node = findFieldAttributeNode(input.field, "default");
 	if (node === void 0) return {};
+	const source = diagnosticSource(input.sources, node.syntax);
 	const interpreted = interpretFieldAttribute({
 		node,
 		spec: sqlAttributeSpecs.field.default(fieldSpecContext({
@@ -838,8 +840,7 @@ function lowerDefaultForField(input) {
 		})),
 		model: input.model,
 		field: input.field,
-		sourceFile: input.sourceFile,
-		sourceId: input.sourceId,
+		sources: input.sources,
 		diagnostics: input.diagnostics
 	});
 	if (interpreted === void 0) return {};
@@ -855,18 +856,20 @@ function lowerDefaultForField(input) {
 	} };
 	if (typeof value === "object") {
 		const context = {
-			sourceId: input.sourceId,
+			sourceId: input.sources.sourceFileFor(node.syntax).filename,
 			modelName: input.modelName,
 			fieldName: input.fieldName,
 			columnCodecId: input.columnDescriptor.codecId
 		};
-		const lowered = "tag" in value ? lowerTaggedLiteral(value, input.defaultLiteralTagRegistry, context) : lowerDefaultFunctionWithRegistry({
+		const lowered = "tag" in value ? lowerTaggedLiteral(value, input.defaultLiteralTagRegistry, context, source) : lowerDefaultFunctionWithRegistry({
 			call: value,
 			registry: input.defaultFunctionRegistry,
-			context
+			context,
+			source
 		});
 		if (!lowered.ok) {
-			input.diagnostics.push(lowered.diagnostic);
+			if (lowered.kind === "owned") input.diagnostics.push(lowered.diagnostic);
+			else input.diagnostics.pushExternal(lowered.diagnostic);
 			return {};
 		}
 		if (lowered.value.kind === "storage") return { defaultValue: lowered.value.defaultValue };
@@ -875,8 +878,7 @@ function lowerDefaultForField(input) {
 			input.diagnostics.push({
 				code: "PSL_INVALID_DEFAULT_APPLICABILITY",
 				message: `Default generator "${lowered.value.generated.id}" is not available in the composed mutation default registry.`,
-				sourceId: input.sourceId,
-				span: value.span
+				...source.at(value.span)
 			});
 			return {};
 		}
@@ -884,8 +886,7 @@ function lowerDefaultForField(input) {
 			input.diagnostics.push({
 				code: "PSL_INVALID_DEFAULT_APPLICABILITY",
 				message: `Default generator "${generatorDescriptor.id}" is not applicable to "@default(...)" lowering. Use the corresponding field preset (e.g. \`temporal.${generatorDescriptor.id === "timestampNow" ? "updatedAt" : generatorDescriptor.id}()\`) instead.`,
-				sourceId: input.sourceId,
-				span: value.span
+				...source.at(value.span)
 			});
 			return {};
 		}
@@ -893,8 +894,7 @@ function lowerDefaultForField(input) {
 			input.diagnostics.push({
 				code: "PSL_INVALID_DEFAULT_APPLICABILITY",
 				message: `Default generator "${generatorDescriptor.id}" is not applicable to "${input.modelName}.${input.fieldName}" with codecId "${input.columnDescriptor.codecId}".`,
-				sourceId: input.sourceId,
-				span: value.span
+				...source.at(value.span)
 			});
 			return {};
 		}
@@ -911,7 +911,7 @@ function resolveColumnDescriptor(field, enumTypeDescriptors, namedTypeDescriptor
 	return scalarColumnDescriptors.get(field.typeName);
 }
 function lowerEnumDefaultForField(input) {
-	const { field, model, sourceFile, enumHandle, sourceId, diagnostics } = input;
+	const { field, model, enumHandle, diagnostics } = input;
 	const node = findFieldAttributeNode(field, "default");
 	if (node === void 0) return {};
 	if (enumHandle.enumMembers.length === 0) return {};
@@ -928,8 +928,7 @@ function lowerEnumDefaultForField(input) {
 		})),
 		model,
 		field,
-		sourceFile,
-		sourceId,
+		sources: input.sources,
 		diagnostics
 	});
 	if (interpreted === void 0) return {};
@@ -961,8 +960,7 @@ function validateFieldAttributes(input) {
 			input.diagnostics.push({
 				code: "PSL_UNSUPPORTED_FIELD_ATTRIBUTE",
 				message: formatDbAttributeMigrationMessage(attribute),
-				sourceId: input.sourceId,
-				span: attribute.span
+				...diagnosticSource(input.sources, input.field.node.syntax).at(attribute.span)
 			});
 			continue;
 		}
@@ -975,7 +973,7 @@ function validateFieldAttributes(input) {
 			reportUncomposedNamespace({
 				subjectLabel: `Attribute "@${attribute.name}"`,
 				namespace: uncomposedNamespace,
-				sourceId: input.sourceId,
+				source: diagnosticSource(input.sources, input.field.node.syntax),
 				span: attribute.span,
 				diagnostics: input.diagnostics
 			});
@@ -987,8 +985,7 @@ function validateFieldAttributes(input) {
 		input.diagnostics.push({
 			code: "PSL_UNSUPPORTED_FIELD_ATTRIBUTE",
 			message,
-			sourceId: input.sourceId,
-			span: attribute.span
+			...diagnosticSource(input.sources, input.field.node.syntax).at(attribute.span)
 		});
 	}
 }
@@ -1001,8 +998,7 @@ function extractFieldConstraintNames(input) {
 		spec: sqlAttributeSpecs.field.id(),
 		model: input.model,
 		field: input.field,
-		sourceFile: input.sourceFile,
-		sourceId: input.sourceId,
+		sources: input.sources,
 		diagnostics: input.diagnostics
 	})?.map;
 	const uniqueNode = findFieldAttributeNode(input.field, "unique");
@@ -1015,8 +1011,7 @@ function extractFieldConstraintNames(input) {
 			spec: sqlAttributeSpecs.field.unique(),
 			model: input.model,
 			field: input.field,
-			sourceFile: input.sourceFile,
-			sourceId: input.sourceId,
+			sources: input.sources,
 			diagnostics: input.diagnostics
 		})?.map
 	};
@@ -1036,8 +1031,7 @@ function lowerNoCheckForField(input) {
 		spec: sqlAttributeSpecs.field.noCheck(),
 		model: input.model,
 		field: input.field,
-		sourceFile: input.sourceFile,
-		sourceId: input.sourceId,
+		sources: input.sources,
 		diagnostics: input.diagnostics
 	});
 	if (interpreted === void 0) return void 0;
@@ -1052,8 +1046,7 @@ function lowerNoCheckForField(input) {
 			input.diagnostics.push({
 				code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 				message: `${subject} @noCheck waives nothing — this column's shape derives no generated checks`,
-				sourceId: input.sourceId,
-				span
+				...diagnosticSource(input.sources, input.field.node.syntax).at(span)
 			});
 			return;
 		}
@@ -1064,20 +1057,20 @@ function lowerNoCheckForField(input) {
 		input.diagnostics.push({
 			code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 			message: `${subject} @noCheck(${kind}) does not apply — ${explanation}`,
-			sourceId: input.sourceId,
-			span
+			...diagnosticSource(input.sources, input.field.node.syntax).at(span)
 		});
 		return;
 	}
 	return [...authored].sort();
 }
 function collectResolvedFields(input) {
-	const { model, symbolTable, mapping, enumTypeDescriptors, namedTypeDescriptors, modelNames, compositeTypeNames, composedExtensions, authoringContributions, familyId, targetId, defaultFunctionRegistry, defaultLiteralTagRegistry, generatorDescriptorById, diagnostics, sourceId, scalarColumnDescriptors, enumHandles, capabilities, namespaceId, namespaceExtensionEntities, codecLookup } = input;
+	const { model, symbolTable, mapping, enumTypeDescriptors, namedTypeDescriptors, modelNames, compositeTypeNames, composedExtensions, authoringContributions, familyId, targetId, defaultFunctionRegistry, defaultLiteralTagRegistry, generatorDescriptorById, diagnostics, sources, scalarColumnDescriptors, enumHandles, capabilities, namespaceId, namespaceExtensionEntities, codecLookup } = input;
 	const resolvedFields = [];
 	const valueObjectStorageTypeName = authoringContributions?.valueObjectStorageType;
 	const declaredControlPolicy = getAttribute(model.attributes, "control")?.args.find((arg) => arg.kind === "positional")?.value.trim();
 	const modelDerivesChecks = declaredControlPolicy === void 0 || declaredControlPolicy === "managed";
 	for (const field of Object.values(model.fields)) {
+		const source = diagnosticSource(sources, field.node.syntax);
 		const isModelField = modelNames.has(field.typeName);
 		if (field.list && isModelField) continue;
 		validateFieldAttributes({
@@ -1086,7 +1079,7 @@ function collectResolvedFields(input) {
 			composedExtensions,
 			authoringContributions,
 			diagnostics,
-			sourceId,
+			sources,
 			familyId,
 			targetId
 		});
@@ -1109,7 +1102,7 @@ function collectResolvedFields(input) {
 			familyId,
 			targetId,
 			diagnostics,
-			sourceId,
+			sources,
 			entityLabel: `Field "${model.name}.${field.name}"`,
 			...ifDefined("namespaceId", namespaceId),
 			...ifDefined("namespaceExtensionEntities", namespaceExtensionEntities),
@@ -1121,8 +1114,7 @@ function collectResolvedFields(input) {
 				diagnostics.push({
 					code: "PSL_SCALAR_LIST_UNSUPPORTED_TARGET",
 					message: `Field "${model.name}.${field.name}" is a scalar list, but target "${targetId}" does not support scalar lists (the adapter does not report the "scalarList" capability). Remove the list or author it against a target that supports scalar lists.`,
-					sourceId,
-					span: field.span
+					...source.at(field.span)
 				});
 				continue;
 			}
@@ -1131,8 +1123,7 @@ function collectResolvedFields(input) {
 				if (!resolved.alreadyReported) diagnostics.push({
 					code: "PSL_UNSUPPORTED_FIELD_TYPE",
 					message: `Field "${model.name}.${field.name}" type "${field.typeName}" is not supported in SQL PSL provider v1`,
-					sourceId,
-					span: field.span
+					...source.at(field.span)
 				});
 				continue;
 			}
@@ -1140,8 +1131,7 @@ function collectResolvedFields(input) {
 				diagnostics.push({
 					code: "PSL_PRESET_NOT_LIST",
 					message: `Field "${model.name}.${field.name}" uses a field-preset call as a list element type. Presets cannot be list elements; remove "[]" or use a scalar type.`,
-					sourceId,
-					span: field.span
+					...source.at(field.span)
 				});
 				continue;
 			}
@@ -1153,8 +1143,7 @@ function collectResolvedFields(input) {
 				if (!resolved.alreadyReported) diagnostics.push({
 					code: "PSL_UNSUPPORTED_FIELD_TYPE",
 					message: `Field "${model.name}.${field.name}" type "${field.typeName}" is not supported in SQL PSL provider v1`,
-					sourceId,
-					span: field.span
+					...source.at(field.span)
 				});
 				continue;
 			}
@@ -1166,8 +1155,7 @@ function collectResolvedFields(input) {
 			diagnostics.push({
 				code: "PSL_PRESET_NOT_OPTIONAL",
 				message: `Field "${model.name}.${field.name}" uses a field-preset call and cannot be optional. Remove "?" or use a different field type.`,
-				sourceId,
-				span: field.span
+				...source.at(field.span)
 			});
 			continue;
 		}
@@ -1176,8 +1164,7 @@ function collectResolvedFields(input) {
 			diagnostics.push({
 				code: "PSL_PRESET_AND_DEFAULT_CONFLICT",
 				message: `Field "${model.name}.${field.name}" uses a field-preset call and cannot also declare @default(...). The preset already specifies the default value.`,
-				sourceId,
-				span: defaultAttribute.span
+				...source.at(defaultAttribute.span)
 			});
 			continue;
 		}
@@ -1188,9 +1175,8 @@ function collectResolvedFields(input) {
 			field,
 			model,
 			symbolTable,
-			sourceFile: input.sourceFile,
+			sources: input.sources,
 			enumHandle,
-			sourceId,
 			defaultFunctionRegistry,
 			defaultLiteralTagRegistry,
 			diagnostics
@@ -1200,10 +1186,9 @@ function collectResolvedFields(input) {
 			field,
 			model,
 			symbolTable,
-			sourceFile: input.sourceFile,
+			sources: input.sources,
 			columnDescriptor: descriptor,
 			generatorDescriptorById,
-			sourceId,
 			defaultFunctionRegistry,
 			defaultLiteralTagRegistry,
 			codecLookup,
@@ -1214,8 +1199,7 @@ function collectResolvedFields(input) {
 			diagnostics.push({
 				code: "PSL_LIST_AUTOINCREMENT_UNSUPPORTED",
 				message: `Field "${model.name}.${field.name}" is a list and cannot use autoincrement(); it is a Prisma marker for a sequence-backed scalar column, not SQL.`,
-				sourceId,
-				span: defaultAttribute?.span ?? field.span
+				...source.at(defaultAttribute?.span ?? field.span)
 			});
 			continue;
 		}
@@ -1224,8 +1208,7 @@ function collectResolvedFields(input) {
 			diagnostics.push({
 				code: "PSL_LIST_EXECUTION_DEFAULT_UNSUPPORTED",
 				message: `Field "${model.name}.${field.name}" is a list and cannot use an execution default ("${defaultExpression}"). Lists have no per-element execution-default semantics; use a literal list @default or remove the default.`,
-				sourceId,
-				span: defaultAttribute?.span ?? field.span
+				...source.at(defaultAttribute?.span ?? field.span)
 			});
 			continue;
 		}
@@ -1234,8 +1217,7 @@ function collectResolvedFields(input) {
 			diagnostics.push({
 				code: "PSL_INVALID_DEFAULT_FUNCTION_ARGUMENT",
 				message: `Field "${model.name}.${field.name}" cannot be optional when using execution default ${generatorDescription}. Remove "?" or use a storage default.`,
-				sourceId,
-				span: defaultAttribute?.span ?? field.span
+				...source.at(defaultAttribute?.span ?? field.span)
 			});
 			continue;
 		}
@@ -1243,8 +1225,7 @@ function collectResolvedFields(input) {
 		const { idAttribute, uniqueAttribute, idName, uniqueName } = extractFieldConstraintNames({
 			model,
 			field,
-			sourceFile: input.sourceFile,
-			sourceId,
+			sources: input.sources,
 			diagnostics
 		});
 		let isIdField = Boolean(idAttribute);
@@ -1252,8 +1233,7 @@ function collectResolvedFields(input) {
 			diagnostics.push({
 				code: "PSL_LIST_ID_UNSUPPORTED",
 				message: `Field "${model.name}.${field.name}" is a list and cannot be a primary key. Remove @id; a list cannot be an identity column.`,
-				sourceId,
-				span: idAttribute.span
+				...source.at(idAttribute.span)
 			});
 			continue;
 		}
@@ -1261,8 +1241,7 @@ function collectResolvedFields(input) {
 			diagnostics.push({
 				code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 				message: `Field "${model.name}.${field.name}" @id cannot be optional; primary key columns must be NOT NULL`,
-				sourceId,
-				span: idAttribute.span
+				...source.at(idAttribute.span)
 			});
 			isIdField = false;
 		}
@@ -1270,8 +1249,7 @@ function collectResolvedFields(input) {
 			diagnostics.push({
 				code: "PSL_PRESET_AND_ID_CONFLICT",
 				message: `Field "${model.name}.${field.name}" uses a field-preset call and cannot also declare @id. Use a preset that contributes id semantics, or drop @id.`,
-				sourceId,
-				span: idAttribute.span
+				...source.at(idAttribute.span)
 			});
 			continue;
 		}
@@ -1280,8 +1258,7 @@ function collectResolvedFields(input) {
 		const noCheckKinds = modelDerivesChecks ? lowerNoCheckForField({
 			model,
 			field,
-			sourceFile: input.sourceFile,
-			sourceId,
+			sources: input.sources,
 			isListField: isListField && !isValueObjectField,
 			isDomainEnum: enumHandle !== void 0,
 			diagnostics
@@ -1305,7 +1282,7 @@ function collectResolvedFields(input) {
 	}
 	return resolvedFields;
 }
-function buildModelMappings(modelEntries, defaultNamespaceId, diagnostics, sourceId, sourceFile) {
+function buildModelMappings(modelEntries, defaultNamespaceId, diagnostics, sources) {
 	const result = /* @__PURE__ */ new Map();
 	for (const { model, namespaceId } of modelEntries) {
 		const mapNode = findModelAttributeNode(model, "map");
@@ -1313,8 +1290,7 @@ function buildModelMappings(modelEntries, defaultNamespaceId, diagnostics, sourc
 			node: mapNode,
 			spec: sqlAttributeSpecs.model.map(),
 			model,
-			sourceFile,
-			sourceId,
+			sources,
 			diagnostics
 		})?.name ?? defaultTableName(model.name);
 		const fieldColumns = /* @__PURE__ */ new Map();
@@ -1325,8 +1301,7 @@ function buildModelMappings(modelEntries, defaultNamespaceId, diagnostics, sourc
 				spec: sqlAttributeSpecs.field.map(),
 				model,
 				field,
-				sourceFile,
-				sourceId,
+				sources,
 				diagnostics
 			})?.name ?? field.name;
 			fieldColumns.set(field.name, columnName);
@@ -1346,8 +1321,7 @@ function validateNamedTypeAttributes(input) {
 			input.diagnostics.push({
 				code: "PSL_UNSUPPORTED_NAMED_TYPE_ATTRIBUTE",
 				message: formatDbAttributeMigrationMessage(attribute),
-				sourceId: input.sourceId,
-				span: attribute.span
+				...input.source.at(attribute.span)
 			});
 			hasUnsupportedNamedTypeAttribute = true;
 			continue;
@@ -1361,7 +1335,7 @@ function validateNamedTypeAttributes(input) {
 			reportUncomposedNamespace({
 				subjectLabel: `Attribute "@${attribute.name}"`,
 				namespace: uncomposedNamespace,
-				sourceId: input.sourceId,
+				source: input.source,
 				span: attribute.span,
 				diagnostics: input.diagnostics
 			});
@@ -1371,8 +1345,7 @@ function validateNamedTypeAttributes(input) {
 		input.diagnostics.push({
 			code: "PSL_UNSUPPORTED_NAMED_TYPE_ATTRIBUTE",
 			message: `Named type "${input.declaration.name}" uses unsupported attribute "${attribute.name}"`,
-			sourceId: input.sourceId,
-			span: attribute.span
+			...input.source.at(attribute.span)
 		});
 		hasUnsupportedNamedTypeAttribute = true;
 	}
@@ -1382,20 +1355,20 @@ function resolveNamedTypeDeclarations(input) {
 	const storageTypeEntries = [];
 	const namedTypeDescriptors = /* @__PURE__ */ new Map();
 	for (const declaration of input.declarations) {
+		const source = diagnosticSource(input.source.sources, declaration.node.syntax);
 		if (declaration.isConstructor) {
 			const typeConstructor = declaration.typeConstructor;
 			if (typeConstructor === void 0) {
 				input.diagnostics.push({
 					code: "PSL_UNSUPPORTED_NAMED_TYPE_BASE",
 					message: `Named type "${declaration.name}" must declare a base type or constructor`,
-					sourceId: input.sourceId,
-					span: declaration.span
+					...source.at(declaration.span)
 				});
 				continue;
 			}
 			if (validateNamedTypeAttributes({
 				declaration,
-				sourceId: input.sourceId,
+				source,
 				diagnostics: input.diagnostics,
 				composedExtensions: input.composedExtensions,
 				authoringContributions: input.authoringContributions,
@@ -1410,7 +1383,7 @@ function resolveNamedTypeDeclarations(input) {
 				familyId: input.familyId,
 				targetId: input.targetId,
 				diagnostics: input.diagnostics,
-				sourceId: input.sourceId,
+				source,
 				unsupportedCode: "PSL_UNSUPPORTED_NAMED_TYPE_CONSTRUCTOR",
 				unsupportedMessage: `Named type "${declaration.name}" references unsupported constructor "${helperPath}"`
 			});
@@ -1419,7 +1392,7 @@ function resolveNamedTypeDeclarations(input) {
 				call: typeConstructor,
 				descriptor,
 				diagnostics: input.diagnostics,
-				sourceId: input.sourceId,
+				source,
 				entityLabel: `Named type "${declaration.name}"`
 			});
 			if (!storageType) continue;
@@ -1437,8 +1410,7 @@ function resolveNamedTypeDeclarations(input) {
 			input.diagnostics.push({
 				code: "PSL_UNSUPPORTED_NAMED_TYPE_BASE",
 				message: `Named type "${declaration.name}" must declare a base type or constructor`,
-				sourceId: input.sourceId,
-				span: declaration.span
+				...source.at(declaration.span)
 			});
 			continue;
 		}
@@ -1447,14 +1419,13 @@ function resolveNamedTypeDeclarations(input) {
 			input.diagnostics.push({
 				code: "PSL_UNSUPPORTED_NAMED_TYPE_BASE",
 				message: `Named type "${declaration.name}" references unsupported base type "${baseType}"`,
-				sourceId: input.sourceId,
-				span: declaration.span
+				...source.at(declaration.span)
 			});
 			continue;
 		}
 		if (validateNamedTypeAttributes({
 			declaration,
-			sourceId: input.sourceId,
+			source,
 			diagnostics: input.diagnostics,
 			composedExtensions: input.composedExtensions,
 			authoringContributions: input.authoringContributions,
@@ -1506,8 +1477,7 @@ function interpretRelationAttribute(input) {
 		spec: sqlAttributeSpecs.field.relation(),
 		model: input.selfModel,
 		field: input.field,
-		sourceFile: input.sourceFile,
-		sourceId: input.sourceId,
+		sources: input.sources,
 		diagnostics: input.diagnostics,
 		resolveReferencedModel: () => resolveReferencedModel(input.symbols, input.field)
 	});
@@ -1638,7 +1608,8 @@ function findJunctionFkPairs(input) {
 		nearMisses
 	};
 }
-function junctionNearMissDiagnostic(candidate, nearMiss, sourceId) {
+function junctionNearMissDiagnostic(candidate, nearMiss, sources) {
+	const source = diagnosticSource(sources, candidate.field.node.syntax);
 	const listField = `${candidate.modelName}.${candidate.field.name}`;
 	const data = {
 		listField,
@@ -1648,15 +1619,13 @@ function junctionNearMissDiagnostic(candidate, nearMiss, sourceId) {
 	if (nearMiss.reason === "target-fk-not-id") return {
 		code: "PSL_JUNCTION_TARGET_FK_NOT_ID",
 		message: `Backrelation list field "${listField}" found junction model "${nearMiss.junctionModelName}", but its foreign key to "${candidate.targetModelName}" does not reference "${candidate.targetModelName}"'s @id. The junction's target-side foreign key must reference "${candidate.targetModelName}"'s full @id columns for many-to-many recognition.`,
-		sourceId,
-		span: candidate.field.span,
+		...source.at(candidate.field.span),
 		data
 	};
 	return {
 		code: "PSL_JUNCTION_ID_NOT_FK_COVERING",
 		message: `Backrelation list field "${listField}" found junction-shaped model "${nearMiss.junctionModelName}" linking "${candidate.modelName}" and "${candidate.targetModelName}", but its id does not cover exactly its foreign-key columns. Declare @@id([...]) on "${nearMiss.junctionModelName}" listing exactly the two foreign-key columns for many-to-many recognition.`,
-		sourceId,
-		span: candidate.field.span,
+		...source.at(candidate.field.span),
 		data
 	};
 }
@@ -1701,6 +1670,7 @@ function fkColumnsAreUnique(localColumns, uniqueColumnSets) {
 }
 function applyBackrelationCandidates(input) {
 	for (const candidate of input.backrelationCandidates) {
+		const source = diagnosticSource(input.sources, candidate.field.node.syntax);
 		const pairKey = fkRelationPairKey(candidate.targetModelName, candidate.modelName);
 		const pairMatches = input.fkRelationsByPair.get(pairKey) ?? [];
 		const matches = candidate.relationName ? pairMatches.filter((relation) => relation.relationName === candidate.relationName) : [...pairMatches];
@@ -1721,22 +1691,20 @@ function applyBackrelationCandidates(input) {
 					input.diagnostics.push({
 						code: "PSL_AMBIGUOUS_BACKRELATION",
 						message: `Backrelation list field "${candidate.modelName}.${candidate.field.name}" matches multiple junction FK pairs for a many-to-many relation. Add @relation(name: "...") (or @relation("...")) to the list field and the junction FK-side relation pointing back at "${candidate.modelName}" to disambiguate.`,
-						sourceId: input.sourceId,
-						span: candidate.field.span
+						...source.at(candidate.field.span)
 					});
 					continue;
 				}
 				const nearMiss = nearMisses[0];
 				if (nearMiss) {
-					input.diagnostics.push(junctionNearMissDiagnostic(candidate, nearMiss, input.sourceId));
+					input.diagnostics.push(junctionNearMissDiagnostic(candidate, nearMiss, input.sources));
 					continue;
 				}
 			}
 			input.diagnostics.push({
 				code: "PSL_ORPHANED_BACKRELATION",
 				message: `Backrelation field "${candidate.modelName}.${candidate.field.name}" has no matching FK-side relation on model "${candidate.targetModelName}". Add @relation(fields: [...], references: [...]) on the FK-side relation${candidate.isList ? " or use an explicit join model for many-to-many" : ""}.`,
-				sourceId: input.sourceId,
-				span: candidate.field.span
+				...source.at(candidate.field.span)
 			});
 			continue;
 		}
@@ -1744,8 +1712,7 @@ function applyBackrelationCandidates(input) {
 			input.diagnostics.push({
 				code: "PSL_AMBIGUOUS_BACKRELATION",
 				message: `Backrelation field "${candidate.modelName}.${candidate.field.name}" matches multiple FK-side relations on model "${candidate.targetModelName}". Add @relation(name: "...") (or @relation("...")) to both sides to disambiguate.`,
-				sourceId: input.sourceId,
-				span: candidate.field.span
+				...source.at(candidate.field.span)
 			});
 			continue;
 		}
@@ -1758,8 +1725,7 @@ function applyBackrelationCandidates(input) {
 				input.diagnostics.push({
 					code: "PSL_NON_UNIQUE_BACKRELATION",
 					message: `Backrelation field "${candidate.modelName}.${candidate.field.name}" is singular, but the matching FK on "${matched.declaringModelName}" (fields ${matched.localColumns.map((column) => `"${column}"`).join(", ")}) is not unique. A singular back-relation implies at most one related row; add @unique (or @@unique([...])) to the FK fields, or make "${candidate.field.name}" a list.`,
-					sourceId: input.sourceId,
-					span: candidate.field.span
+					...source.at(candidate.field.span)
 				});
 				continue;
 			}
@@ -1768,7 +1734,7 @@ function applyBackrelationCandidates(input) {
 			modelName: candidate.modelName,
 			field: candidate.field,
 			targetModelName: candidate.targetModelName,
-			sourceId: input.sourceId,
+			sources: input.sources,
 			recordNoun: "row"
 		}));
 		relationsForModel(input.modelRelations, candidate.modelName).push({
@@ -1790,6 +1756,7 @@ function applyBackrelationCandidates(input) {
 	}
 }
 function validateBackrelationFieldAttributes(input) {
+	const source = diagnosticSource(input.sources, input.field.node.syntax);
 	let valid = true;
 	for (const attribute of input.field.attributes) {
 		if (attribute.name === "relation") continue;
@@ -1802,7 +1769,7 @@ function validateBackrelationFieldAttributes(input) {
 			reportUncomposedNamespace({
 				subjectLabel: `Attribute "@${attribute.name}"`,
 				namespace: uncomposedNamespace,
-				sourceId: input.sourceId,
+				source,
 				span: attribute.span,
 				diagnostics: input.diagnostics
 			});
@@ -1812,8 +1779,7 @@ function validateBackrelationFieldAttributes(input) {
 		input.diagnostics.push({
 			code: "PSL_UNSUPPORTED_FIELD_ATTRIBUTE",
 			message: `Field "${input.modelName}.${input.field.name}" uses unsupported attribute "@${attribute.name}"`,
-			sourceId: input.sourceId,
-			span: attribute.span
+			...source.at(attribute.span)
 		});
 		valid = false;
 	}
@@ -1909,22 +1875,20 @@ function isUnboundNamespaceBlock(ns, targetId) {
 }
 function validateNamespaceBlocksForSqlTarget(input) {
 	if (input.targetId === "sqlite") {
-		for (const namespace of input.namespaces) for (const { span } of namespace.declarations) input.diagnostics.push({
+		for (const namespace of input.namespaces) for (const { node, span } of namespace.declarations) input.diagnostics.push({
 			code: "PSL_UNSUPPORTED_NAMESPACE_BLOCK",
 			message: `SQLite does not support \`namespace ${namespace.name} { … }\` blocks (SQLite has no schema concept; declare models at the document top level instead).`,
-			sourceId: input.sourceId,
-			span
+			...diagnosticSource(input.sources, node.syntax).at(span)
 		});
 		return;
 	}
 	if (input.targetId === "postgres") {
 		const unboundBlock = input.namespaces.find((ns) => isUnboundNamespaceBlock(ns, input.targetId) && Object.keys(ns.models).length > 0);
 		const hasSibling = input.namespaces.some((ns) => !isUnboundNamespaceBlock(ns, input.targetId));
-		if (unboundBlock !== void 0 && hasSibling) for (const { span } of unboundBlock.declarations) input.diagnostics.push({
+		if (unboundBlock !== void 0 && hasSibling) for (const { node, span } of unboundBlock.declarations) input.diagnostics.push({
 			code: "PSL_RESERVED_NAMESPACE_NAME",
 			message: "Namespace \"unbound\" is reserved for the late-binding sentinel mapping; a `namespace unbound { … }` containing models cannot appear alongside other named namespace blocks. Use `namespace unbound { … }` alone (no sibling named namespaces) for late-binding multi-tenant contracts.",
-			sourceId: input.sourceId,
-			span
+			...diagnosticSource(input.sources, node.syntax).at(span)
 		});
 	}
 }
@@ -1955,8 +1919,7 @@ function duplicateModelAttributeDiagnostic(input) {
 	return {
 		code: "PSL_DUPLICATE_ATTRIBUTE",
 		message: `\`@@${input.name}\` declared more than once on model "${input.modelName}".`,
-		sourceId: input.sourceId,
-		...ifDefined("span", input.span)
+		...input.source.at(input.span)
 	};
 }
 /**
@@ -1981,8 +1944,7 @@ function validateBlockModelAttributeRequirements(input) {
 		input.diagnostics.push({
 			code: "PSL_EXTENSION_TARGET_MODEL_MISSING_ATTRIBUTE",
 			message: `\`${blockSymbol.keyword}\` block "${blockSymbol.block.name}" targets model "${captured.identifier}", which does not declare \`@@${requirement.attribute}\`. Add \`@@${requirement.attribute}\` to model "${captured.identifier}".`,
-			sourceId: input.sourceId,
-			span: captured.span
+			...diagnosticSource(input.source.sources, blockSymbol.node.syntax).at(captured.span)
 		});
 	}
 }
@@ -2031,7 +1993,7 @@ function buildModelAttributesByName(contributions) {
 * never looks a model up itself. A required model ref that is missing or
 * does not resolve is this pass's diagnostic; the factory is skipped.
 */
-function lowerExtensionBlocksForNamespace(blocks, nsId, entityTypesByDiscriminator, entityContext, pslBlockDescriptors, resolveModelTable) {
+function lowerExtensionBlocksForNamespace(blocks, nsId, entityTypesByDiscriminator, entityContext, pslBlockDescriptors, resolveModelTable, sources, diagnostics) {
 	const blockSymbols = Object.values(blocks);
 	if (blockSymbols.length === 0) return {};
 	const result = {};
@@ -2047,11 +2009,10 @@ function lowerExtensionBlocksForNamespace(blocks, nsId, entityTypesByDiscriminat
 			const captured = block.parameters[paramName];
 			if (captured?.kind !== "ref") {
 				if (paramDecl.required === true) {
-					entityContext.diagnostics?.push({
+					diagnostics.push({
 						code: "PSL_EXTENSION_MODEL_REF_UNRESOLVED",
 						message: `\`${block.keyword}\` block "${block.name}" is missing the required \`${paramName}\` model reference.`,
-						sourceId: entityContext.sourceId ?? "unknown",
-						span: block.span
+						...diagnosticSource(sources, blockSymbol.node.syntax).at(block.span)
 					});
 					unresolvedRef = true;
 				}
@@ -2059,11 +2020,10 @@ function lowerExtensionBlocksForNamespace(blocks, nsId, entityTypesByDiscriminat
 			}
 			const tableName = resolveModelTable(captured.identifier);
 			if (tableName === void 0) {
-				entityContext.diagnostics?.push({
+				diagnostics.push({
 					code: "PSL_EXTENSION_MODEL_REF_UNRESOLVED",
 					message: `\`${block.keyword}\` block "${block.name}" references model "${captured.identifier}" in \`${paramName}\`, which is not declared in the same namespace. Declare the model or fix the reference.`,
-					sourceId: entityContext.sourceId ?? "unknown",
-					span: captured.span
+					...diagnosticSource(sources, blockSymbol.node.syntax).at(captured.span)
 				});
 				unresolvedRef = true;
 				continue;
@@ -2079,7 +2039,10 @@ function lowerExtensionBlocksForNamespace(blocks, nsId, entityTypesByDiscriminat
 			namespaceId: nsId,
 			...resolvedModelRefs !== void 0 ? { resolvedModelRefs } : {}
 		};
-		const entity = instantiateAuthoringEntityType(descriptor.discriminator, descriptor, [annotatedBlock], entityContext);
+		const entity = instantiateAuthoringEntityType(descriptor.discriminator, descriptor, [annotatedBlock], {
+			...entityContext,
+			sourceId: sources.sourceFileFor(blockSymbol.node.syntax).filename
+		});
 		if (entity === void 0) continue;
 		const entriesKey = descriptor.discriminator;
 		const slot = result[entriesKey] ?? {};
@@ -2103,19 +2066,25 @@ function processEnumDeclarations(input) {
 	};
 	const enumDescriptor = getAuthoringEntity(input.authoringContributions, ["enum"]);
 	if (!enumDescriptor) {
-		for (const decl of input.enumBlocks) input.diagnostics.push({
-			code: "PSL_ENUM_MISSING_FACTORY",
-			message: `enum "${decl.name}" requires an "enum" entityType factory in the active authoring contributions`,
-			sourceId: input.sourceId,
-			span: decl.span
-		});
+		for (const symbol of input.enumBlocks) {
+			const decl = symbol.block;
+			input.diagnostics.push({
+				code: "PSL_ENUM_MISSING_FACTORY",
+				message: `enum "${decl.name}" requires an "enum" entityType factory in the active authoring contributions`,
+				...diagnosticSource(input.source.sources, symbol.node.syntax).at(decl.span)
+			});
+		}
 		return {
 			enumHandles,
 			enumTypeDescriptors
 		};
 	}
-	for (const decl of input.enumBlocks) {
-		const handle = instantiateAuthoringEntityType("enum", enumDescriptor, [decl], input.entityContext);
+	for (const symbol of input.enumBlocks) {
+		const decl = symbol.block;
+		const handle = instantiateAuthoringEntityType("enum", enumDescriptor, [decl], {
+			...input.entityContext,
+			sourceId: input.source.sources.sourceFileFor(symbol.node.syntax).filename
+		});
 		if (handle === void 0 || handle === null) continue;
 		enumHandles[decl.name] = handle;
 		enumTypeDescriptors.set(decl.name, {
@@ -2153,17 +2122,17 @@ function relationNullabilityMismatch(relationField, localColumns, resolvedFields
 		ownsReference: true
 	}).contradiction !== void 0;
 }
-function relationNullabilityMismatchDiagnostic(modelName, relationAttribute, sourceId) {
+function relationNullabilityMismatchDiagnostic(modelName, relationAttribute, source) {
 	const fieldLabel = `Relation field "${modelName}.${relationAttribute.field.name}"`;
 	return {
 		code: "PSL_RELATION_NULLABILITY_MISMATCH",
 		message: relationAttribute.field.optional ? `${fieldLabel} is optional but every field in @relation(fields: [...]) is required. Make one of those fields optional with "?" or remove "?" from "${relationAttribute.field.name}".` : `${fieldLabel} is required but a field in @relation(fields: [...]) is optional. Add "?" to "${relationAttribute.field.name}" or make those fields required.`,
-		sourceId,
-		span: relationAttribute.field.span
+		...source.at(relationAttribute.field.span)
 	};
 }
 function buildModelNodeFromPsl(input) {
-	const { model, mapping, sourceId, diagnostics } = input;
+	const { model, mapping, diagnostics } = input;
+	const source = diagnosticSource(input.sources, model.node.syntax);
 	const tableName = mapping.tableName;
 	const modelNamespaceId = input.modelNamespaceIds.get(model.name);
 	const namespaceExtensionEntitiesForModel = modelNamespaceId !== void 0 ? input.namespaceExtensionEntities?.get(modelNamespaceId) : void 0;
@@ -2183,8 +2152,7 @@ function buildModelNodeFromPsl(input) {
 		defaultLiteralTagRegistry: input.defaultLiteralTagRegistry,
 		generatorDescriptorById: input.generatorDescriptorById,
 		diagnostics,
-		sourceId,
-		sourceFile: input.sourceFile,
+		sources: input.sources,
 		scalarColumnDescriptors: input.scalarColumnDescriptors,
 		...ifDefined("enumHandles", input.enumHandles),
 		capabilities: input.capabilities,
@@ -2196,8 +2164,7 @@ function buildModelNodeFromPsl(input) {
 	if (inlineIdFields.length > 1) diagnostics.push({
 		code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 		message: `Model "${model.name}" cannot declare inline @id on multiple fields; use model-level @@id([...]) for composite identity`,
-		sourceId,
-		span: model.span
+		...source.at(model.span)
 	});
 	const singleInlineIdField = inlineIdFields.length === 1 ? inlineIdFields[0] : void 0;
 	let primaryKey = singleInlineIdField ? {
@@ -2218,7 +2185,7 @@ function buildModelNodeFromPsl(input) {
 		const attributesValid = validateBackrelationFieldAttributes({
 			modelName: model.name,
 			field,
-			sourceId,
+			sources: input.sources,
 			composedExtensions: input.composedExtensions,
 			authoringContributions: input.authoringContributions,
 			diagnostics,
@@ -2231,8 +2198,7 @@ function buildModelNodeFromPsl(input) {
 				selfModel: model,
 				field,
 				symbols: input.symbolTable,
-				sourceFile: input.sourceFile,
-				sourceId,
+				sources: input.sources,
 				diagnostics
 			});
 			if (!parsedRelation) continue;
@@ -2240,8 +2206,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_INVALID_RELATION_ATTRIBUTE",
 					message: `Backrelation list field "${model.name}.${field.name}" cannot declare fields/references; define them on the FK-side relation field`,
-					sourceId,
-					span: relationAttribute.span
+					...source.at(relationAttribute.span)
 				});
 				continue;
 			}
@@ -2249,8 +2214,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_INVALID_RELATION_ATTRIBUTE",
 					message: `Backrelation list field "${model.name}.${field.name}" cannot declare onDelete/onUpdate/index; define them on the FK-side relation field`,
-					sourceId,
-					span: relationAttribute.span
+					...source.at(relationAttribute.span)
 				});
 				continue;
 			}
@@ -2289,7 +2253,7 @@ function buildModelNodeFromPsl(input) {
 				reportUncomposedNamespace({
 					subjectLabel: `Attribute "@@${modelAttribute.name}"`,
 					namespace: uncomposedNamespace,
-					sourceId,
+					source,
 					span: modelAttribute.span,
 					diagnostics
 				});
@@ -2298,8 +2262,7 @@ function buildModelNodeFromPsl(input) {
 			diagnostics.push({
 				code: "PSL_UNSUPPORTED_MODEL_ATTRIBUTE",
 				message: `Model "${model.name}" uses unsupported attribute "@@${modelAttribute.name}"`,
-				sourceId,
-				span: modelAttribute.span
+				...source.at(modelAttribute.span)
 			});
 			continue;
 		}
@@ -2310,7 +2273,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push(duplicateModelAttributeDiagnostic({
 					name: "control",
 					modelName: model.name,
-					sourceId,
+					source,
 					span: modelAttribute.span
 				}));
 				continue;
@@ -2322,8 +2285,7 @@ function buildModelNodeFromPsl(input) {
 				node,
 				spec: sqlAttributeSpecs.model.control(),
 				model,
-				sourceFile: input.sourceFile,
-				sourceId,
+				sources: input.sources,
 				diagnostics
 			});
 			if (parsed !== void 0) controlPolicy = parsed.policy;
@@ -2335,8 +2297,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 					message: `Model "${model.name}" declares @@id more than once`,
-					sourceId,
-					span: modelAttribute.span
+					...source.at(modelAttribute.span)
 				});
 				continue;
 			}
@@ -2344,8 +2305,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 					message: `Model "${model.name}" cannot declare both field-level @id and model-level @@id`,
-					sourceId,
-					span: modelAttribute.span
+					...source.at(modelAttribute.span)
 				});
 				blockPrimaryKeyDeclared = true;
 				continue;
@@ -2356,8 +2316,7 @@ function buildModelNodeFromPsl(input) {
 				node,
 				spec: sqlAttributeSpecs.model.id(),
 				model,
-				sourceFile: input.sourceFile,
-				sourceId,
+				sources: input.sources,
 				diagnostics
 			});
 			if (parsed === void 0) continue;
@@ -2367,8 +2326,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 					message: `${attributeLabel} cannot include optional field "${nullableFieldName}"; primary key columns must be NOT NULL`,
-					sourceId,
-					span: modelAttribute.span
+					...source.at(modelAttribute.span)
 				});
 				continue;
 			}
@@ -2376,7 +2334,7 @@ function buildModelNodeFromPsl(input) {
 				modelName: model.name,
 				fieldNames,
 				mapping,
-				sourceId,
+				source,
 				diagnostics,
 				span: modelAttribute.span,
 				entityLabel: attributeLabel
@@ -2396,8 +2354,7 @@ function buildModelNodeFromPsl(input) {
 				node,
 				spec: sqlAttributeSpecs.model.unique(),
 				model,
-				sourceFile: input.sourceFile,
-				sourceId,
+				sources: input.sources,
 				diagnostics
 			});
 			if (parsed === void 0) continue;
@@ -2405,7 +2362,7 @@ function buildModelNodeFromPsl(input) {
 				modelName: model.name,
 				fieldNames: parsed.fields,
 				mapping,
-				sourceId,
+				source,
 				diagnostics,
 				span: modelAttribute.span,
 				entityLabel: attributeLabel
@@ -2424,8 +2381,7 @@ function buildModelNodeFromPsl(input) {
 				node,
 				spec: sqlAttributeSpecs.model.index(),
 				model,
-				sourceFile: input.sourceFile,
-				sourceId,
+				sources: input.sources,
 				diagnostics
 			});
 			if (parsed === void 0) continue;
@@ -2435,7 +2391,7 @@ function buildModelNodeFromPsl(input) {
 					modelName: model.name,
 					fieldNames: parsed.fields,
 					mapping,
-					sourceId,
+					source,
 					diagnostics,
 					span: modelAttribute.span,
 					entityLabel: attributeLabel
@@ -2462,8 +2418,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_CHECK_UNSUPPORTED_TARGET",
 					message: `Model "${model.name}" declares "@@check", but target "${input.targetId}" does not support check constraints (the adapter does not report the "checkConstraint" capability). Remove the check or author it against a target that supports check constraints.`,
-					sourceId,
-					span: modelAttribute.span
+					...source.at(modelAttribute.span)
 				});
 				continue;
 			}
@@ -2471,8 +2426,7 @@ function buildModelNodeFromPsl(input) {
 				node,
 				spec: sqlAttributeSpecs.model.check(),
 				model,
-				sourceFile: input.sourceFile,
-				sourceId,
+				sources: input.sources,
 				diagnostics
 			});
 			if (parsed === void 0) continue;
@@ -2489,7 +2443,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push(duplicateModelAttributeDiagnostic({
 					name: modelAttribute.name,
 					modelName: model.name,
-					sourceId,
+					source,
 					span: modelAttribute.span
 				}));
 				continue;
@@ -2508,8 +2462,7 @@ function buildModelNodeFromPsl(input) {
 					}
 				}),
 				model,
-				sourceFile: input.sourceFile,
-				sourceId,
+				sources: input.sources,
 				diagnostics
 			});
 			if (parsed === void 0) continue;
@@ -2519,9 +2472,9 @@ function buildModelNodeFromPsl(input) {
 				modelName: model.name,
 				storageName: tableName,
 				namespaceId: modelNamespaceId ?? input.defaultNamespaceId,
-				sourceId,
+				sourceId: source.sources.sourceFileFor(source.node).filename,
 				diagnostics: { push: (d) => {
-					diagnostics.push(blindCast(d));
+					diagnostics.pushExternal(blindCast(d));
 				} }
 			});
 			if (lowered === void 0) continue;
@@ -2541,8 +2494,7 @@ function buildModelNodeFromPsl(input) {
 			if (fieldTypeContractSpaceId !== void 0) diagnostics.push({
 				code: "PSL_UNSUPPORTED_CROSS_SPACE_LIST",
 				message: `Relation field "${model.name}.${relationAttribute.field.name}" is a cross-space list relation (type "${fieldTypeContractSpaceId}:${fieldTypeNamespaceId !== void 0 ? `${fieldTypeNamespaceId}.` : ""}${fieldTypeName}[]"). Cross-space relations must be singular in v0.1 — list cross-space relations are not supported.`,
-				sourceId,
-				span: relationAttribute.field.span
+				...source.at(relationAttribute.field.span)
 			});
 			continue;
 		}
@@ -2553,8 +2505,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_UNKNOWN_CONTRACT_SPACE",
 					message: `Relation field "${model.name}.${relationAttribute.field.name}" references contract space "${fieldTypeContractSpaceId}" which is not declared in extensions. Add "${fieldTypeContractSpaceId}" to extensions in prisma.config.ts.`,
-					sourceId,
-					span: relationAttribute.field.span,
+					...source.at(relationAttribute.field.span),
 					data: {
 						space: fieldTypeContractSpaceId,
 						suggestedPack: fieldTypeContractSpaceId
@@ -2566,8 +2517,7 @@ function buildModelNodeFromPsl(input) {
 				selfModel: model,
 				field: relationAttribute.field,
 				symbols: input.symbolTable,
-				sourceFile: input.sourceFile,
-				sourceId,
+				sources: input.sources,
 				diagnostics
 			});
 			if (!parsedRelation) continue;
@@ -2575,8 +2525,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_INVALID_RELATION_ATTRIBUTE",
 					message: `Relation field "${model.name}.${relationAttribute.field.name}" requires fields and references arguments`,
-					sourceId,
-					span: relationAttribute.relation.span
+					...source.at(relationAttribute.relation.span)
 				});
 				continue;
 			}
@@ -2584,14 +2533,14 @@ function buildModelNodeFromPsl(input) {
 				modelName: model.name,
 				fieldNames: parsedRelation.fields,
 				mapping,
-				sourceId,
+				source,
 				diagnostics,
 				span: relationAttribute.relation.span,
 				entityLabel: `Relation field "${model.name}.${relationAttribute.field.name}"`
 			});
 			if (!localColumns) continue;
 			if (relationNullabilityMismatch(relationAttribute.field, localColumns, resolvedFields)) {
-				diagnostics.push(relationNullabilityMismatchDiagnostic(model.name, relationAttribute, sourceId));
+				diagnostics.push(relationNullabilityMismatchDiagnostic(model.name, relationAttribute, source));
 				continue;
 			}
 			const referencedColumns = parsedRelation.references;
@@ -2599,8 +2548,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_INVALID_RELATION_ATTRIBUTE",
 					message: `Relation field "${model.name}.${relationAttribute.field.name}" must provide the same number of fields and references`,
-					sourceId,
-					span: relationAttribute.relation.span
+					...source.at(relationAttribute.relation.span)
 				});
 				continue;
 			}
@@ -2614,8 +2562,7 @@ function buildModelNodeFromPsl(input) {
 				diagnostics.push({
 					code: "PSL_UNKNOWN_CROSS_SPACE_TARGET",
 					message: `Relation field "${model.name}.${relationAttribute.field.name}" references model "${fieldTypeName}" in namespace "${crossTargetNamespaceId}" of space "${fieldTypeContractSpaceId}", but that model was not found in the extension contract. Available models: ${availableModels}`,
-					sourceId,
-					span: relationAttribute.field.span,
+					...source.at(relationAttribute.field.span),
 					data: {
 						space: fieldTypeContractSpaceId,
 						namespace: crossTargetNamespaceId,
@@ -2661,8 +2608,7 @@ function buildModelNodeFromPsl(input) {
 			diagnostics.push({
 				code: "PSL_INVALID_RELATION_TARGET",
 				message: `Relation field "${model.name}.${relationAttribute.field.name}" references unknown model "${qualifiedTypeName}"`,
-				sourceId,
-				span: relationAttribute.field.span
+				...source.at(relationAttribute.field.span)
 			});
 			continue;
 		}
@@ -2671,8 +2617,7 @@ function buildModelNodeFromPsl(input) {
 			diagnostics.push({
 				code: "PSL_INVALID_RELATION_TARGET",
 				message: `Relation field "${model.name}.${relationAttribute.field.name}" references unknown model "${qualifiedTypeName}"`,
-				sourceId,
-				span: relationAttribute.field.span
+				...source.at(relationAttribute.field.span)
 			});
 			continue;
 		}
@@ -2680,8 +2625,7 @@ function buildModelNodeFromPsl(input) {
 			selfModel: model,
 			field: relationAttribute.field,
 			symbols: input.symbolTable,
-			sourceFile: input.sourceFile,
-			sourceId,
+			sources: input.sources,
 			diagnostics
 		});
 		if (!parsedRelation) continue;
@@ -2689,8 +2633,7 @@ function buildModelNodeFromPsl(input) {
 			diagnostics.push({
 				code: "PSL_INVALID_RELATION_ATTRIBUTE",
 				message: `Relation field "${model.name}.${relationAttribute.field.name}" requires fields and references arguments`,
-				sourceId,
-				span: relationAttribute.relation.span
+				...source.at(relationAttribute.relation.span)
 			});
 			continue;
 		}
@@ -2699,8 +2642,7 @@ function buildModelNodeFromPsl(input) {
 			diagnostics.push({
 				code: "PSL_INVALID_RELATION_TARGET",
 				message: `Relation field "${model.name}.${relationAttribute.field.name}" references unknown model "${qualifiedTypeName}"`,
-				sourceId,
-				span: relationAttribute.field.span
+				...source.at(relationAttribute.field.span)
 			});
 			continue;
 		}
@@ -2708,14 +2650,14 @@ function buildModelNodeFromPsl(input) {
 			modelName: model.name,
 			fieldNames: parsedRelation.fields,
 			mapping,
-			sourceId,
+			source,
 			diagnostics,
 			span: relationAttribute.relation.span,
 			entityLabel: `Relation field "${model.name}.${relationAttribute.field.name}"`
 		});
 		if (!localColumns) continue;
 		if (relationNullabilityMismatch(relationAttribute.field, localColumns, resolvedFields)) {
-			diagnostics.push(relationNullabilityMismatchDiagnostic(model.name, relationAttribute, sourceId));
+			diagnostics.push(relationNullabilityMismatchDiagnostic(model.name, relationAttribute, source));
 			resultInvalidFkPairings.push({
 				pairKey: fkRelationPairKey(model.name, targetMapping.model.name),
 				...ifDefined("relationName", parsedRelation.name)
@@ -2726,7 +2668,7 @@ function buildModelNodeFromPsl(input) {
 			modelName: targetMapping.model.name,
 			fieldNames: parsedRelation.references,
 			mapping: targetMapping,
-			sourceId,
+			source,
 			diagnostics,
 			span: relationAttribute.relation.span,
 			entityLabel: `Relation field "${model.name}.${relationAttribute.field.name}"`
@@ -2736,8 +2678,7 @@ function buildModelNodeFromPsl(input) {
 			diagnostics.push({
 				code: "PSL_INVALID_RELATION_ATTRIBUTE",
 				message: `Relation field "${model.name}.${relationAttribute.field.name}" must provide the same number of fields and references`,
-				sourceId,
-				span: relationAttribute.relation.span
+				...source.at(relationAttribute.relation.span)
 			});
 			continue;
 		}
@@ -2805,7 +2746,7 @@ function buildModelNodeFromPsl(input) {
 	};
 }
 function buildValueObjects(input) {
-	const { compositeTypes, enumTypeDescriptors, namedTypeDescriptors, scalarColumnDescriptors, composedExtensions, familyId, targetId, authoringContributions, diagnostics, sourceId } = input;
+	const { compositeTypes, enumTypeDescriptors, namedTypeDescriptors, scalarColumnDescriptors, composedExtensions, familyId, targetId, authoringContributions, diagnostics, sources } = input;
 	const valueObjects = {};
 	const compositeTypeNames = new Set(compositeTypes.map((ct) => ct.name));
 	for (const compositeType of compositeTypes) {
@@ -2835,15 +2776,14 @@ function buildValueObjects(input) {
 				familyId,
 				targetId,
 				diagnostics,
-				sourceId,
+				sources,
 				entityLabel: `Field "${compositeType.name}.${field.name}"`
 			});
 			if (!resolved.ok) {
 				if (!resolved.alreadyReported) diagnostics.push({
 					code: "PSL_UNSUPPORTED_FIELD_TYPE",
 					message: `Field "${compositeType.name}.${field.name}" type "${field.typeName}" is not supported`,
-					sourceId,
-					span: field.span
+					...diagnosticSource(sources, field.node.syntax).at(field.span)
 				});
 				continue;
 			}
@@ -2901,32 +2841,32 @@ function patchModelDomainFields(models, modelResolvedFields) {
 	}
 	return patched;
 }
-function collectPolymorphismDeclarations(models, sourceFile, sourceId, diagnostics) {
+function collectPolymorphismDeclarations(models, sources, diagnostics) {
 	const discriminatorDeclarations = /* @__PURE__ */ new Map();
 	const baseDeclarations = /* @__PURE__ */ new Map();
 	for (const model of models) {
+		const source = diagnosticSource(sources, model.node.syntax);
 		const discriminatorNode = findModelAttributeNode(model, "discriminator");
 		if (discriminatorNode !== void 0) {
 			const parsed = interpretModelAttribute({
 				node: discriminatorNode,
 				spec: sqlAttributeSpecs.model.discriminator(),
 				model,
-				sourceFile,
-				sourceId,
+				sources,
 				diagnostics
 			});
 			if (parsed !== void 0) {
-				const span = nodePslSpan(discriminatorNode.syntax, sourceFile);
+				const span = nodePslSpan(discriminatorNode.syntax, sources);
 				const discField = model.fields[parsed.field];
 				if (discField && discField.typeName !== "String") diagnostics.push({
 					code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
 					message: `Discriminator field "${parsed.field}" on model "${model.name}" must be of type String, but is "${discField.typeName}"`,
-					sourceId,
-					span
+					...source.at(span)
 				});
 				else discriminatorDeclarations.set(model.name, {
 					fieldName: parsed.field,
-					span
+					span,
+					source
 				});
 			}
 		}
@@ -2936,14 +2876,14 @@ function collectPolymorphismDeclarations(models, sourceFile, sourceId, diagnosti
 				node: baseNode,
 				spec: sqlAttributeSpecs.model.base(),
 				model,
-				sourceFile,
-				sourceId,
+				sources,
 				diagnostics
 			});
 			if (parsed !== void 0) baseDeclarations.set(model.name, {
+				source,
 				baseName: parsed.base,
 				value: parsed.value,
-				span: nodePslSpan(baseNode.syntax, sourceFile)
+				span: nodePslSpan(baseNode.syntax, sources)
 			});
 		}
 	}
@@ -2952,7 +2892,7 @@ function collectPolymorphismDeclarations(models, sourceFile, sourceId, diagnosti
 		baseDeclarations
 	};
 }
-function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations, modelNames, modelMappings, modelNamespaceIds, defaultNamespaceId, syntheticPkFieldsByVariant, stiBaseFieldsByBase, sourceId, diagnostics) {
+function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations, modelNames, modelMappings, modelNamespaceIds, defaultNamespaceId, syntheticPkFieldsByVariant, stiBaseFieldsByBase, diagnostics) {
 	let patched = models;
 	const coordinateFor = (modelName) => modelCoordinateKey(modelNamespaceIds.get(modelName) ?? defaultNamespaceId, modelName);
 	for (const [baseName, fieldNames] of stiBaseFieldsByBase) {
@@ -2969,8 +2909,7 @@ function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations
 			diagnostics.push({
 				code: "PSL_DISCRIMINATOR_AND_BASE",
 				message: `Model "${modelName}" cannot have both @@discriminator and @@base`,
-				sourceId,
-				span: decl.span
+				...decl.source.at(decl.span)
 			});
 			continue;
 		}
@@ -2985,8 +2924,7 @@ function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations
 				diagnostics.push({
 					code: "PSL_DUPLICATE_DISCRIMINATOR_VALUE",
 					message: `Discriminator value "${baseDecl.value}" is used by both "${existingVariant}" and "${variantName}" on base model "${modelName}"`,
-					sourceId,
-					span: baseDecl.span
+					...baseDecl.source.at(baseDecl.span)
 				});
 				continue;
 			}
@@ -2997,8 +2935,7 @@ function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations
 			diagnostics.push({
 				code: "PSL_ORPHANED_DISCRIMINATOR",
 				message: `Model "${modelName}" has @@discriminator but no variant models declare @@base(${modelName}, ...)`,
-				sourceId,
-				span: decl.span
+				...decl.source.at(decl.span)
 			});
 			continue;
 		}
@@ -3016,8 +2953,7 @@ function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations
 			diagnostics.push({
 				code: "PSL_BASE_TARGET_NOT_FOUND",
 				message: `Model "${variantName}" @@base references non-existent model "${baseDecl.baseName}"`,
-				sourceId,
-				span: baseDecl.span
+				...baseDecl.source.at(baseDecl.span)
 			});
 			continue;
 		}
@@ -3025,8 +2961,7 @@ function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations
 			diagnostics.push({
 				code: "PSL_ORPHANED_BASE",
 				message: `Model "${variantName}" declares @@base(${baseDecl.baseName}, ...) but "${baseDecl.baseName}" has no @@discriminator`,
-				sourceId,
-				span: baseDecl.span
+				...baseDecl.source.at(baseDecl.span)
 			});
 			continue;
 		}
@@ -3199,38 +3134,43 @@ function stripStorageOnlyDomainFields(model, fieldNames) {
 	};
 }
 function interpretPslDocumentToSqlContract(input) {
-	const sourceId = input.sourceId;
-	if (!input.target) return notOk({
-		summary: "PSL to SQL contract interpretation failed",
-		diagnostics: [{
+	const source = diagnosticSource(input.sources, input.document.syntax);
+	const diagnostics = createPslDiagnosticCollector(input.sources);
+	if (!input.target) {
+		diagnostics.pushUnlocated({
 			code: "PSL_TARGET_CONTEXT_REQUIRED",
 			message: "PSL interpretation requires an explicit target context from composition.",
-			sourceId
-		}]
-	});
-	if (!input.scalarColumnDescriptors) return notOk({
-		summary: "PSL to SQL contract interpretation failed",
-		diagnostics: [{
+			...source.at()
+		});
+		return notOk({
+			summary: "PSL to SQL contract interpretation failed",
+			diagnostics: diagnostics.toExternal()
+		});
+	}
+	if (!input.scalarColumnDescriptors) {
+		diagnostics.pushUnlocated({
 			code: "PSL_SCALAR_TYPE_CONTEXT_REQUIRED",
 			message: "PSL interpretation requires composed scalar type descriptors.",
-			sourceId
-		}]
-	});
+			...source.at()
+		});
+		return notOk({
+			summary: "PSL to SQL contract interpretation failed",
+			diagnostics: diagnostics.toExternal()
+		});
+	}
 	const { topLevel } = input.symbolTable;
-	const sourceFile = input.sourceFile;
 	const namespaceSymbols = Object.values(topLevel.namespaces);
-	const diagnostics = [...input.seedDiagnostics ?? []];
 	validateNamespaceBlocksForSqlTarget({
 		namespaces: namespaceSymbols,
 		targetId: input.target.targetId,
-		sourceId,
-		sourceFile,
+		source,
+		sources: input.sources,
 		diagnostics
 	});
 	validateBlockModelAttributeRequirements({
 		scopes: [topLevel, ...namespaceSymbols],
 		pslBlockDescriptors: input.authoringContributions?.pslBlockDescriptors ?? {},
-		sourceId,
+		source,
 		diagnostics
 	});
 	const models = [];
@@ -3270,8 +3210,7 @@ function interpretPslDocumentToSqlContract(input) {
 		diagnostics.push({
 			code: "PSL_UNSUPPORTED_TOP_LEVEL_BLOCK",
 			message: `Unsupported top-level block "${block.keyword}"`,
-			sourceId,
-			span: keywordPslSpan(block.node.syntax, block.keyword, sourceFile)
+			...diagnosticSource(input.sources, block.node.syntax).at(keywordPslSpan(block.node.syntax, block.keyword, input.sources))
 		});
 	};
 	const topLevelEnums = [];
@@ -3281,7 +3220,7 @@ function interpretPslDocumentToSqlContract(input) {
 			reportUnsupportedTopLevelBlock(block);
 			continue;
 		}
-		if (isEnumBlock(block)) topLevelEnums.push(block.block);
+		if (isEnumBlock(block)) topLevelEnums.push(block);
 		else topLevelExtensionBlocks[blockName] = block;
 	}
 	for (const namespace of namespaceSymbols) for (const block of Object.values(namespace.blocks)) {
@@ -3289,8 +3228,7 @@ function interpretPslDocumentToSqlContract(input) {
 			diagnostics.push({
 				code: "PSL_ENUM_NAMESPACE_NOT_SUPPORTED",
 				message: `enum "${block.name}" inside namespace "${namespace.name}" is not supported; declare enum at the top level`,
-				sourceId,
-				span: nodePslSpan(block.node.syntax, sourceFile)
+				...diagnosticSource(input.sources, block.node.syntax).at(nodePslSpan(block.node.syntax, input.sources))
 			});
 			continue;
 		}
@@ -3298,15 +3236,15 @@ function interpretPslDocumentToSqlContract(input) {
 	}
 	const enumResult = processEnumDeclarations({
 		enumBlocks: topLevelEnums,
-		sourceId,
+		source,
 		authoringContributions: input.authoringContributions,
 		entityContext: {
 			family: input.target.familyId,
 			target: input.target.targetId,
 			...ifDefined("codecLookup", input.codecLookup),
-			sourceId,
+			sourceId: source.sources.sourceFileFor(source.node).filename,
 			diagnostics: { push: (d) => {
-				diagnostics.push(blindCast(d));
+				diagnostics.pushExternal(blindCast(d));
 			} },
 			...ifDefined("enumInferenceCodecs", input.enumInferenceCodecs)
 		},
@@ -3323,16 +3261,16 @@ function interpretPslDocumentToSqlContract(input) {
 		target: input.target.targetId,
 		...ifDefined("enumInferenceCodecs", input.enumInferenceCodecs),
 		...ifDefined("codecLookup", input.codecLookup),
-		sourceId,
+		sourceId: source.sources.sourceFileFor(source.node).filename,
 		diagnostics: { push: (d) => {
-			diagnostics.push(blindCast(d));
+			diagnostics.pushExternal(blindCast(d));
 		} },
 		warnings: authoringWarnings
 	};
-	const earlyModelMappingsByCoordinate = buildModelMappings(modelEntries, defaultNamespaceId, [], sourceId, sourceFile);
+	const earlyModelMappingsByCoordinate = buildModelMappings(modelEntries, defaultNamespaceId, createPslDiagnosticCollector(input.sources), input.sources);
 	const composedPslBlockDescriptors = input.authoringContributions?.pslBlockDescriptors ?? {};
 	const namespaceExtensionEntities = /* @__PURE__ */ new Map();
-	const mergeNamespaceExtensionEntities = (nsId, entities) => {
+	const mergeNamespaceExtensionEntities = (nsId, entities, blocks) => {
 		if (Object.keys(entities).length === 0) return;
 		const existing = namespaceExtensionEntities.get(nsId);
 		if (existing === void 0) {
@@ -3343,11 +3281,15 @@ function interpretPslDocumentToSqlContract(input) {
 		for (const [entriesKey, slot] of Object.entries(entities)) {
 			const existingSlot = existing[entriesKey];
 			if (existingSlot !== void 0) {
-				for (const name of Object.keys(slot)) if (Object.hasOwn(existingSlot, name)) diagnostics.push({
-					code: "PSL_DUPLICATE_EXTENSION_ENTITY",
-					message: `entries slot "${entriesKey}" in namespace "${nsId}": entity "${name}" is declared more than once in the same namespace.`,
-					sourceId
-				});
+				for (const name of Object.keys(slot)) if (Object.hasOwn(existingSlot, name)) {
+					const block = Object.values(blocks).find((block) => block.name === name);
+					invariant(block !== void 0, "Lowered entity has an owning block");
+					diagnostics.pushUnlocated({
+						code: "PSL_DUPLICATE_EXTENSION_ENTITY",
+						message: `entries slot "${entriesKey}" in namespace "${nsId}": entity "${name}" is declared more than once in the same namespace.`,
+						...diagnosticSource(input.sources, block.node.syntax).at()
+					});
+				}
 			}
 			merged[entriesKey] = {
 				...existingSlot,
@@ -3363,28 +3305,32 @@ function interpretPslDocumentToSqlContract(input) {
 			targetId: input.target.targetId
 		});
 		if (nsId === void 0) continue;
-		mergeNamespaceExtensionEntities(nsId, lowerExtensionBlocksForNamespace(ns.blocks, nsId, entityTypesByDiscriminator, extensionEntityContext, composedPslBlockDescriptors, (modelName) => earlyModelMappingsByCoordinate.get(modelCoordinateKey(nsId, modelName))?.tableName));
+		mergeNamespaceExtensionEntities(nsId, lowerExtensionBlocksForNamespace(ns.blocks, nsId, entityTypesByDiscriminator, extensionEntityContext, composedPslBlockDescriptors, (modelName) => earlyModelMappingsByCoordinate.get(modelCoordinateKey(nsId, modelName))?.tableName, input.sources, diagnostics), ns.blocks);
 	}
 	if (Object.keys(topLevelExtensionBlocks).length > 0) {
 		const topLevelNsId = resolveNamespaceIdForSqlTarget({
 			bucketName: UNSPECIFIED_PSL_NAMESPACE_NAME,
 			targetId: input.target.targetId
 		}) ?? defaultNamespaceId;
-		mergeNamespaceExtensionEntities(topLevelNsId, lowerExtensionBlocksForNamespace(topLevelExtensionBlocks, topLevelNsId, entityTypesByDiscriminator, extensionEntityContext, composedPslBlockDescriptors, (modelName) => earlyModelMappingsByCoordinate.get(modelCoordinateKey(topLevelNsId, modelName))?.tableName));
+		mergeNamespaceExtensionEntities(topLevelNsId, lowerExtensionBlocksForNamespace(topLevelExtensionBlocks, topLevelNsId, entityTypesByDiscriminator, extensionEntityContext, composedPslBlockDescriptors, (modelName) => earlyModelMappingsByCoordinate.get(modelCoordinateKey(topLevelNsId, modelName))?.tableName, input.sources, diagnostics), topLevelExtensionBlocks);
 	}
 	const defaultNsExtensionValueSets = namespaceExtensionEntities.get(defaultNamespaceId)?.["valueSet"];
 	if (defaultNsExtensionValueSets !== void 0) {
-		for (const name of Object.keys(defaultNsExtensionValueSets)) if (Object.hasOwn(validEnumHandles, name)) diagnostics.push({
-			code: "PSL_VALUE_SET_NAME_COLLISION",
-			message: `namespace "${defaultNamespaceId}": name "${name}" is declared both as a domain enum and as an extension entity that derives a value-set; rename one`,
-			sourceId
-		});
+		for (const name of Object.keys(defaultNsExtensionValueSets)) if (Object.hasOwn(validEnumHandles, name)) {
+			const enumSymbol = topLevel.blocks[name];
+			invariant(enumSymbol !== void 0, "Domain enum has an owning block");
+			diagnostics.pushUnlocated({
+				code: "PSL_VALUE_SET_NAME_COLLISION",
+				message: `namespace "${defaultNamespaceId}": name "${name}" is declared both as a domain enum and as an extension entity that derives a value-set; rename one`,
+				...diagnosticSource(input.sources, enumSymbol.node.syntax).at()
+			});
+		}
 	}
 	const isScalarRefinement = (symbol) => !symbol.isConstructor && symbol.baseType !== void 0 && input.scalarColumnDescriptors.has(symbol.baseType);
 	const allNamedTypes = Object.values(topLevel.namedTypes);
 	const namedTypeResult = resolveNamedTypeDeclarations({
 		declarations: [...allNamedTypes.filter(isScalarRefinement), ...allNamedTypes.filter((symbol) => !isScalarRefinement(symbol))],
-		sourceId,
+		source,
 		enumTypeDescriptors: allEnumTypeDescriptors,
 		scalarColumnDescriptors: input.scalarColumnDescriptors,
 		composedExtensions,
@@ -3394,7 +3340,7 @@ function interpretPslDocumentToSqlContract(input) {
 		diagnostics
 	});
 	const storageTypes = { ...namedTypeResult.storageTypes };
-	const modelMappingsByCoordinate = buildModelMappings(modelEntries, defaultNamespaceId, diagnostics, sourceId, sourceFile);
+	const modelMappingsByCoordinate = buildModelMappings(modelEntries, defaultNamespaceId, diagnostics, input.sources);
 	const modelMappings = /* @__PURE__ */ new Map();
 	for (const mapping of modelMappingsByCoordinate.values()) modelMappings.set(mapping.model.name, mapping);
 	const modelNodes = [];
@@ -3426,8 +3372,7 @@ function interpretPslDocumentToSqlContract(input) {
 			defaultLiteralTagRegistry,
 			generatorDescriptorById,
 			scalarColumnDescriptors: input.scalarColumnDescriptors,
-			sourceId,
-			sourceFile,
+			sources: input.sources,
 			symbolTable: input.symbolTable,
 			diagnostics,
 			modelNamespaceIds,
@@ -3479,14 +3424,14 @@ function interpretPslDocumentToSqlContract(input) {
 		modelUniqueColumnSets,
 		modelRelations,
 		diagnostics,
-		sourceId
+		sources: input.sources
 	});
 	for (const [modelName, relations] of crossSpaceRelationsByModel) {
 		const existing = modelRelations.get(modelName);
 		if (existing) existing.push(...relations);
 		else modelRelations.set(modelName, [...relations]);
 	}
-	const { discriminatorDeclarations, baseDeclarations } = collectPolymorphismDeclarations(models, sourceFile, sourceId, diagnostics);
+	const { discriminatorDeclarations, baseDeclarations } = collectPolymorphismDeclarations(models, input.sources, diagnostics);
 	const stiVariantNames = /* @__PURE__ */ new Set();
 	for (const variantName of baseDeclarations.keys()) if (!(modelMappings.get(variantName)?.model.attributes.some((attr) => attr.name === "map") ?? false)) stiVariantNames.add(variantName);
 	for (const variantName of stiVariantNames) {
@@ -3499,8 +3444,7 @@ function interpretPslDocumentToSqlContract(input) {
 			diagnostics.push({
 				code: PSL_CHECK_ON_STI_VARIANT,
 				message: `Model "${variantName}" declares "@@check", but it shares its base model "${baseDecl.baseName}"'s storage table (single-table inheritance via @@base) and has no table of its own to declare a check constraint on. Declare the check on "${baseDecl.baseName}" instead.`,
-				sourceId,
-				span: nodePslSpan(attribute.syntax, sourceFile)
+				...diagnosticSource(input.sources, attribute.syntax).at(nodePslSpan(attribute.syntax, input.sources))
 			});
 		}
 	}
@@ -3516,11 +3460,11 @@ function interpretPslDocumentToSqlContract(input) {
 		targetId: input.target.targetId,
 		authoringContributions: input.authoringContributions,
 		diagnostics,
-		sourceId
+		sources: input.sources
 	});
-	if (diagnostics.length > 0) return notOk({
+	if (diagnostics.length > 0 || (input.seedDiagnostics?.length ?? 0) > 0) return notOk({
 		summary: "PSL to SQL contract interpretation failed",
-		diagnostics
+		diagnostics: [...input.seedDiagnostics ?? [], ...diagnostics.toExternal()]
 	});
 	const { createNamespace } = input;
 	const createNamespaceWithExtensions = (nsInput) => {
@@ -3568,11 +3512,11 @@ function interpretPslDocumentToSqlContract(input) {
 		modelsForPatch[coordinate] = model;
 	}
 	let patchedModels = patchModelDomainFields(modelsForPatch, modelResolvedFields);
-	const polyDiagnostics = [];
-	patchedModels = resolvePolymorphism(patchedModels, discriminatorDeclarations, baseDeclarations, modelNames, modelMappings, modelNamespaceIds, input.target.defaultNamespaceId, syntheticPkFieldsByVariant, stiBaseFieldsByBase, sourceId, polyDiagnostics);
+	const polyDiagnostics = createPslDiagnosticCollector(input.sources);
+	patchedModels = resolvePolymorphism(patchedModels, discriminatorDeclarations, baseDeclarations, modelNames, modelMappings, modelNamespaceIds, input.target.defaultNamespaceId, syntheticPkFieldsByVariant, stiBaseFieldsByBase, polyDiagnostics);
 	if (polyDiagnostics.length > 0) return notOk({
 		summary: "PSL to SQL contract interpretation failed",
-		diagnostics: polyDiagnostics
+		diagnostics: polyDiagnostics.toExternal()
 	});
 	const variantModelNames = new Set(baseDeclarations.keys());
 	const filteredRoots = Object.fromEntries(Object.entries(contract.roots).filter(([, crossReference]) => !variantModelNames.has(crossReference.model)));
@@ -3590,4 +3534,4 @@ function interpretPslDocumentToSqlContract(input) {
 //#endregion
 export { normalizeReferentialAction as a, interpretPslDocumentToSqlContract as i, buildEntityTypesByDiscriminator as n, numberLiteralDefault as o, indexFkRelations as r, resolveFieldTypeDescriptor as s, applyBackrelationCandidates as t };
 
-//# sourceMappingURL=interpreter-9Ru2E-MH-CQdWmnh8.mjs.map
+//# sourceMappingURL=interpreter-C8N5eRW1-LGv-WI9y.mjs.map