@ribbon-studios/js-utils 2.1.0 → 3.0.0

package/README.md

@@ -27,7 +27,8 @@ Collection of generic javascript utilities curated by the Ribbon Studios Team~
     - [`rfetch.post`](#rfetchpost)
     - [`rfetch.patch`](#rfetchpatch)
     - [`rfetch.delete`](#rfetchdelete)
-    - [`rfetch.interceptors`](#rfetchinterceptors)
+    - [`rfetch.interceptors.request`](#rfetchinterceptorsrequest)
+    - [`rfetch.interceptors.reject`](#rfetchinterceptorsreject)
     - [`rfetch.delimiters`](#rfetchdelimiters)
 
 ## Promises
@@ -206,7 +207,7 @@ import { rfetch, type RibbonFetchError } from '@ribbon-studios/js-utils';
 await rfetch.delete<MyExpectedResponse>('https://ribbonstudios.com');
 ```
 
-### `rfetch.interceptors`
+### `rfetch.interceptors.request`
 
 Useful for enhancing requests with additional information
 
@@ -217,9 +218,25 @@ const interceptor = (url: URL, options: RequestInit): RequestInit | Promise<Requ
   return options; // Return the modified options!
 };
 
-rfetch.interceptors.add(interceptor); // Add the interceptor
-rfetch.interceptors.remove(interceptor); // Remove the interceptor
-rfetch.interceptors.clear(); // Clear all interceptors
+rfetch.interceptors.request.add(interceptor); // Add the interceptor
+rfetch.interceptors.request.remove(interceptor); // Remove the interceptor
+rfetch.interceptors.request.clear(); // Clear all interceptors
+```
+
+### `rfetch.interceptors.reject`
+
+Useful for handling special cases when a failed request occurs
+
+```tsx
+import { rfetch, type RibbonFetchError } from '@ribbon-studios/js-utils';
+
+const interceptor = (url: URL, error: RibbonFetchError): RibbonFetchError | Promise<RibbonFetchError> => {
+  return error; // Return the modified error!
+};
+
+rfetch.interceptors.reject.add(interceptor); // Add the interceptor
+rfetch.interceptors.reject.remove(interceptor); // Remove the interceptor
+rfetch.interceptors.reject.clear(); // Clear all interceptors
 ```
 
 ### `rfetch.delimiters`

package/dist/index.cjs

@@ -53,7 +53,10 @@ var DelimiterType = /* @__PURE__ */ ((DelimiterType2) => {
   DelimiterType2[DelimiterType2["DUPLICATE"] = 1] = "DUPLICATE";
   return DelimiterType2;
 })(DelimiterType || {});
-let fetchInterceptors = [];
+const fetchInterceptors = {
+  request: [],
+  reject: []
+};
 let delimiter = 1;
 async function rfetch(url, { params, body, ...options } = {}) {
   var _a, _b;
@@ -97,20 +100,25 @@ async function rfetch(url, { params, body, ...options } = {}) {
   }
   const response = await fetch(
     internalURL,
-    await fetchInterceptors.reduce(
+    await fetchInterceptors.request.reduce(
       async (output, interceptor) => await interceptor(internalURL, await output),
       Promise.resolve(requestInit)
     )
   );
   const content = ((_b = (_a = response.headers.get("Content-Type")) == null ? void 0 : _a.toLowerCase()) == null ? void 0 : _b.includes("json")) ? await response.json() : await response.text();
   if (response.ok) {
+    if (response.status === 204) return void 0;
     return content;
   }
+  const error = new RibbonFetchError({
+    status: response.status,
+    content
+  });
   return Promise.reject(
-    new RibbonFetchError({
-      status: response.status,
-      content
-    })
+    await fetchInterceptors.reject.reduce(
+      async (output, interceptor) => await interceptor(internalURL, await output),
+      Promise.resolve(error)
+    )
   );
 }
 rfetch.delete = (url, options) => {
@@ -157,16 +165,35 @@ rfetch.delete = (url, options) => {
   }
   rfetch2.delimiters = delimiters;
   rfetch2.interceptors = {
-    add(interceptor) {
-      fetchInterceptors.push(interceptor);
+    request: {
+      add(interceptor) {
+        fetchInterceptors.request.push(interceptor);
+      },
+      remove(interceptor) {
+        const index = fetchInterceptors.request.indexOf(interceptor);
+        if (index === -1) return;
+        fetchInterceptors.request.splice(index, 1);
+      },
+      clear() {
+        fetchInterceptors.request = [];
+      }
     },
-    remove(interceptor) {
-      const index = fetchInterceptors.indexOf(interceptor);
-      if (index === -1) return;
-      fetchInterceptors.splice(index, 1);
+    reject: {
+      add(interceptor) {
+        fetchInterceptors.reject.push(interceptor);
+      },
+      remove(interceptor) {
+        const index = fetchInterceptors.reject.indexOf(interceptor);
+        if (index === -1) return;
+        fetchInterceptors.reject.splice(index, 1);
+      },
+      clear() {
+        fetchInterceptors.reject = [];
+      }
     },
     clear() {
-      fetchInterceptors = [];
+      fetchInterceptors.reject = [];
+      fetchInterceptors.request = [];
     }
   };
   ((is2) => {

package/dist/index.js

@@ -51,7 +51,10 @@ var DelimiterType = /* @__PURE__ */ ((DelimiterType2) => {
   DelimiterType2[DelimiterType2["DUPLICATE"] = 1] = "DUPLICATE";
   return DelimiterType2;
 })(DelimiterType || {});
-let fetchInterceptors = [];
+const fetchInterceptors = {
+  request: [],
+  reject: []
+};
 let delimiter = 1;
 async function rfetch(url, { params, body, ...options } = {}) {
   var _a, _b;
@@ -95,20 +98,25 @@ async function rfetch(url, { params, body, ...options } = {}) {
   }
   const response = await fetch(
     internalURL,
-    await fetchInterceptors.reduce(
+    await fetchInterceptors.request.reduce(
       async (output, interceptor) => await interceptor(internalURL, await output),
       Promise.resolve(requestInit)
     )
   );
   const content = ((_b = (_a = response.headers.get("Content-Type")) == null ? void 0 : _a.toLowerCase()) == null ? void 0 : _b.includes("json")) ? await response.json() : await response.text();
   if (response.ok) {
+    if (response.status === 204) return void 0;
     return content;
   }
+  const error = new RibbonFetchError({
+    status: response.status,
+    content
+  });
   return Promise.reject(
-    new RibbonFetchError({
-      status: response.status,
-      content
-    })
+    await fetchInterceptors.reject.reduce(
+      async (output, interceptor) => await interceptor(internalURL, await output),
+      Promise.resolve(error)
+    )
   );
 }
 rfetch.delete = (url, options) => {
@@ -155,16 +163,35 @@ rfetch.delete = (url, options) => {
   }
   rfetch2.delimiters = delimiters;
   rfetch2.interceptors = {
-    add(interceptor) {
-      fetchInterceptors.push(interceptor);
+    request: {
+      add(interceptor) {
+        fetchInterceptors.request.push(interceptor);
+      },
+      remove(interceptor) {
+        const index = fetchInterceptors.request.indexOf(interceptor);
+        if (index === -1) return;
+        fetchInterceptors.request.splice(index, 1);
+      },
+      clear() {
+        fetchInterceptors.request = [];
+      }
     },
-    remove(interceptor) {
-      const index = fetchInterceptors.indexOf(interceptor);
-      if (index === -1) return;
-      fetchInterceptors.splice(index, 1);
+    reject: {
+      add(interceptor) {
+        fetchInterceptors.reject.push(interceptor);
+      },
+      remove(interceptor) {
+        const index = fetchInterceptors.reject.indexOf(interceptor);
+        if (index === -1) return;
+        fetchInterceptors.reject.splice(index, 1);
+      },
+      clear() {
+        fetchInterceptors.reject = [];
+      }
     },
     clear() {
-      fetchInterceptors = [];
+      fetchInterceptors.reject = [];
+      fetchInterceptors.request = [];
     }
   };
   ((is2) => {

package/dist/rfetch.d.ts

@@ -14,7 +14,9 @@ export declare class RibbonFetchError<R> extends Error {
         content: R;
     });
 }
-export type RibbonFetchInterceptor = (url: URL, options: RequestInit) => RequestInit | Promise<RequestInit>;
+export type RibbonRequestInterceptor = (url: URL, options: RequestInit) => RequestInit | Promise<RequestInit>;
+export type RibbonResolveInterceptor = (url: URL, options: RequestInit) => RequestInit | Promise<RequestInit>;
+export type RibbonRejectInterceptor = (url: URL, error: RibbonFetchError<any>) => RibbonFetchError<any> | Promise<RibbonFetchError<any>>;
 export declare enum DelimiterType {
     COMMA = 0,
     DUPLICATE = 1
@@ -75,8 +77,16 @@ export declare namespace rfetch {
     function remove<T>(url: string | URL, options?: RibbonFetchBodyOptions): Promise<T>;
     function delimiters(type: DelimiterType): Promise<void>;
     const interceptors: {
-        add(interceptor: RibbonFetchInterceptor): void;
-        remove(interceptor: RibbonFetchInterceptor): void;
+        request: {
+            add(interceptor: RibbonRequestInterceptor): void;
+            remove(interceptor: RibbonRequestInterceptor): void;
+            clear(): void;
+        };
+        reject: {
+            add(interceptor: RibbonRejectInterceptor): void;
+            remove(interceptor: RibbonRejectInterceptor): void;
+            clear(): void;
+        };
         clear(): void;
     };
     namespace is {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ribbon-studios/js-utils",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "description": "Collection of generic javascript utilities curated by the Rainbow Cafe~",
   "type": "module",
   "source": "src/*.ts",