@usertour/helpers 0.0.36 → 0.0.38

package/dist/__tests__/condition.test.js

@@ -2,11 +2,11 @@ import {
   evaluateRulesConditions,
   filterConditionsByType,
   isConditionsActived
-} from "../chunk-3UOSPZEP.js";
+} from "../chunk-E3B3AWMJ.js";
 import "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
-import "../chunk-JQWKLXW6.js";
 import "../chunk-KYDXF7SU.js";
+import "../chunk-JQWKLXW6.js";
 import "../chunk-GFH3VWOC.js";
 import "../chunk-3KG2HTZ3.js";
 import "../chunk-XEO3YXBM.js";

package/dist/{chunk-G5P7KULU.js → chunk-QWYOGIRR.js}

@@ -1,3 +1,8 @@
+import {
+  isTimeConditionDataLegacy,
+  isTimeConditionDataV2
+} from "./chunk-JQWKLXW6.js";
+
 // src/error.ts
 import {
   AttributeDataType,
@@ -53,7 +58,21 @@ var getUrlPatternError = (data) => {
 };
 var getCurrentTimeError = (data) => {
   const ret = { showError: false, errorInfo: "" };
-  if (!data.startDate && !data.endDate) {
+  if (isTimeConditionDataV2(data)) {
+    if (!data.startTime && !data.endTime) {
+      ret.showError = true;
+      ret.errorInfo = "Either start or end time be filled in";
+    }
+    return ret;
+  }
+  if (isTimeConditionDataLegacy(data)) {
+    if (!data.startDate && !data.endDate) {
+      ret.showError = true;
+      ret.errorInfo = "Either start or end time be filled in";
+    }
+    return ret;
+  }
+  if (!data || typeof data === "object" && Object.keys(data).length === 0) {
     ret.showError = true;
     ret.errorInfo = "Either start or end time be filled in";
   }

package/dist/conditions/condition.js

@@ -8,11 +8,11 @@ import {
   isConditionsActived,
   isEqual,
   regenerateConditionIds
-} from "../chunk-3UOSPZEP.js";
+} from "../chunk-E3B3AWMJ.js";
 import "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
-import "../chunk-JQWKLXW6.js";
 import "../chunk-KYDXF7SU.js";
+import "../chunk-JQWKLXW6.js";
 import "../chunk-GFH3VWOC.js";
 import "../chunk-3KG2HTZ3.js";
 import "../chunk-XEO3YXBM.js";

package/dist/conditions/index.js

@@ -9,12 +9,15 @@ import {
   isConditionsActived,
   isEqual,
   regenerateConditionIds
-} from "../chunk-3UOSPZEP.js";
+} from "../chunk-E3B3AWMJ.js";
 import {
   evaluateUrlCondition,
   isMatchUrlPattern
 } from "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
+import {
+  evaluateAttributeCondition
+} from "../chunk-KYDXF7SU.js";
 import {
   convertTimeConditionLegacyToV2,
   evaluateTimeCondition,
@@ -22,9 +25,6 @@ import {
   isTimeConditionDataV2,
   normalizeTimeConditionData
 } from "../chunk-JQWKLXW6.js";
-import {
-  evaluateAttributeCondition
-} from "../chunk-KYDXF7SU.js";
 import "../chunk-GFH3VWOC.js";
 import "../chunk-3KG2HTZ3.js";
 import "../chunk-XEO3YXBM.js";

package/dist/convert-settings.js

@@ -2,9 +2,9 @@ import {
   convertSettings,
   convertToCssVars,
   mergeThemeDefaultSettings
-} from "./chunk-USHOKNHQ.js";
-import "./chunk-GFH3VWOC.js";
+} from "./chunk-F7ZHCELE.js";
 import "./chunk-VT24VOAZ.js";
+import "./chunk-GFH3VWOC.js";
 import "./chunk-XEO3YXBM.js";
 export {
   convertSettings,

package/dist/error.cjs

@@ -39,6 +39,25 @@ __export(error_exports, {
 });
 module.exports = __toCommonJS(error_exports);
 var import_types = require("@usertour/types");
+
+// src/conditions/time.ts
+var import_date_fns = require("date-fns");
+
+// src/type-utils.ts
+var nativeIsArray = Array.isArray;
+var ObjProto = Object.prototype;
+var objToString = ObjProto.toString;
+var objHasOwn = ObjProto.hasOwnProperty;
+
+// src/conditions/time.ts
+function isTimeConditionDataV2(data) {
+  return data && ("startTime" in data || "endTime" in data);
+}
+function isTimeConditionDataLegacy(data) {
+  return data && ("startDate" in data || "startDateHour" in data);
+}
+
+// src/error.ts
 var isValidSelector = (selector) => {
   if (!selector) {
     return false;
@@ -89,7 +108,21 @@ var getUrlPatternError = (data) => {
 };
 var getCurrentTimeError = (data) => {
   const ret = { showError: false, errorInfo: "" };
-  if (!data.startDate && !data.endDate) {
+  if (isTimeConditionDataV2(data)) {
+    if (!data.startTime && !data.endTime) {
+      ret.showError = true;
+      ret.errorInfo = "Either start or end time be filled in";
+    }
+    return ret;
+  }
+  if (isTimeConditionDataLegacy(data)) {
+    if (!data.startDate && !data.endDate) {
+      ret.showError = true;
+      ret.errorInfo = "Either start or end time be filled in";
+    }
+    return ret;
+  }
+  if (!data || typeof data === "object" && Object.keys(data).length === 0) {
     ret.showError = true;
     ret.errorInfo = "Either start or end time be filled in";
   }

package/dist/error.js

@@ -15,7 +15,9 @@ import {
   hasActionError,
   hasError,
   isValidSelector
-} from "./chunk-G5P7KULU.js";
+} from "./chunk-QWYOGIRR.js";
+import "./chunk-JQWKLXW6.js";
+import "./chunk-GFH3VWOC.js";
 import "./chunk-XEO3YXBM.js";
 export {
   getCodeError,

package/dist/index.cjs

@@ -461,6 +461,143 @@ var convertToCssVars = (settings, type = "tooltip") => {
 
 // src/error.ts
 var import_types2 = require("@usertour/types");
+
+// src/conditions/time.ts
+var import_date_fns = require("date-fns");
+function isEmpty(value) {
+  return isNullish(value) || isEmptyString(value);
+}
+function hasRequiredFields(data, type) {
+  if (type === "start") {
+    return !isEmpty(data.startDate) && !isEmpty(data.startDateHour) && !isEmpty(data.startDateMinute);
+  }
+  return !isEmpty(data.endDate) && !isEmpty(data.endDateHour) && !isEmpty(data.endDateMinute);
+}
+function parseLegacyDate(dateStr) {
+  const [month, day, year] = dateStr.split("/");
+  if (!month || !day || !year) {
+    return null;
+  }
+  return {
+    month: Number.parseInt(month),
+    day: Number.parseInt(day),
+    year: Number.parseInt(year)
+  };
+}
+function createLegacyDateTime(data, type) {
+  const dateStr = type === "start" ? data.startDate : data.endDate;
+  const hourStr = type === "start" ? data.startDateHour : data.endDateHour;
+  const minuteStr = type === "start" ? data.startDateMinute : data.endDateMinute;
+  if (!dateStr || !hourStr || !minuteStr) {
+    return null;
+  }
+  const dateParts = parseLegacyDate(dateStr);
+  if (!dateParts) {
+    return null;
+  }
+  const dateTime = new Date(
+    dateParts.year,
+    dateParts.month - 1,
+    dateParts.day,
+    Number.parseInt(hourStr),
+    Number.parseInt(minuteStr),
+    0
+  );
+  return (0, import_date_fns.isValid)(dateTime) ? dateTime : null;
+}
+function isTimeConditionDataV2(data) {
+  return data && ("startTime" in data || "endTime" in data);
+}
+function isTimeConditionDataLegacy(data) {
+  return data && ("startDate" in data || "startDateHour" in data);
+}
+function convertTimeConditionLegacyToV2(legacyData) {
+  try {
+    if (!hasRequiredFields(legacyData, "start")) {
+      return null;
+    }
+    const startDateTime = createLegacyDateTime(legacyData, "start");
+    if (!startDateTime) {
+      return null;
+    }
+    const result = {
+      startTime: startDateTime.toISOString()
+    };
+    if (hasRequiredFields(legacyData, "end")) {
+      const endDateTime = createLegacyDateTime(legacyData, "end");
+      if (endDateTime) {
+        result.endTime = endDateTime.toISOString();
+      }
+    }
+    return result;
+  } catch {
+    return null;
+  }
+}
+function normalizeTimeConditionData(data) {
+  if (!data) {
+    return null;
+  }
+  if (isTimeConditionDataV2(data)) {
+    return data;
+  }
+  if (isTimeConditionDataLegacy(data)) {
+    return convertTimeConditionLegacyToV2(data);
+  }
+  return null;
+}
+function evaluateTimeConditionV2(data) {
+  if (!data.startTime) {
+    return false;
+  }
+  const startTime = (0, import_date_fns.parseISO)(data.startTime);
+  if (!(0, import_date_fns.isValid)(startTime)) {
+    return false;
+  }
+  const now = /* @__PURE__ */ new Date();
+  if (!data.endTime) {
+    return (0, import_date_fns.isAfter)(now, startTime);
+  }
+  const endTime = (0, import_date_fns.parseISO)(data.endTime);
+  if (!(0, import_date_fns.isValid)(endTime)) {
+    return false;
+  }
+  return (0, import_date_fns.isAfter)(now, startTime) && (0, import_date_fns.isBefore)(now, endTime);
+}
+function evaluateTimeConditionLegacy(data) {
+  if (!hasRequiredFields(data, "start")) {
+    return false;
+  }
+  const startDateTime = createLegacyDateTime(data, "start");
+  if (!startDateTime) {
+    return false;
+  }
+  const now = /* @__PURE__ */ new Date();
+  if (!hasRequiredFields(data, "end")) {
+    return (0, import_date_fns.isAfter)(now, startDateTime);
+  }
+  const endDateTime = createLegacyDateTime(data, "end");
+  if (!endDateTime) {
+    return false;
+  }
+  return (0, import_date_fns.isAfter)(now, startDateTime) && (0, import_date_fns.isBefore)(now, endDateTime);
+}
+var evaluateTimeCondition = (rules) => {
+  try {
+    const data = rules.data || {};
+    if (isTimeConditionDataV2(data)) {
+      return evaluateTimeConditionV2(data);
+    }
+    if (isTimeConditionDataLegacy(data)) {
+      return evaluateTimeConditionLegacy(data);
+    }
+    return false;
+  } catch {
+    return false;
+  }
+};
+
+// src/error.ts
 var isValidSelector = (selector) => {
   if (!selector) {
     return false;
@@ -511,7 +648,21 @@ var getUrlPatternError = (data) => {
 };
 var getCurrentTimeError = (data) => {
   const ret = { showError: false, errorInfo: "" };
-  if (!data.startDate && !data.endDate) {
+  if (isTimeConditionDataV2(data)) {
+    if (!data.startTime && !data.endTime) {
+      ret.showError = true;
+      ret.errorInfo = "Either start or end time be filled in";
+    }
+    return ret;
+  }
+  if (isTimeConditionDataLegacy(data)) {
+    if (!data.startDate && !data.endDate) {
+      ret.showError = true;
+      ret.errorInfo = "Either start or end time be filled in";
+    }
+    return ret;
+  }
+  if (!data || typeof data === "object" && Object.keys(data).length === 0) {
     ret.showError = true;
     ret.errorInfo = "Either start or end time be filled in";
   }
@@ -1105,141 +1256,6 @@ var evaluateUrlCondition = (rules, url) => {
   return isMatchUrlPattern(url, includes, excludes);
 };
 
-// src/conditions/time.ts
-var import_date_fns = require("date-fns");
-function isEmpty(value) {
-  return isNullish(value) || isEmptyString(value);
-}
-function hasRequiredFields(data, type) {
-  if (type === "start") {
-    return !isEmpty(data.startDate) && !isEmpty(data.startDateHour) && !isEmpty(data.startDateMinute);
-  }
-  return !isEmpty(data.endDate) && !isEmpty(data.endDateHour) && !isEmpty(data.endDateMinute);
-}
-function parseLegacyDate(dateStr) {
-  const [month, day, year] = dateStr.split("/");
-  if (!month || !day || !year) {
-    return null;
-  }
-  return {
-    month: Number.parseInt(month),
-    day: Number.parseInt(day),
-    year: Number.parseInt(year)
-  };
-}
-function createLegacyDateTime(data, type) {
-  const dateStr = type === "start" ? data.startDate : data.endDate;
-  const hourStr = type === "start" ? data.startDateHour : data.endDateHour;
-  const minuteStr = type === "start" ? data.startDateMinute : data.endDateMinute;
-  if (!dateStr || !hourStr || !minuteStr) {
-    return null;
-  }
-  const dateParts = parseLegacyDate(dateStr);
-  if (!dateParts) {
-    return null;
-  }
-  const dateTime = new Date(
-    dateParts.year,
-    dateParts.month - 1,
-    dateParts.day,
-    Number.parseInt(hourStr),
-    Number.parseInt(minuteStr),
-    0
-  );
-  return (0, import_date_fns.isValid)(dateTime) ? dateTime : null;
-}
-function isTimeConditionDataV2(data) {
-  return data && ("startTime" in data || "endTime" in data);
-}
-function isTimeConditionDataLegacy(data) {
-  return data && ("startDate" in data || "startDateHour" in data);
-}
-function convertTimeConditionLegacyToV2(legacyData) {
-  try {
-    if (!hasRequiredFields(legacyData, "start")) {
-      return null;
-    }
-    const startDateTime = createLegacyDateTime(legacyData, "start");
-    if (!startDateTime) {
-      return null;
-    }
-    const result = {
-      startTime: startDateTime.toISOString()
-    };
-    if (hasRequiredFields(legacyData, "end")) {
-      const endDateTime = createLegacyDateTime(legacyData, "end");
-      if (endDateTime) {
-        result.endTime = endDateTime.toISOString();
-      }
-    }
-    return result;
-  } catch {
-    return null;
-  }
-}
-function normalizeTimeConditionData(data) {
-  if (!data) {
-    return null;
-  }
-  if (isTimeConditionDataV2(data)) {
-    return data;
-  }
-  if (isTimeConditionDataLegacy(data)) {
-    return convertTimeConditionLegacyToV2(data);
-  }
-  return null;
-}
-function evaluateTimeConditionV2(data) {
-  if (!data.startTime) {
-    return false;
-  }
-  const startTime = (0, import_date_fns.parseISO)(data.startTime);
-  if (!(0, import_date_fns.isValid)(startTime)) {
-    return false;
-  }
-  const now = /* @__PURE__ */ new Date();
-  if (!data.endTime) {
-    return (0, import_date_fns.isAfter)(now, startTime);
-  }
-  const endTime = (0, import_date_fns.parseISO)(data.endTime);
-  if (!(0, import_date_fns.isValid)(endTime)) {
-    return false;
-  }
-  return (0, import_date_fns.isAfter)(now, startTime) && (0, import_date_fns.isBefore)(now, endTime);
-}
-function evaluateTimeConditionLegacy(data) {
-  if (!hasRequiredFields(data, "start")) {
-    return false;
-  }
-  const startDateTime = createLegacyDateTime(data, "start");
-  if (!startDateTime) {
-    return false;
-  }
-  const now = /* @__PURE__ */ new Date();
-  if (!hasRequiredFields(data, "end")) {
-    return (0, import_date_fns.isAfter)(now, startDateTime);
-  }
-  const endDateTime = createLegacyDateTime(data, "end");
-  if (!endDateTime) {
-    return false;
-  }
-  return (0, import_date_fns.isAfter)(now, startDateTime) && (0, import_date_fns.isBefore)(now, endDateTime);
-}
-var evaluateTimeCondition = (rules) => {
-  try {
-    const data = rules.data || {};
-    if (isTimeConditionDataV2(data)) {
-      return evaluateTimeConditionV2(data);
-    }
-    if (isTimeConditionDataLegacy(data)) {
-      return evaluateTimeConditionLegacy(data);
-    }
-    return false;
-  } catch {
-    return false;
-  }
-};
-
 // src/conditions/attribute.ts
 var import_types4 = require("@usertour/types");
 var import_date_fns2 = require("date-fns");

package/dist/index.js

@@ -20,19 +20,12 @@ import {
   isConditionsActived,
   isEqual,
   regenerateConditionIds
-} from "./chunk-3UOSPZEP.js";
+} from "./chunk-E3B3AWMJ.js";
 import {
   evaluateUrlCondition,
   isMatchUrlPattern
 } from "./chunk-YYIGUZNZ.js";
 import "./chunk-PAESAL23.js";
-import {
-  convertTimeConditionLegacyToV2,
-  evaluateTimeCondition,
-  isTimeConditionDataLegacy,
-  isTimeConditionDataV2,
-  normalizeTimeConditionData
-} from "./chunk-JQWKLXW6.js";
 import {
   evaluateAttributeCondition
 } from "./chunk-KYDXF7SU.js";
@@ -58,25 +51,7 @@ import {
   convertSettings,
   convertToCssVars,
   mergeThemeDefaultSettings
-} from "./chunk-USHOKNHQ.js";
-import {
-  isArray,
-  isBoolean,
-  isDate,
-  isDocument,
-  isEmptyObject,
-  isEmptyString,
-  isFile,
-  isFormData,
-  isFunction,
-  isNull,
-  isNullish,
-  isNumber,
-  isObject,
-  isString,
-  isUint8Array,
-  isUndefined
-} from "./chunk-GFH3VWOC.js";
+} from "./chunk-F7ZHCELE.js";
 import {
   generateAutoStateColors,
   hexToHSLString,
@@ -99,7 +74,32 @@ import {
   hasActionError,
   hasError,
   isValidSelector
-} from "./chunk-G5P7KULU.js";
+} from "./chunk-QWYOGIRR.js";
+import {
+  convertTimeConditionLegacyToV2,
+  evaluateTimeCondition,
+  isTimeConditionDataLegacy,
+  isTimeConditionDataV2,
+  normalizeTimeConditionData
+} from "./chunk-JQWKLXW6.js";
+import {
+  isArray,
+  isBoolean,
+  isDate,
+  isDocument,
+  isEmptyObject,
+  isEmptyString,
+  isFile,
+  isFormData,
+  isFunction,
+  isNull,
+  isNullish,
+  isNumber,
+  isObject,
+  isString,
+  isUint8Array,
+  isUndefined
+} from "./chunk-GFH3VWOC.js";
 import {
   AbortController,
   ArrayProto,

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@usertour/helpers",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "type": "module",
   "description": "Utility functions and helpers shared across the UserTour project",
   "homepage": "https://www.usertour.io",
   "author": "Usertour, Inc. <support@usertour.io>",
   "license": "AGPL-3.0",
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "types": "./dist/index.d.ts"
     }
   },
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@paralleldrive/cuid2": "^2.2.2",
-    "@usertour/types": "^0.0.26",
+    "@usertour/types": "^0.0.29",
     "chroma-js": "^3.1.2",
     "class-variance-authority": "^0.4.0",
     "clsx": "^1.2.1",

package/dist/{chunk-3UOSPZEP.js → chunk-E3B3AWMJ.js}

@@ -1,12 +1,12 @@
 import {
   evaluateUrlCondition
 } from "./chunk-YYIGUZNZ.js";
-import {
-  evaluateTimeCondition
-} from "./chunk-JQWKLXW6.js";
 import {
   evaluateAttributeCondition
 } from "./chunk-KYDXF7SU.js";
+import {
+  evaluateTimeCondition
+} from "./chunk-JQWKLXW6.js";
 import {
   cuid
 } from "./chunk-3KG2HTZ3.js";

package/dist/{chunk-USHOKNHQ.js → chunk-F7ZHCELE.js}

@@ -1,10 +1,10 @@
-import {
-  isUndefined
-} from "./chunk-GFH3VWOC.js";
 import {
   hexToHSLString,
   hexToRGBStr
 } from "./chunk-VT24VOAZ.js";
+import {
+  isUndefined
+} from "./chunk-GFH3VWOC.js";
 
 // src/convert-settings.ts
 import { defaultSettings } from "@usertour/types";