@zenstackhq/language 3.0.0-beta.29 → 3.0.0-beta.30

package/dist/index.js

@@ -5572,13 +5572,23 @@ function getAllAttributes(decl, seen = /* @__PURE__ */ new Set()) {
   }
   if (isDataModel(decl) && decl.baseModel) {
     if (decl.baseModel.ref) {
-      attributes.push(...getAllAttributes(decl.baseModel.ref, seen));
+      const attrs = getAllAttributes(decl.baseModel.ref, seen).filter((attr) => !isNonInheritableAttribute(attr));
+      attributes.push(...attrs);
     }
   }
   attributes.push(...decl.attributes);
   return attributes;
 }
 __name(getAllAttributes, "getAllAttributes");
+function isNonInheritableAttribute(attr) {
+  const attrName = attr.decl.ref?.name ?? attr.decl.$refText;
+  return [
+    "@@map",
+    "@@unique",
+    "@@index"
+  ].includes(attrName);
+}
+__name(isNonInheritableAttribute, "isNonInheritableAttribute");
 function getDocument(node) {
   const rootNode = findRootNode(node);
   const result = rootNode.$document;
@@ -6376,7 +6386,7 @@ var DataModelValidator = class {
     if (!thisRelation.valid) {
       return;
     }
-    if (this.isFieldInheritedFromDelegateModel(field)) {
+    if (this.isFieldInheritedFromDelegateModel(field, contextModel)) {
       return;
     }
     if (this.isSelfRelation(field)) {
@@ -6499,8 +6509,8 @@ var DataModelValidator = class {
     }
   }
   // checks if the given field is inherited directly or indirectly from a delegate model
-  isFieldInheritedFromDelegateModel(field) {
-    return isDelegateModel(field.$container);
+  isFieldInheritedFromDelegateModel(field, contextModel) {
+    return field.$container !== contextModel && isDelegateModel(field.$container);
   }
   validateInherits(model, accept) {
     if (!model.baseModel) {