@usertour/helpers 0.0.29 → 0.0.31

package/dist/index.cjs

@@ -39,6 +39,8 @@ __export(src_exports, {
   ArrayProto: () => ArrayProto,
   XMLHttpRequest: () => XMLHttpRequest,
   absoluteUrl: () => absoluteUrl,
+  allConditionsHaveIds: () => allConditionsHaveIds,
+  assignConditionIds: () => assignConditionIds,
   assignableWindow: () => assignableWindow,
   buildConfig: () => buildConfig,
   cn: () => cn,
@@ -110,6 +112,7 @@ __export(src_exports, {
   nativeIndexOf: () => nativeIndexOf,
   navigator: () => navigator,
   parseUrlParams: () => parseUrlParams,
+  regenerateConditionIds: () => regenerateConditionIds,
   removeAuthToken: () => removeAuthToken,
   setAuthToken: () => setAuthToken,
   storage: () => storage,
@@ -836,25 +839,24 @@ function isUrl(string) {
 var import_types3 = require("@usertour/types");
 var import_deepmerge_ts2 = require("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 = {
@@ -1127,20 +1129,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 +1167,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 +1369,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;
   }
@@ -1386,12 +1391,46 @@ 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;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AbortController,
   ArrayProto,
   XMLHttpRequest,
   absoluteUrl,
+  allConditionsHaveIds,
+  assignConditionIds,
   assignableWindow,
   buildConfig,
   cn,
@@ -1463,6 +1502,7 @@ var evaluateRulesConditions = async (conditions, options = {}) => {
   nativeIndexOf,
   navigator,
   parseUrlParams,
+  regenerateConditionIds,
   removeAuthToken,
   setAuthToken,
   storage,

package/dist/index.d.cts

@@ -9,7 +9,7 @@ export { buildConfig, defaultContentConfig, isPublishedAtLeastOneEnvironment, is
 export { deepClone, parseUrlParams, wait } from './utils.cjs';
 export { generateAutoStateColors, hexToHSLString, hexToRGBStr } from './color.cjs';
 export { absoluteUrl, cn, cuid, evalCode, formatDate, getRandomColor, hexToRgb, isDark, uuidV4 } from './helper.cjs';
-export { conditionsIsSame, evaluateRule, evaluateRulesConditions, filterConditionsByType, isConditionsActived } from './conditions/condition.cjs';
+export { allConditionsHaveIds, assignConditionIds, conditionsIsSame, evaluateRule, evaluateRulesConditions, filterConditionsByType, isConditionsActived, regenerateConditionIds } from './conditions/condition.cjs';
 export { evaluateUrlCondition, isMatchUrlPattern } from './conditions/url.cjs';
 export { evaluateTimeCondition } from './conditions/time.cjs';
 export { evaluateAttributeCondition } from './conditions/attribute.cjs';

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export { buildConfig, defaultContentConfig, isPublishedAtLeastOneEnvironment, is
 export { deepClone, parseUrlParams, wait } from './utils.js';
 export { generateAutoStateColors, hexToHSLString, hexToRGBStr } from './color.js';
 export { absoluteUrl, cn, cuid, evalCode, formatDate, getRandomColor, hexToRgb, isDark, uuidV4 } from './helper.js';
-export { conditionsIsSame, evaluateRule, evaluateRulesConditions, filterConditionsByType, isConditionsActived } from './conditions/condition.js';
+export { allConditionsHaveIds, assignConditionIds, conditionsIsSame, evaluateRule, evaluateRulesConditions, filterConditionsByType, isConditionsActived, regenerateConditionIds } from './conditions/condition.js';
 export { evaluateUrlCondition, isMatchUrlPattern } from './conditions/url.js';
 export { evaluateTimeCondition } from './conditions/time.js';
 export { evaluateAttributeCondition } from './conditions/attribute.js';

package/dist/index.js

@@ -11,13 +11,16 @@ import {
   wait
 } from "./chunk-5C3J4DM2.js";
 import {
+  allConditionsHaveIds,
+  assignConditionIds,
   conditionsIsSame,
   evaluateRule,
   evaluateRulesConditions,
   filterConditionsByType,
   isConditionsActived,
-  isEqual
-} from "./chunk-E2IJQFKH.js";
+  isEqual,
+  regenerateConditionIds
+} from "./chunk-VBHUPKP7.js";
 import {
   evaluateUrlCondition,
   isMatchUrlPattern
@@ -25,7 +28,7 @@ import {
 import "./chunk-PAESAL23.js";
 import {
   evaluateAttributeCondition
-} from "./chunk-PBZSPV5R.js";
+} from "./chunk-P46FJFKP.js";
 import {
   evaluateTimeCondition
 } from "./chunk-CEK3SCQO.js";
@@ -41,7 +44,7 @@ import {
   defaultContentConfig,
   isPublishedAtLeastOneEnvironment,
   isPublishedInAllEnvironments
-} from "./chunk-4LLDSAHJ.js";
+} from "./chunk-VWNWWZCH.js";
 import {
   convertSettings,
   convertToCssVars,
@@ -119,6 +122,8 @@ export {
   ArrayProto,
   XMLHttpRequest,
   absoluteUrl,
+  allConditionsHaveIds,
+  assignConditionIds,
   assignableWindow,
   buildConfig,
   cn,
@@ -190,6 +195,7 @@ export {
   nativeIndexOf,
   navigator,
   parseUrlParams,
+  regenerateConditionIds,
   removeAuthToken,
   setAuthToken,
   storage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usertour/helpers",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "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",