atomic-fns 1.1.6 → 1.2.0

package/dist/i18n/date/utils.d.ts

@@ -1,4 +1,4 @@
-export declare type DateObject = {
+export interface DateObject {
     year?: number;
     month?: number;
     day?: number;
@@ -7,7 +7,7 @@ export declare type DateObject = {
     minute?: number;
     second?: number;
     millisecond?: number;
-};
+}
 /**
  * Returns the minimum (most distant past) of the given date values.
  * @template T
@@ -51,11 +51,10 @@ export declare function parseISODuration(s: any): any;
 export declare function weeksInYear(year: number, firstDayOfWeek?: number, firstDayOfYear?: number): number;
 /**
  * Returns the week of the year for the specified date
- * @param year
- * @param dayOfYear
- * @param firstDayOfWeek
- * @param firstDayOfYear
- * @returns
+ * @param date The date value
+ * @param firstDayOfWeek The weekday a week starts on, where Sunday is 0
+ * @param firstDayOfYear Picks week 1: the week holding January `7 + firstDayOfWeek - firstDayOfYear`, so `1, 4` gives ISO weeks
+ * @returns The week and the year that week belongs to
  */
 export declare function weekOfYear(date: string | number | Date, firstDayOfWeek?: number, firstDayOfYear?: number): {
     week: any;

package/dist/i18n/date/utils.js

@@ -1,3 +1,4 @@
+import { asDate } from '../format.js';
 /**
  * Returns x % n but takes the sign of n instead of x
  * @param x
@@ -7,28 +8,13 @@
 function floorMod(x, n) {
     return x - n * Math.floor(x / n);
 }
-function padStart(input, n = 2) {
-    const isNeg = input < 0;
-    let padded;
-    if (isNeg) {
-        padded = '-' + ('' + -input).padStart(n, '0');
-    }
-    else {
-        padded = ('' + input).padStart(n, '0');
-    }
-    return padded;
-}
-function parseInteger(str) {
-    if (str != null && str !== '')
-        return parseInt(str, 10);
-}
 function parseFloating(str) {
     if (str != null && str !== '')
         return parseFloat(str);
 }
 function parseMilliseconds(str) {
     if (str != null && str !== '') {
-        const f = parseFloat('0.' + str) * 1000;
+        const f = parseFloat(`0.${str}`) * 1000;
         return Math.floor(f);
     }
 }
@@ -39,7 +25,7 @@ export function minDate(...dates) {
         ans = ans[0];
     }
     for (let i = 1; i < dates.length; i++) {
-        if (dates[i].valueOf() < ans.valueOf()) {
+        if (dates[i].valueOf() < ans.valueOf() || Number.isNaN(ans.valueOf())) {
             ans = dates[i];
         }
     }
@@ -52,7 +38,7 @@ export function maxDate(...dates) {
         ans = ans[0];
     }
     for (let i = 1; i < dates.length; i++) {
-        if (dates[i].valueOf() > ans.valueOf()) {
+        if (dates[i].valueOf() > ans.valueOf() || Number.isNaN(ans.valueOf())) {
             ans = dates[i];
         }
     }
@@ -80,7 +66,7 @@ export function daysInYear(year) {
  * @returns {number} Number of days in month
  */
 export function daysInMonth(date) {
-    const d = new Date(date), year = d.getFullYear(), month = d.getMonth() + 1;
+    const d = asDate(date), year = d.getFullYear(), month = d.getMonth() + 1;
     const modMonth = floorMod(month - 1, 12) + 1, modYear = year + (month - modMonth) / 12;
     if (modMonth === 2) {
         return isLeapYear(modYear) ? 29 : 28;
@@ -89,51 +75,6 @@ export function daysInMonth(date) {
         return [31, null, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][modMonth - 1];
     }
 }
-// covert a calendar object to a local timestamp (epoch, but with the offset baked in)
-function objToLocalTS(obj) {
-    let d = Date.UTC(obj.year, obj.month - 1, obj.day, obj.hour, obj.minute, obj.second, obj.millisecond);
-    // for legacy reasons, years between 0 and 99 are interpreted as 19XX; revert that
-    if (obj.year < 100 && obj.year >= 0) {
-        let dt = new Date(d);
-        dt.setUTCFullYear(dt.getUTCFullYear() - 1900);
-        d = dt.getTime();
-    }
-    return +d;
-}
-function untruncateYear(year) {
-    if (year > 99) {
-        return year;
-    }
-    else
-        return year > 60 ? 1900 + year : 2000 + year;
-}
-// PARSING
-function parseZoneInfo(ts, offsetFormat, locale, timeZone) {
-    const date = new Date(ts), intlOpts = {
-        hourCycle: 'h23',
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit',
-        hour: '2-digit',
-        minute: '2-digit',
-        timeZone,
-        timeZoneName: offsetFormat
-    };
-    const parsed = new Intl.DateTimeFormat(locale, intlOpts)
-        .formatToParts(date)
-        .find((m) => m.type === 'timeZoneName');
-    return parsed?.value;
-}
-// signedOffset('-5', '30') -> -330
-function signedOffset(offHourStr, offMinuteStr) {
-    let offHour = parseInt(offHourStr, 10);
-    // don't || this because we want to preserve -0
-    if (Number.isNaN(offHour)) {
-        offHour = 0;
-    }
-    const offMin = parseInt(offMinuteStr, 10) || 0, offMinSigned = offHour < 0 || Object.is(offHour, -0) ? -offMin : offMin;
-    return offHour * 60 + offMinSigned;
-}
 // COERCION
 export function asNumber(value) {
     const numericValue = Number(value);
@@ -141,24 +82,6 @@ export function asNumber(value) {
         throw new Error(`Invalid unit value ${value}`);
     return numericValue;
 }
-function formatOffset(offset, format) {
-    const hours = Math.trunc(Math.abs(offset / 60)), minutes = Math.trunc(Math.abs(offset % 60)), sign = offset >= 0 ? '+' : '-';
-    switch (format) {
-        case 'short':
-            return `${sign}${padStart(hours, 2)}:${padStart(minutes, 2)}`;
-        case 'narrow':
-            return `${sign}${hours}${minutes > 0 ? `:${minutes}` : ''}`;
-        case 'techie':
-            return `${sign}${padStart(hours, 2)}${padStart(minutes, 2)}`;
-        default:
-            throw new RangeError(`Value format ${format} is out of range for property format`);
-    }
-}
-function timeObject(obj) {
-    const { hour, minute, second, millisecond } = obj;
-    return { hour, minute, second, millisecond };
-}
-const ianaRegex = /[A-Za-z_+-]{1,256}(?::?\/[A-Za-z0-9_+-]{1,256}(?:\/[A-Za-z0-9_+-]{1,256})?)?/;
 const isoDuration = /^-?P(?:(?:(-?\d{1,20}(?:\.\d{1,20})?)Y)?(?:(-?\d{1,20}(?:\.\d{1,20})?)M)?(?:(-?\d{1,20}(?:\.\d{1,20})?)W)?(?:(-?\d{1,20}(?:\.\d{1,20})?)D)?(?:T(?:(-?\d{1,20}(?:\.\d{1,20})?)H)?(?:(-?\d{1,20}(?:\.\d{1,20})?)M)?(?:(-?\d{1,20})(?:[.,](-?\d{1,20}))?S)?)?)$/;
 function extractISODuration(match) {
     const [s, yearStr, monthStr, weekStr, dayStr, hourStr, minuteStr, secondStr, millisecondsStr] = match;
@@ -197,16 +120,15 @@ function createUTCDate(...args) {
     let date, y = args[0];
     // the Date.UTC function remaps years 0-99 to 1900-1999
     if (y < 100 && y >= 0) {
-        args = Array.from(arguments);
         // preserve leap years using a full 400 year cycle, then reset
         args[0] = y + 400;
         date = new Date(Date.UTC.apply(null, args));
-        if (isFinite(date.getUTCFullYear())) {
+        if (Number.isFinite(date.getUTCFullYear())) {
             date.setUTCFullYear(y);
         }
     }
     else {
-        date = new Date(Date.UTC.apply(null, arguments));
+        date = new Date(Date.UTC.apply(null, args));
     }
     return date;
 }
@@ -217,26 +139,6 @@ function firstWeekOffset(year, dow, doy) {
     fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
     return -fwdlw + fwd - 1;
 }
-// https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
-function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
-    var localWeekday = (7 + weekday - dow) % 7, weekOffset = firstWeekOffset(year, dow, doy), dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset, resYear, resDayOfYear;
-    if (dayOfYear <= 0) {
-        resYear = year - 1;
-        resDayOfYear = daysInYear(resYear) + dayOfYear;
-    }
-    else if (dayOfYear > daysInYear(year)) {
-        resYear = year + 1;
-        resDayOfYear = dayOfYear - daysInYear(year);
-    }
-    else {
-        resYear = year;
-        resDayOfYear = dayOfYear;
-    }
-    return {
-        year: resYear,
-        dayOfYear: resDayOfYear
-    };
-}
 /**
  * Returns the number of weeks in the specified year.
  * @param year
@@ -249,14 +151,13 @@ export function weeksInYear(year, firstDayOfWeek = 1, firstDayOfYear = 1) {
 }
 /**
  * Returns the week of the year for the specified date
- * @param year
- * @param dayOfYear
- * @param firstDayOfWeek
- * @param firstDayOfYear
- * @returns
+ * @param date The date value
+ * @param firstDayOfWeek The weekday a week starts on, where Sunday is 0
+ * @param firstDayOfYear Picks week 1: the week holding January `7 + firstDayOfWeek - firstDayOfYear`, so `1, 4` gives ISO weeks
+ * @returns The week and the year that week belongs to
  */
 export function weekOfYear(date, firstDayOfWeek = 1, firstDayOfYear = 1) {
-    const year = new Date(date).getFullYear();
+    const year = asDate(date).getFullYear();
     const doy = dayOfYear(date);
     let weekOffset = firstWeekOffset(year, firstDayOfWeek, firstDayOfYear), week = Math.floor((doy - weekOffset - 1) / 7) + 1, resWeek, resYear;
     if (week < 1) {
@@ -280,11 +181,12 @@ export function isoWeeksInYear(year) {
     return weeksInYear(year, 1, 4);
 }
 export function dayOfYear(input) {
-    input = new Date(input);
+    input = asDate(input);
     input.setHours(0);
     input.setMinutes(0);
     input.setSeconds(0);
     input.setMilliseconds(0);
-    let start = new Date(input.getFullYear(), 0, 1, 0, 0, 0, 0);
+    const start = new Date(input);
+    start.setMonth(0, 1);
     return Math.round((+input - start.getTime()) / 864e5) + 1;
 }

package/dist/i18n/duration.d.ts

@@ -1,4 +1,4 @@
-export declare type DurationUnit = 'year' | 'years' | 'quarter' | 'quarters' | 'month' | 'months' | 'week' | 'weeks' | 'day' | 'days' | 'hour' | 'hours' | 'minute' | 'minutes' | 'second' | 'seconds' | 'millisecond' | 'milliseconds';
+export type DurationUnit = 'year' | 'years' | 'quarter' | 'quarters' | 'month' | 'months' | 'week' | 'weeks' | 'day' | 'days' | 'hour' | 'hours' | 'minute' | 'minutes' | 'second' | 'seconds' | 'millisecond' | 'milliseconds';
 export interface TDuration {
     years?: number;
     months?: number;
@@ -14,6 +14,7 @@ export declare class Duration {
     values: TDuration;
     private matrix;
     constructor(dur?: number | TDuration | Duration, exact?: boolean);
+    private withValues;
     /** Get the years. */
     get years(): number;
     /** Get the months. */
@@ -24,7 +25,7 @@ export declare class Duration {
     get days(): number;
     /** Get the hours. */
     get hours(): number;
-    /** et the minutes. */
+    /** Get the minutes. */
     get minutes(): number;
     /** Get the seconds. */
     get seconds(): number;
@@ -33,19 +34,19 @@ export declare class Duration {
     /**
      * Get the value of unit.
      * @param {string} unit - a unit such as 'minute' or 'day'
-     * @example Duration.fromObject({years: 2, days: 3}).get('years') // 2
-     * @example Duration.fromObject({years: 2, days: 3}).get('months') // 0
-     * @example Duration.fromObject({years: 2, days: 3}).get('days') // 3
+     * @example new Duration({years: 2, days: 3}).get('years') // 2
+     * @example new Duration({years: 2, days: 3}).get('months') // 0
+     * @example new Duration({years: 2, days: 3}).get('days') // 3
      * @return {number}
      */
-    get(unit: any): any;
+    get(unit: string): number;
     add(duration: TDuration): Duration;
     /**
      * Make this Duration shorter by the specified amount. Return a newly-constructed Duration.
      * @param {Duration|Object|number} duration - The amount to subtract.
      * @return {Duration}
      */
-    subtract(duration: any): Duration;
+    subtract(duration: Duration | TDuration | number): Duration;
     /**
      * Return the negative of this Duration.
      * @example
@@ -85,11 +86,11 @@ export declare class Duration {
     /**
      * Returns an ISO 8601-compliant string representation of this Duration.
      * @see https://en.wikipedia.org/wiki/ISO_8601#Durations
-     * @example Duration.fromObject({ years: 3, seconds: 45 }).toString() // 'P3YT45S'
-     * @example Duration.fromObject({ months: 4, seconds: 45 }).toString() // 'P4MT45S'
-     * @example Duration.fromObject({ months: 5 }).toString() // 'P5M'
-     * @example Duration.fromObject({ minutes: 5 }).toString() // 'PT5M'
-     * @example Duration.fromObject({ milliseconds: 6 }).toString() // 'PT0.006S'
+     * @example new Duration({ years: 3, seconds: 45 }).toString() // 'P3YT45S'
+     * @example new Duration({ months: 4, seconds: 45 }).toString() // 'P4MT45S'
+     * @example new Duration({ months: 5 }).toString() // 'P5M'
+     * @example new Duration({ minutes: 5 }).toString() // 'PT5M'
+     * @example new Duration({ milliseconds: 6 }).toString() // 'PT0.006S'
      * @return {string}
      */
     toISOString(): string;

package/dist/i18n/duration.js

@@ -115,23 +115,26 @@ const orderedUnits = [
 ];
 const reverseUnits = orderedUnits.slice(0).reverse();
 export class Duration {
-    values;
+    values = {};
     matrix = casualMatrix;
     constructor(dur = {}, exact = false) {
         if (dur instanceof Duration) {
             this.values = { ...dur.values };
         }
-        else if (isNumber(dur)) {
+        else if (typeof dur === 'number') {
             this.values = { milliseconds: dur };
         }
         else if (isObject(dur)) {
             this.values = normalizeUnits(dur);
         }
-        if (exact) {
+        if (exact || (dur instanceof Duration && dur.matrix === exactMatrix)) {
             // Set the conversion matrix to use
             this.matrix = exactMatrix;
         }
     }
+    withValues(values) {
+        return new Duration(values, this.matrix === exactMatrix);
+    }
     /** Get the years. */
     get years() {
         return this.values.years || 0;
@@ -152,7 +155,7 @@ export class Duration {
     get hours() {
         return this.values.hours || 0;
     }
-    /** et the minutes. */
+    /** Get the minutes. */
     get minutes() {
         return this.values.minutes || 0;
     }
@@ -167,13 +170,13 @@ export class Duration {
     /**
      * Get the value of unit.
      * @param {string} unit - a unit such as 'minute' or 'day'
-     * @example Duration.fromObject({years: 2, days: 3}).get('years') // 2
-     * @example Duration.fromObject({years: 2, days: 3}).get('months') // 0
-     * @example Duration.fromObject({years: 2, days: 3}).get('days') // 3
+     * @example new Duration({years: 2, days: 3}).get('years') // 2
+     * @example new Duration({years: 2, days: 3}).get('months') // 0
+     * @example new Duration({years: 2, days: 3}).get('days') // 3
      * @return {number}
      */
     get(unit) {
-        return this[UNITS_PLURAL[unit.toLowerCase()]];
+        return this.values[UNITS_PLURAL[unit.toLowerCase()]] ?? 0;
     }
     add(duration) {
         const dur = new Duration(duration);
@@ -183,7 +186,7 @@ export class Duration {
                 result[k] = dur.get(k) + this.get(k);
             }
         }
-        return new Duration(result);
+        return this.withValues(result);
     }
     /**
      * Make this Duration shorter by the specified amount. Return a newly-constructed Duration.
@@ -208,7 +211,7 @@ export class Duration {
         for (const k of Object.keys(this.values)) {
             negated[k] = this.values[k] === 0 ? 0 : -this.values[k];
         }
-        return new Duration(negated);
+        return this.withValues(negated);
     }
     /**
      * Return the absolute values of this Duration.
@@ -224,7 +227,7 @@ export class Duration {
         for (const k of Object.keys(this.values)) {
             parts[k] = Math.abs(this.values[k]);
         }
-        return new Duration(parts);
+        return this.withValues(parts);
     }
     shiftToAll() {
         return this.shiftTo('years', 'months', 'weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds');
@@ -273,59 +276,61 @@ export class Duration {
                     key === lastUnit ? accumulated[key] : accumulated[key] / this.matrix[lastUnit][key];
             }
         }
-        return new Duration(built);
+        return this.withValues(built);
     }
     total(unit) {
         return this.shiftTo(unit).get(unit);
     }
     exact(unit) {
+        if (unit)
+            return new Duration(this, true).total(unit);
         this.matrix = exactMatrix;
-        if (!unit)
-            return this;
-        return this.total(unit);
+        return this;
     }
     toObject() {
         return { ...this.values };
     }
     normalize() {
-        normalizeValues(this.matrix, this.values);
-        return new Duration(this.values);
+        const values = this.toObject();
+        normalizeValues(this.matrix, values);
+        return this.withValues(values);
     }
     rescale() {
         const dur = this.normalize().shiftToAll();
         const vals = removeZeroes(dur.values);
-        return new Duration(vals);
+        return this.withValues(vals);
     }
     /**
      * Returns an ISO 8601-compliant string representation of this Duration.
      * @see https://en.wikipedia.org/wiki/ISO_8601#Durations
-     * @example Duration.fromObject({ years: 3, seconds: 45 }).toString() // 'P3YT45S'
-     * @example Duration.fromObject({ months: 4, seconds: 45 }).toString() // 'P4MT45S'
-     * @example Duration.fromObject({ months: 5 }).toString() // 'P5M'
-     * @example Duration.fromObject({ minutes: 5 }).toString() // 'PT5M'
-     * @example Duration.fromObject({ milliseconds: 6 }).toString() // 'PT0.006S'
+     * @example new Duration({ years: 3, seconds: 45 }).toString() // 'P3YT45S'
+     * @example new Duration({ months: 4, seconds: 45 }).toString() // 'P4MT45S'
+     * @example new Duration({ months: 5 }).toString() // 'P5M'
+     * @example new Duration({ minutes: 5 }).toString() // 'PT5M'
+     * @example new Duration({ milliseconds: 6 }).toString() // 'PT0.006S'
      * @return {string}
      */
     toISOString() {
         let s = 'P';
+        const months = this.get('quarters') * 3 + this.months;
         if (this.years !== 0)
-            s += this.years + 'Y';
-        if (this.months !== 0)
-            s += this.months + 'M';
+            s += `${this.years}Y`;
+        if (months !== 0)
+            s += `${months}M`;
         if (this.weeks !== 0)
-            s += this.weeks + 'W';
+            s += `${this.weeks}W`;
         if (this.days !== 0)
-            s += this.days + 'D';
+            s += `${this.days}D`;
         if (this.hours !== 0 || this.minutes !== 0 || this.seconds !== 0 || this.milliseconds !== 0)
             s += 'T';
         if (this.hours !== 0)
-            s += this.hours + 'H';
+            s += `${this.hours}H`;
         if (this.minutes !== 0)
-            s += this.minutes + 'M';
+            s += `${this.minutes}M`;
         if (this.seconds !== 0 || this.milliseconds !== 0)
             // this will handle "floating point madness" by removing extra decimal places
             // https://stackoverflow.com/questions/588004/is-floating-point-math-broken
-            s += round(this.seconds + this.milliseconds / 1000, 3) + 'S';
+            s += `${round(this.seconds + this.milliseconds / 1000, 3)}S`;
         if (s === 'P')
             s += 'T0S';
         return s;
@@ -357,7 +362,8 @@ export class Duration {
 function normalizeUnits(obj) {
     const vals = {};
     for (const unit of Object.keys(obj)) {
-        vals[UNITS_PLURAL[unit]] = obj[unit];
+        if (obj[unit] != null)
+            vals[UNITS_PLURAL[unit]] = obj[unit];
     }
     return vals;
 }

package/dist/i18n/format.d.ts

@@ -1,3 +1,4 @@
+export declare function fromFields(utc: boolean, year: number, month: any, day: any, hour: any, minute: any, second: any, ms: any): Date;
 /**
  * Returns a new Date from the given arguments.
  * @param {string | number | Date} date The date value
@@ -7,11 +8,13 @@
 export declare function asDate(date: string | number | Date, utc?: boolean): Date;
 /**
  * Returns a localized string representation of this date, according to the given format string. Format codes use the same specification as {@link https://momentjs.com/docs/#/displaying/format/ moment}.
- * @param {string} str The format string to use
+ * @param {string} formatStr The format string to use
+ * @param {Date} date The date value
+ * @param {?string} locale The locale to use when formatting (default is system locale).
  * @see {@link https://momentjs.com/docs/#/displaying/format/ List of formats}
  * @example
 ```js
-formatDate(new Date(), 'MM/DD/YYYY') // '10/31/2022'
+formatDate('MM/DD/YYYY', new Date()) // '10/31/2022'
 ```
   */
 export declare function formatDate(formatStr: string, date: Date, locale?: string): string;
@@ -22,5 +25,10 @@ export declare function formatDate(formatStr: string, date: Date, locale?: strin
  * @param {?string} locale The locale to use when formatting (default is system locale).
  * @returns {string} The string representation of date
  * @see {@link https://strftime.org/ strftime format}
+ * @example
+```js
+strftime('%A, %d/%m/%y', new Date())
+// 'Saturday, 01/02/2020'
+```
  */
 export declare function strftime(fmt: string, date: Date, locale?: string): string;