@sprucelabs/calendar-utils 40.0.9 → 40.0.11

package/build/esm/.spruce/schemas/schemas.types.js

@@ -1 +1,5 @@
+/* eslint-disable @typescript-eslint/no-namespace */
+/* eslint-disable no-redeclare */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable import/order */
 import '@sprucelabs/spruce-event-utils';

package/build/locales/DateUtilDecorator.js

@@ -4,7 +4,6 @@ exports.calculateOffsetAtDate = void 0;
 const schema_1 = require("@sprucelabs/schema");
 const date_fns_tz_1 = require("date-fns-tz");
 class DateUtilDecorator {
-    locale;
     constructor(locale) {
         (0, schema_1.assertOptions)({ locale }, ['locale']);
         this.locale = locale;
@@ -57,7 +56,7 @@ class DateUtilDecorator {
         };
     }
     offsetDate(date) {
-        return this.addOffset(date ?? new Date().getTime(), false);
+        return this.addOffset(date !== null && date !== void 0 ? date : new Date().getTime(), false);
     }
     addOffset(value, shouldInverse = true) {
         let offset = this.calculateOffset(value);

package/build/locales/Locale.js

@@ -11,13 +11,11 @@ const date_fns_tz_1 = require("date-fns-tz");
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 const TimezoneChoiceSorter_1 = __importDefault(require("./TimezoneChoiceSorter"));
 class LocaleImpl extends mercury_event_emitter_1.AbstractEventEmitter {
-    zoneNameByOffset = {};
-    offsetsForDate = {};
-    offset = new Date().getTimezoneOffset() * -1;
-    currentZone;
-    _timezoneChoices;
     constructor() {
         super(localeContract);
+        this.zoneNameByOffset = {};
+        this.offsetsForDate = {};
+        this.offset = new Date().getTimezoneOffset() * -1;
     }
     setTimezoneOffsetMinutes(offset) {
         (0, schema_1.assertOptions)({ offset }, ['offset']);
@@ -28,7 +26,7 @@ class LocaleImpl extends mercury_event_emitter_1.AbstractEventEmitter {
         if (onDate || timezone) {
             const date = onDate ? onDate : Date.now();
             const dateRoundedToNearestHour = date - (date % 3600000);
-            const zone = timezone ?? this.getZoneName();
+            const zone = timezone !== null && timezone !== void 0 ? timezone : this.getZoneName();
             const key = `${zone}-${dateRoundedToNearestHour}`;
             if (!(key in this.offsetsForDate)) {
                 this.offsetsForDate[key] = this.zoneNameToOffsetMinutes(zone, onDate);

package/build/locales/TimezoneChoiceSorter.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const schema_1 = require("@sprucelabs/schema");
 class TimezoneChoiceSorter {
-    locale;
     constructor(locale) {
         (0, schema_1.assertOptions)({ locale }, ['locale']);
         this.locale = locale;

package/build/parsing/AbstractParser.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractParser = void 0;
 class AbstractParser {
-    now;
-    locale;
     constructor(now, locale) {
         this.now = now;
         this.locale = locale;

package/build/parsing/DateParser.js

@@ -7,10 +7,8 @@ const schema_1 = require("@sprucelabs/schema");
 const date_utility_1 = __importDefault(require("../utilities/date.utility"));
 const ParserFactory_1 = __importDefault(require("./ParserFactory"));
 class DateParser {
-    now;
-    parsers = [];
-    locale;
     constructor(now, locale) {
+        this.parsers = [];
         this.now = now;
         this.locale = locale;
         const parsers = ParserFactory_1.default.Factory(now, locale);

package/build/parsing/ParserFactory.js

@@ -9,7 +9,6 @@ const TimeParser_1 = __importDefault(require("./strategies/TimeParser"));
 const WeekParser_1 = __importDefault(require("./strategies/WeekParser"));
 const YearParser_1 = __importDefault(require("./strategies/YearParser"));
 class ParserFactory {
-    locale;
     all() {
         return [
             this.Parser('Year'),
@@ -19,15 +18,14 @@ class ParserFactory {
             this.Parser('Time'),
         ];
     }
-    now;
-    strategies = {
-        Year: () => new YearParser_1.default(this.now, this.locale),
-        Month: () => new MonthParser_1.default(this.now, this.locale),
-        Dow: () => new DowParser_1.default(this.now, this.locale),
-        Time: () => new TimeParser_1.default(this.now, this.locale),
-        Week: () => new WeekParser_1.default(this.now, this.locale),
-    };
     constructor(now, locale) {
+        this.strategies = {
+            Year: () => new YearParser_1.default(this.now, this.locale),
+            Month: () => new MonthParser_1.default(this.now, this.locale),
+            Dow: () => new DowParser_1.default(this.now, this.locale),
+            Time: () => new TimeParser_1.default(this.now, this.locale),
+            Week: () => new WeekParser_1.default(this.now, this.locale),
+        };
         this.now = now;
         this.locale = locale;
     }

package/build/parsing/strategies/DowParser.js

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

package/build/parsing/strategies/TimeParser.js

@@ -7,7 +7,8 @@ const date_utility_1 = __importDefault(require("../../utilities/date.utility"));
 const AbstractParser_1 = require("../AbstractParser");
 class TimeParser extends AbstractParser_1.AbstractParser {
     parse(str, date, context) {
-        const matches = str.match(/(\d{1,2})(:?(\d{1,2}))?\s*([ap]m?)?/) ?? [];
+        var _a;
+        const matches = (_a = str.match(/(\d{1,2})(:?(\d{1,2}))?\s*([ap]m?)?/)) !== null && _a !== void 0 ? _a : [];
         let [match, hour, , minutes, ampm] = matches;
         if (!match) {
             return str;
@@ -15,7 +16,7 @@ class TimeParser extends AbstractParser_1.AbstractParser {
         if (hour) {
             let parsedHour = parseInt(hour, 10);
             if (parsedHour > 12) {
-                minutes = hour[1] + (minutes ?? '');
+                minutes = hour[1] + (minutes !== null && minutes !== void 0 ? minutes : '');
                 hour = hour[0];
                 parsedHour = parseInt(hour, 10);
             }
@@ -28,7 +29,7 @@ class TimeParser extends AbstractParser_1.AbstractParser {
             }
             date.minute = parseInt(minutes, 10);
         }
-        if (ampm?.includes('p')) {
+        if (ampm === null || ampm === void 0 ? void 0 : ampm.includes('p')) {
             date.hour += 12;
         }
         else if (date.hour === 12 && match.includes('am')) {

package/build/parsing/strategies/WeekParser.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AbstractParser_1 = require("../AbstractParser");
 class WeekParser extends AbstractParser_1.AbstractParser {
     parse(str, date) {
+        var _a;
         if (str.includes('next week')) {
             date.day += 7;
             str = str.replace('next week', '');
         }
-        const match = str.match(/(\d{1,2}) ?(weeks?)/)?.[0];
+        const match = (_a = str.match(/(\d{1,2}) ?(weeks?)/)) === null || _a === void 0 ? void 0 : _a[0];
         if (match) {
             date.day += parseInt(match, 10) * 7;
             str = str.replace(match, '');

package/build/utilities/PeopleSorter.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class PeopleSorter {
-    _people;
-    _events;
-    selectedEvents = [];
+    constructor() {
+        this.selectedEvents = [];
+    }
     setPeople(people) {
         this._people = [...people];
     }
@@ -31,7 +31,7 @@ class PeopleSorter {
     }
     peopleExcluding(selectedPeopleWithValidEvents) {
         return this.people.filter((p) => {
-            const match = selectedPeopleWithValidEvents.find((sp) => sp?.id === p.id);
+            const match = selectedPeopleWithValidEvents.find((sp) => (sp === null || sp === void 0 ? void 0 : sp.id) === p.id);
             if (match) {
                 return false;
             }
@@ -96,10 +96,12 @@ class PeopleSorter {
         }
     }
     get people() {
-        return this._people ?? [];
+        var _a;
+        return (_a = this._people) !== null && _a !== void 0 ? _a : [];
     }
     get events() {
-        return this._events ?? [];
+        var _a;
+        return (_a = this._events) !== null && _a !== void 0 ? _a : [];
     }
 }
 exports.default = PeopleSorter;

package/build/utilities/RepeatingRuleTextGenerator.js

@@ -2,22 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const schema_1 = require("@sprucelabs/schema");
 class RepeatingRuleTextGenerator {
-    unitMap = {
-        daily: 'days',
-        weekly: 'weeks',
-        monthly: 'months',
-    };
-    downMap = {
-        sun: 'Sundays',
-        mon: 'Mondays',
-        tue: 'Tuesdays',
-        wed: 'Wednesdays',
-        thur: 'Thursdays',
-        fri: 'Fridays',
-        sat: 'Saturdays',
-    };
-    dates;
     constructor(dates) {
+        this.unitMap = {
+            daily: 'days',
+            weekly: 'weeks',
+            monthly: 'months',
+        };
+        this.downMap = {
+            sun: 'Sundays',
+            mon: 'Mondays',
+            tue: 'Tuesdays',
+            wed: 'Wednesdays',
+            thur: 'Thursdays',
+            fri: 'Fridays',
+            sat: 'Saturdays',
+        };
         this.dates = dates;
     }
     static Generator(options) {
@@ -33,13 +32,13 @@ class RepeatingRuleTextGenerator {
                     .map((d) => this.downMap[d])
                     .join(', ')}`;
             }
-            else if ((interval ?? 0) > 1) {
+            else if ((interval !== null && interval !== void 0 ? interval : 0) > 1) {
                 message = `Repeats every ${interval} ${this.unitMap[repeats]}`;
             }
             else {
                 message = `Repeats ${repeats}`;
             }
-            const until = activeUntilDate ?? repeatsUntil;
+            const until = activeUntilDate !== null && activeUntilDate !== void 0 ? activeUntilDate : repeatsUntil;
             if (until) {
                 message += ` until ${this.dates.formatDate(until)}.`;
             }

package/build/utilities/calendar.utility.js

@@ -29,6 +29,7 @@ const calendarUtil = {
         return excludedEvents;
     },
     applyRuleAndGetEventsWithoutExclusion(e, dateUntil, timezone) {
+        var _a, _b, _c, _d;
         let repeatsUntil;
         if (e.repeats) {
             if (e.repeatsUntil) {
@@ -44,13 +45,13 @@ const calendarUtil = {
             const dtstart = (0, rrule_1.datetime)(startSplit.year, startSplit.month + 1, startSplit.day, startSplit.hour, startSplit.minute);
             const rule = new rrule_1.RRule({
                 freq: this.freqMapToRRule[e.repeats],
-                interval: e.interval ?? 1,
-                byweekday: e.daysOfWeek?.map((d) => this.weekDaysMapToRRuleDays[d]),
+                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]),
                 dtstart,
-                bymonthday: e.daysOfMonth?.map((d) => parseInt(d)),
+                bymonthday: (_c = e.daysOfMonth) === null || _c === void 0 ? void 0 : _c.map((d) => parseInt(d)),
                 until: new Date(repeatsUntil),
                 count: e.occurrences,
-                bysetpos: e.nthOccurrences?.map((o) => {
+                bysetpos: (_d = e.nthOccurrences) === null || _d === void 0 ? void 0 : _d.map((o) => {
                     if (o >= 0) {
                         ++o;
                     }

package/build/utilities/date.utility.js

@@ -163,10 +163,11 @@ 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, date.hour ?? 0, date.minute ?? 0, date.second ?? 0, date.milliseconds ?? 0);
+        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);
     },
     /**
      * Unit_______________Pattern___Results

package/build/utilities/duration.utility.js

@@ -44,7 +44,7 @@ const durationUtil = {
         return this.renderDateTimeUntil(start, new Date().getTime(), prefixes);
     },
     renderDateTimeUntil(start, now, prefixes) {
-        const { today = null, tomorrow = null, yesterday = null, future = null, past = null, shouldCapitalize, } = prefixes ?? {};
+        const { today = null, tomorrow = null, yesterday = null, future = null, past = null, shouldCapitalize, } = prefixes !== null && prefixes !== void 0 ? prefixes : {};
         let prefix = today;
         let startDateAndTime = 'today';
         const daysFromNow = Math.round((start - now) / (1000 * 3600 * 24));

package/build/utilities/sortTimezoneChoices.js

@@ -7,10 +7,11 @@ const schema_1 = require("@sprucelabs/schema");
 const spruce_core_schemas_1 = require("@sprucelabs/spruce-core-schemas");
 const TimezoneChoiceSorter_1 = __importDefault(require("../locales/TimezoneChoiceSorter"));
 function sortTimezoneChoices(locale, schema, fieldName) {
+    var _a;
     const sorter = new TimezoneChoiceSorter_1.default(locale);
     const choices = sorter.sort(spruce_core_schemas_1.timezoneChoices);
     const copy = (0, schema_1.cloneDeep)(schema);
-    const field = copy.fields?.[fieldName];
+    const field = (_a = copy.fields) === null || _a === void 0 ? void 0 : _a[fieldName];
     if (field) {
         field.options = {
             ...field.options,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "40.0.9",
+  "version": "40.0.11",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -61,34 +61,32 @@
     "post.watch.build": "yarn run build.copy-files && yarn run build.resolve-paths",
     "watch.build.dev": "tsc-watch --sourceMap --onCompilationComplete 'yarn run post.watch.build'",
     "lint.tsc": "tsc -p . --noEmit",
-    "watch.lint": "concurrently 'yarn run lint' \"chokidar 'src/**/*' -c 'yarn run lint.tsc'\"",
     "watch.rebuild": "yarn run clean.all && yarn install && yarn run watch.build.dev"
   },
   "dependencies": {
-    "@sprucelabs/error": "^6.0.8",
-    "@sprucelabs/mercury-event-emitter": "^42.0.8",
-    "@sprucelabs/mercury-types": "^47.0.8",
-    "@sprucelabs/schema": "^30.0.12",
-    "@sprucelabs/spruce-core-schemas": "^40.0.9",
-    "@sprucelabs/spruce-event-utils": "^40.0.8",
+    "@sprucelabs/error": "^6.0.11",
+    "@sprucelabs/mercury-event-emitter": "^42.0.10",
+    "@sprucelabs/mercury-types": "^47.0.11",
+    "@sprucelabs/schema": "^30.0.15",
+    "@sprucelabs/spruce-core-schemas": "^40.0.11",
+    "@sprucelabs/spruce-event-utils": "^40.0.11",
     "date-fns": "^3.6.0",
     "date-fns-tz": "^3.1.3",
     "rrule": "^2.8.1"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^6.0.8",
-    "@sprucelabs/jest-json-reporter": "^8.0.7",
-    "@sprucelabs/resolve-path-aliases": "^2.0.10",
+    "@sprucelabs/esm-postbuild": "^6.0.11",
+    "@sprucelabs/jest-json-reporter": "^8.0.11",
+    "@sprucelabs/resolve-path-aliases": "^2.0.13",
     "@sprucelabs/semantic-release": "^5.0.1",
-    "@sprucelabs/test": "^9.0.7",
-    "@sprucelabs/test-utils": "^5.0.9",
+    "@sprucelabs/test": "^9.0.9",
+    "@sprucelabs/test-utils": "^5.0.10",
     "@types/lodash": "^4.17.0",
     "@types/node": "^20.12.7",
     "chokidar-cli": "^3.0.0",
-    "concurrently": "^8.2.2",
     "dotenv": "^16.4.5",
     "eslint": "^9.1.1",
-    "eslint-config-spruce": "^11.2.12",
+    "eslint-config-spruce": "^11.2.13",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "prettier": "^3.2.5",

package/tsconfig.json

@@ -3,7 +3,7 @@
 		"skipLibCheck": true,
 		"module": "commonjs",
 		"esModuleInterop": true,
-		"target": "ES2022",
+		"target": "ES2019",
 		"lib": [
 			"DOM",
 			"ES2022"