@valkyriestudios/utils 11.6.0 → 12.0.0

package/README.md

@@ -155,7 +155,7 @@ shuffle(arr);
 // [4, 6, 3, 2, 5, 1]
 ```
 
-- **sort(val:Array[object], by:String|Function, dir:Enum(asc,desc), options:Object)**
+- **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) 
 
 ```js
@@ -279,7 +279,7 @@ isDate(new Date('December 17, 1995 03:24:00'); // TRUE
 isDate('December 17, 1995 03:24:00'); // FALSE
 ```
 
-- **diff(val_a:Date, val_b:Date, key:String)**
+- **diff(val_a:Date, val_b:Date, key:string)**
 Take two incoming dates and return the difference between them in a certain unit. Possible key options(week,day,hour,minute,second,millisecond).
 
 Note: Does not touch the passed date objects, if no key is passed will default to millisecond
@@ -292,6 +292,51 @@ diff(new Date("2022-10-05T13:12:11+02:00"), new Date("2022-10-05T17:43:09.344+06
 diff(new Date("2022-10-05T13:12:11+02:00"), new Date("2022-10-05T17:43:09.344+06:00"), 'millisecond'); // -1858344
 diff(new Date("2022-11-05T13:12:11+06:00"), new Date("2022-10-05T13:25:43.898+02:00")); // 2663187102
 ```
+- **format(val:Date, spec:string, locale?:string, zone?:string):string**
+Format a date according to a spec/locale and zone
+
+Note: The locale is by default set to 'en-US'
+
+Note: The zone is by default detected as the zone of the client
+
+Available tokens for usage in spec:
+| Token     | Description               | Example       |
+|:---------|:--------------------------|:---------------|
+| `YYYY` | Full Year | 2021 |
+| `Q` | Quarters of the year | 1 2 3 4 |
+| `MMMM` | Month in full | January February ... November December |
+| `MMM` | Month as 3 char | Jan Feb ... Nov Dec |
+| `MM` | Month as 2 char | 01 02 .. 11 12 |
+| `M` | Month as pure digit | 1 2 .. 11 12 |
+| `DD` | Day of month as 2 char | 01 02 .. 30 31 |
+| `D` | Day of month as 1 char | 1 2 .. 30 31 |
+| `dddd` | Day of week as 3 char | Sun Mon ... Fri Sat |
+| `ddd` | Day of week in full | Sunday Monday ... Saturday |
+| `HH` | Hours as 2-char | 00 01 .. 22 23 |
+| `H` | Hours as pure digit | 0 1 .. 22 23 |
+| `hh` | Hours in 12 hour time as 2 char | 01 02 ... 11 12 |
+| `h` | Hours in 12 hour time as pure digit | 1 2 ... 11 12 |
+| `mm` | Minutes as 2-char | 00 01 .. 58 59 |
+| `m` | Minutes as pure digit | 0 1 .. 58 59 |
+| `ss` | Seconds as 2-char | 00 01 .. 58 59 |
+| `s` | Seconds as pure digit | 0 1 .. 58 59 |
+| `SSS` | Milliseconds as 3-digit | 000 001 ... 998 999 |
+| `A` | Uppercase AM/PM | AM ... PM |
+| `a` | Lowercase AM/PM | am ... pm |
+
+```js
+format(new Date('2023-01-10T14:30:00Z'), '[Today is] dddd, MMMM D, YYYY [at] h:mm A', 'en', 'Europe/Brussels');
+//  'Today is Tuesday, January 10, 2023 at 2:30 PM'
+
+format(new Date('2022-07-14T16:40:30Z'), 'dddd, [Year] Q Q M D [à] hh:mm A [string]', 'fr', 'Asia/Singapore');
+// 'vendredi, Year 3 3 7 15 à 12:40 AM string'
+
+format(new Date('2022-07-14T16:40:30Z'), 'YYYY-MM-DD', 'fr', 'Asia/Singapore');
+// 2022-07-15
+
+format(new Date('2022-07-14T16:40:30Z'), 'YYYY-MM-DD', 'fr', 'Europe/Brussels');
+// 2022-07-14
+```
 
 - **toUTC(val:Date)**
 Takes the passed date object and returns a new date object set for utc
@@ -305,7 +350,7 @@ Returns the current unix timestamp in seconds
 - **nowUnixMs()**
 Returns the current unix timestamp in milliseconds
 
-- **startOfUTC(val:Date, key:String)**
+- **startOfUTC(val:Date, key:string)**
 Take the incoming date and return a date set to the start of passed key. Possible key options(year,quarter,month,week,week_sun,week_mon,week_tue,week_wed,week_thu,week_fri,week_sat,day,hour,minute,second).
 
 Note: Does not touch the date object passed
@@ -325,7 +370,7 @@ startOfUTC(new Date("2023-05-04T12:04:27+02:00"), 'minute'); // new Date("2023-0
 startOfUTC(new Date("2023-05-04T12:04:27.043+02:00"), 'second'); // new Date("2023-05-04T10:04:27.000Z")
 ```
 
-- **endOfUTC(val:Date, key:String)**
+- **endOfUTC(val:Date, key:string)**
 Take the incoming date and return a date set to the end of passed key. Possible key options(year,quarter,month,week,week_sun,week_mon,week_tue,week_wed,week_thu,week_fri,week_sat,day,hour,minute,second).
 
 Note: Does not touch the date object passed
@@ -349,7 +394,7 @@ endOfUTC(new Date("2023-05-04T12:04:27+02:00"), 'minute'); // new Date("2023-05-
 endOfUTC(new Date("2023-05-04T12:04:27.043+02:00"), 'second'); // new Date("2023-05-04T10:04:27.999Z")
 ```
 
-- **addUTC(val:Date, amount:integer, key:String)**
+- **addUTC(val:Date, amount:integer, key:string)**
 Take the incoming date and add a certain amount of the passed key. Possible key options(year,years,month,months,day,days,hour,hours,minute,minutes,second,seconds,millisecond,milliseconds).
 
 Note: Does not touch the date object passed

package/array/dedupe.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const fnv1A_1 = require("../hash/fnv1A");
 function dedupe(val) {
-    if (!Array.isArray(val) || val.length === 0)
+    if (!Array.isArray(val) || !val.length)
         return [];
     const set = new Set();
     const acc = [];

package/array/join.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const round_1 = require("../number/round");
 function join(val, opts = {}) {
-    if (!Array.isArray(val) || val.length === 0)
+    if (!Array.isArray(val) || !val.length)
         return '';
     const OPTS = {
         delim: ' ',
@@ -12,7 +12,7 @@ function join(val, opts = {}) {
     };
     const filtered = [];
     for (const el of val) {
-        if (typeof el === 'string' && el.trim().length > 0) {
+        if (typeof el === 'string' && el.trim().length) {
             filtered.push(OPTS.valtrim === true ? el.trim() : el);
         }
         else if (Number.isFinite(el)) {

package/array/mapFn.js

@@ -1,7 +1,7 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 function mapFn(arr, fn, opts = {}) {
-    if ((!Array.isArray(arr) || arr.length === 0) ||
+    if ((!Array.isArray(arr) || !arr.length) ||
         typeof fn !== 'function')
         return {};
     const OPTS = {
@@ -14,7 +14,7 @@ function mapFn(arr, fn, opts = {}) {
         if (Object.prototype.toString.call(el) !== '[object Object]')
             continue;
         hash = fn(el);
-        if (!Number.isFinite(hash) && !(typeof hash === 'string' && hash.trim().length > 0))
+        if (!Number.isFinite(hash) && !(typeof hash === 'string' && hash.trim().length))
             continue;
         hash = `${hash}`;
         if (OPTS.merge === true && map.hasOwnProperty(hash)) {

package/array/mapKey.js

@@ -1,11 +1,11 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 function mapKey(arr, key, opts = {}) {
-    if ((!Array.isArray(arr) || arr.length === 0) ||
+    if ((!Array.isArray(arr) || !arr.length) ||
         typeof key !== 'string')
         return {};
     const key_s = key.trim();
-    if (key_s.length === 0)
+    if (!key_s.length)
         return {};
     const OPTS = {
         merge: false,

package/array/mapPrimitive.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const round_1 = require("../number/round");
 function mapPrimitive(arr, opts = {}) {
-    if (!Array.isArray(arr) || arr.length === 0)
+    if (!Array.isArray(arr) || !arr.length)
         return {};
     const OPTS = {
         valtrim: false,
@@ -12,7 +12,7 @@ function mapPrimitive(arr, opts = {}) {
     };
     const map = {};
     for (const el of arr) {
-        if (typeof el === 'string' && el.trim().length > 0) {
+        if (typeof el === 'string' && el.trim().length) {
             map[el.trim()] = OPTS.valtrim ? el.trim() : el;
         }
         else if (typeof el === 'number' && Number.isFinite(el)) {

package/array/shuffle.js

@@ -1,7 +1,7 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 function shuffle(arr) {
-    if (!Array.isArray(arr) || arr.length === 0)
+    if (!Array.isArray(arr) || !arr.length)
         return;
     for (let i = arr.length - 1; i > 0; i--) {
         const j = Math.floor(Math.random() * (i + 1));

package/array/sort.js

@@ -30,7 +30,7 @@ function quickSort(arr, start_ix = 0, end_ix = arr.length - 1) {
     return arr;
 }
 function sort(arr, by, dir = 'asc', opts = {}) {
-    if (!Array.isArray(arr) || arr.length === 0)
+    if (!Array.isArray(arr) || !arr.length)
         return [];
     if (dir !== 'asc' && dir !== 'desc')
         throw new Error('Direction should be either asc or desc');
@@ -46,7 +46,7 @@ function sort(arr, by, dir = 'asc', opts = {}) {
     const nokey_arr = [];
     if (typeof by === 'string') {
         const by_s = by.trim();
-        if (by_s.length === 0)
+        if (!by_s.length)
             throw new Error('Sort by as string should contain content');
         for (const el of arr) {
             if (!OPTS.filter_fn(el))

package/date/addUTC.d.ts

@@ -7,4 +7,4 @@
  *
  * @returns New date with provided amount of key added
  */
-export default function addUTC(val: Date, amount?: number, key?: 'years' | 'year' | 'months' | 'month' | 'days' | 'day' | 'hours' | 'hour' | 'minutes' | 'minute' | 'seconds' | 'second' | 'milliseconds' | 'millisecond'): Date;
+export default function addUTC(val: Date, amt?: number, key?: 'years' | 'year' | 'months' | 'month' | 'days' | 'day' | 'hours' | 'hour' | 'minutes' | 'minute' | 'seconds' | 'second' | 'milliseconds' | 'millisecond'): Date;

package/date/addUTC.js

@@ -1,52 +1,44 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const is_1 = require("./is");
-function addUTC(val, amount = 0, key = 'millisecond') {
+function addUTC(val, amt = 0, key = 'millisecond') {
     if (!(0, is_1.default)(val))
         throw new TypeError('addUTC requires a date object');
-    if (!Number.isInteger(amount))
+    if (!Number.isInteger(amt))
         throw new TypeError('Amount needs to be an integer');
     if (typeof key !== 'string')
         throw new TypeError('Key needs to be a string with content');
-    const copy = new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), val.getUTCDate(), val.getUTCHours(), val.getUTCMinutes(), val.getUTCSeconds(), val.getUTCMilliseconds()));
+    const year = val.getUTCFullYear();
+    const month = val.getUTCMonth();
+    const date = val.getUTCDate();
+    const hour = val.getUTCHours();
+    const min = val.getUTCMinutes();
+    const sec = val.getUTCSeconds();
+    const ms = val.getUTCMilliseconds();
     switch (key) {
         case 'years':
-        case 'year': {
-            copy.setUTCFullYear(copy.getUTCFullYear() + amount);
-            return copy;
-        }
+        case 'year':
+            return new Date(Date.UTC(year + amt, month, date, hour, min, sec, ms));
         case 'months':
-        case 'month': {
-            copy.setUTCMonth(copy.getUTCMonth() + amount);
-            return copy;
-        }
+        case 'month':
+            return new Date(Date.UTC(year, month + amt, date, hour, min, sec, ms));
         case 'days':
-        case 'day': {
-            copy.setUTCDate(copy.getUTCDate() + amount);
-            return copy;
-        }
+        case 'day':
+            return new Date(Date.UTC(year, month, date + amt, hour, min, sec, ms));
         case 'hours':
-        case 'hour': {
-            copy.setUTCHours(copy.getUTCHours() + amount);
-            return copy;
-        }
+        case 'hour':
+            return new Date(Date.UTC(year, month, date, hour + amt, min, sec, ms));
         case 'minutes':
-        case 'minute': {
-            copy.setUTCMinutes(copy.getUTCMinutes() + amount);
-            return copy;
-        }
+        case 'minute':
+            return new Date(Date.UTC(year, month, date, hour, min + amt, sec, ms));
         case 'seconds':
-        case 'second': {
-            copy.setUTCSeconds(copy.getUTCSeconds() + amount);
-            return copy;
-        }
+        case 'second':
+            return new Date(Date.UTC(year, month, date, hour, min, sec + amt, ms));
         case 'milliseconds':
-        case 'millisecond': {
-            copy.setUTCMilliseconds(copy.getUTCMilliseconds() + amount);
-            return copy;
-        }
+        case 'millisecond':
+            return new Date(Date.UTC(year, month, date, hour, min, sec, ms + amt));
         default:
-            return copy;
+            return new Date(Date.UTC(year, month, date, hour, min, sec, ms));
     }
 }
 exports.default = addUTC;

package/date/diff.js

@@ -29,8 +29,6 @@ function diff(val_a, val_b, key = 'millisecond') {
         case 'second':
         case 'seconds':
             return diff_in_ms / SECOND_IN_MILLISECONDS;
-        case 'millisecond':
-        case 'milliseconds':
         default:
             return diff_in_ms;
     }

package/date/endOfUTC.js

@@ -1,16 +1,16 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const is_1 = require("./is");
-const WEEK_END = {
-    week: 0,
-    week_sun: 6,
-    week_mon: 0,
-    week_tue: 1,
-    week_wed: 2,
-    week_thu: 3,
-    week_fri: 4,
-    week_sat: 5,
-};
+const WEEK_END = new Map([
+    ['week', 0],
+    ['week_sun', 6],
+    ['week_mon', 0],
+    ['week_tue', 1],
+    ['week_wed', 2],
+    ['week_thu', 3],
+    ['week_fri', 4],
+    ['week_sat', 5],
+]);
 function endOfUTC(val, key = 'millisecond') {
     if (!(0, is_1.default)(val))
         throw new TypeError('endOfUTC requires a date object');
@@ -20,7 +20,8 @@ function endOfUTC(val, key = 'millisecond') {
         case 'year':
             return new Date(Date.UTC(val.getUTCFullYear(), 11, 31, 23, 59, 59, 999));
         case 'quarter': {
-            return new Date(Date.UTC(val.getUTCFullYear(), (val.getUTCMonth() - (val.getUTCMonth() % 3)) + 3, 0, 23, 59, 59, 999));
+            const UTC_MONTH = val.getUTCMonth();
+            return new Date(Date.UTC(val.getUTCFullYear(), (UTC_MONTH - (UTC_MONTH % 3)) + 3, 0, 23, 59, 59, 999));
         }
         case 'month':
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth() + 1, 0, 23, 59, 59, 999));
@@ -33,7 +34,7 @@ function endOfUTC(val, key = 'millisecond') {
         case 'week_fri':
         case 'week_sat': {
             const UTC_DAY = val.getUTCDay();
-            const UTC_EOD = WEEK_END[key];
+            const UTC_EOD = WEEK_END.get(key);
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), val.getUTCDate() + (UTC_DAY <= UTC_EOD ? UTC_EOD - UTC_DAY : (7 - UTC_DAY) + UTC_EOD), 23, 59, 59, 999));
         }
         case 'day':
@@ -44,7 +45,6 @@ function endOfUTC(val, key = 'millisecond') {
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), val.getUTCDate(), val.getUTCHours(), val.getUTCMinutes(), 59, 999));
         case 'second':
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), val.getUTCDate(), val.getUTCHours(), val.getUTCMinutes(), val.getUTCSeconds(), 999));
-        case 'millisecond':
         default:
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), val.getUTCDate(), val.getUTCHours(), val.getUTCMinutes(), val.getUTCSeconds(), val.getUTCMilliseconds()));
     }

package/date/format.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Formats the provided date according to a specific spec
+ *
+ * @param {Date} val - Date to format
+ * @param {string} spec - Spec to format the date to
+ * @param {string} locale - Locale to format the date in (only used in certain tokens such as dddd and MMMM)
+ * @param {string} zone - (default=current timezone) Pass the timezone to convert into. If not passed no conversion will happen
+ * @returns {string} Formatted date as string
+ * @throws {TypeError} When provided invalid payload
+ */
+export default function format(val: Date, spec: string, locale?: string, zone?: string): string;

package/date/format.js

@@ -0,0 +1,125 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const is_1 = require("./is");
+const DEFAULT_LOCALE = 'en-US';
+let DEFAULT_TZ = 'UTC';
+try {
+    DEFAULT_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone;
+}
+catch (err) {
+}
+finally {
+    if (typeof DEFAULT_TZ !== 'string')
+        DEFAULT_TZ = 'UTC';
+}
+const escape_rgx = /\[[\s\S]+?]/g;
+const intl_formatters = new Map();
+const spec_cache = new Map();
+const zone_offset_cache = new Map();
+function DOY(d) {
+    return Math.floor((d - new Date(d.getFullYear(), 0, 0)) / 86400000);
+}
+function toZone(date, zone) {
+    const ckey = `${zone}:${date.getUTCFullYear()}${DOY(date)}`;
+    if (zone_offset_cache.has(ckey))
+        return new Date(date.getTime() + zone_offset_cache.get(ckey));
+    const client_time = date.getTime();
+    let zone_time = false;
+    try {
+        zone_time = new Date(date.toLocaleString(DEFAULT_LOCALE, { timeZone: zone })).getTime();
+    }
+    catch (err) {
+    }
+    if (!Number.isInteger(zone_time))
+        throw new Error(`format: Invalid zone passed - ${zone}`);
+    const offset = zone_time - client_time;
+    zone_offset_cache.set(ckey, offset);
+    return new Date(date.getTime() + offset);
+}
+function runIntl(loc, token, props, val) {
+    const hash = `${loc}:${token}`;
+    if (intl_formatters.has(hash))
+        return intl_formatters.get(hash).format(val);
+    try {
+        const instance = new Intl.DateTimeFormat(loc, props);
+        intl_formatters.set(hash, instance);
+        return instance.format(val);
+    }
+    catch (err) {
+        throw new Error(`format: Failed to run conversion for ${token} with locale ${loc}`);
+    }
+}
+const Tokens = [
+    ['YYYY', d => d.getFullYear()],
+    ['Q', d => Math.floor((d.getMonth() + 3) / 3)],
+    ['MMMM', (d, loc) => runIntl(loc, 'MMMM', { month: 'long' }, d)],
+    ['MMM', (d, loc) => runIntl(loc, 'MMM', { month: 'short' }, d)],
+    ['MM', d => `${d.getMonth() + 1}`.padStart(2, '0')],
+    ['M', d => d.getMonth() + 1],
+    ['DD', d => `${d.getDate()}`.padStart(2, '0')],
+    ['D', d => d.getDate()],
+    ['dddd', (d, loc) => runIntl(loc, 'dddd', { weekday: 'long' }, d)],
+    ['ddd', (d, loc) => runIntl(loc, 'ddd', { weekday: 'short' }, d)],
+    ['HH', d => `${d.getHours()}`.padStart(2, '0')],
+    ['H', d => d.getHours()],
+    ['hh', d => `${((d.getHours() + 11) % 12) + 1}`.padStart(2, '0')],
+    ['h', d => ((d.getHours() + 11) % 12) + 1],
+    ['mm', d => `${d.getMinutes()}`.padStart(2, '0')],
+    ['m', d => d.getMinutes()],
+    ['ss', d => `${d.getSeconds()}`.padStart(2, '0')],
+    ['s', d => d.getSeconds()],
+    ['SSS', d => `${d.getMilliseconds()}`.padStart(3, '0')],
+    ['A', d => d.getHours() < 12 ? 'AM' : 'PM'],
+    ['a', d => d.getHours() < 12 ? 'am' : 'pm'],
+]
+    .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 cursor;
+    for (let i = 0; i < Tokens.length; i++) {
+        cursor = Tokens[i];
+        if (spec.indexOf(cursor[0]) < 0)
+            continue;
+        spec_chain.push(cursor);
+    }
+    if (spec_chain.length === 0)
+        return false;
+    spec_cache.set(spec, spec_chain);
+    return spec_chain;
+}
+function format(val, spec, locale = DEFAULT_LOCALE, zone = DEFAULT_TZ) {
+    if (!(0, is_1.default)(val))
+        throw new TypeError('format: val must be a Date');
+    if (typeof spec !== 'string' || !spec.trim().length)
+        throw new TypeError('format: spec must be a non-empty string');
+    if (typeof locale !== 'string' || !locale.trim().length)
+        throw new TypeError('format: locale must be a non-empty string');
+    if (typeof zone !== 'string' || !zone.trim().length)
+        throw new TypeError('format: zone must be a non-empty string');
+    let formatted_string = spec;
+    const escaped_acc = [];
+    if (formatted_string.indexOf('[') >= 0) {
+        formatted_string = formatted_string.replace(escape_rgx, match => {
+            const escape_token = `$R${escaped_acc.length}$`;
+            escaped_acc.push([escape_token, match.replace('[', '').replace(']', '')]);
+            return escape_token;
+        });
+    }
+    const spec_chain = getSpecChain(formatted_string);
+    if (!spec_chain)
+        return val.toISOString();
+    const d = toZone(val, zone);
+    for (const el of spec_chain) {
+        formatted_string = formatted_string.replace(el[1], el[2](d, locale));
+    }
+    if (escaped_acc.length) {
+        for (const escape_token of escaped_acc) {
+            formatted_string = formatted_string.replace(escape_token[0], escape_token[1]);
+        }
+    }
+    return formatted_string;
+}
+exports.default = format;

package/date/is.js

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 function isDate(val) {
-    return Object.prototype.toString.call(val) === '[object Date]' && !isNaN(val);
+    return val instanceof Date && !isNaN(val);
 }
 exports.default = isDate;

package/date/startOfUTC.js

@@ -1,16 +1,16 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const is_1 = require("./is");
-const WEEK_START = {
-    week: 1,
-    week_sun: 0,
-    week_mon: 1,
-    week_tue: 2,
-    week_wed: 3,
-    week_thu: 4,
-    week_fri: 5,
-    week_sat: 6,
-};
+const WEEK_START = new Map([
+    ['week', 1],
+    ['week_sun', 0],
+    ['week_mon', 1],
+    ['week_tue', 2],
+    ['week_wed', 3],
+    ['week_thu', 4],
+    ['week_fri', 5],
+    ['week_sat', 6],
+]);
 function startOfUTC(val, key = 'millisecond') {
     if (!(0, is_1.default)(val))
         throw new TypeError('startOfUTC requires a date object');
@@ -20,7 +20,8 @@ function startOfUTC(val, key = 'millisecond') {
         case 'year':
             return new Date(Date.UTC(val.getUTCFullYear(), 0, 1, 0, 0, 0, 0));
         case 'quarter': {
-            return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth() - (val.getUTCMonth() % 3), 1, 0, 0, 0, 0));
+            const UTC_MONTH = val.getUTCMonth();
+            return new Date(Date.UTC(val.getUTCFullYear(), UTC_MONTH - (UTC_MONTH % 3), 1, 0, 0, 0, 0));
         }
         case 'month':
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), 1, 0, 0, 0, 0));
@@ -33,7 +34,7 @@ function startOfUTC(val, key = 'millisecond') {
         case 'week_fri':
         case 'week_sat': {
             const UTC_DAY = val.getUTCDay();
-            const UTC_SOD = WEEK_START[key];
+            const UTC_SOD = WEEK_START.get(key);
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), val.getUTCDate() - (UTC_DAY < UTC_SOD ? (7 - UTC_SOD) + UTC_DAY : UTC_DAY - UTC_SOD), 0, 0, 0, 0));
         }
         case 'day':
@@ -44,7 +45,6 @@ function startOfUTC(val, key = 'millisecond') {
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), val.getUTCDate(), val.getUTCHours(), val.getUTCMinutes(), 0, 0));
         case 'second':
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), val.getUTCDate(), val.getUTCHours(), val.getUTCMinutes(), val.getUTCSeconds(), 0));
-        case 'millisecond':
         default:
             return new Date(Date.UTC(val.getUTCFullYear(), val.getUTCMonth(), val.getUTCDate(), val.getUTCHours(), val.getUTCMinutes(), val.getUTCSeconds(), val.getUTCMilliseconds()));
     }

package/deep/freeze.d.ts

@@ -3,6 +3,9 @@ type deepInput = {
 } | {
     [key: string]: any;
 }[] | any[];
+type Frozen<T> = {
+    readonly [K in keyof T]: Frozen<T[K]>;
+};
 /**
  * Recursively freezes all properties of an object
  *
@@ -10,5 +13,5 @@ type deepInput = {
  *
  * @returns Deeply frozen object
  */
-export default function deepFreeze(obj: deepInput): Readonly<deepInput>;
+export default function deepFreeze<T extends deepInput>(obj: T): Frozen<T>;
 export {};

package/deep/get.js

@@ -7,19 +7,19 @@ function deepGet(obj, path, get_parent = false) {
     if (typeof path !== 'string')
         throw new TypeError('No path was given');
     const path_s = path.trim();
-    if (path_s.length === 0)
+    if (!path_s.length)
         throw new TypeError('No path was given');
     const parts = path_s
         .replace(/\[/g, '.')
         .replace(/(\.){2,}/g, '.')
         .replace(/(^\.|\.$|\])/g, '')
         .split('.');
-    if (parts.length === 0 || (parts.length === 1 && get_parent))
+    if (!parts.length || (parts.length === 1 && get_parent))
         return obj;
     if (get_parent)
         parts.pop();
     let cursor = obj;
-    while (parts.length > 0) {
+    while (parts.length) {
         if (Array.isArray(cursor)) {
             const ix = parseInt(parts.shift());
             if (!Number.isInteger(ix) || ix < 0 || ix > (cursor.length - 1))
@@ -33,7 +33,7 @@ function deepGet(obj, path, get_parent = false) {
             cursor = cursor[key];
         }
         if ((!Array.isArray(cursor) && Object.prototype.toString.call(cursor) !== '[object Object]') &&
-            parts.length > 0)
+            parts.length)
             return undefined;
     }
     return cursor;

package/deep/seal.d.ts

@@ -3,6 +3,9 @@ type deepInput = {
 } | {
     [key: string]: any;
 }[] | any[];
+type Sealed<T> = {
+    [K in keyof T]: Sealed<T[K]>;
+};
 /**
  * Recursively seals all properties of an object
  *
@@ -10,5 +13,5 @@ type deepInput = {
  *
  * @returns Deeply sealed object
  */
-export default function deepSeal(obj: deepInput): deepInput;
+export default function deepSeal<T extends deepInput>(obj: T): Sealed<T>;
 export {};

package/deep/set.js

@@ -9,7 +9,7 @@ function deepSet(obj, path, value, define = false) {
     if (/__proto__|constructor|prototype/.test(path))
         throw new TypeError('Malicious path provided');
     const path_s = path.trim();
-    if (path_s.length === 0)
+    if (!path_s.length)
         throw new TypeError('No path was given');
     const parts = path_s
         .replace(/\[/g, '.')

package/equal.js

@@ -23,21 +23,17 @@ function isObjectEqual(a, b) {
     return true;
 }
 function equal(a, b) {
-    if (a instanceof Date &&
-        b instanceof Date)
-        return a.valueOf() === b.valueOf();
-    if (Object.prototype.toString.call(a) === '[object RegExp]' &&
-        Object.prototype.toString.call(b) === '[object RegExp]')
-        return String(a) === String(b);
-    if (Array.isArray(a) &&
-        Array.isArray(b))
-        return isArrayEqual(a, b);
-    if (Object.prototype.toString.call(a) === '[object Object]' &&
-        Object.prototype.toString.call(b) === '[object Object]')
-        return isObjectEqual(a, b);
-    if ((0, isNumericalNaN_1.default)(a)) {
-        return (0, isNumericalNaN_1.default)(b);
+    if (a instanceof Date)
+        return b instanceof Date && a.valueOf() === b.valueOf();
+    if (a instanceof RegExp)
+        return b instanceof RegExp && String(a) === String(b);
+    if (Array.isArray(a))
+        return Array.isArray(b) && isArrayEqual(a, b);
+    if (Object.prototype.toString.call(a) === '[object Object]') {
+        return Object.prototype.toString.call(b) === '[object Object]' && isObjectEqual(a, b);
     }
+    if ((0, isNumericalNaN_1.default)(a))
+        return (0, isNumericalNaN_1.default)(b);
     return a === b;
 }
 exports.default = equal;

package/hash/fnv1A.js

@@ -18,7 +18,7 @@ function fnv1A(data, offset = FNV_32) {
     else if (Array.isArray(data) || Object.prototype.toString.call(data) === '[object Object]') {
         sanitized = JSON.stringify(data);
     }
-    else if (Object.prototype.toString.call(data) === '[object RegExp]') {
+    else if (data instanceof RegExp) {
         sanitized = data.toString();
     }
     else if (data instanceof Date) {

package/index.d.ts

@@ -232,7 +232,7 @@ declare module "caching/memoize" {
     export default function memoize(fn: Function, resolver?: Function): Function;
 }
 declare module "date/addUTC" {
-    export default function addUTC(val: Date, amount?: number, key?: 'years' | 'year' | 'months' | 'month' | 'days' | 'day' | 'hours' | 'hour' | 'minutes' | 'minute' | 'seconds' | 'second' | 'milliseconds' | 'millisecond'): Date;
+    export default function addUTC(val: Date, amt?: number, key?: 'years' | 'year' | 'months' | 'month' | 'days' | 'day' | 'hours' | 'hour' | 'minutes' | 'minute' | 'seconds' | 'second' | 'milliseconds' | 'millisecond'): Date;
 }
 declare module "date/diff" {
     export default function diff(val_a: Date, val_b: Date, key?: 'week' | 'weeks' | 'day' | 'days' | 'hour' | 'hours' | 'minute' | 'minutes' | 'second' | 'seconds' | 'millisecond' | 'milliseconds'): number;
@@ -240,6 +240,9 @@ declare module "date/diff" {
 declare module "date/endOfUTC" {
     export default function endOfUTC(val: Date, key?: 'year' | 'quarter' | 'month' | 'week' | 'week_sun' | 'week_mon' | 'week_tue' | 'week_wed' | 'week_thu' | 'week_fri' | 'week_sat' | 'day' | 'hour' | 'minute' | 'second' | 'millisecond'): Date;
 }
+declare module "date/format" {
+    export default function format(val: Date, spec: string, locale?: string, zone?: string): string;
+}
 declare module "date/nowUnix" {
     export default function nowUnix(): number;
 }
@@ -261,7 +264,10 @@ declare module "deep/freeze" {
     } | {
         [key: string]: any;
     }[] | any[];
-    export default function deepFreeze(obj: deepInput): Readonly<deepInput>;
+    type Frozen<T> = {
+        readonly [K in keyof T]: Frozen<T[K]>;
+    };
+    export default function deepFreeze<T extends deepInput>(obj: T): Frozen<T>;
 }
 declare module "deep/get" {
     export default function deepGet(obj: {
@@ -276,7 +282,10 @@ declare module "deep/seal" {
     } | {
         [key: string]: any;
     }[] | any[];
-    export default function deepSeal(obj: deepInput): deepInput;
+    type Sealed<T> = {
+        [K in keyof T]: Sealed<T[K]>;
+    };
+    export default function deepSeal<T extends deepInput>(obj: T): Sealed<T>;
 }
 declare module "deep/set" {
     export default function deepSet(obj: {

package/object/merge.js

@@ -7,10 +7,7 @@ function merge(target, source = {}) {
         throw new TypeError('Please pass a target and object to merge');
     const acc = {};
     for (const key in target) {
-        if (!Object.prototype.hasOwnProperty.call(target, key))
-            continue;
         if (Object.prototype.toString.call(target[key]) === PROTO_OBJ &&
-            Object.prototype.hasOwnProperty.call(source, key) &&
             Object.prototype.toString.call(source[key]) === PROTO_OBJ) {
             acc[key] = merge(target[key], source[key]);
         }

package/object/pick.js

@@ -5,7 +5,7 @@ const set_1 = require("../deep/set");
 function pick(obj, keys) {
     if (Object.prototype.toString.call(obj) !== '[object Object]' ||
         !Array.isArray(keys) ||
-        keys.length === 0)
+        !keys.length)
         throw new TypeError('Please pass an object to pick from and a keys array');
     const map = {};
     let val;
@@ -14,7 +14,7 @@ function pick(obj, keys) {
         if (typeof key !== 'string')
             continue;
         sanitized = key.trim();
-        if (sanitized.length === 0)
+        if (!sanitized.length)
             continue;
         if (/(\.|\[)/g.test(sanitized)) {
             val = (0, get_1.default)(obj, sanitized);

package/package.json

@@ -1 +1 @@
-{ "name": "@valkyriestudios/utils", "version": "11.6.0", "description": "A collection of single-function utilities for common tasks", "author": { "name": "Peter Vermeulen", "email": "contact@valkyriestudios.be", "url": "www.valkyriestudios.be" }, "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.0.0", "description": "A collection of single-function utilities for common tasks", "author": { "name": "Peter Vermeulen", "email": "contact@valkyriestudios.be", "url": "www.valkyriestudios.be" }, "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/is.js

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 function isRegExp(val) {
-    return Object.prototype.toString.call(val) === '[object RegExp]';
+    return val instanceof RegExp;
 }
 exports.default = isRegExp;

package/string/humanizeBytes.js

@@ -8,13 +8,13 @@ function humanizeBytes(val, options = {}) {
         delim: has_opts && typeof options.delim === 'string'
             ? options.delim
             : ',',
-        separator: has_opts && typeof options.separator === 'string' && options.separator.trim().length > 0
+        separator: has_opts && typeof options.separator === 'string' && options.separator.trim().length
             ? options.separator
             : '.',
         precision: has_opts && Number.isInteger(options.precision) && options.precision >= 0
             ? options.precision
             : 2,
-        units: has_opts && Array.isArray(options.units) && options.units.length > 0
+        units: has_opts && Array.isArray(options.units) && options.units.length
             ? options.units.filter(el => (0, isNotEmpty_1.default)(el))
             : [' bytes', ' KB', ' MB', ' GB', ' TB', ' PB', ' EB', ' ZB', ' YB'],
         divider: 1024,

package/string/humanizeNumber.js

@@ -9,13 +9,13 @@ function humanizeNumber(val, options = {}) {
         delim: has_opts && typeof options.delim === 'string'
             ? options.delim
             : ',',
-        separator: has_opts && typeof options.separator === 'string' && options.separator.trim().length > 0
+        separator: has_opts && typeof options.separator === 'string' && options.separator.trim().length
             ? options.separator
             : '.',
         precision: has_opts && Number.isInteger(options.precision) && options.precision >= 0
             ? options.precision
             : 2,
-        units: has_opts && ((Array.isArray(options.units) && options.units.length > 0) || options.units === false)
+        units: has_opts && ((Array.isArray(options.units) && options.units.length) || options.units === false)
             ? options.units ? options.units.filter(is_2.default) : false
             : ['', 'k', 'm', 'b', 't', 'q'],
         divider: has_opts && Number.isInteger(options.divider) && options.divider > 1
@@ -33,18 +33,15 @@ function humanizeNumber(val, options = {}) {
         normalized = typeof val === 'string' ? parseFloat(val) : Number.isFinite(val) ? val : 0;
     }
     if (!Number.isFinite(normalized) || normalized === 0) {
-        return `0${Array.isArray(OPTS.units) && OPTS.units.length > 0 ? OPTS.units[0] : ''}`;
+        return `0${Array.isArray(OPTS.units) && OPTS.units.length ? OPTS.units[0] : ''}`;
     }
     const sign = normalized < 0 ? '-' : '';
     normalized = Math.abs(normalized);
     let postfix = '';
-    if (Array.isArray(OPTS.units) && OPTS.units.length > 0) {
+    if (Array.isArray(OPTS.units) && OPTS.units.length) {
         let unit_ix = 0;
-        while (normalized >= OPTS.divider) {
-            unit_ix++;
-            normalized = normalized / OPTS.divider;
-            if (unit_ix === OPTS.units.length - 1)
-                break;
+        for (unit_ix; normalized >= OPTS.divider && unit_ix < OPTS.units.length - 1; unit_ix++) {
+            normalized /= OPTS.divider;
         }
         postfix = OPTS.units[unit_ix];
     }