@valkyriestudios/utils 12.9.0 → 12.10.0

package/README.md

@@ -39,7 +39,7 @@ mapKey([
     {uid: 87, name: 'Josh'},
 ], 'uid');
 
-output: 
+output:
 
 {
     12: {uid: 12, name: 'Peter'},
@@ -72,7 +72,7 @@ output:
 }
 ```
 
-allows merging objects onto existing keys: 
+allows merging objects onto existing keys:
 ```js
 mapKey([
     0,
@@ -215,7 +215,7 @@ shuffle(arr);
 ```
 
 - **sort(val:Array[object], by:string|Function, dir:Enum(asc,desc), options:Object)**
-Sort an array of objects, uses an implementation of [Tony Hoare's quicksort](https://cs.stanford.edu/people/eroberts/courses/soco/projects/2008-09/tony-hoare/quicksort.html) 
+Sort an array of objects, uses an implementation of [Tony Hoare's quicksort](https://cs.stanford.edu/people/eroberts/courses/soco/projects/2008-09/tony-hoare/quicksort.html)
 
 ```js
 const out = sort([
@@ -226,7 +226,7 @@ const out = sort([
     {test: 'Joe'},
     {test: 'Bob'},
     {test: 'Alice'},
-], 'test', 'desc'); 
+], 'test', 'desc');
 // [{test: 'Pony'}, {test: 'Peter'}, {test: 'John'}, {test: 'Joe'}, {test: 'Jack'}, {test: 'Bob'}, {test: 'Alice'}]
 ```
 
@@ -239,7 +239,7 @@ const out = sort([
     {test: 'Joe'},
     {test: 'Bob'},
     {test: 'Alice'},
-], 'test', 'asc'); 
+], 'test', 'asc');
 // [{test: 'Alice'}, {test: 'Bob'}, {test: 'Jack'}, {test: 'Joe'}, {test: 'John'}, {test: 'Peter'}, {test: 'Pony'}]
 ```
 
@@ -254,7 +254,7 @@ const out = sort([
     {test: 'Joe'},
     {test: 'Bob'},
     {test: 'Alice'},
-], el => el.test.toLowerCase(), 'desc'); 
+], el => el.test.toLowerCase(), 'desc');
 // [{test: 'Pony'}, {test: 'Peter'}, {test: 'JOHn'}, {test: 'Joe'}, {test: 'Jack'}, {test: 'Bob'}, {test: 'Alice'}]
 ```
 
@@ -272,7 +272,7 @@ const out = sort([
     {test: 'Bob'},
     undefined,
     {test: 'Alice'},
-], el => el.test.toLowerCase(), 'desc'); 
+], el => el.test.toLowerCase(), 'desc');
 // [{test: 'Pony'}, {test: 'Peter'}, {test: 'JOHn'}, {test: 'Joe'}, {test: 'Jack'}, {test: 'Bob'}, {test: 'Alice'}]
 ```
 
@@ -293,7 +293,7 @@ const out = sort([
     {test: 'Bob'},
     undefined,
     {test: 'Alice'},
-], el => el.test.toLowerCase(), 'desc', {filter_fn: el => isNotEmptyString(el.test)}); 
+], el => el.test.toLowerCase(), 'desc', {filter_fn: el => isNotEmptyString(el.test)});
 // [{test: 'Pony'}, {test: 'Peter'}, {test: 'JOHn'}, {test: 'Joe'}, {test: 'Jack'}, {test: 'Bob'}, {test: 'Alice'}]
 ```
 
@@ -301,13 +301,13 @@ allows passing custom options to position elements without a proper key (nokey_a
 
 ```js
 const arr = [{test: 'Peter'}, {test: undefined}, {test: 'Jack'}, {test: 'Pony'}, {uid: 100}, {test: 'JOHn'}];
-const out = sort(arr, el => el.test.toLowerCase(), 'desc', {nokey_atend: false}); 
+const out = sort(arr, el => el.test.toLowerCase(), 'desc', {nokey_atend: false});
 // [{test: undefined}, {uid: 100}, {test: 'Pony'}, {test: 'Peter'}, {test: 'JOHn'}, {test: 'Jack'}]
 
-const out = sort(arr, el => el.test.toLowerCase(), 'desc', {nokey_atend: true}); 
+const out = sort(arr, el => el.test.toLowerCase(), 'desc', {nokey_atend: true});
 // [{test: 'Pony'}, {test: 'Peter'}, {test: 'JOHn'}, {test: 'Jack'}, {test: undefined}, {uid: 100}]
 
-const out = sort(arr, el => el.test.toLowerCase(), 'desc', {nokey_hide: true}); 
+const out = sort(arr, el => el.test.toLowerCase(), 'desc', {nokey_hide: true});
 // [{test: 'Pony'}, {test: 'Peter'}, {test: 'JOHn'}, {test: 'Jack'}]
 ```
 
@@ -321,8 +321,8 @@ isBoolean(true); // TRUE
 ```
 
 ### caching
-- **memoize(fn:Function, resolver:Function=false)**
-memoize the output of a specific function. An optional resolver function can be passed which allows custom cache key generation.
+- **memoize(fn:Function, resolver:Function=false, memoize_for:number|false)**
+memoize the output of a function. An optional resolver function can be passed which allows custom cache key generation.
 
 ```js
 const memoized_function = memoize((a) => {
@@ -330,6 +330,27 @@ const memoized_function = memoize((a) => {
 });
 ```
 
+Take Note: Also supports async functions and cache busting, eg:
+```js
+async function retrieveUser (userId:string) {
+    ...
+}
+
+/* Async but with no cache busting */
+const memoized = memoize(retrieveUser);
+await memoized('123456'); /* Original function will be called */
+await memoized('123456'); /* Original function will not be called and memoized cache will be returned */
+
+/* Async with cache busting after 5 seconds */
+const memoized = memoize(retrieveUser, null, 5000);
+await memoized('123456'); /* Original function will be called */
+await memoized('123456'); /* Original function will not be called and memoized cache will be returned */
+
+... (some time longer than 5 seconds passes)
+
+await memoized('123456'); /* Original function will be called and re-cached */
+```
+
 ### date
 - **isDate(val:any)**
 Check if a variable is of type Date
@@ -807,7 +828,7 @@ merge({a: 1, b: false}, {a: 900, c: 50}); // {a: 900, b: false, c: 50}
 Creates an object with the passed accessors set on it
 ```js
 define(
-	{ 
+	{
 		a: {
 			enumerable: false,
 			value : function () { ... }

package/array/dedupe.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.dedupe = void 0;
 const fnv1A_1 = require("../hash/fnv1A");

package/array/groupBy.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.groupBy = void 0;
 const isNotEmpty_1 = require("../object/isNotEmpty");

package/array/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sort = exports.shuffle = exports.groupBy = exports.mapPrimitive = exports.mapKey = exports.mapFn = exports.join = exports.isNe = exports.isNeArray = exports.isNotEmpty = exports.isNotEmptyArray = exports.is = exports.isArray = exports.dedupe = void 0;
 const dedupe_1 = require("./dedupe");

package/array/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isArray = void 0;
 function isArray(val) {

package/array/isNotEmpty.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNotEmptyArray = void 0;
 function isNotEmptyArray(val) {

package/array/join.js

@@ -1,7 +1,8 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.join = void 0;
 const round_1 = require("../number/round");
+const isInteger_1 = require("../number/isInteger");
 function join(val, opts) {
     if (!Array.isArray(val) || !val.length)
         return '';
@@ -16,7 +17,7 @@ function join(val, opts) {
             TRIM = opts.trim;
         if (opts.valtrim === false)
             VALTRIM = opts.valtrim;
-        if (Number.isInteger(opts.valround) && opts.valround >= 0)
+        if ((0, isInteger_1.isInteger)(opts.valround) && opts.valround >= 0)
             VALROUND = opts.valround;
     }
     const filtered = [];

package/array/mapFn.js

@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.mapFn = void 0;
 function mapFn(arr, fn, opts) {
     if ((!Array.isArray(arr) || !arr.length) ||
         typeof fn !== 'function')
         return {};
-    const MERGE = opts && Object.prototype.toString.call(opts) === '[object Object]' && opts.merge === true;
+    const MERGE = opts?.merge === true;
     const map = {};
     let hash = false;
     for (const el of arr) {

package/array/mapKey.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.mapKey = void 0;
 function mapKey(arr, key, opts) {
@@ -8,7 +8,7 @@ function mapKey(arr, key, opts) {
     const key_s = key.trim();
     if (!key_s.length)
         return {};
-    const MERGE = opts && Object.prototype.toString.call(opts) === '[object Object]' && opts.merge === true;
+    const MERGE = opts?.merge === true;
     const map = {};
     for (const el of arr) {
         if (Object.prototype.toString.call(el) !== '[object Object]' ||

package/array/mapPrimitive.js

@@ -1,22 +1,16 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.mapPrimitive = void 0;
 const round_1 = require("../number/round");
-function mapPrimitive(arr, opts) {
+const isIntegerAboveOrEqual_1 = require("../number/isIntegerAboveOrEqual");
+function mapPrimitive(arr, opts = {}) {
     if (!Array.isArray(arr) || !arr.length)
         return {};
-    let VALTRIM = false;
-    let VALROUND = false;
-    let KEYROUND = false;
-    if (opts && Object.prototype.toString.call(opts) === '[object Object]') {
-        if (opts.valtrim === true)
-            VALTRIM = true;
-        if (opts.valround === true ||
-            (Number.isInteger(opts.valround) && opts.valround >= 0))
-            VALROUND = opts.valround;
-        if (opts.keyround === true)
-            KEYROUND = true;
-    }
+    const VALTRIM = opts?.valtrim === true;
+    const VALROUND = (0, isIntegerAboveOrEqual_1.isIntegerAboveOrEqual)(opts?.valround, 0)
+        ? opts?.valround
+        : opts?.valround === true;
+    const KEYROUND = opts?.keyround === true;
     const map = {};
     for (const el of arr) {
         if (typeof el === 'string') {

package/array/shuffle.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.shuffle = void 0;
 function shuffle(arr) {

package/array/sort.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.sort = void 0;
 const isNotEmpty_1 = require("../object/isNotEmpty");

package/boolean/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.is = exports.isBoolean = void 0;
 const is_1 = require("./is");

package/boolean/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isBoolean = void 0;
 function isBoolean(val) {

package/caching/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.memoize = void 0;
 const memoize_1 = require("./memoize");

package/caching/memoize.d.ts

@@ -6,6 +6,7 @@
  *
  * @param fn - Function to memoize
  * @param resolver - Optional resolver function to generate cache key. If not passed the first argument is used as map key
+ * @param {false|number?} memoize_for - Memoize for X milliseconds, if passed false will indefinitely memoize (default = false)
  */
-declare function memoize(fn: Function, resolver?: Function): Function;
+declare function memoize<T extends (...args: any[]) => unknown>(fn: T, resolver?: (...args: Parameters<T>) => any, memoize_for?: number | false): T;
 export { memoize, memoize as default };

package/caching/memoize.js

@@ -1,17 +1,44 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.memoize = void 0;
-function memoize(fn, resolver) {
-    const memoized = function () {
-        const key = typeof resolver === 'function' ? resolver.apply(this, arguments) : arguments[0];
-        if (memoized.cache.has(key))
-            return memoized.cache.get(key);
-        const result = fn.apply(this, arguments);
-        memoized.cache.set(key, result);
-        return result;
-    };
-    memoized.cache = new Map();
-    return memoized;
+const isAsync_1 = require("../function/isAsync");
+const isIntegerAbove_1 = require("../number/isIntegerAbove");
+const toUTC_1 = require("../date/toUTC");
+const diff_1 = require("../date/diff");
+function memoize(fn, resolver, memoize_for = false) {
+    const cache_for = (0, isIntegerAbove_1.default)(memoize_for, 0) ? memoize_for : false;
+    if ((0, isAsync_1.default)(fn)) {
+        const memoized = async function (...args) {
+            const key = typeof resolver === 'function' ? resolver(...args) : args[0];
+            if (memoized.cache.has(key)) {
+                const cached_val = memoized.cache.get(key);
+                if (cache_for === false || (0, diff_1.default)((0, toUTC_1.default)(new Date()), cached_val.d) < cache_for) {
+                    return cached_val.r;
+                }
+            }
+            const result = await fn(...args);
+            memoized.cache.set(key, { r: result, d: (0, toUTC_1.default)(new Date()) });
+            return result;
+        };
+        memoized.cache = new Map();
+        return memoized;
+    }
+    else {
+        const memoized = function (...args) {
+            const key = typeof resolver === 'function' ? resolver(...args) : args[0];
+            if (memoized.cache.has(key)) {
+                const cached_val = memoized.cache.get(key);
+                if (cache_for === false || (0, diff_1.default)((0, toUTC_1.default)(new Date()), cached_val.d) < cache_for) {
+                    return cached_val.r;
+                }
+            }
+            const result = fn(...args);
+            memoized.cache.set(key, { r: result, d: (0, toUTC_1.default)(new Date()) });
+            return result;
+        };
+        memoized.cache = new Map();
+        return memoized;
+    }
 }
 exports.memoize = memoize;
 exports.default = memoize;

package/date/addUTC.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.addUTC = void 0;
 const is_1 = require("./is");

package/date/diff.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.diff = void 0;
 const is_1 = require("./is");
@@ -11,8 +11,6 @@ function diff(val_a, val_b, key = 'millisecond') {
     if (!(0, is_1.isDate)(val_a) ||
         !(0, is_1.isDate)(val_b))
         throw new TypeError('Diff requires date objects for both values');
-    if (typeof key !== 'string')
-        throw new TypeError('Key needs to be a string');
     const diff_in_ms = val_a.valueOf() - val_b.valueOf();
     switch (key) {
         case 'week':

package/date/endOfUTC.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.endOfUTC = void 0;
 const is_1 = require("./is");

package/date/format.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.format = void 0;
 const is_1 = require("./is");
@@ -39,12 +39,13 @@ function toZone(date, zone) {
 }
 function runIntl(loc, token, props, val) {
     const hash = `${loc}:${token}`;
-    if (intl_formatters.has(hash))
-        return intl_formatters.get(hash).format(val);
+    let formatter = intl_formatters.get(hash);
+    if (formatter)
+        return formatter.format(val);
     try {
-        const instance = new Intl.DateTimeFormat(loc, props);
-        intl_formatters.set(hash, instance);
-        return instance.format(val);
+        formatter = new Intl.DateTimeFormat(loc, props);
+        intl_formatters.set(hash, formatter);
+        return formatter.format(val);
     }
     catch (err) {
         throw new Error(`format: Failed to run conversion for ${token} with locale ${loc}`);
@@ -76,9 +77,10 @@ const Tokens = [
     .sort((a, b) => a[0].length > b[0].length ? -1 : 1)
     .map((el) => [el[0], new RegExp(el[0], 'g'), el[1]]);
 function getSpecChain(spec) {
-    if (spec_cache.has(spec))
-        return spec_cache.get(spec);
-    const spec_chain = [];
+    let spec_chain = spec_cache.get(spec);
+    if (spec_chain)
+        return spec_chain;
+    spec_chain = [];
     let cursor;
     for (let i = 0; i < Tokens.length; i++) {
         cursor = Tokens[i];

package/date/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toUTC = exports.toUnix = exports.startOfUTC = exports.nowUnixMs = exports.nowUnix = exports.is = exports.isDate = exports.format = exports.endOfUTC = exports.diff = exports.addUTC = void 0;
 const addUTC_1 = require("./addUTC");

package/date/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isDate = void 0;
 function isDate(val) {

package/date/nowUnix.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.nowUnix = void 0;
 function nowUnix() {

package/date/nowUnixMs.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.nowUnixMs = void 0;
 function nowUnixMs() {

package/date/startOfUTC.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.startOfUTC = void 0;
 const is_1 = require("./is");

package/date/toUTC.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.toUTC = void 0;
 const is_1 = require("./is");

package/date/toUnix.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.toUnix = void 0;
 const is_1 = require("./is");

package/deep/freeze.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.deepFreeze = void 0;
 function deep(obj) {

package/deep/get.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.deepGet = void 0;
 function deepGet(obj, path, get_parent = false) {

package/deep/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deepSet = exports.set = exports.deepSeal = exports.seal = exports.deepGet = exports.get = exports.deepFreeze = exports.freeze = void 0;
 const freeze_1 = require("./freeze");

package/deep/seal.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.deepSeal = void 0;
 function deep(obj) {

package/deep/set.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.deepSet = void 0;
 const RGX_MALICIOUS = /__proto__|constructor|prototype/;

package/equal.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.equal = void 0;
 const isNumericalNaN_1 = require("./number/isNumericalNaN");

package/formdata/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.is = exports.isFormData = void 0;
 const is_1 = require("./is");

package/formdata/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isFormData = void 0;
 function isFormData(val) {

package/function/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sleep = exports.noopreturn = exports.noopresolve = exports.noop = exports.isAsyncFn = exports.isAsync = exports.isAsyncFunction = exports.isFn = exports.is = exports.isFunction = void 0;
 const is_1 = require("./is");

package/function/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isFunction = void 0;
 function isFunction(val) {

package/function/isAsync.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isAsyncFunction = void 0;
 function isAsyncFunction(val) {

package/function/noop.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.noop = void 0;
 function noop() {

package/function/noopresolve.d.ts

@@ -6,5 +6,5 @@
  *
  * @returns Promise that resolves with passed value
  */
-declare function noopresolve<T>(val?: T): Promise<T>;
+declare function noopresolve<T>(val?: T): Promise<T | undefined>;
 export { noopresolve, noopresolve as default };

package/function/noopresolve.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.noopresolve = void 0;
 function noopresolve(val) {

package/function/noopreturn.d.ts

@@ -5,5 +5,5 @@
  *
  * @returns Passed value
  */
-declare function noopreturn<T>(val?: T): T;
+declare function noopreturn<T>(val?: T): T | undefined;
 export { noopreturn, noopreturn as default };

package/function/noopreturn.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.noopreturn = void 0;
 function noopreturn(val) {

package/function/sleep.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.sleep = void 0;
 function sleep(ms = 1000) {

package/hash/fnv1A.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.fnv1A = void 0;
 const FNV_32 = 2166136261;

package/hash/guid.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.guid = void 0;
 const HEX = [];

package/hash/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.guid = exports.fnv1A = void 0;
 const fnv1A_1 = require("./fnv1A");

package/index.d.ts

@@ -26,6 +26,10 @@ declare module "number/round" {
     function round(val: number, precision?: number): number;
     export { round, round as default };
 }
+declare module "number/isInteger" {
+    function isInteger(val: unknown): val is number;
+    export { isInteger, isInteger as default };
+}
 declare module "array/join" {
     interface joinOptions {
         delim?: string;
@@ -51,6 +55,10 @@ declare module "array/mapKey" {
     function mapKey<T extends Record<string, any>>(arr: T[], key: string, opts?: mapOptions): Record<string, T>;
     export { mapKey, mapKey as default };
 }
+declare module "number/isIntegerAboveOrEqual" {
+    function isIntegerAboveOrEqual(val: unknown, ref: number): val is number;
+    export { isIntegerAboveOrEqual, isIntegerAboveOrEqual as default };
+}
 declare module "array/mapPrimitive" {
     interface mapOptions {
         valtrim?: boolean;
@@ -184,11 +192,11 @@ declare module "function/noop" {
     export { noop, noop as default };
 }
 declare module "function/noopresolve" {
-    function noopresolve<T>(val?: T): Promise<T>;
+    function noopresolve<T>(val?: T): Promise<T | undefined>;
     export { noopresolve, noopresolve as default };
 }
 declare module "function/noopreturn" {
-    function noopreturn<T>(val?: T): T;
+    function noopreturn<T>(val?: T): T | undefined;
     export { noopreturn, noopreturn as default };
 }
 declare module "function/sleep" {
@@ -299,18 +307,10 @@ declare module "number/isBetween" {
     function isNumberBetween(val: unknown, min: number, max: number): val is number;
     export { isNumberBetween, isNumberBetween as default };
 }
-declare module "number/isInteger" {
-    function isInteger(val: unknown): val is number;
-    export { isInteger, isInteger as default };
-}
 declare module "number/isIntegerAbove" {
     function isIntegerAbove(val: unknown, ref: number): val is number;
     export { isIntegerAbove, isIntegerAbove as default };
 }
-declare module "number/isIntegerAboveOrEqual" {
-    function isIntegerAboveOrEqual(val: unknown, ref: number): val is number;
-    export { isIntegerAboveOrEqual, isIntegerAboveOrEqual as default };
-}
 declare module "number/isIntegerBelow" {
     function isIntegerBelow(val: unknown, ref: number): val is number;
     export { isIntegerBelow, isIntegerBelow as default };
@@ -364,7 +364,7 @@ declare module "string/humanizeNumber" {
         divider?: number;
         real?: boolean;
     }
-    function humanizeNumber(val: number | string, options?: humanizeNumberOptions | false): string;
+    function humanizeNumber(val: number | string, options?: humanizeNumberOptions): string;
     export { humanizeNumber, humanizeNumber as default };
 }
 declare module "string/humanizeBytes" {
@@ -468,7 +468,7 @@ declare module "is" {
     export { Is, Is as default };
 }
 declare module "caching/memoize" {
-    function memoize(fn: Function, resolver?: Function): Function;
+    function memoize<T extends (...args: any[]) => unknown>(fn: T, resolver?: (...args: Parameters<T>) => any, memoize_for?: number | false): T;
     export { memoize, memoize as default };
 }
 declare module "caching/index" {

package/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.Is = void 0;
 const equal_1 = require("./equal");

package/number/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toPct = exports.toPercentage = exports.round = exports.randIntBetween = exports.randomIntBetween = exports.randBetween = exports.randomBetween = exports.isNumericalNaN = exports.isIntBetween = exports.isIntegerBetween = exports.isIntLte = exports.isIntegerBelowOrEqual = exports.isIntLt = exports.isIntegerBelow = exports.isIntGte = exports.isIntegerAboveOrEqual = exports.isIntGt = exports.isIntegerAbove = exports.isInt = exports.isInteger = exports.isNumBetween = exports.isNumberBetween = exports.isLte = exports.isNumLte = exports.isNumberBelowOrEqual = exports.isLt = exports.isNumLt = exports.isNumberBelow = exports.isGte = exports.isNumGte = exports.isNumberAboveOrEqual = exports.isGt = exports.isNumGt = exports.isNumberAbove = exports.isNum = exports.is = exports.isNumber = void 0;
 const is_1 = require("./is");

package/number/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNumber = void 0;
 function isNumber(val) {

package/number/isAbove.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNumberAbove = void 0;
 function isNumberAbove(val, ref) {

package/number/isAboveOrEqual.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNumberAboveOrEqual = void 0;
 function isNumberAboveOrEqual(val, ref) {

package/number/isBelow.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNumberBelow = void 0;
 function isNumberBelow(val, ref) {

package/number/isBelowOrEqual.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNumberBelowOrEqual = void 0;
 function isNumberBelowOrEqual(val, ref) {

package/number/isBetween.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNumberBetween = void 0;
 function isNumberBetween(val, min, max) {

package/number/isInteger.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isInteger = void 0;
 function isInteger(val) {

package/number/isIntegerAbove.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isIntegerAbove = void 0;
 function isIntegerAbove(val, ref) {

package/number/isIntegerAboveOrEqual.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isIntegerAboveOrEqual = void 0;
 function isIntegerAboveOrEqual(val, ref) {

package/number/isIntegerBelow.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isIntegerBelow = void 0;
 function isIntegerBelow(val, ref) {

package/number/isIntegerBelowOrEqual.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isIntegerBelowOrEqual = void 0;
 function isIntegerBelowOrEqual(val, ref) {

package/number/isIntegerBetween.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isIntegerBetween = void 0;
 function isIntegerBetween(val, min, max) {

package/number/isNumericalNaN.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNumericalNaN = void 0;
 function isNumericalNaN(val) {

package/number/randomBetween.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.randomBetween = void 0;
 function randomBetween(min = 0, max = 10) {

package/number/randomIntBetween.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.randomIntBetween = void 0;
 function randomIntBetween(min = 0, max = 10) {

package/number/round.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.round = void 0;
 function round(val, precision = 0) {

package/number/toPercentage.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.toPercentage = void 0;
 const round_1 = require("./round");

package/object/define.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.define = void 0;
 function define(props, obj = {}) {

package/object/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pick = exports.merge = exports.isNe = exports.isNeObject = exports.isNotEmpty = exports.isNotEmptyObject = exports.is = exports.isObject = exports.define = void 0;
 const define_1 = require("./define");

package/object/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isObject = void 0;
 function isObject(val) {

package/object/isNotEmpty.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNotEmptyObject = void 0;
 function isNotEmptyObject(val) {

package/object/merge.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.merge = void 0;
 const PROTO_OBJ = '[object Object]';

package/object/pick.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.pick = void 0;
 const get_1 = require("../deep/get");

package/package.json

@@ -1 +1 @@
-{ "name": "@valkyriestudios/utils", "version": "12.9.0", "description": "A collection of single-function utilities for common tasks", "author": { "name": "Peter Vermeulen", "url": "https://www.linkedin.com/in/petervermeulen1/" }, "keywords": [ "utility", "library", "javascript", "js", "node", "bun" ], "license": "MIT", "repository": { "type": "git", "url": "git+https://github.com/ValkyrieStudios/utils.git" }, "bugs": { "url": "https://github.com/ValkyrieStudios/utils/issues" }, "homepage": "https://github.com/ValkyrieStudios/utils#readme", "types": "index.d.ts" }
+{ "name": "@valkyriestudios/utils", "version": "12.10.0", "description": "A collection of single-function utilities for common tasks", "author": { "name": "Peter Vermeulen", "url": "https://www.linkedin.com/in/petervermeulen1/" }, "keywords": [ "utility", "library", "javascript", "js", "node", "bun" ], "license": "MIT", "repository": { "type": "git", "url": "git+https://github.com/ValkyrieStudios/utils.git" }, "bugs": { "url": "https://github.com/ValkyrieStudios/utils/issues" }, "homepage": "https://github.com/ValkyrieStudios/utils#readme", "types": "index.d.ts" }

package/regexp/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sanitize = exports.sanitizeRegExp = exports.is = exports.isRegExp = void 0;
 const is_1 = require("./is");

package/regexp/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isRegExp = void 0;
 function isRegExp(val) {

package/regexp/sanitize.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.sanitizeRegExp = void 0;
 function sanitizeRegExp(val) {

package/string/humanizeBytes.d.ts

@@ -31,8 +31,8 @@ interface humanizeBytesOptions {
  * 	humanizeBytes(23); // '23 bytes'
  * 	humanizeBytes(-374237489237); // '-348.5 GB'
  *
- * @param val - Number or string byte value to humanize (string should be convertible to a number)
- * @param opts - (default={}) Pass to override options.
+ * @param {number|string} val - Number or string byte value to humanize (string should be convertible to a number)
+ * @param {humanizeBytesOptions?} opts - Humanization options
  *
  * @returns Humanized byte value as string
  */

package/string/humanizeBytes.js

@@ -1,20 +1,20 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.humanizeBytes = void 0;
 const humanizeNumber_1 = require("./humanizeNumber");
+const isIntegerAboveOrEqual_1 = require("../number/isIntegerAboveOrEqual");
 function humanizeBytes(val, options = {}) {
-    const has_opts = Object.prototype.toString.call(options) === '[object Object]';
     return (0, humanizeNumber_1.humanizeNumber)(val, {
-        delim: has_opts && typeof options.delim === 'string'
+        delim: typeof options?.delim === 'string'
             ? options.delim
             : ',',
-        separator: has_opts && typeof options.separator === 'string' && options.separator.trim().length
+        separator: typeof options?.separator === 'string' && options.separator.trim().length
             ? options.separator
             : '.',
-        precision: has_opts && Number.isInteger(options.precision) && options.precision >= 0
+        precision: (0, isIntegerAboveOrEqual_1.isIntegerAboveOrEqual)(options?.precision, 0)
             ? options.precision
             : 2,
-        units: has_opts && Array.isArray(options.units) && options.units.length
+        units: Array.isArray(options?.units) && options.units.length
             ? options.units
             : [' bytes', ' KB', ' MB', ' GB', ' TB', ' PB', ' EB', ' ZB', ' YB'],
         divider: 1024,

package/string/humanizeNumber.d.ts

@@ -48,5 +48,5 @@ interface humanizeNumberOptions {
  *
  * @returns Humanized number as string
  */
-declare function humanizeNumber(val: number | string, options?: humanizeNumberOptions | false): string;
+declare function humanizeNumber(val: number | string, options?: humanizeNumberOptions): string;
 export { humanizeNumber, humanizeNumber as default };

package/string/humanizeNumber.js

@@ -1,34 +1,20 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.humanizeNumber = void 0;
 const round_1 = require("../number/round");
+const isIntegerAboveOrEqual_1 = require("../number/isIntegerAboveOrEqual");
 const DEFAULT_UNITS = ['', 'k', 'm', 'b', 't', 'q'];
-function humanizeNumber(val, options = false) {
-    let DELIM = ',';
-    let SEPARATOR = '.';
-    let PRECISION = 2;
-    let UNITS = DEFAULT_UNITS;
-    let DIVIDER = 1000;
-    let REAL = false;
-    if (options && Object.prototype.toString.call(options) === '[object Object]') {
-        if (typeof options.delim === 'string')
-            DELIM = options.delim;
-        if (typeof options.separator === 'string' && options.separator.trim().length)
-            SEPARATOR = options.separator;
-        if (Number.isInteger(options.precision) && options.precision >= 0)
-            PRECISION = options.precision;
-        if (Array.isArray(options.units) && options.units.length) {
-            UNITS = options.units;
-        }
-        else if (options.units === false) {
-            UNITS = false;
-        }
-        if (Number.isInteger(options.divider) && options.divider > 1) {
-            DIVIDER = options.divider;
-        }
-        if (options.real === true)
-            REAL = true;
-    }
+function humanizeNumber(val, options = {}) {
+    const DELIM = typeof options?.delim === 'string' ? options.delim : ',';
+    const SEPARATOR = typeof options?.separator === 'string' && options.separator.trim().length ? options.separator : '.';
+    const PRECISION = (0, isIntegerAboveOrEqual_1.isIntegerAboveOrEqual)(options?.precision, 0) ? options.precision : 2;
+    const DIVIDER = (0, isIntegerAboveOrEqual_1.isIntegerAboveOrEqual)(options?.divider, 2) ? options.divider : 1000;
+    const REAL = options?.real === true;
+    const UNITS = Array.isArray(options?.units) && options.units.length
+        ? options.units
+        : options?.units === false
+            ? false
+            : DEFAULT_UNITS;
     let normalized = 0;
     if (typeof val === 'string') {
         normalized = REAL ? parseInt(val.trim(), 10) : parseFloat(val);

package/string/index.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shorten = exports.isBetween = exports.isStringBetween = exports.isNe = exports.isNeString = exports.isNotEmpty = exports.isNotEmptyString = exports.is = exports.isString = exports.humanizeNumber = exports.humanizeBytes = void 0;
 const humanizeBytes_1 = require("./humanizeBytes");

package/string/is.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isString = void 0;
 function isString(val) {

package/string/isBetween.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isStringBetween = void 0;
 function isStringBetween(val, min, max, trimmed = true) {

package/string/isNotEmpty.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.isNotEmptyString = void 0;
 function isNotEmptyString(val, trimmed = true) {

package/string/shorten.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.shorten = void 0;
 function shorten(val, length, postfix = '...') {