@narrative.io/data-collaboration-sdk-ts 2.90.0 → 2.90.1

package/build/collaboration-policy/core/policy-validator.js

@@ -35,7 +35,7 @@ export function validatePolicyAgainstDataset(policy, _dataset, attributes) {
     for (const filter of filters) {
         collectMissingAttributesFromFilter(filter, attributeByName, missingFilterAttributes);
     }
-    visitStructureFilters(policy.policy.definition.structure, (filter) => collectMissingAttributesFromFilter(filter, attributeByName, missingFilterAttributes));
+    visitStructureFilters(policy.policy.definition.structure, (filter) => collectMissingAttributesFromFilter(filter, attributeByName, missingFilterAttributes), attributeByName);
     if (missingFilterAttributes.size > 0) {
         result.isValid = false;
         const missingList = Array.from(missingFilterAttributes).sort();
@@ -115,27 +115,64 @@ function validatePolicyStructure(structure, attributeByName) {
     }
     return { isValid: true, errors: [] };
 }
-function visitStructureFilters(node, visitor) {
+/**
+ * Checks if a branch is satisfied (all required attributes exist).
+ * For anyOf: at least one child must be satisfied.
+ * For allOf: all children must be satisfied.
+ * For field nodes: the attribute must exist.
+ */
+function isBranchSatisfied(node, attributeByName) {
+    if (!node || typeof node !== "object") {
+        return true;
+    }
+    if ("field" in node) {
+        const field = node.field;
+        if (field.type === "attribute" && field.attribute_name) {
+            return attributeByName.has(field.attribute_name);
+        }
+        return true;
+    }
+    if ("anyOf" in node && Array.isArray(node.anyOf)) {
+        return node.anyOf.some((child) => isBranchSatisfied(child, attributeByName));
+    }
+    if ("allOf" in node && Array.isArray(node.allOf)) {
+        return node.allOf.every((child) => isBranchSatisfied(child, attributeByName));
+    }
+    return true;
+}
+/**
+ * Visits filters only in satisfied branches of the policy structure.
+ * For anyOf nodes, only visits filters in branches where the required attributes exist.
+ * For allOf nodes, visits filters in all branches (since all must be satisfied).
+ */
+function visitStructureFilters(node, visitor, attributeByName) {
     if (!node || typeof node !== "object") {
         return;
     }
     if ("field" in node) {
-        const filters = node.filters;
-        if (filters) {
-            for (const filter of filters) {
-                visitor(filter);
+        // Only visit filters if this branch is satisfied
+        if (isBranchSatisfied(node, attributeByName)) {
+            const filters = node.filters;
+            if (filters) {
+                for (const filter of filters) {
+                    visitor(filter);
+                }
             }
         }
         return;
     }
     if ("anyOf" in node && Array.isArray(node.anyOf)) {
+        // Only visit filters in satisfied branches
         for (const child of node.anyOf) {
-            visitStructureFilters(child, visitor);
+            if (isBranchSatisfied(child, attributeByName)) {
+                visitStructureFilters(child, visitor, attributeByName);
+            }
         }
     }
     if ("allOf" in node && Array.isArray(node.allOf)) {
+        // For allOf, visit all branches (they all must be satisfied)
         for (const child of node.allOf) {
-            visitStructureFilters(child, visitor);
+            visitStructureFilters(child, visitor, attributeByName);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narrative.io/data-collaboration-sdk-ts",
-	"version": "2.90.0",
+	"version": "2.90.1",
 	"main": "build/index.js",
 	"repository": "github:narrative-io/data-collaboration-sdk-ts",
 	"source": "src/index.ts",