@usertour/helpers 0.0.43 → 0.0.44

package/dist/__tests__/url.test.cjs

@@ -321,6 +321,12 @@ describe("URL Condition Evaluation", () => {
       const excludes = [];
       expect(isMatchUrlPattern(url, includes, excludes)).toBe(true);
     });
+    test("should handle URL patterns with wildcard in nested path", () => {
+      const url = "http://localhost:3004/client-view/sites/SUPERCONCEPTS/funds/aaaa/queries";
+      const includes = ["/client-view/sites/SUPERCONCEPTS/funds/*/queries"];
+      const excludes = [];
+      expect(isMatchUrlPattern(url, includes, excludes)).toBe(true);
+    });
     test("should handle URL patterns with fragments", () => {
       const url = "https://example.com/dashboard#overview";
       const includes = ["https://example.com/dashboard#*"];

package/dist/__tests__/url.test.js

@@ -243,6 +243,12 @@ describe("URL Condition Evaluation", () => {
       const excludes = [];
       expect(isMatchUrlPattern(url, includes, excludes)).toBe(true);
     });
+    test("should handle URL patterns with wildcard in nested path", () => {
+      const url = "http://localhost:3004/client-view/sites/SUPERCONCEPTS/funds/aaaa/queries";
+      const includes = ["/client-view/sites/SUPERCONCEPTS/funds/*/queries"];
+      const excludes = [];
+      expect(isMatchUrlPattern(url, includes, excludes)).toBe(true);
+    });
     test("should handle URL patterns with fragments", () => {
       const url = "https://example.com/dashboard#overview";
       const includes = ["https://example.com/dashboard#*"];

package/dist/chunk-MU3AHQEC.js

@@ -0,0 +1,141 @@
+import {
+  isUndefined
+} from "./chunk-GFH3VWOC.js";
+
+// src/content.ts
+import {
+  ContentEditorElementType,
+  ContentPriority
+} from "@usertour/types";
+import { deepmerge } from "deepmerge-ts";
+var isPublishedInAllEnvironments = (content, environmentList, version) => {
+  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 _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
+      );
+    }
+  );
+};
+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;
+  }
+  return false;
+};
+var rulesSetting = {
+  // frequency: {
+  //   frequency: Frequency.ONCE,
+  //   every: { duration: 0, times: 1, unit: FrequencyUnits.MINUTES },
+  //   atLeast: { duration: 0, unit: FrequencyUnits.MINUTES },
+  // },
+  startIfNotComplete: false,
+  priority: ContentPriority.MEDIUM,
+  wait: 0
+};
+var hideRulesSetting = {};
+var defaultContentConfig = {
+  enabledAutoStartRules: false,
+  enabledHideRules: false,
+  autoStartRules: [],
+  hideRules: [],
+  autoStartRulesSetting: rulesSetting,
+  hideRulesSetting
+};
+var buildConfig = (config) => {
+  return {
+    ...defaultContentConfig,
+    ...config,
+    autoStartRulesSetting: deepmerge(
+      defaultContentConfig.autoStartRulesSetting,
+      (config == null ? void 0 : config.autoStartRulesSetting) || {}
+    ),
+    hideRulesSetting: (config == null ? void 0 : config.hideRulesSetting) || {}
+  };
+};
+var extractLinkUrl = (value, userAttributes) => {
+  let url = "";
+  try {
+    for (const v of value) {
+      if ("children" in v && Array.isArray(v.children)) {
+        for (const vc of v.children) {
+          if ("type" in vc && vc.type === "user-attribute") {
+            if (userAttributes && "attrCode" in vc && typeof vc.attrCode === "string") {
+              const attrValue = userAttributes[vc.attrCode];
+              const fallback = "fallback" in vc && typeof vc.fallback === "string" ? vc.fallback : "";
+              url += attrValue != null ? attrValue : fallback;
+            } else if ("fallback" in vc && typeof vc.fallback === "string") {
+              url += vc.fallback;
+            }
+          } else if ("text" in vc && typeof vc.text === "string") {
+            url += vc.text;
+          }
+        }
+      }
+    }
+  } catch (_) {
+  }
+  return url;
+};
+var replaceUserAttrForElement = (data, userAttributes) => {
+  return data.map((v) => {
+    if (v.children) {
+      v.children = replaceUserAttrForElement(v.children, userAttributes);
+    }
+    if (v.type === "user-attribute" && userAttributes) {
+      const value = userAttributes[v.attrCode] || v.fallback;
+      if (!isUndefined(value)) {
+        v.value = String(value);
+      }
+    }
+    if (v.type === "link" && userAttributes) {
+      v.url = v.data ? extractLinkUrl(v.data, userAttributes) : "";
+    }
+    return v;
+  });
+};
+var replaceUserAttr = (editorContents, userAttributes) => {
+  return editorContents.map((editorContent) => {
+    if (!editorContent.children) {
+      return editorContent;
+    }
+    return {
+      ...editorContent,
+      children: editorContent.children.map((column) => {
+        if (!column.children) {
+          return column;
+        }
+        return {
+          ...column,
+          children: column.children.map((element) => {
+            if (element.element.type === ContentEditorElementType.TEXT) {
+              return {
+                ...element,
+                element: {
+                  ...element.element,
+                  data: replaceUserAttrForElement(element.element.data, userAttributes)
+                }
+              };
+            }
+            return { ...element };
+          })
+        };
+      })
+    };
+  });
+};
+
+export {
+  isPublishedInAllEnvironments,
+  isPublishedAtLeastOneEnvironment,
+  defaultContentConfig,
+  buildConfig,
+  extractLinkUrl,
+  replaceUserAttr
+};

package/dist/content.cjs

@@ -22,12 +22,23 @@ var content_exports = {};
 __export(content_exports, {
   buildConfig: () => buildConfig,
   defaultContentConfig: () => defaultContentConfig,
+  extractLinkUrl: () => extractLinkUrl,
   isPublishedAtLeastOneEnvironment: () => isPublishedAtLeastOneEnvironment,
-  isPublishedInAllEnvironments: () => isPublishedInAllEnvironments
+  isPublishedInAllEnvironments: () => isPublishedInAllEnvironments,
+  replaceUserAttr: () => replaceUserAttr
 });
 module.exports = __toCommonJS(content_exports);
 var import_types = require("@usertour/types");
 var import_deepmerge_ts = require("deepmerge-ts");
+
+// src/type-utils.ts
+var nativeIsArray = Array.isArray;
+var ObjProto = Object.prototype;
+var objToString = ObjProto.toString;
+var objHasOwn = ObjProto.hasOwnProperty;
+var isUndefined = (x) => x === void 0;
+
+// src/content.ts
 var isPublishedInAllEnvironments = (content, environmentList, version) => {
   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)) {
@@ -79,10 +90,83 @@ var buildConfig = (config) => {
     hideRulesSetting: (config == null ? void 0 : config.hideRulesSetting) || {}
   };
 };
+var extractLinkUrl = (value, userAttributes) => {
+  let url = "";
+  try {
+    for (const v of value) {
+      if ("children" in v && Array.isArray(v.children)) {
+        for (const vc of v.children) {
+          if ("type" in vc && vc.type === "user-attribute") {
+            if (userAttributes && "attrCode" in vc && typeof vc.attrCode === "string") {
+              const attrValue = userAttributes[vc.attrCode];
+              const fallback = "fallback" in vc && typeof vc.fallback === "string" ? vc.fallback : "";
+              url += attrValue != null ? attrValue : fallback;
+            } else if ("fallback" in vc && typeof vc.fallback === "string") {
+              url += vc.fallback;
+            }
+          } else if ("text" in vc && typeof vc.text === "string") {
+            url += vc.text;
+          }
+        }
+      }
+    }
+  } catch (_) {
+  }
+  return url;
+};
+var replaceUserAttrForElement = (data, userAttributes) => {
+  return data.map((v) => {
+    if (v.children) {
+      v.children = replaceUserAttrForElement(v.children, userAttributes);
+    }
+    if (v.type === "user-attribute" && userAttributes) {
+      const value = userAttributes[v.attrCode] || v.fallback;
+      if (!isUndefined(value)) {
+        v.value = String(value);
+      }
+    }
+    if (v.type === "link" && userAttributes) {
+      v.url = v.data ? extractLinkUrl(v.data, userAttributes) : "";
+    }
+    return v;
+  });
+};
+var replaceUserAttr = (editorContents, userAttributes) => {
+  return editorContents.map((editorContent) => {
+    if (!editorContent.children) {
+      return editorContent;
+    }
+    return {
+      ...editorContent,
+      children: editorContent.children.map((column) => {
+        if (!column.children) {
+          return column;
+        }
+        return {
+          ...column,
+          children: column.children.map((element) => {
+            if (element.element.type === import_types.ContentEditorElementType.TEXT) {
+              return {
+                ...element,
+                element: {
+                  ...element.element,
+                  data: replaceUserAttrForElement(element.element.data, userAttributes)
+                }
+              };
+            }
+            return { ...element };
+          })
+        };
+      })
+    };
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildConfig,
   defaultContentConfig,
+  extractLinkUrl,
   isPublishedAtLeastOneEnvironment,
-  isPublishedInAllEnvironments
+  isPublishedInAllEnvironments,
+  replaceUserAttr
 });

package/dist/content.d.cts

@@ -1,8 +1,10 @@
-import { Content, Environment, ContentVersion, ContentConfigObject } from '@usertour/types';
+import { Content, Environment, ContentVersion, ContentConfigObject, UserTourTypes, ContentEditorRoot } from '@usertour/types';
 
 declare const isPublishedInAllEnvironments: (content: Content | null, environmentList: Environment[] | null, version: ContentVersion | null) => boolean;
 declare const isPublishedAtLeastOneEnvironment: (content: Content | null) => boolean;
 declare const defaultContentConfig: ContentConfigObject;
 declare const buildConfig: (config: ContentConfigObject | undefined) => ContentConfigObject;
+declare const extractLinkUrl: (value: any[], userAttributes: UserTourTypes.Attributes) => string;
+declare const replaceUserAttr: (editorContents: ContentEditorRoot[], userAttributes: UserTourTypes.Attributes) => ContentEditorRoot[];
 
-export { buildConfig, defaultContentConfig, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments };
+export { buildConfig, defaultContentConfig, extractLinkUrl, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments, replaceUserAttr };

package/dist/content.d.ts

@@ -1,8 +1,10 @@
-import { Content, Environment, ContentVersion, ContentConfigObject } from '@usertour/types';
+import { Content, Environment, ContentVersion, ContentConfigObject, UserTourTypes, ContentEditorRoot } from '@usertour/types';
 
 declare const isPublishedInAllEnvironments: (content: Content | null, environmentList: Environment[] | null, version: ContentVersion | null) => boolean;
 declare const isPublishedAtLeastOneEnvironment: (content: Content | null) => boolean;
 declare const defaultContentConfig: ContentConfigObject;
 declare const buildConfig: (config: ContentConfigObject | undefined) => ContentConfigObject;
+declare const extractLinkUrl: (value: any[], userAttributes: UserTourTypes.Attributes) => string;
+declare const replaceUserAttr: (editorContents: ContentEditorRoot[], userAttributes: UserTourTypes.Attributes) => ContentEditorRoot[];
 
-export { buildConfig, defaultContentConfig, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments };
+export { buildConfig, defaultContentConfig, extractLinkUrl, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments, replaceUserAttr };

package/dist/content.js

@@ -1,13 +1,18 @@
 import {
   buildConfig,
   defaultContentConfig,
+  extractLinkUrl,
   isPublishedAtLeastOneEnvironment,
-  isPublishedInAllEnvironments
-} from "./chunk-VWNWWZCH.js";
+  isPublishedInAllEnvironments,
+  replaceUserAttr
+} from "./chunk-MU3AHQEC.js";
+import "./chunk-GFH3VWOC.js";
 import "./chunk-XEO3YXBM.js";
 export {
   buildConfig,
   defaultContentConfig,
+  extractLinkUrl,
   isPublishedAtLeastOneEnvironment,
-  isPublishedInAllEnvironments
+  isPublishedInAllEnvironments,
+  replaceUserAttr
 };

package/dist/index.cjs

@@ -60,6 +60,7 @@ __export(src_exports, {
   evaluateRulesConditions: () => evaluateRulesConditions,
   evaluateTimeCondition: () => evaluateTimeCondition,
   evaluateUrlCondition: () => evaluateUrlCondition,
+  extractLinkUrl: () => extractLinkUrl,
   fetch: () => fetch,
   filterConditionsByType: () => filterConditionsByType,
   filterNullAttributes: () => filterNullAttributes,
@@ -121,6 +122,7 @@ __export(src_exports, {
   parseUrlParams: () => parseUrlParams,
   regenerateConditionIds: () => regenerateConditionIds,
   removeAuthToken: () => removeAuthToken,
+  replaceUserAttr: () => replaceUserAttr,
   setAuthToken: () => setAuthToken,
   storage: () => storage,
   userAgent: () => userAgent,
@@ -1050,6 +1052,77 @@ var buildConfig = (config) => {
     hideRulesSetting: (config == null ? void 0 : config.hideRulesSetting) || {}
   };
 };
+var extractLinkUrl = (value, userAttributes) => {
+  let url = "";
+  try {
+    for (const v of value) {
+      if ("children" in v && Array.isArray(v.children)) {
+        for (const vc of v.children) {
+          if ("type" in vc && vc.type === "user-attribute") {
+            if (userAttributes && "attrCode" in vc && typeof vc.attrCode === "string") {
+              const attrValue = userAttributes[vc.attrCode];
+              const fallback = "fallback" in vc && typeof vc.fallback === "string" ? vc.fallback : "";
+              url += attrValue != null ? attrValue : fallback;
+            } else if ("fallback" in vc && typeof vc.fallback === "string") {
+              url += vc.fallback;
+            }
+          } else if ("text" in vc && typeof vc.text === "string") {
+            url += vc.text;
+          }
+        }
+      }
+    }
+  } catch (_) {
+  }
+  return url;
+};
+var replaceUserAttrForElement = (data, userAttributes) => {
+  return data.map((v) => {
+    if (v.children) {
+      v.children = replaceUserAttrForElement(v.children, userAttributes);
+    }
+    if (v.type === "user-attribute" && userAttributes) {
+      const value = userAttributes[v.attrCode] || v.fallback;
+      if (!isUndefined(value)) {
+        v.value = String(value);
+      }
+    }
+    if (v.type === "link" && userAttributes) {
+      v.url = v.data ? extractLinkUrl(v.data, userAttributes) : "";
+    }
+    return v;
+  });
+};
+var replaceUserAttr = (editorContents, userAttributes) => {
+  return editorContents.map((editorContent) => {
+    if (!editorContent.children) {
+      return editorContent;
+    }
+    return {
+      ...editorContent,
+      children: editorContent.children.map((column) => {
+        if (!column.children) {
+          return column;
+        }
+        return {
+          ...column,
+          children: column.children.map((element) => {
+            if (element.element.type === import_types3.ContentEditorElementType.TEXT) {
+              return {
+                ...element,
+                element: {
+                  ...element.element,
+                  data: replaceUserAttrForElement(element.element.data, userAttributes)
+                }
+              };
+            }
+            return { ...element };
+          })
+        };
+      })
+    };
+  });
+};
 
 // src/utils.ts
 var deepClone = (obj) => {
@@ -1653,6 +1726,7 @@ var filterNullAttributes = (attributes) => {
   evaluateRulesConditions,
   evaluateTimeCondition,
   evaluateUrlCondition,
+  extractLinkUrl,
   fetch,
   filterConditionsByType,
   filterNullAttributes,
@@ -1714,6 +1788,7 @@ var filterNullAttributes = (attributes) => {
   parseUrlParams,
   regenerateConditionIds,
   removeAuthToken,
+  replaceUserAttr,
   setAuthToken,
   storage,
   userAgent,

package/dist/index.d.cts

@@ -5,7 +5,7 @@ export { getAuthToken, removeAuthToken, setAuthToken, storage } from './auth.cjs
 export { defaultStep } from './settings.cjs';
 export { isUrl } from './is-url.cjs';
 export { AbortController, ArrayProto, XMLHttpRequest, assignableWindow, document, fetch, location, nativeForEach, nativeIndexOf, navigator, userAgent, window } from './globals.cjs';
-export { buildConfig, defaultContentConfig, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments } from './content.cjs';
+export { buildConfig, defaultContentConfig, extractLinkUrl, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments, replaceUserAttr } from './content.cjs';
 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';

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { getAuthToken, removeAuthToken, setAuthToken, storage } from './auth.js'
 export { defaultStep } from './settings.js';
 export { isUrl } from './is-url.js';
 export { AbortController, ArrayProto, XMLHttpRequest, assignableWindow, document, fetch, location, nativeForEach, nativeIndexOf, navigator, userAgent, window } from './globals.js';
-export { buildConfig, defaultContentConfig, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments } from './content.js';
+export { buildConfig, defaultContentConfig, extractLinkUrl, isPublishedAtLeastOneEnvironment, isPublishedInAllEnvironments, replaceUserAttr } from './content.js';
 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';

package/dist/index.js

@@ -55,9 +55,11 @@ import {
 import {
   buildConfig,
   defaultContentConfig,
+  extractLinkUrl,
   isPublishedAtLeastOneEnvironment,
-  isPublishedInAllEnvironments
-} from "./chunk-VWNWWZCH.js";
+  isPublishedInAllEnvironments,
+  replaceUserAttr
+} from "./chunk-MU3AHQEC.js";
 import {
   convertSettings,
   convertToCssVars,
@@ -152,6 +154,7 @@ export {
   evaluateRulesConditions,
   evaluateTimeCondition,
   evaluateUrlCondition,
+  extractLinkUrl,
   fetch,
   filterConditionsByType,
   filterNullAttributes,
@@ -213,6 +216,7 @@ export {
   parseUrlParams,
   regenerateConditionIds,
   removeAuthToken,
+  replaceUserAttr,
   setAuthToken,
   storage,
   userAgent,

package/package.json

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

package/dist/chunk-VWNWWZCH.js

@@ -1,63 +0,0 @@
-// src/content.ts
-import {
-  ContentPriority
-} from "@usertour/types";
-import { deepmerge } from "deepmerge-ts";
-var isPublishedInAllEnvironments = (content, environmentList, version) => {
-  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 _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
-      );
-    }
-  );
-};
-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;
-  }
-  return false;
-};
-var rulesSetting = {
-  // frequency: {
-  //   frequency: Frequency.ONCE,
-  //   every: { duration: 0, times: 1, unit: FrequencyUnits.MINUTES },
-  //   atLeast: { duration: 0, unit: FrequencyUnits.MINUTES },
-  // },
-  startIfNotComplete: false,
-  priority: ContentPriority.MEDIUM,
-  wait: 0
-};
-var hideRulesSetting = {};
-var defaultContentConfig = {
-  enabledAutoStartRules: false,
-  enabledHideRules: false,
-  autoStartRules: [],
-  hideRules: [],
-  autoStartRulesSetting: rulesSetting,
-  hideRulesSetting
-};
-var buildConfig = (config) => {
-  return {
-    ...defaultContentConfig,
-    ...config,
-    autoStartRulesSetting: deepmerge(
-      defaultContentConfig.autoStartRulesSetting,
-      (config == null ? void 0 : config.autoStartRulesSetting) || {}
-    ),
-    hideRulesSetting: (config == null ? void 0 : config.hideRulesSetting) || {}
-  };
-};
-
-export {
-  isPublishedInAllEnvironments,
-  isPublishedAtLeastOneEnvironment,
-  defaultContentConfig,
-  buildConfig
-};