@usertour/helpers 0.0.29 → 0.0.30

package/dist/__tests__/condition.test.cjs

@@ -143,20 +143,27 @@ var evaluateTimeCondition = (rules) => {
 // src/conditions/attribute.ts
 var import_types = require("@usertour/types");
 var import_date_fns2 = require("date-fns");
-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);
   }
@@ -174,8 +181,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);
@@ -373,11 +380,7 @@ var evaluateRule = async (condition, options) => {
     case import_types2.RulesType.TIME:
       return evaluateTimeCondition(condition);
     case import_types2.RulesType.USER_ATTR:
-      return evaluateAttributeCondition(
-        condition,
-        options.attributes || [],
-        options.userAttributes || {}
-      );
+      return evaluateAttributeCondition(condition, options);
     default:
       return condition.actived || false;
   }
@@ -649,8 +652,8 @@ describe("evaluateRulesConditions", () => {
       {
         id: "email",
         codeName: "email",
-        dataType: 2
-        // String
+        dataType: import_types3.BizAttributeTypes.String,
+        bizType: import_types3.AttributeBizTypes.User
       }
     ],
     userAttributes: {

package/dist/__tests__/condition.test.js

@@ -2,15 +2,19 @@ import {
   evaluateRulesConditions,
   filterConditionsByType,
   isConditionsActived
-} from "../chunk-E2IJQFKH.js";
+} from "../chunk-RVCKVUQF.js";
 import "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
-import "../chunk-PBZSPV5R.js";
+import "../chunk-P46FJFKP.js";
 import "../chunk-CEK3SCQO.js";
 import "../chunk-XEO3YXBM.js";
 
 // src/__tests__/condition.test.ts
-import { RulesType } from "@usertour/types";
+import {
+  RulesType,
+  BizAttributeTypes,
+  AttributeBizTypes
+} from "@usertour/types";
 describe("filterConditionsByType", () => {
   test("should return empty array when no conditions provided", () => {
     const result = filterConditionsByType([], [RulesType.CURRENT_PAGE, RulesType.TIME]);
@@ -259,8 +263,8 @@ describe("evaluateRulesConditions", () => {
       {
         id: "email",
         codeName: "email",
-        dataType: 2
-        // String
+        dataType: BizAttributeTypes.String,
+        bizType: AttributeBizTypes.User
       }
     ],
     userAttributes: {

package/dist/{chunk-PBZSPV5R.js → chunk-P46FJFKP.js}

@@ -1,14 +1,17 @@
 // src/conditions/attribute.ts
-import { BizAttributeTypes } from "@usertour/types";
+import {
+  BizAttributeTypes,
+  AttributeBizTypes
+} from "@usertour/types";
 import { subDays, startOfDay, endOfDay } from "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;
   }
@@ -16,7 +19,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;
     }
@@ -38,20 +41,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 === AttributeBizTypes.Company ? companyAttributes : attr.bizType === AttributeBizTypes.Membership ? membershipAttributes : userAttributes;
+  const actualValue = getAttributeValue(attr.codeName, bizAttributes);
   if (attr.dataType === BizAttributeTypes.String) {
     return evaluateStringCondition(logic, actualValue, value);
   }
@@ -69,8 +79,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);

package/dist/{chunk-E2IJQFKH.js → chunk-RVCKVUQF.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-YYIGUZNZ.js";
 import {
   evaluateAttributeCondition
-} from "./chunk-PBZSPV5R.js";
+} from "./chunk-P46FJFKP.js";
 import {
   evaluateTimeCondition
 } from "./chunk-CEK3SCQO.js";
@@ -66,11 +66,7 @@ var evaluateRule = async (condition, options) => {
     case RulesType.TIME:
       return evaluateTimeCondition(condition);
     case RulesType.USER_ATTR:
-      return evaluateAttributeCondition(
-        condition,
-        options.attributes || [],
-        options.userAttributes || {}
-      );
+      return evaluateAttributeCondition(condition, options);
     default:
       return condition.actived || false;
   }

package/dist/conditions/attribute.cjs

@@ -26,14 +26,14 @@ __export(attribute_exports, {
 module.exports = __toCommonJS(attribute_exports);
 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;
   }
@@ -41,7 +41,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;
     }
@@ -63,20 +63,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);
   }
@@ -94,8 +101,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);

package/dist/conditions/attribute.d.cts

@@ -1,20 +1,18 @@
-import { RulesCondition, SimpleAttribute, UserTourTypes } from '@usertour/types';
+import { RulesCondition, RulesEvaluationOptions } from '@usertour/types';
 
 /**
  * Evaluate filter conditions and return boolean result
  * @param conditions - Filter conditions to evaluate
- * @param attributes - Available attributes
- * @param context - Filter context with user attributes
+ * @param options - Evaluation options including attributes, user attributes, company attributes, and membership attributes
  * @returns boolean indicating if conditions are met
  */
-declare function evaluateFilterConditions(conditions: RulesCondition[], attributes: SimpleAttribute[], userAttributes: UserTourTypes.Attributes): boolean;
+declare function evaluateFilterConditions(conditions: RulesCondition[], options: Pick<RulesEvaluationOptions, 'attributes' | 'userAttributes' | 'companyAttributes' | 'membershipAttributes'>): boolean;
 /**
  * Evaluate a single attribute condition
  * @param condition - Single attribute filter condition
- * @param attributes - Available attributes
- * @param context - Filter context with user attributes
+ * @param options - Evaluation options including attributes, user attributes, company attributes, and membership attributes
  * @returns Evaluation result (boolean or complex structure)
  */
-declare function evaluateAttributeCondition(condition: RulesCondition, attributes: SimpleAttribute[], userAttributes: UserTourTypes.Attributes): any;
+declare function evaluateAttributeCondition(condition: RulesCondition, options: RulesEvaluationOptions): any;
 
 export { evaluateAttributeCondition, evaluateFilterConditions };

package/dist/conditions/attribute.d.ts

@@ -1,20 +1,18 @@
-import { RulesCondition, SimpleAttribute, UserTourTypes } from '@usertour/types';
+import { RulesCondition, RulesEvaluationOptions } from '@usertour/types';
 
 /**
  * Evaluate filter conditions and return boolean result
  * @param conditions - Filter conditions to evaluate
- * @param attributes - Available attributes
- * @param context - Filter context with user attributes
+ * @param options - Evaluation options including attributes, user attributes, company attributes, and membership attributes
  * @returns boolean indicating if conditions are met
  */
-declare function evaluateFilterConditions(conditions: RulesCondition[], attributes: SimpleAttribute[], userAttributes: UserTourTypes.Attributes): boolean;
+declare function evaluateFilterConditions(conditions: RulesCondition[], options: Pick<RulesEvaluationOptions, 'attributes' | 'userAttributes' | 'companyAttributes' | 'membershipAttributes'>): boolean;
 /**
  * Evaluate a single attribute condition
  * @param condition - Single attribute filter condition
- * @param attributes - Available attributes
- * @param context - Filter context with user attributes
+ * @param options - Evaluation options including attributes, user attributes, company attributes, and membership attributes
  * @returns Evaluation result (boolean or complex structure)
  */
-declare function evaluateAttributeCondition(condition: RulesCondition, attributes: SimpleAttribute[], userAttributes: UserTourTypes.Attributes): any;
+declare function evaluateAttributeCondition(condition: RulesCondition, options: RulesEvaluationOptions): any;
 
 export { evaluateAttributeCondition, evaluateFilterConditions };

package/dist/conditions/attribute.js

@@ -1,7 +1,7 @@
 import {
   evaluateAttributeCondition,
   evaluateFilterConditions
-} from "../chunk-PBZSPV5R.js";
+} from "../chunk-P46FJFKP.js";
 import "../chunk-XEO3YXBM.js";
 export {
   evaluateAttributeCondition,

package/dist/conditions/condition.cjs

@@ -155,20 +155,27 @@ var evaluateTimeCondition = (rules) => {
 // src/conditions/attribute.ts
 var import_types = require("@usertour/types");
 var import_date_fns2 = require("date-fns");
-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);
   }
@@ -186,8 +193,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);
@@ -388,11 +395,7 @@ var evaluateRule = async (condition, options) => {
     case import_types2.RulesType.TIME:
       return evaluateTimeCondition(condition);
     case import_types2.RulesType.USER_ATTR:
-      return evaluateAttributeCondition(
-        condition,
-        options.attributes || [],
-        options.userAttributes || {}
-      );
+      return evaluateAttributeCondition(condition, options);
     default:
       return condition.actived || false;
   }

package/dist/conditions/condition.js

@@ -5,10 +5,10 @@ import {
   filterConditionsByType,
   isConditionsActived,
   isEqual
-} from "../chunk-E2IJQFKH.js";
+} from "../chunk-RVCKVUQF.js";
 import "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
-import "../chunk-PBZSPV5R.js";
+import "../chunk-P46FJFKP.js";
 import "../chunk-CEK3SCQO.js";
 import "../chunk-XEO3YXBM.js";
 export {

package/dist/conditions/index.cjs

@@ -161,20 +161,27 @@ var evaluateTimeCondition = (rules) => {
 // src/conditions/attribute.ts
 var import_types = require("@usertour/types");
 var import_date_fns2 = require("date-fns");
-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);
   }
@@ -192,8 +199,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);
@@ -394,11 +401,7 @@ var evaluateRule = async (condition, options) => {
     case import_types2.RulesType.TIME:
       return evaluateTimeCondition(condition);
     case import_types2.RulesType.USER_ATTR:
-      return evaluateAttributeCondition(
-        condition,
-        options.attributes || [],
-        options.userAttributes || {}
-      );
+      return evaluateAttributeCondition(condition, options);
     default:
       return condition.actived || false;
   }

package/dist/conditions/index.js

@@ -6,7 +6,7 @@ import {
   filterConditionsByType,
   isConditionsActived,
   isEqual
-} from "../chunk-E2IJQFKH.js";
+} from "../chunk-RVCKVUQF.js";
 import {
   evaluateUrlCondition,
   isMatchUrlPattern
@@ -14,7 +14,7 @@ import {
 import "../chunk-PAESAL23.js";
 import {
   evaluateAttributeCondition
-} from "../chunk-PBZSPV5R.js";
+} from "../chunk-P46FJFKP.js";
 import {
   evaluateTimeCondition
 } from "../chunk-CEK3SCQO.js";

package/dist/index.cjs

@@ -1127,20 +1127,27 @@ var evaluateTimeCondition = (rules) => {
 // src/conditions/attribute.ts
 var import_types4 = require("@usertour/types");
 var import_date_fns2 = require("date-fns");
-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_types4.AttributeBizTypes.Company ? companyAttributes : attr.bizType === import_types4.AttributeBizTypes.Membership ? membershipAttributes : userAttributes;
+  const actualValue = getAttributeValue(attr.codeName, bizAttributes);
   if (attr.dataType === import_types4.BizAttributeTypes.String) {
     return evaluateStringCondition(logic, actualValue, value);
   }
@@ -1158,8 +1165,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);
@@ -1360,11 +1367,7 @@ var evaluateRule = async (condition, options) => {
     case import_types5.RulesType.TIME:
       return evaluateTimeCondition(condition);
     case import_types5.RulesType.USER_ATTR:
-      return evaluateAttributeCondition(
-        condition,
-        options.attributes || [],
-        options.userAttributes || {}
-      );
+      return evaluateAttributeCondition(condition, options);
     default:
       return condition.actived || false;
   }

package/dist/index.js

@@ -17,7 +17,7 @@ import {
   filterConditionsByType,
   isConditionsActived,
   isEqual
-} from "./chunk-E2IJQFKH.js";
+} from "./chunk-RVCKVUQF.js";
 import {
   evaluateUrlCondition,
   isMatchUrlPattern
@@ -25,7 +25,7 @@ import {
 import "./chunk-PAESAL23.js";
 import {
   evaluateAttributeCondition
-} from "./chunk-PBZSPV5R.js";
+} from "./chunk-P46FJFKP.js";
 import {
   evaluateTimeCondition
 } from "./chunk-CEK3SCQO.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usertour/helpers",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "type": "module",
   "description": "Utility functions and helpers shared across the UserTour project",
   "homepage": "https://www.usertour.io",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@paralleldrive/cuid2": "^2.2.2",
-    "@usertour/types": "^0.0.17",
+    "@usertour/types": "^0.0.19",
     "chroma-js": "^3.1.2",
     "class-variance-authority": "^0.4.0",
     "clsx": "^1.2.1",