@churchapps/helpers 1.2.23 → 1.2.24

package/src/DateHelper.ts

@@ -1,4 +1,4 @@
-import dayjs from "dayjs"
+import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc.js";
 import customParseFormat from "dayjs/plugin/customParseFormat.js";
 
@@ -53,19 +53,19 @@ export class DateHelper {
   }
 
   static getLastSunday() {
-    let result = new Date();
+    const result = new Date();
     while (result.getDay() !== 0) result.setDate(result.getDate() - 1);
     return result;
   }
 
   static getNextSunday() {
-    let result = this.getLastSunday();
+    const result = this.getLastSunday();
     result.setDate(result.getDate() + 7);
     return result;
   }
 
   static getWeekSunday(year: number, week: number) {
-    let result = new Date(year, 0, 1);
+    const result = new Date(year, 0, 1);
     while (result.getDay() !== 0) result.setDate(result.getDate() + 1);
     result.setDate(result.getDate() + ((week - 1) * 7));
     return result;
@@ -75,10 +75,10 @@ export class DateHelper {
     if (!date) return "";
 
     // If already a YYYY-MM-DD string, return as-is
-    if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(date)) return date;
+    if (typeof date === "string" && /^\d{4}-\d{2}-\d{2}$/.test(date)) return date;
 
     // If ISO string, extract date portion (ignore timezone)
-    if (typeof date === 'string') {
+    if (typeof date === "string") {
       const match = date.match(/^(\d{4}-\d{2}-\d{2})/);
       if (match) return match[1];
     }
@@ -88,8 +88,8 @@ export class DateHelper {
     if (isNaN(d.getTime())) return "";
 
     const year = d.getFullYear();
-    const month = String(d.getMonth() + 1).padStart(2, '0');
-    const day = String(d.getDate()).padStart(2, '0');
+    const month = String(d.getMonth() + 1).padStart(2, "0");
+    const day = String(d.getDate()).padStart(2, "0");
     return `${year}-${month}-${day}`;
   }
 
@@ -97,22 +97,22 @@ export class DateHelper {
   static toMysqlDateOnly(date: Date | string | null | undefined): string | null {
     if (date === null || date === undefined) return null;
 
-    if (typeof date === 'string') {
+    if (typeof date === "string") {
       const match = date.match(/^(\d{4}-\d{2}-\d{2})/);
       return match ? match[1] : null;
     }
 
     const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, '0');
-    const day = String(date.getDate()).padStart(2, '0');
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
     return `${year}-${month}-${day}`;
   }
 
   static formatHtml5Time(time: Date): string {
     if (time === undefined || time === null) return "";
-    let h = time.getHours();
-    let m = time.getMinutes();
-    let s = time.getSeconds();
+    const h = time.getHours();
+    const m = time.getMinutes();
+    const s = time.getSeconds();
     return `${h < 10 ? ("0" + h) : h}:${m < 10 ? ("0" + m) : m}:${s < 10 ? ("0" + s) : s}`;
   }
 
@@ -124,20 +124,17 @@ export class DateHelper {
   }
 
   static getDisplayDuration(d: Date): string {
-    let seconds = Math.round((new Date().getTime() - d.getTime()) / 1000);
+    const seconds = Math.round((new Date().getTime() - d.getTime()) / 1000);
     if (seconds > 86400) {
-      let days = Math.floor(seconds / 86400);
+      const days = Math.floor(seconds / 86400);
       return (days === 1) ? "1d" : days.toString() + "d";
-    }
-    else if (seconds > 3600) {
-      let hours = Math.floor(seconds / 3600);
+    } else if (seconds > 3600) {
+      const hours = Math.floor(seconds / 3600);
       return (hours === 1) ? "1h" : hours.toString() + "h";
-    }
-    else if (seconds > 60) {
-      let minutes = Math.floor(seconds / 60);
+    } else if (seconds > 60) {
+      const minutes = Math.floor(seconds / 60);
       return (minutes === 1) ? "1m" : minutes.toString() + "m";
-    }
-    else return (seconds === 1) ? "1s" : Math.floor(seconds).toString() + "s";
+    } else return (seconds === 1) ? "1s" : Math.floor(seconds).toString() + "s";
   }
 
   static getShortDate(d: Date): string {
@@ -154,26 +151,26 @@ export class DateHelper {
     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');
-      
+        .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 undefined;
     }
-    return dayjs(d).format("YYYY-MM-DD HH:mm:ss")
+    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));
+    const now = new Date();
+    return new Date(now.setHours(now.getHours() - hour));
   }
 
   public static toUTCDate(d: Date) {

package/src/DonationHelper.ts

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

package/src/ErrorHelper.ts

@@ -1,7 +1,6 @@
 import { ErrorLogInterface, ErrorAppDataInterface } from "./interfaces/Error.js";
-import { ApiHelper } from "./ApiHelper.js";
-
-
+
+
 export class ErrorHelper {
 
   static getAppData: () => { churchId: string, userId: string, originUrl: string, application: string };
@@ -10,7 +9,7 @@ export class ErrorHelper {
   static init = (getAppData: () => ErrorAppDataInterface, customErrorHandler: (errorLog: ErrorLogInterface) => void) => {
     ErrorHelper.getAppData = getAppData;
     ErrorHelper.customErrorHandler = customErrorHandler;
-  }
+  };
 
   static logError = (errorType: string, message: string, details: string) => {
 
@@ -26,14 +25,14 @@ export class ErrorHelper {
         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

@@ -45,39 +45,38 @@ export class EventHelper {
       d.setHours(start.getHours());
       d.setMinutes(start.getMinutes());
       d.setSeconds(start.getSeconds());
-    })
+    });
     return dates;
-  }
+  };
 
   static getFullRRule = (event:EventInterface) => {
     const RR = getRRule();
-    let rrule = RR.fromString(event.recurrenceRule);
+    const rrule = RR.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)
-      {
+    for (let i = events.length - 1; i >= 0; i--) {
+      if (events[i].exceptionDates?.length > 0) {
         const parsedDates = events[i].exceptionDates.map((d: string | Date)=>new Date(d).toISOString());
-        if (parsedDates.indexOf(events[i].start.toISOString())>-1) events.splice(i,1);
+        if (parsedDates.indexOf(events[i].start.toISOString()) > -1) events.splice(i, 1);
       }
     }
-  }
+  };
 
   static getPartialRRuleString = (options:ParsedOptions) => {
     const RR = getRRule();
     const parts = new RR(options).toString().split("RRULE:");
-    const result = parts.length===2 ? parts[1] : "";
+    const result = parts.length === 2 ? parts[1] : "";
     return result;
-  }
+  };
 
   static cleanRule = (options:ParsedOptions) => {
     options.byhour = undefined;
     options.byminute = undefined;
     options.bysecond = undefined;
-  }
+  };
 
   // Export for consumers who need to ensure initialization
   static ensureInitialized = ensureRRule;

package/src/FileHelper.ts

@@ -12,14 +12,14 @@ export class FileHelper {
     return new Promise((resolve, reject) => {
       const xhr = new XMLHttpRequest();
 
-      xhr.upload.addEventListener('progress', (event) => {
+      xhr.upload.addEventListener("progress", (event) => {
         if (event.lengthComputable) {
           const percent = Math.round((event.loaded / event.total) * 100);
           progressCallback(percent);
         }
       });
 
-      xhr.addEventListener('load', () => {
+      xhr.addEventListener("load", () => {
         if (xhr.status >= 200 && xhr.status < 300) {
           resolve({
             status: xhr.status,
@@ -31,22 +31,24 @@ export class FileHelper {
         }
       });
 
-      xhr.addEventListener('error', () => {
-        reject(new Error('Network error occurred'));
+      xhr.addEventListener("error", () => {
+        reject(new Error("Network error occurred"));
       });
 
-      xhr.open('POST', presigned.url);
+      xhr.open("POST", presigned.url);
       xhr.send(formData);
     });
   };
 
   static dataURLtoBlob(dataurl: string) {
-    let arr = dataurl.split(",");
+    const arr = dataurl.split(",");
     if (arr.length < 2) throw new Error("Invalid data URL format");
-    let mimeMatch = arr[0].match(/:(.*?);/);
+    const 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);
+    const mime = mimeMatch[1];
+    const bstr = atob(arr[1]);
+    let n = bstr.length;
+    const u8arr = new Uint8Array(n);
     while (n--) {
       u8arr[n] = bstr.charCodeAt(n);
     }

package/src/PersonHelper.ts

@@ -7,12 +7,11 @@ export class PersonHelper {
     if (!person.photoUpdated) {
       if (person.id?.startsWith("PER0000")) return "https://app.staging.b1.church/images/demo/avatars/" + person.id + ".svg";
       else return "";
-    }
-    else return "/" + churchId + "/membership/people/" + person.id + ".png?dt=" + new Date(person.photoUpdated).getTime().toString();
+    } else return "/" + churchId + "/membership/people/" + person.id + ".png?dt=" + new Date(person.photoUpdated).getTime().toString();
   }
 
   static getPhotoUrl(person: PersonInterface) {
-    if (!person?.photo) return "/images/sample-profile.png"
+    if (!person?.photo) return "/images/sample-profile.png";
     else {
       return (person?.photo?.startsWith("data:image/png;base64,") || person.photo?.indexOf("://") > -1)
         ? person.photo
@@ -22,12 +21,11 @@ export class PersonHelper {
 
   static getAge(birthdate: Date): string {
     if (birthdate !== undefined && birthdate !== null) {
-      let ageDifMs = Date.now() - new Date(birthdate).getTime();
-      let ageDate = new Date(ageDifMs);
-      let years = Math.abs(ageDate.getUTCFullYear() - 1970);
+      const ageDifMs = Date.now() - new Date(birthdate).getTime();
+      const ageDate = new Date(ageDifMs);
+      const years = Math.abs(ageDate.getUTCFullYear() - 1970);
       return years + " years";
-    }
-    else return "";
+    } else return "";
   }
 
   public static getDisplayNameFromPerson(person: any) {
@@ -50,13 +48,13 @@ export class PersonHelper {
     const displayAddress2: string = this.addressToString(address2).trim();
 
     if (displayAddress1 !== displayAddress2) {
-      return true
+      return true;
     }
-    return false
+    return false;
   }
 
   public static addressToString(address: ContactInfoInterface): string {
-    return `${address.address1 || ""} ${address.address2 || ""} ${address.city || ""}${(address.city && address.state) ? "," : ""} ${address.state || ""} ${address.zip || ""}`
+    return `${address.address1 || ""} ${address.address2 || ""} ${address.city || ""}${(address.city && address.state) ? "," : ""} ${address.state || ""} ${address.zip || ""}`;
   }
 
   public static changeOnlyAddress(contactInfo1: ContactInfoInterface, contactInfo2: ContactInfoInterface): ContactInfoInterface {
@@ -67,9 +65,9 @@ export class PersonHelper {
       city: contactInfo2.city,
       state: contactInfo2.state,
       zip: contactInfo2.zip
-    }
+    };
 
-    return updatedAddress
+    return updatedAddress;
   }
 
   public static checkAddressAvailabilty(person: PersonInterface): boolean {

package/src/PlanHelper.ts

@@ -3,9 +3,7 @@ import type { ContentProviderInterface } from "./contentProviders/ContentProvide
 import { LessonsContentProvider } from "./contentProviders/LessonsContentProvider.js";
 
 export class PlanHelper {
-  private static providers: ContentProviderInterface[] = [
-    new LessonsContentProvider()
-  ];
+  private static providers: ContentProviderInterface[] = [new LessonsContentProvider()];
 
   // Register additional content providers
   static registerProvider(provider: ContentProviderInterface): void {

package/src/UniqueIdHelper.ts

@@ -1,13 +1,136 @@
 export class UniqueIdHelper {
 
-  static chars = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
-    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-    "-", "_"];
+  static chars = [
+    "A",
+    "B",
+    "C",
+    "D",
+    "E",
+    "F",
+    "G",
+    "H",
+    "I",
+    "J",
+    "K",
+    "L",
+    "M",
+    "N",
+    "O",
+    "P",
+    "Q",
+    "R",
+    "S",
+    "T",
+    "U",
+    "V",
+    "W",
+    "X",
+    "Y",
+    "Z",
+    "a",
+    "b",
+    "c",
+    "d",
+    "e",
+    "f",
+    "g",
+    "h",
+    "i",
+    "j",
+    "k",
+    "l",
+    "m",
+    "n",
+    "o",
+    "p",
+    "q",
+    "r",
+    "s",
+    "t",
+    "u",
+    "v",
+    "w",
+    "x",
+    "y",
+    "z",
+    "0",
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+    "-",
+    "_"
+  ];
 
-  static alphanumericChars = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
-    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
+  static alphanumericChars = [
+    "A",
+    "B",
+    "C",
+    "D",
+    "E",
+    "F",
+    "G",
+    "H",
+    "I",
+    "J",
+    "K",
+    "L",
+    "M",
+    "N",
+    "O",
+    "P",
+    "Q",
+    "R",
+    "S",
+    "T",
+    "U",
+    "V",
+    "W",
+    "X",
+    "Y",
+    "Z",
+    "a",
+    "b",
+    "c",
+    "d",
+    "e",
+    "f",
+    "g",
+    "h",
+    "i",
+    "j",
+    "k",
+    "l",
+    "m",
+    "n",
+    "o",
+    "p",
+    "q",
+    "r",
+    "s",
+    "t",
+    "u",
+    "v",
+    "w",
+    "x",
+    "y",
+    "z",
+    "0",
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9"
+  ];
 
   public static isMissing(obj: any) {
     if (obj === undefined || obj === null) return true;

package/src/UserHelper.ts

@@ -1,4 +1,4 @@
-import { ApiHelper } from "./ApiHelper.js"
+import { ApiHelper } from "./ApiHelper.js";
 import { UserInterface, UserContextInterface, IApiPermission, PersonInterface, LoginUserChurchInterface } from "./interfaces/index.js";
 
 export class UserHelper {
@@ -15,8 +15,7 @@ export class UserHelper {
       UserHelper.userChurches.forEach(uc => {
         if (uc.church.id === churchId) userChurch = uc;
       });
-    }
-    else if (keyName) UserHelper.userChurches.forEach(uc => { if (uc.church.subDomain === keyName) userChurch = uc; });
+    } else if (keyName) UserHelper.userChurches.forEach(uc => { if (uc.church.subDomain === keyName) userChurch = uc; });
     else userChurch = UserHelper.userChurches[0];
     if (!userChurch) return;
     else {
@@ -28,7 +27,7 @@ export class UserHelper {
         context.setUserChurch(UserHelper.currentUserChurch);
       }
     }
-  }
+  };
 
   static setupApiHelper(userChurch: LoginUserChurchInterface) {
     ApiHelper.setDefaultPermissions(userChurch.jwt);

package/src/contentProviders/LessonsContentProvider.ts

@@ -33,8 +33,7 @@ export class LessonsContentProvider implements ContentProviderInterface {
     const actions = planItems.filter(p => p.itemType === "lessonAction" && p.relatedId);
     const addOns = planItems.filter(p => p.itemType === "lessonAddOn" && p.relatedId);
     const sections = planItems.filter(p =>
-      (p.itemType === "lessonSection" || p.itemType === "item") && p.relatedId
-    );
+      (p.itemType === "lessonSection" || p.itemType === "item") && p.relatedId);
 
     const externalRef = this.getExternalRef(plan);
 

package/src/interfaces/Doing.ts

@@ -136,4 +136,7 @@ export interface PlanItemInterface {
   children?: PlanItemInterface[];
   content?: PlanItemContentInterface;  // Populated by PlanHelper
   providerId?: string;  // Provider that owns this item's content
+  providerPath?: string;  // Path to fetch instructions from provider
+  providerContentPath?: string;  // Dot-notation path to specific content item (e.g. "0.2.1")
+  thumbnailUrl?: string;
 }

package/src/interfaces/Permissions.ts

@@ -9,9 +9,7 @@ export class Permissions {
       },
       edit: { api: "AttendanceApi", contentType: "Attendance", action: "Edit" }
     },
-    services: {
-      edit: { api: "AttendanceApi", contentType: "Services", action: "Edit" }
-    }
+    services: { edit: { api: "AttendanceApi", contentType: "Services", action: "Edit" } }
   };
 
   static membershipApi = {
@@ -19,19 +17,13 @@ export class Permissions {
       view: { api: "MembershipApi", contentType: "Roles", action: "View" },
       edit: { api: "MembershipApi", contentType: "Roles", action: "Edit" }
     },
-    settings: {
-      edit: { api: "MembershipApi", contentType: "Settings", action: "Edit" }
-    },
-    server: {
-      admin: { api: "MembershipApi", contentType: "Server", action: "Admin" }
-    },
+    settings: { edit: { api: "MembershipApi", contentType: "Settings", action: "Edit" } },
+    server: { admin: { api: "MembershipApi", contentType: "Server", action: "Admin" } },
     forms: {
       admin: { api: "MembershipApi", contentType: "Forms", action: "Admin" },
       edit: { api: "MembershipApi", contentType: "Forms", action: "Edit" }
     },
-    groups: {
-      edit: { api: "MembershipApi", contentType: "Groups", action: "Edit" }
-    },
+    groups: { edit: { api: "MembershipApi", contentType: "Groups", action: "Edit" } },
     people: {
       view: { api: "MembershipApi", contentType: "People", action: "View" },
       viewMembers: {
@@ -41,9 +33,7 @@ export class Permissions {
       },
       edit: { api: "MembershipApi", contentType: "People", action: "Edit" }
     },
-    plans: {
-      edit: { api: "MembershipApi", contentType: "Plans", action: "Edit" }
-    },
+    plans: { edit: { api: "MembershipApi", contentType: "Plans", action: "Edit" } },
     groupMembers: {
       edit: {
         api: "MembershipApi",
@@ -75,12 +65,8 @@ export class Permissions {
   };
 
   static contentApi = {
-    chat: {
-      host: { api: "ContentApi", contentType: "Chat", action: "Host" }
-    },
-    content: {
-      edit: { api: "ContentApi", contentType: "Content", action: "Edit" }
-    },
+    chat: { host: { api: "ContentApi", contentType: "Chat", action: "Host" } },
+    content: { edit: { api: "ContentApi", contentType: "Content", action: "Edit" } },
     streamingServices: {
       edit: {
         api: "ContentApi",

package/.eslintrc.json

@@ -1,29 +0,0 @@
-{
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 2020,
-    "sourceType": "module"
-  },
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "rules": {
-    "@typescript-eslint/no-explicit-any": "warn",
-    "@typescript-eslint/no-unused-vars": "off",
-    "no-unused-vars": "off",
-    "prefer-const": "error",
-    "no-console": "warn",
-    "comma-dangle": ["error", "never"],
-    "object-curly-newline": ["error", { "multiline": true, "consistent": true }],
-    "array-bracket-newline": ["error", "consistent"]
-  },
-  "ignorePatterns": [
-    "dist/**",
-    "node_modules/**"
-  ]
-}

package/.prettierrc

@@ -1,12 +0,0 @@
-{
-  "trailingComma": "none",
-  "printWidth": 120,
-  "tabWidth": 2,
-  "useTabs": false,
-  "semi": true,
-  "singleQuote": false,
-  "quoteProps": "as-needed",
-  "bracketSpacing": true,
-  "bracketSameLine": false,
-  "arrowParens": "avoid"
-}