@useinsider/guido 3.18.0-beta.d542b1f → 3.18.0-beta.dc6c376

package/dist/composables/useHttp.js

@@ -1,93 +1,86 @@
-import { getCsrfToken as S } from "../utils/genericUtil.js";
-import { ref as p, computed as v } from "vue";
-const F = (b = {}) => {
-  const d = p(!1), n = p(null), u = p(null), g = v(() => d.value), y = v(() => n.value !== null), w = {
+import { getCsrfToken as H } from "../utils/genericUtil.js";
+import { ref as p, computed as T } from "vue";
+const k = (b = {}) => {
+  const h = p(!1), a = p(null), u = p(null), g = T(() => h.value), y = T(() => a.value !== null), v = {
     baseURL: "",
     timeout: 1e4,
     retry: 0,
     retryDelay: 1e3,
     headers: {
       "Content-Type": "application/json",
-      "X-CSRF-TOKEN": S()
+      "X-CSRF-TOKEN": H()
     },
     ...b
-  }, P = (e, r) => {
+  }, w = (e, s) => {
     if (e.startsWith("http://") || e.startsWith("https://"))
       return e;
-    const t = r || w.baseURL || "";
+    const t = s || v.baseURL || "";
     return t.endsWith("/") && e.startsWith("/") ? `${t}${e.slice(1)}` : t.endsWith("/") || e.startsWith("/") ? `${t}${e}` : `${t}/${e}`;
-  }, x = (e) => new Promise((r, t) => {
+  }, P = (e) => new Promise((s, t) => {
     setTimeout(() => {
       t(new Error("Request timeout"));
     }, e);
-  }), C = (e) => new Promise((r) => {
-    setTimeout(r, e);
-  }), i = async (e, r, t, D = {}) => {
-    n.value = null, d.value = !0, u.value = new AbortController();
-    const a = { ...w, ...D }, T = P(r, a.baseURL), c = {
+  }), x = (e) => new Promise((s) => {
+    setTimeout(s, e);
+  }), i = async (e, s, t, D = {}) => {
+    a.value = null, h.value = !0, u.value = new AbortController();
+    const n = { ...v, ...D }, L = w(s, n.baseURL), c = {
       method: e,
-      headers: { ...a.headers },
+      headers: { ...n.headers },
       signal: u.value.signal,
-      ...a
+      ...n
     };
     t && ["POST", "PUT", "PATCH"].includes(e) && (t instanceof FormData ? (delete c.headers["Content-Type"], c.body = t) : c.body = JSON.stringify(t));
     const E = async (m = 0) => {
       try {
-        const o = [fetch(T, c)];
-        a.timeout && o.push(x(a.timeout));
-        const s = await Promise.race(o);
-        if (!s.ok) {
-          const O = `HTTP Error: ${s.status} ${s.statusText}`, h = new Error(O);
-          throw h.status = s.status, h.statusText = s.statusText, h.response = s, [401, 403, 419].includes(s.status) && Promise.resolve().then(() => s.clone().text().catch(() => "")).then((H) => window.dispatchEvent(new CustomEvent("insider:http-auth-error", {
-            detail: {
-              status: s.status,
-              body: H,
-              url: new URL(T, window.location.href).href
-            }
-          }))).catch(() => {
-          }), h;
+        const o = [fetch(L, c)];
+        n.timeout && o.push(P(n.timeout));
+        const r = await Promise.race(o);
+        if (!r.ok) {
+          const O = `HTTP Error: ${r.status} ${r.statusText}`, d = new Error(O);
+          throw d.status = r.status, d.statusText = r.statusText, d.response = r, d;
         }
         let f;
-        const l = s.headers.get("content-type");
-        return l != null && l.includes("application/json") ? f = await s.json() : l != null && l.includes("text/") ? f = await s.text() : f = await s.blob(), {
+        const l = r.headers.get("content-type");
+        return l != null && l.includes("application/json") ? f = await r.json() : l != null && l.includes("text/") ? f = await r.text() : f = await r.blob(), {
           data: f,
-          status: s.status,
-          statusText: s.statusText,
-          headers: s.headers
+          status: r.status,
+          statusText: r.statusText,
+          headers: r.headers
         };
       } catch (o) {
-        const s = o instanceof Error && o.name === "AbortError";
-        if (m < (a.retry || 0) && !s)
-          return await C(a.retryDelay || 1e3), E(m + 1);
-        throw o instanceof Error ? o.name === "AbortError" ? n.value = { message: "Request was cancelled" } : n.value = { message: o.message } : n.value = o, o;
+        const r = o instanceof Error && o.name === "AbortError";
+        if (m < (n.retry || 0) && !r)
+          return await x(n.retryDelay || 1e3), E(m + 1);
+        throw o instanceof Error ? o.name === "AbortError" ? a.value = { message: "Request was cancelled" } : a.value = { message: o.message } : a.value = o, o;
       }
     };
     try {
       return await E();
     } finally {
-      d.value = !1, u.value = null;
+      h.value = !1, u.value = null;
     }
-  }, R = (e, r) => i("GET", e, void 0, r), U = (e, r, t) => i("POST", e, r, t), $ = (e, r, t) => i("PUT", e, r, t), A = (e, r, t) => i("PATCH", e, r, t), L = (e, r) => i("DELETE", e, void 0, r), W = (e) => {
+  }, C = (e, s) => i("GET", e, void 0, s), $ = (e, s, t) => i("POST", e, s, t), R = (e, s, t) => i("PUT", e, s, t), U = (e, s, t) => i("PATCH", e, s, t), A = (e, s) => i("DELETE", e, void 0, s), W = (e) => {
     u.value && u.value.abort(e);
   }, q = () => {
-    n.value = null;
+    a.value = null;
   };
   return {
     // State
     loading: g,
-    error: v(() => n.value),
+    error: T(() => a.value),
     hasError: y,
     // Methods
     request: i,
-    get: R,
-    post: U,
-    put: $,
-    patch: A,
-    delete: L,
+    get: C,
+    post: $,
+    put: R,
+    patch: U,
+    delete: A,
     cancel: W,
     clearError: q
   };
 };
 export {
-  F as useHttp
+  k as useHttp
 };

package/dist/src/utils/liquidDynamicContent.d.ts

@@ -0,0 +1,20 @@
+import type { BaseDynamicContent } from '@@/Types/generic';
+export type DynamicContentFormat = NonNullable<BaseDynamicContent['format']>;
+/** Format key the dynamic-content picker sends for a custom date/time format. */
+export declare const TIME_FORMAT_KEY = "time-format";
+/** Wraps a Liquid filter argument in whichever quote style the value itself does not use. */
+export declare const quoteArgument: (value: string) => string | null;
+/**
+ * `{ key: 'time-format', value: '%Y-%m-%d' }` -> `date: "%Y-%m-%d"`.
+ *
+ * Only a custom date/time strftime pattern has a Liquid equivalent. Anything else returns null so
+ * the caller emits a plain tag rather than one that silently lost — or literally printed — its
+ * format.
+ * @example formatToLiquidFilter({ key: 'time-format', value: '%b %-d, %Y' }) -> date: "%b %-d, %Y"
+ */
+export declare const formatToLiquidFilter: (format: DynamicContentFormat) => string | null;
+/**
+ * Inverse of `formatToLiquidFilter` — reads the picker format back out of one filter segment, so a
+ * reopened tag restores its selection in the host's format dropdown.
+ */
+export declare const liquidFilterToFormat: (segment: string) => DynamicContentFormat | null;

package/dist/utils/genericUtil.js

@@ -1,69 +1,72 @@
-const o = (t) => {
-  const a = t.value.match(/\{\{([^}]+)\}\}/)[1].split("|").map((l) => l.trim()), [s] = a, r = {
+import { formatToLiquidFilter as b, quoteArgument as v, liquidFilterToFormat as h } from "./liquidDynamicContent.js";
+const g = (t) => {
+  if (!t.includes("="))
+    return null;
+  const [e, a] = t.split("=");
+  return { key: e.trim(), value: a.trim() };
+}, c = "default:", f = (t) => {
+  if (!t.startsWith(c))
+    return t;
+  const e = t.slice(c.length).trim(), a = (l) => e.length >= 2 && e.startsWith(l) && e.endsWith(l);
+  return a('"') || a("'") ? e.slice(1, -1) : e;
+}, $ = (t) => {
+  const a = t.value.match(/\{\{([^}]+)\}\}/)[1].split("|").map((r) => r.trim()), [l] = a, s = {
     text: t.label,
-    value: s || ""
+    value: l || ""
   };
   if (a.length >= 2) {
-    const [, l, e] = a;
-    if (l.startsWith("default:")) {
-      let n = l.slice(8).trim();
-      n.startsWith('"') && n.endsWith('"') && (n = n.slice(1, -1)), r.fallback = n;
-    } else {
-      const n = l.includes("=") ? { key: l.split("=")[0].trim(), value: l.split("=")[1].trim() } : null;
-      n ? r.format = n : e || (r.fallback = l), e && (r.fallback = e);
+    const [, r, n] = a;
+    if (r.startsWith(c))
+      s.fallback = f(r);
+    else {
+      const o = h(r) ?? g(r);
+      o ? s.format = o : n || (s.fallback = r), n && (s.fallback = f(n));
     }
   }
-  return r;
-}, f = (t, c = !1) => t.map((a) => {
-  if (a.format)
-    return {
-      label: `${a.text} | ${a.format.key}=${a.format.value}`,
-      value: `{{${a.value}|${a.format.key}=${a.format.value}}}`
-    };
-  if (c) {
-    if (!a.fallback)
-      return {
-        label: a.text,
-        value: `{{ ${a.value} }}`
-      };
-    const r = !Number.isNaN(Number(a.fallback)) && a.fallback.trim() !== "" ? a.fallback : `"${a.fallback}"`;
-    return {
-      label: `${a.text} | ${a.fallback}`,
-      value: `{{ ${a.value} | default: ${r} }}`
-    };
-  }
+  return s;
+}, m = (t) => {
+  const a = !Number.isNaN(Number(t)) && t.trim() !== "" ? t : v(t);
+  return a === null ? null : `${c} ${a}`;
+}, k = (t) => {
+  const e = t.format ? b(t.format) : null, a = t.fallback ? m(t.fallback) : null, l = [t.value, e, a].filter(Boolean);
   return {
-    label: a.fallback ? `${a.text} | ${a.fallback}` : a.text,
-    value: a.fallback ? `{{${a.value}|${a.fallback}}}` : `{{${a.value}}}`
+    label: [t.text, e, a && t.fallback].filter(Boolean).join(" | "),
+    value: `{{ ${l.join(" | ")} }}`
   };
-}), b = (t) => {
-  const c = [], a = /* @__PURE__ */ new Set(), s = (l) => {
-    Array.isArray(l) && l.forEach((e) => {
-      const n = [...e.children ?? [], ...e.select_items ?? []];
-      if (n.length > 0) {
-        s(n);
+}, i = (t, e = !1) => t.map((a) => e ? k(a) : a.format ? {
+  label: `${a.text} | ${a.format.key}=${a.format.value}`,
+  value: `{{${a.value}|${a.format.key}=${a.format.value}}}`
+} : {
+  label: a.fallback ? `${a.text} | ${a.fallback}` : a.text,
+  value: a.fallback ? `{{${a.value}|${a.fallback}}}` : `{{${a.value}}}`
+}), d = (t) => {
+  const e = [], a = /* @__PURE__ */ new Set(), l = (r) => {
+    Array.isArray(r) && r.forEach((n) => {
+      const o = [...n.children ?? [], ...n.select_items ?? []];
+      if (o.length > 0) {
+        l(o);
         return;
       }
-      const u = e.text || e.tag_text;
-      u && e.value && !a.has(e.value) && (a.add(e.value), c.push({ text: u, value: e.value }));
+      const u = n.text || n.tag_text;
+      u && n.value && !a.has(n.value) && (a.add(n.value), e.push({ text: u, value: n.value }));
     });
-  }, [r] = Object.values(t ?? {});
-  return s(r), c;
-}, i = (t, c, a = !1) => {
-  const s = new Set(t.map((l) => l.value)), r = c.filter((l) => s.has(l.value) ? !1 : (s.add(l.value), !0));
+  }, [s] = Object.values(t ?? {});
+  return l(s), e;
+}, p = (t, e, a = !1) => {
+  const l = new Set(t.map((r) => r.value)), s = e.filter((r) => l.has(r.value) ? !1 : (l.add(r.value), !0));
   return [
-    ...f(t, a),
-    ...f(r, a)
+    ...i(t, a),
+    ...i(s, a)
   ];
-}, v = () => {
+}, F = () => {
   var t;
   return ((t = document.head.querySelector('meta[name="csrf-token"]')) == null ? void 0 : t.getAttribute("content")) ?? "";
-}, k = (t) => typeof t == "string" ? t : typeof t == "number" ? String(t) : "";
+}, T = (t) => typeof t == "string" ? t : typeof t == "number" ? String(t) : "";
 export {
-  k as asText,
-  i as buildMergeTagEntries,
-  f as dynamicContentToMergeTags,
-  b as flattenDynamicContentList,
-  v as getCsrfToken,
-  o as mergeTagToDynamicContent
+  T as asText,
+  p as buildMergeTagEntries,
+  i as dynamicContentToMergeTags,
+  d as flattenDynamicContentList,
+  F as getCsrfToken,
+  $ as mergeTagToDynamicContent
 };

package/dist/utils/liquidDynamicContent.js

@@ -0,0 +1,15 @@
+const E = "time-format", r = "date", u = new RegExp(`^${r}\\s*:\\s*(?:"([^"]*)"|'([^']*)')$`), s = /%[-_0^#]?\d*[a-zA-Z%]/, c = new RegExp(s, "g"), l = /\b(?:Y{2,4}|M{2,4}|D{1,4}|d{3,4}|H{2}|h{2}|m{2}|s{2}|S{1,3}|A|a)\b/, T = (t) => t.includes('"') ? t.includes("'") ? null : `'${t}'` : `"${t}"`, i = (t) => s.test(t) && !l.test(t.replace(c, "")), R = (t) => {
+  if (t.key !== E || !i(t.value ?? ""))
+    return null;
+  const n = T(t.value);
+  return n === null ? null : `${r}: ${n}`;
+}, _ = (t) => {
+  const [, n, o] = t.match(u) ?? [], e = n ?? o;
+  return e ? { key: E, value: e } : null;
+};
+export {
+  E as TIME_FORMAT_KEY,
+  R as formatToLiquidFilter,
+  _ as liquidFilterToFormat,
+  T as quoteArgument
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@useinsider/guido",
-  "version": "3.18.0-beta.d542b1f",
+  "version": "3.18.0-beta.dc6c376",
   "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",