@prisma-next/sql-contract-psl 0.12.0-dev.78 → 0.12.0-dev.79

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/psl-column-resolution.ts","../src/interpreter.ts"],"mappings":";;;;;;;;;;;KA0CY,gBAAA;EAAA,SACD,OAAA;EAAA,SACA,UAAA;EAAA,SACA,OAAA;EAAA,SACA,UAAA,GAAa,MAAM;AAAA;;;UCkDb,sCAAA;EAAA,SACN,QAAA,EAAU,sBAAA;EAAA,SACV,MAAA,EAAQ,aAAA;EAAA,SACR,qBAAA,EAAuB,WAAA,SAAoB,gBAAA;EAAA,SAC3C,sBAAA;EAAA,SACA,yBAAA,YAAqC,gBAAA;EAAA,SACrC,uBAAA,GAA0B,yBAAA;EAAA,SAC1B,sBAAA,GAAyB,sBAAA;EDzDzB;;;AAAmB;;;;ACkD9B;;EDlDW,SCmEA,0BAAA,EAA4B,WAAA,SAAoB,QAAA;EAhBtC;;;;;;;;;EAAA,SA0BV,eAAA,IAAmB,KAAA,EAAO,uBAAA,KAA4B,SAAA;AAAA;AAAA,iBAurDjD,iCAAA,CACd,KAAA,EAAO,sCAAA,GACN,MAAA,CAAO,QAAA,EAAU,yBAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/psl-column-resolution.ts","../src/interpreter.ts"],"mappings":";;;;;;;;;;;KA0CY,gBAAA;EAAA,SACD,OAAA;EAAA,SACA,UAAA;EAAA,SACA,OAAA;EAAA,SACA,UAAA,GAAa,MAAM;AAAA;;;UCoDb,sCAAA;EAAA,SACN,QAAA,EAAU,sBAAA;EAAA,SACV,MAAA,EAAQ,aAAA;EAAA,SACR,qBAAA,EAAuB,WAAA,SAAoB,gBAAA;EAAA,SAC3C,sBAAA;EAAA,SACA,yBAAA,YAAqC,gBAAA;EAAA,SACrC,uBAAA,GAA0B,yBAAA;EAAA,SAC1B,sBAAA,GAAyB,sBAAA;ED3DzB;;;AAAmB;;;;ACoD9B;;EDpDW,SCqEA,0BAAA,EAA4B,WAAA,SAAoB,QAAA;EAhBtC;;;;;;;;;EAAA,SA0BV,eAAA,IAAmB,KAAA,EAAO,uBAAA,KAA4B,SAAA;AAAA;AAAA,iBA8sDjD,iCAAA,CACd,KAAA,EAAO,sCAAA,GACN,MAAA,CAAO,QAAA,EAAU,yBAAA"}

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { t as interpretPslDocumentToSqlContract } from "./interpreter-B5_yovSP.mjs";
+import { t as interpretPslDocumentToSqlContract } from "./interpreter-B_KtZusL.mjs";
 export { interpretPslDocumentToSqlContract };

package/dist/{interpreter-B5_yovSP.mjs → interpreter-B_KtZusL.mjs}

@@ -1308,6 +1308,10 @@ function resolveColumnDescriptor(field, enumTypeDescriptors, namedTypeDescriptor
 }
 //#endregion
 //#region src/psl-field-resolution.ts
+const MODEL_COORDINATE_SEPARATOR = "\0";
+function modelCoordinateKey(namespaceId, modelName) {
+	return `${namespaceId}${MODEL_COORDINATE_SEPARATOR}${modelName}`;
+}
 const BUILTIN_FIELD_ATTRIBUTE_NAMES = new Set([
 	"id",
 	"unique",
@@ -1540,9 +1544,9 @@ function collectResolvedFields(input) {
 	}
 	return resolvedFields;
 }
-function buildModelMappings(models, diagnostics, sourceId) {
+function buildModelMappings(modelEntries, defaultNamespaceId, diagnostics, sourceId) {
 	const result = /* @__PURE__ */ new Map();
-	for (const model of models) {
+	for (const { model, namespaceId } of modelEntries) {
 		const tableName = parseMapName({
 			attribute: getAttribute(model.attributes, "map"),
 			defaultValue: lowerFirst(model.name),
@@ -1563,7 +1567,7 @@ function buildModelMappings(models, diagnostics, sourceId) {
 			});
 			fieldColumns.set(field.name, columnName);
 		}
-		result.set(model.name, {
+		result.set(modelCoordinateKey(namespaceId ?? defaultNamespaceId, model.name), {
 			model,
 			tableName,
 			fieldColumns
@@ -1717,6 +1721,7 @@ function indexFkRelations(input) {
 			fieldName: relation.declaringFieldName,
 			toModel: relation.targetModelName,
 			toTable: relation.targetTableName,
+			...ifDefined("toNamespaceId", relation.targetNamespaceId),
 			cardinality: "N:1",
 			on: {
 				parentTable: relation.declaringTableName,
@@ -2592,16 +2597,15 @@ function buildModelNodeFromPsl(input) {
 			});
 			continue;
 		}
-		if (fieldTypeNamespaceId !== void 0) {
-			if (input.modelNamespaceIds.get(fieldTypeName) !== (fieldTypeNamespaceId === "unbound" ? "__unbound__" : fieldTypeNamespaceId)) {
-				diagnostics.push({
-					code: "PSL_INVALID_RELATION_TARGET",
-					message: `Relation field "${model.name}.${relationAttribute.field.name}" references unknown model "${qualifiedTypeName}"`,
-					sourceId,
-					span: relationAttribute.field.span
-				});
-				continue;
-			}
+		const normalizedQualifier = fieldTypeNamespaceId === void 0 ? void 0 : fieldTypeNamespaceId === "unbound" ? "__unbound__" : fieldTypeNamespaceId;
+		if (normalizedQualifier !== void 0 && !input.modelMappingsByCoordinate.has(modelCoordinateKey(normalizedQualifier, fieldTypeName))) {
+			diagnostics.push({
+				code: "PSL_INVALID_RELATION_TARGET",
+				message: `Relation field "${model.name}.${relationAttribute.field.name}" references unknown model "${qualifiedTypeName}"`,
+				sourceId,
+				span: relationAttribute.field.span
+			});
+			continue;
 		}
 		const parsedRelation = parseRelationAttribute({
 			attribute: relationAttribute.relation,
@@ -2620,7 +2624,7 @@ function buildModelNodeFromPsl(input) {
 			});
 			continue;
 		}
-		const targetMapping = input.modelMappings.get(fieldTypeName);
+		const targetMapping = normalizedQualifier !== void 0 ? input.modelMappingsByCoordinate.get(modelCoordinateKey(normalizedQualifier, fieldTypeName)) : input.modelMappings.get(fieldTypeName);
 		if (!targetMapping) {
 			diagnostics.push({
 				code: "PSL_INVALID_RELATION_TARGET",
@@ -2677,7 +2681,7 @@ function buildModelNodeFromPsl(input) {
 			span: relationAttribute.field.span,
 			diagnostics
 		}) : void 0;
-		const targetNamespaceId = input.modelNamespaceIds.get(targetMapping.model.name);
+		const targetNamespaceId = normalizedQualifier !== void 0 ? normalizedQualifier : input.modelNamespaceIds.get(targetMapping.model.name);
 		foreignKeyNodes.push({
 			columns: localColumns,
 			references: {
@@ -2696,6 +2700,7 @@ function buildModelNodeFromPsl(input) {
 			declaringTableName: tableName,
 			targetModelName: targetMapping.model.name,
 			targetTableName: targetMapping.tableName,
+			...ifDefined("targetNamespaceId", targetNamespaceId),
 			...ifDefined("relationName", parsedRelation.relationName),
 			localColumns,
 			referencedColumns
@@ -2888,12 +2893,14 @@ function collectPolymorphismDeclarations(models, sourceId, diagnostics) {
 }
 function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations, modelNames, modelMappings, modelNamespaceIds, defaultNamespaceId, syntheticPkFieldsByVariant, stiBaseFieldsByBase, sourceId, diagnostics) {
 	let patched = models;
+	const coordinateFor = (modelName) => modelCoordinateKey(modelNamespaceIds.get(modelName) ?? defaultNamespaceId, modelName);
 	for (const [baseName, fieldNames] of stiBaseFieldsByBase) {
-		const baseModel = patched[baseName];
+		const baseKey = coordinateFor(baseName);
+		const baseModel = patched[baseKey];
 		if (!baseModel || fieldNames.length === 0) continue;
 		patched = {
 			...patched,
-			[baseName]: stripStorageOnlyDomainFields(baseModel, fieldNames)
+			[baseKey]: stripStorageOnlyDomainFields(baseModel, fieldNames)
 		};
 	}
 	for (const [modelName, decl] of discriminatorDeclarations) {
@@ -2906,7 +2913,7 @@ function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations
 			});
 			continue;
 		}
-		const model = patched[modelName];
+		const model = patched[coordinateFor(modelName)];
 		if (!model) continue;
 		if (!Object.hasOwn(model.fields, decl.fieldName)) {
 			diagnostics.push({
@@ -2945,7 +2952,7 @@ function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations
 		}
 		patched = {
 			...patched,
-			[modelName]: {
+			[coordinateFor(modelName)]: {
 				...model,
 				discriminator: { field: decl.fieldName },
 				variants
@@ -2972,7 +2979,7 @@ function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations
 			continue;
 		}
 		if (discriminatorDeclarations.has(variantName)) continue;
-		const variantModel = patched[variantName];
+		const variantModel = patched[coordinateFor(variantName)];
 		if (!variantModel) continue;
 		const baseMapping = modelMappings.get(baseDecl.baseName);
 		const variantMapping = modelMappings.get(variantName);
@@ -2987,7 +2994,7 @@ function resolvePolymorphism(models, discriminatorDeclarations, baseDeclarations
 		};
 		patched = {
 			...patched,
-			[variantName]: stripStorageOnlyDomainFields(patchedVariant, syntheticPkFieldsByVariant.get(variantName) ?? [])
+			[coordinateFor(variantName)]: stripStorageOnlyDomainFields(patchedVariant, syntheticPkFieldsByVariant.get(variantName) ?? [])
 		};
 	}
 	return patched;
@@ -3165,6 +3172,7 @@ function interpretPslDocumentToSqlContract(input) {
 		diagnostics
 	});
 	const models = [];
+	const modelEntries = [];
 	const modelNamespaceIds = /* @__PURE__ */ new Map();
 	for (const namespace of input.document.ast.namespaces) {
 		const resolvedNamespaceId = resolveNamespaceIdForSqlTarget({
@@ -3173,9 +3181,14 @@ function interpretPslDocumentToSqlContract(input) {
 		});
 		for (const model of namespace.models) {
 			models.push(model);
+			modelEntries.push({
+				model,
+				namespaceId: resolvedNamespaceId
+			});
 			if (resolvedNamespaceId !== void 0) modelNamespaceIds.set(model.name, resolvedNamespaceId);
 		}
 	}
+	const defaultNamespaceId = input.target.defaultNamespaceId;
 	const topLevelEnums = input.document.ast.namespaces.filter((ns) => ns.name === UNSPECIFIED_PSL_NAMESPACE_NAME).flatMap((ns) => ns.enums);
 	const namedNamespaceEnumsByNsId = /* @__PURE__ */ new Map();
 	for (const ns of input.document.ast.namespaces) {
@@ -3239,19 +3252,23 @@ function interpretPslDocumentToSqlContract(input) {
 		...enumResult.storageTypes,
 		...namedTypeResult.storageTypes
 	};
-	const modelMappings = buildModelMappings(models, diagnostics, sourceId);
+	const modelMappingsByCoordinate = buildModelMappings(modelEntries, defaultNamespaceId, diagnostics, sourceId);
+	const modelMappings = /* @__PURE__ */ new Map();
+	for (const mapping of modelMappingsByCoordinate.values()) modelMappings.set(mapping.model.name, mapping);
 	const modelNodes = [];
 	const fkRelationMetadata = [];
 	const backrelationCandidates = [];
 	const modelResolvedFields = /* @__PURE__ */ new Map();
 	const crossSpaceRelationsByModel = /* @__PURE__ */ new Map();
-	for (const model of models) {
-		const mapping = modelMappings.get(model.name);
+	for (const { model, namespaceId } of modelEntries) {
+		const coordinate = modelCoordinateKey(namespaceId ?? defaultNamespaceId, model.name);
+		const mapping = modelMappingsByCoordinate.get(coordinate);
 		if (!mapping) continue;
 		const result = buildModelNodeFromPsl({
 			model,
 			mapping,
 			modelMappings,
+			modelMappingsByCoordinate,
 			modelNames,
 			compositeTypeNames,
 			enumTypeDescriptors: allEnumTypeDescriptors,
@@ -3268,14 +3285,13 @@ function interpretPslDocumentToSqlContract(input) {
 			diagnostics,
 			modelNamespaceIds
 		});
-		const resolvedNamespaceId = modelNamespaceIds.get(model.name);
-		modelNodes.push(resolvedNamespaceId !== void 0 ? {
+		modelNodes.push(namespaceId !== void 0 ? {
 			...result.modelNode,
-			namespaceId: resolvedNamespaceId
+			namespaceId
 		} : result.modelNode);
 		fkRelationMetadata.push(...result.fkRelationMetadata);
 		backrelationCandidates.push(...result.backrelationCandidates);
-		modelResolvedFields.set(model.name, result.resolvedFields);
+		modelResolvedFields.set(coordinate, result.resolvedFields);
 		if (result.crossSpaceRelations.length > 0) {
 			const existing = crossSpaceRelationsByModel.get(model.name) ?? [];
 			crossSpaceRelationsByModel.set(model.name, [...existing, ...result.crossSpaceRelations]);
@@ -3327,9 +3343,10 @@ function interpretPslDocumentToSqlContract(input) {
 		}))
 	});
 	const modelsForPatch = {};
-	for (const namespaceSlice of Object.values(contract.domain.namespaces)) for (const [modelName, model] of Object.entries(namespaceSlice.models)) {
-		if (Object.hasOwn(modelsForPatch, modelName)) throw new Error(`duplicate model name "${modelName}" across domain namespaces during PSL interpretation`);
-		modelsForPatch[modelName] = model;
+	for (const [namespaceId, namespaceSlice] of Object.entries(contract.domain.namespaces)) for (const [modelName, model] of Object.entries(namespaceSlice.models)) {
+		const coordinate = modelCoordinateKey(namespaceId, modelName);
+		if (Object.hasOwn(modelsForPatch, coordinate)) throw new Error(`duplicate model "${namespaceId}.${modelName}" during PSL interpretation`);
+		modelsForPatch[coordinate] = model;
 	}
 	let patchedModels = patchModelDomainFields(modelsForPatch, modelResolvedFields);
 	const polyDiagnostics = [];
@@ -3344,7 +3361,7 @@ function interpretPslDocumentToSqlContract(input) {
 		...contract,
 		roots: filteredRoots,
 		domain: { namespaces: Object.fromEntries(Object.entries(contract.domain.namespaces).map(([namespaceId, namespaceSlice]) => [namespaceId, {
-			models: Object.fromEntries(Object.entries(namespaceSlice.models).map(([modelName, model]) => [modelName, patchedModels[modelName] ?? model])),
+			models: Object.fromEntries(Object.entries(namespaceSlice.models).map(([modelName, model]) => [modelName, patchedModels[modelCoordinateKey(namespaceId, modelName)] ?? model])),
 			...namespaceSlice.valueObjects !== void 0 ? { valueObjects: namespaceSlice.valueObjects } : {},
 			...namespaceId === input.target.defaultNamespaceId && Object.keys(valueObjects).length > 0 ? { valueObjects } : {}
 		}])) }
@@ -3353,4 +3370,4 @@ function interpretPslDocumentToSqlContract(input) {
 //#endregion
 export { interpretPslDocumentToSqlContract as t };
 
-//# sourceMappingURL=interpreter-B5_yovSP.mjs.map
+//# sourceMappingURL=interpreter-B_KtZusL.mjs.map