@useinsider/guido 2.1.0-beta.7d0f92a → 2.1.0-beta.7ffef92

package/dist/composables/useHtmlValidator.js

@@ -1,171 +1,159 @@
-import { useConfig as D } from "./useConfig.js";
-import { TemplateTypes as L } from "../enums/defaults.js";
-import { DISPLAY_CONDITIONS_REGEX as V, DISPLAY_CONDITIONS_EXCEPTIONS_REGEX as H, CampaignCouldNotBeSavedKey as M, CanNotMakeAnyChangesForRunningKey as $ } from "../enums/html-validator.js";
-import { ToasterTypeOptions as l } from "../enums/toaster.js";
-import { itemsBlockDynamicVariables as P } from "../extensions/Blocks/Items/enums/productEnums.js";
-import { useRecommendationExtensionStore as j } from "../extensions/Blocks/Recommendation/store/recommendation.js";
-import { useRecommendationStore as G } from "../stores/recommendation.js";
-import { base64EncodeWithSpecialChars as q } from "../utils/base64.js";
-import { useHttp as z } from "./useHttp.js";
-import { useToaster as U } from "./useToaster.js";
-import { useTranslations as X } from "./useTranslations.js";
-const K = [
-  "img",
-  "url",
-  "name",
-  "price",
-  "currency",
-  "original_price",
-  "omnibus_price",
-  "omnibus_discount"
-];
-function Y() {
-  const a = j();
-  return Object.keys(a.blockStates).flatMap((d) => {
-    const f = a.blockStates[Number(d)], i = parseInt(f.recommendationConfigs.size) || 10;
-    return Array.from({ length: i }, (m, u) => u).flatMap((m) => K.map((u) => `${d}_${m}_${u}`));
-  });
+import { useConfig as L } from "./useConfig.js";
+import { TemplateTypes as V } from "../enums/defaults.js";
+import { DISPLAY_CONDITIONS_REGEX as _, DISPLAY_CONDITIONS_EXCEPTIONS_REGEX as H, CampaignCouldNotBeSavedKey as P, CanNotMakeAnyChangesForRunningKey as G } from "../enums/html-validator.js";
+import { ToasterTypeOptions as c } from "../enums/toaster.js";
+import { itemsBlockDynamicVariables as M } from "../extensions/Blocks/Items/enums/productEnums.js";
+import { useRecommendationStore as $ } from "../stores/recommendation.js";
+import { base64EncodeWithSpecialChars as X } from "../utils/base64.js";
+import { useHttp as j } from "./useHttp.js";
+import { useToaster as q } from "./useToaster.js";
+import { useTranslations as z } from "./useTranslations.js";
+const K = /recommendation-id="(\d+)"/g;
+function U(i) {
+  return [...i.matchAll(K)].map((u) => u[1]);
 }
-const le = () => {
-  var p, y;
-  const { showToaster: a } = U(), { post: d } = z(), { config: f } = D(), i = X(), g = G(), m = ((y = (p = f.value) == null ? void 0 : p.partner) == null ? void 0 : y.messageType) === L.transactional, u = async (e) => {
-    const t = await d(
+function Y(i, u) {
+  return u.some((d) => i.startsWith(`${d}_`));
+}
+const ce = () => {
+  var y, h;
+  const { showToaster: i } = q(), { post: u } = j(), { config: d } = L(), r = z(), g = $(), p = ((h = (y = d.value) == null ? void 0 : y.partner) == null ? void 0 : h.messageType) === V.transactional, w = async (e) => {
+    const t = await u(
       "/newsletter/template-library/check-template-html-body",
-      { html: q(e) }
-    ), { status: n, message: c } = t.data;
-    return n || a({
-      type: l.Alert,
-      message: n === void 0 ? c : i("newsletter.invalid-url-link-for-toaster")
-    }), i(M), c === i($) && a({
-      type: l.Alert,
-      message: i("newsletter.already-in-progress")
+      { html: X(e) }
+    ), { status: n, message: l } = t.data;
+    return n || i({
+      type: c.Alert,
+      message: n === void 0 ? l : r("newsletter.invalid-url-link-for-toaster")
+    }), r(P), l === r(G) && i({
+      type: c.Alert,
+      message: r("newsletter.already-in-progress")
     }), n;
-  }, b = (e) => !["if", "endif", "else", "elif", "now"].includes(e.toLowerCase()), S = (e) => ["if", "endif"].includes(e.toLowerCase()), w = (e, s) => {
+  }, b = (e) => !["if", "endif", "else", "elif", "now"].includes(e.toLowerCase()), S = (e) => ["if", "endif"].includes(e.toLowerCase()), E = (e, s) => {
     const t = e.match(/({%(.*?)%})/g);
     let n = !0;
-    return t !== null && !m && t.forEach((c) => {
-      const o = c.slice(2, -2).trim().match(/(".*?"|[^"\s]+)(?=\s*|\s*$)/g);
+    return t !== null && !p && t.forEach((l) => {
+      const o = l.slice(2, -2).trim().match(/(".*?"|[^"\s]+)(?=\s*|\s*$)/g);
       if (o && o.length > 0) {
-        const [r] = o;
-        b(r) && !s.includes(r) && (a({
-          type: l.Warning,
-          message: i("custom-fields.invalid-custom-fields")
+        const [a] = o;
+        b(a) && !s.includes(a) && (i({
+          type: c.Warning,
+          message: r("custom-fields.invalid-custom-fields")
         }), n = !1);
       }
     }), n;
-  }, E = async (e, s, t) => {
-    const n = t ? await u(e) : !0;
-    return w(e, s) && n;
-  }, A = (e) => e.length > 0 ? !0 : (a({
-    type: l.Warning,
-    message: i("newsletter.html-content-is-empty")
+  }, A = async (e, s, t) => {
+    const n = t ? await w(e) : !0;
+    return E(e, s) && n;
+  }, I = (e) => e.length > 0 ? !0 : (i({
+    type: c.Warning,
+    message: r("newsletter.html-content-is-empty")
   }), !1), k = (e) => {
     const s = (e.match(/{/gm) || []).length, t = (e.match(/}/gm) || []).length;
-    return s > t && a({
-      type: l.Warning,
-      message: i("custom-fields.missing-closing-braces")
-    }), s < t && a({
-      type: l.Warning,
-      message: i("custom-fields.missing-opening-braces")
+    return s > t && i({
+      type: c.Warning,
+      message: r("custom-fields.missing-closing-braces")
+    }), s < t && i({
+      type: c.Warning,
+      message: r("custom-fields.missing-opening-braces")
     }), s === t;
   }, x = (e) => {
     const s = e.match(/{{\s*(\w+\s+((\w+\|\w+)|(\w+)))\s*}}/gm) === null;
-    return s || a({
-      type: l.Warning,
-      message: i("custom-fields.invalid-custom-fields")
+    return s || i({
+      type: c.Warning,
+      message: r("custom-fields.invalid-custom-fields")
     }), s;
   }, T = (e, s) => {
     const t = e.match(/{{([a-zA-Z0-9_\s]*)}}/gm);
-    if (t && !m) {
-      const n = new Set(s.map((o) => o.toLowerCase())), c = [];
-      if (t.forEach((o) => {
-        const r = o.slice(2, -2).trim().toLowerCase();
-        (!n.has(r) || r === "") && c.push(r);
-      }), c.length > 0) {
-        const o = `
+    if (t && !p) {
+      const n = new Set(s.map((a) => a.toLowerCase())), l = U(e), o = [];
+      if (t.forEach((a) => {
+        const m = a.slice(2, -2).trim().toLowerCase();
+        (!n.has(m) || m === "") && !Y(m, l) && o.push(m);
+      }), o.length > 0) {
+        const a = `
                     <ul>
-                        ${c.map((r) => `<li>${r}</li>`).join("")}
+                        ${o.map((m) => `<li>${m}</li>`).join("")}
                     </ul>
                 `;
-        return a({
-          type: l.Alert,
-          message: i("custom-fields.invalid-custom-fields") + o
+        return i({
+          type: c.Alert,
+          message: r("custom-fields.invalid-custom-fields") + a
         }), !1;
       }
     }
     return !0;
-  }, I = (e) => {
+  }, F = (e) => {
     const s = e.match(/{%(.*?)%}/g), t = [];
     let n = !0;
-    if (s && s.forEach((c) => {
-      const o = c.match(V), r = c.match(H), B = (o == null ? void 0 : o.join("")) || "";
-      (!o || c !== B) && !r && (a({
-        type: l.Alert,
-        message: i("newsletter.display-conditions-invalid-syntax")
-      }), n = !1), o && o.forEach((h) => {
-        h.trim() === "=" && (a({
-          type: l.Alert,
-          message: i("custom-conditions.wrong-equality-operators")
+    if (s && s.forEach((l) => {
+      const o = l.match(_), a = l.match(H), m = (o == null ? void 0 : o.join("")) || "";
+      (!o || l !== m) && !a && (i({
+        type: c.Alert,
+        message: r("newsletter.display-conditions-invalid-syntax")
+      }), n = !1), o && o.forEach((f) => {
+        f.trim() === "=" && (i({
+          type: c.Alert,
+          message: r("custom-conditions.wrong-equality-operators")
         }), n = !1);
-        const C = h.match(/^[a-zA-Z]*$/g);
-        C && C.forEach((v) => {
-          S(v) && t.push(v);
+        const v = f.match(/^[a-zA-Z]*$/g);
+        v && v.forEach((C) => {
+          S(C) && t.push(C);
         });
       });
     }), t.length) {
-      const c = t.filter((r) => r === "if"), o = t.filter((r) => r === "endif");
-      c.length !== o.length && (a({
-        type: l.Alert,
-        message: i("custom-conditions.missing-if-endif-tag")
+      const l = t.filter((a) => a === "if"), o = t.filter((a) => a === "endif");
+      l.length !== o.length && (i({
+        type: c.Alert,
+        message: r("custom-conditions.missing-if-endif-tag")
       }), n = !1);
     }
     return n;
-  }, F = (e) => {
+  }, W = (e) => {
     const s = (e.match(/{% /gm) || []).length, t = (e.match(/ %}/gm) || []).length, n = s === t;
-    return n || a({
-      type: l.Warning,
-      message: i("custom-conditions.no-space-after-braces")
+    return n || i({
+      type: c.Warning,
+      message: r("custom-conditions.no-space-after-braces")
     }), n;
-  }, _ = (e) => (e.match(/({%(.*?)%})/g) || []).filter((t) => t.includes("if")).map((t) => (t.match(/{{.*}}/gm) || []).length).reduce((t, n) => t + n, 0) > 0 ? (a({
-    type: l.Warning,
-    message: i("custom-conditions.no-braces-inside-if-tag")
-  }), !1) : !0, N = () => g.recommendationConfigs && Object.values(g.recommendationConfigs).find((s) => s.filters.find((t) => t.value === "")) !== void 0 ? (a({
-    type: l.Alert,
-    message: i("newsletter.fill-all-necessary-fields")
-  }), !1) : !0, O = (e) => {
+  }, N = (e) => (e.match(/({%(.*?)%})/g) || []).filter((t) => t.includes("if")).map((t) => (t.match(/{{.*}}/gm) || []).length).reduce((t, n) => t + n, 0) > 0 ? (i({
+    type: c.Warning,
+    message: r("custom-conditions.no-braces-inside-if-tag")
+  }), !1) : !0, O = () => g.recommendationConfigs && Object.values(g.recommendationConfigs).find((s) => s.filters.find((t) => t.value === "")) !== void 0 ? (i({
+    type: c.Alert,
+    message: r("newsletter.fill-all-necessary-fields")
+  }), !1) : !0, B = (e) => {
     const s = /src="[^"]*\.(svg|pst)"/gm;
-    return e.match(s) === null ? !0 : (a({
-      type: l.Alert,
-      message: i("newsletter.invalid-image-type")
+    return e.match(s) === null ? !0 : (i({
+      type: c.Alert,
+      message: r("newsletter.invalid-image-type")
     }), !1);
-  }, W = (e) => {
+  }, R = (e) => {
     const n = new DOMParser().parseFromString(e, "text/html").querySelectorAll(".checkbox-block-v2");
     return Array.from(n).find((o) => {
-      var r;
-      return !((r = o.id) != null && r.trim());
-    }) ? (a({
-      type: l.Alert,
-      message: i("unsubscribe-templates.select-checkbox-groups")
+      var a;
+      return !((a = o.id) != null && a.trim());
+    }) ? (i({
+      type: c.Alert,
+      message: r("unsubscribe-templates.select-checkbox-groups")
     }), !1) : !0;
-  }, R = (e) => {
+  }, D = (e) => {
     const n = new DOMParser().parseFromString(e, "text/html").querySelectorAll(".radio-button-v2");
     return Array.from(n).find((o) => {
-      var r;
-      return !((r = o.id) != null && r.trim());
-    }) ? (a({
-      type: l.Alert,
-      message: i("unsubscribe-templates.select-radio-button-groups")
+      var a;
+      return !((a = o.id) != null && a.trim());
+    }) ? (i({
+      type: c.Alert,
+      message: r("unsubscribe-templates.select-radio-button-groups")
     }), !1) : !0;
   };
   return { validateHtml: async (e, s, t = !1) => {
     const n = [
       ...s.map((o) => o.value),
-      ...P,
-      ...Y()
+      ...M
     ];
-    return await E(e, n, t) && A(e) && k(e) && x(e) && T(e, n) && I(e) && F(e) && _(e) && N() && O(e) && W(e) && R(e);
+    return await A(e, n, t) && I(e) && k(e) && x(e) && T(e, n) && F(e) && W(e) && N(e) && O() && B(e) && R(e) && D(e);
   } };
 };
 export {
-  le as useHtmlValidator
+  ce as useHtmlValidator
 };

package/dist/config/compiler/utils/recommendationCompilerUtils.js

@@ -1,13 +1,13 @@
-import { useRecommendation as S } from "../../../composables/useRecommendation.js";
+import { useRecommendation as _ } from "../../../composables/useRecommendation.js";
 function b(e, u, r, o) {
-  const s = `{{${e}_${u}_${r}}}`, t = `{{${e}_${u}_currency}}`;
-  return o === "before" ? `${t} ${s}` : `${s} ${t}`;
+  const n = `{{${e}_${u}_${r}}}`, t = `{{${e}_${u}_currency}}`;
+  return o === "before" ? `${t} ${n}` : `${n} ${t}`;
 }
-function p(e, u, r, o, s) {
+function p(e, u, r, o, n) {
   switch (u) {
     case "productImage": {
       const t = e.querySelector("img");
-      t && t.setAttribute("src", `{{${r}_${o}_img}}`);
+      t && (t.setAttribute("src", `{{${r}_${o}_image_url}}`), t.setAttribute("alt", `{{${r}_${o}_name}}`));
       const c = e.querySelector("a");
       c && c.setAttribute("href", `{{${r}_${o}_url}}`);
       break;
@@ -24,7 +24,7 @@ function p(e, u, r, o, s) {
       const t = e.querySelector("p");
       if (t) {
         const c = t.querySelector("strong") || t;
-        c.textContent = b(r, o, "price", s);
+        c.textContent = b(r, o, "price", n);
       }
       break;
     }
@@ -36,7 +36,7 @@ function p(e, u, r, o, s) {
           r,
           o,
           "original_price",
-          s
+          n
         ), t.setAttribute("product-attr", "discount");
       }
       break;
@@ -67,22 +67,22 @@ function p(e, u, r, o, s) {
   }
 }
 function $(e, u, r) {
-  e.querySelectorAll(".recommendation-product-row").forEach((s, t) => {
-    s.querySelectorAll("[data-attribute-type]").forEach((n) => {
-      const i = n.getAttribute("data-attribute-type") || "", a = n.querySelectorAll(".attribute-cell");
+  e.querySelectorAll(".recommendation-product-row").forEach((n, t) => {
+    n.querySelectorAll("[data-attribute-type]").forEach((s) => {
+      const i = s.getAttribute("data-attribute-type") || "", a = s.querySelectorAll(".attribute-cell");
       a.length > 0 ? a.forEach((l) => {
         p(l, i, u, t, r);
-      }) : p(n, i, u, t, r);
+      }) : p(s, i, u, t, r);
     });
   });
 }
-function _(e, u, r) {
+function S(e, u, r) {
   const o = e.querySelectorAll(".recommendation-product-row");
   if (!o.length)
     return;
-  const [s] = o, t = s.querySelector("[data-attribute-type]"), c = t ? t.querySelectorAll(".attribute-cell").length : 1;
-  o.forEach((n, i) => {
-    n.querySelectorAll("[data-attribute-type]").forEach((l) => {
+  const [n] = o, t = n.querySelector("[data-attribute-type]"), c = t ? t.querySelectorAll(".attribute-cell").length : 1;
+  o.forEach((s, i) => {
+    s.querySelectorAll("[data-attribute-type]").forEach((l) => {
       const f = l.getAttribute("data-attribute-type") || "";
       l.querySelectorAll(".attribute-cell").forEach((y, m) => {
         const A = i * c + m;
@@ -91,11 +91,16 @@ function _(e, u, r) {
     });
   });
 }
-function q(e, u) {
-  const r = e.getAttribute("data-layout") || "grid", o = e.getAttribute("currency-alignment") || "after";
-  r === "list" ? $(e, u, o) : _(e, u, o);
+function q(e, u, r) {
+  e.querySelectorAll(".ins-recommendation-product-container").forEach((n) => {
+    S(n, u, r);
+  });
 }
 function d(e, u) {
+  const r = e.getAttribute("data-layout") || "grid", o = e.getAttribute("currency-alignment") || "after";
+  r === "list" ? $(e, u, o) : q(e, u, o);
+}
+function h(e, u) {
   const r = e.match(/<!DOCTYPE[^>]*>/i);
   return (r ? `${r[0]}
 ` : "") + u.documentElement.outerHTML;
@@ -104,11 +109,11 @@ function w(e) {
   const u = e.replaceAll("{%", "<!--{%").replaceAll("%}", "%}-->"), r = new DOMParser().parseFromString(u, "text/html"), o = r.querySelectorAll(".ins-recommendation-v3-block-v2");
   if (!o.length)
     return e;
-  const { buildCampaignUrl: s } = S();
+  const { buildCampaignUrl: n } = _();
   return o.forEach((c) => {
-    const n = c.getAttribute("recommendation-id");
-    n && (s(n), q(c, n));
-  }), d(u, r).replaceAll("<!--{%", "{%").replaceAll("%}-->", "%}").replaceAll("&lt;!--{%", "{%").replaceAll("%}--&gt;", "%}");
+    const s = c.getAttribute("recommendation-id");
+    s && (n(s), d(c, s));
+  }), h(u, r).replaceAll("<!--{%", "{%").replaceAll("%}-->", "%}").replaceAll("&lt;!--{%", "{%").replaceAll("%}--&gt;", "%}");
 }
 export {
   b as formatPriceVariable,