Added query & fragment to xhr

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.4.0",
+	"version": "0.10.4",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@ztimson/utils",
-			"version": "0.4.0",
+			"version": "0.10.4",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.12",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.10.1",
+	"version": "0.11.0",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",

src/xhr.ts

@@ -1,17 +1,11 @@
-import {
-	BadRequestError,
-	CustomError,
-	ForbiddenError,
-	InternalServerError,
-	NotFoundError,
-	UnauthorizedError
-} from './errors.ts';
 import {clean} from './objects';
 
 export type Interceptor = (request: Response, next: () => void) => void;
 
 export type RequestOptions = {
 	url?: string;
+	fragment?: string;
+	query?: {key: string, value: string}[] | {[key: string]: string};
 	method?: 'GET' | 'POST' | 'PATCH' | 'DELETE';
 	body?: any;
 	headers?: {[key: string | symbol]: string | null | undefined};
@@ -55,7 +49,13 @@ export class XHR {
 
 	async request<T>(opts: RequestOptions = {}): Promise<T>  {
 		if(!this.opts.url && !opts.url) throw new Error('URL needs to be set');
-		const url = (opts.url?.startsWith('http') ? opts.url : (this.opts.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
+		let url = (opts.url?.startsWith('http') ? opts.url : (this.opts.url || '') + (opts.url || '')).replace(/([^:]\/)\/+/g, '$1');
+		if(opts.fragment) url.includes('#') ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += '#' + opts.fragment;
+		if(opts.query) {
+			const q = Array.isArray(opts.query) ? opts.query :
+				Object.keys(opts.query).map(k => ({key: k, value: (<any>opts.query)[k]}))
+			url += (url.includes('?') ? '&' : '?') + q.map(q => `${q.key}=${q.value}`).join('&');
+		}
 
 		// Prep headers
 		const headers = <any>clean({
@@ -75,21 +75,16 @@ export class XHR {
 				await new Promise<void>(res => fn(resp, () => res()));
 			}
 
-			if(!resp.ok) throw new Error(resp.statusText);
+			const decode = async () => {
 				if(!opts.skipConverting && resp.headers.get('Content-Type')?.startsWith('application/json')) return await resp.json();
 				if(!opts.skipConverting && resp.headers.get('Content-Type')?.startsWith('text/plain')) return await <any>resp.text();
 				return resp;
-		});
-	}
 			}
 
-XHR.addInterceptor((resp: Response, next: () => void) => {
-	const getErr = (e: any) => e.error?.message || e.reason?.message || e.message || e.statusText || e.toString();
-	if(resp.status == 200) return next();
-	if(resp.status == 400) throw new BadRequestError(getErr(resp));
-	if(resp.status == 401) throw new UnauthorizedError(getErr(resp));
-	if(resp.status == 403) throw new ForbiddenError(getErr(resp));
-	if(resp.status == 404) throw new NotFoundError(getErr(resp));
-	if(resp.status == 500) throw new InternalServerError(getErr(resp));
-	throw new CustomError(getErr(resp), resp.status);
+			const payload = await decode();
+			if(resp.ok) return payload;
+			const text = resp.statusText || (typeof payload == 'string' ? payload : null);
+			throw (text ? new Error(text) : payload);
 		});
+	}
+}