@noxickon/onyx 6.3.0 → 6.5.0

package/dist/rest/executors/restExecutor.js

@@ -1,48 +1,49 @@
 import { formErrors as e } from "../../hooks/useForm/useForm.js";
+import { OxRestError as t } from "./OxRestError.js";
 //#region src/rest/executors/restExecutor.ts
-var t = (e) => typeof Blob < "u" && e instanceof Blob, n = (e) => typeof FileList < "u" && e instanceof FileList;
-function r(e) {
-	return t(e) || n(e) ? !0 : Array.isArray(e) ? e.some((e) => r(e)) : typeof e == "object" && e ? Object.values(e).some((e) => r(e)) : !1;
+var n = (e) => typeof Blob < "u" && e instanceof Blob, r = (e) => typeof FileList < "u" && e instanceof FileList;
+function i(e) {
+	return n(e) || r(e) ? !0 : Array.isArray(e) ? e.some((e) => i(e)) : typeof e == "object" && e ? Object.values(e).some((e) => i(e)) : !1;
 }
-function i(e, r, a) {
-	if (a !== void 0) {
-		if (a === null) {
-			e.append(r, "");
+function a(e, t, i) {
+	if (i !== void 0) {
+		if (i === null) {
+			e.append(t, "");
 			return;
 		}
-		if (t(a)) {
-			e.append(r, a);
+		if (n(i)) {
+			e.append(t, i);
 			return;
 		}
-		if (n(a)) {
-			[...a].forEach((t, n) => i(e, `${r}[${n}]`, t));
+		if (r(i)) {
+			[...i].forEach((n, r) => a(e, `${t}[${r}]`, n));
 			return;
 		}
-		if (Array.isArray(a)) {
-			a.forEach((t, n) => i(e, `${r}[${n}]`, t));
+		if (Array.isArray(i)) {
+			i.forEach((n, r) => a(e, `${t}[${r}]`, n));
 			return;
 		}
-		if (a instanceof Date) {
-			e.append(r, a.toISOString());
+		if (i instanceof Date) {
+			e.append(t, i.toISOString());
 			return;
 		}
-		if (typeof a == "object") {
-			for (let [t, n] of Object.entries(a)) i(e, `${r}[${t}]`, n);
+		if (typeof i == "object") {
+			for (let [n, r] of Object.entries(i)) a(e, `${t}[${n}]`, r);
 			return;
 		}
-		if (typeof a == "boolean") {
-			e.append(r, a ? "1" : "0");
+		if (typeof i == "boolean") {
+			e.append(t, i ? "1" : "0");
 			return;
 		}
-		e.append(r, String(a));
+		e.append(t, String(i));
 	}
 }
-function a(e) {
+function o(e) {
 	let t = new FormData();
-	for (let [n, r] of Object.entries(e)) i(t, n, r);
+	for (let [n, r] of Object.entries(e)) a(t, n, r);
 	return t;
 }
-function o(e) {
+function s(e) {
 	let t = new URLSearchParams(), n = (e, r) => {
 		if (!(r == null || r === "")) {
 			if (Array.isArray(r)) {
@@ -60,94 +61,101 @@ function o(e) {
 	for (let [t, r] of Object.entries(e)) n(t, r);
 	return t.toString();
 }
-var s = (e, t) => e !== 422 || typeof t != "object" || !t ? null : t.errors ?? t;
-function c(t, n, r) {
-	let i = r(t, n);
-	if (i === null) throw Error(`restExecutor: received HTTP ${t} but parseErrors produced no field errors`);
-	return e(i);
+var c = (e, t) => e !== 422 || typeof t != "object" || !t ? null : t.errors ?? t;
+function l(n, r, i) {
+	let a = i(n, r);
+	if (a === null) throw new t(n, r);
+	return e(a);
 }
-function l(e, t) {
-	return t.length === 0 ? null : e?.includes("application/json") ? JSON.parse(t) : t;
+var u = (e) => e?.includes("application/json") === !0 || e?.includes("application/problem+json") === !0;
+function d(e, t) {
+	if (t.length === 0) return null;
+	if (u(e)) return JSON.parse(t);
+	try {
+		return JSON.parse(t);
+	} catch {
+		return t;
+	}
 }
-function u(e, t, n, r, i, o, s) {
-	let { onProgress: u, signal: d } = s;
-	return new Promise((s, f) => {
-		if (d.aborted) {
-			f(new DOMException("Aborted", "AbortError"));
+function f(e, n, r, i, a, s, c) {
+	let { onProgress: u, signal: f } = c;
+	return new Promise((c, p) => {
+		if (f.aborted) {
+			p(new DOMException("Aborted", "AbortError"));
 			return;
 		}
-		let p = new XMLHttpRequest();
-		p.open(e, t), p.withCredentials = i;
-		for (let [e, t] of Object.entries(r)) p.setRequestHeader(e, t);
-		let m = () => p.abort();
-		d.addEventListener("abort", m), p.upload.addEventListener("progress", (e) => {
+		let m = new XMLHttpRequest();
+		m.open(e, n), m.withCredentials = a;
+		for (let [e, t] of Object.entries(i)) m.setRequestHeader(e, t);
+		let h = () => m.abort();
+		f.addEventListener("abort", h), m.upload.addEventListener("progress", (e) => {
 			let t = {
 				loaded: e.loaded,
 				total: e.lengthComputable ? e.total : void 0,
 				percentage: e.lengthComputable ? Math.round(e.loaded * 100 / e.total) : void 0
 			};
 			u?.(t);
-		}), p.addEventListener("abort", () => {
-			d.removeEventListener("abort", m), f(new DOMException("Aborted", "AbortError"));
-		}), p.addEventListener("error", () => {
-			d.removeEventListener("abort", m), f(/* @__PURE__ */ Error("Network request failed"));
-		}), p.addEventListener("load", () => {
-			d.removeEventListener("abort", m);
+		}), m.addEventListener("abort", () => {
+			f.removeEventListener("abort", h), p(new DOMException("Aborted", "AbortError"));
+		}), m.addEventListener("error", () => {
+			f.removeEventListener("abort", h), p(/* @__PURE__ */ Error("Network request failed"));
+		}), m.addEventListener("load", () => {
+			f.removeEventListener("abort", h);
 			let e;
 			try {
-				e = l(p.getResponseHeader("Content-Type"), p.responseText);
+				e = d(m.getResponseHeader("Content-Type"), m.responseText);
 			} catch (e) {
-				f(e instanceof Error ? e : /* @__PURE__ */ Error("Failed to parse response"));
+				p(e instanceof Error ? e : /* @__PURE__ */ Error("Failed to parse response"));
 				return;
 			}
-			if (p.status === 422) {
+			if (m.status === 422) {
 				try {
-					s(c(422, e, o));
+					c(l(422, e, s));
 				} catch (e) {
-					f(e instanceof Error ? e : /* @__PURE__ */ Error("Failed to map validation error"));
+					p(e instanceof Error ? e : /* @__PURE__ */ Error("Failed to map validation error"));
 				}
 				return;
 			}
-			if (p.status < 200 || p.status >= 300) {
-				f(/* @__PURE__ */ Error(`HTTP ${p.status}`));
+			if (m.status < 200 || m.status >= 300) {
+				p(new t(m.status, e));
 				return;
 			}
-			s(e);
-		}), p.send(a(n));
+			c(e);
+		}), m.send(o(r));
 	});
 }
-function d(e, t = {}) {
-	let { credentials: n = "same-origin", forceFormData: i = !1, headers: a, parseErrors: d } = t, f = d ?? s;
-	return async (t) => {
-		let { method: s = "post", payload: d, signal: p, url: m } = t, h = m ?? e;
-		if (!h) throw Error("restExecutor: no url provided (pass it to restExecutor or to the method)");
-		let g = s.toUpperCase(), _ = g === "GET" || g === "HEAD", v = typeof a == "function" ? a(d) : a ?? {};
-		if (!_ && (i || r(d))) return u(g, h, d, v, n === "include", f, t);
-		if (_) {
-			let e = o(d), t = await fetch(e ? `${h}?${e}` : h, {
-				method: g,
-				headers: v,
-				credentials: n,
-				signal: p
-			}), r = l(t.headers.get("Content-Type"), await t.text());
-			if (t.status === 422) return c(422, r, f);
-			if (!t.ok) throw Error(`HTTP ${t.status}`);
-			return r;
+function p(e, n = {}) {
+	let { credentials: r = "same-origin", forceFormData: a = !1, headers: o, parseErrors: u } = n, p = u ?? c;
+	return async (n) => {
+		let { method: c = "post", payload: u, signal: m, url: h } = n, g = h ?? e;
+		if (!g) throw Error("restExecutor: no url provided (pass it to restExecutor or to the method)");
+		let _ = c.toUpperCase(), v = _ === "GET" || _ === "HEAD", y = typeof o == "function" ? o(u) : o ?? {};
+		if (!v && (a || i(u))) return f(_, g, u, y, r === "include", p, n);
+		if (v) {
+			let e = s(u), n = await fetch(e ? `${g}?${e}` : g, {
+				method: _,
+				headers: y,
+				credentials: r,
+				signal: m
+			}), i = d(n.headers.get("Content-Type"), await n.text());
+			if (n.status === 422) return l(422, i, p);
+			if (!n.ok) throw new t(n.status, i);
+			return i;
 		}
-		let y = await fetch(h, {
-			method: g,
+		let b = await fetch(g, {
+			method: _,
 			headers: {
 				"Content-Type": "application/json",
-				...v
+				...y
 			},
-			body: JSON.stringify(d),
-			credentials: n,
-			signal: p
-		}), b = l(y.headers.get("Content-Type"), await y.text());
-		if (y.status === 422) return c(422, b, f);
-		if (!y.ok) throw Error(`HTTP ${y.status}`);
-		return b;
+			body: JSON.stringify(u),
+			credentials: r,
+			signal: m
+		}), x = d(b.headers.get("Content-Type"), await b.text());
+		if (b.status === 422) return l(422, x, p);
+		if (!b.ok) throw new t(b.status, x);
+		return x;
 	};
 }
 //#endregion
-export { d as restExecutor };
+export { p as restExecutor };

package/dist/rest/index.d.ts

@@ -1,2 +1,3 @@
+export { OxRestError } from './executors/OxRestError';
 export { restExecutor } from './executors/restExecutor';
 export type { RestExecutorOptions } from './executors/restExecutor.types';

package/dist/rest.js

@@ -1,2 +1,3 @@
-import { restExecutor as e } from "./rest/executors/restExecutor.js";
-export { e as restExecutor };
+import { OxRestError as e } from "./rest/executors/OxRestError.js";
+import { restExecutor as t } from "./rest/executors/restExecutor.js";
+export { e as OxRestError, t as restExecutor };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noxickon/onyx",
-  "version": "6.3.0",
+  "version": "6.5.0",
   "type": "module",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",