@useinsider/guido 1.0.2-beta.0e6f88a → 1.0.2-beta.110deb9

package/dist/composables/useHtmlValidator.d.ts

@@ -1,3 +1,4 @@
+import type { DynamicContent } from '@@/Types/generic';
 export declare const useHtmlValidator: () => {
-    validateHtml: (html: string, customFields: string[], isOnSaveValidation?: boolean) => Promise<boolean>;
+    validateHtml: (html: string, customFields: DynamicContent[], isOnSaveValidation?: boolean) => Promise<boolean>;
 };

package/dist/composables/useHtmlValidator.js

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

package/dist/composables/useSave.js

@@ -1,12 +1,12 @@
-import { useSaveStart as i, useSaveComplete as l } from "./useGuidoActions.js";
-import { useTemplatePreparation as m } from "../utils/templatePreparation.js";
-import { useHtmlValidator as n } from "./useHtmlValidator.js";
+import { useSaveStart as i, useSaveComplete as m } from "./useGuidoActions.js";
+import { useTemplatePreparation as n } from "../utils/templatePreparation.js";
+import { useHtmlValidator as l } from "./useHtmlValidator.js";
 const f = () => {
-  const e = i(), a = l(), { validateHtml: s } = n();
+  const e = i(), a = m(), { validateHtml: s } = l();
   return { save: async (o = !1) => {
     e();
-    const { prepareTemplateDetails: r } = m(), t = await r();
-    if (await s(t.compiledHtml, [], !0))
+    const { prepareTemplateDetails: r } = n(), t = await r();
+    if (await s(t.compiledHtml, t.dynamicContentList, !0))
       return o || a(t), t;
   } };
 };

package/dist/utils/genericUtil.d.ts

@@ -1,3 +1,8 @@
 import type { DynamicContent, MergeTag } from '@@/Types/generic';
 export declare const dynamicContentToMergeTags: (dynamicContentList: DynamicContent[]) => MergeTag[];
 export declare const getCsrfToken: () => string;
+/**
+ * URL Parameter utilities
+ */
+export declare const getUrlParams: () => URLSearchParams;
+export declare const getUrlParam: (paramName: string, defaultValue?: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@useinsider/guido",
-  "version": "1.0.2-beta.0e6f88a",
+  "version": "1.0.2-beta.110deb9",
   "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",