@blueprint-ts/core 4.1.0-beta.6 → 5.0.0

package/dist/requests/drivers/mock/MockRequestDriver.js

@@ -1,12 +1,3 @@
-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());
-    });
-};
 import { ResponseException } from '../../exceptions/ResponseException';
 import { isEqual } from 'lodash-es';
 import { MockRequestAssertionError } from './MockRequestAssertionError';
@@ -45,8 +36,7 @@ function stringify(value) {
     return value === undefined ? 'undefined' : JSON.stringify(value, null, 2);
 }
 function getPredicateDescription(predicate) {
-    var _a;
-    return (_a = predicate.description) !== null && _a !== void 0 ? _a : '[custom matcher]';
+    return predicate.description ?? '[custom matcher]';
 }
 function getTextBody(body) {
     if (!body || body.kind !== 'text') {
@@ -62,7 +52,7 @@ function getJsonBody(body) {
     try {
         return JSON.parse(textBody);
     }
-    catch (_a) {
+    catch {
         return undefined;
     }
 }
@@ -104,9 +94,11 @@ function isRecord(value) {
     return !!value && typeof value === 'object' && !Array.isArray(value);
 }
 export class MockRequestExpectationBuilder {
+    driver;
+    criteria;
     constructor(driver, criteria) {
         this.driver = driver;
-        this.criteria = Object.assign({}, criteria);
+        this.criteria = { ...criteria };
     }
     withHeaders(headers) {
         this.criteria.headers = headers;
@@ -121,18 +113,22 @@ export class MockRequestExpectationBuilder {
         return this;
     }
     respond(response) {
-        this.driver.expect(Object.assign(Object.assign({}, this.criteria), { response }));
+        this.driver.expect({
+            ...this.criteria,
+            response
+        });
         return this.driver;
     }
 }
 export class MockRequestDriver {
+    config;
+    expectations = [];
+    history = [];
+    matchMode;
     constructor(config, expectations = [], options = {}) {
-        var _a;
         this.config = config;
-        this.expectations = [];
-        this.history = [];
         this.expectations.push(...expectations);
-        this.matchMode = (_a = options.matchMode) !== null && _a !== void 0 ? _a : 'ordered';
+        this.matchMode = options.matchMode ?? 'ordered';
     }
     setMatchMode(mode) {
         this.matchMode = mode;
@@ -176,70 +172,63 @@ export class MockRequestDriver {
             `Next expected request: ${this.describeExpectation(nextExpectation)}`
         ].join('\n'));
     }
-    send(url, method, headers, body, requestConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if ((_a = requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.abortSignal) === null || _a === void 0 ? void 0 : _a.aborted) {
-                throw new DOMException('The operation was aborted.', 'AbortError');
-            }
-            const actualRequest = yield this.normalizeActualRequest(url, method, headers, body);
-            const { index, expectation } = yield this.selectExpectation(actualRequest);
-            this.expectations.splice(index, 1);
-            this.history.push(this.toHistoryEntry(actualRequest));
-            const response = new MockResponseHandler(expectation.response);
-            if (!response.getRawResponse().ok) {
-                throw new ResponseException(response);
-            }
-            return response;
-        });
+    async send(url, method, headers, body, requestConfig) {
+        if (requestConfig?.abortSignal?.aborted) {
+            throw new DOMException('The operation was aborted.', 'AbortError');
+        }
+        const actualRequest = await this.normalizeActualRequest(url, method, headers, body);
+        const { index, expectation } = await this.selectExpectation(actualRequest);
+        this.expectations.splice(index, 1);
+        this.history.push(this.toHistoryEntry(actualRequest));
+        const response = new MockResponseHandler(expectation.response);
+        if (!response.getRawResponse().ok) {
+            throw new ResponseException(response);
+        }
+        return response;
     }
-    selectExpectation(actualRequest) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.expectations.length === 0) {
+    async selectExpectation(actualRequest) {
+        if (this.expectations.length === 0) {
+            throw new MockRequestAssertionError(this.buildUnexpectedRequestMessage(actualRequest));
+        }
+        if (this.matchMode === 'ordered') {
+            const expectation = this.expectations[0];
+            if (!expectation) {
                 throw new MockRequestAssertionError(this.buildUnexpectedRequestMessage(actualRequest));
             }
-            if (this.matchMode === 'ordered') {
-                const expectation = this.expectations[0];
-                if (!expectation) {
-                    throw new MockRequestAssertionError(this.buildUnexpectedRequestMessage(actualRequest));
-                }
-                const failure = yield this.matchExpectation(expectation, actualRequest);
-                if (failure) {
-                    throw new MockRequestAssertionError(this.buildMismatchMessage(failure, actualRequest));
-                }
-                return { index: 0, expectation };
+            const failure = await this.matchExpectation(expectation, actualRequest);
+            if (failure) {
+                throw new MockRequestAssertionError(this.buildMismatchMessage(failure, actualRequest));
             }
-            const failures = [];
-            for (const [index, expectation] of this.expectations.entries()) {
-                const failure = yield this.matchExpectation(expectation, actualRequest);
-                if (!failure) {
-                    return { index, expectation };
-                }
-                failures.push(failure);
+            return { index: 0, expectation };
+        }
+        const failures = [];
+        for (const [index, expectation] of this.expectations.entries()) {
+            const failure = await this.matchExpectation(expectation, actualRequest);
+            if (!failure) {
+                return { index, expectation };
             }
-            throw new MockRequestAssertionError(this.buildUnorderedMismatchMessage(actualRequest, failures));
-        });
+            failures.push(failure);
+        }
+        throw new MockRequestAssertionError(this.buildUnorderedMismatchMessage(actualRequest, failures));
     }
-    matchExpectation(expectation, actualRequest) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const methodFailure = this.matchMethod(expectation.method, actualRequest, expectation);
-            if (methodFailure) {
-                return methodFailure;
-            }
-            const urlFailure = this.matchUrl(expectation, actualRequest);
-            if (urlFailure) {
-                return urlFailure;
-            }
-            const headersFailure = this.matchHeaders(expectation.headers, actualRequest, expectation);
-            if (headersFailure) {
-                return headersFailure;
-            }
-            const queryFailure = this.matchQuery(expectation.query, actualRequest, expectation);
-            if (queryFailure) {
-                return queryFailure;
-            }
-            return yield this.matchBody(expectation.body, actualRequest, expectation);
-        });
+    async matchExpectation(expectation, actualRequest) {
+        const methodFailure = this.matchMethod(expectation.method, actualRequest, expectation);
+        if (methodFailure) {
+            return methodFailure;
+        }
+        const urlFailure = this.matchUrl(expectation, actualRequest);
+        if (urlFailure) {
+            return urlFailure;
+        }
+        const headersFailure = this.matchHeaders(expectation.headers, actualRequest, expectation);
+        if (headersFailure) {
+            return headersFailure;
+        }
+        const queryFailure = this.matchQuery(expectation.query, actualRequest, expectation);
+        if (queryFailure) {
+            return queryFailure;
+        }
+        return await this.matchBody(expectation.body, actualRequest, expectation);
     }
     matchMethod(method, actualRequest, expectation) {
         if (isPredicate(method)) {
@@ -347,46 +336,73 @@ export class MockRequestDriver {
             actualValue: actualRequest.query
         };
     }
-    matchBody(body, actualRequest, expectation) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (body === undefined) {
-                return undefined;
-            }
-            if (isPredicate(body)) {
-                const context = this.createBodyMatchContext(actualRequest);
-                if (body(context)) {
-                    return undefined;
-                }
-                return {
-                    field: 'body',
-                    message: 'Body matcher returned false.',
-                    expectation,
-                    expectedValue: getPredicateDescription(body),
-                    actualValue: this.describeBodyForMessage(actualRequest.body)
-                };
-            }
-            const expectedBody = yield this.normalizeBody(body);
-            if (JSON.stringify(expectedBody) === JSON.stringify(actualRequest.body)) {
+    async matchBody(body, actualRequest, expectation) {
+        if (body === undefined) {
+            return undefined;
+        }
+        if (isPredicate(body)) {
+            const context = this.createBodyMatchContext(actualRequest);
+            if (body(context)) {
                 return undefined;
             }
-            const expectedJson = getJsonBody(expectedBody);
-            const actualJson = getJsonBody(actualRequest.body);
-            return Object.assign({ field: 'body', message: expectedJson !== undefined && actualJson !== undefined ? 'JSON body did not match.' : 'Body did not match exactly.', expectation, expectedValue: expectedJson !== null && expectedJson !== void 0 ? expectedJson : expectedBody, actualValue: actualJson !== null && actualJson !== void 0 ? actualJson : actualRequest.body }, (expectedJson !== undefined && actualJson !== undefined ? { diffPaths: collectJsonDiffPaths(expectedJson, actualJson) } : {}));
-        });
+            return {
+                field: 'body',
+                message: 'Body matcher returned false.',
+                expectation,
+                expectedValue: getPredicateDescription(body),
+                actualValue: this.describeBodyForMessage(actualRequest.body)
+            };
+        }
+        const expectedBody = await this.normalizeBody(body);
+        if (JSON.stringify(expectedBody) === JSON.stringify(actualRequest.body)) {
+            return undefined;
+        }
+        const expectedJson = getJsonBody(expectedBody);
+        const actualJson = getJsonBody(actualRequest.body);
+        return {
+            field: 'body',
+            message: expectedJson !== undefined && actualJson !== undefined ? 'JSON body did not match.' : 'Body did not match exactly.',
+            expectation,
+            expectedValue: expectedJson ?? expectedBody,
+            actualValue: actualJson ?? actualRequest.body,
+            ...(expectedJson !== undefined && actualJson !== undefined ? { diffPaths: collectJsonDiffPaths(expectedJson, actualJson) } : {})
+        };
     }
     createBodyMatchContext(actualRequest) {
-        return Object.assign(Object.assign({ method: actualRequest.method, url: actualRequest.url, headers: actualRequest.headers }, (actualRequest.body !== undefined ? { body: actualRequest.body } : {})), { getJson: () => getJsonBody(actualRequest.body), getText: () => getTextBody(actualRequest.body), getQuery: () => actualRequest.query });
-    }
-    normalizeActualRequest(url, method, headers, body) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const resolvedUrl = parseUrl(url);
-            const normalizedBody = yield this.normalizeBody(body === null || body === void 0 ? void 0 : body.getContent());
-            return Object.assign({ method, url: this.normalizeUrl(url), urlWithoutQuery: buildUrlWithoutQuery(resolvedUrl), parsedUrl: resolvedUrl, headers: this.resolveHeaders(Object.assign(Object.assign(Object.assign({}, (_a = this.config) === null || _a === void 0 ? void 0 : _a.headers), headers), body === null || body === void 0 ? void 0 : body.getHeaders())), query: parseQuery(resolvedUrl) }, (normalizedBody !== undefined ? { body: normalizedBody } : {}));
-        });
+        return {
+            method: actualRequest.method,
+            url: actualRequest.url,
+            headers: actualRequest.headers,
+            ...(actualRequest.body !== undefined ? { body: actualRequest.body } : {}),
+            getJson: () => getJsonBody(actualRequest.body),
+            getText: () => getTextBody(actualRequest.body),
+            getQuery: () => actualRequest.query
+        };
+    }
+    async normalizeActualRequest(url, method, headers, body) {
+        const resolvedUrl = parseUrl(url);
+        const normalizedBody = await this.normalizeBody(body?.getContent());
+        return {
+            method,
+            url: this.normalizeUrl(url),
+            urlWithoutQuery: buildUrlWithoutQuery(resolvedUrl),
+            parsedUrl: resolvedUrl,
+            headers: this.resolveHeaders({
+                ...this.config?.headers,
+                ...headers,
+                ...body?.getHeaders()
+            }),
+            query: parseQuery(resolvedUrl),
+            ...(normalizedBody !== undefined ? { body: normalizedBody } : {})
+        };
     }
     toHistoryEntry(request) {
-        return Object.assign({ method: request.method, url: request.url, headers: request.headers }, (request.body !== undefined ? { body: request.body } : {}));
+        return {
+            method: request.method,
+            url: request.url,
+            headers: request.headers,
+            ...(request.body !== undefined ? { body: request.body } : {})
+        };
     }
     buildUnexpectedRequestMessage(actualRequest) {
         return ['Unexpected request received with no expectations left.', '', 'Actual request:', this.formatRequestSnapshot(actualRequest)].join('\n');
@@ -477,7 +493,7 @@ export class MockRequestDriver {
     }
     describeBodyForMessage(body) {
         const json = getJsonBody(body);
-        return json !== null && json !== void 0 ? json : body;
+        return json ?? body;
     }
     normalizeUrl(url) {
         return parseUrl(url).toString();
@@ -493,51 +509,55 @@ export class MockRequestDriver {
         }
         return resolved;
     }
-    normalizeBody(body) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (body === undefined) {
-                return undefined;
-            }
-            if (body === null) {
-                return { kind: 'null' };
-            }
-            if (typeof body === 'string') {
-                return { kind: 'text', value: body };
-            }
-            if (body instanceof FormData) {
-                return yield this.normalizeFormData(body);
-            }
-            if (body instanceof Blob) {
-                const mimeType = body.type || undefined;
-                return Object.assign(Object.assign({ kind: 'binary' }, (mimeType !== undefined ? { mimeType } : {})), { bytes: Array.from(new Uint8Array(yield this.readBlob(body))) });
-            }
-            if (this.isBufferSource(body)) {
-                return {
-                    kind: 'binary',
-                    bytes: Array.from(new Uint8Array(this.toArrayBuffer(body)))
-                };
-            }
+    async normalizeBody(body) {
+        if (body === undefined) {
+            return undefined;
+        }
+        if (body === null) {
+            return { kind: 'null' };
+        }
+        if (typeof body === 'string') {
+            return { kind: 'text', value: body };
+        }
+        if (body instanceof FormData) {
+            return await this.normalizeFormData(body);
+        }
+        if (body instanceof Blob) {
+            const mimeType = body.type || undefined;
             return {
-                kind: 'text',
-                value: JSON.stringify(body)
+                kind: 'binary',
+                ...(mimeType !== undefined ? { mimeType } : {}),
+                bytes: Array.from(new Uint8Array(await this.readBlob(body)))
             };
-        });
+        }
+        if (this.isBufferSource(body)) {
+            return {
+                kind: 'binary',
+                bytes: Array.from(new Uint8Array(this.toArrayBuffer(body)))
+            };
+        }
+        return {
+            kind: 'text',
+            value: JSON.stringify(body)
+        };
     }
-    normalizeFormData(body) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const entries = [];
-            for (const [key, value] of body.entries()) {
-                if (typeof value === 'string') {
-                    entries.push({ key, value: { kind: 'text', value } });
-                    continue;
-                }
-                entries.push({
-                    key,
-                    value: Object.assign(Object.assign({ kind: 'file' }, this.getOptionalBlobDetails(value)), { bytes: Array.from(new Uint8Array(yield this.readBlob(value))) })
-                });
+    async normalizeFormData(body) {
+        const entries = [];
+        for (const [key, value] of body.entries()) {
+            if (typeof value === 'string') {
+                entries.push({ key, value: { kind: 'text', value } });
+                continue;
             }
-            return { kind: 'form-data', entries };
-        });
+            entries.push({
+                key,
+                value: {
+                    kind: 'file',
+                    ...this.getOptionalBlobDetails(value),
+                    bytes: Array.from(new Uint8Array(await this.readBlob(value)))
+                }
+            });
+        }
+        return { kind: 'form-data', entries };
     }
     getBlobName(value) {
         if (typeof File !== 'undefined' && value instanceof File) {
@@ -548,24 +568,25 @@ export class MockRequestDriver {
     getOptionalBlobDetails(value) {
         const name = this.getBlobName(value);
         const mimeType = value.type || undefined;
-        return Object.assign(Object.assign({}, (name !== undefined ? { name } : {})), (mimeType !== undefined ? { mimeType } : {}));
+        return {
+            ...(name !== undefined ? { name } : {}),
+            ...(mimeType !== undefined ? { mimeType } : {})
+        };
     }
-    readBlob(value) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const blobWithReader = value;
-            if (typeof blobWithReader.arrayBuffer === 'function') {
-                return yield blobWithReader.arrayBuffer();
-            }
-            if (typeof FileReader !== 'undefined') {
-                return yield new Promise((resolve, reject) => {
-                    const reader = new FileReader();
-                    reader.onload = () => resolve(reader.result);
-                    reader.onerror = () => { var _a; return reject((_a = reader.error) !== null && _a !== void 0 ? _a : new Error('Failed to read Blob contents.')); };
-                    reader.readAsArrayBuffer(value);
-                });
-            }
-            return yield new Response(value).arrayBuffer();
-        });
+    async readBlob(value) {
+        const blobWithReader = value;
+        if (typeof blobWithReader.arrayBuffer === 'function') {
+            return await blobWithReader.arrayBuffer();
+        }
+        if (typeof FileReader !== 'undefined') {
+            return await new Promise((resolve, reject) => {
+                const reader = new FileReader();
+                reader.onload = () => resolve(reader.result);
+                reader.onerror = () => reject(reader.error ?? new Error('Failed to read Blob contents.'));
+                reader.readAsArrayBuffer(value);
+            });
+        }
+        return await new Response(value).arrayBuffer();
     }
     isBufferSource(value) {
         return value instanceof ArrayBuffer || ArrayBuffer.isView(value);

package/dist/requests/drivers/mock/MockRequestTestHelpers.js

@@ -40,7 +40,11 @@ export function expectJsonBody(expected, options = {}) {
     });
 }
 export function jsonResponse(status, body, headers) {
-    return Object.assign(Object.assign({ status }, (headers !== undefined ? { headers } : {})), { body });
+    return {
+        status,
+        ...(headers !== undefined ? { headers } : {}),
+        body
+    };
 }
 export function validationError(errors, message = 'The given data was invalid.') {
     return jsonResponse(422, {
@@ -49,12 +53,14 @@ export function validationError(errors, message = 'The given data was invalid.')
     });
 }
 export function emptyResponse(status = 204, headers) {
-    return Object.assign({ status }, (headers !== undefined ? { headers } : {}));
+    return {
+        status,
+        ...(headers !== undefined ? { headers } : {})
+    };
 }
 let installedMockRequestDriver;
 export function installMockRequestDriver(options = {}) {
-    var _a;
-    const driver = new MockRequestDriver(options.config, (_a = options.expectations) !== null && _a !== void 0 ? _a : [], options.matchMode !== undefined ? { matchMode: options.matchMode } : {});
+    const driver = new MockRequestDriver(options.config, options.expectations ?? [], options.matchMode !== undefined ? { matchMode: options.matchMode } : {});
     BaseRequest.setRequestDriver(driver);
     installedMockRequestDriver = driver;
     return driver;

package/dist/requests/drivers/mock/MockResponseHandler.js

@@ -1,18 +1,13 @@
-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());
-    });
-};
 export class MockResponseHandler {
+    response;
     constructor(definition) {
-        var _a;
         const headers = new Headers(definition.headers);
         const body = this.resolveBody(definition.body, headers);
-        this.response = new Response(body, Object.assign({ status: (_a = definition.status) !== null && _a !== void 0 ? _a : 200, headers }, (definition.statusText !== undefined ? { statusText: definition.statusText } : {})));
+        this.response = new Response(body, {
+            status: definition.status ?? 200,
+            headers,
+            ...(definition.statusText !== undefined ? { statusText: definition.statusText } : {})
+        });
     }
     getStatusCode() {
         return this.response.status;
@@ -23,20 +18,14 @@ export class MockResponseHandler {
     getRawResponse() {
         return this.response;
     }
-    json() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.response.clone().json();
-        });
+    async json() {
+        return await this.response.clone().json();
     }
-    text() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.response.clone().text();
-        });
+    async text() {
+        return await this.response.clone().text();
     }
-    blob() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.response.clone().blob();
-        });
+    async blob() {
+        return await this.response.clone().blob();
     }
     resolveBody(body, headers) {
         if (body === undefined || body === null) {