@narrative.io/data-collaboration-sdk-ts 2.89.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/build/mappings/index.d.ts

@@ -1,7 +1,7 @@
 import type { ApiRecords, Config } from "src/types";
 import { BaseApi } from "../base-api";
 import { CompanyInfoApi } from "../company-info";
-import type { CreateMapping, Mapping, MappingTestResult, MappingTestResults } from "./types";
+import type { CreateMapping, Mapping, MappingExpressionDependencies, MappingTestResult, MappingTestResults, ObjectMapping, PropertyMapping, RawMappingDefinition, RawObjectMapping, RawPropertyMapping, RawValueMapping, ValueMapping } from "./types";
 /**
  * Class representing the Mappings API.
  * Extends the BaseApi to provide functionalities specific to mappings.
@@ -111,4 +111,4 @@ declare class MappingsApi extends BaseApi {
      */
     getMapping(mappingId: string): Promise<Mapping>;
 }
-export { type Mapping, MappingsApi, type CreateMapping, type MappingTestResult, type MappingTestResults, };
+export { type Mapping, MappingsApi, type CreateMapping, type MappingExpressionDependencies, type MappingTestResult, type MappingTestResults, type ObjectMapping, type PropertyMapping, type RawMappingDefinition, type RawObjectMapping, type RawPropertyMapping, type RawValueMapping, type ValueMapping, };

package/build/mappings/types.d.ts

@@ -17,9 +17,25 @@ export interface Mapping {
 type MappingStatus = "active" | "archived" | "pending" | "rejected";
 type MappingScope = "global" | "private";
 type MappingSource = "system" | "admin" | "company";
+export interface MappingExpressionDependencies {
+    properties: string[];
+}
+export interface RawPropertyMapping {
+    path: string;
+    expression: string;
+}
+export interface RawObjectMapping {
+    type: "object_mapping";
+    property_mappings: RawPropertyMapping[];
+}
+export interface RawValueMapping {
+    type: "value_mapping";
+    expression: string;
+}
 export interface PropertyMapping {
     path: string;
     expression: string;
+    dependencies: MappingExpressionDependencies;
 }
 export interface ObjectMapping {
     type: "object_mapping";
@@ -28,9 +44,16 @@ export interface ObjectMapping {
 export interface ValueMapping {
     type: "value_mapping";
     expression: string;
+    dependencies: MappingExpressionDependencies;
+}
+export type RawMappingDefinition = RawObjectMapping | RawValueMapping;
+export interface CreateMapping {
+    attribute_id: number;
+    dataset_id: number;
+    mapping: RawMappingDefinition;
+    tags?: string[];
+    status?: MappingStatus;
 }
-type WithOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
-export type CreateMapping = WithOptional<Pick<Mapping, "attribute_id" | "dataset_id" | "mapping" | "tags" | "status">, "status">;
 export interface MappingTestResult {
     input: Record<string, unknown>;
     output: Record<string, unknown>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narrative.io/data-collaboration-sdk-ts",
-	"version": "2.89.0",
+	"version": "2.90.1",
 	"main": "build/index.js",
 	"repository": "github:narrative-io/data-collaboration-sdk-ts",
 	"source": "src/index.ts",
@@ -29,12 +29,12 @@
 		"@babel/preset-env": "7.28.5",
 		"@babel/preset-typescript": "7.28.5",
 		"@biomejs/biome": "2.3.8",
-		"@commitlint/cli": "20.1.0",
-		"@commitlint/config-conventional": "20.0.0",
+		"@commitlint/cli": "20.2.0",
+		"@commitlint/config-conventional": "20.2.0",
 		"@types/jest": "30.0.0",
 		"babel-jest": "30.2.0",
 		"jest": "30.2.0",
-		"lefthook": "2.0.7",
+		"lefthook": "2.0.9",
 		"ts-jest": "29.4.6"
 	},
 	"dependencies": {