@useinsider/guido 3.13.1-beta.2f8f877 → 3.13.1-beta.5ea31b5

package/dist/composables/useAllowlist.js

@@ -1,50 +1,68 @@
 import { useAllowlistApi as A } from "../services/allowlistApi.js";
-import { base64EncodeWithSpecialChars as p } from "../utils/base64.js";
-import { useTranslations as h } from "./useTranslations.js";
-import { useUserRole as D } from "./useUserRole.js";
-const f = /(?:https?:\/\/|www\.)[^\s"'<>()]+/gi, E = /&quot;\/\//gi, i = {
+import { base64EncodeWithSpecialChars as f } from "../utils/base64.js";
+import { useTranslations as D } from "./useTranslations.js";
+import { useUserRole as E } from "./useUserRole.js";
+const _ = /(?:https?:\/\/|www\.)[^\s"'<>()]+/gi, L = /&quot;\/\//gi, w = "s3-eu-west-1.amazonaws.com", d = [
+  "insider-email",
+  "web-image.useinsider.com",
+  "image.useinsider.com",
+  "panel-assets.useinsider.com",
+  "stripo-editor-image"
+], N = ({ hostname: r, pathname: l }) => {
+  const n = r.toLowerCase();
+  if (n === w) {
+    const i = l.split("/")[1].toLowerCase();
+    return d.includes(i);
+  }
+  return d.some((i) => n === `${i}.${w}`);
+}, m = {
   MANAGE: "journey-builder.domain-allowlist-warning",
   NON_MANAGE: "settings.allow-list-warning-not-admin-architect",
   ADD_BUTTON: "settings.allow-list-warning-add-button"
-}, w = /* @__PURE__ */ new Set(), O = (n) => `/settings?openAddModal=true&type=domain&values=${p(n)}#security`, M = () => {
-  const { checkDomain: n } = A(), { getIsManageUser: l } = D(), a = h(), d = (t, s) => {
-    const c = `${t || ""} ${s || ""}`.replace(E, "https://").match(f) || [], e = /* @__PURE__ */ new Set();
-    return c.forEach((r) => {
-      const g = /^https?:\/\//i.test(r) ? r : `https://${r}`;
+}, g = /* @__PURE__ */ new Set(), O = (r) => `/settings?openAddModal=true&type=domain&values=${f(r)}#security`, C = () => {
+  const { checkDomain: r } = A(), { getIsManageUser: l } = E(), n = D(), i = (t, e) => {
+    const a = `${t || ""} ${e || ""}`.replace(L, "https://").match(_) || [], s = /* @__PURE__ */ new Set();
+    return a.forEach((c) => {
+      const h = /^https?:\/\//i.test(c) ? c : `https://${c}`;
       try {
-        const { hostname: u } = new URL(g);
-        u && e.add(u.replace(/^www\./i, "").toLowerCase());
+        const u = new URL(h);
+        if (N(u))
+          return;
+        u.hostname && s.add(u.hostname.replace(/^www\./i, "").toLowerCase());
       } catch {
       }
-    }), [...e];
-  }, m = async (t) => {
-    if (w.has(t))
+    }), [...s];
+  }, p = async (t) => {
+    if (g.has(t))
       return !0;
     try {
-      const s = await n(t);
-      return s && w.add(t), s;
-    } catch (s) {
-      return console.error("[GUIDO_ALLOWLIST] isDomainAllowlisted failed", t, s), !0;
+      const e = await r(t);
+      return e && g.add(t), e;
+    } catch (e) {
+      return console.error("[GUIDO_ALLOWLIST] isDomainAllowlisted failed", t, e), !0;
     }
   };
-  return { getBlockedDomains: async (t, s) => {
+  return { getBlockedDomains: async (t, e) => {
     try {
-      const o = d(t, s);
+      const o = i(t, e);
       return o.length ? (await Promise.all(
-        o.map(async (e) => ({ domain: e, allowlisted: await m(e) }))
-      )).filter((e) => !e.allowlisted).map((e) => e.domain) : [];
+        o.map(async (s) => ({ domain: s, allowlisted: await p(s) }))
+      )).filter((s) => !s.allowlisted).map((s) => s.domain) : [];
     } catch (o) {
       return console.error("[GUIDO_ALLOWLIST] getBlockedDomains failed", o), [];
     }
-  }, resolveToast: async (t) => await l() ? {
-    message: a(i.MANAGE),
-    actionButton: {
-      text: a(i.ADD_BUTTON),
-      onClick: () => window.open(O(t.join(",")), "_blank")
-    }
-  } : { message: a(i.NON_MANAGE) } };
+  }, resolveToast: async (t) => {
+    const e = await l(), o = t.length ? ` (${t.join(", ")})` : "", a = (s) => `${s}${o}`;
+    return e ? {
+      message: a(n(m.MANAGE)),
+      actionButton: {
+        text: n(m.ADD_BUTTON),
+        onClick: () => window.open(O(t.join(",")), "_blank")
+      }
+    } : { message: a(n(m.NON_MANAGE)) };
+  } };
 };
 export {
   O as buildAllowlistSettingsUrl,
-  M as useAllowlist
+  C as useAllowlist
 };

package/dist/composables/useHtmlValidator.js

@@ -1,69 +1,64 @@
-import { useConfig as V } from "./useConfig.js";
-import { getIgnoredRecommendationBlockIds as M } from "../config/compiler/utils/recommendationIgnoreUtils.js";
-import { TemplateTypes as W } from "../enums/defaults.js";
-import { DISPLAY_CONDITIONS_REGEX as G, DISPLAY_CONDITIONS_EXCEPTIONS_REGEX as H, CampaignCouldNotBeSavedKey as P, CanNotMakeAnyChangesForRunningKey as X, DATA_ATTRIBUTE_REGEX as $, DYNAMIC_CONTENT_TAG_REGEX as Y, ALLOWED_DYNAMIC_SYSTEM_TOKENS as U, VALID_DYNAMIC_VARIABLE_REGEX as j } from "../enums/html-validator.js";
+import { useConfig as W } from "./useConfig.js";
+import { getIgnoredRecommendationBlockIds as G } from "../config/compiler/utils/recommendationIgnoreUtils.js";
+import { TemplateTypes as H } from "../enums/defaults.js";
+import { DISPLAY_CONDITIONS_REGEX as P, DISPLAY_CONDITIONS_EXCEPTIONS_REGEX as X, CampaignCouldNotBeSavedKey as $, CanNotMakeAnyChangesForRunningKey as Y, DATA_ATTRIBUTE_REGEX as U, DYNAMIC_CONTENT_TAG_REGEX as j, ALLOWED_DYNAMIC_SYSTEM_TOKENS as q, VALID_DYNAMIC_VARIABLE_REGEX as K } from "../enums/html-validator.js";
 import { ToasterTypeOptions as c } from "../enums/toaster.js";
-import { itemsBlockDynamicVariables as q } from "../extensions/Blocks/Items/enums/productEnums.js";
-import { RECOMMENDATION_VARIABLE_BUILTIN_ATTRIBUTES as K } from "../extensions/Blocks/Recommendation/constants/selectors.js";
-import { useRecommendationExtensionStore as z } from "../extensions/Blocks/Recommendation/store/recommendation.js";
-import { resolveProductAttrValue as Z } from "../extensions/Blocks/Recommendation/templates/utils.js";
-import { RecommendationRequiredFieldsKey as J } from "../extensions/Blocks/Recommendation/validation/requiredFields.js";
-import { useRecommendationStore as Q } from "../stores/recommendation.js";
-import { base64EncodeWithSpecialChars as ee } from "../utils/base64.js";
-import { computed as te } from "vue";
-import { useHttp as ne } from "./useHttp.js";
-import { useToaster as se } from "./useToaster.js";
-import { useTranslations as re } from "./useTranslations.js";
-const oe = /recommendation-id="(\d+)"/g;
-function ie(n) {
-  return [...n.matchAll(oe)].map((m) => m[1]);
+import { itemsBlockDynamicVariables as z } from "../extensions/Blocks/Items/enums/productEnums.js";
+import { RECOMMENDATION_VARIABLE_BUILTIN_ATTRIBUTES as Z } from "../extensions/Blocks/Recommendation/constants/selectors.js";
+import { useRecommendationExtensionStore as J } from "../extensions/Blocks/Recommendation/store/recommendation.js";
+import { resolveProductAttrValue as Q } from "../extensions/Blocks/Recommendation/templates/utils.js";
+import { RecommendationRequiredFieldsKey as ee } from "../extensions/Blocks/Recommendation/validation/requiredFields.js";
+import { useRecommendationStore as te } from "../stores/recommendation.js";
+import { base64EncodeWithSpecialChars as ne } from "../utils/base64.js";
+import { useHttp as se } from "./useHttp.js";
+import { useToaster as re } from "./useToaster.js";
+import { useTranslations as oe } from "./useTranslations.js";
+const ie = /recommendation-id="(\d+)"/g;
+function ae(t) {
+  return [...t.matchAll(ie)].map((m) => m[1]);
 }
-function ae(n, m) {
-  return m.some((f) => n.startsWith(`${f}_`));
+function ce(t, m) {
+  return m.some((f) => t.startsWith(`${f}_`));
 }
-const ce = /^(\d+)_\d+_(.+)$/;
-function le(n) {
-  const m = n.match(ce);
+const le = /^(\d+)_\d+_(.+)$/;
+function me(t) {
+  const m = t.match(le);
   return m ? { recoId: m[1], attribute: m[2] } : null;
 }
-function me(n) {
-  const m = new Set(K);
-  return Object.values(n).forEach((f) => {
-    m.add(Z(f.attributeName, n).toLowerCase());
+function ue(t) {
+  const m = new Set(Z);
+  return Object.values(t).forEach((f) => {
+    m.add(Q(f.attributeName, t).toLowerCase());
   }), m;
 }
-function ue(n, m, f, o, d) {
-  const u = n.match(/{{([a-zA-Z0-9_.\s]*)}}/gm);
+function de(t, m, f, o, d) {
+  const u = t.match(/{{([a-zA-Z0-9_.\s]*)}}/gm);
   if (!u)
     return [];
-  const g = new Set(m.map((h) => h.toLowerCase())), E = [];
+  const p = new Set(m.map((h) => h.toLowerCase())), E = [];
   return u.forEach((h) => {
-    const p = h.slice(2, -2).trim().toLowerCase();
-    if (p !== "" && g.has(p))
+    const g = h.slice(2, -2).trim().toLowerCase();
+    if (g !== "" && p.has(g))
       return;
-    const y = le(p);
+    const y = me(g);
     if (y && o.has(y.recoId)) {
       if (!d || d.has(y.attribute))
         return;
-      E.push(p);
+      E.push(g);
       return;
     }
-    ae(p, f) || p.includes(".") || E.push(p);
+    ce(g, f) || g.includes(".") || E.push(g);
   }), E;
 }
-function de(n) {
-  return (n.replace($, "$1").match(Y) ?? []).filter((o) => {
-    const d = o.slice(2, -2), u = d.indexOf("|"), g = (u === -1 ? d : d.slice(0, u)).trim();
-    return U.includes(g) ? !1 : j.test(g) ? u !== -1 && d.slice(u + 1).trim() === "" : !0;
+function fe(t) {
+  return (t.replace(U, "$1").match(j) ?? []).filter((o) => {
+    const d = o.slice(2, -2), u = d.indexOf("|"), p = (u === -1 ? d : d.slice(0, u)).trim();
+    return q.includes(p) ? !1 : K.test(p) ? u !== -1 && d.slice(u + 1).trim() === "" : !0;
   });
 }
 const xe = () => {
-  const { showToaster: n } = se(), { post: m } = ne(), { config: f } = V(), o = re(), d = Q(), u = z(), g = te(
-    () => {
-      var e, t;
-      return ((t = (e = f.value) == null ? void 0 : e.partner) == null ? void 0 : t.messageType) === W.transactional;
-    }
-  ), E = async (e) => {
+  var b, S;
+  const { showToaster: t } = re(), { post: m } = se(), { config: f } = W(), o = oe(), d = te(), u = J(), p = ((S = (b = f.value) == null ? void 0 : b.partner) == null ? void 0 : S.messageType) === H.transactional, E = async (e) => {
     if (e.size === 0)
       return /* @__PURE__ */ new Set();
     try {
@@ -71,61 +66,61 @@ const xe = () => {
     } catch {
       return null;
     }
-    return me(u.filterList);
+    return ue(u.filterList);
   }, h = async (e) => {
-    const s = await m(
+    const n = await m(
       "/newsletter/template-library/check-template-html-body",
-      { html: ee(e) }
-    ), { status: r, message: a } = s.data;
-    return r || n({
+      { html: ne(e) }
+    ), { status: r, message: a } = n.data;
+    return r || t({
       type: c.Error,
       message: r === void 0 ? a : o("newsletter.invalid-url-link-for-toaster")
-    }), o(P), a === o(X) && n({
+    }), o($), a === o(Y) && t({
       type: c.Error,
       message: o("newsletter.already-in-progress")
     }), r;
-  }, p = (e) => !["if", "endif", "else", "elif", "now"].includes(e.toLowerCase()), y = (e) => ["if", "endif"].includes(e.toLowerCase()), S = (e, t) => {
-    const s = e.match(/({%(.*?)%})/g);
+  }, g = (e) => !["if", "endif", "else", "elif", "now"].includes(e.toLowerCase()), y = (e) => ["if", "endif"].includes(e.toLowerCase()), T = (e, s) => {
+    const n = e.match(/({%(.*?)%})/g);
     let r = !0;
-    return s !== null && !g.value && s.forEach((a) => {
+    return n !== null && !p && n.forEach((a) => {
       const i = a.slice(2, -2).trim().match(/(".*?"|[^"\s]+)(?=\s*|\s*$)/g);
       if (i && i.length > 0) {
         const [l] = i;
-        p(l) && !t.includes(l) && (n({
+        g(l) && !s.includes(l) && (t({
           type: c.Warning,
           message: o("custom-fields.invalid-custom-fields")
         }), r = !1);
       }
     }), r;
-  }, A = async (e, t, s) => {
-    const r = s ? await h(e) : !0;
-    return S(e, t) && r;
-  }, T = (e) => e.length > 0 ? !0 : (n({
+  }, w = async (e, s, n) => {
+    const r = n ? await h(e) : !0;
+    return T(e, s) && r;
+  }, R = (e) => e.length > 0 ? !0 : (t({
     type: c.Warning,
     message: o("newsletter.html-content-is-empty")
-  }), !1), w = (e) => {
-    const t = (e.match(/{/gm) || []).length, s = (e.match(/}/gm) || []).length;
-    return t > s && n({
+  }), !1), _ = (e) => {
+    const s = (e.match(/{/gm) || []).length, n = (e.match(/}/gm) || []).length;
+    return s > n && t({
       type: c.Warning,
       message: o("custom-fields.missing-closing-braces")
-    }), t < s && n({
+    }), s < n && t({
       type: c.Warning,
       message: o("custom-fields.missing-opening-braces")
-    }), t === s;
-  }, R = (e) => {
-    const t = de(e).length === 0;
-    return t || n({
+    }), s === n;
+  }, N = (e) => {
+    const s = fe(e).length === 0;
+    return s || t({
       type: c.Warning,
       message: o("custom-fields.invalid-custom-fields")
-    }), t;
-  }, _ = (e, t, s, r) => {
-    if (g.value)
+    }), s;
+  }, x = (e, s, n, r) => {
+    if (p)
       return !0;
-    const a = ue(
+    const a = de(
       e,
-      t,
-      ie(e),
       s,
+      ae(e),
+      n,
       r
     );
     if (a.length > 0) {
@@ -134,91 +129,91 @@ const xe = () => {
                     ${a.map((l) => `<li>${l}</li>`).join("")}
                 </ul>
             `;
-      return n({
+      return t({
         type: c.Error,
         message: o("custom-fields.invalid-custom-fields") + i
       }), !1;
     }
     return !0;
-  }, N = (e) => {
-    const t = e.match(/{%(.*?)%}/g), s = [];
+  }, O = (e) => {
+    const s = e.match(/{%(.*?)%}/g), n = [];
     let r = !0;
-    if (t && t.forEach((a) => {
-      const i = a.match(G), l = a.match(H), C = (i == null ? void 0 : i.join("")) || "";
-      (!i || a !== C) && !l && (n({
+    if (s && s.forEach((a) => {
+      const i = a.match(P), l = a.match(X), v = (i == null ? void 0 : i.join("")) || "";
+      (!i || a !== v) && !l && (t({
         type: c.Error,
         message: o("newsletter.display-conditions-invalid-syntax")
-      }), r = !1), i && i.forEach((v) => {
-        v.trim() === "=" && (n({
+      }), r = !1), i && i.forEach((C) => {
+        C.trim() === "=" && (t({
           type: c.Error,
           message: o("custom-conditions.wrong-equality-operators")
         }), r = !1);
-        const I = v.match(/^[a-zA-Z]*$/g);
-        I && I.forEach((b) => {
-          y(b) && s.push(b);
+        const I = C.match(/^[a-zA-Z]*$/g);
+        I && I.forEach((A) => {
+          y(A) && n.push(A);
         });
       });
-    }), s.length) {
-      const a = s.filter((l) => l === "if"), i = s.filter((l) => l === "endif");
-      a.length !== i.length && (n({
+    }), n.length) {
+      const a = n.filter((l) => l === "if"), i = n.filter((l) => l === "endif");
+      a.length !== i.length && (t({
         type: c.Error,
         message: o("custom-conditions.missing-if-endif-tag")
       }), r = !1);
     }
     return r;
-  }, x = (e) => {
-    const t = (e.match(/{% /gm) || []).length, s = (e.match(/ %}/gm) || []).length, r = t === s;
-    return r || n({
+  }, k = (e) => {
+    const s = (e.match(/{% /gm) || []).length, n = (e.match(/ %}/gm) || []).length, r = s === n;
+    return r || t({
       type: c.Warning,
       message: o("custom-conditions.no-space-after-braces")
     }), r;
-  }, O = (e) => (e.match(/({%(.*?)%})/g) || []).filter((s) => s.includes("if")).map((s) => (s.match(/{{.*}}/gm) || []).length).reduce((s, r) => s + r, 0) > 0 ? (n({
+  }, B = (e) => (e.match(/({%(.*?)%})/g) || []).filter((n) => n.includes("if")).map((n) => (n.match(/{{.*}}/gm) || []).length).reduce((n, r) => n + r, 0) > 0 ? (t({
     type: c.Warning,
     message: o("custom-conditions.no-braces-inside-if-tag")
-  }), !1) : !0, k = () => u.hasInvalidBlock() ? (n({
+  }), !1) : !0, D = () => u.hasInvalidBlock() ? (t({
     type: c.Error,
-    message: o(J)
-  }), !1) : !0, B = () => d.recommendationConfigs && Object.values(d.recommendationConfigs).find((t) => t.filters.find((s) => s.value === "")) !== void 0 ? (n({
+    message: o(ee)
+  }), !1) : !0, F = () => d.recommendationConfigs && Object.values(d.recommendationConfigs).find((s) => s.filters.find((n) => n.value === "")) !== void 0 ? (t({
     type: c.Error,
     message: o("newsletter.fill-all-necessary-fields")
-  }), !1) : !0, D = (e) => {
-    const t = /src="[^"]*\.(svg|pst)"/gm;
-    return e.match(t) === null ? !0 : (n({
+  }), !1) : !0, L = (e) => {
+    const s = /src="[^"]*\.(svg|pst)"/gm;
+    return e.match(s) === null ? !0 : (t({
       type: c.Error,
       message: o("newsletter.invalid-image-type")
     }), !1);
-  }, F = (e) => {
+  }, V = (e) => {
     const r = new DOMParser().parseFromString(e, "text/html").querySelectorAll(".checkbox-block-v2");
     return Array.from(r).find((i) => {
       var l;
       return !((l = i.id) != null && l.trim());
-    }) ? (n({
+    }) ? (t({
       type: c.Error,
       message: o("unsubscribe-templates.select-checkbox-groups")
     }), !1) : !0;
-  }, L = (e) => {
+  }, M = (e) => {
     const r = new DOMParser().parseFromString(e, "text/html").querySelectorAll(".radio-button-v2");
     return Array.from(r).find((i) => {
       var l;
       return !((l = i.id) != null && l.trim());
-    }) ? (n({
+    }) ? (t({
       type: c.Error,
       message: o("unsubscribe-templates.select-radio-button-groups")
     }), !1) : !0;
   };
-  return { validateHtml: async (e, t, s = !1) => {
-    var C, v;
+  return { validateHtml: async (e, s, n = !1) => {
+    var v, C;
     const r = [
-      ...t.map((I) => I.value),
-      ...q,
-      ...((v = (C = f.value) == null ? void 0 : C.template) == null ? void 0 : v.customFieldAttributes) ?? []
-    ], a = M(e), i = await E(a);
-    return await A(e, r, s) && T(e) && w(e) && R(e) && _(e, r, a, i) && N(e) && x(e) && O(e) && k() && B() && D(e) && F(e) && L(e);
+      ...s.map((I) => I.value),
+      ...z,
+      ...((C = (v = f.value) == null ? void 0 : v.template) == null ? void 0 : C.customFieldAttributes) ?? []
+    ], a = G(e), i = await E(a);
+    return await w(e, r, n) && R(e) && _(e) && N(e) && x(e, r, a, i) && O(e) && k(e) && B(e) && D() && F() && L(e) && V(e) && M(e);
   } };
 };
 export {
-  me as buildPartnerAttributeNameSet,
-  ue as findInvalidCustomFields,
-  le as parseRecommendationVariable,
+  ue as buildPartnerAttributeNameSet,
+  de as findInvalidCustomFields,
+  me as parseRecommendationVariable,
   xe as useHtmlValidator
 };

package/dist/config/compiler/htmlCompilerRules.js

@@ -147,6 +147,24 @@ const d = [
     replaceAll: !0,
     priority: 41
   },
+  {
+    id: "replace-s3-path-style-web-image-domain",
+    description: "Rewriting path-style S3 asset URLs to the web-image.useinsider.com domain",
+    type: "replace",
+    search: "s3-eu-west-1.amazonaws.com/web-image.useinsider.com",
+    replacement: "web-image.useinsider.com",
+    replaceAll: !0,
+    priority: 42
+  },
+  {
+    id: "replace-s3-path-style-image-domain",
+    description: "Rewriting path-style S3 asset URLs to the image.useinsider.com domain",
+    type: "replace",
+    search: "s3-eu-west-1.amazonaws.com/image.useinsider.com",
+    replacement: "image.useinsider.com",
+    replaceAll: !0,
+    priority: 43
+  },
   {
     id: "convert-rgb-to-hex",
     // SD-142395: rgb()/6-digit hex are verbose; hex/3-digit shorthand is byte-identical

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@useinsider/guido",
-  "version": "3.13.1-beta.2f8f877",
+  "version": "3.13.1-beta.5ea31b5",
   "description": "Guido is a Vue + TypeScript wrapper for Email Plugin. Easily embed the email editor in your Vue applications.",
   "main": "./dist/guido.umd.cjs",
   "module": "./dist/library.js",