@thepassle/app-tools 1.0.1 → 1.1.1

package/api/index.js

@@ -31,7 +31,7 @@ function handleStatus(response) {
  *  plugins: [
  *    {
  *      beforeFetch: ({url, method, opts, data}) => {},
- *      afterFetch: (res) => res,
+ *      afterFetch: ({response}) => response,
  *    }
  *  ]
  *});
@@ -131,22 +131,22 @@ export class Api {
         ...(opts?.signal ? { signal: opts.signal } : {}),
       })
         /** [PLUGINS - AFTERFETCH] */
-        .then(async (res) => {
+        .then(async (response) => {
           for (const plugin of plugins) {
             try {
-              const afterFetchResult =
-                (await plugin?.afterFetch?.(res, {
-                  responseType,
-                  headers,
-                  fetchFn,
-                  baseURL,
-                  url,
-                  method,
-                  opts,
-                  data,
-                })) ?? res;
+              const afterFetchResult = await plugin?.afterFetch?.({
+                responseType,
+                headers,
+                fetchFn,
+                baseURL,
+                url,
+                method,
+                opts,
+                data,
+                response,
+              });
               if (afterFetchResult) {
-                res = afterFetchResult;
+                response = afterFetchResult;
               }
             } catch (e) {
               log(`Plugin "${plugin.name}" error on afterFetch hook`);
@@ -154,12 +154,12 @@ export class Api {
             }
           }
 
-          return res;
+          return response;
         })
         /** [STATUS] */
         .then(handleStatus)
         /** [RESPONSETYPE] */
-        .then((res) => res[responseType]())
+        .then((response) => response[responseType]())
         .then(async (data) => {
           for (const plugin of plugins) {
             try {

package/api/plugins/abort.js

@@ -6,12 +6,12 @@ export function abortPlugin() {
   const requests = new Map();
 
   return {
-    name: 'abort',
+    name: "abort",
     beforeFetch: (meta) => {
       const { method, url } = meta;
       requestId = `${method}:${url}`;
 
-      if(requests.has(requestId)) {
+      if (requests.has(requestId)) {
         const request = requests.get(requestId);
         request.abort();
       }
@@ -21,17 +21,17 @@ export function abortPlugin() {
         ...meta,
         opts: {
           ...meta.opts,
-          signal: requests.get(requestId).signal
-        }
+          signal: requests.get(requestId).signal,
+        },
       };
     },
-    afterFetch: (res) => {
+    afterFetch: ({ response }) => {
       requests.delete(requestId);
-      return res;
+      return response;
     },
     // return true if an error should throw, return false if an error should be ignored
-    handleError: ({name}) => name !== 'AbortError'
-  }
+    handleError: ({ name }) => name !== "AbortError",
+  };
 }
 
-export const abort = abortPlugin();
+export const abort = abortPlugin();

package/api/plugins/cache.js

@@ -44,13 +44,13 @@ export function cachePlugin({
         }
       }
     },
-    afterFetch: async (res, meta) => {
-      const requestId = `${meta.method}:${meta.url}`;
-      const clone = res.clone();
+    afterFetch: async ({ response, method, url }) => {
+      const requestId = `${method}:${url}`;
+      const clone = response.clone();
       const data = await clone.json();
       cache.set(requestId, { updatedAt: Date.now(), data });
       evict();
-      return res;
+      return response;
     },
   };
 }

package/api/plugins/jsonPrefix.js

@@ -5,23 +5,23 @@
 export function jsonPrefixPlugin(jsonPrefix) {
   let responseType;
   return {
-    name: 'jsonPrefix',
-    beforeFetch: ({responseType: type}) => {
+    name: "jsonPrefix",
+    beforeFetch: ({ responseType: type }) => {
       responseType = type;
     },
-    afterFetch: async (res) => {
-      if(jsonPrefix && responseType === 'json') {
-        let responseAsText = await res.text();
-        
-        if(responseAsText.startsWith(jsonPrefix)) {
+    afterFetch: async ({ response }) => {
+      if (jsonPrefix && responseType === "json") {
+        let responseAsText = await response.text();
+
+        if (responseAsText.startsWith(jsonPrefix)) {
           responseAsText = responseAsText.substring(jsonPrefix.length);
         }
 
-        return new Response(responseAsText, res);
+        return new Response(responseAsText, response);
       }
-      return res;
-    }
-  }
+      return response;
+    },
+  };
 }
 
-export const jsonPrefix = jsonPrefixPlugin(`)]}',\n`);
+export const jsonPrefix = jsonPrefixPlugin(`)]}',\n`);

package/api/plugins/logger.js

@@ -1,27 +1,31 @@
-/** 
+/**
  * @param {{
  *  collapsed?: boolean
  * }} options
- * @returns {import('../index.js').Plugin} 
+ * @returns {import('../index.js').Plugin}
  */
-export function loggerPlugin({collapsed = true} = {}) {
+export function loggerPlugin({ collapsed = true } = {}) {
   let m;
   let start;
-  const group = collapsed ? 'groupCollapsed' : 'group';
+  const group = collapsed ? "groupCollapsed" : "group";
   return {
-    name: 'logger',
+    name: "logger",
     beforeFetch: (meta) => {
-      console[group](`[START] [${new Date().toLocaleTimeString()}] [${meta.method}] "${meta.url}"`);
+      console[group](
+        `[START] [${new Date().toLocaleTimeString()}] [${meta.method}] "${meta.url}"`,
+      );
       console.table([meta]);
-      console.groupEnd()
+      console.groupEnd();
       start = Date.now();
       m = meta;
     },
-    afterFetch: (r) => {
-      console.log(`[END] [${m.method}] "${m.url}" Request took ${Date.now() - start}ms`);
-      return r;
-    }
-  }
+    afterFetch: ({ response }) => {
+      console.log(
+        `[END] [${m.method}] "${m.url}" Request took ${Date.now() - start}ms`,
+      );
+      return response;
+    },
+  };
 }
 
-export const logger = loggerPlugin();
+export const logger = loggerPlugin();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thepassle/app-tools",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "",
   "type": "module",
   "scripts": {

package/types/api/index.d.ts

@@ -12,7 +12,7 @@
  *  plugins: [
  *    {
  *      beforeFetch: ({url, method, opts, data}) => {},
- *      afterFetch: (res) => res,
+ *      afterFetch: ({response}) => response,
  *    }
  *  ]
  *});

package/types/api/types.d.ts

@@ -8,12 +8,15 @@ export type BodyMethod = <R>(url: string, data?: object, opts?: RequestOptions)
 export type BodylessMethod = <R>(url: string, opts?: RequestOptions) => Promise<R>;
 export type Method = 'GET' | 'DELETE' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'PATCH';
 export interface Plugin {
-    beforeFetch?: (meta: MetaParams) => MetaParams | Promise<MetaParams> | void;
-    afterFetch?: (res: Response, meta: MetaParams) => void | Promise<void> | Response | Promise<Response>;
+    beforeFetch?: (meta: MetaParams) => MetaParams | Promise<MetaParams> | void | Promise<void>;
+    afterFetch?: (meta: AfterFetchParams) => void | Promise<void> | Response | Promise<Response>;
     transform?: (data: any) => any;
     name: string;
     handleError?: (e: Error) => boolean;
 }
+export interface AfterFetchParams extends MetaParams {
+    response: Response;
+}
 export interface CustomRequestOptions {
     transform?: (data: object) => object;
     responseType?: ResponseType;