@usertour/helpers 0.0.29 → 0.0.31

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);
@@ -320,6 +327,74 @@ function evaluateDateTimeCondition(logic, actualValue, expectedValue) {
   }
 }
 
+// src/helper.ts
+var import_clsx = require("clsx");
+var import_tailwind_merge = require("tailwind-merge");
+var import_uuid = require("uuid");
+var import_cuid2 = require("@paralleldrive/cuid2");
+function cn(...inputs) {
+  return (0, import_tailwind_merge.twMerge)((0, import_clsx.clsx)(inputs));
+}
+var cuid = () => {
+  return (0, import_cuid2.createId)();
+};
+function formatDate(input) {
+  const date = new Date(input);
+  return date.toLocaleDateString("en-US", {
+    month: "long",
+    day: "numeric",
+    year: "numeric"
+  });
+}
+function absoluteUrl(path) {
+  return `${path}`;
+}
+var uuidV4 = () => {
+  return (0, import_uuid.v4)();
+};
+function hexToRgb(hex) {
+  const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  return result ? {
+    r: Number.parseInt(result[1], 16),
+    g: Number.parseInt(result[2], 16),
+    b: Number.parseInt(result[3], 16)
+  } : null;
+}
+var isDark = (hex) => {
+  const rgb = hexToRgb(hex);
+  if (!rgb) {
+    return null;
+  }
+  const { r, g, b } = rgb;
+  if (r * 0.299 + g * 0.587 + b * 0.114 > 186) {
+    return true;
+  }
+  return false;
+};
+var evalCode = (code) => {
+  try {
+    return eval(code);
+  } catch (error) {
+    console.error("Usertour.js: Error evaluating code:", error);
+    return null;
+  }
+};
+var getRandomColor = () => {
+  const colors = [
+    "bg-red-500",
+    "bg-orange-500",
+    "bg-yellow-500",
+    "bg-green-500",
+    "bg-teal-500",
+    "bg-blue-500",
+    "bg-indigo-500",
+    "bg-purple-500",
+    "bg-pink-500",
+    "bg-rose-500"
+  ];
+  return colors[Math.floor(Math.random() * colors.length)];
+};
+
 // src/conditions/condition.ts
 var isConditionsActived = (conditions) => {
   if (!conditions || conditions.length === 0) {
@@ -373,11 +448,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 +720,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,20 @@ import {
   evaluateRulesConditions,
   filterConditionsByType,
   isConditionsActived
-} from "../chunk-E2IJQFKH.js";
+} from "../chunk-VBHUPKP7.js";
 import "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
-import "../chunk-PBZSPV5R.js";
+import "../chunk-P46FJFKP.js";
 import "../chunk-CEK3SCQO.js";
+import "../chunk-3KG2HTZ3.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 +264,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-VBHUPKP7.js}

@@ -3,10 +3,13 @@ import {
 } from "./chunk-YYIGUZNZ.js";
 import {
   evaluateAttributeCondition
-} from "./chunk-PBZSPV5R.js";
+} from "./chunk-P46FJFKP.js";
 import {
   evaluateTimeCondition
 } from "./chunk-CEK3SCQO.js";
+import {
+  cuid
+} from "./chunk-3KG2HTZ3.js";
 
 // src/conditions/condition.ts
 import { RulesType } from "@usertour/types";
@@ -66,11 +69,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;
   }
@@ -92,6 +91,38 @@ var evaluateRulesConditions = async (conditions, options = {}) => {
   }
   return results;
 };
+var regenerateConditionIds = (conditions) => {
+  return conditions.map((condition) => ({
+    ...condition,
+    id: cuid(),
+    conditions: condition.conditions ? regenerateConditionIds(condition.conditions) : void 0
+  }));
+};
+var assignConditionIds = (conditions) => {
+  return conditions.map((condition) => {
+    var _a;
+    return {
+      ...condition,
+      id: (_a = condition.id) != null ? _a : cuid(),
+      conditions: condition.conditions ? assignConditionIds(condition.conditions) : void 0
+    };
+  });
+};
+var allConditionsHaveIds = (conditions) => {
+  if (!conditions || conditions.length === 0)
+    return true;
+  for (const condition of conditions) {
+    if (!condition.id) {
+      return false;
+    }
+    if (condition.type === "group" && condition.conditions) {
+      if (!allConditionsHaveIds(condition.conditions)) {
+        return false;
+      }
+    }
+  }
+  return true;
+};
 
 export {
   isEqual,
@@ -99,5 +130,8 @@ export {
   isConditionsActived,
   filterConditionsByType,
   evaluateRule,
-  evaluateRulesConditions
+  evaluateRulesConditions,
+  regenerateConditionIds,
+  assignConditionIds,
+  allConditionsHaveIds
 };

package/dist/{chunk-4LLDSAHJ.js → chunk-VWNWWZCH.js}

@@ -4,25 +4,24 @@ import {
 } from "@usertour/types";
 import { deepmerge } from "deepmerge-ts";
 var isPublishedInAllEnvironments = (content, environmentList, version) => {
-  const isPublishedInAllEnvironments2 = environmentList == null ? void 0 : environmentList.every(
+  var _a;
+  if (!((_a = content == null ? void 0 : content.contentOnEnvironments) == null ? void 0 : _a.length) || !(environmentList == null ? void 0 : environmentList.length) || !(version == null ? void 0 : version.id)) {
+    return false;
+  }
+  return environmentList.every(
     (env) => {
-      var _a;
-      return (_a = content == null ? void 0 : content.contentOnEnvironments) == null ? void 0 : _a.find(
-        (item) => item.published && item.publishedVersionId === (version == null ? void 0 : version.id) && item.environment.id === env.id
+      var _a2;
+      return (_a2 = content == null ? void 0 : content.contentOnEnvironments) == null ? void 0 : _a2.some(
+        (item) => item.published && item.publishedVersionId === version.id && item.environment.id === env.id
       );
     }
   );
-  const isPublishedInOneEnvironment = (content == null ? void 0 : content.published) && (content == null ? void 0 : content.publishedVersionId) === (version == null ? void 0 : version.id) && environmentList && (environmentList == null ? void 0 : environmentList.length) === 1;
-  return (content == null ? void 0 : content.contentOnEnvironments) && (content == null ? void 0 : content.contentOnEnvironments.length) > 0 ? Boolean(isPublishedInAllEnvironments2) : Boolean(isPublishedInOneEnvironment);
 };
 var isPublishedAtLeastOneEnvironment = (content) => {
   var _a;
   if ((content == null ? void 0 : content.contentOnEnvironments) && ((_a = content == null ? void 0 : content.contentOnEnvironments) == null ? void 0 : _a.length) > 0) {
     return true;
   }
-  if ((content == null ? void 0 : content.published) && (content == null ? void 0 : content.publishedVersionId)) {
-    return true;
-  }
   return false;
 };
 var rulesSetting = {

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,