@sprucelabs/calendar-utils 42.0.489 → 42.0.491

package/build/esm/errors/SpruceError.js

@@ -4,7 +4,7 @@ export default class SpruceError extends BaseSpruceError {
     friendlyMessage() {
         const { options } = this;
         let message;
-        switch (options === null || options === void 0 ? void 0 : options.code) {
+        switch (options?.code) {
             case 'INVALID_TIMEZONE_NAME':
                 message = `Invalid timezone: ${options.name}!`;
                 break;

package/build/esm/locales/DateUtilDecorator.js

@@ -7,9 +7,12 @@ export default class DateUtilDecorator {
     }
     makeLocaleAware(dateUtil) {
         assertOptions({ dateUtil }, ['dateUtil']);
-        return Object.assign(Object.assign({}, dateUtil), { 
+        return {
+            ...dateUtil,
             //@ts-ignore
-            __beenDecorated: true, __locale: this.locale, date: (date) => {
+            __beenDecorated: true,
+            __locale: this.locale,
+            date: (date) => {
                 let value;
                 if (!date) {
                     const d = new Date();
@@ -22,26 +25,35 @@ export default class DateUtilDecorator {
                     return value - offset;
                 }
                 return this.addOffset(value);
-            }, setTimeOfDay: (...args) => {
+            },
+            setTimeOfDay: (...args) => {
                 return this.addOffset(dateUtil.setTimeOfDay(...args));
-            }, format: (date, format) => {
+            },
+            format: (date, format) => {
                 return dateUtil.format(this.addOffset(date, false), format);
-            }, getStartOfDay: (date) => {
+            },
+            getStartOfDay: (date) => {
                 return this.addOffset(dateUtil.getStartOfDay(this.offsetDate(date)));
-            }, getEndOfDay: (date) => {
+            },
+            getEndOfDay: (date) => {
                 return this.addOffset(dateUtil.getEndOfDay(this.offsetDate(date)));
-            }, getStartOfMonth: (date) => {
+            },
+            getStartOfMonth: (date) => {
                 return this.addOffset(dateUtil.getStartOfMonth(this.offsetDate(date)));
-            }, getEndOfMonth: (date) => {
+            },
+            getEndOfMonth: (date) => {
                 return this.addOffset(dateUtil.getEndOfMonth(this.offsetDate(date)));
-            }, splitDate: (timestamp) => {
+            },
+            splitDate: (timestamp) => {
                 return dateUtil.splitDate(this.addOffset(timestamp, false));
-            }, addMonths: (date, months) => {
+            },
+            addMonths: (date, months) => {
                 return this.addOffset(dateUtil.addMonths(this.addOffset(date, false), months));
-            } });
+            },
+        };
     }
     offsetDate(date) {
-        return this.addOffset(date !== null && date !== void 0 ? date : new Date().getTime(), false);
+        return this.addOffset(date ?? new Date().getTime(), false);
     }
     addOffset(value, shouldInverse = true) {
         let offset = this.calculateOffset(value);

package/build/esm/locales/Locale.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { AbstractEventEmitter } from '@sprucelabs/mercury-event-emitter';
 import { buildEventContract } from '@sprucelabs/mercury-types';
 import { assertOptions, buildSchema } from '@sprucelabs/schema';
@@ -30,7 +21,7 @@ export default class LocaleImpl extends AbstractEventEmitter {
         if (onDate || timezone) {
             const date = onDate ? onDate : Date.now();
             const dateRoundedToNearestHour = date - (date % 3600000);
-            const zone = timezone !== null && timezone !== void 0 ? timezone : this.getZoneName();
+            const zone = timezone ?? this.getZoneName();
             const key = `${zone}-${dateRoundedToNearestHour}`;
             if (!(key in this.offsetsForDate)) {
                 this.offsetsForDate[key] = this.zoneNameToOffsetMinutes(zone, onDate);
@@ -39,16 +30,14 @@ export default class LocaleImpl extends AbstractEventEmitter {
         }
         return this.offset;
     }
-    setZoneName(zone) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.currentZone === zone) {
-                return;
-            }
-            this.currentZone = zone;
-            this.offset = this.zoneNameToOffsetMinutes(zone);
-            yield this.emit('did-change-timezones', {
-                zoneName: zone,
-            });
+    async setZoneName(zone) {
+        if (this.currentZone === zone) {
+            return;
+        }
+        this.currentZone = zone;
+        this.offset = this.zoneNameToOffsetMinutes(zone);
+        await this.emit('did-change-timezones', {
+            zoneName: zone,
         });
     }
     getZoneName() {

package/build/esm/parsing/DateParser.js

@@ -32,7 +32,11 @@ export default class DateParser {
         if (parsed === original) {
             return null;
         }
-        let normalized = dateUtil.date(Object.assign(Object.assign({}, date), { milliseconds: 0, second: 0 }));
+        let normalized = dateUtil.date({
+            ...date,
+            milliseconds: 0,
+            second: 0,
+        });
         return normalized;
     }
 }

package/build/esm/parsing/strategies/DowParser.js

@@ -2,7 +2,6 @@ import dateUtil from '../../utilities/date.utility.js';
 import { AbstractParser } from '../AbstractParser.js';
 export default class DowParser extends AbstractParser {
     parse(str, date) {
-        var _a;
         if (str.includes('tomorrow')) {
             date.day += 1;
             str = str.replace('tomorrow', '');
@@ -41,7 +40,7 @@ export default class DowParser extends AbstractParser {
             const re = new RegExp(`(^|\\W)${dow.abbr}(\\W|$)`, 'gi');
             str = str.replace(re, `$1${dow.full}$2`);
         }
-        const match = (_a = str.match(/(monday|tuesday|wednesday|thursday|friday|saturday|sunday)/)) === null || _a === void 0 ? void 0 : _a[0];
+        const match = str.match(/(monday|tuesday|wednesday|thursday|friday|saturday|sunday)/)?.[0];
         if (match) {
             while (dateUtil
                 .format(dateUtil.date(date), 'EEEE')

package/build/esm/parsing/strategies/TimeParser.js

@@ -2,8 +2,7 @@ import dateUtil from '../../utilities/date.utility.js';
 import { AbstractParser } from '../AbstractParser.js';
 export default class TimeParser extends AbstractParser {
     parse(str, date, context) {
-        var _a;
-        const matches = (_a = str.match(/(\d{1,2})(:?(\d{1,2}))?\s*([ap]m?)?/)) !== null && _a !== void 0 ? _a : [];
+        const matches = str.match(/(\d{1,2})(:?(\d{1,2}))?\s*([ap]m?)?/) ?? [];
         let [match, hour, , minutes, ampm] = matches;
         if (!match) {
             return str;
@@ -11,7 +10,7 @@ export default class TimeParser extends AbstractParser {
         if (hour) {
             let parsedHour = parseInt(hour, 10);
             if (parsedHour > 12) {
-                minutes = hour[1] + (minutes !== null && minutes !== void 0 ? minutes : '');
+                minutes = hour[1] + (minutes ?? '');
                 hour = hour[0];
                 parsedHour = parseInt(hour, 10);
             }
@@ -24,7 +23,7 @@ export default class TimeParser extends AbstractParser {
             }
             date.minute = parseInt(minutes, 10);
         }
-        if (ampm === null || ampm === void 0 ? void 0 : ampm.includes('p')) {
+        if (ampm?.includes('p')) {
             date.hour += 12;
         }
         else if (date.hour === 12 && match.includes('am')) {

package/build/esm/parsing/strategies/WeekParser.js

@@ -1,12 +1,11 @@
 import { AbstractParser } from '../AbstractParser.js';
 export default class WeekParser extends AbstractParser {
     parse(str, date) {
-        var _a;
         if (str.includes('next week')) {
             date.day += 7;
             str = str.replace('next week', '');
         }
-        const match = (_a = str.match(/(\d{1,2}) ?(weeks?)/)) === null || _a === void 0 ? void 0 : _a[0];
+        const match = str.match(/(\d{1,2}) ?(weeks?)/)?.[0];
         if (match) {
             date.day += parseInt(match, 10) * 7;
             str = str.replace(match, '');

package/build/esm/schemas/v2021_05_19/calendarEvent.builder.js

@@ -76,10 +76,13 @@ export default buildSchema({
             options: {
                 schema: {
                     id: 'calendarEventTarget',
-                    fields: Object.assign(Object.assign({}, eventTargetSchema.fields), { personId: {
+                    fields: {
+                        ...eventTargetSchema.fields,
+                        personId: {
                             type: 'id',
                             isRequired: true,
-                        } }),
+                        },
+                    },
                 },
             },
         },

package/build/esm/utilities/DurationUtilBuilder.js

@@ -1,30 +1,19 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import DateUtilDecorator from '../locales/DateUtilDecorator.js';
 import LocaleImpl from '../locales/Locale.js';
 import dateUtil from './date.utility.js';
 import durationUtil from './duration.utility.js';
 class DurationUtilBuilder {
-    static getForTimezone(timezone) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const locale = new LocaleImpl();
-            yield locale.setZoneName(timezone);
-            const durationUtilCopy = Object.assign({}, this.durationUtil);
-            durationUtilCopy.dates = new DateUtilDecorator(locale).makeLocaleAware(dateUtil);
-            this.lastBuiltDurationUtil = durationUtilCopy;
-            return durationUtilCopy;
-        });
+    static async getForTimezone(timezone) {
+        const locale = new LocaleImpl();
+        await locale.setZoneName(timezone);
+        const durationUtilCopy = { ...this.durationUtil };
+        durationUtilCopy.dates = new DateUtilDecorator(locale).makeLocaleAware(dateUtil);
+        this.lastBuiltDurationUtil = durationUtilCopy;
+        return durationUtilCopy;
     }
     static reset() {
-        this.durationUtil = Object.assign({}, durationUtil);
+        this.durationUtil = { ...durationUtil };
     }
 }
-DurationUtilBuilder.durationUtil = Object.assign({}, durationUtil);
+DurationUtilBuilder.durationUtil = { ...durationUtil };
 export default DurationUtilBuilder;

package/build/esm/utilities/PeopleSorter.js

@@ -29,7 +29,7 @@ export default class PeopleSorter {
     }
     peopleExcluding(selectedPeopleWithValidEvents) {
         return this.people.filter((p) => {
-            const match = selectedPeopleWithValidEvents.find((sp) => (sp === null || sp === void 0 ? void 0 : sp.id) === p.id);
+            const match = selectedPeopleWithValidEvents.find((sp) => sp?.id === p.id);
             if (match) {
                 return false;
             }
@@ -94,12 +94,10 @@ export default class PeopleSorter {
         }
     }
     get people() {
-        var _a;
-        return (_a = this._people) !== null && _a !== void 0 ? _a : [];
+        return this._people ?? [];
     }
     get events() {
-        var _a;
-        return (_a = this._events) !== null && _a !== void 0 ? _a : [];
+        return this._events ?? [];
     }
 }
 function sortByCasualName(people) {

package/build/esm/utilities/RepeatingRuleTextGenerator.js

@@ -30,13 +30,13 @@ export default class RepeatingRuleTextGenerator {
                     .map((d) => this.downMap[d])
                     .join(', ')}`;
             }
-            else if ((interval !== null && interval !== void 0 ? interval : 0) > 1) {
+            else if ((interval ?? 0) > 1) {
                 message = `Repeats every ${interval} ${this.unitMap[repeats]}`;
             }
             else {
                 message = `Repeats ${repeats}`;
             }
-            const until = activeUntilDate !== null && activeUntilDate !== void 0 ? activeUntilDate : repeatsUntil;
+            const until = activeUntilDate ?? repeatsUntil;
             if (until) {
                 message += ` until ${this.dates.formatDate(until)}.`;
             }

package/build/esm/utilities/calendar.utility.js

@@ -24,7 +24,6 @@ const calendarUtil = {
         return excludedEvents;
     },
     applyRuleAndGetEventsWithoutExclusion(e, dateUntil, timezone) {
-        var _a, _b, _c, _d;
         let repeatsUntil;
         if (e.repeats) {
             if (e.repeatsUntil) {
@@ -40,13 +39,13 @@ const calendarUtil = {
             const dtstart = datetime(startSplit.year, startSplit.month + 1, startSplit.day, startSplit.hour, startSplit.minute);
             const rule = new RRule({
                 freq: this.freqMapToRRule[e.repeats],
-                interval: (_a = e.interval) !== null && _a !== void 0 ? _a : 1,
-                byweekday: (_b = e.daysOfWeek) === null || _b === void 0 ? void 0 : _b.map((d) => this.weekDaysMapToRRuleDays[d]),
+                interval: e.interval ?? 1,
+                byweekday: e.daysOfWeek?.map((d) => this.weekDaysMapToRRuleDays[d]),
                 dtstart,
-                bymonthday: (_c = e.daysOfMonth) === null || _c === void 0 ? void 0 : _c.map((d) => parseInt(d)),
+                bymonthday: e.daysOfMonth?.map((d) => parseInt(d)),
                 until: new Date(repeatsUntil),
                 count: e.occurrences,
-                bysetpos: (_d = e.nthOccurrences) === null || _d === void 0 ? void 0 : _d.map((o) => {
+                bysetpos: e.nthOccurrences?.map((o) => {
                     if (o >= 0) {
                         ++o;
                     }
@@ -64,7 +63,12 @@ const calendarUtil = {
             const iosDate = dateUtil.splitDate(r.getTime());
             const startDateTimeMs = dateUtil.date(iosDate);
             const offset = calculateOffsetAtDate(iosDate, this.locale, timezone);
-            return Object.assign(Object.assign({}, e), { nthInRepeating: idx, totalInRepeating: allEvents.length, startDateTimeMs: startDateTimeMs - offset });
+            return {
+                ...e,
+                nthInRepeating: idx,
+                totalInRepeating: allEvents.length,
+                startDateTimeMs: startDateTimeMs - offset,
+            };
         });
         return events;
     },

package/build/esm/utilities/date.utility.js

@@ -161,11 +161,10 @@ const dateUtil = {
         return this.addMonths(this.getStartOfMonth(timestamp), count);
     },
     date(date) {
-        var _a, _b, _c, _d;
         if (!date) {
             return new Date().getTime();
         }
-        return Date.UTC(date.year, date.month, date.day, (_a = date.hour) !== null && _a !== void 0 ? _a : 0, (_b = date.minute) !== null && _b !== void 0 ? _b : 0, (_c = date.second) !== null && _c !== void 0 ? _c : 0, (_d = date.milliseconds) !== null && _d !== void 0 ? _d : 0);
+        return Date.UTC(date.year, date.month, date.day, date.hour ?? 0, date.minute ?? 0, date.second ?? 0, date.milliseconds ?? 0);
     },
     /**
      * Unit_______________Pattern___Results

package/build/esm/utilities/duration.utility.js

@@ -27,7 +27,7 @@ const durationUtil = {
         return durationStr.trim();
     },
     renderDateTimeUntil(end, prefixes) {
-        const { today = null, tomorrow = null, yesterday = null, future = null, past = null, shouldCapitalize, now = Date.now(), } = prefixes !== null && prefixes !== void 0 ? prefixes : {};
+        const { today = null, tomorrow = null, yesterday = null, future = null, past = null, shouldCapitalize, now = Date.now(), } = prefixes ?? {};
         let prefix = today;
         let startDateAndTime = 'today';
         const daysFromNow = Math.round((this.dates.getStartOfDay(end) - this.dates.getStartOfDay(now)) /

package/build/esm/utilities/sortTimezoneChoices.js

@@ -2,13 +2,15 @@ import { cloneDeep } from '@sprucelabs/schema';
 import { timezoneChoices } from '@sprucelabs/spruce-core-schemas';
 import TimezoneChoiceSorter from '../locales/TimezoneChoiceSorter.js';
 export default function sortTimezoneChoices(locale, schema, fieldName) {
-    var _a;
     const sorter = new TimezoneChoiceSorter(locale);
     const choices = sorter.sort(timezoneChoices);
     const copy = cloneDeep(schema);
-    const field = (_a = copy.fields) === null || _a === void 0 ? void 0 : _a[fieldName];
+    const field = copy.fields?.[fieldName];
     if (field) {
-        field.options = Object.assign(Object.assign({}, field.options), { choices });
+        field.options = {
+            ...field.options,
+            choices,
+        };
     }
     return copy;
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "42.0.489",
+  "version": "42.0.491",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@sprucelabs/error": "^6.0.538",
-    "@sprucelabs/mercury-event-emitter": "^42.0.596",
+    "@sprucelabs/mercury-event-emitter": "^42.0.597",
     "@sprucelabs/mercury-types": "^47.0.596",
     "@sprucelabs/schema": "^30.0.555",
     "@sprucelabs/spruce-core-schemas": "^40.1.542",