@churchapps/helpers 1.2.3 → 1.2.5

package/src/DateHelper.ts

@@ -1,153 +1,154 @@
-import dayjs from "dayjs"
-
-// Use dynamic import for ES module compatibility with dayjs plugins
-const loadPlugins = async () => {
-  const utc = await import("dayjs/plugin/utc");
-  const customParseFormat = await import("dayjs/plugin/customParseFormat");
-  dayjs.extend((utc as any).default || utc);
-  dayjs.extend((customParseFormat as any).default || customParseFormat);
-};
-
-// Initialize the plugins
-loadPlugins().catch(() => {
-  console.warn("Could not load dayjs plugins");
-});
-
-export class DateHelper {
-
-  //Fixes timezone issues when you just need the date.
-  static toDate(input: any) {
-    return new Date(Date.parse(input.toString().replace("Z", "")));
-  }
-
-  static toDateTime(input: any) {
-    return new Date(Date.parse(input.toString()));
-  }
-
-  //obsolete.  Do not use
-  static convertToDate(input: any) {
-    return this.toDateTime(input);
-  }
-
-  static addDays(date: Date, days: number) {
-    const result = new Date(date.getTime());
-    result.setDate(result.getDate() + days);
-    return result;
-  }
-
-  static prettyDate(date: Date) {
-    if (date === undefined || date === null) return "";
-    return this.formatDateTime(date, "MMM d, yyyy");
-  }
-
-  static prettyDateTime(date: Date) {
-    if (date === undefined || date === null) return "";
-    return this.formatDateTime(date, "MMM d, yyyy h:mm a");
-  }
-
-  static prettyTime(date: Date) {
-    if (date === undefined || date === null) return "";
-    return this.formatDateTime(date, "h:mm a");
-  }
-
-  static getLastSunday() {
-    let result = new Date();
-    while (result.getDay() !== 0) result.setDate(result.getDate() - 1);
-    return result;
-  }
-
-  static getNextSunday() {
-    let result = this.getLastSunday();
-    result.setDate(result.getDate() + 7);
-    return result;
-  }
-
-  static getWeekSunday(year: number, week: number) {
-    let result = new Date(year, 0, 1);
-    while (result.getDay() !== 0) result.setDate(result.getDate() + 1);
-    result.setDate(result.getDate() + ((week - 1) * 7));
-    return result;
-  }
-
-  static formatHtml5Date(date: Date): string {
-    let result = "";
-    if (date !== undefined && date !== null) {
-      try {
-        result = new Date(date).toISOString().split("T")[0];
-      } catch { }
-    }
-    return result;
-  }
-
-  static formatHtml5Time(time: Date): string {
-    let h = time.getHours();
-    let m = time.getMinutes();
-    let s = time.getSeconds();
-    return `${h < 10 ? ("0" + h) : h}:${m < 10 ? ("0" + m) : m}:${s < 10 ? ("0" + s) : s}`;
-  }
-
-  static formatHtml5DateTime(date: Date): string {
-    if (date === undefined || date === null) return "";
-    else {
-      return this.formatDateTime(date, "yyyy-MM-dd") + "T" + this.formatDateTime(date, "HH:mm");
-    }
-  }
-
-  static getDisplayDuration(d: Date): string {
-    let seconds = Math.round((new Date().getTime() - d.getTime()) / 1000);
-    if (seconds > 86400) {
-      let days = Math.floor(seconds / 86400);
-      return (days === 1) ? "1d" : days.toString() + "d";
-    }
-    else if (seconds > 3600) {
-      let hours = Math.floor(seconds / 3600);
-      return (hours === 1) ? "1h" : hours.toString() + "h";
-    }
-    else if (seconds > 60) {
-      let minutes = Math.floor(seconds / 60);
-      return (minutes === 1) ? "1m" : minutes.toString() + "m";
-    }
-    else return (seconds === 1) ? "1s" : Math.floor(seconds).toString() + "s";
-  }
-
-  static getShortDate(d: Date): string {
-    return (d.getMonth() + 1).toString() + "/" + (d.getDate()).toString() + "/" + d.getFullYear().toString();
-  }
-
-  static convertDatePickerFormat(d: Date): Date {
-    const date = this.formatHtml5Date(d).split("-");
-    if (date.length === 3) return new Date(`${date[1]}-${date[2]}-${date[0]}`);
-    return new Date();
-  }
-
-  private static formatDateTime(date: Date, format: string) {
-    try {
-      // Convert date-fns format to dayjs format
-      const dayjsFormat = format
-        .replace(/yyyy/g, 'YYYY')
-        .replace(/yy/g, 'YY')
-        .replace(/d/g, 'D')
-        .replace(/DD/g, 'DD')
-        .replace(/a/g, 'A');
-      
-      return dayjs(date).format(dayjsFormat);
-    } catch { return ""; }
-  }
-
-  public static toMysqlDate(d: Date) {
-    if (d === null || d === undefined) {
-        return undefined;
-    }
-    return dayjs(d).format("YYYY-MM-DD HH:mm:ss")
-  }
-
-  public static subtractHoursFromNow(hour: number) {
-      const now = new Date();
-      return new Date(now.setHours(now.getHours() - hour));
-  }
-
-  public static toUTCDate(d: Date) {
-    return dayjs(d).utc().format("YYYY-MM-DD HH:mm:ss");
-  }
-
-}
+import dayjs from "dayjs"
+
+// Use dynamic import for ES module compatibility with dayjs plugins
+const loadPlugins = async () => {
+  const utc = await import("dayjs/plugin/utc");
+  const customParseFormat = await import("dayjs/plugin/customParseFormat");
+  dayjs.extend((utc as any).default || utc);
+  dayjs.extend((customParseFormat as any).default || customParseFormat);
+};
+
+// Initialize the plugins
+loadPlugins().catch(() => {
+  console.warn("Could not load dayjs plugins");
+});
+
+export class DateHelper {
+
+  //Fixes timezone issues when you just need the date.
+  static toDate(input: any) {
+    return new Date(Date.parse(input.toString().replace("Z", "")));
+  }
+
+  static toDateTime(input: any) {
+    return new Date(Date.parse(input.toString()));
+  }
+
+  //obsolete.  Do not use
+  static convertToDate(input: any) {
+    return this.toDateTime(input);
+  }
+
+  static addDays(date: Date, days: number) {
+    const result = new Date(date.getTime());
+    result.setDate(result.getDate() + days);
+    return result;
+  }
+
+  static prettyDate(date: Date) {
+    if (date === undefined || date === null) return "";
+    return this.formatDateTime(date, "MMM d, yyyy");
+  }
+
+  static prettyDateTime(date: Date) {
+    if (date === undefined || date === null) return "";
+    return this.formatDateTime(date, "MMM d, yyyy h:mm a");
+  }
+
+  static prettyTime(date: Date) {
+    if (date === undefined || date === null) return "";
+    return this.formatDateTime(date, "h:mm a");
+  }
+
+  static getLastSunday() {
+    let result = new Date();
+    while (result.getDay() !== 0) result.setDate(result.getDate() - 1);
+    return result;
+  }
+
+  static getNextSunday() {
+    let result = this.getLastSunday();
+    result.setDate(result.getDate() + 7);
+    return result;
+  }
+
+  static getWeekSunday(year: number, week: number) {
+    let result = new Date(year, 0, 1);
+    while (result.getDay() !== 0) result.setDate(result.getDate() + 1);
+    result.setDate(result.getDate() + ((week - 1) * 7));
+    return result;
+  }
+
+  static formatHtml5Date(date: Date): string {
+    let result = "";
+    if (date !== undefined && date !== null) {
+      try {
+        result = new Date(date).toISOString().split("T")[0];
+      } catch { }
+    }
+    return result;
+  }
+
+  static formatHtml5Time(time: Date): string {
+    if (time === undefined || time === null) return "";
+    let h = time.getHours();
+    let m = time.getMinutes();
+    let s = time.getSeconds();
+    return `${h < 10 ? ("0" + h) : h}:${m < 10 ? ("0" + m) : m}:${s < 10 ? ("0" + s) : s}`;
+  }
+
+  static formatHtml5DateTime(date: Date): string {
+    if (date === undefined || date === null) return "";
+    else {
+      return this.formatDateTime(date, "yyyy-MM-dd") + "T" + this.formatDateTime(date, "HH:mm");
+    }
+  }
+
+  static getDisplayDuration(d: Date): string {
+    let seconds = Math.round((new Date().getTime() - d.getTime()) / 1000);
+    if (seconds > 86400) {
+      let days = Math.floor(seconds / 86400);
+      return (days === 1) ? "1d" : days.toString() + "d";
+    }
+    else if (seconds > 3600) {
+      let hours = Math.floor(seconds / 3600);
+      return (hours === 1) ? "1h" : hours.toString() + "h";
+    }
+    else if (seconds > 60) {
+      let minutes = Math.floor(seconds / 60);
+      return (minutes === 1) ? "1m" : minutes.toString() + "m";
+    }
+    else return (seconds === 1) ? "1s" : Math.floor(seconds).toString() + "s";
+  }
+
+  static getShortDate(d: Date): string {
+    return (d.getMonth() + 1).toString() + "/" + (d.getDate()).toString() + "/" + d.getFullYear().toString();
+  }
+
+  static convertDatePickerFormat(d: Date): Date {
+    const date = this.formatHtml5Date(d).split("-");
+    if (date.length === 3) return new Date(`${date[1]}-${date[2]}-${date[0]}`);
+    return new Date();
+  }
+
+  private static formatDateTime(date: Date, format: string) {
+    try {
+      // Convert date-fns format to dayjs format
+      const dayjsFormat = format
+        .replace(/yyyy/g, 'YYYY')
+        .replace(/yy/g, 'YY')
+        .replace(/d/g, 'D')
+        .replace(/DD/g, 'DD')
+        .replace(/a/g, 'A');
+      
+      return dayjs(date).format(dayjsFormat);
+    } catch { return ""; }
+  }
+
+  public static toMysqlDate(d: Date) {
+    if (d === null || d === undefined) {
+        return undefined;
+    }
+    return dayjs(d).format("YYYY-MM-DD HH:mm:ss")
+  }
+
+  public static subtractHoursFromNow(hour: number) {
+      const now = new Date();
+      return new Date(now.setHours(now.getHours() - hour));
+  }
+
+  public static toUTCDate(d: Date) {
+    return dayjs(d).utc().format("YYYY-MM-DD HH:mm:ss");
+  }
+
+}

package/src/DonationHelper.ts

@@ -1,26 +1,26 @@
-export class DonationHelper {
-
-  static getInterval(intervalName:string) {
-    let intervalCount = 1;
-    let intervalType = "month";
-    let parts = intervalName.split("_");
-    if (parts.length === 2) {
-      switch (parts[0])
-      {
-        case "two": intervalCount = 2; break;
-        case "three": intervalCount = 3; break;
-      }
-      intervalType = parts[1];
-    }
-    let result = { interval_count: intervalCount, interval: intervalType };
-    return result;
-  }
-
-  static getIntervalKeyName(intervalCount: number, intervalType: string) {
-    let firstPart = "one";
-    if (intervalCount === 2) firstPart = "two";
-    else if (intervalCount === 3) firstPart = "three";
-    return firstPart + "_" + intervalType;
-  }
-
-}
+export class DonationHelper {
+
+  static getInterval(intervalName:string) {
+    let intervalCount = 1;
+    let intervalType = "month";
+    let parts = intervalName.split("_");
+    if (parts.length === 2) {
+      switch (parts[0])
+      {
+        case "two": intervalCount = 2; break;
+        case "three": intervalCount = 3; break;
+      }
+      intervalType = parts[1];
+    }
+    let result = { interval_count: intervalCount, interval: intervalType };
+    return result;
+  }
+
+  static getIntervalKeyName(intervalCount: number, intervalType: string) {
+    let firstPart = "one";
+    if (intervalCount === 2) firstPart = "two";
+    else if (intervalCount === 3) firstPart = "three";
+    return firstPart + "_" + intervalType;
+  }
+
+}

package/src/ErrorHelper.ts

@@ -1,39 +1,39 @@
-import { ErrorLogInterface, ErrorAppDataInterface } from "./interfaces/Error";
-import { ApiHelper } from "./ApiHelper";
-
-
-export class ErrorHelper {
-
-  static getAppData: () => { churchId: string, userId: string, originUrl: string, application: string };
-  static customErrorHandler: (errorLog: ErrorLogInterface) => void;
-
-  static init = (getAppData: () => ErrorAppDataInterface, customErrorHandler: (errorLog: ErrorLogInterface) => void) => {
-    ErrorHelper.getAppData = getAppData;
-    ErrorHelper.customErrorHandler = customErrorHandler;
-  }
-
-  static logError = (errorType: string, message: string, details: string) => {
-
-
-    if (this.getAppData) {
-      const data = this.getAppData();
-      const log: ErrorLogInterface = {
-        application: data.application,
-        errorTime: new Date(),
-        userId: data.userId,
-        churchId: data.churchId,
-        originUrl: data.originUrl,
-        errorType: errorType,
-        message: message,
-        details: details
-      }
-
-      if (log.errorType === "401" && log.message.indexOf("/users/login") > -1) return;
-      //temporarily disabled error logging
-      //ApiHelper.postAnonymous("/errors", [log], "MembershipApi");
-      if (ErrorHelper.customErrorHandler) ErrorHelper.customErrorHandler(log);
-    }
-  }
-
-
-}
+import { ErrorLogInterface, ErrorAppDataInterface } from "./interfaces/Error";
+import { ApiHelper } from "./ApiHelper";
+
+
+export class ErrorHelper {
+
+  static getAppData: () => { churchId: string, userId: string, originUrl: string, application: string };
+  static customErrorHandler: (errorLog: ErrorLogInterface) => void;
+
+  static init = (getAppData: () => ErrorAppDataInterface, customErrorHandler: (errorLog: ErrorLogInterface) => void) => {
+    ErrorHelper.getAppData = getAppData;
+    ErrorHelper.customErrorHandler = customErrorHandler;
+  }
+
+  static logError = (errorType: string, message: string, details: string) => {
+
+
+    if (this.getAppData) {
+      const data = this.getAppData();
+      const log: ErrorLogInterface = {
+        application: data.application,
+        errorTime: new Date(),
+        userId: data.userId,
+        churchId: data.churchId,
+        originUrl: data.originUrl,
+        errorType: errorType,
+        message: message,
+        details: details
+      }
+
+      if (log.errorType === "401" && log.message.indexOf("/users/login") > -1) return;
+      //temporarily disabled error logging
+      //ApiHelper.postAnonymous("/errors", [log], "MembershipApi");
+      if (ErrorHelper.customErrorHandler) ErrorHelper.customErrorHandler(log);
+    }
+  }
+
+
+}

package/src/EventHelper.ts

@@ -1,49 +1,49 @@
-import { EventInterface } from "./interfaces";
-import { RRule, datetime } from "rrule";
-import { ParsedOptions } from "rrule/dist/esm/types";
-
-export class EventHelper {
-
-  static getRange = (event:EventInterface, startDate:Date, endDate:Date) => {
-    const start = new Date(event.start);
-    const rrule = EventHelper.getFullRRule(event);
-
-    const dates = rrule.between(startDate, endDate);
-
-    dates.forEach(d => {
-      d.setHours(start.getHours());
-      d.setMinutes(start.getMinutes());
-      d.setSeconds(start.getSeconds());
-    })
-    return dates;
-  }
-
-  static getFullRRule = (event:EventInterface) => {
-    let rrule = RRule.fromString(event.recurrenceRule);
-    rrule.options.dtstart = new Date(event.start);
-    return rrule;
-  }
-
-  static removeExcludeDates = (events:EventInterface[]) => {
-    for (let i=events.length-1; i>=0; i--) {
-      if (events[i].exceptionDates?.length>0)
-      {
-        const parsedDates = events[i].exceptionDates.map(d=>new Date(d).toISOString());
-        if (parsedDates.indexOf(events[i].start.toISOString())>-1) events.splice(i,1);
-      }
-    }
-  }
-
-  static getPartialRRuleString = (options:ParsedOptions) => {
-    const parts = new RRule(options).toString().split("RRULE:");
-    const result = parts.length===2 ? parts[1] : "";
-    return result;
-  }
-
-  static cleanRule = (options:ParsedOptions) => {
-    options.byhour = undefined;
-    options.byminute = undefined;
-    options.bysecond = undefined;
-  }
-
-}
+import { EventInterface } from "./interfaces";
+import { RRule, datetime } from "rrule";
+import { ParsedOptions } from "rrule/dist/esm/types";
+
+export class EventHelper {
+
+  static getRange = (event:EventInterface, startDate:Date, endDate:Date) => {
+    const start = new Date(event.start);
+    const rrule = EventHelper.getFullRRule(event);
+
+    const dates = rrule.between(startDate, endDate);
+
+    dates.forEach(d => {
+      d.setHours(start.getHours());
+      d.setMinutes(start.getMinutes());
+      d.setSeconds(start.getSeconds());
+    })
+    return dates;
+  }
+
+  static getFullRRule = (event:EventInterface) => {
+    let rrule = RRule.fromString(event.recurrenceRule);
+    rrule.options.dtstart = new Date(event.start);
+    return rrule;
+  }
+
+  static removeExcludeDates = (events:EventInterface[]) => {
+    for (let i=events.length-1; i>=0; i--) {
+      if (events[i].exceptionDates?.length>0)
+      {
+        const parsedDates = events[i].exceptionDates.map(d=>new Date(d).toISOString());
+        if (parsedDates.indexOf(events[i].start.toISOString())>-1) events.splice(i,1);
+      }
+    }
+  }
+
+  static getPartialRRuleString = (options:ParsedOptions) => {
+    const parts = new RRule(options).toString().split("RRULE:");
+    const result = parts.length===2 ? parts[1] : "";
+    return result;
+  }
+
+  static cleanRule = (options:ParsedOptions) => {
+    options.byhour = undefined;
+    options.byminute = undefined;
+    options.bysecond = undefined;
+  }
+
+}

package/src/FileHelper.ts

@@ -1,55 +1,55 @@
-export class FileHelper {
-
-  static postPresignedFile = (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void) => {
-    const formData = new FormData();
-    formData.append("key", presigned.key);
-    formData.append("acl", "public-read");
-    formData.append("Content-Type", uploadedFile.type);
-    for (const property in presigned.fields) formData.append(property, presigned.fields[property]);
-    formData.append("file", uploadedFile);
-
-    // Use XMLHttpRequest for upload progress tracking since fetch doesn't support it natively
-    return new Promise((resolve, reject) => {
-      const xhr = new XMLHttpRequest();
-
-      xhr.upload.addEventListener('progress', (event) => {
-        if (event.lengthComputable) {
-          const percent = Math.round((event.loaded / event.total) * 100);
-          progressCallback(percent);
-        }
-      });
-
-      xhr.addEventListener('load', () => {
-        if (xhr.status >= 200 && xhr.status < 300) {
-          resolve({
-            status: xhr.status,
-            statusText: xhr.statusText,
-            data: xhr.responseText
-          });
-        } else {
-          reject(new Error(`HTTP Error: ${xhr.status} ${xhr.statusText}`));
-        }
-      });
-
-      xhr.addEventListener('error', () => {
-        reject(new Error('Network error occurred'));
-      });
-
-      xhr.open('POST', presigned.url);
-      xhr.send(formData);
-    });
-  };
-
-  static dataURLtoBlob(dataurl: string) {
-    let arr = dataurl.split(",");
-    if (arr.length < 2) throw new Error("Invalid data URL format");
-    let mimeMatch = arr[0].match(/:(.*?);/);
-    if (!mimeMatch) throw new Error("Invalid MIME type in data URL");
-    let mime = mimeMatch[1];
-    let bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
-    while (n--) {
-      u8arr[n] = bstr.charCodeAt(n);
-    }
-    return new Blob([u8arr], { type: mime });
-  }
-}
+export class FileHelper {
+
+  static postPresignedFile = (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void) => {
+    const formData = new FormData();
+    formData.append("key", presigned.key);
+    formData.append("acl", "public-read");
+    formData.append("Content-Type", uploadedFile.type);
+    for (const property in presigned.fields) formData.append(property, presigned.fields[property]);
+    formData.append("file", uploadedFile);
+
+    // Use XMLHttpRequest for upload progress tracking since fetch doesn't support it natively
+    return new Promise((resolve, reject) => {
+      const xhr = new XMLHttpRequest();
+
+      xhr.upload.addEventListener('progress', (event) => {
+        if (event.lengthComputable) {
+          const percent = Math.round((event.loaded / event.total) * 100);
+          progressCallback(percent);
+        }
+      });
+
+      xhr.addEventListener('load', () => {
+        if (xhr.status >= 200 && xhr.status < 300) {
+          resolve({
+            status: xhr.status,
+            statusText: xhr.statusText,
+            data: xhr.responseText
+          });
+        } else {
+          reject(new Error(`HTTP Error: ${xhr.status} ${xhr.statusText}`));
+        }
+      });
+
+      xhr.addEventListener('error', () => {
+        reject(new Error('Network error occurred'));
+      });
+
+      xhr.open('POST', presigned.url);
+      xhr.send(formData);
+    });
+  };
+
+  static dataURLtoBlob(dataurl: string) {
+    let arr = dataurl.split(",");
+    if (arr.length < 2) throw new Error("Invalid data URL format");
+    let mimeMatch = arr[0].match(/:(.*?);/);
+    if (!mimeMatch) throw new Error("Invalid MIME type in data URL");
+    let mime = mimeMatch[1];
+    let bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
+    while (n--) {
+      u8arr[n] = bstr.charCodeAt(n);
+    }
+    return new Blob([u8arr], { type: mime });
+  }
+}