@dereekb/util 9.12.0 → 9.12.1

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [9.12.1](https://github.com/dereekb/dbx-components/compare/v9.12.0-dev...v9.12.1) (2022-11-07)
+
+
+
 # [9.12.0](https://github.com/dereekb/dbx-components/compare/v9.11.13-dev...v9.12.0) (2022-11-07)
 
 

package/fetch/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [9.12.1](https://github.com/dereekb/dbx-components/compare/v9.12.0-dev...v9.12.1) (2022-11-07)
+
+
+
 # [9.12.0](https://github.com/dereekb/dbx-components/compare/v9.11.13-dev...v9.12.0) (2022-11-07)
 
 

package/fetch/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/util/fetch",
-  "version": "9.12.0",
+  "version": "9.12.1",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@dereekb/util": "9.12.0",
+    "@dereekb/util": "9.12.1",
     "lodash.isequal": "^4.5.0",
     "make-error": "^1.3.0",
     "class-validator": "^0.13.2",

package/fetch/src/lib/error.d.ts

@@ -0,0 +1,13 @@
+import { BaseError } from 'make-error';
+/**
+ * Wraps the input fetch function to always pass the fetch response promise to requireOkResponse().
+ *
+ * @param inputFetch
+ * @returns
+ */
+export declare function fetchOk(inputFetch: typeof fetch): typeof fetch;
+export declare class FetchResponseError extends BaseError {
+    readonly response: Response;
+    constructor(response: Response);
+}
+export declare function requireOkResponse(responsePromise: Promise<Response>): Promise<Response>;

package/fetch/src/lib/error.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireOkResponse = exports.FetchResponseError = exports.fetchOk = void 0;
+const make_error_1 = require("make-error");
+/**
+ * Wraps the input fetch function to always pass the fetch response promise to requireOkResponse().
+ *
+ * @param inputFetch
+ * @returns
+ */
+function fetchOk(inputFetch) {
+    return (input, init) => requireOkResponse(inputFetch(input, init));
+}
+exports.fetchOk = fetchOk;
+class FetchResponseError extends make_error_1.BaseError {
+    constructor(response) {
+        super(`Fetch response was a non-ok status code (${response.status}): ${response.statusText}`);
+        this.response = response;
+    }
+}
+exports.FetchResponseError = FetchResponseError;
+function requireOkResponse(responsePromise) {
+    return responsePromise.then((response) => {
+        if (!response.ok) {
+            throw new FetchResponseError(response);
+        }
+        return response;
+    });
+}
+exports.requireOkResponse = requireOkResponse;
+//# sourceMappingURL=error.js.map

package/fetch/src/lib/error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/error.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AAEvC;;;;;GAKG;AACH,SAAgB,OAAO,CAAC,UAAwB;IAC9C,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AACrE,CAAC;AAFD,0BAEC;AAED,MAAa,kBAAmB,SAAQ,sBAAS;IAC/C,YAAqB,QAAkB;QACrC,KAAK,CAAC,4CAA4C,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QAD3E,aAAQ,GAAR,QAAQ,CAAU;IAEvC,CAAC;CACF;AAJD,gDAIC;AAED,SAAgB,iBAAiB,CAAC,eAAkC;IAClE,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QACvC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;YAChB,MAAM,IAAI,kBAAkB,CAAC,QAAQ,CAAC,CAAC;SACxC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AARD,8CAQC"}

package/fetch/src/lib/fetch.d.ts

@@ -1,16 +1,17 @@
-import { WebsiteUrl } from '@dereekb/util';
+import { Factory, MapFunction, WebsiteUrl } from '@dereekb/util';
+import { ConfiguredFetchWithTimeout, RequestInitWithTimeout } from './fetch.type';
 /**
  * Interface used for creating fetch related resource factories.
  */
 export interface FetchService {
-    makeFetch: typeof configureFetch;
+    makeFetch: (config?: ConfigureFetchInput) => ConfiguredFetchWithTimeout;
     makeRequest: FetchRequestFactory;
     fetchRequestFactory: typeof fetchRequestFactory;
 }
 /**
  * fetchService() configuration.
  */
-export declare type FetchServiceConfig = Required<Pick<ConfigureFetchInput, 'makeFetch' | 'makeRequest'>>;
+export declare type FetchServiceConfig = Required<Pick<ConfigureFetchInput, 'makeFetch' | 'makeRequest'>> & Pick<ConfigureFetchInput, 'baseRequest'>;
 /**
  * Used to create a FetchService.
  *
@@ -18,17 +19,35 @@ export declare type FetchServiceConfig = Required<Pick<ConfigureFetchInput, 'mak
  * @returns
  */
 export declare function fetchService(config: FetchServiceConfig): FetchService;
+export declare type MapFetchResponseFunction = MapFunction<Promise<Response>, Promise<Response>>;
 export interface ConfigureFetchInput extends FetchRequestFactoryInput {
     makeFetch?: typeof fetch;
+    /**
+     * Whether or not to add timeout handling using timeoutFetch().
+     *
+     * Default: false
+     */
+    useTimeout?: boolean;
+    /**
+     * Whether or not to map the fetch response using requireOkResponse().
+     *
+     * Default: false
+     */
+    requireOkResponse?: boolean;
+    /**
+     * (Optional) MapFetchResponseFunction
+     *
+     * If requireOkResponse is true, this mapping occurs afterwards.
+     */
+    mapResponse?: MapFetchResponseFunction;
 }
-export declare type ConfiguredFetch = typeof fetch;
 /**
  * Creates a function that wraps fetch and uses a FetchRequestFactory to generate a Request before invoking Fetch.
  *
  * @param config
  * @returns
  */
-export declare function configureFetch(config: ConfigureFetchInput): ConfiguredFetch;
+export declare function configureFetch(config: ConfigureFetchInput): ConfiguredFetchWithTimeout;
 export interface FetchRequestFactoryInput {
     /**
      * Request factory to use. If not defined, will default to window/global.
@@ -46,6 +65,12 @@ export interface FetchRequestFactoryInput {
      * Base request info to add to each value.
      */
     baseRequest?: RequestInit;
+    /**
+     * Default timeout to add to requestInit values.
+     *
+     * NOTE: This timeout is not used by this fetchRequest directly, but instead
+     */
+    timeout?: number;
     /**
      * Maps the input RequestInit value to another.
      *
@@ -53,7 +78,8 @@ export interface FetchRequestFactoryInput {
      */
     requestInitFactory?: FetchRequestInitFactory;
 }
-export declare type FetchRequestInitFactory = (currRequest: Request, init?: RequestInit) => RequestInit | undefined;
+export declare type FetchRequestInitFactory = (currRequest: Request, init?: RequestInit) => RequestInitWithTimeout | undefined;
 export declare type FetchRequestFactory = (input: RequestInfo | URL, init?: RequestInit | undefined) => Request;
+export declare type AbortControllerFactory = Factory<AbortController>;
 export declare function fetchRequestFactory(config: FetchRequestFactoryInput): FetchRequestFactory;
 export declare function isFetchRequest(input: unknown): input is Request;

package/fetch/src/lib/fetch.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isFetchRequest = exports.fetchRequestFactory = exports.configureFetch = exports.fetchService = void 0;
 const util_1 = require("@dereekb/util");
+const error_1 = require("./error");
+const timeout_1 = require("./timeout");
 /**
  * Used to create a FetchService.
  *
@@ -9,10 +11,10 @@ const util_1 = require("@dereekb/util");
  * @returns
  */
 function fetchService(config) {
-    const { makeFetch: inputMakeFetch, makeRequest } = config;
+    const { makeFetch: inputMakeFetch, makeRequest, baseRequest } = config;
     const factory = {
-        makeFetch: (config) => configureFetch(Object.assign({ makeFetch: inputMakeFetch }, config)),
-        fetchRequestFactory: (config) => fetchRequestFactory(Object.assign({ makeRequest }, config)),
+        fetchRequestFactory: (config) => fetchRequestFactory(Object.assign({ makeRequest, baseRequest }, config)),
+        makeFetch: (config = {}) => configureFetch(Object.assign({ makeRequest, makeFetch: inputMakeFetch, baseRequest }, config)),
         makeRequest: config.makeRequest
     };
     return factory;
@@ -25,16 +27,30 @@ exports.fetchService = fetchService;
  * @returns
  */
 function configureFetch(config) {
-    const { makeFetch = fetch } = config;
+    const { makeFetch: inputMakeFetch = fetch, useTimeout, requireOkResponse: inputRequireOkResponse, mapResponse } = config;
+    let makeFetch = inputMakeFetch;
+    if (useTimeout) {
+        // add fetchTimeout
+        makeFetch = (0, timeout_1.fetchTimeout)(makeFetch);
+    }
+    if (inputRequireOkResponse) {
+        // Add fetchOk
+        makeFetch = (0, error_1.fetchOk)(makeFetch);
+    }
     const makeFetchRequest = fetchRequestFactory(config);
     return (input, init) => {
-        return makeFetch(makeFetchRequest(input, init));
+        let response = makeFetch(makeFetchRequest(input, init));
+        if (mapResponse) {
+            response = mapResponse(response);
+        }
+        return response;
     };
 }
 exports.configureFetch = configureFetch;
 function fetchRequestFactory(config) {
-    const { makeRequest: requestFactory = (input, init) => new Request(input, init), baseUrl: inputBaseUrl, baseRequest, requestInitFactory, useBaseUrlForConfiguredFetchRequests = false } = config;
+    const { makeRequest = (input, init) => new Request(input, init), baseUrl: inputBaseUrl, baseRequest: inputBaseRequest, timeout, requestInitFactory, useBaseUrlForConfiguredFetchRequests = false } = config;
     const baseUrl = inputBaseUrl ? new URL((0, util_1.removeTrailingFileTypeSeparators)(inputBaseUrl)) : undefined;
+    const baseRequest = timeout ? Object.assign(Object.assign({}, inputBaseRequest), { timeout }) : inputBaseRequest;
     const buildUrl = baseUrl
         ? (url) => {
             return new URL(url, baseUrl);
@@ -45,7 +61,7 @@ function fetchRequestFactory(config) {
             return input;
         }
         else {
-            return new Request(input);
+            return makeRequest(input);
         }
     }
     const buildRequestWithFixedUrl = buildUrl
@@ -66,21 +82,21 @@ function fetchRequestFactory(config) {
                 }
             }
             else {
-                request = requestFactory(input);
+                request = makeRequest(input);
             }
             if (!request) {
                 const url = buildUrl(relativeUrl);
-                request = requestFactory(url.href, baseRequest);
+                request = makeRequest(url.href, baseRequest);
             }
             return request;
         }
         : asFetchRequest;
     let buildRequestInit;
     if (baseRequest && requestInitFactory) {
-        buildRequestInit = (req, x) => requestInitFactory(req, Object.assign(Object.assign({}, baseRequest), x));
+        buildRequestInit = (req, x) => requestInitFactory(req, Object.assign(Object.assign(Object.assign({}, baseRequest), { timeout: req.timeout }), x));
     }
     else if (baseRequest) {
-        buildRequestInit = (_, x) => (Object.assign(Object.assign({}, baseRequest), x));
+        buildRequestInit = (req, x) => (Object.assign(Object.assign(Object.assign({}, baseRequest), { timeout: req.timeout }), x));
     }
     else if (requestInitFactory) {
         buildRequestInit = requestInitFactory;
@@ -91,7 +107,9 @@ function fetchRequestFactory(config) {
     return (input, init) => {
         const fixedRequest = buildRequestWithFixedUrl(input);
         init = buildRequestInit(fixedRequest, init);
-        return requestFactory(fixedRequest, init);
+        const request = makeRequest(fixedRequest, init);
+        request.timeout = timeout; // copy/set timeout on the request directly
+        return request;
     };
 }
 exports.fetchRequestFactory = fetchRequestFactory;

package/fetch/src/lib/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/fetch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/fetch.ts"],"names":[],"mappings":"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"}

package/fetch/src/lib/fetch.type.d.ts

@@ -0,0 +1,13 @@
+export declare type FetchMethod = Request['method'];
+export interface RequestTimeoutRef {
+    timeout?: number | null;
+}
+/**
+ * RequestInit with timeout provided.
+ */
+export interface RequestInitWithTimeout extends RequestInit, RequestTimeoutRef {
+}
+export interface RequestWithTimeout extends Request, RequestTimeoutRef {
+}
+export declare type ConfiguredFetch = typeof fetch;
+export declare type ConfiguredFetchWithTimeout = (input: Parameters<typeof fetch>[0], init?: RequestInitWithTimeout | undefined) => ReturnType<typeof fetch>;

package/fetch/src/lib/fetch.type.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=fetch.type.js.map

package/fetch/src/lib/fetch.type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch.type.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/fetch.type.ts"],"names":[],"mappings":""}

package/fetch/src/lib/index.d.ts

@@ -1 +1,3 @@
+export * from './error';
 export * from './fetch';
+export * from './json';

package/fetch/src/lib/index.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./error"), exports);
 tslib_1.__exportStar(require("./fetch"), exports);
+tslib_1.__exportStar(require("./json"), exports);
 //# sourceMappingURL=index.js.map

package/fetch/src/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,kDAAwB;AACxB,iDAAuB"}

package/fetch/src/lib/json.d.ts

@@ -0,0 +1,24 @@
+import { FetchMethod, ConfiguredFetch } from './fetch.type';
+export declare type FetchJsonBody = string | object;
+/**
+ * Converts the input to a JSON string, or undefined if not provided.
+ *
+ * @param body
+ * @returns
+ */
+export declare function fetchJsonBodyString(body: FetchJsonBody | undefined): string | undefined;
+export interface FetchJsonInput extends Omit<RequestInit, 'body'> {
+    method: FetchMethod;
+    body?: FetchJsonBody;
+}
+export declare type FetchJsonMethodAndBodyFunction = <R>(url: URL | string, method: string, body?: FetchJsonBody) => Promise<R>;
+export declare type FetchJsonWithInputFunction = <R>(url: URL | string, input: FetchJsonInput) => Promise<R>;
+/**
+ * Used to fetch from the input url and retrieve a JSON response.
+ */
+export declare type FetchJsonFunction = FetchJsonMethodAndBodyFunction & FetchJsonWithInputFunction;
+/**
+ * Creates a FetchJsonFunction from the input ConfiguredFetch.
+ */
+export declare function fetchJsonFunction(fetch: ConfiguredFetch): FetchJsonFunction;
+export declare function fetchJsonRequestInit(methodOrInput: string | FetchJsonInput, body?: FetchJsonBody): RequestInit;

package/fetch/src/lib/json.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchJsonRequestInit = exports.fetchJsonFunction = exports.fetchJsonBodyString = void 0;
+/**
+ * Converts the input to a JSON string, or undefined if not provided.
+ *
+ * @param body
+ * @returns
+ */
+function fetchJsonBodyString(body) {
+    return body != null ? (typeof body === 'string' ? body : JSON.stringify(body)) : undefined;
+}
+exports.fetchJsonBodyString = fetchJsonBodyString;
+/**
+ * Creates a FetchJsonFunction from the input ConfiguredFetch.
+ */
+function fetchJsonFunction(fetch) {
+    return (url, methodOrInput, body) => {
+        const requestInit = fetchJsonRequestInit(methodOrInput, body);
+        const response = fetch(url, requestInit);
+        return response.then((x) => x.json());
+    };
+}
+exports.fetchJsonFunction = fetchJsonFunction;
+function fetchJsonRequestInit(methodOrInput, body) {
+    let config;
+    if (typeof methodOrInput === 'string') {
+        config = {
+            method: methodOrInput,
+            body
+        };
+    }
+    else {
+        config = methodOrInput;
+    }
+    const requestInit = Object.assign(Object.assign({}, config), { body: fetchJsonBodyString(config.body) });
+    return requestInit;
+}
+exports.fetchJsonRequestInit = fetchJsonRequestInit;
+//# sourceMappingURL=json.js.map

package/fetch/src/lib/json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/json.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,IAA+B;IACjE,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7F,CAAC;AAFD,kDAEC;AAeD;;GAEG;AACH,SAAgB,iBAAiB,CAAC,KAAsB;IACtD,OAAO,CAAC,GAAiB,EAAE,aAAsC,EAAE,IAAoB,EAAE,EAAE;QACzF,MAAM,WAAW,GAAG,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACzC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC;AACJ,CAAC;AAND,8CAMC;AAED,SAAgB,oBAAoB,CAAC,aAAsC,EAAE,IAAoB;IAC/F,IAAI,MAAsB,CAAC;IAE3B,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QACrC,MAAM,GAAG;YACP,MAAM,EAAE,aAAa;YACrB,IAAI;SACL,CAAC;KACH;SAAM;QACL,MAAM,GAAG,aAAa,CAAC;KACxB;IAED,MAAM,WAAW,mCACZ,MAAM,KACT,IAAI,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,GACvC,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC;AAlBD,oDAkBC"}

package/fetch/src/lib/timeout.d.ts

@@ -0,0 +1,7 @@
+import { BaseError } from 'make-error';
+export declare class FetchTimeoutError extends BaseError {
+    readonly response: Response;
+    readonly timeout: number;
+    constructor(response: Response, timeout: number);
+}
+export declare function fetchTimeout(inputFetch: typeof fetch): typeof fetch;

package/fetch/src/lib/timeout.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchTimeout = exports.FetchTimeoutError = void 0;
+const make_error_1 = require("make-error");
+class FetchTimeoutError extends make_error_1.BaseError {
+    constructor(response, timeout) {
+        super(`Fetch response was timed out (${timeout})`);
+        this.response = response;
+        this.timeout = timeout;
+    }
+}
+exports.FetchTimeoutError = FetchTimeoutError;
+function fetchTimeout(inputFetch) {
+    return (input, init) => {
+        var _a;
+        let controller;
+        let timeout = (_a = init === null || init === void 0 ? void 0 : init.timeout) !== null && _a !== void 0 ? _a : input.timeout;
+        // if signal is not provided, and a timeout is specified, configure the timeout
+        if (!(init === null || init === void 0 ? void 0 : init.signal) && timeout) {
+            controller = new AbortController();
+            init = Object.assign(Object.assign({}, init), { signal: controller.signal // pass the abort signal
+             });
+        }
+        let responsePromise = inputFetch(input, init);
+        if (timeout) {
+            const timeoutId = setTimeout(() => {
+                controller === null || controller === void 0 ? void 0 : controller.abort();
+            }, timeout);
+            responsePromise = responsePromise.finally(() => {
+                clearTimeout(timeoutId);
+            });
+        }
+        return responsePromise;
+    };
+}
+exports.fetchTimeout = fetchTimeout;
+//# sourceMappingURL=timeout.js.map

package/fetch/src/lib/timeout.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/timeout.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AAGvC,MAAa,iBAAkB,SAAQ,sBAAS;IAC9C,YAAqB,QAAkB,EAAW,OAAe;QAC/D,KAAK,CAAC,iCAAiC,OAAO,GAAG,CAAC,CAAC;QADhC,aAAQ,GAAR,QAAQ,CAAU;QAAW,YAAO,GAAP,OAAO,CAAQ;IAEjE,CAAC;CACF;AAJD,8CAIC;AAED,SAAgB,YAAY,CAAC,UAAwB;IACnD,OAAO,CAAC,KAAwB,EAAE,IAA6B,EAAE,EAAE;;QACjE,IAAI,UAAuC,CAAC;QAC5C,IAAI,OAAO,GAA8B,MAAC,IAA+B,aAA/B,IAAI,uBAAJ,IAAI,CAA6B,OAAO,mCAAK,KAA4B,CAAC,OAAO,CAAC;QAE5H,+EAA+E;QAC/E,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAA,IAAI,OAAO,EAAE;YAC5B,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YAEnC,IAAI,mCACC,IAAI,KACP,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,wBAAwB;eACnD,CAAC;SACH;QAED,IAAI,eAAe,GAAG,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE9C,IAAI,OAAO,EAAE;YACX,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;gBAChC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,EAAE,CAAC;YACtB,CAAC,EAAE,OAAO,CAAC,CAAC;YAEZ,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE;gBAC7C,YAAY,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,eAAe,CAAC;IACzB,CAAC,CAAC;AACJ,CAAC;AA7BD,oCA6BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util",
-  "version": "9.12.0",
+  "version": "9.12.1",
   "type": "commonjs",
   "exports": {
     ".": {

package/src/lib/error/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/error/error.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AACvC,+CAAyD;AA2BzD,SAAgB,aAAa,CAAC,IAAqB,EAAE,OAAgB;IACnE,OAAO;QACL,IAAI;QACJ,OAAO;KACR,CAAC;AACJ,CAAC;AALD,sCAKC;AAYD;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,UAA6B;IAC3D,IAAI,KAAwC,CAAC;IAE7C,IAAI,UAAU,EAAE;QACd,IAAK,UAAyB,CAAC,IAAI,EAAE;YACnC,KAAK,GAAG,UAA2B,CAAC;SACrC;aAAM,IAAK,UAA2B,CAAC,IAAI,EAAE;YAC5C,KAAK,GAAI,UAA2B,CAAC,IAAqB,CAAC;SAC5D;aAAM,IAAI,UAAU,YAAY,sBAAS,EAAE;YAC1C,KAAK,GAAG;gBACN,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,MAAM,EAAE,UAAU;aACnB,CAAC;SACH;aAAM;YACL,KAAK,GAAG;gBACN,IAAI,EAAE,OAAO;gBACb,OAAO,EAAG,UAA4B,CAAC,OAAO,IAAI,EAAE;gBACpD,MAAM,EAAE,UAAU;aACnB,CAAC;SACH;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAxBD,0CAwBC;AAED,SAAgB,0BAA0B,CAAC,KAAiC,EAAE,MAAc;IAC1F,OAAO,KAAK,CAAC,CAAC,CAAC,kCAAkC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC3E,CAAC;AAFD,gEAEC;AAID,SAAgB,kCAAkC,CAAC,MAAc;IAC/D,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC,CAAC;IAEvD,OAAO,CAAC,KAAiC,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAkB,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACvD,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC/C,CAAC,CAAC;AACJ,CAAC;AAPD,gFAOC;AAED,SAAgB,gBAAgB,CAAC,KAAiC;IAChE,OAAO,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAE,KAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,IAAK,KAAmC,CAAC;AACxH,CAAC;AAFD,4CAEC"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/error/error.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AACvC,+CAAyD;AA0BzD,SAAgB,aAAa,CAAC,IAAqB,EAAE,OAAgB;IACnE,OAAO;QACL,IAAI;QACJ,OAAO;KACR,CAAC;AACJ,CAAC;AALD,sCAKC;AAYD;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,UAA6B;IAC3D,IAAI,KAAwC,CAAC;IAE7C,IAAI,UAAU,EAAE;QACd,IAAK,UAAyB,CAAC,IAAI,EAAE;YACnC,KAAK,GAAG,UAA2B,CAAC;SACrC;aAAM,IAAK,UAA2B,CAAC,IAAI,EAAE;YAC5C,KAAK,GAAI,UAA2B,CAAC,IAAqB,CAAC;SAC5D;aAAM,IAAI,UAAU,YAAY,sBAAS,EAAE;YAC1C,KAAK,GAAG;gBACN,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,MAAM,EAAE,UAAU;aACnB,CAAC;SACH;aAAM;YACL,KAAK,GAAG;gBACN,IAAI,EAAE,OAAO;gBACb,OAAO,EAAG,UAA4B,CAAC,OAAO,IAAI,EAAE;gBACpD,MAAM,EAAE,UAAU;aACnB,CAAC;SACH;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAxBD,0CAwBC;AAED,SAAgB,0BAA0B,CAAC,KAAiC,EAAE,MAAc;IAC1F,OAAO,KAAK,CAAC,CAAC,CAAC,kCAAkC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC3E,CAAC;AAFD,gEAEC;AAID,SAAgB,kCAAkC,CAAC,MAAc;IAC/D,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC,CAAC;IAEvD,OAAO,CAAC,KAAiC,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAkB,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACvD,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC/C,CAAC,CAAC;AACJ,CAAC;AAPD,gFAOC;AAED,SAAgB,gBAAgB,CAAC,KAAiC;IAChE,OAAO,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAE,KAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,IAAK,KAAmC,CAAC;AACxH,CAAC;AAFD,4CAEC"}

package/test/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [9.12.1](https://github.com/dereekb/dbx-components/compare/v9.12.0-dev...v9.12.1) (2022-11-07)
+
+
+
 # [9.12.0](https://github.com/dereekb/dbx-components/compare/v9.11.13-dev...v9.12.0) (2022-11-07)
 
 

package/test/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/util/test",
-  "version": "9.12.0",
+  "version": "9.12.1",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@dereekb/util": "9.12.0",
+    "@dereekb/util": "9.12.1",
     "lodash.isequal": "^4.5.0",
     "make-error": "^1.3.0",
     "class-validator": "^0.13.2",