@useinsider/guido 3.15.0 → 3.15.1-beta.6da4177

package/dist/composables/useHtmlValidator.js

@@ -6,7 +6,7 @@ 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 { filterToProductAttrValue as Z } from "../extensions/Blocks/Recommendation/utils/compositionKeys.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";
@@ -15,25 +15,25 @@ 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]);
+function ie(s) {
+  return [...s.matchAll(oe)].map((m) => m[1]);
 }
-function ae(n, m) {
-  return m.some((f) => n.startsWith(`${f}_`));
+function ae(s, m) {
+  return m.some((f) => s.startsWith(`${f}_`));
 }
 const ce = /^(\d+)_\d+_(.+)$/;
-function le(n) {
-  const m = n.match(ce);
+function le(s) {
+  const m = s.match(ce);
   return m ? { recoId: m[1], attribute: m[2] } : null;
 }
-function me(n) {
+function me(s) {
   const m = new Set(K);
-  return Object.values(n).forEach((f) => {
-    m.add(Z(f.attributeName, n).toLowerCase());
+  return Object.values(s).forEach((f) => {
+    m.add(Z(f).toLowerCase());
   }), m;
 }
-function ue(n, m, f, o, d) {
-  const u = n.match(/{{([a-zA-Z0-9_.\s]*)}}/gm);
+function ue(s, m, f, o, d) {
+  const u = s.match(/{{([a-zA-Z0-9_.\s]*)}}/gm);
   if (!u)
     return [];
   const g = new Set(m.map((h) => h.toLowerCase())), E = [];
@@ -51,14 +51,14 @@ function ue(n, m, f, o, d) {
     ae(p, f) || p.includes(".") || E.push(p);
   }), E;
 }
-function de(n) {
-  return (n.replace($, "$1").match(Y) ?? []).filter((o) => {
+function de(s) {
+  return (s.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;
   });
 }
 const xe = () => {
-  const { showToaster: n } = se(), { post: m } = ne(), { config: f } = V(), o = re(), d = Q(), u = z(), g = te(
+  const { showToaster: s } = 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;
@@ -73,59 +73,59 @@ const xe = () => {
     }
     return me(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({
+    ), { status: r, message: a } = n.data;
+    return r || s({
       type: c.Error,
       message: r === void 0 ? a : o("newsletter.invalid-url-link-for-toaster")
-    }), o(P), a === o(X) && n({
+    }), o(P), a === o(X) && s({
       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);
+    const n = e.match(/({%(.*?)%})/g);
     let r = !0;
-    return s !== null && !g.value && s.forEach((a) => {
+    return n !== null && !g.value && 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({
+        p(l) && !t.includes(l) && (s({
           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;
+  }, A = async (e, t, n) => {
+    const r = n ? await h(e) : !0;
     return S(e, t) && r;
-  }, T = (e) => e.length > 0 ? !0 : (n({
+  }, T = (e) => e.length > 0 ? !0 : (s({
     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({
+    const t = (e.match(/{/gm) || []).length, n = (e.match(/}/gm) || []).length;
+    return t > n && s({
       type: c.Warning,
       message: o("custom-fields.missing-closing-braces")
-    }), t < s && n({
+    }), t < n && s({
       type: c.Warning,
       message: o("custom-fields.missing-opening-braces")
-    }), t === s;
+    }), t === n;
   }, R = (e) => {
     const t = de(e).length === 0;
-    return t || n({
+    return t || s({
       type: c.Warning,
       message: o("custom-fields.invalid-custom-fields")
     }), t;
-  }, _ = (e, t, s, r) => {
+  }, _ = (e, t, n, r) => {
     if (g.value)
       return !0;
     const a = ue(
       e,
       t,
       ie(e),
-      s,
+      n,
       r
     );
     if (a.length > 0) {
@@ -134,56 +134,56 @@ const xe = () => {
                     ${a.map((l) => `<li>${l}</li>`).join("")}
                 </ul>
             `;
-      return n({
+      return s({
         type: c.Error,
         message: o("custom-fields.invalid-custom-fields") + i
       }), !1;
     }
     return !0;
   }, N = (e) => {
-    const t = e.match(/{%(.*?)%}/g), s = [];
+    const t = 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({
+      (!i || a !== C) && !l && (s({
         type: c.Error,
         message: o("newsletter.display-conditions-invalid-syntax")
       }), r = !1), i && i.forEach((v) => {
-        v.trim() === "=" && (n({
+        v.trim() === "=" && (s({
           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);
+          y(b) && n.push(b);
         });
       });
-    }), 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 && (s({
         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({
+    const t = (e.match(/{% /gm) || []).length, n = (e.match(/ %}/gm) || []).length, r = t === n;
+    return r || s({
       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({
+  }, O = (e) => (e.match(/({%(.*?)%})/g) || []).filter((n) => n.includes("if")).map((n) => (n.match(/{{.*}}/gm) || []).length).reduce((n, r) => n + r, 0) > 0 ? (s({
     type: c.Warning,
     message: o("custom-conditions.no-braces-inside-if-tag")
-  }), !1) : !0, k = () => u.hasInvalidBlock() ? (n({
+  }), !1) : !0, k = () => u.hasInvalidBlock() ? (s({
     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({
+  }), !1) : !0, B = () => d.recommendationConfigs && Object.values(d.recommendationConfigs).find((t) => t.filters.find((n) => n.value === "")) !== void 0 ? (s({
     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({
+    return e.match(t) === null ? !0 : (s({
       type: c.Error,
       message: o("newsletter.invalid-image-type")
     }), !1);
@@ -192,7 +192,7 @@ const xe = () => {
     return Array.from(r).find((i) => {
       var l;
       return !((l = i.id) != null && l.trim());
-    }) ? (n({
+    }) ? (s({
       type: c.Error,
       message: o("unsubscribe-templates.select-checkbox-groups")
     }), !1) : !0;
@@ -201,19 +201,19 @@ const xe = () => {
     return Array.from(r).find((i) => {
       var l;
       return !((l = i.id) != null && l.trim());
-    }) ? (n({
+    }) ? (s({
       type: c.Error,
       message: o("unsubscribe-templates.select-radio-button-groups")
     }), !1) : !0;
   };
-  return { validateHtml: async (e, t, s = !1) => {
+  return { validateHtml: async (e, t, n = !1) => {
     var C, v;
     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);
+    return await A(e, r, n) && T(e) && w(e) && R(e) && _(e, r, a, i) && N(e) && x(e) && O(e) && k() && B() && D(e) && F(e) && L(e);
   } };
 };
 export {

package/dist/config/i18n/en/labels.json.js

@@ -1,4 +1,4 @@
-const e = "Items", o = {
+const e = "Items", o = "Default", t = "Custom", s = {
   "Global Styles & Layout": "Global Styles and Layout",
   "Structures & Modules": "Structures and Modules",
   "Recommendation Block": "Recommendation",
@@ -7,9 +7,13 @@ const e = "Items", o = {
   "This block is switched from the Old Version to the New Version. We recommend you check the Items block and test your message to ensure it works properly.": "This block is switched from the Old Version to the New Version. We recommend you check the Items block and test your message to ensure it works properly.",
   "Pixel Tracking Opt-in": "Pixel Tracking Opt-in",
   "OPT-IN SELECTION": "OPT-IN SELECTION",
-  "UNSUBSCRIBE GROUPS": "UNSUBSCRIBE GROUPS"
+  "UNSUBSCRIBE GROUPS": "UNSUBSCRIBE GROUPS",
+  Default: o,
+  Custom: t
 };
 export {
+  t as Custom,
+  o as Default,
   e as Items,
-  o as default
+  s as default
 };

package/dist/config/migrator/recommendation/compositionMapper.js

@@ -1,4 +1,4 @@
-import { DEFAULT_COMPOSITION as d, DEFAULT_VISIBILITY as I } from "../../../extensions/Blocks/Recommendation/constants/defaultConfig.js";
+import { DEFAULT_COMPOSITION as p, DEFAULT_VISIBILITY as I } from "../../../extensions/Blocks/Recommendation/constants/defaultConfig.js";
 import { ATTR_CUSTOM_PREFIX as l, ATTR_PRODUCT_BUTTON as k, ATTR_PRODUCT_OMNIBUS_DISCOUNT as A, ATTR_PRODUCT_OMNIBUS_PRICE as x, ATTR_PRODUCT_OLD_PRICE as f, ATTR_PRODUCT_PRICE as R, ATTR_PRODUCT_NAME as h, ATTR_PRODUCT_IMAGE as y } from "../../../extensions/Blocks/Recommendation/constants/selectors.js";
 import { mapTextTheme as E, mapButtonTheme as O, mapImageTheme as b } from "./themeMapper.js";
 const C = "__title__", a = "product_attribute.";
@@ -23,19 +23,22 @@ function N(r) {
       return { key: k, kind: "button" };
     default:
       if (r.variableType === "p_attribute" || t.startsWith("p_attribute_")) {
-        const s = r.value ?? "", o = s.startsWith(a) ? s.slice(a.length) : s;
-        return o ? {
-          key: `${l}${o}`,
+        const o = r.value ?? "", s = o.startsWith(a) ? o.slice(a.length) : o;
+        if (!s)
+          return null;
+        const e = o || `${a}${s}`;
+        return {
+          key: `${l}${e}`,
           kind: "custom",
-          customAttrName: o,
-          customAttrValue: s || `${a}${o}`
-        } : null;
+          customAttrName: s,
+          customAttrValue: e
+        };
       }
       return null;
   }
 }
-function p(r) {
-  const t = d.indexOf(r);
+function _(r) {
+  const t = p.indexOf(r);
   return t === -1 ? Number.POSITIVE_INFINITY : t;
 }
 function S(r) {
@@ -48,8 +51,8 @@ function S(r) {
     anyTextTrimming: !1
   };
   if (!r || r.length === 0)
-    return t.composition = [...d], t;
-  const s = [];
+    return t.composition = [...p], t;
+  const o = [];
   r.forEach((e, i) => {
     const n = N(e);
     if (n) {
@@ -57,7 +60,7 @@ function S(r) {
         t.titleVariable = e;
         return;
       }
-      s.push({
+      o.push({
         key: n.key,
         kind: n.kind,
         hidden: e.hidden === !0,
@@ -68,30 +71,30 @@ function S(r) {
         originalIndex: i
       });
     }
-  }), s.sort((e, i) => {
+  }), o.sort((e, i) => {
     if (e.positionIdx !== i.positionIdx)
       return e.positionIdx - i.positionIdx;
-    const n = p(e.key), u = p(i.key);
+    const n = _(e.key), u = _(i.key);
     return n !== u ? n - u : e.originalIndex - i.originalIndex;
   });
-  const o = {};
-  return s.forEach((e) => {
-    const { key: i, kind: n, hidden: u, legacy: m, customAttrName: c, customAttrValue: T } = e;
-    switch (t.composition.push(i), t.visibility[i] = !u, n === "custom" && c && T && (t.customAttributes.includes(c) || t.customAttributes.push(c), t.customAttrValues[i] = T), n) {
+  const s = {};
+  return o.forEach((e) => {
+    const { key: i, kind: n, hidden: u, legacy: c, customAttrName: d, customAttrValue: m } = e;
+    switch (t.composition.push(i), t.visibility[i] = !u, n === "custom" && d && m && (t.customAttributes.includes(m) || t.customAttributes.push(m), t.customAttrValues[i] = m), n) {
       case "image":
-        o[i] = b(m.theme);
+        s[i] = b(c.theme);
         break;
       case "button":
-        o[i] = O(m.theme);
+        s[i] = O(c.theme);
         break;
       case "text":
       case "custom": {
-        const _ = E(m.theme);
-        o[i] = _, _.textTrimming && (t.anyTextTrimming = !0);
+        const T = E(c.theme);
+        s[i] = T, T.textTrimming && (t.anyTextTrimming = !0);
         break;
       }
     }
-  }), t.perElementStyles = o, t;
+  }), t.perElementStyles = s, t;
 }
 export {
   S as mapComposition