@useinsider/guido 3.14.0-beta.1e474dd → 3.14.0-beta.2bae355

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

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

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

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

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

@@ -1,46 +1,48 @@
-import { defineComponent as b, computed as e, onMounted as O, watch as t } from "vue";
+import { defineComponent as O, computed as e, onMounted as b, watch as t } from "vue";
 import u from "./AMPOnboarding.vue.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 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 { useOnboardingStore as _ } from "../../../stores/onboarding.js";
 import { usePreviewStore as A } from "../../../stores/preview.js";
-const G = /* @__PURE__ */ b({
+const R = /* @__PURE__ */ O({
   __name: "OnboardingWrapper",
   emits: ["onboarding-finished"],
   setup(H, { emit: f }) {
-    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 },
+    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 },
       { type: "ampOnboarding", component: u },
-      { 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();
+      { 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);
+      });
     }), t(
-      () => r.isVersionHistoryOpen,
-      (n, i) => {
-        n && !i && o.shouldShowOnboarding("versionHistoryOnboarding") && o.start("versionHistoryOnboarding"), !n && i && o.isActive("versionHistoryOnboarding") && o.close("versionHistoryOnboarding");
+      () => n.isVersionHistoryOpen,
+      (o, i) => {
+        o && !i && r.shouldShowOnboarding("versionHistoryOnboarding") && r.start("versionHistoryOnboarding"), !o && i && r.isActive("versionHistoryOnboarding") && r.close("versionHistoryOnboarding");
       }
     ), t(
       () => s.emailFormat,
-      (n, i) => {
-        i !== "AMP" && n === "AMP" && o.shouldShowOnboarding("ampOnboarding") && o.start("ampOnboarding");
+      (o, i) => {
+        i !== "AMP" && o === "AMP" && r.shouldShowOnboarding("ampOnboarding") && r.start("ampOnboarding");
       }
     ), t(
-      () => r.isPreviewModeOpen,
-      (n) => {
-        !n && o.isActive("ampOnboarding") && o.close("ampOnboarding");
+      () => n.isPreviewModeOpen,
+      (o) => {
+        !o && r.isActive("ampOnboarding") && r.close("ampOnboarding");
       }
-    ), { __sfc: !0, emit: f, onboardingStore: o, editorStore: r, previewStore: s, isTestPartner: a, isStripoReady: p, isTestPartnerActive: d, onboardingConfigs: m, shouldShow: c, visibleOnboardings: g };
+    ), { __sfc: !0, emit: f, onboardingStore: r, editorStore: n, previewStore: s, isTestPartner: a, isStripoReady: p, isTestPartnerActive: d, onboardingConfigs: m, shouldShow: c, visibleOnboardings: g };
   }
 });
 export {
-  G as default
+  R as default
 };

package/dist/{src/composables → composables}/useHtmlValidator.d.ts

@@ -14,9 +14,8 @@ export declare function parseRecommendationVariable(field: string): {
  * `{{recoId_index_attribute}}` variables: the built-in compiler attributes plus
  * each account attribute in its canonical token form — bare for
  * `defaultAttribute`, `product_attribute.<name>` for `productAttribute`. Using
- * `filterToProductAttrValue` (the same producer the block builder uses) keeps the
- * validator's notion of "valid form" identical to what is actually emitted, and
- * admits both forms when a default and a custom attribute share a name.
+ * `resolveProductAttrValue` (the same producer the block builder uses) keeps the
+ * validator's notion of "valid form" identical to what is actually emitted.
  */
 export declare function buildPartnerAttributeNameSet(filterList: FiltersResponse): Set<string>;
 /**

package/dist/composables/useHtmlValidator.js

@@ -6,7 +6,7 @@ import { ToasterTypeOptions as c } from "../enums/toaster.js";
 import { itemsBlockDynamicVariables as z } from "../extensions/Blocks/Items/enums/productEnums.js";
 import { RECOMMENDATION_VARIABLE_BUILTIN_ATTRIBUTES as Z } from "../extensions/Blocks/Recommendation/constants/selectors.js";
 import { useRecommendationExtensionStore as J } from "../extensions/Blocks/Recommendation/store/recommendation.js";
-import { filterToProductAttrValue as Q } from "../extensions/Blocks/Recommendation/utils/compositionKeys.js";
+import { resolveProductAttrValue as Q } from "../extensions/Blocks/Recommendation/templates/utils.js";
 import { RecommendationRequiredFieldsKey as ee } from "../extensions/Blocks/Recommendation/validation/requiredFields.js";
 import { useRecommendationStore as te } from "../stores/recommendation.js";
 import { base64EncodeWithSpecialChars as ne } from "../utils/base64.js";
@@ -14,25 +14,25 @@ import { useHttp as se } from "./useHttp.js";
 import { useToaster as re } from "./useToaster.js";
 import { useTranslations as oe } from "./useTranslations.js";
 const ie = /recommendation-id="(\d+)"/g;
-function ae(n) {
-  return [...n.matchAll(ie)].map((m) => m[1]);
+function ae(t) {
+  return [...t.matchAll(ie)].map((m) => m[1]);
 }
-function ce(n, m) {
-  return m.some((f) => n.startsWith(`${f}_`));
+function ce(t, m) {
+  return m.some((f) => t.startsWith(`${f}_`));
 }
 const le = /^(\d+)_\d+_(.+)$/;
-function me(n) {
-  const m = n.match(le);
+function me(t) {
+  const m = t.match(le);
   return m ? { recoId: m[1], attribute: m[2] } : null;
 }
-function ue(n) {
+function ue(t) {
   const m = new Set(Z);
-  return Object.values(n).forEach((f) => {
-    m.add(Q(f).toLowerCase());
+  return Object.values(t).forEach((f) => {
+    m.add(Q(f.attributeName, t).toLowerCase());
   }), m;
 }
-function de(n, m, f, o, d) {
-  const u = n.match(/{{([a-zA-Z0-9_.\s]*)}}/gm);
+function de(t, m, f, o, d) {
+  const u = t.match(/{{([a-zA-Z0-9_.\s]*)}}/gm);
   if (!u)
     return [];
   const p = new Set(m.map((h) => h.toLowerCase())), E = [];
@@ -50,15 +50,15 @@ function de(n, m, f, o, d) {
     ce(g, f) || g.includes(".") || E.push(g);
   }), E;
 }
-function fe(n) {
-  return (n.replace(U, "$1").match(j) ?? []).filter((o) => {
+function fe(t) {
+  return (t.replace(U, "$1").match(j) ?? []).filter((o) => {
     const d = o.slice(2, -2), u = d.indexOf("|"), p = (u === -1 ? d : d.slice(0, u)).trim();
     return q.includes(p) ? !1 : K.test(p) ? u !== -1 && d.slice(u + 1).trim() === "" : !0;
   });
 }
 const xe = () => {
   var b, S;
-  const { showToaster: n } = re(), { post: m } = se(), { config: f } = W(), o = oe(), d = te(), u = J(), p = ((S = (b = f.value) == null ? void 0 : b.partner) == null ? void 0 : S.messageType) === H.transactional, E = async (e) => {
+  const { showToaster: t } = re(), { post: m } = se(), { config: f } = W(), o = oe(), d = te(), u = J(), p = ((S = (b = f.value) == null ? void 0 : b.partner) == null ? void 0 : S.messageType) === H.transactional, E = async (e) => {
     if (e.size === 0)
       return /* @__PURE__ */ new Set();
     try {
@@ -68,59 +68,59 @@ const xe = () => {
     }
     return ue(u.filterList);
   }, h = async (e) => {
-    const t = await m(
+    const n = await m(
       "/newsletter/template-library/check-template-html-body",
       { html: ne(e) }
-    ), { status: r, message: a } = t.data;
-    return r || n({
+    ), { status: r, message: a } = n.data;
+    return r || t({
       type: c.Error,
       message: r === void 0 ? a : o("newsletter.invalid-url-link-for-toaster")
-    }), o($), a === o(Y) && n({
+    }), o($), a === o(Y) && t({
       type: c.Error,
       message: o("newsletter.already-in-progress")
     }), r;
   }, g = (e) => !["if", "endif", "else", "elif", "now"].includes(e.toLowerCase()), y = (e) => ["if", "endif"].includes(e.toLowerCase()), T = (e, s) => {
-    const t = e.match(/({%(.*?)%})/g);
+    const n = e.match(/({%(.*?)%})/g);
     let r = !0;
-    return t !== null && !p && t.forEach((a) => {
+    return n !== null && !p && n.forEach((a) => {
       const i = a.slice(2, -2).trim().match(/(".*?"|[^"\s]+)(?=\s*|\s*$)/g);
       if (i && i.length > 0) {
         const [l] = i;
-        g(l) && !s.includes(l) && (n({
+        g(l) && !s.includes(l) && (t({
           type: c.Warning,
           message: o("custom-fields.invalid-custom-fields")
         }), r = !1);
       }
     }), r;
-  }, w = async (e, s, t) => {
-    const r = t ? await h(e) : !0;
+  }, w = async (e, s, n) => {
+    const r = n ? await h(e) : !0;
     return T(e, s) && r;
-  }, R = (e) => e.length > 0 ? !0 : (n({
+  }, R = (e) => e.length > 0 ? !0 : (t({
     type: c.Warning,
     message: o("newsletter.html-content-is-empty")
   }), !1), _ = (e) => {
-    const s = (e.match(/{/gm) || []).length, t = (e.match(/}/gm) || []).length;
-    return s > t && n({
+    const s = (e.match(/{/gm) || []).length, n = (e.match(/}/gm) || []).length;
+    return s > n && t({
       type: c.Warning,
       message: o("custom-fields.missing-closing-braces")
-    }), s < t && n({
+    }), s < n && t({
       type: c.Warning,
       message: o("custom-fields.missing-opening-braces")
-    }), s === t;
+    }), s === n;
   }, N = (e) => {
     const s = fe(e).length === 0;
-    return s || n({
+    return s || t({
       type: c.Warning,
       message: o("custom-fields.invalid-custom-fields")
     }), s;
-  }, x = (e, s, t, r) => {
+  }, x = (e, s, n, r) => {
     if (p)
       return !0;
     const a = de(
       e,
       s,
       ae(e),
-      t,
+      n,
       r
     );
     if (a.length > 0) {
@@ -129,56 +129,56 @@ const xe = () => {
                     ${a.map((l) => `<li>${l}</li>`).join("")}
                 </ul>
             `;
-      return n({
+      return t({
         type: c.Error,
         message: o("custom-fields.invalid-custom-fields") + i
       }), !1;
     }
     return !0;
   }, O = (e) => {
-    const s = e.match(/{%(.*?)%}/g), t = [];
+    const s = e.match(/{%(.*?)%}/g), n = [];
     let r = !0;
     if (s && s.forEach((a) => {
       const i = a.match(P), l = a.match(X), v = (i == null ? void 0 : i.join("")) || "";
-      (!i || a !== v) && !l && (n({
+      (!i || a !== v) && !l && (t({
         type: c.Error,
         message: o("newsletter.display-conditions-invalid-syntax")
       }), r = !1), i && i.forEach((C) => {
-        C.trim() === "=" && (n({
+        C.trim() === "=" && (t({
           type: c.Error,
           message: o("custom-conditions.wrong-equality-operators")
         }), r = !1);
         const I = C.match(/^[a-zA-Z]*$/g);
         I && I.forEach((A) => {
-          y(A) && t.push(A);
+          y(A) && n.push(A);
         });
       });
-    }), t.length) {
-      const a = t.filter((l) => l === "if"), i = t.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 && (t({
         type: c.Error,
         message: o("custom-conditions.missing-if-endif-tag")
       }), r = !1);
     }
     return r;
   }, k = (e) => {
-    const s = (e.match(/{% /gm) || []).length, t = (e.match(/ %}/gm) || []).length, r = s === t;
-    return r || n({
+    const s = (e.match(/{% /gm) || []).length, n = (e.match(/ %}/gm) || []).length, r = s === n;
+    return r || t({
       type: c.Warning,
       message: o("custom-conditions.no-space-after-braces")
     }), r;
-  }, B = (e) => (e.match(/({%(.*?)%})/g) || []).filter((t) => t.includes("if")).map((t) => (t.match(/{{.*}}/gm) || []).length).reduce((t, r) => t + r, 0) > 0 ? (n({
+  }, B = (e) => (e.match(/({%(.*?)%})/g) || []).filter((n) => n.includes("if")).map((n) => (n.match(/{{.*}}/gm) || []).length).reduce((n, r) => n + r, 0) > 0 ? (t({
     type: c.Warning,
     message: o("custom-conditions.no-braces-inside-if-tag")
-  }), !1) : !0, D = () => u.hasInvalidBlock() ? (n({
+  }), !1) : !0, D = () => u.hasInvalidBlock() ? (t({
     type: c.Error,
     message: o(ee)
-  }), !1) : !0, F = () => d.recommendationConfigs && Object.values(d.recommendationConfigs).find((s) => s.filters.find((t) => t.value === "")) !== void 0 ? (n({
+  }), !1) : !0, F = () => d.recommendationConfigs && Object.values(d.recommendationConfigs).find((s) => s.filters.find((n) => n.value === "")) !== void 0 ? (t({
     type: c.Error,
     message: o("newsletter.fill-all-necessary-fields")
   }), !1) : !0, L = (e) => {
     const s = /src="[^"]*\.(svg|pst)"/gm;
-    return e.match(s) === null ? !0 : (n({
+    return e.match(s) === null ? !0 : (t({
       type: c.Error,
       message: o("newsletter.invalid-image-type")
     }), !1);
@@ -187,7 +187,7 @@ const xe = () => {
     return Array.from(r).find((i) => {
       var l;
       return !((l = i.id) != null && l.trim());
-    }) ? (n({
+    }) ? (t({
       type: c.Error,
       message: o("unsubscribe-templates.select-checkbox-groups")
     }), !1) : !0;
@@ -196,19 +196,19 @@ const xe = () => {
     return Array.from(r).find((i) => {
       var l;
       return !((l = i.id) != null && l.trim());
-    }) ? (n({
+    }) ? (t({
       type: c.Error,
       message: o("unsubscribe-templates.select-radio-button-groups")
     }), !1) : !0;
   };
-  return { validateHtml: async (e, s, t = !1) => {
+  return { validateHtml: async (e, s, n = !1) => {
     var v, C;
     const r = [
       ...s.map((I) => I.value),
       ...z,
       ...((C = (v = f.value) == null ? void 0 : v.template) == null ? void 0 : C.customFieldAttributes) ?? []
     ], a = G(e), i = await E(a);
-    return await w(e, r, t) && R(e) && _(e) && N(e) && x(e, r, a, i) && O(e) && k(e) && B(e) && D() && F() && L(e) && V(e) && M(e);
+    return await w(e, r, n) && R(e) && _(e) && N(e) && x(e, r, a, i) && O(e) && k(e) && B(e) && D() && F() && L(e) && V(e) && M(e);
   } };
 };
 export {

package/dist/{src/composables → composables}/useHttp.d.ts

@@ -17,6 +17,12 @@ export interface HttpError {
     statusText?: string;
     response?: Response;
 }
+export declare const TIMEOUT_ERROR_NAME = "TimeoutError";
+export interface TimeoutErrorContext {
+    url: string;
+    method: HttpMethod;
+    timeout: number;
+}
 export declare const useHttp: (defaultOptions?: HttpOptions) => {
     loading: import("vue").ComputedRef<boolean>;
     error: import("vue").ComputedRef<{

package/dist/composables/useHttp.js

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