@mountainpass/waychaser 5.0.46 → 5.0.48

package/dist/waychaser.js

@@ -1,204 +1,64 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, 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 };
-    }
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _a, _b;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.waychaser = exports.WayChaserProblem = exports.WayChaserResponse = void 0;
-exports.isValidationSuccess = isValidationSuccess;
-exports.sortHandlers = sortHandlers;
-exports._waychaser = _waychaser;
 /* global Response */
-var operation_1 = require("./operation");
-var operation_array_1 = require("./operation-array");
-var parse_operations_1 = require("./util/parse-operations");
-var uri_template_lite_1 = require("./util/uri-template-lite");
-var flat_1 = require("flat");
-var hal_handler_1 = require("./handlers/hal/hal-handler");
-var link_header_handler_1 = require("./handlers/link-header/link-header-handler");
-var siren_handler_1 = require("./handlers/siren/siren-handler");
-var media_types_1 = __importDefault(require("./util/media-types"));
+import { InvocableOperation } from './operation';
+import { OperationArray } from './operation-array';
+import { parseOperations } from './util/parse-operations';
+import { URI } from './util/uri-template-lite';
+import { flatten } from 'flat';
+import { halHandler } from './handlers/hal/hal-handler';
+import { linkHeaderHandler } from './handlers/link-header/link-header-handler';
+import { sirenHandler } from './handlers/siren/siren-handler';
+import MediaTypes from './util/media-types';
 // import { fetch } from 'cross-fetch'
-var location_header_handler_1 = require("./handlers/location-header/location-header-handler");
-var augment_options_1 = require("./augment-options");
-var problem_document_1 = require("@mountainpass/problem-document");
+import { locationHeaderHandler } from './handlers/location-header/location-header-handler';
+import { augmentOptions } from './augment-options';
+import { ProblemDocument } from '@mountainpass/problem-document';
 /**
  * @param result
  */
-function isValidationSuccess(result) {
+export function isValidationSuccess(result) {
     return result.success;
 }
-var WayChaserResponse = /** @class */ (function () {
-    function WayChaserResponse(_a) {
-        var e_1, _b, e_2, _c, e_3, _d;
-        var handlers = _a.handlers, defaultOptions = _a.defaultOptions, baseResponse = _a.baseResponse, content = _a.content, fullContent = _a.fullContent, anchor = _a.anchor, parentOperations = _a.parentOperations, parameters = _a.parameters;
+export class WayChaserResponse {
+    constructor({ handlers, defaultOptions, baseResponse, content, fullContent, anchor, parentOperations, parameters }) {
         this.response = baseResponse;
         this.anchor = anchor;
         this.parameters = parameters || {};
         this.fullContent = fullContent || content;
         this.content = content;
-        this.operations = operation_array_1.OperationArray.create();
-        var thisContext = (0, flat_1.flatten)({ this: content });
+        this.operations = OperationArray.create();
+        const thisContext = flatten({ this: content });
         if (parentOperations && anchor && defaultOptions) {
             this.allOperations = parentOperations;
-            try {
-                for (var _e = __values(this.allOperations[anchor] || []), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    var operation = _f.value;
-                    this.operations.push(new operation_1.InvocableOperation(operation, this, defaultOptions, thisContext));
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-                }
-                finally { if (e_1) throw e_1.error; }
+            for (const operation of this.allOperations[anchor] || []) {
+                this.operations.push(new InvocableOperation(operation, this, defaultOptions, thisContext));
             }
             // not only do we need to go through the operations with a matching anchor
             // we also need to go though anchors that could match this.anchor
-            for (var key in this.allOperations) {
+            for (const key in this.allOperations) {
                 if (key !== '') {
                     // need to see if key could match this.anchor
-                    var template = new uri_template_lite_1.URI.Template(key);
-                    var parameters_1 = template.match(this.anchor);
-                    var expandedAnchor = template.expand(parameters_1);
+                    const template = new URI.Template(key);
+                    const parameters = template.match(this.anchor);
+                    const expandedAnchor = template.expand(parameters);
                     if (expandedAnchor === this.anchor) {
-                        var expandedOptions = Object.assign({}, defaultOptions, { parameters: Object.assign(parameters_1, defaultOptions.parameters) });
-                        try {
-                            for (var _g = (e_2 = void 0, __values(this.allOperations[key])), _h = _g.next(); !_h.done; _h = _g.next()) {
-                                var operation = _h.value;
-                                this.operations.push(new operation_1.InvocableOperation(operation, this, expandedOptions, thisContext));
-                            }
-                        }
-                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                        finally {
-                            try {
-                                if (_h && !_h.done && (_c = _g.return)) _c.call(_g);
-                            }
-                            finally { if (e_2) throw e_2.error; }
+                        const expandedOptions = Object.assign({}, defaultOptions, { parameters: Object.assign(parameters, defaultOptions.parameters) });
+                        for (const operation of this.allOperations[key]) {
+                            this.operations.push(new InvocableOperation(operation, this, expandedOptions, thisContext));
                         }
                     }
                 }
             }
         }
         else if (baseResponse && handlers && defaultOptions) {
-            this.allOperations = (0, parse_operations_1.parseOperations)({
-                baseResponse: baseResponse,
-                content: content,
-                handlers: handlers
+            this.allOperations = parseOperations({
+                baseResponse,
+                content,
+                handlers
             });
-            this.operations = operation_array_1.OperationArray.create();
-            try {
-                for (var _j = __values(this.allOperations[''] || []), _k = _j.next(); !_k.done; _k = _j.next()) {
-                    var operation = _k.value;
-                    var op = new operation_1.InvocableOperation(operation, this, defaultOptions, thisContext);
-                    this.operations.push(op);
-                }
-            }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_k && !_k.done && (_d = _j.return)) _d.call(_j);
-                }
-                finally { if (e_3) throw e_3.error; }
+            this.operations = OperationArray.create();
+            for (const operation of this.allOperations[''] || []) {
+                const op = new InvocableOperation(operation, this, defaultOptions, thisContext);
+                this.operations.push(op);
             }
         }
     }
@@ -210,161 +70,108 @@ var WayChaserResponse = /** @class */ (function () {
      * @returns
      * @throws {WayChaserProblem}
      */
-    WayChaserResponse.create = function (baseResponse, content, defaultOptions, mergedOptions) {
-        if (content instanceof problem_document_1.ProblemDocument) {
+    static create(baseResponse, content, defaultOptions, mergedOptions) {
+        if (content instanceof ProblemDocument) {
             throw new WayChaserProblem({
-                response: new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions: defaultOptions, baseResponse: baseResponse, content: content, parameters: mergedOptions.parameters }),
+                response: new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions, baseResponse, content, parameters: mergedOptions.parameters }),
                 problem: content,
             });
         }
         else {
             if (mergedOptions.validator) {
-                var validationResult = mergedOptions.validator(content);
+                const validationResult = mergedOptions.validator(content);
                 if (isValidationSuccess(validationResult)) {
-                    return new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions: defaultOptions, baseResponse: baseResponse, content: validationResult.content, parameters: mergedOptions.parameters });
+                    return new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions, baseResponse, content: validationResult.content, parameters: mergedOptions.parameters });
                 }
                 else {
                     throw new WayChaserProblem({
-                        response: new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions: defaultOptions, baseResponse: baseResponse, content: content, parameters: mergedOptions.parameters }),
+                        response: new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions, baseResponse, content, parameters: mergedOptions.parameters }),
                         problem: validationResult.problem,
                     });
                 }
             }
             else {
-                return new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions: defaultOptions, baseResponse: baseResponse, content: content, parameters: mergedOptions.parameters });
+                return new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions, baseResponse, content, parameters: mergedOptions.parameters });
             }
         }
-    };
-    Object.defineProperty(WayChaserResponse.prototype, "ops", {
-        get: function () {
-            return this.operations;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    WayChaserResponse.prototype.invoke = function (relationship, options) {
+    }
+    get ops() {
+        return this.operations;
+    }
+    invoke(relationship, options) {
         return this.operations.invoke(relationship, options);
-    };
-    WayChaserResponse.prototype.invokeAll = function (relationship, options) {
+    }
+    invokeAll(relationship, options) {
         return this.operations.invokeAll(relationship, options);
-    };
-    Object.defineProperty(WayChaserResponse.prototype, "body", {
-        get: function () {
-            throw new Error('Not Implemented. Use `.content` instead');
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(WayChaserResponse.prototype, "bodyUsed", {
-        get: function () {
-            return true;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(WayChaserResponse.prototype, "headers", {
-        get: function () {
-            var _a;
-            return (_a = this.response) === null || _a === void 0 ? void 0 : _a.headers;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(WayChaserResponse.prototype, "ok", {
-        get: function () {
-            return this.response ? this.response.ok : false;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(WayChaserResponse.prototype, "redirected", {
-        get: function () {
-            return this.response ? this.response.redirected : false;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(WayChaserResponse.prototype, "status", {
-        get: function () {
-            var _a;
-            return (_a = this.response) === null || _a === void 0 ? void 0 : _a.status;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(WayChaserResponse.prototype, "statusText", {
-        get: function () {
-            var _a;
-            return (_a = this.response) === null || _a === void 0 ? void 0 : _a.statusText;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(WayChaserResponse.prototype, "type", {
-        get: function () {
-            var _a;
-            return (_a = this.response) === null || _a === void 0 ? void 0 : _a.type;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(WayChaserResponse.prototype, "url", {
-        get: function () {
-            var _a;
-            return (_a = this.response) === null || _a === void 0 ? void 0 : _a.url;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    WayChaserResponse.prototype.arrayBuffer = function () {
+    }
+    get body() {
         throw new Error('Not Implemented. Use `.content` instead');
-    };
-    WayChaserResponse.prototype.blob = function () {
+    }
+    get bodyUsed() {
+        return true;
+    }
+    get headers() {
+        return this.response?.headers;
+    }
+    get ok() {
+        return this.response ? this.response.ok : false;
+    }
+    get redirected() {
+        return this.response ? this.response.redirected : false;
+    }
+    get status() {
+        return this.response?.status;
+    }
+    get statusText() {
+        return this.response?.statusText;
+    }
+    get type() {
+        return this.response?.type;
+    }
+    get url() {
+        return this.response?.url;
+    }
+    arrayBuffer() {
         throw new Error('Not Implemented. Use `.content` instead');
-    };
-    WayChaserResponse.prototype.clone = function () {
+    }
+    blob() {
+        throw new Error('Not Implemented. Use `.content` instead');
+    }
+    clone() {
         throw new Error('Not Implemented');
-    };
-    WayChaserResponse.prototype.formData = function () {
+    }
+    formData() {
         throw new Error('Not Implemented. Use `.content` instead');
-    };
+    }
     // async json() {
     //   throw new Error('Not Implemented. Use `.content` instead')
     // }
-    WayChaserResponse.prototype.text = function () {
+    text() {
         throw new Error('Not Implemented. Use `.content` instead');
-    };
-    return WayChaserResponse;
-}());
-exports.WayChaserResponse = WayChaserResponse;
-var WayChaserProblem = /** @class */ (function (_super) {
-    __extends(WayChaserProblem, _super);
-    function WayChaserProblem(_a) {
-        var response = _a.response, problem = _a.problem;
-        var _newTarget = this.constructor;
+    }
+}
+export class WayChaserProblem extends Error {
+    constructor({ response, problem }) {
         // 'Error' breaks prototype chain here
-        var _this = _super.call(this, problem.detail) || this;
+        super(problem.detail);
         // restore prototype chain   
-        var actualProto = _newTarget.prototype;
+        const actualProto = new.target.prototype;
         if (Object.setPrototypeOf) {
-            Object.setPrototypeOf(_this, actualProto);
+            Object.setPrototypeOf(this, actualProto);
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         else {
-            _this.__proto__ = actualProto;
+            this.__proto__ = actualProto;
         }
-        _this.problem = problem;
-        _this.response = response;
-        return _this;
+        this.problem = problem;
+        this.response = response;
     }
-    return WayChaserProblem;
-}(Error));
-exports.WayChaserProblem = WayChaserProblem;
+}
 /**
  * @param handlers
  */
-function sortHandlers(handlers) {
-    return handlers.sort(function (a, b) {
+export function sortHandlers(handlers) {
+    return handlers.sort((a, b) => {
         // -ve if less
         // e.g. a.q = 0.3, b.q = 0.4, then a.q - b.q = 0.3 - 0.4 = -0.1
         return (b.q || 1) - (a.q || 1);
@@ -375,54 +182,33 @@ function sortHandlers(handlers) {
  * @param handlers
  */
 function allMediaRanges(handlers) {
-    var e_4, _a, e_5, _b;
-    var rval = [];
-    try {
-        for (var handlers_1 = __values(handlers), handlers_1_1 = handlers_1.next(); !handlers_1_1.done; handlers_1_1 = handlers_1.next()) {
-            var handlerSpec = handlers_1_1.value;
-            try {
-                for (var _c = (e_5 = void 0, __values(handlerSpec.mediaRanges)), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var range = _d.value;
-                    if (typeof range === 'object') {
-                        if (handlerSpec.q) {
-                            rval.push({ type: range.mediaType, q: handlerSpec.q * (range.q || 1) });
-                        }
-                        else {
-                            rval.push({ type: range.mediaType, q: (range.q || 1) });
-                        }
-                    }
-                    else {
-                        if (handlerSpec.q) {
-                            rval.push({ type: range, q: handlerSpec.q });
-                        }
-                        else {
-                            rval.push({ type: range, q: 1 });
-                        }
-                    }
+    const rval = [];
+    for (const handlerSpec of handlers) {
+        for (const range of handlerSpec.mediaRanges) {
+            if (typeof range === 'object') {
+                if (handlerSpec.q) {
+                    rval.push({ type: range.mediaType, q: handlerSpec.q * (range.q || 1) });
+                }
+                else {
+                    rval.push({ type: range.mediaType, q: (range.q || 1) });
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
-            finally {
-                try {
-                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+            else {
+                if (handlerSpec.q) {
+                    rval.push({ type: range, q: handlerSpec.q });
+                }
+                else {
+                    rval.push({ type: range, q: 1 });
                 }
-                finally { if (e_5) throw e_5.error; }
             }
         }
     }
-    catch (e_4_1) { e_4 = { error: e_4_1 }; }
-    finally {
-        try {
-            if (handlers_1_1 && !handlers_1_1.done && (_a = handlers_1.return)) _a.call(handlers_1);
-        }
-        finally { if (e_4) throw e_4.error; }
-    }
-    var sorted = rval.sort(function (a, b) {
+    const sorted = rval.sort((a, b) => {
         return a.q - b.q;
     });
-    var seen = new Set();
-    var filtered = sorted.filter(function (item) {
-        var k = item.type;
+    const seen = new Set();
+    const filtered = sorted.filter(item => {
+        const k = item.type;
         return seen.has(k) ? false : seen.add(k);
     });
     return filtered;
@@ -434,113 +220,73 @@ function allMediaRanges(handlers) {
  * @returns {Promise<WayChaserResponse<Content>>}
  * @throws {TypeError | AbortError | WayChaserProblem}
  */
-function _waychaser(uriOrRequest, defaultOptions, options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var mergedOptions, mergedHandlers, defaultAcceptRanges, defaultAcceptStrings, additionalAcceptHeader, fullAcceptHeader, updateOptions, stop, _a, _b, interceptor, baseResponse, content, response, _c, _d, interceptor, error_1, response, wayChaserProblem, _e, _f, interceptor;
-        var e_6, _g, e_7, _h, e_8, _j;
-        var _k;
-        return __generator(this, function (_l) {
-            switch (_l.label) {
-                case 0:
-                    mergedOptions = (0, augment_options_1.augmentOptions)(defaultOptions, options);
-                    mergedHandlers = mergedOptions.defaultHandlers;
-                    if (!mergedOptions.fetch) {
-                        throw new Error('No global fetch and fetch not provided in options');
-                    }
-                    defaultAcceptRanges = allMediaRanges(mergedHandlers);
-                    defaultAcceptStrings = defaultAcceptRanges.map(function (accept) {
-                        return accept.q === 1 ? accept.type : "".concat(accept.type, ";q=").concat(accept.q);
-                    });
-                    additionalAcceptHeader = ((_k = options === null || options === void 0 ? void 0 : options.headers) === null || _k === void 0 ? void 0 : _k['accept'])
-                        ? [options.headers['accept']]
-                        : [];
-                    fullAcceptHeader = __spreadArray(__spreadArray([], __read(additionalAcceptHeader), false), __read(defaultAcceptStrings), false).join(',');
-                    updateOptions = __assign(__assign({}, mergedOptions), { headers: __assign(__assign({}, mergedOptions.headers), { accept: fullAcceptHeader }) });
-                    stop = false;
-                    try {
-                        for (_a = __values(updateOptions.preInterceptors || []), _b = _a.next(); !_b.done; _b = _a.next()) {
-                            interceptor = _b.value;
-                            interceptor(uriOrRequest, updateOptions, function () { return (stop = true); });
-                            if (stop) {
-                                break;
-                            }
-                        }
-                    }
-                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                    finally {
-                        try {
-                            if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
-                        }
-                        finally { if (e_6) throw e_6.error; }
-                    }
-                    return [4 /*yield*/, mergedOptions.fetch(uriOrRequest.toString(), updateOptions)];
-                case 1:
-                    baseResponse = _l.sent();
-                    _l.label = 2;
-                case 2:
-                    _l.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, mergedOptions.contentParser(baseResponse)
-                        // content is
-                        // 1. unknown, 
-                        // 4. undefined
-                    ];
-                case 3:
-                    content = _l.sent();
-                    response = WayChaserResponse.create(baseResponse, content, defaultOptions, mergedOptions);
-                    stop = false;
-                    try {
-                        for (_c = __values(updateOptions.postInterceptors), _d = _c.next(); !_d.done; _d = _c.next()) {
-                            interceptor = _d.value;
-                            interceptor(response, function () { return (stop = true); });
-                            if (stop) {
-                                break;
-                            }
-                        }
-                    }
-                    catch (e_7_1) { e_7 = { error: e_7_1 }; }
-                    finally {
-                        try {
-                            if (_d && !_d.done && (_h = _c.return)) _h.call(_c);
-                        }
-                        finally { if (e_7) throw e_7.error; }
-                    }
-                    return [2 /*return*/, response];
-                case 4:
-                    error_1 = _l.sent();
-                    response = new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions: defaultOptions, baseResponse: baseResponse, content: error_1, parameters: mergedOptions.parameters });
-                    wayChaserProblem = error_1 instanceof problem_document_1.ProblemDocument ? new WayChaserProblem({
-                        response: response,
-                        problem: error_1,
-                    }) : new WayChaserProblem({
-                        response: response,
-                        problem: new problem_document_1.ProblemDocument({
-                            type: "https://waychaser.io/unexected-error",
-                            title: "An unexpected error occurred",
-                            error: error_1
-                        }),
-                    });
-                    stop = false;
-                    try {
-                        for (_e = __values(updateOptions.postErrorInterceptors), _f = _e.next(); !_f.done; _f = _e.next()) {
-                            interceptor = _f.value;
-                            interceptor(wayChaserProblem, function () { return (stop = true); });
-                            if (stop) {
-                                break;
-                            }
-                        }
-                    }
-                    catch (e_8_1) { e_8 = { error: e_8_1 }; }
-                    finally {
-                        try {
-                            if (_f && !_f.done && (_j = _e.return)) _j.call(_e);
-                        }
-                        finally { if (e_8) throw e_8.error; }
-                    }
-                    throw wayChaserProblem;
-                case 5: return [2 /*return*/];
+export async function _waychaser(uriOrRequest, defaultOptions, options) {
+    const mergedOptions = augmentOptions(defaultOptions, options);
+    const mergedHandlers = mergedOptions.defaultHandlers;
+    if (!mergedOptions.fetch) {
+        throw new Error('No global fetch and fetch not provided in options');
+    }
+    const defaultAcceptRanges = allMediaRanges(mergedHandlers);
+    const defaultAcceptStrings = defaultAcceptRanges.map(accept => {
+        return accept.q === 1 ? accept.type : `${accept.type};q=${accept.q}`;
+    });
+    const additionalAcceptHeader = options?.headers?.['accept']
+        ? [options.headers['accept']]
+        : [];
+    const fullAcceptHeader = [
+        ...additionalAcceptHeader,
+        ...defaultAcceptStrings
+    ].join(',');
+    const updateOptions = {
+        ...mergedOptions,
+        headers: { ...mergedOptions.headers, accept: fullAcceptHeader }
+    };
+    let stop = false;
+    for (const interceptor of updateOptions.preInterceptors || []) {
+        interceptor(uriOrRequest, updateOptions, () => (stop = true));
+        if (stop) {
+            break;
+        }
+    }
+    const baseResponse = await mergedOptions.fetch(uriOrRequest.toString(), updateOptions);
+    try {
+        // TODO allow lazy loading of the content 
+        const content = await mergedOptions.contentParser(baseResponse);
+        // content is
+        // 1. unknown, 
+        // 4. undefined
+        const response = WayChaserResponse.create(baseResponse, content, defaultOptions, mergedOptions);
+        stop = false;
+        for (const interceptor of updateOptions.postInterceptors) {
+            interceptor(response, () => (stop = true));
+            if (stop) {
+                break;
             }
+        }
+        return response;
+    }
+    catch (error) {
+        const response = new WayChaserResponse({ handlers: mergedOptions.defaultHandlers, defaultOptions, baseResponse, content: error, parameters: mergedOptions.parameters });
+        const wayChaserProblem = error instanceof ProblemDocument ? new WayChaserProblem({
+            response,
+            problem: error,
+        }) : new WayChaserProblem({
+            response,
+            problem: new ProblemDocument({
+                type: "https://waychaser.io/unexected-error",
+                title: "An unexpected error occurred",
+                error
+            }),
         });
-    });
+        stop = false;
+        for (const interceptor of updateOptions.postErrorInterceptors) {
+            interceptor(wayChaserProblem, () => (stop = true));
+            if (stop) {
+                break;
+            }
+        }
+        throw wayChaserProblem;
+    }
 }
 /**
  *
@@ -567,65 +313,53 @@ function tryParseJson(content, contentType) {
         return JSON.parse(content);
     }
     catch (error) {
-        throw new problem_document_1.ProblemDocument({
+        throw new ProblemDocument({
             type: "https://waychaser.io/invalid-json",
             title: "JSON response could not be parsed",
-            detail: "The response document with content type '".concat(contentType, "' could not be parsed as json"),
-            content: content,
-            error: error
+            detail: `The response document with content type '${contentType}' could not be parsed as json`,
+            content, error
         });
     }
 }
-var wayChaserDefaults = {
-    fetch: typeof globalThis === 'undefined' ? (_a = getGlobal()) === null || _a === void 0 ? void 0 : _a.fetch : (_b = globalThis.fetch) === null || _b === void 0 ? void 0 : _b.bind(globalThis),
+const wayChaserDefaults = {
+    fetch: typeof globalThis === 'undefined' ? getGlobal()?.fetch : globalThis.fetch?.bind(globalThis),
     handlers: [],
     defaultHandlers: sortHandlers([
-        { handler: location_header_handler_1.locationHeaderHandler, mediaRanges: ['*/*'], q: 0.4 },
-        { handler: link_header_handler_1.linkHeaderHandler, mediaRanges: ['*/*'], q: 0.5 },
-        { handler: hal_handler_1.halHandler, mediaRanges: [media_types_1.default.HAL], q: 0.5 },
-        { handler: siren_handler_1.sirenHandler, mediaRanges: [media_types_1.default.SIREN], q: 0.5 }
+        { handler: locationHeaderHandler, mediaRanges: ['*/*'], q: 0.4 },
+        { handler: linkHeaderHandler, mediaRanges: ['*/*'], q: 0.5 },
+        { handler: halHandler, mediaRanges: [MediaTypes.HAL], q: 0.5 },
+        { handler: sirenHandler, mediaRanges: [MediaTypes.SIREN], q: 0.5 }
     ]),
     preInterceptors: [],
     postInterceptors: [],
     postErrorInterceptors: [],
-    contentParser: function (response) { return __awaiter(void 0, void 0, void 0, function () {
-        var content, contentType, jsonContent;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    if (!(response.headers.get('content-length') &&
-                        response.headers.get('content-length') !== '0')) return [3 /*break*/, 2];
-                    return [4 /*yield*/, response.text()];
-                case 1:
-                    content = _c.sent();
-                    contentType = (_b = (_a = response.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.split(';')) === null || _b === void 0 ? void 0 : _b[0];
-                    if (contentType === null || contentType === void 0 ? void 0 : contentType.endsWith('json')) {
-                        jsonContent = tryParseJson(content, contentType);
-                        if (contentType === 'application/problem+json') {
-                            throw Object.assign(new problem_document_1.ProblemDocument(jsonContent), jsonContent);
-                        }
-                        else {
-                            return [2 /*return*/, jsonContent];
-                        }
-                    }
-                    _c.label = 2;
-                case 2: return [2 /*return*/];
+    contentParser: async (response) => {
+        if (response.headers.get('content-length') &&
+            response.headers.get('content-length') !== '0') {
+            const content = await response.text();
+            const contentType = response.headers.get('content-type')?.split(';')?.[0];
+            if (contentType?.endsWith('json')) {
+                const jsonContent = tryParseJson(content, contentType);
+                if (contentType === 'application/problem+json') {
+                    throw Object.assign(new ProblemDocument(jsonContent), jsonContent);
+                }
+                else {
+                    return jsonContent;
+                }
             }
-        });
-    }); }
+        }
+        // else no content. Returning undefined
+    }
 };
 /**
  * @param newDefaults
  * @param oldDefaults
  */
 function _defaults(newDefaults, oldDefaults) {
-    var mergedOptions = (0, augment_options_1.augmentOptions)(oldDefaults, newDefaults);
-    var defaultedWaychaser = function (uriOrRequest, options) { return _waychaser(uriOrRequest, mergedOptions, options); };
+    const mergedOptions = augmentOptions(oldDefaults, newDefaults);
+    const defaultedWaychaser = (uriOrRequest, options) => _waychaser(uriOrRequest, mergedOptions, options);
     defaultedWaychaser.currentDefaults = mergedOptions;
-    defaultedWaychaser.defaults = function (newDefaults) {
-        return _defaults(newDefaults, mergedOptions);
-    };
+    defaultedWaychaser.defaults = (newDefaults) => _defaults(newDefaults, mergedOptions);
     return defaultedWaychaser;
 }
 /**
@@ -635,12 +369,10 @@ function _defaults(newDefaults, oldDefaults) {
  * @returns WayChaserResponse<Content>
  * @throws TypeError | AbortError | WayChaserResponseProblem | Error
  */
-exports.waychaser = Object.assign(function (uriOrRequest, options) {
+export const waychaser = Object.assign((uriOrRequest, options) => {
     return _waychaser(uriOrRequest, wayChaserDefaults, options);
 }, {
     currentDefaults: wayChaserDefaults,
-    defaults: function (newDefaults) {
-        return _defaults(newDefaults, wayChaserDefaults);
-    }
+    defaults: (newDefaults) => _defaults(newDefaults, wayChaserDefaults)
 });
 //# sourceMappingURL=waychaser.js.map