@usertour/helpers 0.0.57 → 0.0.59

package/README.md

@@ -30,7 +30,6 @@ This package provides various utility functions for the UserTour project:
 - **ID Generation**: Unique ID generation with cuid2
 - **Object Utilities**: Deep merging, equality checking
 - **Color Utilities**: Color formatting and manipulation with chroma-js
-- **Class Utilities**: Class name merging with clsx and tailwind-merge
 - **Type Utilities**: Type-safe utility functions
 - **Validation**: Input validation helpers
 - **Formatting**: Data formatting utilities
@@ -44,8 +43,6 @@ This package depends on:
 - `deepmerge-ts` - Type-safe deep merging
 - `@paralleldrive/cuid2` - Unique ID generation
 - `class-variance-authority` - Class name variants
-- `clsx` - Conditional class names
-- `tailwind-merge` - Tailwind class merging
 - `uuid` - UUID generation
 
 ## Development

package/dist/__tests__/condition.test.cjs

@@ -419,13 +419,8 @@ 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)();
 };

package/dist/__tests__/condition.test.js

@@ -2,10 +2,10 @@ import {
   evaluateRulesConditions,
   filterConditionsByType,
   isConditionsActived
-} from "../chunk-X6R6AH7G.js";
+} from "../chunk-FHPXPUN3.js";
 import "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
-import "../chunk-73OREOHT.js";
+import "../chunk-7EZSPJW4.js";
 import "../chunk-KYDXF7SU.js";
 import "../chunk-JQWKLXW6.js";
 import "../chunk-GFH3VWOC.js";

package/dist/__tests__/content-helper.test.cjs

@@ -29,13 +29,8 @@ var import_types4 = require("@usertour/types");
 var import_types3 = require("@usertour/types");
 
 // 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)();
 };

package/dist/__tests__/content-helper.test.js

@@ -14,12 +14,12 @@ import {
   isQuestionElement,
   isRestrictedType,
   processQuestionElements
-} from "../chunk-RQ4UE7ZB.js";
+} from "../chunk-HNOXFGE2.js";
 import "../chunk-7ODE2AIC.js";
-import "../chunk-X6R6AH7G.js";
+import "../chunk-FHPXPUN3.js";
 import "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
-import "../chunk-73OREOHT.js";
+import "../chunk-7EZSPJW4.js";
 import "../chunk-KYDXF7SU.js";
 import "../chunk-JQWKLXW6.js";
 import "../chunk-GFH3VWOC.js";

package/dist/{chunk-73OREOHT.js → chunk-7EZSPJW4.js}

@@ -1,11 +1,6 @@
 // src/helper.ts
-import { clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
 import { v4 } from "uuid";
 import { createId } from "@paralleldrive/cuid2";
-function cn(...inputs) {
-  return twMerge(clsx(inputs));
-}
 var cuid = () => {
   return createId();
 };
@@ -56,7 +51,6 @@ var getRandomColor = () => {
 };
 
 export {
-  cn,
   cuid,
   formatDate,
   absoluteUrl,

package/dist/{chunk-X6R6AH7G.js → chunk-FHPXPUN3.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-YYIGUZNZ.js";
 import {
   cuid
-} from "./chunk-73OREOHT.js";
+} from "./chunk-7EZSPJW4.js";
 import {
   evaluateAttributeCondition
 } from "./chunk-KYDXF7SU.js";

package/dist/{chunk-RQ4UE7ZB.js → chunk-HNOXFGE2.js}

@@ -1,10 +1,10 @@
 import {
   regenerateConditionIds
-} from "./chunk-X6R6AH7G.js";
+} from "./chunk-FHPXPUN3.js";
 import {
   cuid,
   uuidV4
-} from "./chunk-73OREOHT.js";
+} from "./chunk-7EZSPJW4.js";
 import {
   isArray,
   isEmptyString,

package/dist/{chunk-IS56PYND.js → chunk-MA5IMKG6.js}

@@ -89,7 +89,7 @@ var convertSettings = (settings) => {
     data.font.linkColor = settings.brandColor.background;
   }
   if (settings.xbutton.color === "Auto") {
-    data.xbutton.color = settings.brandColor.background;
+    data.xbutton.color = settings.mainColor.color;
   }
   if (((_a = settings == null ? void 0 : settings.progress) == null ? void 0 : _a.color) === "Auto") {
     data.progress.color = settings.brandColor.background;
@@ -219,7 +219,9 @@ var convertToCssVars = (settings, type = "tooltip") => {
     "--usertour-checklist-trigger-counter-background-color": settings.checklistLauncher.counter.background,
     "--usertour-checklist-trigger-counter-font-color": settings.checklistLauncher.counter.color,
     "--usertour-checklist-trigger-font-color-rgb": settings.checklistLauncher.color.color,
-    "--usertour-checklist-trigger-font-color": settings.checklistLauncher.color.color,
+    "--usertour-checklist-trigger-font-color": hexToHSLString(
+      settings.checklistLauncher.color.color
+    ),
     "--usertour-checklist-trigger-font-weight": settings.checklistLauncher.fontWeight,
     "--usertour-checkmark-background-color": settings.checklist.checkmarkColor,
     "--usertour-checklist-trigger-height": `${settings.checklistLauncher.height}px`,

package/dist/conditions/condition.cjs

@@ -434,13 +434,8 @@ 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)();
 };

package/dist/conditions/condition.js

@@ -8,10 +8,10 @@ import {
   isConditionsActived,
   isEqual,
   regenerateConditionIds
-} from "../chunk-X6R6AH7G.js";
+} from "../chunk-FHPXPUN3.js";
 import "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
-import "../chunk-73OREOHT.js";
+import "../chunk-7EZSPJW4.js";
 import "../chunk-KYDXF7SU.js";
 import "../chunk-JQWKLXW6.js";
 import "../chunk-GFH3VWOC.js";

package/dist/conditions/index.cjs

@@ -479,13 +479,8 @@ 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)();
 };

package/dist/conditions/index.js

@@ -9,13 +9,13 @@ import {
   isConditionsActived,
   isEqual,
   regenerateConditionIds
-} from "../chunk-X6R6AH7G.js";
+} from "../chunk-FHPXPUN3.js";
 import {
   evaluateUrlCondition,
   isMatchUrlPattern
 } from "../chunk-YYIGUZNZ.js";
 import "../chunk-PAESAL23.js";
-import "../chunk-73OREOHT.js";
+import "../chunk-7EZSPJW4.js";
 import {
   evaluateAttributeCondition
 } from "../chunk-KYDXF7SU.js";

package/dist/content-helper.cjs

@@ -50,13 +50,8 @@ module.exports = __toCommonJS(content_helper_exports);
 var import_types3 = require("@usertour/types");
 
 // 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)();
 };

package/dist/content-helper.js

@@ -14,12 +14,12 @@ import {
   isQuestionElement,
   isRestrictedType,
   processQuestionElements
-} from "./chunk-RQ4UE7ZB.js";
+} from "./chunk-HNOXFGE2.js";
 import "./chunk-7ODE2AIC.js";
-import "./chunk-X6R6AH7G.js";
+import "./chunk-FHPXPUN3.js";
 import "./chunk-YYIGUZNZ.js";
 import "./chunk-PAESAL23.js";
-import "./chunk-73OREOHT.js";
+import "./chunk-7EZSPJW4.js";
 import "./chunk-KYDXF7SU.js";
 import "./chunk-JQWKLXW6.js";
 import "./chunk-GFH3VWOC.js";

package/dist/convert-settings.cjs

@@ -154,7 +154,7 @@ var convertSettings = (settings) => {
     data.font.linkColor = settings.brandColor.background;
   }
   if (settings.xbutton.color === "Auto") {
-    data.xbutton.color = settings.brandColor.background;
+    data.xbutton.color = settings.mainColor.color;
   }
   if (((_a = settings == null ? void 0 : settings.progress) == null ? void 0 : _a.color) === "Auto") {
     data.progress.color = settings.brandColor.background;
@@ -284,7 +284,9 @@ var convertToCssVars = (settings, type = "tooltip") => {
     "--usertour-checklist-trigger-counter-background-color": settings.checklistLauncher.counter.background,
     "--usertour-checklist-trigger-counter-font-color": settings.checklistLauncher.counter.color,
     "--usertour-checklist-trigger-font-color-rgb": settings.checklistLauncher.color.color,
-    "--usertour-checklist-trigger-font-color": settings.checklistLauncher.color.color,
+    "--usertour-checklist-trigger-font-color": hexToHSLString(
+      settings.checklistLauncher.color.color
+    ),
     "--usertour-checklist-trigger-font-weight": settings.checklistLauncher.fontWeight,
     "--usertour-checkmark-background-color": settings.checklist.checkmarkColor,
     "--usertour-checklist-trigger-height": `${settings.checklistLauncher.height}px`,

package/dist/convert-settings.js

@@ -2,7 +2,7 @@ import {
   convertSettings,
   convertToCssVars,
   mergeThemeDefaultSettings
-} from "./chunk-IS56PYND.js";
+} from "./chunk-MA5IMKG6.js";
 import "./chunk-FZFHBCB6.js";
 import "./chunk-GFH3VWOC.js";
 import "./chunk-XEO3YXBM.js";

package/dist/helper.cjs

@@ -21,7 +21,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helper_exports = {};
 __export(helper_exports, {
   absoluteUrl: () => absoluteUrl,
-  cn: () => cn,
   cuid: () => cuid,
   evalCode: () => evalCode,
   formatDate: () => formatDate,
@@ -30,13 +29,8 @@ __export(helper_exports, {
   uuidV4: () => uuidV4
 });
 module.exports = __toCommonJS(helper_exports);
-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)();
 };
@@ -88,7 +82,6 @@ var getRandomColor = () => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   absoluteUrl,
-  cn,
   cuid,
   evalCode,
   formatDate,

package/dist/helper.d.cts

@@ -1,6 +1,3 @@
-import { ClassValue } from 'clsx';
-
-declare function cn(...inputs: ClassValue[]): string;
 declare const cuid: () => string;
 declare function formatDate(input: string | number): string;
 declare function absoluteUrl(path: string): string;
@@ -13,4 +10,4 @@ declare function hexToRgb(hex: string): {
 declare const evalCode: (code: string) => any;
 declare const getRandomColor: () => string;
 
-export { absoluteUrl, cn, cuid, evalCode, formatDate, getRandomColor, hexToRgb, uuidV4 };
+export { absoluteUrl, cuid, evalCode, formatDate, getRandomColor, hexToRgb, uuidV4 };

package/dist/helper.d.ts

@@ -1,6 +1,3 @@
-import { ClassValue } from 'clsx';
-
-declare function cn(...inputs: ClassValue[]): string;
 declare const cuid: () => string;
 declare function formatDate(input: string | number): string;
 declare function absoluteUrl(path: string): string;
@@ -13,4 +10,4 @@ declare function hexToRgb(hex: string): {
 declare const evalCode: (code: string) => any;
 declare const getRandomColor: () => string;
 
-export { absoluteUrl, cn, cuid, evalCode, formatDate, getRandomColor, hexToRgb, uuidV4 };
+export { absoluteUrl, cuid, evalCode, formatDate, getRandomColor, hexToRgb, uuidV4 };

package/dist/helper.js

@@ -1,17 +1,15 @@
 import {
   absoluteUrl,
-  cn,
   cuid,
   evalCode,
   formatDate,
   getRandomColor,
   hexToRgb,
   uuidV4
-} from "./chunk-73OREOHT.js";
+} from "./chunk-7EZSPJW4.js";
 import "./chunk-XEO3YXBM.js";
 export {
   absoluteUrl,
-  cn,
   cuid,
   evalCode,
   formatDate,

package/dist/index.cjs

@@ -44,7 +44,6 @@ __export(src_exports, {
   assignableWindow: () => assignableWindow,
   buildConfig: () => buildConfig,
   capitalizeFirstLetter: () => capitalizeFirstLetter,
-  cn: () => cn,
   conditionsIsSame: () => conditionsIsSame,
   convertSettings: () => convertSettings,
   convertTimeConditionLegacyToV2: () => convertTimeConditionLegacyToV2,
@@ -414,7 +413,7 @@ var convertSettings = (settings) => {
     data.font.linkColor = settings.brandColor.background;
   }
   if (settings.xbutton.color === "Auto") {
-    data.xbutton.color = settings.brandColor.background;
+    data.xbutton.color = settings.mainColor.color;
   }
   if (((_a = settings == null ? void 0 : settings.progress) == null ? void 0 : _a.color) === "Auto") {
     data.progress.color = settings.brandColor.background;
@@ -544,7 +543,9 @@ var convertToCssVars = (settings, type = "tooltip") => {
     "--usertour-checklist-trigger-counter-background-color": settings.checklistLauncher.counter.background,
     "--usertour-checklist-trigger-counter-font-color": settings.checklistLauncher.counter.color,
     "--usertour-checklist-trigger-font-color-rgb": settings.checklistLauncher.color.color,
-    "--usertour-checklist-trigger-font-color": settings.checklistLauncher.color.color,
+    "--usertour-checklist-trigger-font-color": hexToHSLString(
+      settings.checklistLauncher.color.color
+    ),
     "--usertour-checklist-trigger-font-weight": settings.checklistLauncher.fontWeight,
     "--usertour-checkmark-background-color": settings.checklist.checkmarkColor,
     "--usertour-checklist-trigger-height": `${settings.checklistLauncher.height}px`,
@@ -1281,13 +1282,8 @@ var wait = (seconds) => {
 };
 
 // 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)();
 };
@@ -1994,7 +1990,6 @@ var duplicateStep = (step) => {
   assignableWindow,
   buildConfig,
   capitalizeFirstLetter,
-  cn,
   conditionsIsSame,
   convertSettings,
   convertTimeConditionLegacyToV2,

package/dist/index.d.cts

@@ -8,7 +8,7 @@ export { AbortController, ArrayProto, XMLHttpRequest, assignableWindow, document
 export { buildConfig, defaultContentConfig, extractLinkUrl, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments, replaceUserAttr } from './content.cjs';
 export { deepClone, parseUrlParams, wait } from './utils.cjs';
 export { generateStateColors, hexToHSLString, hexToRGBStr } from './color.cjs';
-export { absoluteUrl, cn, cuid, evalCode, formatDate, getRandomColor, hexToRgb, uuidV4 } from './helper.cjs';
+export { absoluteUrl, cuid, evalCode, formatDate, getRandomColor, hexToRgb, uuidV4 } from './helper.cjs';
 export { allConditionsHaveIds, assignConditionIds, conditionsIsSame, evaluateRule, evaluateRulesConditions, filterConditionsByType, isConditionsActived, regenerateConditionIds } from './conditions/condition.cjs';
 export { evaluateUrlCondition, isMatchUrlPattern } from './conditions/url.cjs';
 export { convertTimeConditionLegacyToV2, evaluateTimeCondition, isTimeConditionDataLegacy, isTimeConditionDataV2, normalizeTimeConditionData } from './conditions/time.cjs';
@@ -19,4 +19,3 @@ export { default as isEqual } from 'fast-deep-equal';
 import '@usertour/types';
 import './storage.cjs';
 import '@usertour/types/';
-import 'clsx';

package/dist/index.d.ts

@@ -8,7 +8,7 @@ export { AbortController, ArrayProto, XMLHttpRequest, assignableWindow, document
 export { buildConfig, defaultContentConfig, extractLinkUrl, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments, replaceUserAttr } from './content.js';
 export { deepClone, parseUrlParams, wait } from './utils.js';
 export { generateStateColors, hexToHSLString, hexToRGBStr } from './color.js';
-export { absoluteUrl, cn, cuid, evalCode, formatDate, getRandomColor, hexToRgb, uuidV4 } from './helper.js';
+export { absoluteUrl, cuid, evalCode, formatDate, getRandomColor, hexToRgb, uuidV4 } from './helper.js';
 export { allConditionsHaveIds, assignConditionIds, conditionsIsSame, evaluateRule, evaluateRulesConditions, filterConditionsByType, isConditionsActived, regenerateConditionIds } from './conditions/condition.js';
 export { evaluateUrlCondition, isMatchUrlPattern } from './conditions/url.js';
 export { convertTimeConditionLegacyToV2, evaluateTimeCondition, isTimeConditionDataLegacy, isTimeConditionDataV2, normalizeTimeConditionData } from './conditions/time.js';
@@ -19,4 +19,3 @@ export { default as isEqual } from 'fast-deep-equal';
 import '@usertour/types';
 import './storage.js';
 import '@usertour/types/';
-import 'clsx';

package/dist/index.js

@@ -38,7 +38,7 @@ import {
   isQuestionElement,
   isRestrictedType,
   processQuestionElements
-} from "./chunk-RQ4UE7ZB.js";
+} from "./chunk-HNOXFGE2.js";
 import "./chunk-7ODE2AIC.js";
 import {
   allConditionsHaveIds,
@@ -50,7 +50,7 @@ import {
   isConditionsActived,
   isEqual,
   regenerateConditionIds
-} from "./chunk-X6R6AH7G.js";
+} from "./chunk-FHPXPUN3.js";
 import {
   evaluateUrlCondition,
   isMatchUrlPattern
@@ -58,14 +58,13 @@ import {
 import "./chunk-PAESAL23.js";
 import {
   absoluteUrl,
-  cn,
   cuid,
   evalCode,
   formatDate,
   getRandomColor,
   hexToRgb,
   uuidV4
-} from "./chunk-73OREOHT.js";
+} from "./chunk-7EZSPJW4.js";
 import {
   evaluateAttributeCondition
 } from "./chunk-KYDXF7SU.js";
@@ -81,7 +80,7 @@ import {
   convertSettings,
   convertToCssVars,
   mergeThemeDefaultSettings
-} from "./chunk-IS56PYND.js";
+} from "./chunk-MA5IMKG6.js";
 import {
   generateStateColors,
   hexToHSLString,
@@ -155,7 +154,6 @@ export {
   assignableWindow,
   buildConfig,
   capitalizeFirstLetter,
-  cn,
   conditionsIsSame,
   convertSettings,
   convertTimeConditionLegacyToV2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usertour/helpers",
-  "version": "0.0.57",
+  "version": "0.0.59",
   "type": "module",
   "description": "Utility functions and helpers shared across the UserTour project",
   "homepage": "https://www.usertour.io",
@@ -29,14 +29,12 @@
   },
   "dependencies": {
     "@paralleldrive/cuid2": "^2.2.2",
-    "@usertour/types": "^0.0.42",
+    "@usertour/types": "^0.0.43",
     "chroma-js": "^3.1.2",
     "class-variance-authority": "^0.4.0",
-    "clsx": "^1.2.1",
     "date-fns": "^2.30.0",
     "deepmerge-ts": "^7.1.3",
     "fast-deep-equal": "^3.1.3",
-    "tailwind-merge": "^1.13.2",
     "uuid": "^9.0.1"
   },
   "devDependencies": {