@prisma-next/sql-contract-psl 0.5.0-dev.52 → 0.5.0-dev.54

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/psl-column-resolution.ts","../src/interpreter.ts"],"sourcesContent":[],"mappings":";;;;;;;;;KAuCY,gBAAA;;;;EAAA,SAAA,UAAgB,CAAA,EAIJ,MAJI,CAAA,MAIJ,EAAM,OAAA,CAAA;;;;UCkCb,sCAAA;EDtCL,SAAA,QAAA,ECuCS,sBDnCS;mBCoCX;kCACe,oBAAoB;;EAHrC,SAAA,yBAAA,CAAA,EAAA,SAK+B,gBALO,CAAA,KAAA,EAAA,MAAA,CAAA,EAAA;EAClC,SAAA,uBAAA,CAAA,EAKgB,yBALhB;EACF,SAAA,sBAAA,CAAA,EAKiB,sBALjB;;AACe,iBAggClB,iCAAA,CAhgCkB,KAAA,EAigCzB,sCAjgCyB,CAAA,EAkgC/B,MAlgC+B,CAkgCxB,QAlgCwB,EAkgCd,yBAlgCc,CAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/psl-column-resolution.ts","../src/interpreter.ts"],"sourcesContent":[],"mappings":";;;;;;;;;KAuCY,gBAAA;;;;EAAA,SAAA,UAAgB,CAAA,EAIJ,MAJI,CAAA,MAIJ,EAAM,OAAA,CAAA;;;;UCoCb,sCAAA;EDxCL,SAAA,QAAA,ECyCS,sBDrCS;mBCsCX;kCACe,oBAAoB;;EAHrC,SAAA,yBAAA,CAAA,EAAA,SAK+B,gBALO,CAAA,KAAA,EAAA,MAAA,CAAA,EAAA;EAClC,SAAA,uBAAA,CAAA,EAKgB,yBALhB;EACF,SAAA,sBAAA,CAAA,EAKiB,sBALjB;;AACe,iBAylClB,iCAAA,CAzlCkB,KAAA,EA0lCzB,sCA1lCyB,CAAA,EA2lC/B,MA3lC+B,CA2lCxB,QA3lCwB,EA2lCd,yBA3lCc,CAAA"}

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { t as interpretPslDocumentToSqlContract } from "./interpreter-DJrrH8Ee.mjs";
+import { t as interpretPslDocumentToSqlContract } from "./interpreter-BChe-9vN.mjs";
 
 export { interpretPslDocumentToSqlContract };

package/dist/{interpreter-DJrrH8Ee.mjs → interpreter-BChe-9vN.mjs}

@@ -149,7 +149,7 @@ function parseAttributeFieldList(input) {
 	if (!raw) {
 		input.diagnostics.push({
 			code: input.code,
-			message: `${input.messagePrefix} requires fields list argument`,
+			message: `${input.entityLabel} requires fields list argument`,
 			sourceId: input.sourceId,
 			span: input.attribute.span
 		});
@@ -159,7 +159,7 @@ function parseAttributeFieldList(input) {
 	if (!fields || fields.length === 0) {
 		input.diagnostics.push({
 			code: input.code,
-			message: `${input.messagePrefix} requires bracketed field list argument`,
+			message: `${input.entityLabel} requires bracketed field list argument`,
 			sourceId: input.sourceId,
 			span: input.attribute.span
 		});
@@ -167,6 +167,13 @@ function parseAttributeFieldList(input) {
 	}
 	return fields;
 }
+function findDuplicateFieldName(fieldNames) {
+	const seen = /* @__PURE__ */ new Set();
+	for (const name of fieldNames) {
+		if (seen.has(name)) return name;
+		seen.add(name);
+	}
+}
 function mapFieldNamesToColumns(input) {
 	const columns = [];
 	for (const fieldName of input.fieldNames) {
@@ -174,7 +181,7 @@ function mapFieldNamesToColumns(input) {
 		if (!columnName) {
 			input.diagnostics.push({
 				code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
-				message: `${input.contextLabel} references unknown field "${input.modelName}.${fieldName}"`,
+				message: `${input.entityLabel} references unknown field "${input.modelName}.${fieldName}"`,
 				sourceId: input.sourceId,
 				span: input.span
 			});
@@ -1343,6 +1350,16 @@ function collectResolvedFields(input) {
 			sourceId,
 			diagnostics
 		});
+		let isIdField = Boolean(idAttribute);
+		if (idAttribute && field.optional) {
+			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
+			});
+			isIdField = false;
+		}
 		if (presetContributions && idAttribute && !presetContributions.id) {
 			diagnostics.push({
 				code: "PSL_PRESET_AND_ID_CONFLICT",
@@ -1360,7 +1377,7 @@ function collectResolvedFields(input) {
 			descriptor,
 			...ifDefined("defaultValue", fieldDefaultValue),
 			...ifDefined("executionDefaults", fieldExecutionDefaults),
-			isId: Boolean(idAttribute) || Boolean(presetContributions?.id),
+			isId: isIdField || Boolean(presetContributions?.id),
 			isUnique: Boolean(uniqueAttribute) || Boolean(presetContributions?.unique),
 			...ifDefined("idName", idName),
 			...ifDefined("uniqueName", uniqueName),
@@ -1887,16 +1904,20 @@ function buildModelNodeFromPsl(input) {
 		sourceId,
 		scalarTypeDescriptors: input.scalarTypeDescriptors
 	});
-	const primaryKeyFields = resolvedFields.filter((field) => field.isId);
-	const primaryKeyColumns = primaryKeyFields.map((field) => field.columnName);
-	const primaryKeyName = primaryKeyFields.length === 1 ? primaryKeyFields[0]?.idName : void 0;
-	const isVariantModel = model.attributes.some((attr) => attr.name === "base");
-	if (primaryKeyColumns.length === 0 && !isVariantModel) diagnostics.push({
-		code: "PSL_MISSING_PRIMARY_KEY",
-		message: `Model "${model.name}" must declare at least one @id field for SQL provider`,
+	const inlineIdFields = resolvedFields.filter((field) => field.isId);
+	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
 	});
+	const singleInlineIdField = inlineIdFields.length === 1 ? inlineIdFields[0] : void 0;
+	let primaryKey = singleInlineIdField ? {
+		columns: [singleInlineIdField.columnName],
+		...ifDefined("name", singleInlineIdField.idName)
+	} : void 0;
+	const hasInlinePrimaryKey = primaryKey !== void 0;
+	let blockPrimaryKeyDeclared = false;
 	const resultBackrelationCandidates = [];
 	for (const field of model.fields) {
 		if (!field.list || !input.modelNames.has(field.typeName)) continue;
@@ -1963,15 +1984,98 @@ function buildModelNodeFromPsl(input) {
 	for (const modelAttribute of model.attributes) {
 		if (modelAttribute.name === "map") continue;
 		if (modelAttribute.name === "discriminator" || modelAttribute.name === "base") continue;
+		const attributeLabel = `Model "${model.name}" @@${modelAttribute.name}`;
+		if (modelAttribute.name === "id") {
+			if (blockPrimaryKeyDeclared) {
+				diagnostics.push({
+					code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
+					message: `Model "${model.name}" declares @@id more than once`,
+					sourceId,
+					span: modelAttribute.span
+				});
+				continue;
+			}
+			if (hasInlinePrimaryKey) {
+				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
+				});
+				blockPrimaryKeyDeclared = true;
+				continue;
+			}
+			const fieldNames = parseAttributeFieldList({
+				attribute: modelAttribute,
+				sourceId,
+				diagnostics,
+				code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
+				entityLabel: attributeLabel
+			});
+			if (!fieldNames) continue;
+			const duplicateFieldName = findDuplicateFieldName(fieldNames);
+			if (duplicateFieldName !== void 0) {
+				diagnostics.push({
+					code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
+					message: `${attributeLabel} list contains duplicate field "${duplicateFieldName}"`,
+					sourceId,
+					span: modelAttribute.span
+				});
+				continue;
+			}
+			const nullableFieldName = fieldNames.find((name) => model.fields.find((f) => f.name === name)?.optional === true);
+			if (nullableFieldName !== void 0) {
+				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
+				});
+				continue;
+			}
+			const columnNames = mapFieldNamesToColumns({
+				modelName: model.name,
+				fieldNames,
+				mapping,
+				sourceId,
+				diagnostics,
+				span: modelAttribute.span,
+				entityLabel: attributeLabel
+			});
+			if (!columnNames) continue;
+			primaryKey = {
+				columns: columnNames,
+				...ifDefined("name", parseConstraintMapArgument({
+					attribute: modelAttribute,
+					sourceId,
+					diagnostics,
+					entityLabel: attributeLabel,
+					span: modelAttribute.span,
+					code: "PSL_INVALID_ATTRIBUTE_ARGUMENT"
+				}))
+			};
+			blockPrimaryKeyDeclared = true;
+			continue;
+		}
 		if (modelAttribute.name === "unique" || modelAttribute.name === "index") {
 			const fieldNames = parseAttributeFieldList({
 				attribute: modelAttribute,
 				sourceId,
 				diagnostics,
 				code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
-				messagePrefix: `Model "${model.name}" @@${modelAttribute.name}`
+				entityLabel: attributeLabel
 			});
 			if (!fieldNames) continue;
+			const duplicateFieldName = findDuplicateFieldName(fieldNames);
+			if (duplicateFieldName !== void 0) {
+				diagnostics.push({
+					code: "PSL_INVALID_ATTRIBUTE_ARGUMENT",
+					message: `${attributeLabel} list contains duplicate field "${duplicateFieldName}"`,
+					sourceId,
+					span: modelAttribute.span
+				});
+				continue;
+			}
 			const columnNames = mapFieldNamesToColumns({
 				modelName: model.name,
 				fieldNames,
@@ -1979,14 +2083,14 @@ function buildModelNodeFromPsl(input) {
 				sourceId,
 				diagnostics,
 				span: modelAttribute.span,
-				contextLabel: `Model "${model.name}" @@${modelAttribute.name}`
+				entityLabel: attributeLabel
 			});
 			if (!columnNames) continue;
 			const constraintName = parseConstraintMapArgument({
 				attribute: modelAttribute,
 				sourceId,
 				diagnostics,
-				entityLabel: `Model "${model.name}" @@${modelAttribute.name}`,
+				entityLabel: attributeLabel,
 				span: modelAttribute.span,
 				code: "PSL_INVALID_ATTRIBUTE_ARGUMENT"
 			});
@@ -2068,7 +2172,7 @@ function buildModelNodeFromPsl(input) {
 			sourceId,
 			diagnostics,
 			span: relationAttribute.relation.span,
-			contextLabel: `Relation field "${model.name}.${relationAttribute.field.name}"`
+			entityLabel: `Relation field "${model.name}.${relationAttribute.field.name}"`
 		});
 		if (!localColumns) continue;
 		const referencedColumns = mapFieldNamesToColumns({
@@ -2078,7 +2182,7 @@ function buildModelNodeFromPsl(input) {
 			sourceId,
 			diagnostics,
 			span: relationAttribute.relation.span,
-			contextLabel: `Relation field "${model.name}.${relationAttribute.field.name}"`
+			entityLabel: `Relation field "${model.name}.${relationAttribute.field.name}"`
 		});
 		if (!referencedColumns) continue;
 		if (localColumns.length !== referencedColumns.length) {
@@ -2142,10 +2246,7 @@ function buildModelNodeFromPsl(input) {
 				...ifDefined("default", resolvedField.defaultValue),
 				...ifDefined("executionDefaults", resolvedField.executionDefaults)
 			})),
-			...primaryKeyColumns.length > 0 ? { id: {
-				columns: primaryKeyColumns,
-				...ifDefined("name", primaryKeyName)
-			} } : {},
+			...ifDefined("id", primaryKey),
 			...uniqueConstraints.length > 0 ? { uniques: uniqueConstraints } : {},
 			...indexNodes.length > 0 ? { indexes: indexNodes } : {},
 			...foreignKeyNodes.length > 0 ? { foreignKeys: foreignKeyNodes } : {}
@@ -2547,4 +2648,4 @@ function interpretPslDocumentToSqlContract(input) {
 
 //#endregion
 export { interpretPslDocumentToSqlContract as t };
-//# sourceMappingURL=interpreter-DJrrH8Ee.mjs.map
+//# sourceMappingURL=interpreter-BChe-9vN.mjs.map