@driveflux/fetch 7.0.1 → 7.0.2

package/dist/index.js

@@ -1,210 +1,4 @@
-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 _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
-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;
-}
-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 { PROBLEM_INVALID_DATA, PROBLEM_NETWORK_ERROR, makeProblem } from '@driveflux/problem';
+import { PROBLEM_INVALID_DATA, PROBLEM_NETWORK_ERROR, makeProblem, } from '@driveflux/problem';
 import { Err, Ok } from '@driveflux/result';
 /**
  * Checks if a network request came back fine, and throws an error if not
@@ -212,7 +6,8 @@ import { Err, Ok } from '@driveflux/result';
  * @param  response   A response from a network request
  *
  * @return Returns either the response, or throws an error
- */ var isSuccessful = function(response) {
+ */
+const isSuccessful = (response) => {
     return response.status >= 200 && response.status < 300;
 };
 /**
@@ -222,132 +17,78 @@ import { Err, Ok } from '@driveflux/result';
  * @param [options] The options we want to pass to "fetch"
  *
  * @return          The response data
- */ export var enhancedFetch = function(url, providedOptions) {
-    return _async_to_generator(function() {
-        var _ref, body, rest, options, finalBody, response, e, metadata, responseBody, textBody, e1;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    _ref = providedOptions || {}, body = _ref.body, rest = _object_without_properties(_ref, [
-                        "body"
-                    ]);
-                    options = _object_spread_props(_object_spread({
-                        credentials: 'include'
-                    }, rest), {
-                        headers: _object_spread({
-                            'Content-Type': 'application/json; charset=utf-8',
-                            Accept: 'application/json'
-                        }, rest === null || rest === void 0 ? void 0 : rest.headers)
-                    });
-                    finalBody = body;
-                    if (finalBody && typeof finalBody !== 'string') {
-                        if (_instanceof(finalBody, FormData)) {
-                            options.headers = _object_spread_props(_object_spread({}, options.headers), {
-                                'Content-Type': 'application/x-www-form-urlencoded'
-                            });
-                        } else {
-                            finalBody = JSON.stringify(finalBody);
-                        }
-                    }
-                    options.body = finalBody;
-                    _state.label = 1;
-                case 1:
-                    _state.trys.push([
-                        1,
-                        3,
-                        ,
-                        4
-                    ]);
-                    return [
-                        4,
-                        fetch(url, options)
-                    ];
-                case 2:
-                    response = _state.sent();
-                    return [
-                        3,
-                        4
-                    ];
-                case 3:
-                    e = _state.sent();
-                    return [
-                        2,
-                        new Err(makeProblem({
-                            code: PROBLEM_NETWORK_ERROR,
-                            message: e.message,
-                            privateMetadata: {
-                                error: e
-                            }
-                        }))
-                    ];
-                case 4:
-                    metadata = {
-                        headers: response.headers,
-                        status: response.status
-                    };
-                    return [
-                        4,
-                        response.text()
-                    ];
-                case 5:
-                    textBody = _state.sent();
-                    _state.label = 6;
-                case 6:
-                    _state.trys.push([
-                        6,
-                        8,
-                        ,
-                        9
-                    ]);
-                    return [
-                        4,
-                        JSON.parse(textBody)
-                    ];
-                case 7:
-                    responseBody = _state.sent();
-                    return [
-                        3,
-                        9
-                    ];
-                case 8:
-                    e1 = _state.sent();
-                    if (response.status > 200 && response.status < 206) {
-                        responseBody = null;
-                    } else {
-                        return [
-                            2,
-                            new Err(makeProblem({
-                                code: PROBLEM_INVALID_DATA,
-                                message: 'Unable to parse json',
-                                statusCode: response.status,
-                                metadata: {
-                                    response: {
-                                        status: response.status,
-                                        statusTest: response.statusText,
-                                        body: textBody
-                                    }
-                                }
-                            }), metadata)
-                        ];
-                    }
-                    return [
-                        3,
-                        9
-                    ];
-                case 9:
-                    // We return the body as E if the fetch is not successful
-                    if (!isSuccessful(response)) {
-                        return [
-                            2,
-                            new Err(responseBody, metadata)
-                        ];
-                    }
-                    // We return the body as S if the fetch is successful
-                    return [
-                        2,
-                        new Ok(responseBody, metadata)
-                    ];
-            }
-        });
-    })();
+ */
+export const enhancedFetch = async (url, providedOptions) => {
+    const { body, ...rest } = providedOptions || {};
+    const options = {
+        credentials: 'include',
+        ...rest,
+        headers: {
+            'Content-Type': 'application/json; charset=utf-8',
+            Accept: 'application/json',
+            ...rest?.headers,
+        },
+    };
+    let finalBody = body;
+    if (finalBody && typeof finalBody !== 'string') {
+        if (finalBody instanceof FormData) {
+            options.headers = {
+                ...options.headers,
+                'Content-Type': 'application/x-www-form-urlencoded',
+            };
+        }
+        else {
+            finalBody = JSON.stringify(finalBody);
+        }
+    }
+    options.body = finalBody;
+    let response;
+    try {
+        response = await fetch(url, options);
+    }
+    catch (e) {
+        return new Err(makeProblem({
+            code: PROBLEM_NETWORK_ERROR,
+            message: e.message,
+            privateMetadata: {
+                error: e,
+            },
+        }));
+    }
+    const metadata = {
+        headers: response.headers,
+        status: response.status,
+    };
+    let responseBody;
+    // Will parse JSON body regardless of the response status
+    const textBody = await response.text();
+    try {
+        responseBody = await JSON.parse(textBody);
+    }
+    catch (e) {
+        if (response.status > 200 && response.status < 206) {
+            responseBody = null;
+        }
+        else {
+            return new Err(makeProblem({
+                code: PROBLEM_INVALID_DATA,
+                message: 'Unable to parse json',
+                statusCode: response.status,
+                metadata: {
+                    response: {
+                        status: response.status,
+                        statusTest: response.statusText,
+                        body: textBody,
+                    },
+                },
+            }), metadata);
+        }
+    }
+    // We return the body as E if the fetch is not successful
+    if (!isSuccessful(response)) {
+        return new Err(responseBody, metadata);
+    }
+    // We return the body as S if the fetch is successful
+    return new Ok(responseBody, metadata);
 };
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@driveflux/fetch",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
@@ -13,12 +13,12 @@
     "dist"
   ],
   "dependencies": {
-    "@driveflux/problem": "5.0.1",
-    "@driveflux/result": "5.0.1"
+    "@driveflux/problem": "5.0.2",
+    "@driveflux/result": "5.0.2"
   },
   "devDependencies": {
-    "@driveflux/fab": "3.0.1",
-    "@driveflux/tsconfig": "2.0.1",
+    "@driveflux/fab": "3.0.2",
+    "@driveflux/tsconfig": "2.0.2",
     "@types/node": "^22.15.16",
     "del-cli": "^6.0.0",
     "typescript": "^5.8.3"