@useinsider/guido 3.7.0-beta.516b778 → 3.7.0-beta.61e8940

package/dist/composables/useHtmlValidator.js

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

package/dist/enums/html-validator.js

@@ -1,7 +1,15 @@
-const e = "newsletter.already-in-progress", n = "newsletter.campaign-could-not-be-saved", o = / (==|<=|>=|!=|>|<|in) | (if|elif|endif|else|and|or) |("[\S ]+")|('[\S ]+')|([^”\s\n]+)|(({%)|( %}))/gm, a = /{%( )*now( )(".*")( )*%}/gm;
+const n = "newsletter.already-in-progress", e = "newsletter.campaign-could-not-be-saved", s = / (==|<=|>=|!=|>|<|in) | (if|elif|endif|else|and|or) |("[\S ]+")|('[\S ]+')|([^”\s\n]+)|(({%)|( %}))/gm, o = /{%( )*now( )(".*")( )*%}/gm, i = /\{\{[^{}]+\}\}/g, E = /^[A-Za-z0-9_.]+$/, _ = [
+  "ins-unsubscribe-link",
+  "ins-global-unsubscribe-link",
+  "ins-preferences-unsubscribe-link",
+  "@COUPON_CODE"
+];
 export {
-  n as CampaignCouldNotBeSavedKey,
-  e as CanNotMakeAnyChangesForRunningKey,
-  a as DISPLAY_CONDITIONS_EXCEPTIONS_REGEX,
-  o as DISPLAY_CONDITIONS_REGEX
+  _ as ALLOWED_DYNAMIC_SYSTEM_TOKENS,
+  e as CampaignCouldNotBeSavedKey,
+  n as CanNotMakeAnyChangesForRunningKey,
+  o as DISPLAY_CONDITIONS_EXCEPTIONS_REGEX,
+  s as DISPLAY_CONDITIONS_REGEX,
+  i as DYNAMIC_CONTENT_TAG_REGEX,
+  E as VALID_DYNAMIC_VARIABLE_REGEX
 };

package/dist/src/enums/html-validator.d.ts

@@ -4,3 +4,6 @@ export declare const CampaignCouldNotBeSavedKey = "newsletter.campaign-could-not
 export declare const DISPLAY_CONDITIONS_REGEX: RegExp;
 export declare const DISPLAY_CONDITIONS_EXCEPTIONS_REGEX: RegExp;
 export declare const REMOVE_CONDITIONS_REGEX: RegExp;
+export declare const DYNAMIC_CONTENT_TAG_REGEX: RegExp;
+export declare const VALID_DYNAMIC_VARIABLE_REGEX: RegExp;
+export declare const ALLOWED_DYNAMIC_SYSTEM_TOKENS: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@useinsider/guido",
-  "version": "3.7.0-beta.516b778",
+  "version": "3.7.0-beta.61e8940",
   "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",
@@ -27,8 +27,6 @@
     "test": "vitest run --coverage",
     "test:watch": "vitest",
     "test:visual-update": "npx playwright test --update-snapshots --reporter html",
-    "test:e2e:coverage": "E2E_COVERAGE=true playwright test",
-    "coverage:e2e:report": "nyc report --reporter=lcov --reporter=text-summary --report-dir=coverage/e2e",
     "prepare": "husky",
     "preinstall": "rm -rf ./node_modules/.vite"
   },
@@ -76,12 +74,10 @@
     "happy-dom": "15.11.7",
     "husky": "9.1.7",
     "msw": "2.10.3",
-    "nyc": "17.1.0",
     "sass": "1.69.7",
     "typescript": "5.5.4",
     "typescript-eslint": "8.26.0",
     "vite-plugin-dts": "4.5.4",
-    "vite-plugin-istanbul": "7.0.0",
     "vitest": "2.1.9",
     "vue-tsc": "2.2.10"
   },
@@ -94,11 +90,6 @@
   "msw": {
     "workerDirectory": "public"
   },
-  "nyc": {
-    "report-dir": "coverage/e2e",
-    "reporter": ["lcov", "text-summary"],
-    "all": false
-  },
   "guido": {
     "stripo": {
       "version": "2.65.0"