@usertour/helpers 0.0.29 → 0.0.30

package/dist/__tests__/attribute.test.cjs

@@ -6,14 +6,14 @@ var import_types2 = require("@usertour/types");
 // src/conditions/attribute.ts
 var import_types = require("@usertour/types");
 var import_date_fns = require("date-fns");
-function evaluateFilterConditions(conditions, attributes, userAttributes) {
+function evaluateFilterConditions(conditions, options) {
   if (!conditions || !conditions.length) {
     return true;
   }
-  const result = evaluateAttributeConditionsGroup(conditions, attributes, userAttributes);
+  const result = evaluateAttributeConditionsGroup(conditions, options);
   return evaluateFilterResult(result);
 }
-function evaluateAttributeConditionsGroup(conditions, attributes, userAttributes) {
+function evaluateAttributeConditionsGroup(conditions, options) {
   if (!conditions || !conditions.length) {
     return false;
   }
@@ -21,7 +21,7 @@ function evaluateAttributeConditionsGroup(conditions, attributes, userAttributes
   const OR = [];
   for (const condition of conditions) {
     const { operators } = condition;
-    const item = condition.type !== "group" ? evaluateAttributeCondition(condition, attributes, userAttributes) : evaluateAttributeConditionsGroup(condition.conditions || [], attributes, userAttributes);
+    const item = condition.type !== "group" ? evaluateAttributeCondition(condition, options) : evaluateAttributeConditionsGroup(condition.conditions || [], options);
     if (!item) {
       continue;
     }
@@ -43,20 +43,27 @@ function evaluateAttributeConditionsGroup(conditions, attributes, userAttributes
   }
   return filter;
 }
-function evaluateAttributeCondition(condition, attributes, userAttributes) {
+function evaluateAttributeCondition(condition, options) {
   const { data } = condition;
   if (!data) {
     return false;
   }
   const { logic, value, attrId, value2, listValues = [] } = data;
-  if (!attrId) {
+  const {
+    attributes,
+    userAttributes = {},
+    companyAttributes = {},
+    membershipAttributes = {}
+  } = options;
+  if (!attrId || !attributes) {
     return false;
   }
   const attr = attributes.find((attr2) => attr2.id === attrId);
   if (!attr) {
     return false;
   }
-  const actualValue = getAttributeValue(attr.codeName, userAttributes);
+  const bizAttributes = attr.bizType === import_types.AttributeBizTypes.Company ? companyAttributes : attr.bizType === import_types.AttributeBizTypes.Membership ? membershipAttributes : userAttributes;
+  const actualValue = getAttributeValue(attr.codeName, bizAttributes);
   if (attr.dataType === import_types.BizAttributeTypes.String) {
     return evaluateStringCondition(logic, actualValue, value);
   }
@@ -74,8 +81,8 @@ function evaluateAttributeCondition(condition, attributes, userAttributes) {
   }
   return false;
 }
-function getAttributeValue(codeName, userAttributes) {
-  return userAttributes == null ? void 0 : userAttributes[codeName];
+function getAttributeValue(codeName, attributes) {
+  return attributes == null ? void 0 : attributes[codeName];
 }
 function evaluateStringCondition(logic, actualValue, expectedValue) {
   const stringValue = actualValue === null || actualValue === void 0 ? "" : String(actualValue);
@@ -243,32 +250,64 @@ var testAttributes = [
   {
     id: "email-attr",
     codeName: "email",
-    dataType: import_types2.BizAttributeTypes.String
+    dataType: import_types2.BizAttributeTypes.String,
+    bizType: import_types2.AttributeBizTypes.User
   },
   {
     id: "age-attr",
     codeName: "age",
-    dataType: import_types2.BizAttributeTypes.Number
+    dataType: import_types2.BizAttributeTypes.Number,
+    bizType: import_types2.AttributeBizTypes.User
   },
   {
     id: "isPremium-attr",
     codeName: "isPremium",
-    dataType: import_types2.BizAttributeTypes.Boolean
+    dataType: import_types2.BizAttributeTypes.Boolean,
+    bizType: import_types2.AttributeBizTypes.User
   },
   {
     id: "roles-attr",
     codeName: "roles",
-    dataType: import_types2.BizAttributeTypes.List
+    dataType: import_types2.BizAttributeTypes.List,
+    bizType: import_types2.AttributeBizTypes.User
   },
   {
     id: "signUpDate-attr",
     codeName: "signUpDate",
-    dataType: import_types2.BizAttributeTypes.DateTime
+    dataType: import_types2.BizAttributeTypes.DateTime,
+    bizType: import_types2.AttributeBizTypes.User
   },
   {
     id: "score-attr",
     codeName: "score",
-    dataType: import_types2.BizAttributeTypes.Number
+    dataType: import_types2.BizAttributeTypes.Number,
+    bizType: import_types2.AttributeBizTypes.User
+  },
+  // Company attributes
+  {
+    id: "company-name-attr",
+    codeName: "companyName",
+    dataType: import_types2.BizAttributeTypes.String,
+    bizType: import_types2.AttributeBizTypes.Company
+  },
+  {
+    id: "company-size-attr",
+    codeName: "companySize",
+    dataType: import_types2.BizAttributeTypes.Number,
+    bizType: import_types2.AttributeBizTypes.Company
+  },
+  // Membership attributes
+  {
+    id: "membership-level-attr",
+    codeName: "membershipLevel",
+    dataType: import_types2.BizAttributeTypes.String,
+    bizType: import_types2.AttributeBizTypes.Membership
+  },
+  {
+    id: "membership-duration-attr",
+    codeName: "membershipDuration",
+    dataType: import_types2.BizAttributeTypes.Number,
+    bizType: import_types2.AttributeBizTypes.Membership
   }
 ];
 var testUserAttributes = {
@@ -279,6 +318,20 @@ var testUserAttributes = {
   signUpDate: "2024-01-15T10:30:00Z",
   score: 85.5
 };
+var testCompanyAttributes = {
+  companyName: "Example Corp",
+  companySize: 500
+};
+var testMembershipAttributes = {
+  membershipLevel: "premium",
+  membershipDuration: 12
+};
+var defaultOptions = {
+  attributes: testAttributes,
+  userAttributes: testUserAttributes,
+  companyAttributes: testCompanyAttributes,
+  membershipAttributes: testMembershipAttributes
+};
 describe("Attribute Filter - Complete Test Suite", () => {
   describe("String conditions (8 cases)", () => {
     test('should evaluate "is" condition correctly', () => {
@@ -294,7 +347,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "not" condition correctly', () => {
       const condition = [
@@ -309,7 +362,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "contains" condition correctly', () => {
       const condition = [
@@ -324,7 +377,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "notContain" condition correctly', () => {
       const condition = [
@@ -339,7 +392,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "startsWith" condition correctly', () => {
       const condition = [
@@ -354,7 +407,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "endsWith" condition correctly', () => {
       const condition = [
@@ -369,7 +422,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "empty" condition correctly', () => {
       const condition = [
@@ -383,7 +436,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test('should evaluate "any" condition correctly', () => {
       const condition = [
@@ -397,7 +450,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
   });
   describe("Number conditions (9 cases)", () => {
@@ -414,7 +467,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "not" condition correctly', () => {
       const condition = [
@@ -429,7 +482,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "isLessThan" condition correctly', () => {
       const condition = [
@@ -444,7 +497,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "isLessThanOrEqualTo" condition correctly', () => {
       const condition = [
@@ -459,7 +512,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "isGreaterThan" condition correctly', () => {
       const condition = [
@@ -474,7 +527,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "isGreaterThanOrEqualTo" condition correctly', () => {
       const condition = [
@@ -489,7 +542,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "between" condition correctly', () => {
       const condition = [
@@ -505,7 +558,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "empty" condition correctly', () => {
       const condition = [
@@ -519,7 +572,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test('should evaluate "any" condition correctly', () => {
       const condition = [
@@ -533,7 +586,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
   });
   describe("Boolean conditions (4 cases)", () => {
@@ -549,7 +602,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "false" condition correctly', () => {
       const condition = [
@@ -563,7 +616,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test('should evaluate "empty" condition correctly', () => {
       const condition = [
@@ -577,7 +630,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test('should evaluate "any" condition correctly', () => {
       const condition = [
@@ -591,7 +644,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
   });
   describe("List conditions (6 cases)", () => {
@@ -608,7 +661,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "includesAll" condition correctly', () => {
       const condition = [
@@ -623,7 +676,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "notIncludesAtLeastOne" condition correctly', () => {
       const condition = [
@@ -638,7 +691,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "notIncludesAll" condition correctly', () => {
       const condition = [
@@ -653,7 +706,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "empty" condition correctly', () => {
       const condition = [
@@ -667,7 +720,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test('should evaluate "any" condition correctly', () => {
       const condition = [
@@ -681,7 +734,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
   });
   describe("DateTime conditions (8 cases)", () => {
@@ -693,13 +746,13 @@ describe("Attribute Filter - Complete Test Suite", () => {
           operators: "and",
           data: {
             logic: "lessThan",
-            value: 600,
-            // 600 days ago (signUpDate is 575 days ago, which is < 600, so should be false)
+            value: 30,
+            // Check if signUpDate is within the last 30 days (it's not, so should be false)
             attrId: "signUpDate-attr"
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test('should evaluate "exactly" condition correctly', () => {
       const condition = [
@@ -715,7 +768,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test('should evaluate "moreThan" condition correctly', () => {
       const condition = [
@@ -731,7 +784,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "before" condition correctly', () => {
       const condition = [
@@ -746,7 +799,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "on" condition correctly', () => {
       const condition = [
@@ -761,7 +814,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "after" condition correctly', () => {
       const condition = [
@@ -776,7 +829,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test('should evaluate "empty" condition correctly', () => {
       const condition = [
@@ -790,7 +843,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test('should evaluate "any" condition correctly', () => {
       const condition = [
@@ -804,7 +857,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
   });
   describe("Complex conditions with AND/OR logic", () => {
@@ -839,7 +892,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           ]
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test("should evaluate OR condition correctly", () => {
       const condition = [
@@ -872,7 +925,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           ]
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
     test("should evaluate mixed AND/OR condition correctly", () => {
       const condition = [
@@ -923,15 +976,15 @@ describe("Attribute Filter - Complete Test Suite", () => {
           ]
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
     });
   });
   describe("Edge cases and error handling", () => {
     test("should handle empty conditions array", () => {
-      expect(evaluateFilterConditions([], testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions([], defaultOptions)).toBe(true);
     });
     test("should handle null/undefined conditions", () => {
-      expect(evaluateFilterConditions(null, testAttributes, testUserAttributes)).toBe(true);
+      expect(evaluateFilterConditions(null, defaultOptions)).toBe(true);
     });
     test("should handle missing attribute", () => {
       const condition = [
@@ -946,7 +999,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test("should handle missing user attribute value", () => {
       const userAttributesWithoutEmail = {
@@ -965,17 +1018,21 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, userAttributesWithoutEmail)).toBe(
-        false
-      );
+      expect(
+        evaluateFilterConditions(condition, {
+          ...defaultOptions,
+          userAttributes: userAttributesWithoutEmail
+        })
+      ).toBe(false);
     });
     test("should handle invalid data type", () => {
       const invalidAttribute = [
         {
           id: "invalid-attr",
           codeName: "invalid",
-          dataType: 999
-          // Invalid data type
+          dataType: 999,
+          // Invalid data type for testing
+          bizType: import_types2.AttributeBizTypes.User
         }
       ];
       const condition = [
@@ -990,7 +1047,12 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, invalidAttribute, testUserAttributes)).toBe(false);
+      expect(
+        evaluateFilterConditions(condition, {
+          ...defaultOptions,
+          attributes: invalidAttribute
+        })
+      ).toBe(false);
     });
     test("should handle invalid logic", () => {
       const condition = [
@@ -1005,7 +1067,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test("should handle missing data in condition", () => {
       const condition = [
@@ -1016,7 +1078,7 @@ describe("Attribute Filter - Complete Test Suite", () => {
           data: void 0
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
     test("should handle missing attrId in condition", () => {
       const condition = [
@@ -1030,7 +1092,383 @@ describe("Attribute Filter - Complete Test Suite", () => {
           }
         }
       ];
-      expect(evaluateFilterConditions(condition, testAttributes, testUserAttributes)).toBe(false);
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
+    });
+  });
+  describe("Company attributes evaluation", () => {
+    test("should evaluate company string attribute correctly", () => {
+      const condition = [
+        {
+          id: "company-condition-1",
+          type: "condition",
+          operators: "and",
+          data: {
+            logic: "is",
+            value: "Example Corp",
+            attrId: "company-name-attr"
+          }
+        }
+      ];
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
+    });
+    test("should evaluate company number attribute correctly", () => {
+      const condition = [
+        {
+          id: "company-condition-2",
+          type: "condition",
+          operators: "and",
+          data: {
+            logic: "isGreaterThan",
+            value: 100,
+            attrId: "company-size-attr"
+          }
+        }
+      ];
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
+    });
+    test("should handle missing company attribute value", () => {
+      const condition = [
+        {
+          id: "company-condition-3",
+          type: "condition",
+          operators: "and",
+          data: {
+            logic: "is",
+            value: "Test Corp",
+            attrId: "company-name-attr"
+          }
+        }
+      ];
+      const optionsWithoutCompany = {
+        ...defaultOptions,
+        companyAttributes: {}
+      };
+      expect(evaluateFilterConditions(condition, optionsWithoutCompany)).toBe(false);
+    });
+  });
+  describe("Membership attributes evaluation", () => {
+    test("should evaluate membership string attribute correctly", () => {
+      const condition = [
+        {
+          id: "membership-condition-1",
+          type: "condition",
+          operators: "and",
+          data: {
+            logic: "is",
+            value: "premium",
+            attrId: "membership-level-attr"
+          }
+        }
+      ];
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
+    });
+    test("should evaluate membership number attribute correctly", () => {
+      const condition = [
+        {
+          id: "membership-condition-2",
+          type: "condition",
+          operators: "and",
+          data: {
+            logic: "isGreaterThanOrEqualTo",
+            value: 12,
+            attrId: "membership-duration-attr"
+          }
+        }
+      ];
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
+    });
+    test("should handle missing membership attribute value", () => {
+      const condition = [
+        {
+          id: "membership-condition-3",
+          type: "condition",
+          operators: "and",
+          data: {
+            logic: "is",
+            value: "premium",
+            attrId: "membership-level-attr"
+          }
+        }
+      ];
+      const optionsWithoutMembership = {
+        ...defaultOptions,
+        membershipAttributes: {}
+      };
+      expect(evaluateFilterConditions(condition, optionsWithoutMembership)).toBe(false);
+    });
+  });
+  describe("Mixed attribute types in conditions", () => {
+    test("should evaluate mixed user and company attributes with AND logic", () => {
+      const condition = [
+        {
+          id: "mixed-condition-1",
+          type: "group",
+          operators: "and",
+          data: {},
+          conditions: [
+            {
+              id: "mixed-condition-1-1",
+              type: "condition",
+              operators: "and",
+              data: {
+                logic: "contains",
+                value: "example.com",
+                attrId: "email-attr"
+              }
+            },
+            {
+              id: "mixed-condition-1-2",
+              type: "condition",
+              operators: "and",
+              data: {
+                logic: "isGreaterThan",
+                value: 100,
+                attrId: "company-size-attr"
+              }
+            }
+          ]
+        }
+      ];
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
+    });
+    test("should evaluate mixed user, company, and membership attributes with OR logic", () => {
+      const condition = [
+        {
+          id: "mixed-condition-2",
+          type: "group",
+          operators: "or",
+          data: {},
+          conditions: [
+            {
+              id: "mixed-condition-2-1",
+              type: "condition",
+              operators: "or",
+              data: {
+                logic: "is",
+                value: "wrong@email.com",
+                attrId: "email-attr"
+              }
+            },
+            {
+              id: "mixed-condition-2-2",
+              type: "condition",
+              operators: "or",
+              data: {
+                logic: "is",
+                value: "Example Corp",
+                attrId: "company-name-attr"
+              }
+            },
+            {
+              id: "mixed-condition-2-3",
+              type: "condition",
+              operators: "or",
+              data: {
+                logic: "is",
+                value: "premium",
+                attrId: "membership-level-attr"
+              }
+            }
+          ]
+        }
+      ];
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
+    });
+  });
+  describe("evaluateAttributeCondition function tests", () => {
+    test("should evaluate single attribute condition correctly", () => {
+      const condition = {
+        id: "single-condition-1",
+        type: "condition",
+        operators: "and",
+        data: {
+          logic: "is",
+          value: "user@example.com",
+          attrId: "email-attr"
+        }
+      };
+      expect(evaluateAttributeCondition(condition, defaultOptions)).toBe(true);
+    });
+    test("should handle missing data in single condition", () => {
+      const condition = {
+        id: "single-condition-2",
+        type: "condition",
+        operators: "and",
+        data: void 0
+      };
+      expect(evaluateAttributeCondition(condition, defaultOptions)).toBe(false);
+    });
+    test("should handle missing attribute in single condition", () => {
+      const condition = {
+        id: "single-condition-3",
+        type: "condition",
+        operators: "and",
+        data: {
+          logic: "is",
+          value: "test",
+          attrId: "non-existent-attr"
+        }
+      };
+      expect(evaluateAttributeCondition(condition, defaultOptions)).toBe(false);
+    });
+    test("should handle missing attributes array", () => {
+      const condition = {
+        id: "single-condition-4",
+        type: "condition",
+        operators: "and",
+        data: {
+          logic: "is",
+          value: "test",
+          attrId: "email-attr"
+        }
+      };
+      const optionsWithoutAttributes = {
+        ...defaultOptions,
+        attributes: void 0
+      };
+      expect(evaluateAttributeCondition(condition, optionsWithoutAttributes)).toBe(false);
+    });
+    test("should evaluate company attribute in single condition", () => {
+      const condition = {
+        id: "single-condition-5",
+        type: "condition",
+        operators: "and",
+        data: {
+          logic: "is",
+          value: "Example Corp",
+          attrId: "company-name-attr"
+        }
+      };
+      expect(evaluateAttributeCondition(condition, defaultOptions)).toBe(true);
+    });
+    test("should evaluate membership attribute in single condition", () => {
+      const condition = {
+        id: "single-condition-6",
+        type: "condition",
+        operators: "and",
+        data: {
+          logic: "is",
+          value: "premium",
+          attrId: "membership-level-attr"
+        }
+      };
+      expect(evaluateAttributeCondition(condition, defaultOptions)).toBe(true);
+    });
+  });
+  describe("Additional edge cases for new functionality", () => {
+    test("should handle empty attribute contexts", () => {
+      const condition = [
+        {
+          id: "empty-context-1",
+          type: "condition",
+          operators: "and",
+          data: {
+            logic: "is",
+            value: "test",
+            attrId: "email-attr"
+          }
+        }
+      ];
+      const emptyOptions = {
+        attributes: testAttributes,
+        userAttributes: {},
+        companyAttributes: {},
+        membershipAttributes: {}
+      };
+      expect(evaluateFilterConditions(condition, emptyOptions)).toBe(false);
+    });
+    test("should handle missing attribute contexts", () => {
+      const condition = [
+        {
+          id: "missing-context-1",
+          type: "condition",
+          operators: "and",
+          data: {
+            logic: "is",
+            value: "test",
+            attrId: "email-attr"
+          }
+        }
+      ];
+      const minimalOptions = {
+        attributes: testAttributes
+      };
+      expect(evaluateFilterConditions(condition, minimalOptions)).toBe(false);
+    });
+    test("should handle complex nested groups with mixed attribute types", () => {
+      const condition = [
+        {
+          id: "complex-nested-1",
+          type: "group",
+          operators: "and",
+          data: {},
+          conditions: [
+            {
+              id: "complex-nested-1-1",
+              type: "group",
+              operators: "or",
+              data: {},
+              conditions: [
+                {
+                  id: "complex-nested-1-1-1",
+                  type: "condition",
+                  operators: "or",
+                  data: {
+                    logic: "contains",
+                    value: "example.com",
+                    attrId: "email-attr"
+                  }
+                },
+                {
+                  id: "complex-nested-1-1-2",
+                  type: "condition",
+                  operators: "or",
+                  data: {
+                    logic: "is",
+                    value: "Test Corp",
+                    attrId: "company-name-attr"
+                  }
+                }
+              ]
+            },
+            {
+              id: "complex-nested-1-2",
+              type: "condition",
+              operators: "and",
+              data: {
+                logic: "is",
+                value: "premium",
+                attrId: "membership-level-attr"
+              }
+            }
+          ]
+        }
+      ];
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(true);
+    });
+    test("should handle empty group conditions", () => {
+      const condition = [
+        {
+          id: "empty-group-1",
+          type: "group",
+          operators: "and",
+          data: {},
+          conditions: []
+        }
+      ];
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
+    });
+    test("should handle group with undefined conditions", () => {
+      const condition = [
+        {
+          id: "undefined-group-1",
+          type: "group",
+          operators: "and",
+          data: {},
+          conditions: void 0
+        }
+      ];
+      expect(evaluateFilterConditions(condition, defaultOptions)).toBe(false);
     });
   });
 });