@valkyriestudios/utils 11.7.0 → 12.1.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

@@ -1,19 +1,13 @@
 'use strict';
 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))
         return [];
     const set = new Set();
-    const acc = [];
-    let hash;
     for (const item of val) {
-        hash = (0, fnv1A_1.default)(item);
-        if (set.has(hash))
-            continue;
-        set.add(hash);
-        acc.push(item);
+        if (!set.has(item))
+            set.add(item);
     }
-    return acc;
+    return [...set];
 }
 exports.default = dedupe;

package/array/join.d.ts

@@ -27,8 +27,8 @@ interface joinOptions {
 /**
  * Join an array of values while autofiltering any non-string/non-number elements
  *
- * @param val - Array of values to join
- * @param opts - Join options
+ * @param {unknown[]} val - Array of values to join
+ * @param {joinOptions?} opts - Join options
  *
  * @returns Joined array as string
  */

package/array/join.js

@@ -1,24 +1,32 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const round_1 = require("../number/round");
-function join(val, opts = {}) {
-    if (!Array.isArray(val) || val.length === 0)
+function join(val, opts) {
+    if (!Array.isArray(val) || !val.length)
         return '';
-    const OPTS = {
-        delim: ' ',
-        trim: true,
-        valtrim: true,
-        ...Object.prototype.toString.call(opts) === '[object Object]' ? opts : {},
-    };
+    let DELIM = ' ';
+    let TRIM = true;
+    let VALTRIM = true;
+    let VALROUND = false;
+    if (opts && Object.prototype.toString.call(opts) === '[object Object]') {
+        if (typeof opts.delim === 'string')
+            DELIM = opts.delim;
+        if (opts.trim === false)
+            TRIM = opts.trim;
+        if (opts.valtrim === false)
+            VALTRIM = opts.valtrim;
+        if (Number.isInteger(opts.valround) && opts.valround >= 0)
+            VALROUND = opts.valround;
+    }
     const filtered = [];
     for (const el of val) {
-        if (typeof el === 'string' && el.trim().length > 0) {
-            filtered.push(OPTS.valtrim === true ? el.trim() : el);
+        if (typeof el === 'string' && el.trim().length) {
+            filtered.push(VALTRIM ? el.trim() : el);
         }
         else if (Number.isFinite(el)) {
-            filtered.push(Number.isFinite(OPTS.valround) ? (0, round_1.default)(el, OPTS.valround) : el);
+            filtered.push(VALROUND !== false ? (0, round_1.default)(el, VALROUND) : el);
         }
     }
-    return OPTS.trim === true ? filtered.join(OPTS.delim).trim() : filtered.join(OPTS.delim);
+    return TRIM ? filtered.join(DELIM).trim() : filtered.join(DELIM);
 }
 exports.default = join;

package/array/mapFn.d.ts

@@ -12,11 +12,10 @@ interface mapOptions {
      */
     merge?: boolean;
 }
-interface kvMap {
-    [key: string]: {
-        [key: string]: any;
-    };
-}
+type mapFn = (entry: {
+    [key: string]: any;
+}) => (string | number | boolean);
+type mapReturn = Record<string, Record<string, any>>;
 /**
  * Map an object array into a kv-object through a function that generates a key. Returning a non-string,
  * non-numeric value from the function (eg: false) will filter out the object.
@@ -26,15 +25,11 @@ interface kvMap {
  * Output:
  *  {12: {uid: 12, name: 'Peter'}, 15: {uid: 15, name: 'Jonas'}}
  *
- * @param val - Array to map
- * @param fn - Handler function which is run for each of the objects and should return a string or number
- * @param opts - Options object to override built-in defaults
+ * @param {Record<string, any>[]} val - Array to map
+ * @param {mapFn} fn - Handler function which is run for each of the objects and should return a string or number
+ * @param {mapOptions?} opts - Options object to override built-in defaults
  *
- * @returns KV-Map object
+ * @returns {mapReturn} KV-Map object
  */
-export default function mapFn(arr: {
-    [key: string]: any;
-}[], fn: (entry: {
-    [key: string]: any;
-}) => (string | number | boolean), opts?: mapOptions): kvMap;
+export default function mapFn(arr: Record<string, any>[], fn: mapFn, opts?: mapOptions): mapReturn;
 export {};

package/array/mapFn.js

@@ -1,28 +1,24 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-function mapFn(arr, fn, opts = {}) {
-    if ((!Array.isArray(arr) || arr.length === 0) ||
+function mapFn(arr, fn, opts) {
+    if ((!Array.isArray(arr) || !arr.length) ||
         typeof fn !== 'function')
         return {};
-    const OPTS = {
-        merge: false,
-        ...Object.prototype.toString.call(opts) === '[object Object]' ? opts : {},
-    };
+    let MERGE = false;
+    if (opts && Object.prototype.toString.call(opts) === '[object Object]') {
+        if (opts.merge === true)
+            MERGE = true;
+    }
     const map = {};
     let hash = false;
     for (const el of arr) {
         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)) {
-            map[hash] = { ...map[hash], ...el };
-        }
-        else {
-            map[hash] = el;
-        }
+        map[hash] = MERGE && map.hasOwnProperty(hash) ? { ...map[hash], ...el } : el;
     }
     return map;
 }

package/array/mapKey.d.ts

@@ -12,11 +12,7 @@ interface mapOptions {
      */
     merge?: boolean;
 }
-interface kvMap {
-    [key: string]: {
-        [key: string]: any;
-    };
-}
+type kvMap = Record<string, Record<string, any>>;
 /**
  * Map an object array into a kv-object by passing a common key that exists on the objects. Objects for
  * which the key doesn't exist will be filtered out automatically
@@ -26,13 +22,11 @@ interface kvMap {
  * Output:
  *  {12: {uid: 12, name: 'Peter'}, 15: {uid: 15, name: 'Jonas'}}
  *
- * @param val - Array to map
- * @param key - Key to map by
- * @param opts - Options object to override built-in defaults
+ * @param {Record<string,any>[]} val - Array to map
+ * @param {string} key - Key to map by
+ * @param {mapOptions?} opts - Options object to override built-in defaults
  *
- * @returns KV-Map object
+ * @returns {kvMap} KV-Map object
  */
-export default function mapKey(arr: {
-    [key: string]: any;
-}[], key: string, opts?: mapOptions): kvMap;
+export default function mapKey(arr: Record<string, any>[], key: string, opts?: mapOptions): kvMap;
 export {};

package/array/mapKey.js

@@ -1,27 +1,23 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-function mapKey(arr, key, opts = {}) {
-    if ((!Array.isArray(arr) || arr.length === 0) ||
+function mapKey(arr, key, opts) {
+    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,
-        ...Object.prototype.toString.call(opts) === '[object Object]' ? opts : {},
-    };
+    let MERGE = false;
+    if (opts && Object.prototype.toString.call(opts) === '[object Object]') {
+        if (opts.merge === true)
+            MERGE = true;
+    }
     const map = {};
     for (const el of arr) {
         if (Object.prototype.toString.call(el) !== '[object Object]' ||
             !Object.prototype.hasOwnProperty.call(el, key_s))
             continue;
-        if (OPTS.merge === true && map.hasOwnProperty(el[key_s])) {
-            map[el[key_s]] = { ...map[el[key_s]], ...el };
-        }
-        else {
-            map[el[key_s]] = el;
-        }
+        map[el[key_s]] = MERGE && map.hasOwnProperty(el[key_s]) ? { ...map[el[key_s]], ...el } : el;
     }
     return map;
 }

package/array/mapPrimitive.d.ts

@@ -19,9 +19,7 @@ interface mapOptions {
      */
     keyround?: boolean;
 }
-interface mapReturn {
-    [key: string]: string | number;
-}
+type mapReturn = Record<string, string | number>;
 /**
  * Map an array of primitive values (numbers/strings) into a kv-object
  * non-numeric and non-string values will be filtered out
@@ -31,10 +29,10 @@ interface mapReturn {
  * Output:
  *  {hello: 'hello', foo: 'foo', bar: 'bar'}
  *
- * @param val - Array to map
- * @param opts - Options object to override built-in defaults
+ * @param {unknown[]} val - Array to map
+ * @param {mapOptions?} opts - Options object to override built-in defaults
  *
- * @returns KV-Map object
+ * @returns {mapReturn} KV-Map object
  */
 export default function mapPrimitive(arr: unknown[], opts?: mapOptions): mapReturn;
 export {};

package/array/mapPrimitive.js

@@ -1,26 +1,35 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const round_1 = require("../number/round");
-function mapPrimitive(arr, opts = {}) {
-    if (!Array.isArray(arr) || arr.length === 0)
+function mapPrimitive(arr, opts) {
+    if (!Array.isArray(arr) || !arr.length)
         return {};
-    const OPTS = {
-        valtrim: false,
-        valround: false,
-        keyround: false,
-        ...Object.prototype.toString.call(opts) === '[object Object]' ? opts : {},
-    };
+    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 map = {};
     for (const el of arr) {
-        if (typeof el === 'string' && el.trim().length > 0) {
-            map[el.trim()] = OPTS.valtrim ? el.trim() : el;
+        if (typeof el === 'string') {
+            const trimmed = el.trim();
+            if (!trimmed.length)
+                continue;
+            map[trimmed] = VALTRIM ? trimmed : el;
         }
         else if (typeof el === 'number' && Number.isFinite(el)) {
-            map[`${OPTS.keyround === true ? Math.round(el) : el}`] = OPTS.valround === false
+            map[`${KEYROUND ? Math.round(el) : el}`] = VALROUND === false
                 ? el
-                : OPTS.valround === true
+                : VALROUND === true
                     ? Math.round(el)
-                    : (0, round_1.default)(el, OPTS.valround);
+                    : (0, round_1.default)(el, VALROUND);
         }
     }
     return map;

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))
         return;
     for (let i = arr.length - 1; i > 0; i--) {
         const j = Math.floor(Math.random() * (i + 1));

package/array/sort.js

@@ -1,6 +1,5 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-const is_1 = require("../boolean/is");
 const isNotEmpty_1 = require("../object/isNotEmpty");
 function partition(arr, start_ix, end_ix) {
     const pivot_val = arr[Math.floor((start_ix + end_ix) / 2)].t;
@@ -29,27 +28,32 @@ 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)
+function sort(arr, by, dir = 'asc', opts) {
+    if (!Array.isArray(arr) || !arr.length)
         return [];
     if (dir !== 'asc' && dir !== 'desc')
         throw new Error('Direction should be either asc or desc');
-    const has_opts = Object.prototype.toString.call(opts) === '[object Object]';
-    const OPTS = {
-        filter_fn: has_opts && typeof opts.filter_fn === 'function'
-            ? el => (0, isNotEmpty_1.default)(el) && opts.filter_fn(el)
-            : isNotEmpty_1.default,
-        nokey_hide: has_opts && (0, is_1.default)(opts.nokey_hide) ? opts.nokey_hide : false,
-        nokey_atend: has_opts && (0, is_1.default)(opts.nokey_atend) ? opts.nokey_atend : true,
-    };
+    let NOKEY_HIDE = false;
+    let NOKEY_AT_END = true;
+    let FILTER_FN = isNotEmpty_1.default;
+    if (opts && Object.prototype.toString.call(opts) === '[object Object]') {
+        if (opts.nokey_hide === true)
+            NOKEY_HIDE = true;
+        if (opts.nokey_atend === false)
+            NOKEY_AT_END = false;
+        if (typeof opts.filter_fn === 'function') {
+            const fn = opts.filter_fn;
+            FILTER_FN = el => (0, isNotEmpty_1.default)(el) && fn(el);
+        }
+    }
     const prepared_arr = [];
     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))
+            if (!FILTER_FN(el))
                 continue;
             if (!Object.prototype.hasOwnProperty.call(el, by_s) || el[by_s] === undefined) {
                 nokey_arr.push(el);
@@ -62,7 +66,7 @@ function sort(arr, by, dir = 'asc', opts = {}) {
     else if (typeof by === 'function') {
         let key;
         for (const el of arr) {
-            if (!OPTS.filter_fn(el))
+            if (!FILTER_FN(el))
                 continue;
             key = by(el);
             if (key === undefined) {
@@ -80,11 +84,11 @@ function sort(arr, by, dir = 'asc', opts = {}) {
     if (dir === 'desc')
         prepared_arr.reverse();
     const result = [];
-    if (OPTS.nokey_hide) {
+    if (NOKEY_HIDE) {
         for (const obj of prepared_arr)
             result.push(obj.el);
     }
-    else if (OPTS.nokey_atend) {
+    else if (NOKEY_AT_END) {
         for (const obj of prepared_arr)
             result.push(obj.el);
         for (const el of nokey_arr)

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;