@driveflux/api-swr 4.0.87 → 4.0.88

package/dist/api-legacy/index.js

@@ -1,3 +1,225 @@
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _iterable_to_array_limit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+}
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(g && (g = 0, op[0] && (_ = 0)), _)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
 import { useAuth } from '@driveflux/auth/react/providers';
 import { config } from '@driveflux/config/frontend';
 import { enhancedFetch } from '@driveflux/fetch';
@@ -9,124 +231,182 @@ import useSWRInfinite from 'swr/infinite';
  *
  * @important instead of returning a result, this will always return Success or throw an error containing Error
  * @important if the 3rd param provides an Authorization header, it will be ignored!
- */
-export const fetchWithAuth = async (urlParams, options = {}) => {
-    const [url, accessToken, otherOptions] = Array.isArray(urlParams)
-        ? urlParams
-        : [urlParams, null];
-    const apiHost = config.appUrl;
-    const finalUrl = url.startsWith('/') ? `${apiHost}${url}` : url;
-    const correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined'
-        ? sessionStorage.getItem('x-correlation-id')
-        : null;
-    const result = await enhancedFetch(finalUrl, {
-        ...options,
-        ...otherOptions,
-        headers: {
-            ...(options.headers || {}),
-            ...(otherOptions?.headers || {}),
-            ...(accessToken ? { Authorization: `Bearer ${accessToken}` } : {}),
-            ...(correlationIdFromSessionStorage
-                ? { 'x-correlation-id': correlationIdFromSessionStorage }
-                : {}),
-        },
-    });
-    const correlationId = result.metadata?.headers.get('x-correlation-id');
-    if (correlationId && typeof sessionStorage !== 'undefined') {
-        // We store the correlation id in the session storage so that we can use it in the next request
-        sessionStorage.setItem('x-correlation-id', result.metadata?.headers.get('x-correlation-id') || '');
-    }
-    if (!result.ok) {
-        throw result.val;
-    }
-    return result.val;
+ */ export var fetchWithAuth = function(urlParams) {
+    var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+    return _async_to_generator(function() {
+        var _result_metadata, _ref, url, accessToken, otherOptions, apiHost, finalUrl, correlationIdFromSessionStorage, result, correlationId, _result_metadata1;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    _ref = _sliced_to_array(Array.isArray(urlParams) ? urlParams : [
+                        urlParams,
+                        null
+                    ], 3), url = _ref[0], accessToken = _ref[1], otherOptions = _ref[2];
+                    apiHost = config.appUrl;
+                    finalUrl = url.startsWith('/') ? "".concat(apiHost).concat(url) : url;
+                    correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('x-correlation-id') : null;
+                    return [
+                        4,
+                        enhancedFetch(finalUrl, _object_spread_props(_object_spread({}, options, otherOptions), {
+                            headers: _object_spread({}, options.headers || {}, (otherOptions === null || otherOptions === void 0 ? void 0 : otherOptions.headers) || {}, accessToken ? {
+                                Authorization: "Bearer ".concat(accessToken)
+                            } : {}, correlationIdFromSessionStorage ? {
+                                'x-correlation-id': correlationIdFromSessionStorage
+                            } : {})
+                        }))
+                    ];
+                case 1:
+                    result = _state.sent();
+                    correlationId = (_result_metadata = result.metadata) === null || _result_metadata === void 0 ? void 0 : _result_metadata.headers.get('x-correlation-id');
+                    if (correlationId && typeof sessionStorage !== 'undefined') {
+                        ;
+                        // We store the correlation id in the session storage so that we can use it in the next request
+                        sessionStorage.setItem('x-correlation-id', ((_result_metadata1 = result.metadata) === null || _result_metadata1 === void 0 ? void 0 : _result_metadata1.headers.get('x-correlation-id')) || '');
+                    }
+                    if (!result.ok) {
+                        throw result.val;
+                    }
+                    return [
+                        2,
+                        result.val
+                    ];
+            }
+        });
+    })();
 };
-export const isStructuredResponse = (obj) => {
-    return obj && typeof obj === 'object' && obj.metadata;
+export var isStructuredResponse = function(obj) {
+    return obj && (typeof obj === "undefined" ? "undefined" : _type_of(obj)) === 'object' && obj.metadata;
 };
-export const swrFetch = async (url, options = {}) => {
-    const correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined'
-        ? sessionStorage.getItem('x-correlation-id')
-        : null;
-    const response = await enhancedFetch(url, {
-        ...options,
-        headers: {
-            ...(options.headers || {}),
-            ...(correlationIdFromSessionStorage
-                ? { 'x-correlation-id': correlationIdFromSessionStorage }
-                : {}),
-        },
-    });
-    const correlationId = response.metadata?.headers.get('x-correlation-id');
-    if (correlationId && typeof sessionStorage !== 'undefined') {
-        // We store the correlation id in the session storage so that we can use it in the next request
-        sessionStorage.setItem('x-correlation-id', response.metadata?.headers.get('x-correlation-id') || '');
-    }
-    if (response.ok) {
-        return response.val;
-    }
-    throw response.val;
+export var swrFetch = function(url) {
+    var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+    return _async_to_generator(function() {
+        var _response_metadata, correlationIdFromSessionStorage, response, correlationId, _response_metadata1;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('x-correlation-id') : null;
+                    return [
+                        4,
+                        enhancedFetch(url, _object_spread_props(_object_spread({}, options), {
+                            headers: _object_spread({}, options.headers || {}, correlationIdFromSessionStorage ? {
+                                'x-correlation-id': correlationIdFromSessionStorage
+                            } : {})
+                        }))
+                    ];
+                case 1:
+                    response = _state.sent();
+                    correlationId = (_response_metadata = response.metadata) === null || _response_metadata === void 0 ? void 0 : _response_metadata.headers.get('x-correlation-id');
+                    if (correlationId && typeof sessionStorage !== 'undefined') {
+                        ;
+                        // We store the correlation id in the session storage so that we can use it in the next request
+                        sessionStorage.setItem('x-correlation-id', ((_response_metadata1 = response.metadata) === null || _response_metadata1 === void 0 ? void 0 : _response_metadata1.headers.get('x-correlation-id')) || '');
+                    }
+                    if (response.ok) {
+                        return [
+                            2,
+                            response.val
+                        ];
+                    }
+                    throw response.val;
+            }
+        });
+    })();
 };
-export const useApi = (key, config) => {
-    const result = useSWR(key, (url) => swrFetch(url), config);
-    return {
-        ...result,
-        revalidate: async () => !!(await result.mutate()),
-    };
+export var useApi = function(key, config) {
+    var result = useSWR(key, function(url) {
+        return swrFetch(url);
+    }, config);
+    return _object_spread_props(_object_spread({}, result), {
+        revalidate: function() {
+            return _async_to_generator(function() {
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                result.mutate()
+                            ];
+                        case 1:
+                            return [
+                                2,
+                                !!_state.sent()
+                            ];
+                    }
+                });
+            })();
+        }
+    });
 };
-export const useApiWithAuth = (key, config) => {
+export var useApiWithAuth = function(key, config) {
     // TODO
-    const { accessToken } = useAuth();
-    const result = useSWR(key ? (Array.isArray(key) ? key : [key, accessToken]) : null, fetchWithAuth, config);
-    return {
-        ...result,
-        revalidate: result.mutate,
-    };
+    var accessToken = useAuth().accessToken;
+    var result = useSWR(key ? Array.isArray(key) ? key : [
+        key,
+        accessToken
+    ] : null, fetchWithAuth, config);
+    return _object_spread_props(_object_spread({}, result), {
+        revalidate: result.mutate
+    });
 };
-export const usePaginationApiWithAuth = (key, config) => {
+export var usePaginationApiWithAuth = function(key, config) {
     // TODO
-    const { accessToken } = useAuth();
-    const result = useSWRInfinite((i, p) => {
-        let res = null;
+    var accessToken = useAuth().accessToken;
+    var result = useSWRInfinite(function(i, p) {
+        var res = null;
         if (typeof key === 'function') {
             res = key(i, p);
-        }
-        else if (isStructuredResponse(p) && key) {
-            if (p.metadata?.nextSkip === null) {
-                return null; // reached the end
+        } else if (isStructuredResponse(p) && key) {
+            var _p_metadata, _p_metadata1;
+            if (((_p_metadata = p.metadata) === null || _p_metadata === void 0 ? void 0 : _p_metadata.nextSkip) === null) {
+                return null // reached the end
+                ;
             }
-            const separator = key.indexOf('?') !== -1 ? '&' : '?';
-            res = p.metadata?.nextSkip
-                ? `${key}${separator}skip=${p.metadata.nextSkip}`
-                : key;
-        }
-        else if (!p) {
+            var separator = key.indexOf('?') !== -1 ? '&' : '?';
+            res = ((_p_metadata1 = p.metadata) === null || _p_metadata1 === void 0 ? void 0 : _p_metadata1.nextSkip) ? "".concat(key).concat(separator, "skip=").concat(p.metadata.nextSkip) : key;
+        } else if (!p) {
             res = key;
-        }
-        else {
+        } else {
             console.error('Wrong key loader or data type supplied to pagination');
             return null;
         }
-        return [res, accessToken];
+        return [
+            res,
+            accessToken
+        ];
     }, fetchWithAuth, config);
-    return {
-        ...result,
-        revalidate: async () => !!(await result.mutate()),
-    };
+    return _object_spread_props(_object_spread({}, result), {
+        revalidate: function() {
+            return _async_to_generator(function() {
+                return _ts_generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                result.mutate()
+                            ];
+                        case 1:
+                            return [
+                                2,
+                                !!_state.sent()
+                            ];
+                    }
+                });
+            })();
+        }
+    });
 };
 /**
  * TODO
  * @deprecated
- */
-export const useAuthenticatedFetch = (url, options = {}) => {
-    const { accessToken } = useAuth();
-    const headers = {
-        ...(accessToken ? { Authorization: `Bearer ${accessToken}` } : undefined),
-        ...(options?.headers || {}),
+ */ export var useAuthenticatedFetch = function(url) {
+    var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+    var accessToken = useAuth().accessToken;
+    var headers = _object_spread({}, accessToken ? {
+        Authorization: "Bearer ".concat(accessToken)
+    } : undefined, (options === null || options === void 0 ? void 0 : options.headers) || {});
+    return function() {
+        return enhancedFetch(url, _object_spread({
+            headers: headers
+        }, options));
     };
-    return () => enhancedFetch(url, {
-        headers,
-        ...options,
-    });
 };
-//# sourceMappingURL=index.js.map

package/dist/api-models.js

@@ -1,5 +1,5 @@
 import { config } from '@driveflux/config/frontend';
-export const API_MODELS_URLS = {
+export var API_MODELS_URLS = {
     Business: '/api/businesses',
     User: '/api/users',
     Inquiry: '/api/inquiries',
@@ -11,14 +11,11 @@ export const API_MODELS_URLS = {
     Invoice: '/api/invoices',
     SubscriptionReservation: '/api/reservations',
     SubscriptionContract: '/api/subscription-contracts',
-    EmailSent: '/api/emails-sent',
+    EmailSent: '/api/emails-sent'
 };
 export function getApiUrl(model) {
-    if (model.startsWith('/api') || model.startsWith(`${config.apiUrl}`)) {
+    if (model.startsWith('/api') || model.startsWith("".concat(config.apiUrl))) {
         return model;
     }
-    return model in API_MODELS_URLS
-        ? API_MODELS_URLS[model]
-        : `/api/${model}`;
+    return model in API_MODELS_URLS ? API_MODELS_URLS[model] : "/api/".concat(model);
 }
-//# sourceMappingURL=api-models.js.map

package/dist/fetcher.js

@@ -1,3 +1,221 @@
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _iterable_to_array_limit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(g && (g = 0, op[0] && (_ = 0)), _)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
 import { config } from '@driveflux/config/frontend';
 import { enhancedFetch } from '@driveflux/fetch';
 /**
@@ -6,34 +224,46 @@ import { enhancedFetch } from '@driveflux/fetch';
  *
  * @important instead of returning a result, this will always return Success or throw an error containing Error
  * @important if the 3rd param provides an Authorization header, it will be ignored!
- */
-export const fetchWithAuth = async (urlParams, options = {}) => {
-    const [url, accessToken] = Array.isArray(urlParams)
-        ? urlParams
-        : [urlParams, null];
-    const apiHost = config.appUrl;
-    const finalUrl = url.startsWith('/') ? `${apiHost}${url}` : url;
-    const correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined'
-        ? sessionStorage.getItem('x-correlation-id')
-        : null;
-    const result = await enhancedFetch(finalUrl, {
-        ...options,
-        headers: {
-            ...(options.headers || {}),
-            ...(accessToken ? { Authorization: `Bearer ${accessToken}` } : {}),
-            ...(correlationIdFromSessionStorage
-                ? { 'x-correlation-id': correlationIdFromSessionStorage }
-                : {}),
-        },
-    });
-    const correlationId = result.metadata?.headers.get('x-correlation-id');
-    if (correlationId && typeof sessionStorage !== 'undefined') {
-        // We store the correlation id in the session storage so that we can use it in the next request
-        sessionStorage.setItem('x-correlation-id', result.metadata?.headers.get('x-correlation-id') || '');
-    }
-    if (!result.ok) {
-        throw result.val;
-    }
-    return result.val;
+ */ export var fetchWithAuth = function(urlParams) {
+    var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+    return _async_to_generator(function() {
+        var _result_metadata, _ref, url, accessToken, apiHost, finalUrl, correlationIdFromSessionStorage, result, correlationId, _result_metadata1;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    _ref = _sliced_to_array(Array.isArray(urlParams) ? urlParams : [
+                        urlParams,
+                        null
+                    ], 2), url = _ref[0], accessToken = _ref[1];
+                    apiHost = config.appUrl;
+                    finalUrl = url.startsWith('/') ? "".concat(apiHost).concat(url) : url;
+                    correlationIdFromSessionStorage = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('x-correlation-id') : null;
+                    return [
+                        4,
+                        enhancedFetch(finalUrl, _object_spread_props(_object_spread({}, options), {
+                            headers: _object_spread({}, options.headers || {}, accessToken ? {
+                                Authorization: "Bearer ".concat(accessToken)
+                            } : {}, correlationIdFromSessionStorage ? {
+                                'x-correlation-id': correlationIdFromSessionStorage
+                            } : {})
+                        }))
+                    ];
+                case 1:
+                    result = _state.sent();
+                    correlationId = (_result_metadata = result.metadata) === null || _result_metadata === void 0 ? void 0 : _result_metadata.headers.get('x-correlation-id');
+                    if (correlationId && typeof sessionStorage !== 'undefined') {
+                        ;
+                        // We store the correlation id in the session storage so that we can use it in the next request
+                        sessionStorage.setItem('x-correlation-id', ((_result_metadata1 = result.metadata) === null || _result_metadata1 === void 0 ? void 0 : _result_metadata1.headers.get('x-correlation-id')) || '');
+                    }
+                    if (!result.ok) {
+                        throw result.val;
+                    }
+                    return [
+                        2,
+                        result.val
+                    ];
+            }
+        });
+    })();
 };
-//# sourceMappingURL=fetcher.js.map

package/dist/index.js

@@ -1,3 +1,82 @@
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _object_without_properties(source, excluded) {
+    if (source == null) return {};
+    var target = _object_without_properties_loose(source, excluded);
+    var key, i;
+    if (Object.getOwnPropertySymbols) {
+        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+        for(i = 0; i < sourceSymbolKeys.length; i++){
+            key = sourceSymbolKeys[i];
+            if (excluded.indexOf(key) >= 0) continue;
+            if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+            target[key] = source[key];
+        }
+    }
+    return target;
+}
+function _object_without_properties_loose(source, excluded) {
+    if (source == null) return {};
+    var target = {};
+    var sourceKeys = Object.keys(source);
+    var key, i;
+    for(i = 0; i < sourceKeys.length; i++){
+        key = sourceKeys[i];
+        if (excluded.indexOf(key) >= 0) continue;
+        target[key] = source[key];
+    }
+    return target;
+}
 import { useAuth } from '@driveflux/auth/react/providers';
 import isEmpty from 'lodash/isEmpty.js';
 import { useCallback } from 'react';
@@ -6,55 +85,62 @@ import useSWRInfinite from 'swr/infinite';
 import { getApiUrl } from './api-models.js';
 import { fetchWithAuth } from './fetcher.js';
 import { makeQueryParams } from './utils.js';
-const getKeyMaker = (model, pageSize, query, accessToken) => {
-    const resource = getApiUrl(model);
-    const loader = (pageIndex, previousPageData) => {
+var getKeyMaker = function(model, pageSize, query, accessToken) {
+    var resource = getApiUrl(model);
+    var loader = function(pageIndex, previousPageData) {
         if (previousPageData && !previousPageData.next) {
             return null;
         }
-        const makeFinalQuery = (index) => {
-            const take = previousPageData?.take || pageSize;
-            return {
-                ...query,
-                skip: previousPageData?.skip || (take ? index * take : undefined),
-                take,
-            };
+        var makeFinalQuery = function(index) {
+            var take = (previousPageData === null || previousPageData === void 0 ? void 0 : previousPageData.take) || pageSize;
+            return _object_spread_props(_object_spread({}, query), {
+                skip: (previousPageData === null || previousPageData === void 0 ? void 0 : previousPageData.skip) || (take ? index * take : undefined),
+                take: take
+            });
         };
-        const finalQuery = makeFinalQuery(pageIndex);
-        const queryString = !isEmpty(finalQuery)
-            ? `?${makeQueryParams(finalQuery)}`
-            : '';
-        const url = `${resource}${queryString}`;
-        const nextQuery = makeFinalQuery(pageIndex + 1);
-        const nextQueryString = !isEmpty(nextQuery)
-            ? `?${makeQueryParams(nextQuery)}`
-            : '';
-        const nextUrl = `${resource}${nextQueryString}`;
+        var finalQuery = makeFinalQuery(pageIndex);
+        var queryString = !isEmpty(finalQuery) ? "?".concat(makeQueryParams(finalQuery)) : '';
+        var url = "".concat(resource).concat(queryString);
+        var nextQuery = makeFinalQuery(pageIndex + 1);
+        var nextQueryString = !isEmpty(nextQuery) ? "?".concat(makeQueryParams(nextQuery)) : '';
+        var nextUrl = "".concat(resource).concat(nextQueryString);
         // Preload next page
-        preload([nextUrl, accessToken], fetchWithAuth);
-        return [url, accessToken];
+        preload([
+            nextUrl,
+            accessToken
+        ], fetchWithAuth);
+        return [
+            url,
+            accessToken
+        ];
     };
     return loader;
 };
-export const useApiPagination = (model, { pageSize, query, ...swrConfig }) => {
+export var useApiPagination = function(model, _param) {
+    var pageSize = _param.pageSize, query = _param.query, swrConfig = _object_without_properties(_param, [
+        "pageSize",
+        "query"
+    ]);
+    var _result_data_, _result_data;
     // TODO
-    const { accessToken } = useAuth();
-    const result = useSWRInfinite(getKeyMaker(model, pageSize || 20, query, accessToken), fetchWithAuth, {
-        parallel: true,
-        ...swrConfig,
-    });
-    const hasMore = (result?.data?.[0]?.count || 0) > result.size * (pageSize || 20);
-    const next = useCallback(() => {
+    var accessToken = useAuth().accessToken;
+    var result = useSWRInfinite(getKeyMaker(model, pageSize || 20, query, accessToken), fetchWithAuth, _object_spread({
+        parallel: true
+    }, swrConfig));
+    var hasMore = ((result === null || result === void 0 ? void 0 : (_result_data = result.data) === null || _result_data === void 0 ? void 0 : (_result_data_ = _result_data[0]) === null || _result_data_ === void 0 ? void 0 : _result_data_.count) || 0) > result.size * (pageSize || 20);
+    var next = useCallback(function() {
         if (!hasMore) {
             return;
         }
         result.setSize(result.size + 1);
-    }, [hasMore, result?.size, result.setSize]);
-    return {
-        ...result,
-        next,
+    }, [
         hasMore,
-    };
+        result === null || result === void 0 ? void 0 : result.size,
+        result.setSize
+    ]);
+    return _object_spread_props(_object_spread({}, result), {
+        next: next,
+        hasMore: hasMore
+    });
 };
 export * from './utils.js';
-//# sourceMappingURL=index.js.map

package/dist/utils.js

@@ -1,24 +1,108 @@
-export const makeQueryParams = (params) => {
-    if (params instanceof URLSearchParams) {
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _iterable_to_array_limit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+export var makeQueryParams = function(params) {
+    if (_instanceof(params, URLSearchParams)) {
         return params.toString();
     }
-    const newParams = new URLSearchParams();
-    for (const [key, value] of Object.entries(params)) {
-        appendParam(newParams, key, value);
+    var newParams = new URLSearchParams();
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = Object.entries(params)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], value = _step_value[1];
+            appendParam(newParams, key, value);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
     }
     return newParams.toString();
 };
-const appendParam = (params, key, value) => {
+var appendParam = function(params, key, value) {
     if (Array.isArray(value)) {
-        for (const v of value) {
-            appendParam(params, key, v);
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = value[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var v = _step.value;
+                appendParam(params, key, v);
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
         }
-    }
-    else if (value instanceof Date) {
+    } else if (_instanceof(value, Date)) {
         params.append(key, value.toISOString());
-    }
-    else if (value !== undefined && value !== null) {
+    } else if (value !== undefined && value !== null) {
         params.append(key, value.toString());
     }
 };
-//# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@driveflux/api-swr",
-  "version": "4.0.87",
+  "version": "4.0.88",
   "type": "module",
   "exports": {
     ".": {
@@ -16,9 +16,9 @@
     "dist"
   ],
   "dependencies": {
-    "@driveflux/auth": "4.0.86",
+    "@driveflux/auth": "4.0.87",
     "@driveflux/config": "3.0.10",
-    "@driveflux/db": "4.1.18",
+    "@driveflux/db": "4.1.19",
     "@driveflux/fetch": "8.0.1",
     "@driveflux/problem": "6.0.1",
     "@driveflux/result": "6.0.1",