@koine/api 2.0.0-beta.2 → 2.0.0-beta.4

package/ApiError.js

@@ -1,23 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiError = void 0;
-var tslib_1 = require("tslib");
 /**
  * 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
  *
- */
-var ApiError = /** @class */ (function (_super) {
-    tslib_1.__extends(ApiError, _super);
-    function ApiError(result) {
-        var _this = _super.call(this, "Request failed with ".concat(result.status, " ").concat(result.msg)) || this;
-        _this.name = "ApiError";
-        Object.assign(_this, result);
-        return _this;
+ */ "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    ApiError: function() {
+        return ApiError;
+    },
+    default: function() {
+        return _default;
     }
-    return ApiError;
-}(Error));
-exports.ApiError = ApiError;
-exports.default = ApiError;
+});
+let ApiError = class ApiError extends Error {
+    constructor(result){
+        super(`Request failed with ${result.status} ${result.msg}`);
+        this.name = "ApiError";
+        Object.assign(this, result);
+    }
+};
+const _default = ApiError;

package/ApiError.mjs

@@ -1,20 +1,14 @@
-import { __extends } from "tslib";
 /**
  * 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
  *
- */
-var ApiError = /** @class */ (function (_super) {
-    __extends(ApiError, _super);
-    function ApiError(result) {
-        var _this = _super.call(this, "Request failed with ".concat(result.status, " ").concat(result.msg)) || this;
-        _this.name = "ApiError";
-        Object.assign(_this, result);
-        return _this;
+ */ export class ApiError extends Error {
+    constructor(result){
+        super(`Request failed with ${result.status} ${result.msg}`);
+        this.name = "ApiError";
+        Object.assign(this, result);
     }
-    return ApiError;
-}(Error));
-export { ApiError };
+}
 export default ApiError;

package/createApi.js

@@ -1,148 +1,142 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createApi = void 0;
-var tslib_1 = require("tslib");
-var buildUrlQueryString_1 = require("@koine/utils/buildUrlQueryString");
-var isFullObject_1 = require("@koine/utils/isFullObject");
-var errorToString_1 = require("@koine/utils/errorToString");
-/**
- * Create api client
- *
- * @param apiName Short name to use in debug logs
- * @param baseUrl Either relativ eor absolute, it must end without trailing slash
- */
-var createApi = function (apiName, baseUrl, options) {
-    var _a = options || {}, _b = _a.headers, headersBase = _b === void 0 ? {} : _b, _c = _a.request, requestBase = _c === void 0 ? {
-        referrerPolicy: "no-referrer",
-        // credentials: "include",
-        // mode: "cors",
-        // redirect: "follow",
-        // cache: "no-cache",
-    } : _c, throwErrBase = _a.throwErr, _d = _a.timeout, timeoutBase = _d === void 0 ? 10000 : _d, processReqBase = _a.processReq, processResBase = _a.processRes, processErrBase = _a.processErr;
-    return ["get", "post", "put", "patch", "delete"].reduce(function (api, method) {
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    createApi: function() {
+        return createApi;
+    },
+    default: function() {
+        return _default;
+    }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _buildUrlQueryString = /*#__PURE__*/ _interop_require_default._(require("@koine/utils/buildUrlQueryString"));
+const _errorToString = /*#__PURE__*/ _interop_require_default._(require("@koine/utils/errorToString"));
+const _isFullObject = /*#__PURE__*/ _interop_require_default._(require("@koine/utils/isFullObject"));
+const createApi = (apiName, baseUrl, options)=>{
+    const { headers: headersBase = {}, request: requestBase = {
+        referrerPolicy: "no-referrer"
+    }, throwErr: throwErrBase, timeout: timeoutBase = 10000, processReq: processReqBase, processRes: processResBase, processErr: processErrBase } = options || {};
+    return [
+        "get",
+        "post",
+        "put",
+        "patch",
+        "delete"
+    ].reduce((api, method)=>{
         // @ts-expect-error FIXME: type
-        api[method] = function (endpoint, options) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-            var _a, _b, request, _c, headers, _d, timeout, processReq, _e, processRes, _f, processErr, _g, throwErr, _h, params, json, query, url, requestInit, transformed, transformed, key, timeoutNumber, controller, timeoutId, response, result, msg, e_1, e_2, logMsg;
-            return tslib_1.__generator(this, function (_j) {
-                switch (_j.label) {
-                    case 0:
-                        _a = options || {}, _b = _a.request, request = _b === void 0 ? requestBase : _b, _c = _a.headers, headers = _c === void 0 ? headersBase : _c, _d = _a.timeout, timeout = _d === void 0 ? timeoutBase : _d, processReq = _a.processReq, _e = _a.processRes, processRes = _e === void 0 ? processResBase : _e, _f = _a.processErr, processErr = _f === void 0 ? processErrBase : _f, _g = _a.throwErr, throwErr = _g === void 0 ? throwErrBase : _g;
-                        _h = options || {}, params = _h.params, json = _h.json, query = _h.query;
-                        url = "".concat(baseUrl, "/").concat(endpoint + "".replace(/^\/*/, ""));
-                        requestInit = tslib_1.__assign(tslib_1.__assign({ method: method.toUpperCase() }, request), { headers: tslib_1.__assign({ "content-type": "application/json" }, headers) });
-                        if (processReqBase) {
-                            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) {
-                            transformed = processReq(method, url, query, json, params, requestInit);
-                            url = transformed[0];
-                            query = transformed[1];
-                            json = transformed[2];
-                            params = transformed[3];
-                            requestInit = transformed[4];
-                        }
-                        if ((0, isFullObject_1.default)(params)) {
-                            for (key in params) {
-                                url = url.replace("{".concat(key, "}"), params[key].toString());
-                            }
-                        }
-                        timeoutNumber = Number(timeout);
-                        if (json) {
-                            requestInit.body = JSON.stringify(json);
-                        }
-                        if (timeoutNumber > 0) {
-                            controller = new AbortController();
-                            timeoutId = setTimeout(function () { return controller.abort(); }, timeoutNumber);
-                            requestInit.signal = controller.signal;
-                        }
-                        if (query) {
-                            // FIXME: ts-expect-error this assertion is not the best, but nevermind for now
-                            url += (0, buildUrlQueryString_1.default)(query);
-                        }
-                        response = null;
-                        result = null;
-                        msg = "";
-                        _j.label = 1;
-                    case 1:
-                        _j.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, fetch(url, requestInit)];
-                    case 2:
-                        response = _j.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        e_1 = _j.sent();
-                        msg = (0, errorToString_1.default)(e_1);
-                        return [3 /*break*/, 4];
-                    case 4:
-                        if (timeoutId) {
-                            clearTimeout(timeoutId);
-                        }
-                        if (!response) return [3 /*break*/, 11];
-                        _j.label = 5;
-                    case 5:
-                        _j.trys.push([5, 10, , 11]);
-                        if (!processRes) return [3 /*break*/, 7];
-                        return [4 /*yield*/, processRes(response, options || {})];
-                    case 6:
-                        result = _j.sent();
-                        return [3 /*break*/, 9];
-                    case 7: return [4 /*yield*/, response.json()];
-                    case 8:
-                        result = _j.sent();
-                        _j.label = 9;
-                    case 9: return [3 /*break*/, 11];
-                    case 10:
-                        e_2 = _j.sent();
-                        msg = (0, errorToString_1.default)(e_2);
-                        return [3 /*break*/, 11];
-                    case 11:
-                        if (!(result === null)) return [3 /*break*/, 14];
-                        if (!processErr) return [3 /*break*/, 13];
-                        return [4 /*yield*/, processErr(msg, options || {})];
-                    case 12:
-                        result = _j.sent();
-                        return [3 /*break*/, 14];
-                    case 13:
-                        // 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)
-                        result = {
-                            data: null,
-                            msg: msg,
-                            status: 100,
-                            fail: true,
-                            ok: false,
-                        };
-                        _j.label = 14;
-                    case 14:
-                        if (throwErr && (result === null || result === void 0 ? void 0 : result.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 result;
-                        }
-                        if (process.env["NODE_ENV"] !== "production") {
-                            logMsg = "".concat(result === null || result === void 0 ? void 0 : result.status, ": api[").concat(apiName, "] ").concat(method.toUpperCase(), " ").concat(url);
-                            if (result === null || result === void 0 ? void 0 : result.ok) {
-                                console.info("\uD83D\uDFE2 ".concat(logMsg));
-                            }
-                            else {
-                                console.info("\uD83D\uDD34 ".concat(logMsg));
-                            }
-                        }
-                        return [2 /*return*/, result];
+        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 ((0, _isFullObject.default)(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) {
+                // FIXME: ts-expect-error this assertion is not the best, but nevermind for now
+                url += (0, _buildUrlQueryString.default)(query);
+            }
+            let response = null;
+            let result = null;
+            let msg = "";
+            try {
+                response = await fetch(url, requestInit);
+            } catch (e) {
+                msg = (0, _errorToString.default)(e);
+            }
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+            if (response) {
+                try {
+                    if (processRes) {
+                        result = await processRes(response, options || {});
+                    } else {
+                        result = await response.json();
+                    }
+                } catch (e) {
+                    msg = (0, _errorToString.default)(e);
+                }
+            }
+            if (result === null) {
+                if (processErr) {
+                    result = await processErr(msg, options || {});
+                } else {
+                    // 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)
+                    result = {
+                        data: null,
+                        msg,
+                        status: 100,
+                        fail: true,
+                        ok: false
+                    };
+                }
+            }
+            if (throwErr && result?.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 result;
+            }
+            if (process.env["NODE_ENV"] !== "production") {
+                const logMsg = `${result?.status}: api[${apiName}] ${method.toUpperCase()} ${url}`;
+                if (result?.ok) {
+                    console.info(`🟢 ${logMsg}`);
+                } else {
+                    console.info(`🔴 ${logMsg}`);
+                }
+            }
+            return result;
+        };
         return api;
     }, {});
 };
-exports.createApi = createApi;
-exports.default = exports.createApi;
+const _default = createApi;

package/createApi.mjs

@@ -1,143 +1,127 @@
-import { __assign, __awaiter, __generator } from "tslib";
 import buildUrlQueryString from "@koine/utils/buildUrlQueryString";
-import isFullObject from "@koine/utils/isFullObject";
 import errorToString from "@koine/utils/errorToString";
+import isFullObject from "@koine/utils/isFullObject";
 /**
  * Create api client
  *
  * @param apiName Short name to use in debug logs
  * @param baseUrl Either relativ eor absolute, it must end without trailing slash
- */
-export var createApi = function (apiName, baseUrl, options) {
-    var _a = options || {}, _b = _a.headers, headersBase = _b === void 0 ? {} : _b, _c = _a.request, requestBase = _c === void 0 ? {
-        referrerPolicy: "no-referrer",
-        // credentials: "include",
-        // mode: "cors",
-        // redirect: "follow",
-        // cache: "no-cache",
-    } : _c, throwErrBase = _a.throwErr, _d = _a.timeout, timeoutBase = _d === void 0 ? 10000 : _d, processReqBase = _a.processReq, processResBase = _a.processRes, processErrBase = _a.processErr;
-    return ["get", "post", "put", "patch", "delete"].reduce(function (api, method) {
+ */ export const createApi = (apiName, baseUrl, options)=>{
+    const { headers: headersBase = {}, request: requestBase = {
+        referrerPolicy: "no-referrer"
+    }, throwErr: throwErrBase, timeout: timeoutBase = 10000, processReq: processReqBase, processRes: processResBase, processErr: processErrBase } = options || {};
+    return [
+        "get",
+        "post",
+        "put",
+        "patch",
+        "delete"
+    ].reduce((api, method)=>{
         // @ts-expect-error FIXME: type
-        api[method] = function (endpoint, options) { return __awaiter(void 0, void 0, void 0, function () {
-            var _a, _b, request, _c, headers, _d, timeout, processReq, _e, processRes, _f, processErr, _g, throwErr, _h, params, json, query, url, requestInit, transformed, transformed, key, timeoutNumber, controller, timeoutId, response, result, msg, e_1, e_2, logMsg;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
-                    case 0:
-                        _a = options || {}, _b = _a.request, request = _b === void 0 ? requestBase : _b, _c = _a.headers, headers = _c === void 0 ? headersBase : _c, _d = _a.timeout, timeout = _d === void 0 ? timeoutBase : _d, processReq = _a.processReq, _e = _a.processRes, processRes = _e === void 0 ? processResBase : _e, _f = _a.processErr, processErr = _f === void 0 ? processErrBase : _f, _g = _a.throwErr, throwErr = _g === void 0 ? throwErrBase : _g;
-                        _h = options || {}, params = _h.params, json = _h.json, query = _h.query;
-                        url = "".concat(baseUrl, "/").concat(endpoint + "".replace(/^\/*/, ""));
-                        requestInit = __assign(__assign({ method: method.toUpperCase() }, request), { headers: __assign({ "content-type": "application/json" }, headers) });
-                        if (processReqBase) {
-                            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) {
-                            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 (key in params) {
-                                url = url.replace("{".concat(key, "}"), params[key].toString());
-                            }
-                        }
-                        timeoutNumber = Number(timeout);
-                        if (json) {
-                            requestInit.body = JSON.stringify(json);
-                        }
-                        if (timeoutNumber > 0) {
-                            controller = new AbortController();
-                            timeoutId = setTimeout(function () { return controller.abort(); }, timeoutNumber);
-                            requestInit.signal = controller.signal;
-                        }
-                        if (query) {
-                            // FIXME: ts-expect-error this assertion is not the best, but nevermind for now
-                            url += buildUrlQueryString(query);
-                        }
-                        response = null;
-                        result = null;
-                        msg = "";
-                        _j.label = 1;
-                    case 1:
-                        _j.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, fetch(url, requestInit)];
-                    case 2:
-                        response = _j.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        e_1 = _j.sent();
-                        msg = errorToString(e_1);
-                        return [3 /*break*/, 4];
-                    case 4:
-                        if (timeoutId) {
-                            clearTimeout(timeoutId);
-                        }
-                        if (!response) return [3 /*break*/, 11];
-                        _j.label = 5;
-                    case 5:
-                        _j.trys.push([5, 10, , 11]);
-                        if (!processRes) return [3 /*break*/, 7];
-                        return [4 /*yield*/, processRes(response, options || {})];
-                    case 6:
-                        result = _j.sent();
-                        return [3 /*break*/, 9];
-                    case 7: return [4 /*yield*/, response.json()];
-                    case 8:
-                        result = _j.sent();
-                        _j.label = 9;
-                    case 9: return [3 /*break*/, 11];
-                    case 10:
-                        e_2 = _j.sent();
-                        msg = errorToString(e_2);
-                        return [3 /*break*/, 11];
-                    case 11:
-                        if (!(result === null)) return [3 /*break*/, 14];
-                        if (!processErr) return [3 /*break*/, 13];
-                        return [4 /*yield*/, processErr(msg, options || {})];
-                    case 12:
-                        result = _j.sent();
-                        return [3 /*break*/, 14];
-                    case 13:
-                        // 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)
-                        result = {
-                            data: null,
-                            msg: msg,
-                            status: 100,
-                            fail: true,
-                            ok: false,
-                        };
-                        _j.label = 14;
-                    case 14:
-                        if (throwErr && (result === null || result === void 0 ? void 0 : result.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 result;
-                        }
-                        if (process.env["NODE_ENV"] !== "production") {
-                            logMsg = "".concat(result === null || result === void 0 ? void 0 : result.status, ": api[").concat(apiName, "] ").concat(method.toUpperCase(), " ").concat(url);
-                            if (result === null || result === void 0 ? void 0 : result.ok) {
-                                console.info("\uD83D\uDFE2 ".concat(logMsg));
-                            }
-                            else {
-                                console.info("\uD83D\uDD34 ".concat(logMsg));
-                            }
-                        }
-                        return [2 /*return*/, result];
+        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) {
+                // FIXME: ts-expect-error this assertion is not the best, but nevermind for now
+                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 {
+                    // 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)
+                    result = {
+                        data: null,
+                        msg,
+                        status: 100,
+                        fail: true,
+                        ok: false
+                    };
+                }
+            }
+            if (throwErr && result?.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 result;
+            }
+            if (process.env["NODE_ENV"] !== "production") {
+                const logMsg = `${result?.status}: api[${apiName}] ${method.toUpperCase()} ${url}`;
+                if (result?.ok) {
+                    console.info(`🟢 ${logMsg}`);
+                } else {
+                    console.info(`🔴 ${logMsg}`);
                 }
-            });
-        }); };
+            }
+            return result;
+        };
         return api;
     }, {});
 };

package/createSwrApi.d.ts

@@ -1,4 +1,5 @@
-import { type SWRConfiguration, type SWRResponse, type BareFetcher } from "swr";
+import { type BareFetcher, // type Fetcher,
+type SWRConfiguration, type SWRResponse } from "swr";
 import { type SWRMutationConfiguration, type SWRMutationResponse } from "swr/mutation";
 type SWRConfigurationExtended<Data = any, Error = any, Fn extends BareFetcher<any> = BareFetcher<any>> = SWRConfiguration<Data, Error, Fn> & {
     /**

package/createSwrApi.js

@@ -1,15 +1,29 @@
-"use strict";
 "use client";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSwrApi = void 0;
-var tslib_1 = require("tslib");
-var isFunction_1 = require("@koine/utils/isFunction");
-var swr_1 = require("swr");
-var mutation_1 = require("swr/mutation");
-var createApi_1 = require("./createApi");
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    createSwrApi: function() {
+        return createSwrApi;
+    },
+    default: function() {
+        return _default;
+    }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _swr = /*#__PURE__*/ _interop_require_default._(require("swr"));
+const _mutation = /*#__PURE__*/ _interop_require_default._(require("swr/mutation"));
+const _isFunction = /*#__PURE__*/ _interop_require_default._(require("@koine/utils/isFunction"));
+const _createApi = /*#__PURE__*/ _interop_require_default._(require("./createApi"));
 function createUseApi(api, method) {
     return function useApi(endpoint, options, _config) {
-        var _this = this;
         if (method === "get") {
             // const fetcher = async (_endpoint: TEndpoint) => {
             //   try {
@@ -26,66 +40,60 @@ function createUseApi(api, method) {
             //     }
             //   };
             // }
-            var fetcher = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var data;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, api[method](endpoint, tslib_1.__assign(tslib_1.__assign({}, (options || {})), { throwErr: true }))];
-                        case 1:
-                            data = (_a.sent()).data;
-                            return [2 /*return*/, data];
-                    }
+            const fetcher = async ()=>{
+                const { data } = await api[method](endpoint, {
+                    ...options || {},
+                    throwErr: true
                 });
-            }); };
-            var config_1 = _config;
-            var shouldNotFetch = (config_1 === null || config_1 === void 0 ? void 0 : config_1.when) === false ||
-                ((0, isFunction_1.default)(config_1 === null || config_1 === void 0 ? void 0 : config_1.when) && (config_1 === null || config_1 === void 0 ? void 0 : config_1.when()) === false);
+                return data;
+            };
+            const config = _config;
+            const shouldNotFetch = config?.when === false || (0, _isFunction.default)(config?.when) && config?.when() === false;
             // <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 (0, swr_1.default)(shouldNotFetch ? null : options ? [endpoint, options] : [endpoint], fetcher, config_1);
+            return (0, _swr.default)(shouldNotFetch ? null : options ? [
+                endpoint,
+                options
+            ] : [
+                endpoint
+            ], fetcher, config);
         }
-        var config = _config;
-        var sender = function (
-        // if the first argument is an array the second tem are the base options
+        const config = _config;
+        const sender = async (// if the first argument is an array the second tem are the base options
         // defined when calling the usePost/Put/etc. hook, these will be overriden
         // by the _options just here below
-        _endpoint, 
-        // these are the options arriving when calling `trigger({ json, query, etc... })
-        _options) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var endpoint, options, _a, ok, data;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        endpoint = Array.isArray(_endpoint) ? _endpoint[0] : _endpoint;
-                        options = Array.isArray(_endpoint) ? _endpoint[1] : {};
-                        return [4 /*yield*/, api[method](endpoint, tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, options), (_options.arg || {})), { throwErr: true }))];
-                    case 1:
-                        _a = _b.sent(), ok = _a.ok, data = _a.data;
-                        return [2 /*return*/, ok ? data : data];
-                }
+        _endpoint, // these are the options arriving when calling `trigger({ json, query, etc... })
+        _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;
+        };
         // config.fetcher = sender;
         // eslint-disable-next-line react-hooks/rules-of-hooks
-        return (0, mutation_1.default)(
-        // @ts-expect-error FIXME: I can't get it...
-        options ? [endpoint, options] : endpoint, sender, config);
+        return (0, _mutation.default)(// @ts-expect-error FIXME: I can't get it...
+        options ? [
+            endpoint,
+            options
+        ] : endpoint, sender, config);
     };
 }
-/**
- * It creates an api client extended with auto-generated SWR wrapper hooks
- */
-var createSwrApi = function () {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    var api = createApi_1.default.apply(void 0, args);
-    ["get", "post", "put", "patch", "delete"].forEach(function (method) {
-        var hookName = "use".concat(method.charAt(0).toUpperCase() + method.slice(1));
+const createSwrApi = (...args)=>{
+    const api = (0, _createApi.default)(...args);
+    [
+        "get",
+        "post",
+        "put",
+        "patch",
+        "delete"
+    ].forEach((method)=>{
+        const hookName = `use${method.charAt(0).toUpperCase() + method.slice(1)}`;
         api[hookName] = createUseApi(api, method);
     });
     return api;
 };
-exports.createSwrApi = createSwrApi;
-exports.default = exports.createSwrApi;
+const _default = createSwrApi;

package/createSwrApi.mjs

@@ -1,12 +1,10 @@
 "use client";
-import { __assign, __awaiter, __generator } from "tslib";
-import isFunction from "@koine/utils/isFunction";
 import useSWR from "swr";
 import useSWRMutation from "swr/mutation";
+import isFunction from "@koine/utils/isFunction";
 import createApi from "./createApi";
 function createUseApi(api, method) {
     return function useApi(endpoint, options, _config) {
-        var _this = this;
         if (method === "get") {
             // const fetcher = async (_endpoint: TEndpoint) => {
             //   try {
@@ -23,63 +21,60 @@ function createUseApi(api, method) {
             //     }
             //   };
             // }
-            var fetcher = function () { return __awaiter(_this, void 0, void 0, function () {
-                var data;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, api[method](endpoint, __assign(__assign({}, (options || {})), { throwErr: true }))];
-                        case 1:
-                            data = (_a.sent()).data;
-                            return [2 /*return*/, data];
-                    }
+            const fetcher = async ()=>{
+                const { data } = await api[method](endpoint, {
+                    ...options || {},
+                    throwErr: true
                 });
-            }); };
-            var config_1 = _config;
-            var shouldNotFetch = (config_1 === null || config_1 === void 0 ? void 0 : config_1.when) === false ||
-                (isFunction(config_1 === null || config_1 === void 0 ? void 0 : config_1.when) && (config_1 === null || config_1 === void 0 ? void 0 : config_1.when()) === false);
+                return data;
+            };
+            const config = _config;
+            const shouldNotFetch = config?.when === false || isFunction(config?.when) && config?.when() === false;
             // <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 useSWR(shouldNotFetch ? null : options ? [endpoint, options] : [endpoint], fetcher, config_1);
+            return useSWR(shouldNotFetch ? null : options ? [
+                endpoint,
+                options
+            ] : [
+                endpoint
+            ], fetcher, config);
         }
-        var config = _config;
-        var sender = function (
-        // if the first argument is an array the second tem are the base options
+        const config = _config;
+        const sender = async (// if the first argument is an array the second tem are the base options
         // defined when calling the usePost/Put/etc. hook, these will be overriden
         // by the _options just here below
-        _endpoint, 
-        // these are the options arriving when calling `trigger({ json, query, etc... })
-        _options) { return __awaiter(_this, void 0, void 0, function () {
-            var endpoint, options, _a, ok, data;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        endpoint = Array.isArray(_endpoint) ? _endpoint[0] : _endpoint;
-                        options = Array.isArray(_endpoint) ? _endpoint[1] : {};
-                        return [4 /*yield*/, api[method](endpoint, __assign(__assign(__assign({}, options), (_options.arg || {})), { throwErr: true }))];
-                    case 1:
-                        _a = _b.sent(), ok = _a.ok, data = _a.data;
-                        return [2 /*return*/, ok ? data : data];
-                }
+        _endpoint, // these are the options arriving when calling `trigger({ json, query, etc... })
+        _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;
+        };
         // config.fetcher = sender;
         // eslint-disable-next-line react-hooks/rules-of-hooks
-        return useSWRMutation(
-        // @ts-expect-error FIXME: I can't get it...
-        options ? [endpoint, options] : endpoint, sender, config);
+        return useSWRMutation(// @ts-expect-error FIXME: I can't get it...
+        options ? [
+            endpoint,
+            options
+        ] : endpoint, sender, config);
     };
 }
 /**
  * It creates an api client extended with auto-generated SWR wrapper hooks
- */
-export var createSwrApi = function () {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    var api = createApi.apply(void 0, args);
-    ["get", "post", "put", "patch", "delete"].forEach(function (method) {
-        var hookName = "use".concat(method.charAt(0).toUpperCase() + method.slice(1));
+ */ export const createSwrApi = (...args)=>{
+    const api = createApi(...args);
+    [
+        "get",
+        "post",
+        "put",
+        "patch",
+        "delete"
+    ].forEach((method)=>{
+        const hookName = `use${method.charAt(0).toUpperCase() + method.slice(1)}`;
         api[hookName] = createUseApi(api, method);
     });
     return api;

package/index.js

@@ -1,11 +1,28 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nextApiResponse = exports.createSwrApi = exports.createApi = exports.ApiError = void 0;
-var ApiError_1 = require("./ApiError");
-Object.defineProperty(exports, "ApiError", { enumerable: true, get: function () { return ApiError_1.ApiError; } });
-var createApi_1 = require("./createApi");
-Object.defineProperty(exports, "createApi", { enumerable: true, get: function () { return createApi_1.createApi; } });
-var createSwrApi_1 = require("./createSwrApi");
-Object.defineProperty(exports, "createSwrApi", { enumerable: true, get: function () { return createSwrApi_1.createSwrApi; } });
-var nextApiResponse_1 = require("./nextApiResponse");
-Object.defineProperty(exports, "nextApiResponse", { enumerable: true, get: function () { return nextApiResponse_1.nextApiResponse; } });
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    ApiError: function() {
+        return _ApiError.ApiError;
+    },
+    createApi: function() {
+        return _createApi.createApi;
+    },
+    createSwrApi: function() {
+        return _createSwrApi.createSwrApi;
+    },
+    nextApiResponse: function() {
+        return _nextApiResponse.nextApiResponse;
+    }
+});
+const _ApiError = require("./ApiError");
+const _createApi = require("./createApi");
+const _createSwrApi = require("./createSwrApi");
+const _nextApiResponse = require("./nextApiResponse");

package/nextApiResponse.js

@@ -1,9 +1,23 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nextApiResponse = void 0;
-var nextApiResponse = function (nextRes, result) {
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    nextApiResponse: function() {
+        return nextApiResponse;
+    },
+    default: function() {
+        return _default;
+    }
+});
+const nextApiResponse = (nextRes, result)=>{
     // nextRes.status(result.status).json(result.data || result.msg);
     nextRes.status(result.status).json(result);
 };
-exports.nextApiResponse = nextApiResponse;
-exports.default = exports.nextApiResponse;
+const _default = nextApiResponse;

package/nextApiResponse.mjs

@@ -1,4 +1,4 @@
-export var nextApiResponse = function (nextRes, result) {
+export const nextApiResponse = (nextRes, result)=>{
     // nextRes.status(result.status).json(result.data || result.msg);
     nextRes.status(result.status).json(result);
 };

package/package.json

@@ -7,18 +7,21 @@
     }
   },
   "dependencies": {
-    "clsx": "1.2.1",
-    "next": "^13.4.4",
-    "swr": "^2.1.5",
+    "clsx": "^1.2.1",
+    "next": "^13.4.7",
+    "swr": "^2.2.0",
     "ts-debounce": "^4.0.0",
-    "type-fest": "^3.11.1"
-  },
-  "peerDependencies": {
-    "@koine/utils": "2.0.0-beta.2",
-    "tslib": "2.5.3"
+    "type-fest": "^3.12.0"
   },
+  "peerDependencies": {},
+  "module": "./index.mjs",
   "main": "./index.js",
+  "exports": {
+    ".": {
+      "import": "./index.js",
+      "require": "./index.js"
+    }
+  },
   "types": "./index.d.ts",
-  "version": "2.0.0-beta.2",
-  "module": "./index.mjs"
-}
+  "version": "2.0.0-beta.4"
+}