@usertour/helpers 0.0.18 → 0.0.20

package/dist/conditions/index.cjs

@@ -34,130 +34,97 @@ __export(conditions_exports, {
   evaluateAttributeCondition: () => evaluateAttributeCondition,
   evaluateTimeCondition: () => evaluateTimeCondition,
   evaluateUrlCondition: () => evaluateUrlCondition,
+  filterConditionsByType: () => filterConditionsByType,
+  isConditionsActived: () => isConditionsActived,
   isEqual: () => import_fast_deep_equal.default,
   isMatchUrlPattern: () => isMatchUrlPattern
 });
 module.exports = __toCommonJS(conditions_exports);
 
 // src/conditions/condition.ts
+var import_types2 = 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);
 };
 
@@ -368,12 +335,49 @@ 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 = {
   conditionsIsSame,
   evaluateAttributeCondition,
   evaluateTimeCondition,
   evaluateUrlCondition,
+  filterConditionsByType,
+  isConditionsActived,
   isEqual,
   isMatchUrlPattern
 });

package/dist/conditions/index.d.cts

@@ -1,4 +1,4 @@
-export { conditionsIsSame } from './condition.cjs';
+export { conditionsIsSame, filterConditionsByType, isConditionsActived } from './condition.cjs';
 export { evaluateUrlCondition, isMatchUrlPattern } from './url.cjs';
 export { evaluateTimeCondition } from './time.cjs';
 export { evaluateAttributeCondition } from './attribute.cjs';

package/dist/conditions/index.d.ts

@@ -1,4 +1,4 @@
-export { conditionsIsSame } from './condition.js';
+export { conditionsIsSame, filterConditionsByType, isConditionsActived } from './condition.js';
 export { evaluateUrlCondition, isMatchUrlPattern } from './url.js';
 export { evaluateTimeCondition } from './time.js';
 export { evaluateAttributeCondition } from './attribute.js';

package/dist/conditions/index.js

@@ -1,15 +1,18 @@
 import "../chunk-7ODE2AIC.js";
+import {
+  conditionsIsSame,
+  filterConditionsByType,
+  isConditionsActived,
+  isEqual
+} from "../chunk-TB7JGI2Q.js";
 import {
   evaluateUrlCondition,
   isMatchUrlPattern
-} from "../chunk-BC7KXBMF.js";
+} from "../chunk-YYIGUZNZ.js";
+import "../chunk-PAESAL23.js";
 import {
   evaluateAttributeCondition
 } from "../chunk-PBZSPV5R.js";
-import {
-  conditionsIsSame,
-  isEqual
-} from "../chunk-YOFQHQ7D.js";
 import {
   evaluateTimeCondition
 } from "../chunk-CEK3SCQO.js";
@@ -19,6 +22,8 @@ export {
   evaluateAttributeCondition,
   evaluateTimeCondition,
   evaluateUrlCondition,
+  filterConditionsByType,
+  isConditionsActived,
   isEqual,
   isMatchUrlPattern
 };

package/dist/conditions/url-v1.cjs

@@ -0,0 +1,89 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/conditions/url-v1.ts
+var url_v1_exports = {};
+__export(url_v1_exports, {
+  isMatchUrlPattern: () => isMatchUrlPattern
+});
+module.exports = __toCommonJS(url_v1_exports);
+var parseUrl = (url) => {
+  const urlPatterns = url.match(/^(([a-z\d]+):\/\/)?([^/?#]+)?(\/[^?#]*)?(\?([^#]*))?(#.*)?$/i);
+  if (!urlPatterns) {
+    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) => {
+  return str.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+};
+var parsePattern = (pattern) => {
+  if (!pattern || !pattern.trim()) {
+    return null;
+  }
+  const _pattern = parseUrl(pattern);
+  if (!_pattern) {
+    console.error("Invalid URL pattern:", pattern);
+    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 = "(\\?[^#]*)?";
+  if (query) {
+    new URLSearchParams(query).forEach((value, key) => {
+      const _str = value === "" ? "=?" : value === "*" ? "(=[^&#]*)?" : `=${replaceWildcard(value, "[^#]")}`;
+      _query += `(?=.*[?&]${replaceSpecialWords(key)}${_str}([&#]|$))`;
+    });
+    _query += "\\?[^#]*";
+  }
+  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);
+    }
+    return false;
+  }) : false;
+  return isMatchIncludesConditions && !isMatchExcludesConditions;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isMatchUrlPattern
+});

package/dist/conditions/url-v1.d.cts

@@ -0,0 +1,3 @@
+declare const isMatchUrlPattern: (_url: string, includes: string[], excludes: string[]) => boolean;
+
+export { isMatchUrlPattern };

package/dist/conditions/url-v1.d.ts

@@ -0,0 +1,3 @@
+declare const isMatchUrlPattern: (_url: string, includes: string[], excludes: string[]) => boolean;
+
+export { isMatchUrlPattern };

package/dist/{chunk-BC7KXBMF.js → conditions/url-v1.js}

@@ -1,4 +1,6 @@
-// src/conditions/url.ts
+import "../chunk-XEO3YXBM.js";
+
+// src/conditions/url-v1.ts
 var parseUrl = (url) => {
   const urlPatterns = url.match(/^(([a-z\d]+):\/\/)?([^/?#]+)?(\/[^?#]*)?(\?([^#]*))?(#.*)?$/i);
   if (!urlPatterns) {
@@ -59,12 +61,6 @@ var isMatchUrlPattern = (_url, includes, excludes) => {
   }) : false;
   return isMatchIncludesConditions && !isMatchExcludesConditions;
 };
-var evaluateUrlCondition = (rules, url) => {
-  const { excludes, includes } = rules.data;
-  return isMatchUrlPattern(url, includes, excludes);
-};
-
 export {
-  isMatchUrlPattern,
-  evaluateUrlCondition
+  isMatchUrlPattern
 };

package/dist/conditions/url-v2.cjs

@@ -0,0 +1,101 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/conditions/url-v2.ts
+var url_v2_exports = {};
+__export(url_v2_exports, {
+  matchUrlPattern: () => matchUrlPattern
+});
+module.exports = __toCommonJS(url_v2_exports);
+function parseUrl(url) {
+  const match = url.match(/^(([a-z\d]+):\/\/)?([^/?#]+)?(\/[^?#]*)?(\?([^#]*))?(#.*)?$/i);
+  if (!match)
+    return null;
+  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, "\\$&");
+}
+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}]+`);
+  }
+  return processed;
+}
+function urlPatternToRegex(pattern) {
+  const parsed = parseUrl(pattern);
+  if (!parsed) {
+    return null;
+  }
+  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) => {
+      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}([&#]|$))`;
+    });
+    queryPattern += "\\?[^#]*";
+  } else {
+    queryPattern = "(\\?[^#]*)?";
+  }
+  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;
+  }
+  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;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  matchUrlPattern
+});

package/dist/conditions/url-v2.d.cts

@@ -0,0 +1,16 @@
+/**
+ * URL pattern object interface
+ */
+interface UrlPattern {
+    includes: string[];
+    excludes: string[];
+}
+/**
+ * Check if URL matches URL pattern with includes/excludes
+ * @param urlPattern - URL pattern object with includes and excludes arrays
+ * @param url - URL to check
+ * @returns True if URL matches pattern
+ */
+declare function matchUrlPattern(urlPattern: UrlPattern, url: string): boolean;
+
+export { matchUrlPattern };

package/dist/conditions/url-v2.d.ts

@@ -0,0 +1,16 @@
+/**
+ * URL pattern object interface
+ */
+interface UrlPattern {
+    includes: string[];
+    excludes: string[];
+}
+/**
+ * Check if URL matches URL pattern with includes/excludes
+ * @param urlPattern - URL pattern object with includes and excludes arrays
+ * @param url - URL to check
+ * @returns True if URL matches pattern
+ */
+declare function matchUrlPattern(urlPattern: UrlPattern, url: string): boolean;
+
+export { matchUrlPattern };

package/dist/conditions/url-v2.js

@@ -0,0 +1,7 @@
+import {
+  matchUrlPattern
+} from "../chunk-PAESAL23.js";
+import "../chunk-XEO3YXBM.js";
+export {
+  matchUrlPattern
+};