@useinsider/guido 3.15.0-beta.3794b87 → 3.15.0-beta.3e8c8d2

package/dist/components/organisms/header/EditorActions.vue.js

@@ -15,7 +15,7 @@ var u = function() {
   p,
   !1,
   null,
-  "16e8682a"
+  "6e711fd7"
 );
 const v = c.exports;
 export {

package/dist/components/organisms/header/EditorActions.vue2.js

@@ -1,75 +1,66 @@
-import { defineComponent as q, ref as a, computed as h } from "vue";
-import { useActionsApi as D } from "../../../composables/useActionsApi.js";
+import { defineComponent as O, ref as n, computed as h } from "vue";
+import { useActionsApi as q } from "../../../composables/useActionsApi.js";
 import { useConfig as b } from "../../../composables/useConfig.js";
 import { useExport as k } from "../../../composables/useExport.js";
 import { useTestEmailClick as B } from "../../../composables/useGuidoActions.js";
-import { useHtmlCompiler as F } from "../../../composables/useHtmlCompiler.js";
-import { useSave as I } from "../../../composables/useSave.js";
-import { useToaster as L } from "../../../composables/useToaster.js";
-import { useTranslations as R } from "../../../composables/useTranslations.js";
-import { useVersionHistoryApi as z } from "../../../composables/useVersionHistoryApi.js";
-import { useLiquidValidator as G } from "../../../composables/validators/useLiquidValidator.js";
-import { ToasterTypeOptions as P } from "../../../enums/toaster.js";
-import { useEditorStore as U } from "../../../stores/editor.js";
-import { useTemplateStore as j } from "../../../stores/template.js";
-import { getTooltipOptions as J } from "../../../utils/tooltipUtils.js";
-import { InButtonV2 as K } from "@useinsider/design-system-vue";
-import { storeToRefs as N } from "pinia";
-import Q from "./MigrationConfirmModal.vue.js";
-const yo = /* @__PURE__ */ q({
+import { useHtmlCompiler as D } from "../../../composables/useHtmlCompiler.js";
+import { useSave as F } from "../../../composables/useSave.js";
+import { useTranslations as L } from "../../../composables/useTranslations.js";
+import { useVersionHistoryApi as R } from "../../../composables/useVersionHistoryApi.js";
+import { useLiquidValidator as z } from "../../../composables/validators/useLiquidValidator.js";
+import { useEditorStore as I } from "../../../stores/editor.js";
+import { useTemplateStore as P } from "../../../stores/template.js";
+import { getTooltipOptions as j } from "../../../utils/tooltipUtils.js";
+import { InButtonV2 as G } from "@useinsider/design-system-vue";
+import { storeToRefs as J } from "pinia";
+import K from "./MigrationConfirmModal.vue.js";
+const ut = /* @__PURE__ */ O({
   __name: "EditorActions",
-  setup(W, { expose: w }) {
-    const { config: n, isFeatureEnabled: l } = b(), { exportHtml: m } = k(), { save: c } = I(), { openVersionHistory: u, closeVersionHistory: p } = z(), { getCompiledEmail: f } = D(), { compileHtml: d } = F(), { validateLiquidSyntax: v } = G(), { showToaster: y } = L(), e = U(), g = j(), { hasMigrations: S } = N(g), r = R(), s = a(!1), i = a(!1), H = a(), T = B(), x = () => {
+  setup(N, { expose: x }) {
+    const { config: a, isFeatureEnabled: l } = b(), { exportHtml: m } = k(), { save: u } = F(), { openVersionHistory: c, closeVersionHistory: p } = R(), { getCompiledEmail: f } = q(), { compileHtml: d } = D(), { validateLiquidSyntax: v } = z(), e = I(), y = P(), { hasMigrations: g } = J(y), s = L(), i = n(!1), r = n(!1), S = n(), H = B(), T = () => {
       if (e.isVersionHistoryOpen) {
         p();
         return;
       }
-      u();
-    }, _ = async () => {
-      s.value = !0, await m(), s.value = !1;
-    }, A = () => {
+      c();
+    }, w = async () => {
+      i.value = !0, await m(), i.value = !1;
+    }, _ = () => {
       e.isSaveAsTemplateDrawerOpen = !0;
-    }, C = h(() => e.isVersionHistoryOpen ? r("newsletter.close-version-history") : r("newsletter.version-history")), O = h(
+    }, C = h(() => e.isVersionHistoryOpen ? s("newsletter.close-version-history") : s("newsletter.version-history")), A = h(
       () => {
-        var o, t;
-        return ((t = (o = n.value) == null ? void 0 : o.features) == null ? void 0 : t.versionHistory) && !e.isPreviewModeOpen;
+        var t, o;
+        return ((o = (t = a.value) == null ? void 0 : t.features) == null ? void 0 : o.versionHistory) && !e.isPreviewModeOpen;
       }
-    ), V = async (o) => {
-      i.value = !0, o || (e.loadingStatus = !0);
-      try {
-        const t = await c(o);
-        return !o && !t && (e.loadingStatus = !1), t;
-      } catch (t) {
-        console.error("[GUIDO_SAVE] save failed", t), o || (y({ type: P.Error, message: r("products.error-occurred") }), e.loadingStatus = !1);
+    ), V = async (t) => {
+      r.value = !0, t || (e.loadingStatus = !0);
+      const o = await u(t);
+      return r.value = !1, !t && !o && (e.loadingStatus = !1), o;
+    }, E = (t) => {
+      var o;
+      if (!t && g.value) {
+        (o = S.value) == null || o.open();
         return;
-      } finally {
-        i.value = !1;
       }
-    }, E = (o) => {
-      var t;
-      if (!o && S.value) {
-        (t = H.value) == null || t.open();
-        return;
-      }
-      return V(o);
+      return V(t);
     }, M = async () => {
       if (l("liquidSyntax")) {
         e.loadingStatus = !0;
         try {
-          const { html: o } = await f({ minimize: !0, resetDataSavedFlag: !1 }), { compiledHtml: t } = d(o);
-          if (!await v(t))
+          const { html: t } = await f({ minimize: !0, resetDataSavedFlag: !1 }), { compiledHtml: o } = d(t);
+          if (!await v(o))
             return;
         } finally {
           e.loadingStatus = !1;
         }
       }
-      T();
+      H();
     };
-    return w({
+    return x({
       handleSave: E
-    }), { __sfc: !0, config: n, isFeatureEnabled: l, exportHtml: m, save: c, openVersionHistory: u, closeVersionHistory: p, getCompiledEmail: f, compileHtml: d, validateLiquidSyntax: v, showToaster: y, editorStore: e, templateStore: g, hasMigrations: S, trans: r, isExporting: s, isSaving: i, migrationModalRef: H, testEmailClick: T, handleVersionHistory: x, handleExport: _, handleSaveAs: A, versionHistoryTooltipText: C, isVersionHistoryButtonVisible: O, executeSave: V, handleSave: E, handleTestEmail: M, getTooltipOptions: J, InButtonV2: K, MigrationConfirmModal: Q };
+    }), { __sfc: !0, config: a, isFeatureEnabled: l, exportHtml: m, save: u, openVersionHistory: c, closeVersionHistory: p, getCompiledEmail: f, compileHtml: d, validateLiquidSyntax: v, editorStore: e, templateStore: y, hasMigrations: g, trans: s, isExporting: i, isSaving: r, migrationModalRef: S, testEmailClick: H, handleVersionHistory: T, handleExport: w, handleSaveAs: _, versionHistoryTooltipText: C, isVersionHistoryButtonVisible: A, executeSave: V, handleSave: E, handleTestEmail: M, getTooltipOptions: j, InButtonV2: G, MigrationConfirmModal: K };
   }
 });
 export {
-  yo as default
+  ut as default
 };

package/dist/components/organisms/onboarding/OnboardingWrapper.vue2.js

@@ -1,48 +1,46 @@
-import { defineComponent as O, computed as e, onMounted as b, watch as t } from "vue";
+import { defineComponent as b, computed as e, onMounted as O, watch as t } from "vue";
 import u from "./AMPOnboarding.vue.js";
-import l from "./GenericOnboarding.vue.js";
-import v from "./ItemsOnboarding.vue.js";
-import h from "./NewVersionPopup.vue.js";
-import y from "./TextBlockOnboarding.vue.js";
-import S from "./VersionHistoryOnboarding.vue.js";
-import { usePartner as P } from "../../../composables/usePartner.js";
-import { useEditorStore as w } from "../../../stores/editor.js";
+import v from "./GenericOnboarding.vue.js";
+import l from "./ItemsOnboarding.vue.js";
+import y from "./NewVersionPopup.vue.js";
+import S from "./TextBlockOnboarding.vue.js";
+import h from "./VersionHistoryOnboarding.vue.js";
+import { usePartner as w } from "../../../composables/usePartner.js";
+import { useEditorStore as P } from "../../../stores/editor.js";
 import { useOnboardingStore as _ } from "../../../stores/onboarding.js";
 import { usePreviewStore as A } from "../../../stores/preview.js";
-const R = /* @__PURE__ */ O({
+const G = /* @__PURE__ */ b({
   __name: "OnboardingWrapper",
   emits: ["onboarding-finished"],
   setup(H, { emit: f }) {
-    const r = _(), n = w(), s = A(), { isTestPartner: a } = P(), p = e(() => n.isStripoInitialized), d = e(() => a()), m = [
-      { type: "newVersionPopup", component: h },
-      { type: "genericOnboarding", component: l },
-      { type: "textBlockOnboarding", component: y },
-      { type: "versionHistoryOnboarding", component: S },
+    const o = _(), r = P(), s = A(), { isTestPartner: a } = w(), p = e(() => r.isStripoInitialized), d = e(() => a()), m = [
+      { type: "newVersionPopup", component: y },
+      { type: "genericOnboarding", component: v },
+      { type: "textBlockOnboarding", component: S },
+      { type: "versionHistoryOnboarding", component: h },
       { type: "ampOnboarding", component: u },
-      { type: "itemsOnboarding", component: v }
-    ], c = (o) => d.value || !p.value ? !1 : o === "newVersionPopup" ? r.shouldShowOnboarding(o) : r.isActive(o), g = e(() => m.filter((o) => c(o.type)));
-    return b(() => {
-      r.fetchUserModalState().catch((o) => {
-        console.error("[GUIDO_ONBOARDING] user modal state prefetch failed", o);
-      });
+      { type: "itemsOnboarding", component: l }
+    ], c = (n) => d.value || !p.value ? !1 : n === "newVersionPopup" ? o.shouldShowOnboarding(n) : o.isActive(n), g = e(() => m.filter((n) => c(n.type)));
+    return O(async () => {
+      await o.fetchUserModalState();
     }), t(
-      () => n.isVersionHistoryOpen,
-      (o, i) => {
-        o && !i && r.shouldShowOnboarding("versionHistoryOnboarding") && r.start("versionHistoryOnboarding"), !o && i && r.isActive("versionHistoryOnboarding") && r.close("versionHistoryOnboarding");
+      () => r.isVersionHistoryOpen,
+      (n, i) => {
+        n && !i && o.shouldShowOnboarding("versionHistoryOnboarding") && o.start("versionHistoryOnboarding"), !n && i && o.isActive("versionHistoryOnboarding") && o.close("versionHistoryOnboarding");
       }
     ), t(
       () => s.emailFormat,
-      (o, i) => {
-        i !== "AMP" && o === "AMP" && r.shouldShowOnboarding("ampOnboarding") && r.start("ampOnboarding");
+      (n, i) => {
+        i !== "AMP" && n === "AMP" && o.shouldShowOnboarding("ampOnboarding") && o.start("ampOnboarding");
       }
     ), t(
-      () => n.isPreviewModeOpen,
-      (o) => {
-        !o && r.isActive("ampOnboarding") && r.close("ampOnboarding");
+      () => r.isPreviewModeOpen,
+      (n) => {
+        !n && o.isActive("ampOnboarding") && o.close("ampOnboarding");
       }
-    ), { __sfc: !0, emit: f, onboardingStore: r, editorStore: n, previewStore: s, isTestPartner: a, isStripoReady: p, isTestPartnerActive: d, onboardingConfigs: m, shouldShow: c, visibleOnboardings: g };
+    ), { __sfc: !0, emit: f, onboardingStore: o, editorStore: r, previewStore: s, isTestPartner: a, isStripoReady: p, isTestPartnerActive: d, onboardingConfigs: m, shouldShow: c, visibleOnboardings: g };
   }
 });
 export {
-  R as default
+  G as default
 };

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/composables/useHttp.js

@@ -1,119 +1,86 @@
-import { getCsrfToken as k } from "../utils/genericUtil.js";
-import { ref as w, computed as C } from "vue";
-const F = "TimeoutError", I = ($ = {}) => {
-  const T = w(!1), i = w(null), E = w(null), P = C(() => T.value), x = C(() => i.value !== null), A = {
+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": k()
+      "X-CSRF-TOKEN": H()
     },
-    ...$
-  }, L = (e, t) => {
+    ...b
+  }, w = (e, s) => {
     if (e.startsWith("http://") || e.startsWith("https://"))
       return e;
-    const r = t || A.baseURL || "";
-    return r.endsWith("/") && e.startsWith("/") ? `${r}${e.slice(1)}` : r.endsWith("/") || e.startsWith("/") ? `${r}${e}` : `${r}/${e}`;
-  }, O = (e, t, r, d) => {
-    let o;
-    return { promise: new Promise((m, a) => {
-      o = setTimeout(() => {
-        const l = new Error(
-          `Request timeout after ${e}ms: ${t} ${r.split("?")[0]}`
-        );
-        l.name = F, l.url = r, l.method = t, l.timeout = e, a(l), d.abort(l);
-      }, e);
-    }), clear: () => clearTimeout(o) };
-  }, b = (e) => {
-    if (e instanceof Error)
-      return e;
-    const t = new Error(typeof e == "string" ? e : "Request was cancelled");
-    return t.name = "AbortError", t;
-  }, U = (e, t) => {
-    let r;
-    return new Promise((d, o) => {
-      if (t.aborted) {
-        o(b(t.reason));
-        return;
-      }
-      const c = () => {
-        clearTimeout(r), o(b(t.reason));
-      };
-      r = setTimeout(() => {
-        t.removeEventListener("abort", c), d();
-      }, e), t.addEventListener("abort", c, { once: !0 });
-    });
-  }, u = async (e, t, r, d = {}) => {
-    i.value = null, T.value = !0;
-    const o = { ...A, ...d }, c = L(t, o.baseURL), m = {
+    const t = s || v.baseURL || "";
+    return t.endsWith("/") && e.startsWith("/") ? `${t}${e.slice(1)}` : t.endsWith("/") || e.startsWith("/") ? `${t}${e}` : `${t}/${e}`;
+  }, P = (e) => new Promise((s, t) => {
+    setTimeout(() => {
+      t(new Error("Request timeout"));
+    }, e);
+  }), 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: { ...o.headers },
-      ...o
+      headers: { ...n.headers },
+      signal: u.value.signal,
+      ...n
     };
-    r && ["POST", "PUT", "PATCH"].includes(e) && (r instanceof FormData ? (delete m.headers["Content-Type"], m.body = r) : m.body = JSON.stringify(r));
-    const a = new AbortController();
-    E.value = a;
-    const l = async (v = 0) => {
-      const h = new AbortController(), g = () => h.abort(a.signal.reason);
-      a.signal.aborted ? g() : a.signal.addEventListener("abort", g, { once: !0 });
-      const R = { ...m, signal: h.signal }, y = o.timeout ? O(o.timeout, e, c, h) : null;
+    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 s = await (y ? Promise.race([fetch(c, R), y.promise]).finally(y.clear) : fetch(c, R));
-        if (!s.ok) {
-          const j = `HTTP Error: ${s.status} ${s.statusText}`, p = new Error(j);
-          throw p.status = s.status, p.statusText = s.statusText, p.response = s, p;
+        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 n = s.headers.get("content-type");
-        return n != null && n.includes("application/json") ? f = await s.json() : n != null && n.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 (s) {
-        const f = s instanceof Error && s.name === "AbortError";
-        let n = s;
-        if (v < (o.retry || 0) && !f) {
-          if (await U(o.retryDelay || 1e3, a.signal).catch(() => {
-          }), !a.signal.aborted)
-            return await l(v + 1);
-          n = b(a.signal.reason);
-        }
-        throw n instanceof Error ? n.name === "AbortError" ? i.value = { message: "Request was cancelled" } : i.value = { message: n.message } : i.value = n, n;
-      } finally {
-        a.signal.removeEventListener("abort", g);
+      } catch (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 l();
+      return await E();
     } finally {
-      T.value = !1, E.value = null;
+      h.value = !1, u.value = null;
     }
-  }, H = (e, t) => u("GET", e, void 0, t), W = (e, t, r) => u("POST", e, t, r), q = (e, t, r) => u("PUT", e, t, r), D = (e, t, r) => u("PATCH", e, t, r), S = (e, t) => u("DELETE", e, void 0, t), N = (e) => {
-    E.value && E.value.abort(b(e));
-  }, _ = () => {
-    i.value = null;
+  }, 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 = () => {
+    a.value = null;
   };
   return {
     // State
-    loading: P,
-    error: C(() => i.value),
-    hasError: x,
+    loading: g,
+    error: T(() => a.value),
+    hasError: y,
     // Methods
-    request: u,
-    get: H,
-    post: W,
-    put: q,
-    patch: D,
-    delete: S,
-    cancel: N,
-    clearError: _
+    request: i,
+    get: C,
+    post: $,
+    put: R,
+    patch: U,
+    delete: A,
+    cancel: W,
+    clearError: q
   };
 };
 export {
-  F as TIMEOUT_ERROR_NAME,
-  I as useHttp
+  k as useHttp
 };