@koine/api 2.0.0-beta.113 → 2.0.0-beta.114

package/ApiError.cjs.js

@@ -11,4 +11,4 @@ Object.defineProperty(exports, '__esModule', { value: true });
  */class ApiError extends Error{constructor(r){super(`Request failed with ${r.status} ${r.msg}`),this.name="ApiError",Object.assign(this,r);}}
 
 exports.ApiError = ApiError;
-exports["default"] = ApiError;
+exports.default = ApiError;

package/ApiError.esm.d.ts

@@ -0,0 +1,2 @@
+export * from "./ApiError";
+export { default } from "./ApiError";

package/createApi.cjs.js

@@ -10,18 +10,19 @@ let o=["get","post","put","patch","delete"];/**
  * @param apiName Short name to use in debug logs
  * @param baseUrl Either relativ eor absolute, it must end without trailing slash
  */let createApi=(l,a,i)=>{let{headers:s={},request:n={},throwErr:p,timeout:c=1e4,processReq:u,processRes:f,processErr:d}=i||{};return o.reduce((o,i)=>(// @ts-expect-error FIXME: type
-    o[i]=async(o,h)=>{let $,m;let{request:w=n,headers:y=s,timeout:g=c,processReq:b,processRes:E=f,processErr:N=d,throwErr:k=p}=h||{},{params:A,json:C,query:j}=h||{},q=`${a}/${o+"".replace(/^\/*/,"")}`,v={method:i.toUpperCase(),...w,headers:{"content-type":"application/json",...y}};if(u){let e=u(i,q,j,C,A,v);q=e[0],j=e[1],C=e[2],A=e[3],v=e[4];}if(b){let e=b(i,q,j,C,A,v);q=e[0],j=e[1],C=e[2],A=e[3],v=e[4];}if(utils.isFullObject(A))for(let e in A)q=q.replace(`{${e}}`,A[e].toString());let x=Number(g);C&&(v.body=JSON.stringify(C)),x>0&&(// TODO: combine multiple abort signals
+    o[i]=async(o,h)=>{let $,m;let{request:w=n,headers:y=s,timeout:b=c,processReq:g,processRes:E=f,processErr:N=d,throwErr:k=p}=h||{},{params:A,json:C,query:j}=h||{},q=`${a}/${o+"".replace(/^\/*/,"")}`,v={method:i.toUpperCase(),...w,headers:{"content-type":"application/json",...y}};if(u){let e=u(i,q,j,C,A,v);q=e[0],j=e[1],C=e[2],A=e[3],v=e[4];}if(g){let e=g(i,q,j,C,A,v);q=e[0],j=e[1],C=e[2],A=e[3],v=e[4];}if(utils.isFullObject(A))for(let e in A)// TODO: not the greatest assertion...
+    q=q.replace(`{${e}}`,A[e]);let x=Number(b);C&&(v.body=JSON.stringify(C)),x>0&&(// TODO: combine multiple abort signals
     // @see https://dev.to/rashidshamloo/adding-timeout-and-multiple-abort-signals-to-fetch-typescriptreact-33bb
     $=new AbortController,m=setTimeout(()=>$.abort(),x),v.signal=$.signal),j&&// FIXME: ts-expect-error this assertion is not the best, but nevermind for now
-    (q+=utils.buildUrlQueryString(j));let O=null,R=null,S="";try{O=await fetch(q,v);}catch(e){S=utils.errorToString(e);}if(m&&clearTimeout(m),O)try{R=E?await E(O,h||{}):await O.json();}catch(e){S=utils.errorToString(e);}if(null===R&&(R=N?await N(S,h||{}):// this error should only happen on network errors or wrong API urls
+    (q+=utils.buildUrlQueryString(j));let O=null,R=null,T="";try{O=await fetch(q,v);}catch(e){T=utils.errorToString(e);}if(m&&clearTimeout(m),O)try{R=E?await E(O,h||{}):await O.json();}catch(e){T=utils.errorToString(e);}if(null===R&&(R=N?await N(T,h||{}):// this error should only happen on network errors or wrong API urls
     // there is no specific HTTP error for this, we can consider these
     // two statuses though:
     // - [100 Continue](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/100)
     // - [501 Not Implemented](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/501)
-    {data:null,msg:S,status:100,fail:!0,ok:!1}),k&&R?.fail)// throw new ApiError<Failed>(result);
+    {data:null,msg:T,status:100,fail:!0,ok:!1}),k&&R?.fail)// throw new ApiError<Failed>(result);
     // I prefer to throw an object literal despite what eslint says
     // eslint-disable-next-line no-throw-literal
     throw R;if("development"===process.env.NODE_ENV){let e=`${R?.status}: api[${l}] ${i.toUpperCase()} ${q}`;R?.ok?console.info(`🟢 ${e}`):console.info(`🔴 ${e}`);}return R},o),{})};
 
 exports.createApi = createApi;
-exports["default"] = createApi;
+exports.default = createApi;

package/createApi.esm.d.ts

@@ -0,0 +1,2 @@
+export * from "./createApi";
+export { default } from "./createApi";

package/createApi.esm.js

@@ -6,15 +6,16 @@ let o=["get","post","put","patch","delete"];/**
  * @param apiName Short name to use in debug logs
  * @param baseUrl Either relativ eor absolute, it must end without trailing slash
  */let createApi=(l,a,i)=>{let{headers:s={},request:n={},throwErr:p,timeout:c=1e4,processReq:u,processRes:f,processErr:d}=i||{};return o.reduce((o,i)=>(// @ts-expect-error FIXME: type
-    o[i]=async(o,h)=>{let $,m;let{request:w=n,headers:y=s,timeout:g=c,processReq:b,processRes:E=f,processErr:N=d,throwErr:k=p}=h||{},{params:A,json:C,query:j}=h||{},q=`${a}/${o+"".replace(/^\/*/,"")}`,v={method:i.toUpperCase(),...w,headers:{"content-type":"application/json",...y}};if(u){let e=u(i,q,j,C,A,v);q=e[0],j=e[1],C=e[2],A=e[3],v=e[4];}if(b){let e=b(i,q,j,C,A,v);q=e[0],j=e[1],C=e[2],A=e[3],v=e[4];}if(isFullObject(A))for(let e in A)q=q.replace(`{${e}}`,A[e].toString());let x=Number(g);C&&(v.body=JSON.stringify(C)),x>0&&(// TODO: combine multiple abort signals
+    o[i]=async(o,h)=>{let $,m;let{request:w=n,headers:y=s,timeout:b=c,processReq:g,processRes:E=f,processErr:N=d,throwErr:k=p}=h||{},{params:A,json:C,query:j}=h||{},q=`${a}/${o+"".replace(/^\/*/,"")}`,v={method:i.toUpperCase(),...w,headers:{"content-type":"application/json",...y}};if(u){let e=u(i,q,j,C,A,v);q=e[0],j=e[1],C=e[2],A=e[3],v=e[4];}if(g){let e=g(i,q,j,C,A,v);q=e[0],j=e[1],C=e[2],A=e[3],v=e[4];}if(isFullObject(A))for(let e in A)// TODO: not the greatest assertion...
+    q=q.replace(`{${e}}`,A[e]);let x=Number(b);C&&(v.body=JSON.stringify(C)),x>0&&(// TODO: combine multiple abort signals
     // @see https://dev.to/rashidshamloo/adding-timeout-and-multiple-abort-signals-to-fetch-typescriptreact-33bb
     $=new AbortController,m=setTimeout(()=>$.abort(),x),v.signal=$.signal),j&&// FIXME: ts-expect-error this assertion is not the best, but nevermind for now
-    (q+=buildUrlQueryString(j));let O=null,R=null,S="";try{O=await fetch(q,v);}catch(e){S=errorToString(e);}if(m&&clearTimeout(m),O)try{R=E?await E(O,h||{}):await O.json();}catch(e){S=errorToString(e);}if(null===R&&(R=N?await N(S,h||{}):// this error should only happen on network errors or wrong API urls
+    (q+=buildUrlQueryString(j));let O=null,R=null,T="";try{O=await fetch(q,v);}catch(e){T=errorToString(e);}if(m&&clearTimeout(m),O)try{R=E?await E(O,h||{}):await O.json();}catch(e){T=errorToString(e);}if(null===R&&(R=N?await N(T,h||{}):// this error should only happen on network errors or wrong API urls
     // there is no specific HTTP error for this, we can consider these
     // two statuses though:
     // - [100 Continue](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/100)
     // - [501 Not Implemented](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/501)
-    {data:null,msg:S,status:100,fail:!0,ok:!1}),k&&R?.fail)// throw new ApiError<Failed>(result);
+    {data:null,msg:T,status:100,fail:!0,ok:!1}),k&&R?.fail)// throw new ApiError<Failed>(result);
     // I prefer to throw an object literal despite what eslint says
     // eslint-disable-next-line no-throw-literal
     throw R;if("development"===process.env.NODE_ENV){let e=`${R?.status}: api[${l}] ${i.toUpperCase()} ${q}`;R?.ok?console.info(`🟢 ${e}`):console.info(`🔴 ${e}`);}return R},o),{})};

package/createApiResultFail.cjs.js

@@ -6,4 +6,4 @@ let createApiResultOk=(t={},e)=>({ok:!0,fail:!1,data:t,msg:e||"",status:200});le
 
 exports.createApiResultFail = createApiResultFail;
 exports.createApiResultOk = createApiResultOk;
-exports["default"] = createApiResultFail;
+exports.default = createApiResultFail;

package/createApiResultFail.esm.d.ts

@@ -0,0 +1,2 @@
+export * from "./createApiResultFail";
+export { default } from "./createApiResultFail";

package/createApiResultOk.cjs.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, '__esModule', { value: true });
 let createApiResultOk=(e={},t)=>({ok:!0,fail:!1,data:e,msg:t||"",status:200});
 
 exports.createApiResultOk = createApiResultOk;
-exports["default"] = createApiResultOk;
+exports.default = createApiResultOk;

package/createApiResultOk.esm.d.ts

@@ -0,0 +1,2 @@
+export * from "./createApiResultOk";
+export { default } from "./createApiResultOk";

package/createSwrApi.cjs.js

@@ -4,10 +4,6 @@ var e = require('swr');
 var utils = require('@koine/utils');
 var createApi = require('./createApi.cjs.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var e__default = /*#__PURE__*/_interopDefaultLegacy(e);
-
 /**
    * Conditional fetching as option
    *
@@ -42,7 +38,7 @@ var e__default = /*#__PURE__*/_interopDefaultLegacy(e);
     // }
     let a=async()=>{let{data:e}=await t.get(i,{...o||{},throwErr:!0});return e};// <Data = any, Error = any>(key: Key, config: SWRConfigurationExtended<Data, Error, Fetcher<Data>> | undefined): SWRResponse<Data, Error>;
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    return e__default["default"](p?.when===!1||utils.isFunction(p?.when)&&p?.when()===!1?null:o?[i,o]:[i],a,p)};/**
+    return e(p?.when===!1||utils.isFunction(p?.when)&&p?.when()===!1?null:o?[i,o]:[i],a,p)};/**
  * It creates an api client extended with auto-generated SWR wrapper hooks
  */let createSwrApi=(...e)=>{let r=createApi.createApi(...e);return r.use=createUseApi(r),r};
 

package/index.cjs.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var ApiError = require('./ApiError.cjs.js');
 var createApi = require('./createApi.cjs.js');
 var createApiResultFail = require('./createApiResultFail.cjs.js');

package/index.esm.d.ts

@@ -0,0 +1 @@
+export * from "./index";

package/next.cjs.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var server = require('next/server');
 var createApiResultFail = require('./createApiResultFail.cjs.js');
 var createApiResultOk = require('./createApiResultOk.cjs.js');

package/next.esm.d.ts

@@ -0,0 +1 @@
+export * from "./next";

package/package.json

@@ -2,7 +2,7 @@
   "name": "@koine/api",
   "sideEffects": false,
   "dependencies": {
-    "@koine/utils": "2.0.0-beta.113"
+    "@koine/utils": "2.0.0-beta.114"
   },
   "peerDependencies": {
     "next": "^14.0.4",
@@ -61,5 +61,5 @@
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js",
-  "version": "2.0.0-beta.113"
+  "version": "2.0.0-beta.114"
 }

package/swr-mutation.cjs.js

@@ -1,20 +1,14 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var r = require('swr/mutation');
 var createApi = require('./createApi.cjs.js');
 var createSwrApi = require('./createSwrApi.cjs.js');
 require('@koine/utils');
 require('swr');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var r__default = /*#__PURE__*/_interopDefaultLegacy(r);
-
 let a=(t,e)=>(a,o,i)=>// config.fetcher = sender;
         // eslint-disable-next-line react-hooks/rules-of-hooks
-        r__default["default"](// @ts-expect-error FIXME: I can't get it...
+        r(// @ts-expect-error FIXME: I can't get it...
         o?[a,o]:a,async(// if the first argument is an array the second one are the base options
         // defined when calling the usePost/Put/etc. hook, these will be overriden
         // by the _options just here below

package/swr-mutation.esm.d.ts

@@ -0,0 +1 @@
+export * from "./swr-mutation";

package/swr.cjs.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var createSwrApi = require('./createSwrApi.cjs.js');
 require('swr');
 require('@koine/utils');

package/swr.esm.d.ts

@@ -0,0 +1 @@
+export * from "./swr";

package/types.d.ts

@@ -1,9 +1,9 @@
 type _Response = Response;
-type ExtractEndpointParams<T extends string> = string extends T ? Record<string, string> : T extends `${infer _Start}{${infer Param}}${infer Rest}` ? {
+type ExtractEndpointParams<T extends string> = string | number extends T ? Record<string, string> : T extends `${infer _Start}{${infer Param}}${infer Rest}` ? {
     [k in Param | keyof ExtractEndpointParams<Rest>]: string | number;
 } : T extends `${infer _Start}{${infer Param}}` ? {
     [k in Param]: string | number;
-} : never;
+} : {};
 export declare namespace Api {
     export type ClientOptions = {
         headers?: RequestInit["headers"];