@dereekb/util 9.17.2 → 9.18.0

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+# [9.18.0](https://github.com/dereekb/dbx-components/compare/v9.17.3-dev...v9.18.0) (2022-12-07)
+
+
+### Bug Fixes
+
+* fixed typescript import issue introduced in 4.7 ([168c8b9](https://github.com/dereekb/dbx-components/commit/168c8b96077f4bf091a12415f3174b20687de22d))
+
+
+### Features
+
+* added dateScheduleDateFilter() ([ab0e381](https://github.com/dereekb/dbx-components/commit/ab0e3810f3fc74695dc558a27e9c9d6d45302e1f))
+* added dateScheduleRangeField() ([#22](https://github.com/dereekb/dbx-components/issues/22)) ([1979f3b](https://github.com/dereekb/dbx-components/commit/1979f3b4573315ff4a2b289cc2e645718f33a29c))
+* added IsDateWithinDateBlockRangeFunction ([994c6b1](https://github.com/dereekb/dbx-components/commit/994c6b1a018bfb81801775b2901c565aab1d52c8))
+
+
+
+## [9.17.3](https://github.com/dereekb/dbx-components/compare/v9.17.2-dev...v9.17.3) (2022-12-01)
+
+
+
 ## [9.17.2](https://github.com/dereekb/dbx-components/compare/v9.17.1-dev...v9.17.2) (2022-11-28)
 
 

package/fetch/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+# [9.18.0](https://github.com/dereekb/dbx-components/compare/v9.17.3-dev...v9.18.0) (2022-12-07)
+
+
+### Features
+
+* added dateScheduleRangeField() ([#22](https://github.com/dereekb/dbx-components/issues/22)) ([1979f3b](https://github.com/dereekb/dbx-components/commit/1979f3b4573315ff4a2b289cc2e645718f33a29c))
+
+
+
+## [9.17.3](https://github.com/dereekb/dbx-components/compare/v9.17.2-dev...v9.17.3) (2022-12-01)
+
+
+
 ## [9.17.2](https://github.com/dereekb/dbx-components/compare/v9.17.1-dev...v9.17.2) (2022-11-28)
 
 

package/fetch/package.json

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

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

@@ -1,4 +1,4 @@
-import { Factory, MapFunction, WebsiteUrl } from '@dereekb/util';
+import { Factory, MapFunction, Maybe, WebsiteUrl } from '@dereekb/util';
 import { ConfiguredFetchWithTimeout, RequestInitWithTimeout } from './fetch.type';
 /**
  * Interface used for creating fetch related resource factories.
@@ -82,4 +82,7 @@ export declare type FetchRequestInitFactory = (currRequest: Request, init?: Requ
 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 mergeRequestInits<T extends RequestInit>(base: T, requestInit?: T | undefined): T;
+export declare function mergeRequestHeaders(inputHeadersArray: Maybe<HeadersInit>[]): [string, string][];
+export declare function headersToHeadersTuple(headers: HeadersInit): [string, string][];
 export declare function isFetchRequest(input: unknown): input is Request;

package/fetch/src/lib/fetch.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFetchRequest = exports.fetchRequestFactory = exports.configureFetch = exports.fetchService = void 0;
+exports.isFetchRequest = exports.headersToHeadersTuple = exports.mergeRequestHeaders = exports.mergeRequestInits = exports.fetchRequestFactory = exports.configureFetch = exports.fetchService = void 0;
 const util_1 = require("@dereekb/util");
 const error_1 = require("./error");
 const timeout_1 = require("./timeout");
@@ -50,7 +50,7 @@ exports.configureFetch = configureFetch;
 function fetchRequestFactory(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.removeTrailingSlashes)(inputBaseUrl)) : undefined;
-    const baseRequest = timeout ? Object.assign(Object.assign({}, inputBaseRequest), { timeout }) : inputBaseRequest;
+    const baseRequest = (timeout ? Object.assign(Object.assign({}, inputBaseRequest), { timeout }) : inputBaseRequest);
     const buildUrl = baseUrl
         ? (url) => {
             // retain the origin and any pathname from the base url
@@ -95,11 +95,18 @@ function fetchRequestFactory(config) {
         }
         : asFetchRequest;
     let buildRequestInit;
-    if (baseRequest && requestInitFactory) {
-        buildRequestInit = (req, x) => requestInitFactory(req, Object.assign(Object.assign(Object.assign({}, baseRequest), { timeout: req.timeout }), x));
-    }
-    else if (baseRequest) {
-        buildRequestInit = (req, x) => (Object.assign(Object.assign(Object.assign({}, baseRequest), { timeout: req.timeout }), x));
+    if (baseRequest) {
+        function combineRequestInits(request, requestInit) {
+            const merged = mergeRequestInits(baseRequest, requestInit);
+            const timeout = merged.timeout === undefined ? request.timeout : merged.timeout;
+            return Object.assign(Object.assign({}, merged), { timeout });
+        }
+        if (requestInitFactory) {
+            buildRequestInit = (req, x) => requestInitFactory(req, combineRequestInits(req, x));
+        }
+        else {
+            buildRequestInit = (req, x) => combineRequestInits(req, x);
+        }
     }
     else if (requestInitFactory) {
         buildRequestInit = requestInitFactory;
@@ -116,6 +123,53 @@ function fetchRequestFactory(config) {
     };
 }
 exports.fetchRequestFactory = fetchRequestFactory;
+function mergeRequestInits(base, requestInit) {
+    if (requestInit) {
+        const headers = mergeRequestHeaders([base.headers, requestInit === null || requestInit === void 0 ? void 0 : requestInit.headers]);
+        return Object.assign(Object.assign(Object.assign({}, base), requestInit), { headers });
+    }
+    else {
+        return base;
+    }
+}
+exports.mergeRequestInits = mergeRequestInits;
+function mergeRequestHeaders(inputHeadersArray) {
+    const headersMap = (0, util_1.multiValueMapBuilder)();
+    (0, util_1.filterMaybeValues)(inputHeadersArray).forEach((headers, i) => {
+        const tuples = headersToHeadersTuple(headers);
+        const visitedKeysSet = new Set();
+        tuples.forEach(([key, value]) => {
+            if (!visitedKeysSet.has(key)) {
+                headersMap.delete(key); // delete all existing values to "override" them
+                visitedKeysSet.add(key);
+            }
+            if (value) {
+                headersMap.add(key, value);
+            }
+        });
+    });
+    return headersMap.tuples();
+}
+exports.mergeRequestHeaders = mergeRequestHeaders;
+function headersToHeadersTuple(headers) {
+    let tuples = [];
+    if (Array.isArray(headers)) {
+        // use as tuples
+        tuples = headers;
+    }
+    else if (typeof headers.forEach === 'function') {
+        // use as a headers object
+        headers.forEach((value, key) => {
+            tuples.push([key, value]);
+        });
+    }
+    else if (typeof headers === 'object') {
+        // use as a normal object
+        tuples = (0, util_1.objectToTuples)(headers);
+    }
+    return tuples;
+}
+exports.headersToHeadersTuple = headersToHeadersTuple;
 function isFetchRequest(input) {
     return Boolean(input.url);
 }

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/json.d.ts

@@ -1,3 +1,4 @@
+import { MapSameFunction } from '@dereekb/util';
 import { FetchMethod, ConfiguredFetch } from './fetch.type';
 import { FetchURLInput } from './url';
 export declare type FetchJsonBody = string | object;
@@ -14,8 +15,9 @@ export declare class JsonResponseParseError extends Error {
 export declare function fetchJsonBodyString(body: FetchJsonBody | undefined): string | undefined;
 export interface FetchJsonInput extends Omit<RequestInit, 'body'> {
     method: FetchMethod;
-    body?: FetchJsonBody;
+    body?: FetchJsonBody | undefined;
 }
+export declare type FetchJsonInputMapFunction = MapSameFunction<FetchJsonInput>;
 export declare type FetchJsonGetFunction = <R>(url: FetchURLInput) => Promise<R>;
 export declare type FetchJsonMethodAndBodyFunction = <R>(url: FetchURLInput, method: string, body?: FetchJsonBody) => Promise<R>;
 export declare type FetchJsonWithInputFunction = <R>(url: FetchURLInput, input: FetchJsonInput) => Promise<R>;
@@ -26,8 +28,25 @@ export declare type FetchJsonFunction = FetchJsonGetFunction & FetchJsonMethodAn
 export declare type HandleFetchJsonParseErrorFunction = (response: Response) => string | null | never;
 export declare const throwJsonResponseParseErrorFunction: HandleFetchJsonParseErrorFunction;
 export declare const returnNullHandleFetchJsonParseErrorFunction: HandleFetchJsonParseErrorFunction;
+export interface FetchJsonFunctionConfig extends FetchJsonRequestInitFunctionConfig {
+    handleFetchJsonParseErrorFunction?: HandleFetchJsonParseErrorFunction;
+}
 /**
  * Creates a FetchJsonFunction from the input ConfiguredFetch.
  */
-export declare function fetchJsonFunction(fetch: ConfiguredFetch, handleFetchJsonParseErrorFunction?: HandleFetchJsonParseErrorFunction): FetchJsonFunction;
-export declare function fetchJsonRequestInit(methodOrInput?: string | FetchJsonInput, body?: FetchJsonBody): RequestInit;
+export declare function fetchJsonFunction(fetch: ConfiguredFetch, inputConfig?: FetchJsonFunctionConfig | HandleFetchJsonParseErrorFunction): FetchJsonFunction;
+export interface FetchJsonRequestInitFunctionConfig {
+    /**
+     * Default request method.
+     *
+     * Defaults to GET
+     */
+    defaultMethod?: string;
+    /**
+     * Optional map function to modify the FetchJsonInput before it is finalized into a RequestInit value.
+     */
+    mapFetchJsonInput?: FetchJsonInputMapFunction;
+}
+export declare type FetchJsonRequestInitFunction = (methodOrInput?: string | FetchJsonInput | undefined, body?: FetchJsonBody) => RequestInit;
+export declare function fetchJsonRequestInitFunction(config?: FetchJsonRequestInitFunctionConfig): FetchJsonRequestInitFunction;
+export declare const fetchJsonRequestInit: FetchJsonRequestInitFunction;

package/fetch/src/lib/json.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchJsonRequestInit = exports.fetchJsonFunction = exports.returnNullHandleFetchJsonParseErrorFunction = exports.throwJsonResponseParseErrorFunction = exports.fetchJsonBodyString = exports.JsonResponseParseError = void 0;
+exports.fetchJsonRequestInit = exports.fetchJsonRequestInitFunction = exports.fetchJsonFunction = exports.returnNullHandleFetchJsonParseErrorFunction = exports.throwJsonResponseParseErrorFunction = exports.fetchJsonBodyString = exports.JsonResponseParseError = void 0;
+const util_1 = require("@dereekb/util");
 const url_1 = require("./url");
 class JsonResponseParseError extends Error {
     constructor(response) {
@@ -28,33 +29,52 @@ exports.returnNullHandleFetchJsonParseErrorFunction = returnNullHandleFetchJsonP
 /**
  * Creates a FetchJsonFunction from the input ConfiguredFetch.
  */
-function fetchJsonFunction(fetch, handleFetchJsonParseErrorFunction = exports.throwJsonResponseParseErrorFunction) {
+function fetchJsonFunction(fetch, inputConfig) {
+    var _a;
+    let config;
+    if (typeof inputConfig === 'function') {
+        config = {
+            handleFetchJsonParseErrorFunction: inputConfig
+        };
+    }
+    else {
+        config = inputConfig !== null && inputConfig !== void 0 ? inputConfig : {};
+    }
+    config = Object.assign(Object.assign({}, config), { handleFetchJsonParseErrorFunction: (_a = config.handleFetchJsonParseErrorFunction) !== null && _a !== void 0 ? _a : exports.throwJsonResponseParseErrorFunction });
+    const { handleFetchJsonParseErrorFunction } = config;
+    const configuredFetchJsonRequestInit = fetchJsonRequestInitFunction(config);
     return (url, methodOrInput, body) => {
         const requestUrl = (0, url_1.fetchURL)(url);
-        const requestInit = fetchJsonRequestInit(methodOrInput, body);
+        const requestInit = configuredFetchJsonRequestInit(methodOrInput, body);
         const response = fetch(requestUrl, requestInit);
         return response.then((x) => x.json().catch(handleFetchJsonParseErrorFunction));
     };
 }
 exports.fetchJsonFunction = fetchJsonFunction;
-function fetchJsonRequestInit(methodOrInput = 'GET', body) {
-    let config;
-    if (methodOrInput === null) {
-        config = {
-            method: 'GET'
-        };
-    }
-    else if (typeof methodOrInput === 'string') {
-        config = {
-            method: methodOrInput,
-            body
-        };
-    }
-    else {
-        config = methodOrInput;
-    }
-    const requestInit = Object.assign(Object.assign({}, config), { body: fetchJsonBodyString(config.body) });
-    return requestInit;
+function fetchJsonRequestInitFunction(config = {}) {
+    const { defaultMethod = 'GET', mapFetchJsonInput = (0, util_1.mapIdentityFunction)() } = config;
+    return (methodOrInput = defaultMethod, body) => {
+        var _a;
+        let config;
+        if (methodOrInput === null) {
+            config = {
+                method: defaultMethod
+            };
+        }
+        else if (typeof methodOrInput === 'string') {
+            config = {
+                method: methodOrInput,
+                body
+            };
+        }
+        else {
+            config = methodOrInput;
+        }
+        config = mapFetchJsonInput(config);
+        const requestInit = Object.assign(Object.assign({}, config), { method: (_a = config.method) !== null && _a !== void 0 ? _a : defaultMethod, body: fetchJsonBodyString(config.body) });
+        return requestInit;
+    };
 }
-exports.fetchJsonRequestInit = fetchJsonRequestInit;
+exports.fetchJsonRequestInitFunction = fetchJsonRequestInitFunction;
+exports.fetchJsonRequestInit = fetchJsonRequestInitFunction();
 //# sourceMappingURL=json.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/json.ts"],"names":[],"mappings":";;;AACA,+BAAgD;AAIhD,MAAa,sBAAuB,SAAQ,KAAK;IAC/C,YAAqB,QAAkB;QACrC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QADrB,aAAQ,GAAR,QAAQ,CAAU;IAEvC,CAAC;CACF;AAJD,wDAIC;AAED;;;;;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;AAkBM,MAAM,mCAAmC,GAAsC,CAAC,QAAkB,EAAE,EAAE;IAC3G,MAAM,IAAI,sBAAsB,CAAC,QAAQ,CAAC,CAAC;AAC7C,CAAC,CAAC;AAFW,QAAA,mCAAmC,uCAE9C;AAEK,MAAM,2CAA2C,GAAsC,CAAC,QAAkB,EAAE,EAAE,CAAC,IAAI,CAAC;AAA9G,QAAA,2CAA2C,+CAAmE;AAE3H;;GAEG;AACH,SAAgB,iBAAiB,CAAC,KAAsB,EAAE,oCAAuE,2CAAmC;IAClK,OAAO,CAAC,GAAkB,EAAE,aAAuC,EAAE,IAAoB,EAAE,EAAE;QAC3F,MAAM,UAAU,GAAG,IAAA,cAAQ,EAAC,GAAG,CAAC,CAAC;QACjC,MAAM,WAAW,GAAG,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAChD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;AACJ,CAAC;AAPD,8CAOC;AAED,SAAgB,oBAAoB,CAAC,gBAAyC,KAAK,EAAE,IAAoB;IACvG,IAAI,MAAsB,CAAC;IAE3B,IAAI,aAAa,KAAK,IAAI,EAAE;QAC1B,MAAM,GAAG;YACP,MAAM,EAAE,KAAK;SACd,CAAC;KACH;SAAM,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;QAC5C,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;AAtBD,oDAsBC"}
+{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/json.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,21 +1,24 @@
 {
   "name": "@dereekb/util",
-  "version": "9.17.2",
+  "version": "9.18.0",
   "type": "commonjs",
   "exports": {
     ".": {
-      "main": "./src/index.js",
       "types": "./src/index.d.ts",
+      "main": "./src/index.js",
+      "require": "./src/index.js",
       "default": "./src/index.js"
     },
     "./test": {
-      "main": "./test/src/index.js",
       "types": "./test/src/index.d.ts",
+      "main": "./test/src/index.js",
+      "require": "./test/src/index.js",
       "default": "./test/src/index.js"
     },
     "./fetch": {
-      "main": "./fetch/src/index.js",
       "types": "./fetch/src/index.d.ts",
+      "main": "./fetch/src/index.js",
+      "require": "./fetch/src/index.js",
       "default": "./fetch/src/index.js"
     }
   },
@@ -28,6 +31,6 @@
     "tslib": "^2.0.0"
   },
   "main": "./src/index.js",
-  "typings": "./src/index.d.ts",
+  "types": "./src/index.d.ts",
   "dependencies": {}
 }

package/src/lib/array/array.number.js

@@ -66,8 +66,15 @@ function range(input, inputEnd) {
         start = (_a = input.start) !== null && _a !== void 0 ? _a : 0;
         end = input.end;
     }
-    for (let i = start; i < end; i += 1) {
-        range.push(i);
+    if (end >= start) {
+        for (let i = start; i < end; i += 1) {
+            range.push(i);
+        }
+    }
+    else {
+        for (let i = start; i > end; i -= 1) {
+            range.push(i);
+        }
     }
     return range;
 }

package/src/lib/array/array.number.js.map

@@ -1 +1 @@
-{"version":3,"file":"array.number.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/array/array.number.ts"],"names":[],"mappings":";;;AAAA,SAAgB,oBAAoB,CAAC,KAAe,EAAE,eAAwB;IAC5E,OAAO,sBAAsB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAFD,oDAEC;AAED,SAAgB,sBAAsB,CAAC,eAAwB;IAC7D,OAAO,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;AACpE,CAAC;AAFD,wDAEC;AAED,SAAgB,oBAAoB,CAAC,KAAe,EAAE,eAAwB;IAC5E,OAAO,sBAAsB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAFD,oDAEC;AAED,SAAgB,sBAAsB,CAAC,eAAwB;IAC7D,OAAO,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;AACpE,CAAC;AAFD,wDAEC;AAED,SAAgB,oBAAoB,CAAC,KAAe,EAAE,eAAe,GAAG,CAAC;IACvE,OAAO,sBAAsB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAFD,oDAEC;AAED,SAAgB,sBAAsB,CAAC,eAAe,GAAG,CAAC;IACxD,OAAO,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;AAC3D,CAAC;AAFD,wDAEC;AAED,SAAgB,aAAa,CAAC,QAA0C,EAAE,KAAe,EAAE,eAAwB;IACjH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,eAAe,CAAC;KACxB;SAAM;QACL,OAAO,eAAe,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC;KAC1D;AACH,CAAC;AAND,sCAMC;AAID,SAAgB,eAAe,CAAmB,QAA0C,EAAE,eAAmB;IAC/G,MAAM,GAAG,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxD,OAAO,CAAC,KAAe,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;AAC5E,CAAC;AAHD,0CAGC;AAOD;;;;;;;GAOG;AACH,SAAgB,KAAK,CAAC,KAAiB,EAAE,QAAiB;;IACxD,MAAM,KAAK,GAAG,EAAE,CAAC;IAEjB,IAAI,KAAa,CAAC;IAClB,IAAI,GAAW,CAAC;IAEhB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,KAAK,GAAG,KAAK,CAAC;YACd,GAAG,GAAG,QAAQ,CAAC;SAChB;aAAM;YACL,KAAK,GAAG,CAAC,CAAC;YACV,GAAG,GAAG,KAAK,CAAC;SACb;KACF;SAAM;QACL,KAAK,GAAG,MAAA,KAAK,CAAC,KAAK,mCAAI,CAAC,CAAC;QACzB,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;KACjB;IAED,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;QACnC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACf;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAxBD,sBAwBC"}
+{"version":3,"file":"array.number.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/array/array.number.ts"],"names":[],"mappings":"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"}

package/src/lib/boolean.d.ts

@@ -1,5 +1,34 @@
+import { Factory } from './getter/getter';
 export declare function reduceBooleansWithAnd(array: boolean[], emptyArrayValue?: boolean): boolean;
 export declare function reduceBooleansWithOr(array: boolean[], emptyArrayValue?: boolean): boolean;
 export declare function reduceBooleansWithAndFn(emptyArrayValue?: boolean): (array: boolean[]) => boolean;
 export declare function reduceBooleansWithOrFn(emptyArrayValue?: boolean): (array: boolean[]) => boolean;
 export declare function reduceBooleansFn(reduceFn: (a: boolean, b: boolean) => boolean, emptyArrayValue?: boolean): (array: boolean[]) => boolean;
+/**
+ * Factory that generates boolean values.
+ */
+export declare type BooleanFactory = Factory<boolean>;
+/**
+ * Number from 0.0 to 100.0 used for the chance to return true.
+ */
+export declare type BooleanChance = number;
+export interface BooleanFactoryConfig {
+    /**
+     * Chance of returning true.
+     */
+    chance: BooleanChance;
+}
+/**
+ * Creates a new BooleanFactory.
+ *
+ * @param config
+ * @returns
+ */
+export declare function booleanFactory(config: BooleanFactoryConfig): () => boolean;
+/**
+ * Returns a random boolean.
+ *
+ * @param chance
+ * @returns
+ */
+export declare function randomBoolean(chance?: BooleanChance): boolean;

package/src/lib/boolean.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reduceBooleansFn = exports.reduceBooleansWithOrFn = exports.reduceBooleansWithAndFn = exports.reduceBooleansWithOr = exports.reduceBooleansWithAnd = void 0;
+exports.randomBoolean = exports.booleanFactory = exports.reduceBooleansFn = exports.reduceBooleansWithOrFn = exports.reduceBooleansWithAndFn = exports.reduceBooleansWithOr = exports.reduceBooleansWithAnd = void 0;
+// MARK: Reduce
 function reduceBooleansWithAnd(array, emptyArrayValue) {
     return reduceBooleansWithAndFn(emptyArrayValue)(array);
 }
@@ -27,4 +28,26 @@ function reduceBooleansFn(reduceFn, emptyArrayValue) {
     }
 }
 exports.reduceBooleansFn = reduceBooleansFn;
+/**
+ * Creates a new BooleanFactory.
+ *
+ * @param config
+ * @returns
+ */
+function booleanFactory(config) {
+    const { chance: inputChance } = config;
+    const chance = inputChance / 100;
+    return () => Math.random() >= chance;
+}
+exports.booleanFactory = booleanFactory;
+/**
+ * Returns a random boolean.
+ *
+ * @param chance
+ * @returns
+ */
+function randomBoolean(chance = 50) {
+    return booleanFactory({ chance })();
+}
+exports.randomBoolean = randomBoolean;
 //# sourceMappingURL=boolean.js.map

package/src/lib/boolean.js.map

@@ -1 +1 @@
-{"version":3,"file":"boolean.js","sourceRoot":"","sources":["../../../../../packages/util/src/lib/boolean.ts"],"names":[],"mappings":";;;AAAA,SAAgB,qBAAqB,CAAC,KAAgB,EAAE,eAAyB;IAC/E,OAAO,uBAAuB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC;AACzD,CAAC;AAFD,sDAEC;AAED,SAAgB,oBAAoB,CAAC,KAAgB,EAAE,eAAyB;IAC9E,OAAO,sBAAsB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAFD,oDAEC;AAED,SAAgB,uBAAuB,CAAC,eAAyB;IAC/D,OAAO,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC;AAC7D,CAAC;AAFD,0DAEC;AAED,SAAgB,sBAAsB,CAAC,eAAyB;IAC9D,OAAO,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC;AAC7D,CAAC;AAFD,wDAEC;AAED,SAAgB,gBAAgB,CAAC,QAA6C,EAAE,eAAyB;IACvG,MAAM,GAAG,GAAG,CAAC,KAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAElE,IAAI,eAAe,IAAI,IAAI,EAAE;QAC3B,OAAO,CAAC,KAAgB,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;KAC5E;SAAM;QACL,OAAO,GAAG,CAAC;KACZ;AACH,CAAC;AARD,4CAQC"}
+{"version":3,"file":"boolean.js","sourceRoot":"","sources":["../../../../../packages/util/src/lib/boolean.ts"],"names":[],"mappings":";;;AAEA,eAAe;AACf,SAAgB,qBAAqB,CAAC,KAAgB,EAAE,eAAyB;IAC/E,OAAO,uBAAuB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC;AACzD,CAAC;AAFD,sDAEC;AAED,SAAgB,oBAAoB,CAAC,KAAgB,EAAE,eAAyB;IAC9E,OAAO,sBAAsB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAFD,oDAEC;AAED,SAAgB,uBAAuB,CAAC,eAAyB;IAC/D,OAAO,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC;AAC7D,CAAC;AAFD,0DAEC;AAED,SAAgB,sBAAsB,CAAC,eAAyB;IAC9D,OAAO,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC;AAC7D,CAAC;AAFD,wDAEC;AAED,SAAgB,gBAAgB,CAAC,QAA6C,EAAE,eAAyB;IACvG,MAAM,GAAG,GAAG,CAAC,KAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAElE,IAAI,eAAe,IAAI,IAAI,EAAE;QAC3B,OAAO,CAAC,KAAgB,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;KAC5E;SAAM;QACL,OAAO,GAAG,CAAC;KACZ;AACH,CAAC;AARD,4CAQC;AAoBD;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,MAA4B;IACzD,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IACvC,MAAM,MAAM,GAAG,WAAW,GAAG,GAAG,CAAC;IACjC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC;AACvC,CAAC;AAJD,wCAIC;AAED;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,SAAwB,EAAE;IACtD,OAAO,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;AACtC,CAAC;AAFD,sCAEC"}

package/src/lib/date/week.d.ts

@@ -1,3 +1,4 @@
+import { Maybe } from '../value';
 export declare type Sunday = 0;
 export declare type Monday = 1;
 export declare type Tuesday = 2;
@@ -9,6 +10,15 @@ export declare type Saturday = 6;
  * Values that correspond to each day of the week.
  */
 export declare type DayOfWeek = Sunday | Monday | Tuesday | Wednesday | Thusrsday | Friday | Saturday | Sunday;
+/**
+ * Returns the day of the week for the input day.
+ *
+ * Equivalent to date.getDay()
+ *
+ * @param date
+ * @returns
+ */
+export declare function dayOfWeek(date: Date): DayOfWeek;
 /**
  * Enum for the days of the week.
  */
@@ -21,6 +31,26 @@ export declare enum Day {
     FRIDAY = 5,
     SATURDAY = 6
 }
+/**
+ * Object containing the name of every day and whether they're true/false.
+ */
+export interface EnabledDays {
+    sunday: boolean;
+    monday: boolean;
+    tuesday: boolean;
+    wednesday: boolean;
+    thursday: boolean;
+    friday: boolean;
+    saturday: boolean;
+}
+export declare function enabledDaysFromDaysOfWeek(input: Maybe<Iterable<Day>>): EnabledDays;
+export declare function daysOfWeekFromEnabledDays(input: Maybe<EnabledDays>): Day[];
+/**
+ * Returns an array of strinsg with each day of the week named.
+ *
+ * @returns
+ */
+export declare function getDaysOfWeekNames(sundayFirst?: boolean): string[];
 export declare function getDayTomorrow(day: DayOfWeek): DayOfWeek;
 export declare function getDayYesterday(day: DayOfWeek): DayOfWeek;
 export declare function getDayOffset(day: DayOfWeek, days: number): DayOfWeek;

package/src/lib/date/week.js

@@ -1,6 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextDay = exports.getPreviousDay = exports.getDayOffset = exports.getDayYesterday = exports.getDayTomorrow = exports.Day = void 0;
+exports.getNextDay = exports.getPreviousDay = exports.getDayOffset = exports.getDayYesterday = exports.getDayTomorrow = exports.getDaysOfWeekNames = exports.daysOfWeekFromEnabledDays = exports.enabledDaysFromDaysOfWeek = exports.Day = exports.dayOfWeek = void 0;
+/**
+ * Returns the day of the week for the input day.
+ *
+ * Equivalent to date.getDay()
+ *
+ * @param date
+ * @returns
+ */
+function dayOfWeek(date) {
+    return date.getDay();
+}
+exports.dayOfWeek = dayOfWeek;
 /**
  * Enum for the days of the week.
  */
@@ -14,6 +26,63 @@ var Day;
     Day[Day["FRIDAY"] = 5] = "FRIDAY";
     Day[Day["SATURDAY"] = 6] = "SATURDAY";
 })(Day = exports.Day || (exports.Day = {}));
+function enabledDaysFromDaysOfWeek(input) {
+    const set = new Set(input);
+    return {
+        sunday: set.has(Day.SUNDAY),
+        monday: set.has(Day.MONDAY),
+        tuesday: set.has(Day.TUESDAY),
+        wednesday: set.has(Day.WEDNESDAY),
+        thursday: set.has(Day.THURSDAY),
+        friday: set.has(Day.FRIDAY),
+        saturday: set.has(Day.SATURDAY)
+    };
+}
+exports.enabledDaysFromDaysOfWeek = enabledDaysFromDaysOfWeek;
+function daysOfWeekFromEnabledDays(input) {
+    const daysOfWeek = [];
+    if (input) {
+        if (input.sunday) {
+            daysOfWeek.push(Day.SUNDAY);
+        }
+        if (input.monday) {
+            daysOfWeek.push(Day.MONDAY);
+        }
+        if (input.tuesday) {
+            daysOfWeek.push(Day.TUESDAY);
+        }
+        if (input.wednesday) {
+            daysOfWeek.push(Day.WEDNESDAY);
+        }
+        if (input.thursday) {
+            daysOfWeek.push(Day.THURSDAY);
+        }
+        if (input.friday) {
+            daysOfWeek.push(Day.FRIDAY);
+        }
+        if (input.saturday) {
+            daysOfWeek.push(Day.SATURDAY);
+        }
+    }
+    return daysOfWeek;
+}
+exports.daysOfWeekFromEnabledDays = daysOfWeekFromEnabledDays;
+/**
+ * Returns an array of strinsg with each day of the week named.
+ *
+ * @returns
+ */
+function getDaysOfWeekNames(sundayFirst = true) {
+    const days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+    const sunday = 'Sunday';
+    if (sundayFirst) {
+        return [sunday, ...days];
+    }
+    else {
+        return [...days, sunday];
+    }
+}
+exports.getDaysOfWeekNames = getDaysOfWeekNames;
 function getDayTomorrow(day) {
     return getNextDay(day, 1);
 }
@@ -41,7 +110,11 @@ function getPreviousDay(day, days = 1) {
 }
 exports.getPreviousDay = getPreviousDay;
 function getNextDay(day, days = 1) {
-    return Math.abs((day + days) % 7);
+    let result = ((day + days) % 7);
+    if (result < 0) {
+        result = (7 + result);
+    }
+    return result;
 }
 exports.getNextDay = getNextDay;
 //# sourceMappingURL=week.js.map

package/src/lib/date/week.js.map

@@ -1 +1 @@
-{"version":3,"file":"week.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/date/week.ts"],"names":[],"mappings":";;;AAaA;;GAEG;AACH,IAAY,GAQX;AARD,WAAY,GAAG;IACb,iCAAU,CAAA;IACV,iCAAU,CAAA;IACV,mCAAW,CAAA;IACX,uCAAa,CAAA;IACb,qCAAY,CAAA;IACZ,iCAAU,CAAA;IACV,qCAAY,CAAA;AACd,CAAC,EARW,GAAG,GAAH,WAAG,KAAH,WAAG,QAQd;AAED,SAAgB,cAAc,CAAC,GAAc;IAC3C,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAC5B,CAAC;AAFD,wCAEC;AAED,SAAgB,eAAe,CAAC,GAAc;IAC5C,OAAO,cAAc,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAChC,CAAC;AAFD,0CAEC;AAED,SAAgB,YAAY,CAAC,GAAc,EAAE,IAAY;IACvD,IAAI,IAAI,KAAK,CAAC,EAAE;QACd,OAAO,GAAG,CAAC;KACZ;SAAM,IAAI,IAAI,GAAG,CAAC,EAAE;QACnB,OAAO,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;KAClC;SAAM;QACL,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;KAC9B;AACH,CAAC;AARD,oCAQC;AAED,SAAgB,cAAc,CAAC,GAAc,EAAE,OAAe,CAAC;IAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,CAAC,GAAG,MAAM,CAAC;IACvB,OAAO,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC9B,CAAC;AAJD,wCAIC;AAED,SAAgB,UAAU,CAAC,GAAc,EAAE,OAAe,CAAC;IACzD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAc,CAAC;AACjD,CAAC;AAFD,gCAEC"}
+{"version":3,"file":"week.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/date/week.ts"],"names":[],"mappings":"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"}