@sprucelabs/calendar-utils 39.0.292 → 40.0.1

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

@@ -79,10 +79,13 @@ exports.default = (0, schema_1.buildSchema)({
             options: {
                 schema: {
                     id: 'calendarEventTarget',
-                    fields: Object.assign(Object.assign({}, spruce_event_utils_1.eventTargetSchema.fields), { personId: {
+                    fields: {
+                        ...spruce_event_utils_1.eventTargetSchema.fields,
+                        personId: {
                             type: 'id',
                             isRequired: true,
-                        } }),
+                        },
+                    },
                 },
             },
         },

package/build/types/calendar.types.d.ts

@@ -1,5 +1,5 @@
 import { timezoneChoices } from '@sprucelabs/spruce-core-schemas';
-import { SpruceSchemas } from "./../.spruce/schemas/schemas.types";
+import { SpruceSchemas } from './../.spruce/schemas/schemas.types';
 import LocaleImpl from '../locales/Locale';
 import dateUtil from '../utilities/date.utility';
 type D = typeof dateUtil;
@@ -16,11 +16,11 @@ export type TimezoneChoices = typeof timezoneChoices;
 export type TimezoneName = TimezoneChoices[number]['value'];
 export type Repeats = NonNullable<CalendarEvent['repeats']>;
 export type Locale = Pick<LocaleImpl, 'on' | 'getZoneName' | 'offsetMinutesToZoneName' | 'getTimezoneOffsetMinutes' | 'setTimezoneOffsetMinutes' | 'setZoneName' | 'zoneNameToOffsetMinutes'>;
-export type SorterCalendarEvent = {
+export interface SorterCalendarEvent {
     id: string;
     groupId?: string;
     startDateTimeMs: number;
     personId: string;
-};
+}
 export type RepeatingCalendarEvent = Pick<CalendarEvent, 'repeats' | 'repeatsUntil' | 'daysOfWeek' | 'daysOfMonth' | 'interval' | 'startDateTimeMs' | 'occurrences' | 'nthOccurrences' | 'timeBlocks' | 'nthInRepeating' | 'totalInRepeating'>;
 export {};

package/build/utilities/PeopleSorter.d.ts

@@ -18,7 +18,7 @@ export default class PeopleSorter {
     private get people();
     private get events();
 }
-export type Person = {
+export interface Person {
     id: string;
     casualName: string;
-};
+}

package/build/utilities/PeopleSorter.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class PeopleSorter {
-    constructor() {
-        this.selectedEvents = [];
-    }
+    _people;
+    _events;
+    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 === null || sp === void 0 ? void 0 : sp.id) === p.id);
+            const match = selectedPeopleWithValidEvents.find((sp) => sp?.id === p.id);
             if (match) {
                 return false;
             }
@@ -50,7 +50,9 @@ class PeopleSorter {
             }
             return false;
         });
-        const groupsIds = selectedEvents.map((e) => e.groupId).filter((g) => !!g);
+        const groupsIds = selectedEvents
+            .map((e) => e.groupId)
+            .filter((g) => !!g);
         const matchOnGroup = groupsIds.length > 0
             ? this.events.filter((e) => !selectedEvents.find((se) => se.id === e.id) &&
                 groupsIds.indexOf(e.groupId) > -1)
@@ -94,12 +96,10 @@ 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 ?? [];
     }
 }
 exports.default = PeopleSorter;

package/build/utilities/RepeatingRuleTextGenerator.js

@@ -2,21 +2,22 @@
 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) {
@@ -32,13 +33,13 @@ 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/utilities/calendar.utility.js

@@ -29,7 +29,6 @@ const calendarUtil = {
         return excludedEvents;
     },
     applyRuleAndGetEventsWithoutExclusion(e, dateUntil, timezone) {
-        var _a, _b, _c, _d;
         let repeatsUntil;
         if (e.repeats) {
             if (e.repeatsUntil) {
@@ -45,13 +44,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: (_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;
                     }
@@ -69,7 +68,12 @@ const calendarUtil = {
             const iosDate = date_utility_1.default.splitDate(r.getTime());
             const startDateTimeMs = date_utility_1.default.date(iosDate);
             const offset = (0, DateUtilDecorator_1.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/utilities/date.utility.js

@@ -163,11 +163,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
@@ -546,7 +545,7 @@ const dateUtil = {
     },
     isSameDay(timestamp1, timestamp2) {
         const { day, year, month } = this.splitDate(timestamp1);
-        const { day: day2, year: year2, month: month2 } = this.splitDate(timestamp2);
+        const { day: day2, year: year2, month: month2, } = this.splitDate(timestamp2);
         return day === day2 && year === year2 && month === month2;
     },
     getTotalDaysInMonth(year, month) {

package/build/utilities/duration.utility.d.ts

@@ -3,7 +3,9 @@ declare const durationUtil: {
         eventDaysOfWeek: {
             sun: string;
             mon: string;
-            tue: string;
+            tue: string; /**
+             * @deprecated durationUtil.msToFriendly(...) -> durationUtil.renderDuration(...)
+             */
             wed: string;
             thur: string;
             fri: string;

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 !== null && prefixes !== void 0 ? prefixes : {};
+        const { today = null, tomorrow = null, yesterday = null, future = null, past = null, shouldCapitalize, } = prefixes ?? {};
         let prefix = today;
         let startDateAndTime = 'today';
         const daysFromNow = Math.round((start - now) / (1000 * 3600 * 24));
@@ -64,13 +64,14 @@ const durationUtil = {
         else if (daysFromNow < -1) {
             prefix = past;
             startDateAndTime =
-                this.dates.format(start, 'MMM do') + ` (${daysFromNow * -1} days ago)`;
+                this.dates.format(start, 'MMM do') +
+                    ` (${daysFromNow * -1} days ago)`;
         }
         startDateAndTime += ` @ ${this.dates.format(start, 'h:mmaaa')}`.replace(':00', '');
         return optionallUcFirst(`${prefix ? `${prefix} ` : ''}${startDateAndTime}`, shouldCapitalize);
     },
     renderTimeRange(date1, date2) {
-        return this.dates.formatTime(date1) + ' to ' + this.dates.formatTime(date2);
+        return (this.dates.formatTime(date1) + ' to ' + this.dates.formatTime(date2));
     },
 };
 exports.default = durationUtil;

package/build/utilities/sortTimezoneChoices.js

@@ -7,13 +7,15 @@ 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 = (_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": "39.0.292",
+  "version": "40.0.1",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -19,8 +19,7 @@
     "namespace": "calendar-utils",
     "upgradeIgnoreList": [
       "@sprucelabs/spruce-skill-utils",
-      "@sprucelabs/spruce-test-fixtures",
-      "date-fns"
+      "@sprucelabs/spruce-test-fixtures"
     ],
     "commandOverrides": {
       "sync.schemas": "--shouldFetchCoreSchemas false --moduleToImportFromWhenRemote @sprucelabs/calendar-utils"
@@ -47,8 +46,8 @@
     "clean.build": "rm -rf build/",
     "clean.dependencies": "rm -rf node_modules/ package-lock.json yarn.lock",
     "clean.dist": "rm -rf build/__tests__ build/esm/__tests__",
-    "fix.lint": "eslint --fix --cache '**/*.ts'",
-    "lint": "eslint --cache '**/*.ts'",
+    "fix.lint": "eslint --fix --cache",
+    "lint": "eslint --cache",
     "rebuild": "yarn clean.all && yarn && yarn build.dev",
     "release": "semantic-release",
     "resolve-paths.lint": "yarn build.resolve-paths ; yarn lint",
@@ -66,37 +65,37 @@
     "watch.rebuild": "yarn clean.all && yarn && yarn watch.build.dev"
   },
   "dependencies": {
-    "@sprucelabs/error": "^5.1.108",
-    "@sprucelabs/mercury-event-emitter": "^41.0.384",
-    "@sprucelabs/mercury-types": "^46.0.300",
-    "@sprucelabs/schema": "^29.4.60",
-    "@sprucelabs/spruce-core-schemas": "^39.0.294",
-    "@sprucelabs/spruce-event-utils": "^38.1.42",
-    "date-fns": "2.30.0",
-    "date-fns-tz": "^2.0.1",
+    "@sprucelabs/error": "^6.0.1",
+    "@sprucelabs/mercury-event-emitter": "^42.0.1",
+    "@sprucelabs/mercury-types": "^47.0.0",
+    "@sprucelabs/schema": "^30.0.1",
+    "@sprucelabs/spruce-core-schemas": "^40.0.0",
+    "@sprucelabs/spruce-event-utils": "^40.0.0",
+    "date-fns": "^3.6.0",
+    "date-fns-tz": "^3.1.2",
     "rrule": "^2.8.1"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^5.0.200",
+    "@sprucelabs/esm-postbuild": "^6.0.1",
     "@sprucelabs/jest-json-reporter": "^7.0.207",
-    "@sprucelabs/resolve-path-aliases": "^1.1.304",
-    "@sprucelabs/semantic-release": "^4.0.8",
-    "@sprucelabs/test": "^8.0.50",
-    "@sprucelabs/test-utils": "^4.0.157",
+    "@sprucelabs/resolve-path-aliases": "^2.0.3",
+    "@sprucelabs/semantic-release": "^5.0.1",
+    "@sprucelabs/test": "^9.0.2",
+    "@sprucelabs/test-utils": "^5.0.1",
     "@types/lodash": "^4.17.0",
-    "@types/node": "^20.12.4",
+    "@types/node": "^20.12.7",
     "chokidar-cli": "^3.0.0",
     "concurrently": "^8.2.2",
     "dotenv": "^16.4.5",
-    "eslint": "^8.57.0",
-    "eslint-config-spruce": "^10.13.6",
+    "eslint": "^9.0.0",
+    "eslint-config-spruce": "^11.2.5",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "prettier": "^3.2.5",
     "ts-node": "^10.9.2",
     "tsc-watch": "^6.2.0",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.4.4",
+    "typescript": "^5.4.5",
     "yarn-upgrade-all": "^0.7.2"
   },
   "jest": {

package/tsconfig.json

@@ -3,11 +3,10 @@
 		"skipLibCheck": true,
 		"module": "commonjs",
 		"esModuleInterop": true,
-		"target": "ES2017",
+		"target": "ES2022",
 		"lib": [
 			"DOM",
-			"es2017",
-			"ES2020"
+			"ES2022"
 		],
 		"declaration": true,
 		"noImplicitAny": true,
@@ -37,4 +36,4 @@
 		"build",
 		"esm"
 	]
-}
+}