@usertour/helpers 0.0.17 → 0.0.20

package/dist/conditions/url.cjs

@@ -24,68 +24,87 @@ __export(url_exports, {
   isMatchUrlPattern: () => isMatchUrlPattern
 });
 module.exports = __toCommonJS(url_exports);
-var parseUrl = (url) => {
-  const urlPatterns = url.match(/^(([a-z\d]+):\/\/)?([^/?#]+)?(\/[^?#]*)?(\?([^#]*))?(#.*)?$/i);
-  if (!urlPatterns) {
+
+// src/conditions/url-v2.ts
+function parseUrl(url) {
+  const match = url.match(/^(([a-z\d]+):\/\/)?([^/?#]+)?(\/[^?#]*)?(\?([^#]*))?(#.*)?$/i);
+  if (!match)
     return null;
-  }
-  const [, , scheme = "", domain = "", path = "", , query = "", fragment = ""] = urlPatterns;
-  return { scheme, domain, path, query, fragment };
-};
-var replaceWildcard = (input, s1, s2) => {
-  const withSpecialWords = replaceSpecialWords(input);
-  const withWildcard = withSpecialWords.replace(/\\\*/g, `${s1}*`);
-  if (!s2) {
-    return withWildcard;
-  }
-  return withWildcard.replace(/:[a-z0-9_]+/g, `[^${s2}]+`);
-};
-var replaceSpecialWords = (str) => {
+  const [, , scheme, domain, path, , query, fragment] = match;
+  return {
+    scheme: scheme || "",
+    domain: domain || "",
+    path: path || "",
+    query: query || "",
+    fragment: fragment || ""
+  };
+}
+function escapeRegex(str) {
   return str.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
-};
-var parsePattern = (pattern) => {
-  if (!pattern || !pattern.trim()) {
-    return null;
+}
+function processUrlPattern(pattern, wildcardReplacement, paramReplacement) {
+  let processed = escapeRegex(pattern);
+  processed = processed.replace(/\\\*/g, `${wildcardReplacement}*`);
+  if (paramReplacement) {
+    processed = processed.replace(/:[a-zA-Z0-9_]+/g, `[^${paramReplacement}]+`);
   }
-  const _pattern = parseUrl(pattern);
-  if (!_pattern) {
-    console.error("Invalid URL pattern:", pattern);
+  return processed;
+}
+function urlPatternToRegex(pattern) {
+  const parsed = parseUrl(pattern);
+  if (!parsed) {
     return null;
   }
-  const { scheme, domain, path, query, fragment } = _pattern;
-  const _scheme = scheme ? replaceSpecialWords(scheme) : "[a-z\\d]+";
-  const _domain = domain ? replaceWildcard(domain, "[^/]", ".") : "[^/]*";
-  const _fragment = fragment ? replaceWildcard(fragment, ".", "/") : "(#.*)?";
-  const _path = path ? replaceWildcard(path, "[^?#]", "/") : "/[^?#]*";
-  let _query = "(\\?[^#]*)?";
+  const { scheme, domain, path, query, fragment } = parsed;
+  const schemePattern = scheme ? escapeRegex(scheme) : "[a-z\\d]+";
+  const domainPattern = domain ? processUrlPattern(domain, "[^/]", ".") : "[^/]*";
+  const portPattern = "(:\\d+)?";
+  const pathPattern = path ? processUrlPattern(path, "[^?#]", "/") : "/[^?#]*";
+  let queryPattern;
   if (query) {
+    queryPattern = "";
     new URLSearchParams(query).forEach((value, key) => {
-      const _str = value === "" ? "=?" : value === "*" ? "(=[^&#]*)?" : `=${replaceWildcard(value, "[^#]")}`;
-      _query += `(?=.*[?&]${replaceSpecialWords(key)}${_str}([&#]|$))`;
+      let valuePattern;
+      if (value === "") {
+        valuePattern = "=?";
+      } else if (value === "*") {
+        valuePattern = "(=[^&#]*)?";
+      } else {
+        const encodedValue = value.split(/\*/g).map((part) => encodeURI(part)).join("*");
+        valuePattern = `=${processUrlPattern(encodedValue, "[^#]")}`;
+      }
+      queryPattern += `(?=.*[?&]${escapeRegex(key)}${valuePattern}([&#]|$))`;
     });
-    _query += "\\?[^#]*";
+    queryPattern += "\\?[^#]*";
+  } else {
+    queryPattern = "(\\?[^#]*)?";
   }
-  return new RegExp(`^${_scheme}://${_domain}(:\\d+)?${_path}${_query}${_fragment}$`);
-};
-var isMatchUrlPattern = (_url, includes, excludes) => {
-  const isMatchIncludesConditions = includes.length > 0 ? includes.some((_include) => {
-    const reg = parsePattern(_include);
-    if (reg) {
-      return reg.test(_url);
-    }
+  const fragmentPattern = fragment ? processUrlPattern(fragment, ".", "/") : "(#.*)?";
+  return new RegExp(
+    `^${schemePattern}://${domainPattern}${portPattern}${pathPattern}${queryPattern}${fragmentPattern}$`
+  );
+}
+function matchUrlPattern(urlPattern, url) {
+  if (urlPattern.includes.length === 0 && urlPattern.excludes.length === 0) {
     return false;
-  }) : true;
-  const isMatchExcludesConditions = excludes.length > 0 ? excludes.some((_exclude) => {
-    const reg = parsePattern(_exclude);
-    if (reg) {
-      return reg.test(_url);
-    }
-    return false;
-  }) : false;
-  return isMatchIncludesConditions && !isMatchExcludesConditions;
+  }
+  const matchesInclude = urlPattern.includes.length === 0 || urlPattern.includes.some((includePattern) => {
+    const regex = urlPatternToRegex(includePattern);
+    return regex && url.match(regex);
+  });
+  const matchesExclude = urlPattern.excludes.some((excludePattern) => {
+    const regex = urlPatternToRegex(excludePattern);
+    return regex && url.match(regex);
+  });
+  return matchesInclude && !matchesExclude;
+}
+
+// src/conditions/url.ts
+var isMatchUrlPattern = (_url, includes, excludes) => {
+  return matchUrlPattern({ includes, excludes }, _url);
 };
 var evaluateUrlCondition = (rules, url) => {
-  const { excludes, includes } = rules.data;
+  const { excludes = [], includes = [] } = rules.data || {};
   return isMatchUrlPattern(url, includes, excludes);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/conditions/url.js

@@ -1,7 +1,8 @@
 import {
   evaluateUrlCondition,
   isMatchUrlPattern
-} from "../chunk-BC7KXBMF.js";
+} from "../chunk-YYIGUZNZ.js";
+import "../chunk-PAESAL23.js";
 import "../chunk-XEO3YXBM.js";
 export {
   evaluateUrlCondition,

package/dist/index.cjs

@@ -55,6 +55,7 @@ __export(src_exports, {
   evaluateTimeCondition: () => evaluateTimeCondition,
   evaluateUrlCondition: () => evaluateUrlCondition,
   fetch: () => fetch,
+  filterConditionsByType: () => filterConditionsByType,
   formatDate: () => formatDate,
   generateAutoStateColors: () => generateAutoStateColors,
   getAuthToken: () => getAuthToken,
@@ -79,6 +80,7 @@ __export(src_exports, {
   hexToRgb: () => hexToRgb,
   isArray: () => isArray,
   isBoolean: () => isBoolean,
+  isConditionsActived: () => isConditionsActived,
   isDark: () => isDark,
   isDate: () => isDate,
   isDocument: () => isDocument,
@@ -961,124 +963,89 @@ var getRandomColor = () => {
 };
 
 // src/conditions/condition.ts
+var import_types5 = require("@usertour/types");
 var import_fast_deep_equal = __toESM(require("fast-deep-equal"), 1);
-var compareConditionsItem = (item1, item2) => {
-  const { data = {}, ...others1 } = item1;
-  const { data: data2 = {}, ...others2 } = item2;
-  if (!(0, import_fast_deep_equal.default)(others2, others1)) {
-    return false;
-  }
-  for (const key in data) {
-    if (!(0, import_fast_deep_equal.default)(data[key], data2[key])) {
-      return false;
-    }
-  }
-  return true;
-};
-var conditionsIsSame = (rr1, rr2) => {
-  const r1 = [...rr1];
-  const r2 = [...rr2];
-  if (r1.length === 0 && r2.length === 0) {
-    return true;
-  }
-  if (r1.length !== r2.length) {
-    return false;
-  }
-  const group1 = r1.filter((item) => item.type === "group");
-  const group2 = r2.filter((item) => item.type === "group");
-  if (group1.length !== group2.length) {
-    return false;
-  }
-  for (let index = 0; index < r1.length; index++) {
-    const item1 = r1[index];
-    const item2 = r2[index];
-    if (!item1 || !item2) {
-      return false;
-    }
-    if (item1.type === "group") {
-      if (!item2.conditions) {
-        return false;
-      }
-      const c1 = item1.conditions;
-      const c2 = item2.conditions;
-      if (item1.operators !== item2.operators) {
-        return false;
-      }
-      if (!conditionsIsSame(c1, c2)) {
-        return false;
-      }
-    } else {
-      if (!compareConditionsItem(item1, item2)) {
-        return false;
-      }
-    }
-  }
-  return true;
-};
 
-// src/conditions/url.ts
-var parseUrl = (url) => {
-  const urlPatterns = url.match(/^(([a-z\d]+):\/\/)?([^/?#]+)?(\/[^?#]*)?(\?([^#]*))?(#.*)?$/i);
-  if (!urlPatterns) {
+// src/conditions/url-v2.ts
+function parseUrl(url) {
+  const match = url.match(/^(([a-z\d]+):\/\/)?([^/?#]+)?(\/[^?#]*)?(\?([^#]*))?(#.*)?$/i);
+  if (!match)
     return null;
-  }
-  const [, , scheme = "", domain = "", path = "", , query = "", fragment = ""] = urlPatterns;
-  return { scheme, domain, path, query, fragment };
-};
-var replaceWildcard = (input, s1, s2) => {
-  const withSpecialWords = replaceSpecialWords(input);
-  const withWildcard = withSpecialWords.replace(/\\\*/g, `${s1}*`);
-  if (!s2) {
-    return withWildcard;
-  }
-  return withWildcard.replace(/:[a-z0-9_]+/g, `[^${s2}]+`);
-};
-var replaceSpecialWords = (str) => {
+  const [, , scheme, domain, path, , query, fragment] = match;
+  return {
+    scheme: scheme || "",
+    domain: domain || "",
+    path: path || "",
+    query: query || "",
+    fragment: fragment || ""
+  };
+}
+function escapeRegex(str) {
   return str.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
-};
-var parsePattern = (pattern) => {
-  if (!pattern || !pattern.trim()) {
-    return null;
+}
+function processUrlPattern(pattern, wildcardReplacement, paramReplacement) {
+  let processed = escapeRegex(pattern);
+  processed = processed.replace(/\\\*/g, `${wildcardReplacement}*`);
+  if (paramReplacement) {
+    processed = processed.replace(/:[a-zA-Z0-9_]+/g, `[^${paramReplacement}]+`);
   }
-  const _pattern = parseUrl(pattern);
-  if (!_pattern) {
-    console.error("Invalid URL pattern:", pattern);
+  return processed;
+}
+function urlPatternToRegex(pattern) {
+  const parsed = parseUrl(pattern);
+  if (!parsed) {
     return null;
   }
-  const { scheme, domain, path, query, fragment } = _pattern;
-  const _scheme = scheme ? replaceSpecialWords(scheme) : "[a-z\\d]+";
-  const _domain = domain ? replaceWildcard(domain, "[^/]", ".") : "[^/]*";
-  const _fragment = fragment ? replaceWildcard(fragment, ".", "/") : "(#.*)?";
-  const _path = path ? replaceWildcard(path, "[^?#]", "/") : "/[^?#]*";
-  let _query = "(\\?[^#]*)?";
+  const { scheme, domain, path, query, fragment } = parsed;
+  const schemePattern = scheme ? escapeRegex(scheme) : "[a-z\\d]+";
+  const domainPattern = domain ? processUrlPattern(domain, "[^/]", ".") : "[^/]*";
+  const portPattern = "(:\\d+)?";
+  const pathPattern = path ? processUrlPattern(path, "[^?#]", "/") : "/[^?#]*";
+  let queryPattern;
   if (query) {
+    queryPattern = "";
     new URLSearchParams(query).forEach((value, key) => {
-      const _str = value === "" ? "=?" : value === "*" ? "(=[^&#]*)?" : `=${replaceWildcard(value, "[^#]")}`;
-      _query += `(?=.*[?&]${replaceSpecialWords(key)}${_str}([&#]|$))`;
+      let valuePattern;
+      if (value === "") {
+        valuePattern = "=?";
+      } else if (value === "*") {
+        valuePattern = "(=[^&#]*)?";
+      } else {
+        const encodedValue = value.split(/\*/g).map((part) => encodeURI(part)).join("*");
+        valuePattern = `=${processUrlPattern(encodedValue, "[^#]")}`;
+      }
+      queryPattern += `(?=.*[?&]${escapeRegex(key)}${valuePattern}([&#]|$))`;
     });
-    _query += "\\?[^#]*";
+    queryPattern += "\\?[^#]*";
+  } else {
+    queryPattern = "(\\?[^#]*)?";
   }
-  return new RegExp(`^${_scheme}://${_domain}(:\\d+)?${_path}${_query}${_fragment}$`);
-};
-var isMatchUrlPattern = (_url, includes, excludes) => {
-  const isMatchIncludesConditions = includes.length > 0 ? includes.some((_include) => {
-    const reg = parsePattern(_include);
-    if (reg) {
-      return reg.test(_url);
-    }
-    return false;
-  }) : true;
-  const isMatchExcludesConditions = excludes.length > 0 ? excludes.some((_exclude) => {
-    const reg = parsePattern(_exclude);
-    if (reg) {
-      return reg.test(_url);
-    }
+  const fragmentPattern = fragment ? processUrlPattern(fragment, ".", "/") : "(#.*)?";
+  return new RegExp(
+    `^${schemePattern}://${domainPattern}${portPattern}${pathPattern}${queryPattern}${fragmentPattern}$`
+  );
+}
+function matchUrlPattern(urlPattern, url) {
+  if (urlPattern.includes.length === 0 && urlPattern.excludes.length === 0) {
     return false;
-  }) : false;
-  return isMatchIncludesConditions && !isMatchExcludesConditions;
+  }
+  const matchesInclude = urlPattern.includes.length === 0 || urlPattern.includes.some((includePattern) => {
+    const regex = urlPatternToRegex(includePattern);
+    return regex && url.match(regex);
+  });
+  const matchesExclude = urlPattern.excludes.some((excludePattern) => {
+    const regex = urlPatternToRegex(excludePattern);
+    return regex && url.match(regex);
+  });
+  return matchesInclude && !matchesExclude;
+}
+
+// src/conditions/url.ts
+var isMatchUrlPattern = (_url, includes, excludes) => {
+  return matchUrlPattern({ includes, excludes }, _url);
 };
 var evaluateUrlCondition = (rules, url) => {
-  const { excludes, includes } = rules.data;
+  const { excludes = [], includes = [] } = rules.data || {};
   return isMatchUrlPattern(url, includes, excludes);
 };
 
@@ -1289,6 +1256,41 @@ function evaluateDateTimeCondition(logic, actualValue, expectedValue) {
       return false;
   }
 }
+
+// src/conditions/condition.ts
+var conditionsIsSame = (rr1, rr2) => {
+  return (0, import_fast_deep_equal.default)(rr1, rr2);
+};
+var isConditionsActived = (conditions) => {
+  if (!conditions || conditions.length === 0) {
+    return false;
+  }
+  const operator = conditions[0].operators;
+  const actives = conditions.filter((rule) => {
+    if (!rule.conditions) {
+      return rule.actived;
+    }
+    return isConditionsActived(rule.conditions);
+  });
+  return operator === "and" ? actives.length === conditions.length : actives.length > 0;
+};
+var filterConditionsByType = (conditions, allowedTypes) => {
+  return conditions.filter((condition) => {
+    if (condition.type === "group" && condition.conditions) {
+      const filteredGroupConditions = filterConditionsByType(condition.conditions, allowedTypes);
+      return filteredGroupConditions.length > 0;
+    }
+    return allowedTypes.includes(condition.type);
+  }).map((condition) => {
+    if (condition.type === "group" && condition.conditions) {
+      return {
+        ...condition,
+        conditions: filterConditionsByType(condition.conditions, allowedTypes)
+      };
+    }
+    return condition;
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AbortController,
@@ -1311,6 +1313,7 @@ function evaluateDateTimeCondition(logic, actualValue, expectedValue) {
   evaluateTimeCondition,
   evaluateUrlCondition,
   fetch,
+  filterConditionsByType,
   formatDate,
   generateAutoStateColors,
   getAuthToken,
@@ -1335,6 +1338,7 @@ function evaluateDateTimeCondition(logic, actualValue, expectedValue) {
   hexToRgb,
   isArray,
   isBoolean,
+  isConditionsActived,
   isDark,
   isDate,
   isDocument,

package/dist/index.d.cts

@@ -9,7 +9,7 @@ export { buildConfig, defaultContentConfig, isPublishedAtLeastOneEnvironment, is
 export { deepClone } 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 } from './conditions/condition.cjs';
+export { conditionsIsSame, filterConditionsByType, isConditionsActived } 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 } 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 } from './conditions/condition.js';
+export { conditionsIsSame, filterConditionsByType, isConditionsActived } 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

@@ -1,8 +1,4 @@
 import "./chunk-7ODE2AIC.js";
-import {
-  conditionsIsSame,
-  isEqual
-} from "./chunk-7CC4WXB3.js";
 import {
   isUrl
 } from "./chunk-ZNFXGN3M.js";
@@ -12,16 +8,23 @@ import {
 import {
   deepClone
 } from "./chunk-2AEGAICC.js";
+import {
+  conditionsIsSame,
+  filterConditionsByType,
+  isConditionsActived,
+  isEqual
+} from "./chunk-TB7JGI2Q.js";
+import {
+  evaluateUrlCondition,
+  isMatchUrlPattern
+} from "./chunk-YYIGUZNZ.js";
+import "./chunk-PAESAL23.js";
 import {
   evaluateAttributeCondition
 } from "./chunk-PBZSPV5R.js";
 import {
   evaluateTimeCondition
 } from "./chunk-CEK3SCQO.js";
-import {
-  evaluateUrlCondition,
-  isMatchUrlPattern
-} from "./chunk-BC7KXBMF.js";
 import {
   getAuthToken,
   removeAuthToken,
@@ -128,6 +131,7 @@ export {
   evaluateTimeCondition,
   evaluateUrlCondition,
   fetch,
+  filterConditionsByType,
   formatDate,
   generateAutoStateColors,
   getAuthToken,
@@ -152,6 +156,7 @@ export {
   hexToRgb,
   isArray,
   isBoolean,
+  isConditionsActived,
   isDark,
   isDate,
   isDocument,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usertour/helpers",
-  "version": "0.0.17",
+  "version": "0.0.20",
   "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.9",
+    "@usertour/types": "^0.0.11",
     "chroma-js": "^3.1.2",
     "class-variance-authority": "^0.4.0",
     "clsx": "^1.2.1",

package/dist/chunk-7CC4WXB3.js

@@ -1,60 +0,0 @@
-// src/conditions/condition.ts
-import isEqual from "fast-deep-equal";
-var compareConditionsItem = (item1, item2) => {
-  const { data = {}, ...others1 } = item1;
-  const { data: data2 = {}, ...others2 } = item2;
-  if (!isEqual(others2, others1)) {
-    return false;
-  }
-  for (const key in data) {
-    if (!isEqual(data[key], data2[key])) {
-      return false;
-    }
-  }
-  return true;
-};
-var conditionsIsSame = (rr1, rr2) => {
-  const r1 = [...rr1];
-  const r2 = [...rr2];
-  if (r1.length === 0 && r2.length === 0) {
-    return true;
-  }
-  if (r1.length !== r2.length) {
-    return false;
-  }
-  const group1 = r1.filter((item) => item.type === "group");
-  const group2 = r2.filter((item) => item.type === "group");
-  if (group1.length !== group2.length) {
-    return false;
-  }
-  for (let index = 0; index < r1.length; index++) {
-    const item1 = r1[index];
-    const item2 = r2[index];
-    if (!item1 || !item2) {
-      return false;
-    }
-    if (item1.type === "group") {
-      if (!item2.conditions) {
-        return false;
-      }
-      const c1 = item1.conditions;
-      const c2 = item2.conditions;
-      if (item1.operators !== item2.operators) {
-        return false;
-      }
-      if (!conditionsIsSame(c1, c2)) {
-        return false;
-      }
-    } else {
-      if (!compareConditionsItem(item1, item2)) {
-        return false;
-      }
-    }
-  }
-  return true;
-};
-
-export {
-  isEqual,
-  conditionsIsSame
-};