@zenstackhq/language 3.8.0-beta.3 → 3.8.1

package/dist/index.cjs

@@ -4008,7 +4008,6 @@ var AttributeApplicationValidator = class {
 		if (require_ast.isDataField(targetDecl) && !isValidAttributeTarget(decl, targetDecl)) accept("error", `attribute "${decl.name}" cannot be used on this type of field`, { node: attr });
 		this.checkDeprecation(attr, accept);
 		this.checkDuplicatedAttributes(attr, accept, contextDataModel);
-		this.checkOnceInModel(attr, accept);
 		const filledParams = /* @__PURE__ */ new Set();
 		for (const arg of attr.args) {
 			let paramDecl;
@@ -4054,15 +4053,6 @@ var AttributeApplicationValidator = class {
 		if (!attrDecl?.attributes.some((a) => a.decl.ref?.name === "@@@once")) return;
 		if ((contextDataModel ? require_utils.getAllAttributes(contextDataModel) : attr.$container.attributes).filter((a) => a.decl.ref === attrDecl && a !== attr).length > 0) accept("error", `Attribute "${attrDecl.name}" can only be applied once`, { node: attr });
 	}
-	checkOnceInModel(attr, accept) {
-		const attrDecl = attr.decl.ref;
-		if (!attrDecl?.attributes.some((a) => a.decl.ref?.name === "@@@onceInModel")) return;
-		const field = attr.$container;
-		if (!require_ast.isDataField(field)) return;
-		const dataModel = require_utils.getContainingDataModel(attr);
-		if (!dataModel) return;
-		if (require_utils.getAllFields(dataModel).filter((f) => f.attributes.some((a) => a.decl.ref === attrDecl)).length > 1) accept("error", `Attribute "${attrDecl.name}" can only be applied to one field per model`, { node: attr });
-	}
 	_checkModelLevelPolicy(attr, accept) {
 		const kind = require_utils.getStringLiteral(attr.args[0]?.value);
 		if (!kind) {
@@ -4409,6 +4399,7 @@ var DataModelValidator = class {
 		validateDuplicatedDeclarations(dm, require_utils.getAllFields(dm), accept);
 		this.validateAttributes(dm, accept);
 		this.validateFields(dm, accept);
+		this.validateOnceInModelAttributes(dm, accept);
 		if (dm.mixins.length > 0) this.validateMixins(dm, accept);
 		this.validateInherits(dm, accept);
 		this.validateDelegateMap(dm, accept);
@@ -4457,6 +4448,24 @@ var DataModelValidator = class {
 	validateAttributes(dm, accept) {
 		require_utils.getAllAttributes(dm).forEach((attr) => validateAttributeApplication(attr, accept, dm));
 	}
+	validateOnceInModelAttributes(dm, accept) {
+		const occurrences = /* @__PURE__ */ new Map();
+		for (const field of require_utils.getAllFields(dm)) for (const attr of field.attributes) {
+			const decl = attr.decl.ref;
+			if (decl && require_utils.hasAttribute(decl, "@@@onceInModel")) {
+				const list = occurrences.get(decl) ?? [];
+				list.push(attr);
+				occurrences.set(decl, list);
+			}
+		}
+		for (const [decl, attrs] of occurrences) {
+			if (attrs.length <= 1) continue;
+			const message = `Attribute "${decl.name}" can only be applied to one field per model`;
+			const local = attrs.filter((attr) => dm.fields.includes(attr.$container));
+			if (local.length > 0) local.forEach((attr) => accept("error", message, { node: attr }));
+			else accept("error", message, { node: dm });
+		}
+	}
 	parseRelation(field, accept) {
 		const relAttr = field.attributes.find((attr) => attr.decl.ref?.name === "@relation");
 		let name;