@koine/api 2.0.0-beta.80 → 2.0.0-beta.83

package/ApiError.cjs.js

@@ -2,13 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-class ApiError extends Error {
-    constructor(result) {
-        super(`Request failed with ${result.status} ${result.msg}`);
-        this.name = "ApiError";
-        Object.assign(this, result);
-    }
-}
+/**
+ * Custom `ApiError` class extending `Error` to throw in failed response.
+ *
+ * @see https://eslint.org/docs/rules/no-throw-literal
+ * @see https://github.com/sindresorhus/ky/blob/main/source/errors/HTTPError.ts
+ *
+ */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;

package/ApiError.esm.js

@@ -1,9 +1,9 @@
-class ApiError extends Error {
-    constructor(result) {
-        super(`Request failed with ${result.status} ${result.msg}`);
-        this.name = "ApiError";
-        Object.assign(this, result);
-    }
-}
+/**
+ * Custom `ApiError` class extending `Error` to throw in failed response.
+ *
+ * @see https://eslint.org/docs/rules/no-throw-literal
+ * @see https://github.com/sindresorhus/ky/blob/main/source/errors/HTTPError.ts
+ *
+ */class ApiError extends Error{constructor(r){super(`Request failed with ${r.status} ${r.msg}`),this.name="ApiError",Object.assign(this,r);}}
 
 export { ApiError, ApiError as default };

package/createApi.cjs.js

@@ -4,119 +4,24 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var utils = require('@koine/utils');
 
-let apiMethods = [
-    "get",
-    "post",
-    "put",
-    "patch",
-    "delete",
-];
-let createApi = (apiName, baseUrl, options) => {
-    const { headers: headersBase = {}, request: requestBase = {}, throwErr: throwErrBase, timeout: timeoutBase = 10000, processReq: processReqBase, processRes: processResBase, processErr: processErrBase, } = options || {};
-    return apiMethods.reduce((api, method) => {
-        api[method] = async (endpoint, options) => {
-            const { request = requestBase, headers = headersBase, timeout = timeoutBase, processReq, processRes = processResBase, processErr = processErrBase, throwErr = throwErrBase, } = options || {};
-            let { params, json, query } = options || {};
-            let url = `${baseUrl}/${endpoint + "".replace(/^\/*/, "")}`;
-            let requestInit = {
-                method: method.toUpperCase(),
-                ...request,
-                headers: {
-                    "content-type": "application/json",
-                    ...headers,
-                },
-            };
-            if (processReqBase) {
-                const transformed = processReqBase(method, url, query, json, params, requestInit);
-                url = transformed[0];
-                query = transformed[1];
-                json = transformed[2];
-                params = transformed[3];
-                requestInit = transformed[4];
-            }
-            if (processReq) {
-                const transformed = processReq(method, url, query, json, params, requestInit);
-                url = transformed[0];
-                query = transformed[1];
-                json = transformed[2];
-                params = transformed[3];
-                requestInit = transformed[4];
-            }
-            if (utils.isFullObject(params)) {
-                for (const key in params) {
-                    url = url.replace(`{${key}}`, params[key].toString());
-                }
-            }
-            const timeoutNumber = Number(timeout);
-            let controller;
-            let timeoutId;
-            if (json) {
-                requestInit.body = JSON.stringify(json);
-            }
-            if (timeoutNumber > 0) {
-                controller = new AbortController();
-                timeoutId = setTimeout(() => controller.abort(), timeoutNumber);
-                requestInit.signal = controller.signal;
-            }
-            if (query) {
-                url += utils.buildUrlQueryString(query);
-            }
-            let response = null;
-            let result = null;
-            let msg = "";
-            try {
-                response = await fetch(url, requestInit);
-            }
-            catch (e) {
-                msg = utils.errorToString(e);
-            }
-            if (timeoutId) {
-                clearTimeout(timeoutId);
-            }
-            if (response) {
-                try {
-                    if (processRes) {
-                        result = await processRes(response, options || {});
-                    }
-                    else {
-                        result = await response.json();
-                    }
-                }
-                catch (e) {
-                    msg = utils.errorToString(e);
-                }
-            }
-            if (result === null) {
-                if (processErr) {
-                    result = await processErr(msg, options || {});
-                }
-                else {
-                    result = {
-                        data: null,
-                        msg,
-                        status: 100,
-                        fail: true,
-                        ok: false,
-                    };
-                }
-            }
-            if (throwErr && result?.fail) {
-                throw result;
-            }
-            if (process.env["NODE_ENV"] === "development") {
-                const logMsg = `${result?.status}: api[${apiName}] ${method.toUpperCase()} ${url}`;
-                if (result?.ok) {
-                    console.info(`🟢 ${logMsg}`);
-                }
-                else {
-                    console.info(`🔴 ${logMsg}`);
-                }
-            }
-            return result;
-        };
-        return api;
-    }, {});
-};
+let o=["get","post","put","patch","delete"];/**
+ * Create api client
+ *
+ * @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
+    // @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
+    // 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);
+    // 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;

package/createApi.esm.js

@@ -1,117 +1,22 @@
 import { isFullObject, buildUrlQueryString, errorToString } from '@koine/utils';
 
-let apiMethods = [
-    "get",
-    "post",
-    "put",
-    "patch",
-    "delete",
-];
-let createApi = (apiName, baseUrl, options) => {
-    const { headers: headersBase = {}, request: requestBase = {}, throwErr: throwErrBase, timeout: timeoutBase = 10000, processReq: processReqBase, processRes: processResBase, processErr: processErrBase, } = options || {};
-    return apiMethods.reduce((api, method) => {
-        api[method] = async (endpoint, options) => {
-            const { request = requestBase, headers = headersBase, timeout = timeoutBase, processReq, processRes = processResBase, processErr = processErrBase, throwErr = throwErrBase, } = options || {};
-            let { params, json, query } = options || {};
-            let url = `${baseUrl}/${endpoint + "".replace(/^\/*/, "")}`;
-            let requestInit = {
-                method: method.toUpperCase(),
-                ...request,
-                headers: {
-                    "content-type": "application/json",
-                    ...headers,
-                },
-            };
-            if (processReqBase) {
-                const transformed = processReqBase(method, url, query, json, params, requestInit);
-                url = transformed[0];
-                query = transformed[1];
-                json = transformed[2];
-                params = transformed[3];
-                requestInit = transformed[4];
-            }
-            if (processReq) {
-                const transformed = processReq(method, url, query, json, params, requestInit);
-                url = transformed[0];
-                query = transformed[1];
-                json = transformed[2];
-                params = transformed[3];
-                requestInit = transformed[4];
-            }
-            if (isFullObject(params)) {
-                for (const key in params) {
-                    url = url.replace(`{${key}}`, params[key].toString());
-                }
-            }
-            const timeoutNumber = Number(timeout);
-            let controller;
-            let timeoutId;
-            if (json) {
-                requestInit.body = JSON.stringify(json);
-            }
-            if (timeoutNumber > 0) {
-                controller = new AbortController();
-                timeoutId = setTimeout(() => controller.abort(), timeoutNumber);
-                requestInit.signal = controller.signal;
-            }
-            if (query) {
-                url += buildUrlQueryString(query);
-            }
-            let response = null;
-            let result = null;
-            let msg = "";
-            try {
-                response = await fetch(url, requestInit);
-            }
-            catch (e) {
-                msg = errorToString(e);
-            }
-            if (timeoutId) {
-                clearTimeout(timeoutId);
-            }
-            if (response) {
-                try {
-                    if (processRes) {
-                        result = await processRes(response, options || {});
-                    }
-                    else {
-                        result = await response.json();
-                    }
-                }
-                catch (e) {
-                    msg = errorToString(e);
-                }
-            }
-            if (result === null) {
-                if (processErr) {
-                    result = await processErr(msg, options || {});
-                }
-                else {
-                    result = {
-                        data: null,
-                        msg,
-                        status: 100,
-                        fail: true,
-                        ok: false,
-                    };
-                }
-            }
-            if (throwErr && result?.fail) {
-                throw result;
-            }
-            if (process.env["NODE_ENV"] === "development") {
-                const logMsg = `${result?.status}: api[${apiName}] ${method.toUpperCase()} ${url}`;
-                if (result?.ok) {
-                    console.info(`🟢 ${logMsg}`);
-                }
-                else {
-                    console.info(`🔴 ${logMsg}`);
-                }
-            }
-            return result;
-        };
-        return api;
-    }, {});
-};
+let o=["get","post","put","patch","delete"];/**
+ * Create api client
+ *
+ * @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
+    // @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
+    // 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);
+    // 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),{})};
 
 export { createApi, createApi as default };

package/createApiResultFail.cjs.js

@@ -2,19 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-let createApiResultOk = (data = {}, msg) => ({
-    ok: true,
-    fail: false,
-    data,
-    msg: msg || "",
-    status: 200,
-});
-let createApiResultFail = (data = {}, msg, status) => ({
-    fail: true,
-    data,
-    msg: msg || "",
-    status: status || 404,
-});
+let createApiResultOk=(t={},e)=>({ok:!0,fail:!1,data:t,msg:e||"",status:200});let createApiResultFail=(t={},e,a)=>({fail:!0,data:t,msg:e||"",status:a||404});
 
 exports.createApiResultFail = createApiResultFail;
 exports.createApiResultOk = createApiResultOk;

package/createApiResultFail.esm.js

@@ -1,15 +1,3 @@
-let createApiResultOk = (data = {}, msg) => ({
-    ok: true,
-    fail: false,
-    data,
-    msg: msg || "",
-    status: 200,
-});
-let createApiResultFail = (data = {}, msg, status) => ({
-    fail: true,
-    data,
-    msg: msg || "",
-    status: status || 404,
-});
+let createApiResultOk=(t={},e)=>({ok:!0,fail:!1,data:t,msg:e||"",status:200});let createApiResultFail=(t={},e,a)=>({fail:!0,data:t,msg:e||"",status:a||404});
 
 export { createApiResultFail, createApiResultOk, createApiResultFail as default };

package/createApiResultOk.cjs.js

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

package/createApiResultOk.esm.js

@@ -1,9 +1,3 @@
-let createApiResultOk = (data = {}, msg) => ({
-    ok: true,
-    fail: false,
-    data,
-    msg: msg || "",
-    status: 200,
-});
+let createApiResultOk=(e={},t)=>({ok:!0,fail:!1,data:e,msg:t||"",status:200});
 
 export { createApiResultOk, createApiResultOk as default };

package/createSwrApi.cjs.js

@@ -1,30 +1,52 @@
 'use strict';
 
-var useSWR = require('swr');
+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 useSWR__default = /*#__PURE__*/_interopDefaultLegacy(useSWR);
+var e__default = /*#__PURE__*/_interopDefaultLegacy(e);
 
-let createUseApi = (api) => (endpoint, options, config) => {
-    const fetcher = async () => {
-        const { data } = await api.get(endpoint, {
-            ...(options || {}),
-            throwErr: true,
-        });
-        return data;
-    };
-    const shouldNotFetch = config?.when === false ||
-        (utils.isFunction(config?.when) && config?.when() === false);
-    return useSWR__default["default"](shouldNotFetch ? null : options ? [endpoint, options] : [endpoint], fetcher, config);
-};
-let createSwrApi = (...args) => {
-    const api = createApi.createApi(...args);
-    api.use = createUseApi(api);
-    return api;
-};
+/**
+   * Conditional fetching as option
+   *
+   * Moving this to an option allows us to keep the endpoints typed dictionary,
+   * e.g. we can write:
+   *
+   * ```js
+   * const { data, mutate } = myApi.use("User/{id}",
+   *  { params: { id: aVariableMaybeContainingAnId || "" }, },
+   *  { when: !!aVariableMaybeContainingAnId }
+   * );
+   *
+   * // we still have typed `data`, `mutate`
+   * ```
+   * @see https://swr.vercel.app/docs/conditional-fetching
+   *//**
+ * @private
+ *//**
+ * @private
+ */let createUseApi=t=>(i,o,p)=>{// const fetcher = async (_endpoint: TEndpoint) => {
+    //   try {
+    //     const { ok, data } = await api.get(_endpoint, {
+    //         ...(options || {}),
+    //         throwErr: true,
+    //       });
+    //       if (ok) {
+    //         return data;
+    //       }
+    //       throw new Error() as unknown as Api.EndpointResponseFail<TEndpoints, TEndpoint, TMethod>;
+    //     } catch(e) {
+    //       throw new Error() as unknown as Api.EndpointResponseFail<TEndpoints, TEndpoint, TMethod>;;
+    //     }
+    //   };
+    // }
+    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)};/**
+ * 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};
 
 exports.createSwrApi = createSwrApi;
 exports.createUseApi = createUseApi;

package/createSwrApi.esm.js

@@ -1,23 +1,45 @@
-import useSWR from 'swr';
+import e from 'swr';
 import { isFunction } from '@koine/utils';
 import { createApi } from './createApi.esm.js';
 
-let createUseApi = (api) => (endpoint, options, config) => {
-    const fetcher = async () => {
-        const { data } = await api.get(endpoint, {
-            ...(options || {}),
-            throwErr: true,
-        });
-        return data;
-    };
-    const shouldNotFetch = config?.when === false ||
-        (isFunction(config?.when) && config?.when() === false);
-    return useSWR(shouldNotFetch ? null : options ? [endpoint, options] : [endpoint], fetcher, config);
-};
-let createSwrApi = (...args) => {
-    const api = createApi(...args);
-    api.use = createUseApi(api);
-    return api;
-};
+/**
+   * Conditional fetching as option
+   *
+   * Moving this to an option allows us to keep the endpoints typed dictionary,
+   * e.g. we can write:
+   *
+   * ```js
+   * const { data, mutate } = myApi.use("User/{id}",
+   *  { params: { id: aVariableMaybeContainingAnId || "" }, },
+   *  { when: !!aVariableMaybeContainingAnId }
+   * );
+   *
+   * // we still have typed `data`, `mutate`
+   * ```
+   * @see https://swr.vercel.app/docs/conditional-fetching
+   *//**
+ * @private
+ *//**
+ * @private
+ */let createUseApi=t=>(i,o,p)=>{// const fetcher = async (_endpoint: TEndpoint) => {
+    //   try {
+    //     const { ok, data } = await api.get(_endpoint, {
+    //         ...(options || {}),
+    //         throwErr: true,
+    //       });
+    //       if (ok) {
+    //         return data;
+    //       }
+    //       throw new Error() as unknown as Api.EndpointResponseFail<TEndpoints, TEndpoint, TMethod>;
+    //     } catch(e) {
+    //       throw new Error() as unknown as Api.EndpointResponseFail<TEndpoints, TEndpoint, TMethod>;;
+    //     }
+    //   };
+    // }
+    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(p?.when===!1||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(...e);return r.use=createUseApi(r),r};
 
 export { createUseApi as a, createSwrApi as c };

package/next.cjs.js

@@ -6,23 +6,9 @@ var server = require('next/server');
 var createApiResultFail = require('./createApiResultFail.cjs.js');
 var createApiResultOk = require('./createApiResultOk.cjs.js');
 
-let nextApiResponse = {
-    ok(data, msg) {
-        return server.NextResponse.json(createApiResultOk.createApiResultOk(data, msg));
-    },
-    fail(data, msg, status) {
-        return server.NextResponse.json(createApiResultFail.createApiResultFail(data, msg, status));
-    },
-};
+let nextApiResponse={ok:(t,r)=>server.NextResponse.json(createApiResultOk.createApiResultOk(t,r)),fail:(o,r,p)=>server.NextResponse.json(createApiResultFail.createApiResultFail(o,r,p))};
 
-let nextApiResponse12 = (nextRes) => ({
-    ok(data, msg) {
-        nextRes.status(200).json(createApiResultOk.createApiResultOk(data, msg));
-    },
-    fail(data, msg, status) {
-        nextRes.status(status || 404).json(createApiResultFail.createApiResultFail(data, msg, status));
-    },
-});
+let nextApiResponse12=s=>({ok(e,o){s.status(200).json(createApiResultOk.createApiResultOk(e,o));},fail(t,o,p){s.status(p||404).json(createApiResultFail.createApiResultFail(t,o,p));}});
 
 exports.nextApiResponse = nextApiResponse;
 exports.nextApiResponse12 = nextApiResponse12;

package/next.esm.js

@@ -2,22 +2,8 @@ import { NextResponse } from 'next/server';
 import { createApiResultFail } from './createApiResultFail.esm.js';
 import { createApiResultOk } from './createApiResultOk.esm.js';
 
-let nextApiResponse = {
-    ok(data, msg) {
-        return NextResponse.json(createApiResultOk(data, msg));
-    },
-    fail(data, msg, status) {
-        return NextResponse.json(createApiResultFail(data, msg, status));
-    },
-};
+let nextApiResponse={ok:(t,r)=>NextResponse.json(createApiResultOk(t,r)),fail:(o,r,p)=>NextResponse.json(createApiResultFail(o,r,p))};
 
-let nextApiResponse12 = (nextRes) => ({
-    ok(data, msg) {
-        nextRes.status(200).json(createApiResultOk(data, msg));
-    },
-    fail(data, msg, status) {
-        nextRes.status(status || 404).json(createApiResultFail(data, msg, status));
-    },
-});
+let nextApiResponse12=s=>({ok(e,o){s.status(200).json(createApiResultOk(e,o));},fail(t,o,p){s.status(p||404).json(createApiResultFail(t,o,p));}});
 
 export { nextApiResponse, nextApiResponse12 };

package/package.json

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

package/swr/createSwrApi.d.ts

@@ -3,7 +3,9 @@ import type { Api } from "../types";
 type SWRConfigurationExtended<Data = any, Error = any, Fn extends BareFetcher<any> = BareFetcher<any>> = SWRConfiguration<Data, Error, Fn> & {
     when?: boolean | (() => boolean);
 };
+export type CreatedUseApi<TEndpoints extends Api.Endpoints> = ReturnType<typeof createUseApi<TEndpoints>>;
+export declare let createUseApi: <TEndpoints extends Api.Endpoints>(api: Api.Client<TEndpoints>) => <TEndpoint extends Extract<keyof TEndpoints, string>>(endpoint: TEndpoint, options?: Api.EndpointOptions<TEndpoints, TEndpoint, "get">, config?: SWRConfigurationExtended<Api.EndpointResponseOk<TEndpoints, TEndpoint, "get">, Api.EndpointResponseFail<TEndpoints, TEndpoint, "get">>) => SWRResponse<Api.GetDataType<TEndpoints, TEndpoint, "get", "ok">, Api.GetDataType<TEndpoints, TEndpoint, "get", "fail">, any>;
 export declare let createSwrApi: <TEndpoints extends Api.Endpoints>(apiName: string, baseUrl: string, options?: Api.ClientOptions | undefined) => Api.Client<TEndpoints> & {
-    use: <TEndpoint extends Extract<keyof TEndpoints, string>>(endpoint: TEndpoint, options?: Api.EndpointOptions<TEndpoints, TEndpoint, "get"> | undefined, config?: SWRConfigurationExtended<Api.GetDataType<TEndpoints, TEndpoint, "get", "ok">, Api.GetDataType<TEndpoints, TEndpoint, "get", "fail">, BareFetcher<any>> | undefined) => SWRResponse<Api.GetDataType<TEndpoints, TEndpoint, "get", "ok">, Api.GetDataType<TEndpoints, TEndpoint, "get", "fail">, any>;
+    use: CreatedUseApi<TEndpoints>;
 };
 export default createSwrApi;

package/swr-mutation/createSwrMutationApi.d.ts

@@ -1,5 +1,5 @@
 import { type SWRMutationConfiguration, type SWRMutationResponse } from "swr/mutation";
-import { createUseApi } from "../swr/createSwrApi";
+import { type CreatedUseApi } from "../swr/createSwrApi";
 import type { Api } from "../types";
 type MutationRequestMethod = Exclude<Api.RequestMethod, "get">;
 type MutationHookName = Exclude<keyof Api.HooksMapsByName, "use">;
@@ -10,10 +10,6 @@ export declare let createSwrMutationApi: <TEndpoints extends Api.Endpoints>(apiN
     usePatch: KoineApiMethodHookSWR<"usePatch", TEndpoints>;
     useDelete: KoineApiMethodHookSWR<"useDelete", TEndpoints>;
 } & {
-    use: <TEndpoint extends Extract<keyof TEndpoints, string>>(endpoint: TEndpoint, options?: Api.EndpointOptions<TEndpoints, TEndpoint, "get"> | undefined, config?: (Partial<import("swr/dist/_internal").PublicConfiguration<Api.GetDataType<TEndpoints, TEndpoint, "get", "ok">, Api.GetDataType<TEndpoints, TEndpoint, "get", "fail">, import("swr/dist/_internal").BareFetcher<any>>> & Partial<import("swr/dist/_internal").ProviderConfiguration> & {
-        provider?: ((cache: Readonly<import("swr/dist/_internal").Cache<any>>) => import("swr/dist/_internal").Cache<any>) | undefined;
-    } & {
-        when?: boolean | (() => boolean) | undefined;
-    }) | undefined) => import("swr/dist/_internal").SWRResponse<Api.GetDataType<TEndpoints, TEndpoint, "get", "ok">, Api.GetDataType<TEndpoints, TEndpoint, "get", "fail">, any>;
+    use: CreatedUseApi<TEndpoints>;
 };
 export default createSwrMutationApi;

package/swr-mutation.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var useSWRMutation = require('swr/mutation');
+var r = require('swr/mutation');
 var createApi = require('./createApi.cjs.js');
 var createSwrApi = require('./createSwrApi.cjs.js');
 require('@koine/utils');
@@ -10,29 +10,17 @@ require('swr');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var useSWRMutation__default = /*#__PURE__*/_interopDefaultLegacy(useSWRMutation);
+var r__default = /*#__PURE__*/_interopDefaultLegacy(r);
 
-let createUseMutationApi = (api, method) => (endpoint, options, config) => {
-    const sender = async (_endpoint, _options) => {
-        const endpoint = Array.isArray(_endpoint) ? _endpoint[0] : _endpoint;
-        const options = Array.isArray(_endpoint) ? _endpoint[1] : {};
-        const { ok, data } = await api[method](endpoint, {
-            ...options,
-            ...(_options.arg || {}),
-            throwErr: true,
-        });
-        return ok ? data : data;
-    };
-    return useSWRMutation__default["default"](options ? [endpoint, options] : endpoint, sender, config);
-};
-let createSwrMutationApi = (...args) => {
-    const api = createApi.createApi(...args);
-    api.use = createSwrApi.createUseApi(api);
-    ["post", "put", "patch", "delete"].forEach((method) => {
-        const hookName = `use${method.charAt(0).toUpperCase() + method.slice(1)}`;
-        api[hookName] = createUseMutationApi(api, method);
-    });
-    return api;
-};
+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...
+        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
+        r,// these are the options arriving when calling `trigger({ json, query, etc... })
+        a)=>{let o=Array.isArray(r)?r[0]:r,i=Array.isArray(r)?r[1]:{},{ok:p,data:s}=await t[e](o,{...i,...a.arg||{},throwErr:!0});return s},i);/**
+ * It creates an api client extended with auto-generated SWR wrapper hooks
+ */let createSwrMutationApi=(...r)=>{let o=createApi.createApi(...r);return o.use=createSwrApi.createUseApi(o),["post","put","patch","delete"].forEach(r=>{o[`use${r.charAt(0).toUpperCase()+r.slice(1)}`]=a(o,r);}),o};
 
 exports.createSwrMutationApi = createSwrMutationApi;

package/swr-mutation.esm.js

@@ -1,30 +1,18 @@
-import useSWRMutation from 'swr/mutation';
+import r from 'swr/mutation';
 import { createApi } from './createApi.esm.js';
 import { a as createUseApi } from './createSwrApi.esm.js';
 import '@koine/utils';
 import 'swr';
 
-let createUseMutationApi = (api, method) => (endpoint, options, config) => {
-    const sender = async (_endpoint, _options) => {
-        const endpoint = Array.isArray(_endpoint) ? _endpoint[0] : _endpoint;
-        const options = Array.isArray(_endpoint) ? _endpoint[1] : {};
-        const { ok, data } = await api[method](endpoint, {
-            ...options,
-            ...(_options.arg || {}),
-            throwErr: true,
-        });
-        return ok ? data : data;
-    };
-    return useSWRMutation(options ? [endpoint, options] : endpoint, sender, config);
-};
-let createSwrMutationApi = (...args) => {
-    const api = createApi(...args);
-    api.use = createUseApi(api);
-    ["post", "put", "patch", "delete"].forEach((method) => {
-        const hookName = `use${method.charAt(0).toUpperCase() + method.slice(1)}`;
-        api[hookName] = createUseMutationApi(api, method);
-    });
-    return api;
-};
+let a=(t,e)=>(a,o,i)=>// config.fetcher = sender;
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        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
+        r,// these are the options arriving when calling `trigger({ json, query, etc... })
+        a)=>{let o=Array.isArray(r)?r[0]:r,i=Array.isArray(r)?r[1]:{},{ok:p,data:s}=await t[e](o,{...i,...a.arg||{},throwErr:!0});return s},i);/**
+ * It creates an api client extended with auto-generated SWR wrapper hooks
+ */let createSwrMutationApi=(...r)=>{let o=createApi(...r);return o.use=createUseApi(o),["post","put","patch","delete"].forEach(r=>{o[`use${r.charAt(0).toUpperCase()+r.slice(1)}`]=a(o,r);}),o};
 
 export { createSwrMutationApi };