fch 5.1.5 → 6.0.0

package/index.d.ts

@@ -1,142 +1,76 @@
 type Store = {
-  get: (key: string) => Promise<any>;
-  set: (key: string, value: any, options: { EX: number }) => Promise<null>;
-  del: (key: string) => Promise<null>;
-  keys: () => Promise<string[]>;
-  exists: (key: string) => Promise<boolean>;
-  flushAll: () => Promise<any>;
+    get: (key: string) => Promise<any>;
+    set: (key: string, value: any, options?: any) => Promise<any>;
+    del: (key: string) => Promise<any>;
+    has?: (key: string) => Promise<boolean>;
+    clear?: () => Promise<any>;
 };
-
-type Cache =
-  | boolean
-  | number
-  | string
-  | {
-      expire?: number | string;
-      store?: Store;
-      shouldCache?: (request) => boolean;
-      createKey?: (request) => string;
-    };
-
-type Headers = { [name: string]: string };
-type Query = { [name: string]: string };
-
-type Methods = "get" | "head" | "post" | "patch" | "put" | "delete";
-
+type Cache = boolean | number | string | Store | {
+    expire?: number | string;
+    store?: Store;
+    shouldCache?: (request: any) => boolean;
+    createKey?: (request: any) => string;
+};
+type Headers = {
+    [name: string]: string;
+};
+type Query = {
+    [name: string]: string;
+};
+type Methods = "get" | "head" | "post" | "patch" | "put" | "delete" | "GET" | "HEAD" | "POST" | "PATCH" | "PUT" | "DELETE";
+type Body = string | any[] | {
+    [key: string]: any;
+} | FormData | HTMLFormElement | SubmitEvent | ReadableStream;
 type Options = {
-  url?: string;
-  method?: Methods;
-  query?: Query;
-  headers?: Headers;
-  baseUrl?: string;
-  baseURL?: string;
-  cache?: Cache;
-  output?: string;
-  credentials?: string;
-  before?: (req: any) => any;
-  after?: (res: any) => any;
-  error?: (error: Error) => any;
-  signal?: AbortSignal;
-  [key: string]: any;
+    url?: string;
+    method?: Methods;
+    query?: Query;
+    headers?: Headers;
+    baseUrl?: string;
+    baseURL?: string;
+    cache?: Cache;
+    output?: string;
+    credentials?: string;
+    before?: (req: any) => any;
+    after?: (res: any) => any;
+    error?: (error: Error) => any;
+    signal?: AbortSignal;
+    [key: string]: any;
 };
-
-type FullOptions = Options & { url: "string" };
-
-type Body =
-  | string
-  | any[]
-  | { [key: string]: any }
-  | FormData
-  | HTMLFormElement
-  | SubmitEvent
-  | ReadableStream;
-
-declare function fch(url: string, options?: Options): Promise<any>;
-
-declare module fch {
-  var url: string;
-  var method: Methods;
-  var query: Query;
-  var headers: Headers;
-  var baseUrl: string;
-  var baseURL: string;
-  var cache: Cache;
-  var output: string;
-  var credentials: string;
-  var before: (req: any) => any;
-  var after: (res: any) => any;
-  var error: (error: Error) => any;
-  var signal: AbortSignal;
-
-  /**
-   * Creates an instance of fch with the given options, perfect for custom APIs:
-   *
-   * ```js
-   * const api = fch.create({
-   *   baseUrl: 'https://api.myapi.com/',
-   *   headers: { apiVersion: 2 }
-   * })
-   * ```
-   */
-  function create(options?: FullOptions): typeof fch;
-
-  /**
-   * Make a GET request to the given endpoint:
-   *
-   * ```js
-   * const data = await fch.get('/path')
-   * const data = await fch.get('/path', options)
-   */
-  function get(url: string, options?: Options): Promise<any>;
-
-  /**
-   * Make a HEAD request to the given endpoint:
-   *
-   * ```js
-   * const data = await fch.head('/path')
-   * const data = await fch.head('/path', options)
-   */
-  function head(url: string, options?: Options): Promise<any>;
-
-  /**
-   * Make a POST request to the given endpoint:
-   *
-   * ```js
-   * const data = await fch.post('/path', body)
-   * const data = await fch.post('/path', body, options)
-   * ```
-   */
-  function post(url: string, body?: Body, options?: Options): Promise<any>;
-
-  /**
-   * Make a PATCH request to the given endpoint:
-   *
-   * ```js
-   * const data = await fch.patch('/path', body)
-   * const data = await fch.patch('/path', body, options)
-   * ```
-   */
-  function put(url: string, body?: Body, options?: Options): Promise<any>;
-
-  /**
-   * Make a PUT request to the given endpoint:
-   *
-   * ```js
-   * const data = await fch.put('/path', body)
-   * const data = await fch.put('/path', body, options)
-   * ```
-   */
-  function patch(url: string, body?: Body, options?: Options): Promise<any>;
-
-  /**
-   * Make a DELETE request to the given endpoint:
-   *
-   * ```js
-   * const data = await fch.del('/patd)
-   * const data = await fch.del('/patd, options)
-   * ```
-   */
-  function del(url: string, body?: Body, options?: Options): Promise<any>;
+interface FchInstance {
+    (url?: string, options?: Options): Promise<any>;
+    create: (options?: Options) => FchInstance;
+    get: (url: string, options?: Options) => Promise<any>;
+    head: (url: string, options?: Options) => Promise<any>;
+    post: (url: string, body?: Body, options?: Options) => Promise<any>;
+    patch: (url: string, body?: Body, options?: Options) => Promise<any>;
+    put: (url: string, body?: Body, options?: Options) => Promise<any>;
+    delete: (url: string, options?: Options) => Promise<any>;
+    del: (url: string, options?: Options) => Promise<any>;
+    text: () => Promise<string>;
+    json: () => Promise<any>;
+    blob: () => Promise<Blob>;
+    stream: () => ReadableStream | null;
+    arrayBuffer: () => Promise<ArrayBuffer>;
+    formData: () => Promise<FormData>;
+    body: () => Promise<any>;
+    clone: () => Response;
+    raw: () => Response;
+    response: () => Promise<any>;
+    url: string;
+    method: Methods;
+    query: Query;
+    headers: Headers;
+    baseUrl: string | null;
+    baseURL: string | null;
+    cache: any;
+    output: string;
+    credentials: string;
+    before?: (req: any) => any;
+    after?: (res: any) => any;
+    error?: (error: Error) => any;
 }
-
-export default fch;
+declare function create(defaults?: Options): FchInstance;
+export { create };
+declare const _default: FchInstance;
+export default _default;

package/index.min.js

@@ -1,2 +1 @@
-var d=async e=>(e=await e,Array.isArray(e)?await Promise.all(e.map(d)):e),y=(e,n)=>(...a)=>(r=>r instanceof RegExp?r.test.bind(r):r)(e).call(n,...a),L=(e,n)=>async(a,r,t)=>({value:a,extra:await y(e,n)(a,r,t)}),T=({extra:e})=>e,D=({value:e})=>e,F={every:async(e,n,a)=>{for(let r=0;r<e.length;r++)if(!await y(n,a)(e[r],r,e))return!1;return!0},filter:async(e,n,a)=>(await d(e.map(L(n,a)))).filter(T).map(D),find:async(e,n,a)=>{for(let r=0;r<e.length;r++)if(await y(n,a)(e[r],r,e))return e[r]},findIndex:async(e,n,a)=>{for(let r=0;r<e.length;r++)if(await y(n,a)(e[r],r,e))return r;return-1},forEach:async(e,n,a)=>(await d(e.map(L(n,a))),e),reduce:async(e,n,a)=>{let r=a!==void 0;r||(a=e[0]);for(let t=r?0:1;t<e.length;t++)a=await y(n)(a,e[t],t,e);return a},reduceRight:async(e,n,a)=>{let r=a!==void 0;r||(a=e[e.length-1]);for(let t=e.length-(r?1:2);t>=0;t--)a=await y(n)(a,e[t],t,e);return a},some:async(e,n,a)=>{for(let r=0;r<e.length;r++)if(await y(n,a)(e[r],r,e))return!0;return!1}},U=(e,n)=>(a,r)=>r==="then"?(...t)=>d(e).then(...t):r==="catch"?(...t)=>p(d(e).catch(...t)):h(d(e).then(t=>typeof r=="symbol"?t[r]:r in n?h((...o)=>n[r](t,...o),n):typeof t=="number"&&r in n.number?h((...o)=>n.number[r](t,...o),n):typeof t=="string"&&r in n.string?h((...o)=>n.string[r](t,...o),n):Array.isArray(t)&&r in n.array?h((...o)=>n.array[r](t,...o),n):t[r]&&t[r].bind?h(t[r].bind(t),n):h(t[r],n)),n),M=(e,n)=>(a,r,t)=>h(d(e).then(o=>{return typeof o!="function"?(c=`You tried to call "${JSON.stringify(o)}" (${typeof o}) as a function, but it is not.`,Promise.reject(new Error(c))):o(...t);var c}),n),h=(e,n)=>new Proxy(()=>{},{get:U(e,n),apply:M(e,n)});function p(e,{number:n,string:a,array:r,...t}={}){return typeof e=="function"?(...o)=>p(Promise.all(o).then(c=>e(...c)),{number:n,string:a,array:r,...t}):new Proxy({},{get:U(e,{number:{...n},string:{...a},array:{...F,...r},...t})})}function w(e){e.expire||(e.expire=0);let n=new Map,a=async r=>{if(!n.has(r))return!1;let{time:t,expire:o}=n.get(r);return!(!o||new Date().getTime()-t>o*1e3)};return{get:async r=>{if(!await a(r))return null;let{data:o}=n.get(r);return o},set:async(r,t,o={})=>{let c=new Date().getTime(),f=o.EX||o.expire||e.expire;return n.set(r,{time:c,expire:f,data:t})},keys:async()=>[...n.keys()],del:async r=>n.delete(r),exists:a,flushAll:()=>n.clear()}}var j=/(-?(?:\d+\.?\d*|\d*\.?\d+)(?:e[-+]?\d+)?)\s*([\p{L}]*)/iu;s.millisecond=s.ms=1;s.second=s.sec=s.s=s[""]=s.ms*1e3;s.minute=s.min=s.m=s.s*60;s.hour=s.hr=s.h=s.m*60;s.day=s.d=s.h*24;s.week=s.wk=s.w=s.d*7;s.year=s.yr=s.y=s.d*365.25;s.month=s.b=s.y/12;function s(e=""){if(!e)return 0;if(e===!0)return 60*60*1e3;if(typeof e=="number")return e;e=e.toLowerCase().replace(/[,_]/g,"");let[n,a,r]=j.exec(e)||[];r=s[r]||s[r.replace(/s$/,"")]||1e3;let t=r*parseFloat(a,10);return Math.abs(Math.round(t))}var O=e=>!e||e instanceof FormData||typeof(e.pipe||e.pipeTo)=="function"?!1:typeof e=="object"||Array.isArray(e),b=e=>{if(typeof e!="object")return e;for(let n in e)e[n]===void 0&&delete e[n];return e},g=class extends Error{constructor(n){let a="Error "+n.status;super(a),this.response=n,this.message=a}},B=(e,n,a)=>{let[r,t={}]=e.split("?"),o=new URLSearchParams(Object.fromEntries([...new URLSearchParams(b(n)),...new URLSearchParams(b(t))])).toString();return o&&(r=r+"?"+o),a?new URL(r.replace(/^\//,""),a).href:r},J=e=>{let n={};for(let[a,r]of Object.entries(e))n[a.toLowerCase()]=r;return n},v=async e=>{let n=e.headers.get("content-type"),a=n&&n.includes("application/json"),r=await e.clone().text();return a?JSON.parse(r):r},S=async e=>{let n={status:e.status,statusText:e.statusText,headers:{}};for(let a of e.headers.keys())n.headers[a.toLowerCase()]=e.headers.get(a);if(!e.ok)throw new g(e);return n.body=await v(e),n},k=(e,{ref:n,after:a,error:r,output:t})=>fetch(e.url,e).then(async o=>{if(n.res=o,o.ok&&t==="stream")return o.body;if(o.ok&&o[t]&&typeof o[t]=="function")return o[t]();let c=a(await S(o));if(t==="body")return c.body;if(t==="response")return c;if(t==="raw")return o.clone();throw new Error(`Invalid option output="${t}"`)}).catch(r),$=e=>e.method==="get",q=e=>e.method+":"+e.url,H=({store:e,...n}={},a)=>{let r={store:e?p(e):w({expire:s(n.expire)}),shouldCache:$,createKey:q,...n};return r.clear=()=>Promise.resolve(r.store).then(t=>t?.flushAll()),a&&(r.shouldCache=()=>!1),r};function x(e={}){let n={},a={},t=p(async(o="/",c={})=>{let{output:f,before:P,after:E,error:C,cache:K,...i}={...t,...c},l={...t.cache},A=u=>["number","string","boolean"].includes(typeof u);if(l.expire=s([c.cache?.expire,c.cache,l?.expire,l].find(A)),i.url=B(o,{...t.query,...c.query},i.baseUrl??i.baseURL),i.method=i.method.toLowerCase()||"GET",i.headers=J({...t.headers,...c.headers}),typeof SubmitEvent<"u"&&i.body instanceof SubmitEvent&&(i.body=new FormData(i.body.target)),typeof HTMLFormElement<"u"&&i.body instanceof HTMLFormElement&&(i.body=new FormData(i.body)),O(i.body)&&(i.body=JSON.stringify(b(i.body)),i.headers["content-type"]="application/json"),i=P(i),l.shouldCache(i)&&l.expire){let u=l.createKey(i);if(l.store?.then){let R=await l.store;l.store=R}if(await l.store.exists(u))return l.store.get(u);if(n[u])return n[u];let m;try{n[u]=k(i,{ref:a,cache:l,output:f,error:C,after:E}),m=await n[u]}finally{delete n[u]}return await l.store.set(u,m,{EX:l.expire}),m}return k(i,{ref:a,output:f,error:C,after:E})},{text:()=>a.res.text(),json:()=>a.res.json(),blob:()=>a.res.blob(),stream:()=>a.res.body,arrayBuffer:()=>a.res.arrayBuffer(),formData:()=>a.res.formData(),body:()=>v(a.res),clone:()=>a.res.clone(),raw:()=>a.res.clone(),response:()=>S(a.res.clone())});return t.url=e.url??"/",t.method=e.method??"get",t.query=e.query??{},t.headers=e.headers??{},t.baseUrl=e.baseUrl??e.baseURL??null,["number","string","boolean"].includes(typeof e.cache)&&(e.cache={expire:e.cache}),t.cache=H(e.cache,e.cache?.expire===!1||e.cache?.expire===0),t.output=e.output??"body",t.credentials=e.credentials??"include",t.before=e.before??(o=>o),t.after=e.after??(o=>o),t.error=e.error??(o=>Promise.reject(o)),t.get=(o,c)=>t(o,{method:"get",...c}),t.head=(o,c)=>t(o,{method:"head",...c}),t.post=(o,c,f)=>t(o,{method:"post",body:c,...f}),t.patch=(o,c,f)=>t(o,{method:"patch",body:c,...f}),t.put=(o,c,f)=>t(o,{method:"put",body:c,...f}),t.delete=(o,c)=>t(o,{method:"delete",...c}),t.del=t.delete,t.create=x,t}typeof window<"u"&&(window.fch=x());var G=x();export{x as create,G as default,s as parse};
-//# sourceMappingURL=index.min.js.map
+var z=async(i)=>(i=await i,Array.isArray(i)?await Promise.all(i.map(z)):i),Y=(i,n)=>(...x)=>((w)=>w instanceof RegExp?w.test.bind(w):w)(i).call(n,...x),T=(i,n)=>async(x,w,m)=>({value:x,extra:await Y(i,n)(x,w,m)}),D=({extra:i})=>i,K=({value:i})=>i,Q={every:async(i,n,x)=>{for(let w=0;w<i.length;w++)if(!await Y(n,x)(i[w],w,i))return!1;return!0},filter:async(i,n,x)=>(await z(i.map(T(n,x)))).filter(D).map(K),find:async(i,n,x)=>{for(let w=0;w<i.length;w++)if(await Y(n,x)(i[w],w,i))return i[w]},findIndex:async(i,n,x)=>{for(let w=0;w<i.length;w++)if(await Y(n,x)(i[w],w,i))return w;return-1},forEach:async(i,n,x)=>(await z(i.map(T(n,x))),i),reduce:async(i,n,x)=>{let w=x!==void 0;w||(x=i[0]);for(let m=w?0:1;m<i.length;m++)x=await Y(n)(x,i[m],m,i);return x},reduceRight:async(i,n,x)=>{let w=x!==void 0;w||(x=i[i.length-1]);for(let m=i.length-(w?1:2);m>=0;m--)x=await Y(n)(x,i[m],m,i);return x},some:async(i,n,x)=>{for(let w=0;w<i.length;w++)if(await Y(n,x)(i[w],w,i))return!0;return!1}},V=(i,n)=>(x,w)=>w==="then"?(...m)=>z(i).then(...m):w==="catch"?(...m)=>G(z(i).catch(...m)):E(z(i).then((m)=>typeof w=="symbol"?m[w]:(w in n)?E((...P)=>n[w](m,...P),n):typeof m=="number"&&(w in n.number)?E((...P)=>n.number[w](m,...P),n):typeof m=="string"&&(w in n.string)?E((...P)=>n.string[w](m,...P),n):Array.isArray(m)&&(w in n.array)?E((...P)=>n.array[w](m,...P),n):m[w]&&m[w].bind?E(m[w].bind(m),n):E(m[w],n)),n),F=(i,n)=>(x,w,m)=>E(z(i).then((P)=>{return typeof P!="function"?(g=`You tried to call "${JSON.stringify(P)}" (${typeof P}) as a function, but it is not.`,Promise.reject(Error(g))):P(...m);var g}),n),E=(i,n)=>new Proxy(()=>{},{get:V(i,n),apply:F(i,n)});function G(i,{number:n,string:x,array:w,...m}={}){return typeof i=="function"?(...P)=>G(Promise.all(P).then((g)=>i(...g)),{number:n,string:x,array:w,...m}):new Proxy({},{get:V(i,{number:{...n},string:{...x},array:{...Q,...w},...m})})}var H=(i)=>{if(!i)return!1;if(i instanceof FormData)return!1;if(typeof(i.pipe||i.pipeTo)==="function")return!1;return typeof i==="object"||Array.isArray(i)},J=(i)=>{if(typeof i!=="object")return i;for(let n in i)if(i[n]===void 0)delete i[n];return i};class X extends Error{response;constructor(i){let n="Error "+i.status;super(n);this.response=i,this.message=n}}var R=(i,n,x)=>{let[w,m=""]=i.split("?"),P=new URLSearchParams(Object.fromEntries([...new URLSearchParams(J(n)),...new URLSearchParams(J(m))])).toString();if(P)w=w+"?"+P;if(!x)return w;return new URL(w.replace(/^\//,""),x).href},B=(i)=>{let n={};for(let[x,w]of Object.entries(i))n[x.toLowerCase()]=w;return n},Z=async(i)=>{let n=i.headers.get("content-type"),x=n&&n.includes("application/json"),w=await i.clone().text();return x?JSON.parse(w):w},_=async(i)=>{let n={status:i.status,statusText:i.statusText,headers:{},body:void 0};if(i.headers.forEach((x,w)=>{n.headers[w.toLowerCase()]=x}),!i.ok)throw new X(i);return n.body=await Z(i),n},W=(i,{ref:n,after:x,error:w,output:m})=>{return fetch(i.url,i).then(async(P)=>{if(n.res=P,P.ok&&m==="stream")return P.body;if(P.ok&&P[m]&&typeof P[m]==="function")return P[m]();let g=x(await _(P));if(m==="body")return g.body;else if(m==="response")return g;else if(m==="raw")return P.clone();else throw Error(`Invalid option output="${m}"`)}).catch(w)},C=(i)=>i.method==="get",U=(i)=>i.method+":"+i.url,y=(i)=>{let n={store:i??null,shouldCache:C,createKey:U,clear:()=>Promise.resolve(n.store).then((x)=>x?.clear?x.clear():Promise.resolve())};return n};function L(i={}){let n={},x={},m=G(async(P="/",g={})=>{let{output:v,before:M,after:O,error:S,cache:j,...A}={...m,...g},N={...m.cache};if(A.url=R(P,{...m.query,...g.query},A.baseUrl??A.baseURL),A.method=A.method.toLowerCase()||"GET",A.headers=B({...m.headers,...g.headers}),typeof SubmitEvent<"u"&&A.body instanceof SubmitEvent)A.body=new FormData(A.body.target);if(typeof HTMLFormElement<"u"&&A.body instanceof HTMLFormElement)A.body=new FormData(A.body);if(H(A.body))A.body=JSON.stringify(J(A.body)),A.headers["content-type"]="application/json";if(A=M?M(A):A,N.shouldCache(A)&&N.store){let $=N.createKey(A);if(await N.store.has($))return N.store.get($);if(n[$])return n[$];let I;try{n[$]=W(A,{ref:x,cache:N,output:v,error:S,after:O}),I=await n[$]}finally{delete n[$]}return await N.store.set($,I),I}return W(A,{ref:x,output:v,error:S,after:O})},{text:()=>x.res.clone().text(),json:()=>x.res.clone().json(),blob:()=>x.res.clone().blob(),stream:()=>x.res.clone().body,arrayBuffer:()=>x.res.clone().arrayBuffer(),formData:()=>x.res.clone().formData(),body:()=>Z(x.res.clone()),clone:()=>x.res.clone(),raw:()=>x.res.clone(),response:()=>_(x.res.clone())});return m.url=i.url??"/",m.method=i.method??"get",m.query=i.query??{},m.headers=i.headers??{},m.baseUrl=i.baseUrl??i.baseURL??null,m.baseURL=i.baseUrl??i.baseURL??null,m.cache=y(i.cache),m.output=i.output??"body",m.credentials=i.credentials??"include",m.before=i.before??((P)=>P),m.after=i.after??((P)=>P),m.error=i.error??((P)=>Promise.reject(P)),m.get=(P,g)=>m(P,{method:"get",...g}),m.head=(P,g)=>m(P,{method:"head",...g}),m.post=(P,g,v)=>m(P,{method:"post",body:g,...v}),m.patch=(P,g,v)=>m(P,{method:"patch",body:g,...v}),m.put=(P,g,v)=>m(P,{method:"put",body:g,...v}),m.delete=(P,g)=>m(P,{method:"delete",...g}),m.del=m.delete,m.create=L,m}if(typeof window<"u")window.fch=L();var b=L();export{b as default,L as create};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fch",
-  "version": "5.1.5",
+  "version": "6.0.0",
   "description": "Fetch interface with better promises, deduplication, defaults, etc.",
   "homepage": "https://github.com/franciscop/fetch",
   "repository": "https://github.com/franciscop/fetch.git",
@@ -9,10 +9,13 @@
   "author": "Francisco Presencia <public@francisco.io> (https://francisco.io/)",
   "license": "MIT",
   "scripts": {
-    "build": "esbuild src/index.js --bundle --minify --sourcemap --outfile=index.min.js --format=esm",
+    "build": "npm run build:bundle && npm run build:types",
+    "build:bundle": "bun build src/index.ts --outfile=index.min.js --minify --format=esm",
+    "build:types": "tsc --emitDeclarationOnly --outDir .",
+    "typecheck": "tsc --noEmit src/**/*.ts",
     "size": "echo $(gzip -c index.min.js | wc -c) bytes",
-    "start": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch --coverage --detectOpenHandles",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage --detectOpenHandles && check-dts"
+    "start": "bun test --watch",
+    "test": "npm run typecheck && bun test"
   },
   "keywords": [
     "fetch",
@@ -25,8 +28,7 @@
   "main": "index.min.js",
   "files": [
     "index.min.js",
-    "index.d.ts",
-    "index.min.js.map"
+    "index.d.ts"
   ],
   "types": "index.d.ts",
   "type": "module",
@@ -34,20 +36,10 @@
     "node": ">=18.0.0"
   },
   "devDependencies": {
-    "check-dts": "^0.7.2",
-    "dotenv": "^16.3.1",
-    "esbuild": "^0.19.2",
-    "jest": "^28.1.0",
-    "jest-environment-jsdom": "^28.1.0",
-    "jest-fetch-mock": "^3.0.3",
-    "redis": "^4.6.10",
-    "swear": "^1.1.2"
-  },
-  "jest": {
-    "testEnvironment": "jest-environment-node",
-    "transform": {},
-    "setupFiles": [
-      "./test/setup.js"
-    ]
+    "@types/bun": "^1.3.11",
+    "@types/node": "^25.5.0",
+    "polystore": "^0.19.0",
+    "swear": "^1.1.2",
+    "typescript": "^5.7.3"
   }
 }

package/readme.md

@@ -46,7 +46,7 @@ api.del(url, { headers, ...options });
 | [`query`](#query)         | `{}`               | Add query parameters to the URL          |
 | [`headers`](#headers)     | `{}`               | Shared headers across all requests       |
 | [`output`](#output)       | `"body"`           | The return value of the API call         |
-| [`cache`](#cache)         | `{ expire: 0 }`    | How long to reuse the response body      |
+| [`cache`](#cache)         | `false`            | How long to reuse the response body      |
 | [`before`](#interceptors) | `req => req`       | Process the request before sending it    |
 | [`after`](#interceptors)  | `res => res`       | Process the response before returning it |
 | [`error`](#interceptors)  | `err => throw err` | Process errors before returning them     |
@@ -92,7 +92,7 @@ api.headers = {}; // Merged with the headers on a per-request basis
 
 // Control simple variables
 api.output = "body"; // Return the parsed body; use 'response' or 'stream' otherwise
-api.cache = { expires: 0 }; // Avoid sending GET requests that were already sent recently
+api.cache = false; // Avoid sending GET requests that were already sent recently
 
 // Interceptors
 api.before = (req) => req;
@@ -126,8 +126,8 @@ api.get(...);
 api.GET(...);
 
 // Both of these are valid:
-api({ method; 'GET' })
-api({ method; 'get'})
+api({ method: 'GET' })
+api({ method: 'get'})
 ```
 
 Example: adding a new cat and fixing a typo:
@@ -226,7 +226,7 @@ You can define headers in 4 ways:
 - Globally, in which case they'll be added to every request
 - On an instance, so they are added every time you use that instance
 - Per-request, so that they are only added to the current request.
-- In the `before` interceptor, which again can be globa, on an instance, or per-request
+- In the `before` interceptor, which again can be global, on an instance, or per-request
 
 ```js
 import fch from "fch";
@@ -326,21 +326,16 @@ stream.pipeTo(...);
 
 ### Cache
 
-The cache (disabled by default) is a great method to reduce the number of API requests we make. While it's possible to modify the global fch to add a cache, we recommend to always use it per-instance or per-request. Options:
-
-- `expire`: the amount of time the cached data will be valid for, it can be a number (seconds) or a string such as `1hour`, `1week`, etc. (based on [parse-duration](https://github.com/jkroso/parse-duration))
-- `store`: the store where the cached data will be stored.
-- `shouldCache`: a function that returns a boolean to determine whether the current data should go through the cache process.
-- `createKey`: a function that takes the request and generates a unique key for that request, which will be the same for the next time that same request is made. Defaults to method+url.
+The cache (disabled by default) is a great method to reduce the number of API requests we make. We use [polystore](https://polystore.dev/) for cache storage, which provides a unified interface for multiple storage backends.
 
 > Note: cache should only be used through `fch.create({ cache: ... })`, not through the global instance.
 
-To activate the cache, we just need to set a time as such:
+To activate the cache, you can pass a time string or number (seconds), and an in-memory store will be created automatically:
 
 ```js
-// This API has 1h by default:
+// This API has 1h cache by default (uses in-memory Map):
 const api = fch.create({
-  baseUrl: 'https://api.myweb.com/'
+  baseUrl: 'https://api.myweb.com/',
   cache: '1h'
 });
 
@@ -348,56 +343,75 @@ const api = fch.create({
 api.get('/somedata', { cache: '20s' });
 ```
 
-Your cache will have a `store`; by default we create an in-memory store, but you can also use `redis` and it's fully compatible. Note now `cache` is now an object:
+For more control, you can use **polystore** to create a custom cache store with different backends (in-memory, Redis, localStorage, etc.):
 
 ```js
 import fch from "fch";
+import kv from "polystore";
+
+// In-memory cache with 1 hour expiration
+const cache = kv(new Map()).expires("1h");
+
+const api = fch.create({
+  baseUrl: 'https://api.myweb.com/',
+  cache: cache
+});
+```
+
+Polystore supports multiple backends. For example, with Redis:
+
+```js
+import fch from "fch";
+import kv from "polystore";
 import { createClient } from "redis";
 
-// You can either pass the store instance, or a promise that will
-// return the instance. In this case we are doing the latter
-const store = createClient().connect();
+// Redis cache with 1 hour expiration
+const redis = await createClient().connect();
+const cache = kv(redis).expires("1h");
 
 const api = fch.create({
-  cache: {
-    store: store,
-    expire: "1h",
-  },
+  cache: cache
 });
 ```
 
 That's the basic usage, but "invalidating cache" is not one of the complex topics in CS for no reason. Let's dig deeper. To clear the cache, you can call `cache.clear()` at any time:
 
 ```js
-const api = fch.create({ cache: "1h" });
+import kv from "polystore";
+
+const cache = kv(new Map()).expires("1h");
+const api = fch.create({ cache });
 
 // Remove them all
-await api.cache.clear();
+await cache.clear();
 ```
 
-You can always access the store of the instance through `api.cache.store`, so we can do low-level operations on the store as such if needed:
+You can also access the underlying store directly through the polystore instance to perform low-level operations:
 
 ```js
 import fch from "fch";
+import kv from "polystore";
 import { createClient } from "redis";
 
-// Initialize it straight away
-const api = fch.create({
-  cache: {
-    store: createClient().connect(),
-    expire: "1h",
-  },
-});
+const redis = await createClient().connect();
+const cache = kv(redis).expires("1h");
+
+const api = fch.create({ cache });
 
-// Later on, maybe in a different place
-await api.cache.store.flushDB();
+// Later on, you can access the underlying Redis client
+await redis.flushDB();
 ```
 
-Finally, the other two bits that are relevant for cache are `shouldCache` and `createKey`. For the most basic examples the default probably works, but you might want more advanced configuration:
+For advanced cache configuration, you can pass an object with additional options like `shouldCache` and `createKey`:
 
 ```js
+import kv from "polystore";
+
+const cache = kv(new Map()).expires("1h");
+
 const api = fch.create({
   cache: {
+    store: cache,
     // Default shouldCache; Note the lowercase
     shouldCache: (request) => request.method === "get",
 
@@ -410,26 +424,34 @@ const api = fch.create({
 For example, if you want to differentiate the auth requests from the non-auth requests, you can do it so:
 
 ```js
-import api from "./api";
+import kv from "polystore";
 
-const onLogin = (user) => {
-  // ... Do some other stuff
+const cache = kv(new Map()).expires("1h");
 
-  // Remove the old requests since we were not auth'ed yet
-  api.cache.clear();
+const api = fch.create({
+  cache: {
+    store: cache,
+    // Create a key unique for each user
+    createKey: (req) => user.id + ":" + req.method + ":" + req.url,
+  }
+});
 
-  // Create a key unique for this user
-  api.cache.createKey = (req) => user.id + ":" + req.method + ":" + req.url;
+const onLogin = (user) => {
+  // Remove the old requests since we were not auth'ed yet
+  cache.clear();
 };
 ```
 
 Or maybe you just want to NOT cache any of the requests that have an `Authorization` header, you can do so:
 
 ```js
+import kv from "polystore";
+
+const cache = kv(new Map()).expires("1week");
+
 const api = fch.create({
   cache: {
-    expire: "1week",
-
+    store: cache,
     // Note the lowercase in both! we normalize them to be lowercase
     shouldCache: (req) => req.method === "get" && !req.headers.authorization,
   },
@@ -438,19 +460,9 @@ const api = fch.create({
 
 It is this flexible since you can use fch both in the front-end and back-end, so usually in each of them you might want to follow a slightly different strategy.
 
-#### Creating a store.
+#### Creating a custom store
 
-You might want to create a custom store. Please have a look at `src/store.js`, but basically you need an object that implements these methods:
-
-```js
-type Store = {
-  get: (key: string) => Promise<any>,
-  set: (key: string, value: any, options?: { EX: number }) => Promise<null>,
-  del: (key: string) => Promise<null>,
-  exists: (key: string) => Promise<boolean>,
-  flushAll: () => Promise<any>,
-};
-```
+You can create a custom store that works with fch by implementing the polystore-compatible interface. See the [polystore documentation](https://polystore.dev/) for details on creating custom stores and adapters.
 
 ### Interceptors
 
@@ -460,8 +472,6 @@ You can also add the interceptors `before`, `after` and `error`:
 - `after`: Called just after the response is created and if there was no error, but before parsing anything else.
 - `error`: When the response is not okay, if possible it'll include the `response` object.
 
-> Note: interceptors are never deduped/cached and always execute once per call, even if the main async fetch() has been deduped.
-
 ```js
 // Perform an action or request transformation before the request is sent
 fch.before = async req => {
@@ -666,7 +676,7 @@ You can also [create an instance](#create-an-instance) that will have the same o
 
 First, we use the native Node.js' fetch() and the browser's native fetch(), so any difference between those also applies to this library. For example, if you were to call `"/"` in the browser it'd refer to the current URL, while in Node.js it'd fail since you need to specify the full URL. Some other places where you might find differences: CORS, cache, etc.
 
-In the library itself there's nothing different between the browser and Node.js, but it might be interesting to note that (if/when implemented) things like cache, etc. in Node.js are normally long-lived and shared, while in a browser request it'd bound to the request itself.
+In the library itself there's nothing different between the browser and Node.js, but it might be interesting to note that things like ephemeral cache in Node.js are normally long-lived and shared, while in a browser request it'd bound to the browser runtime.
 
 ### Differences with Axios
 
@@ -692,17 +702,3 @@ As disadvantages, I can think of two major ones for `fch`:
 
 - Requires Node.js 18+, which is the version that includes `fetch()` by default.
 - Does not support many of the more advanced options, like `onUploadProgress` nor `onDownloadProgress`.
-
-## Releases
-
-### V4
-
-Breaking changes:
-
-- Only ESM exports. Meaning, if you use it in a browser you'll need the `<script type="module">`.
-- The method `fch.del()` (and derivates with fch.create()) have been renamed to `fch.delete()`.
-
-Changes:
-
-- Added `output` options: `raw`, `stream`, `arrayBuffer`, `blob`, `clone`, `formData`, `json`, `text`
-- Gone from 1.2kb down to 1.0kb

package/index.min.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["node_modules/swear/index.min.js", "src/store.js", "src/index.js"],
-  "sourcesContent": ["const t=async r=>(r=await r,Array.isArray(r)?await Promise.all(r.map(t)):r),r=(t,r)=>(...n)=>(t=>t instanceof RegExp?t.test.bind(t):t)(t).call(r,...n),n=(t,n)=>async(e,a,i)=>({value:e,extra:await r(t,n)(e,a,i)}),e=({extra:t})=>t,a=({value:t})=>t,i={every:async(t,n,e)=>{for(let a=0;a<t.length;a++){if(!await r(n,e)(t[a],a,t))return!1}return!0},filter:async(r,i,o)=>(await t(r.map(n(i,o)))).filter(e).map(a),find:async(t,n,e)=>{for(let a=0;a<t.length;a++){if(await r(n,e)(t[a],a,t))return t[a]}},findIndex:async(t,n,e)=>{for(let a=0;a<t.length;a++){if(await r(n,e)(t[a],a,t))return a}return-1},forEach:async(r,e,a)=>(await t(r.map(n(e,a))),r),reduce:async(t,n,e)=>{const a=void 0!==e;a||(e=t[0]);for(let i=a?0:1;i<t.length;i++)e=await r(n)(e,t[i],i,t);return e},reduceRight:async(t,n,e)=>{const a=void 0!==e;a||(e=t[t.length-1]);for(let i=t.length-(a?1:2);i>=0;i--)e=await r(n)(e,t[i],i,t);return e},some:async(t,n,e)=>{for(let a=0;a<t.length;a++){if(await r(n,e)(t[a],a,t))return!0}return!1}},o=(r,n)=>(e,a)=>\"then\"===a?(...n)=>t(r).then(...n):\"catch\"===a?(...n)=>c(t(r).catch(...n)):y(t(r).then((t=>\"symbol\"==typeof a?t[a]:a in n?y(((...r)=>n[a](t,...r)),n):\"number\"==typeof t&&a in n.number?y(((...r)=>n.number[a](t,...r)),n):\"string\"==typeof t&&a in n.string?y(((...r)=>n.string[a](t,...r)),n):Array.isArray(t)&&a in n.array?y(((...r)=>n.array[a](t,...r)),n):t[a]&&t[a].bind?y(t[a].bind(t),n):y(t[a],n))),n),s=(r,n)=>(e,a,i)=>y(t(r).then((t=>{return\"function\"!=typeof t?(r=`You tried to call \"${JSON.stringify(t)}\" (${typeof t}) as a function, but it is not.`,Promise.reject(new Error(r))):t(...i);var r})),n),y=(t,r)=>new Proxy((()=>{}),{get:o(t,r),apply:s(t,r)});export default function c(t,{number:r,string:n,array:e,...a}={}){return\"function\"==typeof t?(...i)=>c(Promise.all(i).then((r=>t(...r))),{number:r,string:n,array:e,...a}):new Proxy({},{get:o(t,{number:{...r},string:{...n},array:{...i,...e},...a})})}", "export default function createCache(options) {\n  // no cache by default\n  if (!options.expire) {\n    options.expire = 0;\n  }\n\n  const cache = new Map();\n  const exists = async (key) => {\n    if (!cache.has(key)) return false;\n    const { time, expire } = cache.get(key);\n    if (!expire) return false;\n    if (new Date().getTime() - time > expire * 1000) return false;\n    return true;\n  };\n  return {\n    get: async (key) => {\n      const keyExists = await exists(key);\n      if (!keyExists) return null;\n      const { data } = cache.get(key);\n      return data;\n    },\n    set: async (key, data, opts = {}) => {\n      const time = new Date().getTime();\n      const expire = opts.EX || opts.expire || options.expire;\n      return cache.set(key, { time, expire, data });\n    },\n    keys: async () => [...cache.keys()],\n    del: async (key) => {\n      return cache.delete(key);\n    },\n    exists,\n    flushAll: () => cache.clear(),\n  };\n}\n", "import swear from \"swear\";\n\nimport createCacheStore from \"./store\";\n\nconst times = /(-?(?:\\d+\\.?\\d*|\\d*\\.?\\d+)(?:e[-+]?\\d+)?)\\s*([\\p{L}]*)/iu;\n\nparse.millisecond = parse.ms = 1;\nparse.second = parse.sec = parse.s = parse[\"\"] = parse.ms * 1000;\nparse.minute = parse.min = parse.m = parse.s * 60;\nparse.hour = parse.hr = parse.h = parse.m * 60;\nparse.day = parse.d = parse.h * 24;\nparse.week = parse.wk = parse.w = parse.d * 7;\nparse.year = parse.yr = parse.y = parse.d * 365.25;\nparse.month = parse.b = parse.y / 12;\n\nexport function parse(str = \"\") {\n  if (!str) return 0;\n  if (str === true) return 60 * 60 * 1000;\n  if (typeof str === \"number\") return str;\n  // ignore commas/placeholders\n  str = str.toLowerCase().replace(/[,_]/g, \"\");\n  let [_, value, units] = times.exec(str) || [];\n  units = parse[units] || parse[units.replace(/s$/, \"\")] || 1000;\n  const result = units * parseFloat(value, 10);\n  return Math.abs(Math.round(result));\n}\n\n// Check if the body is an object/array, and if so return true so that it can be\n// properly JSON.stringify() + adding the proper ContentType\nconst hasObjectBody = (body) => {\n  if (!body) return false;\n  if (body instanceof FormData) return false;\n  if (typeof (body.pipe || body.pipeTo) === \"function\") return false;\n  return typeof body === \"object\" || Array.isArray(body);\n};\n\nconst noUndefined = (obj) => {\n  if (typeof obj !== \"object\") return obj;\n  for (let key in obj) {\n    if (obj[key] === undefined) delete obj[key];\n  }\n  return obj;\n};\n\nclass ResponseError extends Error {\n  constructor(response) {\n    const message = \"Error \" + response.status;\n    super(message);\n    this.response = response;\n    this.message = message;\n  }\n}\n\nconst createUrl = (url, query, base) => {\n  let [path, urlQuery = {}] = url.split(\"?\");\n\n  // Merge global params with passed params with url params\n  const entries = new URLSearchParams(\n    Object.fromEntries([\n      ...new URLSearchParams(noUndefined(query)),\n      ...new URLSearchParams(noUndefined(urlQuery)),\n    ])\n  ).toString();\n  if (entries) {\n    path = path + \"?\" + entries;\n  }\n\n  if (!base) return path;\n  const fullUrl = new URL(path.replace(/^\\//, \"\"), base);\n  return fullUrl.href;\n};\n\nconst createHeaders = (raw) => {\n  // User-set headers overwrite the base headers\n  const headers = {};\n\n  // Make the headers lowercase\n  for (let [key, value] of Object.entries(raw)) {\n    headers[key.toLowerCase()] = value;\n  }\n\n  return headers;\n};\n\nconst getBody = async (res) => {\n  // Automatically parse the response\n  const type = res.headers.get(\"content-type\");\n  const isJson = type && type.includes(\"application/json\");\n  const text = await res.clone().text();\n  return isJson ? JSON.parse(text) : text;\n};\n\nconst parseResponse = async (res) => {\n  // Need to manually create it to set some things like the proper response\n  let response = {\n    status: res.status,\n    statusText: res.statusText,\n    headers: {},\n  };\n\n  // Lowercase all of the response headers and put them into a plain object\n  for (let key of res.headers.keys()) {\n    response.headers[key.toLowerCase()] = res.headers.get(key);\n  }\n\n  // Oops, throw it\n  if (!res.ok) {\n    throw new ResponseError(res);\n  }\n\n  response.body = await getBody(res);\n\n  return response;\n};\n\nconst createFetch = (request, { ref, after, error, output }) => {\n  return fetch(request.url, request)\n    .then(async (res) => {\n      ref.res = res;\n\n      // In this case, do not process anything else just return the ReadableStream\n      if (res.ok && output === \"stream\") {\n        return res.body;\n      }\n\n      // Raw methods requested\n      if (res.ok && res[output] && typeof res[output] === \"function\") {\n        return res[output]();\n      }\n\n      // Hijack the response and modify it, earlier than the manual body changes\n      const response = after(await parseResponse(res));\n\n      if (output === \"body\") {\n        return response.body;\n      } else if (output === \"response\") {\n        return response;\n      } else if (output === \"raw\") {\n        return res.clone();\n      } else {\n        throw new Error(`Invalid option output=\"${output}\"`);\n      }\n    })\n    .catch(error);\n};\n\nconst defaultShouldCache = (request) => request.method === \"get\";\nconst defaultCreateKey = (request) => request.method + \":\" + request.url;\n\nconst createCache = ({ store, ...options } = {}, noCache) => {\n  const cache = {\n    store: store\n      ? swear(store)\n      : createCacheStore({ expire: parse(options.expire) }),\n    shouldCache: defaultShouldCache,\n    createKey: defaultCreateKey,\n    ...options,\n  };\n\n  cache.clear = () =>\n    Promise.resolve(cache.store).then((store) => store?.flushAll());\n\n  // If we REALLY don't want any cache (false + undef|falsy, or any + false)\n  if (noCache) {\n    cache.shouldCache = () => false;\n  }\n\n  return cache;\n};\n\nfunction create(defaults = {}) {\n  const ongoing = {};\n  const ref = {};\n  const extraMethods = {\n    text: () => ref.res.text(),\n    json: () => ref.res.json(),\n    blob: () => ref.res.blob(),\n    stream: () => ref.res.body,\n    arrayBuffer: () => ref.res.arrayBuffer(),\n    formData: () => ref.res.formData(),\n    body: () => getBody(ref.res),\n    clone: () => ref.res.clone(),\n    raw: () => ref.res.clone(),\n    response: () => parseResponse(ref.res.clone()),\n  };\n\n  const fch = swear(async (url = \"/\", options = {}) => {\n    // Exctract the options\n    let {\n      output,\n\n      // Interceptors can also be passed as parameters\n      before,\n      after,\n      error,\n\n      cache: _lostCache,\n\n      ...request\n    } = { ...fch, ...options }; // Local option OR global value (including defaults)\n\n    const cache = { ...fch.cache };\n    const isValid = (v) => [\"number\", \"string\", \"boolean\"].includes(typeof v);\n    cache.expire = parse(\n      [options.cache?.expire, options.cache, cache?.expire, cache].find(isValid)\n    );\n\n    // Absolute URL if possible; Default method; merge the default headers\n    request.url = createUrl(\n      url,\n      { ...fch.query, ...options.query },\n      request.baseUrl ?? request.baseURL\n    );\n    request.method = request.method.toLowerCase() || \"GET\";\n    request.headers = createHeaders({ ...fch.headers, ...options.headers });\n\n    // Has the event or form, transform it to a FormData\n    if (\n      typeof SubmitEvent !== \"undefined\" &&\n      request.body instanceof SubmitEvent\n    ) {\n      request.body = new FormData(request.body.target);\n    }\n    if (\n      typeof HTMLFormElement !== \"undefined\" &&\n      request.body instanceof HTMLFormElement\n    ) {\n      request.body = new FormData(request.body);\n    }\n\n    // JSON-encode plain objects\n    if (hasObjectBody(request.body)) {\n      request.body = JSON.stringify(noUndefined(request.body));\n      // Note: already defaults to utf-8\n      request.headers[\"content-type\"] = \"application/json\";\n    }\n\n    // Hijack the requeset and modify it\n    request = before(request);\n\n    if (cache.shouldCache(request) && cache.expire) {\n      const key = cache.createKey(request);\n\n      // Allow to receive async cache stores\n      if (cache.store?.then) {\n        const out = await cache.store;\n        cache.store = out;\n      }\n\n      // Already cached, return the previous request\n      if (await cache.store.exists(key)) {\n        return cache.store.get(key);\n      }\n\n      // Ongoing, return the instance\n      if (ongoing[key]) return ongoing[key];\n\n      let res;\n      try {\n        // Otherwise generate a request, save it, and return it\n        ongoing[key] = createFetch(request, {\n          ref,\n          cache,\n          output,\n          error,\n          after,\n        });\n        res = await ongoing[key];\n      } finally {\n        delete ongoing[key];\n      }\n      // Note: failing the request will throw and thus never cache\n      await cache.store.set(key, res, { EX: cache.expire });\n      return res;\n    }\n\n    // PUT, POST, etc should never dedupe and just return the plain request\n    return createFetch(request, { ref, output, error, after });\n  }, extraMethods);\n\n  // Default values\n  fch.url = defaults.url ?? \"/\";\n  fch.method = defaults.method ?? \"get\";\n  fch.query = defaults.query ?? {};\n  fch.headers = defaults.headers ?? {};\n  fch.baseUrl = defaults.baseUrl ?? defaults.baseURL ?? null;\n\n  // Accept a simple \"false\"ache = { expire: parse(defaults.cache) };\n  if ([\"number\", \"string\", \"boolean\"].includes(typeof defaults.cache)) {\n    defaults.cache = { expire: defaults.cache };\n  }\n  fch.cache = createCache(\n    defaults.cache,\n    defaults.cache?.expire === false || defaults.cache?.expire === 0\n  );\n\n  // Default options\n  fch.output = defaults.output ?? \"body\";\n  fch.credentials = defaults.credentials ?? \"include\";\n\n  // Interceptors\n  fch.before = defaults.before ?? ((req) => req);\n  fch.after = defaults.after ?? ((res) => res);\n  fch.error = defaults.error ?? ((err) => Promise.reject(err));\n\n  fch.get = (url, opts) => fch(url, { method: \"get\", ...opts });\n  fch.head = (url, opts) => fch(url, { method: \"head\", ...opts });\n  fch.post = (url, body, opts) => fch(url, { method: \"post\", body, ...opts });\n  fch.patch = (url, body, opts) => fch(url, { method: \"patch\", body, ...opts });\n  fch.put = (url, body, opts) => fch(url, { method: \"put\", body, ...opts });\n  fch.delete = (url, opts) => fch(url, { method: \"delete\", ...opts });\n  fch.del = fch.delete;\n\n  fch.create = create;\n\n  return fch;\n}\n\nif (typeof window !== \"undefined\") {\n  window.fch = create();\n}\n\nexport { create };\nexport default create();\n"],
-  "mappings": "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",
-  "names": ["t", "r", "n", "e", "a", "i", "o", "c", "y", "s", "createCache", "options", "cache", "exists", "key", "time", "expire", "data", "opts", "times", "parse", "str", "_", "value", "units", "result", "hasObjectBody", "body", "noUndefined", "obj", "key", "ResponseError", "response", "message", "createUrl", "url", "query", "base", "path", "urlQuery", "entries", "createHeaders", "raw", "headers", "getBody", "res", "type", "isJson", "text", "parseResponse", "createFetch", "request", "ref", "after", "error", "output", "defaultShouldCache", "defaultCreateKey", "createCache", "store", "options", "noCache", "cache", "c", "create", "defaults", "ongoing", "fch", "before", "_lostCache", "isValid", "v", "out", "req", "err", "opts", "src_default", "create"]
-}