updated xhr error handling

.github/workflows/build.yaml

@@ -37,11 +37,15 @@ jobs:
             key: node_modules
             pattern: node_modules
 
-      -   name: Cache Artifacts
-          uses: ztimson/actions/cache@develop
+      -   name: Upload to Registry
+          uses: ztimson/actions/npm/publish@develop
+
+      -   name: Upload to NPM
+          uses: ztimson/actions/npm/publish@develop
           with:
-            key: dist
-            pattern: dist
+              owner: ztimson
+              registry: https://registry.npmjs.org/
+              token: ${{secrets.NPM_TOKEN}}
   tag:
     name: Tag Version
     needs: build
@@ -59,31 +63,3 @@ jobs:
           uses: ztimson/actions/tag@develop
           with:
             tag: ${{env.VERSION}}
-
-  publish:
-    name: Publish
-    needs: build
-    if: ${{github.ref_name}} == 'release'
-    runs-on: ubuntu-latest
-    container:
-      image: node
-      volumes:
-        - '/mnt/swarm/gitea/runner/cache:/cache'
-    steps:
-      -   name: Clone Repository
-          uses: ztimson/actions/clone@develop
-
-      -   name: Restore Artifacts
-          uses: ztimson/actions/cache/restore@develop
-          with:
-            key: dist
-
-      -   name: Upload to Registry
-          uses: ztimson/actions/npm/publish@develop
-
-      -   name: Upload to NPM
-          uses: ztimson/actions/npm/publish@develop
-          with:
-            owner: ztimson
-            registry: https://registry.npmjs.org/
-            token: ${{secrets.NPM_TOKEN}}

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.12.3",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",
@@ -12,6 +12,13 @@
 	"main": "./dist/utils.cjs",
 	"module": "./dist/utils.mjs",
 	"types": "./dist/index.d.ts",
+	"exports": {
+		".": {
+			"import": "./dist/utils.mjs",
+			"require": "./dist/utils.cjs",
+			"types": "./dist/index.d.ts"
+		}
+	},
 	"scripts": {
 		"build": "npx tsc && npx vite build",
 		"test": "npx jest",

src/objects.ts

@@ -35,6 +35,27 @@ export function deepCopy<T>(value: T): T {
 	return JSON.parse(JSON.stringify(value));
 }
 
+/**
+ * Merge any number of objects into the target
+ *
+ * @param target Destination of all properties
+ * @param sources Objects that will copied into target
+ * @return {any} The des
+ */
+export function deepMerge<T>(target: any, ...sources: any[]): T {
+	sources.forEach(s => {
+		for(const key in s) {
+			if(s[key] && typeof s[key] == 'object' && !Array.isArray(s[key])) {
+				if(!target[key]) target[key] = {};
+				deepMerge(target[key], s[key]);
+			} else {
+				target[key] = s[key];
+			}
+		}
+	});
+	return target;
+}
+
 /**
  * Get/set a property of an object using dot notation
  *

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);
-			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;
+			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;
+			}
+
+			const payload = await decode();
+			if(resp.ok) return payload;
+			throw Object.assign(new Error(typeof payload == 'string' ? payload : resp.statusText),
+				typeof payload == 'object' ? payload : {});
 		});
 	}
 }
-
-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);
-});