@churchapps/helpers 1.2.3 → 1.2.5

package/package.json

@@ -1,49 +1,50 @@
-{
-  "name": "@churchapps/helpers",
-  "version": "1.2.3",
-  "description": "Library of helper functions not specific to any one ChurchApps project or framework.",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "clean": "rimraf dist",
-    "build": "yarn clean && tsc",
-    "lint": "eslint src/**/*.ts",
-    "lint:fix": "eslint src/**/*.ts --fix",
-    "format": "prettier --write src/**/*.ts"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/LiveChurchSolutions/Helpers.git"
-  },
-  "keywords": [
-    "ChurchApps"
-  ],
-  "author": "ChurchApps.org",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/LiveChurchSolutions/Helpers/issues"
-  },
-  "homepage": "https://github.com/LiveChurchSolutions/Helpers#readme",
-  "engines": {
-    "node": ">=20.0.0",
-    "yarn": ">=1.22.0",
-    "npm": ">=8.0.0"
-  },
-  "devDependencies": {
-    "@types/node": "^24.5.0",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^7.0.0",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.4",
-    "npm-run-all2": "^8.0.4",
-    "prettier": "^3.6.2",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.9.2"
-  },
-  "dependencies": {
-    "dayjs": "^1.11.18",
-    "rrule": "^2.8.1"
-  }
-}
+{
+  "name": "@churchapps/helpers",
+  "version": "1.2.5",
+  "description": "Library of helper functions not specific to any one ChurchApps project or framework.",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "clean": "rimraf dist",
+    "build": "yarn clean && tsc",
+    "lint": "eslint src/**/*.ts",
+    "lint:fix": "eslint src/**/*.ts --fix",
+    "format": "prettier --write src/**/*.ts",
+    "publish": "npm run build && npm publish --access=public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/LiveChurchSolutions/Helpers.git"
+  },
+  "keywords": [
+    "ChurchApps"
+  ],
+  "author": "ChurchApps.org",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/LiveChurchSolutions/Helpers/issues"
+  },
+  "homepage": "https://github.com/LiveChurchSolutions/Helpers#readme",
+  "engines": {
+    "node": ">=20.0.0",
+    "yarn": ">=1.22.0",
+    "npm": ">=8.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^24.5.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/parser": "^7.0.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.4",
+    "npm-run-all2": "^8.0.4",
+    "prettier": "^3.6.2",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.9.2"
+  },
+  "dependencies": {
+    "dayjs": "^1.11.18",
+    "rrule": "^2.8.1"
+  }
+}

package/scripts/build-cjs.js

@@ -1,33 +1,33 @@
-import fs from 'fs-extra';
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-async function buildCjs() {
-  try {
-    const distDir = path.join(__dirname, '..', 'dist');
-    
-    // Read the ES module index
-    const esmContent = await fs.readFile(path.join(distDir, 'index.js'), 'utf8');
-    
-    // Convert ES module syntax to CommonJS
-    let cjsContent = esmContent
-      .replace(/export \* from "(.+?)";/g, 'Object.assign(module.exports, require("$1"));')
-      .replace(/export \{ (.+?) \} from "(.+?)";/g, (match, exports, from) => {
-        const exportList = exports.split(',').map(e => e.trim());
-        return exportList.map(exp => `module.exports.${exp} = require("${from}").${exp};`).join('\n');
-      });
-    
-    // Write CommonJS version
-    await fs.writeFile(path.join(distDir, 'index.cjs'), cjsContent);
-    
-    console.log('CommonJS build created successfully');
-  } catch (error) {
-    console.error('Error building CommonJS version:', error);
-    process.exit(1);
-  }
-}
-
+import fs from 'fs-extra';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+async function buildCjs() {
+  try {
+    const distDir = path.join(__dirname, '..', 'dist');
+    
+    // Read the ES module index
+    const esmContent = await fs.readFile(path.join(distDir, 'index.js'), 'utf8');
+    
+    // Convert ES module syntax to CommonJS
+    let cjsContent = esmContent
+      .replace(/export \* from "(.+?)";/g, 'Object.assign(module.exports, require("$1"));')
+      .replace(/export \{ (.+?) \} from "(.+?)";/g, (match, exports, from) => {
+        const exportList = exports.split(',').map(e => e.trim());
+        return exportList.map(exp => `module.exports.${exp} = require("${from}").${exp};`).join('\n');
+      });
+    
+    // Write CommonJS version
+    await fs.writeFile(path.join(distDir, 'index.cjs'), cjsContent);
+    
+    console.log('CommonJS build created successfully');
+  } catch (error) {
+    console.error('Error building CommonJS version:', error);
+    process.exit(1);
+  }
+}
+
 buildCjs();

package/src/ApiHelper.ts

@@ -1,176 +1,169 @@
-import { ApiConfig, RolePermissionInterface, ApiListType } from "./interfaces";
-import { ErrorHelper } from "./ErrorHelper";
-
-// Global singleton pattern to ensure single instance across all packages
-declare global {
-  interface Window {
-    __CHURCHAPPS_API_HELPER__?: ApiHelperClass;
-  }
-  var __CHURCHAPPS_API_HELPER__: ApiHelperClass | undefined;
-}
-
-class ApiHelperClass {
-
-  apiConfigs: ApiConfig[] = [];
-  isAuthenticated = false;
-  onRequest: (url:string, requestOptions:any) => void;
-  onError: (url:string, requestOptions:any, error: any) => void;
-
-  getConfig(keyName: string) {
-    let result: ApiConfig = null;
-    this.apiConfigs.forEach(config => { if (config.keyName === keyName) result = config });
-    //if (result === null) throw new Error("Unconfigured API: " + keyName);
-    return result;
-  }
-
-  setDefaultPermissions(jwt: string) {
-    this.apiConfigs.forEach(config => {
-      config.jwt = jwt;
-      config.permissions = [];
-    });
-    this.isAuthenticated = true;
-  }
-
-  setPermissions(keyName: string, jwt: string, permissions: RolePermissionInterface[]) {
-    this.apiConfigs.forEach(config => {
-      if (config.keyName === keyName) {
-        config.jwt = jwt;
-        config.permissions = permissions;
-      }
-    });
-    this.isAuthenticated = true;
-  }
-
-  clearPermissions() {
-    this.apiConfigs.forEach(config => { config.jwt = ""; config.permissions = []; });
-    this.isAuthenticated = false;
-  }
-
-  async get(path: string, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    if (!config) throw new Error(`API configuration not found: ${apiName}`);
-    const requestOptions = { method: "GET", headers: { Authorization: "Bearer " + config.jwt } };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  async getAnonymous(path: string, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    const requestOptions = { method: "GET" };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  async post(path: string, data: any[] | {}, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    if (!config) throw new Error(`API configuration not found: ${apiName}`);
-    const requestOptions = {
-      method: "POST",
-      headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
-      body: JSON.stringify(data)
-    };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  async patch(path: string, data: any[] | {}, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    if (!config) throw new Error(`API configuration not found: ${apiName}`);
-    const requestOptions = {
-      method: "PATCH",
-      headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
-      body: JSON.stringify(data)
-    };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  async delete(path: string, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    if (!config) throw new Error(`API configuration not found: ${apiName}`);
-    const requestOptions = {
-      method: "DELETE",
-      headers: { Authorization: "Bearer " + config.jwt }
-    };
-    if (this.onRequest) this.onRequest(config.url + path, requestOptions);
-    try {
-      const response = await fetch(config.url + path, requestOptions);
-      if (!response.ok) await this.throwApiError(response);
-    } catch (e) {
-      console.log(e);
-      if (this.onError) this.onError(config.url + path, requestOptions, e);
-      throw (e);
-    }
-  }
-
-  async postAnonymous(path: string, data: any[] | {}, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    const requestOptions = {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(data)
-    };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  async fetchWithErrorHandling(url: string, requestOptions: any) {
-    if (this.onRequest) this.onRequest(url, requestOptions);
-    try {
-      const response = await fetch(url, requestOptions);
-      if (!response.ok) await this.throwApiError(response);
-      else {
-        if (response.status !== 204 ) {
-          return response.json();
-        }
-      }
-    } catch (e) {
-      console.log("Error loading url: " + url);
-      console.log(e)
-      throw (e);
-    }
-  }
-
-  private async throwApiError(response: Response) {
-    let msg = response.statusText;
-    try {
-      msg = await response.text();
-    } catch {}
-    try {
-      const json = await response.json();
-      msg = json.errors[0];
-    } catch { }
-    console.log("RESPONSE", response)
-    ErrorHelper.logError(response.status.toString(), response.url, msg);
-    throw new Error(msg || "Error");
-  }
-
-}
-
-// Force singleton with immediate global assignment
-const getGlobalObject = () => {
-  if (typeof window !== 'undefined') return window;
-  if (typeof global !== 'undefined') return global;
-  if (typeof globalThis !== 'undefined') return globalThis;
-  return {};
-};
-
-// Get or create singleton immediately - FORCE SINGLE INSTANCE
-const ensureSingleton = () => {
-  const globalObj = getGlobalObject() as any;
-  
-  // Use a more unique key to avoid conflicts
-  const SINGLETON_KEY = '__CHURCHAPPS_API_HELPER_SINGLETON__';
-  
-  // ALWAYS create a new instance and overwrite any existing one
-  // This ensures the latest module load wins
-  if (!globalObj[SINGLETON_KEY]) {
-    globalObj[SINGLETON_KEY] = new ApiHelperClass();
-    console.log('🔧 ApiHelper SINGLETON created (new instance)');
-  } else {
-    console.log('🔄 ApiHelper SINGLETON already exists - using existing (configs:', globalObj[SINGLETON_KEY].apiConfigs.length, ')');
-  }
-  
-  return globalObj[SINGLETON_KEY];
-};
-
-// Export the singleton instance
-export const ApiHelper = ensureSingleton();
-
-// Also export the class for type usage
-export type { ApiHelperClass };
+import { ApiConfig, RolePermissionInterface, ApiListType } from "./interfaces";
+import { ErrorHelper } from "./ErrorHelper";
+
+// Global singleton pattern to ensure single instance across all packages
+declare global {
+  interface Window {
+    __CHURCHAPPS_API_HELPER__?: ApiHelperClass;
+  }
+  var __CHURCHAPPS_API_HELPER__: ApiHelperClass | undefined;
+}
+
+class ApiHelperClass {
+
+  apiConfigs: ApiConfig[] = [];
+  isAuthenticated = false;
+  onRequest: (url:string, requestOptions:any) => void;
+  onError: (url:string, requestOptions:any, error: any) => void;
+
+  getConfig(keyName: string) {
+    let result: ApiConfig = null;
+    this.apiConfigs.forEach(config => { if (config.keyName === keyName) result = config });
+    //if (result === null) throw new Error("Unconfigured API: " + keyName);
+    return result;
+  }
+
+  setDefaultPermissions(jwt: string) {
+    this.apiConfigs.forEach(config => {
+      config.jwt = jwt;
+      config.permissions = [];
+    });
+    this.isAuthenticated = true;
+  }
+
+  setPermissions(keyName: string, jwt: string, permissions: RolePermissionInterface[]) {
+    this.apiConfigs.forEach(config => {
+      if (config.keyName === keyName) {
+        config.jwt = jwt;
+        config.permissions = permissions;
+      }
+    });
+    this.isAuthenticated = true;
+  }
+
+  clearPermissions() {
+    this.apiConfigs.forEach(config => { config.jwt = ""; config.permissions = []; });
+    this.isAuthenticated = false;
+  }
+
+  async get(path: string, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    if (!config) throw new Error(`API configuration not found: ${apiName}`);
+    const requestOptions = { method: "GET", headers: { Authorization: "Bearer " + config.jwt } };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  async getAnonymous(path: string, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    if (!config) throw new Error(`API configuration not found: ${apiName}`);
+    const requestOptions = { method: "GET" };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  async post(path: string, data: any[] | {}, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    if (!config) throw new Error(`API configuration not found: ${apiName}`);
+    const requestOptions = {
+      method: "POST",
+      headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
+      body: JSON.stringify(data)
+    };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  async patch(path: string, data: any[] | {}, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    if (!config) throw new Error(`API configuration not found: ${apiName}`);
+    const requestOptions = {
+      method: "PATCH",
+      headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
+      body: JSON.stringify(data)
+    };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  async delete(path: string, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    if (!config) throw new Error(`API configuration not found: ${apiName}`);
+    const requestOptions = {
+      method: "DELETE",
+      headers: { Authorization: "Bearer " + config.jwt }
+    };
+    if (this.onRequest) this.onRequest(config.url + path, requestOptions);
+    try {
+      const response = await fetch(config.url + path, requestOptions);
+      if (!response.ok) await this.throwApiError(response);
+    } catch (e) {
+      if (this.onError) this.onError(config.url + path, requestOptions, e);
+      throw (e);
+    }
+  }
+
+  async postAnonymous(path: string, data: any[] | {}, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    if (!config) throw new Error(`API configuration not found: ${apiName}`);
+    const requestOptions = {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(data)
+    };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  async fetchWithErrorHandling(url: string, requestOptions: any) {
+    if (this.onRequest) this.onRequest(url, requestOptions);
+    try {
+      const response = await fetch(url, requestOptions);
+      if (!response.ok) await this.throwApiError(response);
+      else {
+        if (response.status !== 204 ) {
+          return response.json();
+        }
+      }
+    } catch (e) {
+      throw (e);
+    }
+  }
+
+  private async throwApiError(response: Response) {
+    let msg = response.statusText;
+    try {
+      msg = await response.text();
+    } catch {}
+    try {
+      const json = await response.json();
+      msg = json.errors[0];
+    } catch { }
+    ErrorHelper.logError(response.status.toString(), response.url, msg);
+    throw new Error(msg || "Error");
+  }
+
+}
+
+// Force singleton with immediate global assignment
+const getGlobalObject = () => {
+  if (typeof window !== 'undefined') return window;
+  if (typeof global !== 'undefined') return global;
+  if (typeof globalThis !== 'undefined') return globalThis;
+  return {};
+};
+
+// Get or create singleton immediately - FORCE SINGLE INSTANCE
+const ensureSingleton = () => {
+  const globalObj = getGlobalObject() as any;
+  
+  // Use a more unique key to avoid conflicts
+  const SINGLETON_KEY = '__CHURCHAPPS_API_HELPER_SINGLETON__';
+  
+  if (!globalObj[SINGLETON_KEY]) {
+    globalObj[SINGLETON_KEY] = new ApiHelperClass();
+  }
+  
+  return globalObj[SINGLETON_KEY];
+};
+
+// Export the singleton instance
+export const ApiHelper = ensureSingleton();
+
+// Also export the class for type usage
+export type { ApiHelperClass };

package/src/AppearanceHelper.ts

@@ -1,69 +1,69 @@
-
-export interface AppearanceInterface { primaryColor?: string, primaryContrast?: string, secondaryColor?: string, secondaryContrast?: string, logoLight?: string, logoDark?: string, favicon_400x400?: string, favicon_16x16?: string }
-
-export class AppearanceHelper {
-
-  public static getLogoDark(appearanceSettings: AppearanceInterface, defaultLogo: string) {
-    return (appearanceSettings?.logoDark) ? appearanceSettings.logoDark : defaultLogo;
-  }
-
-  public static getLogoLight(appearanceSettings: AppearanceInterface, defaultLogo: string) {
-    return (appearanceSettings?.logoLight) ? appearanceSettings.logoLight : defaultLogo;
-  }
-
-  public static getFavicon(appearanceSettings: AppearanceInterface, size: "400" | "16") {
-    if (size === "400") {
-      return appearanceSettings?.favicon_400x400;
-    }
-
-    if (size === "16") {
-      return appearanceSettings?.favicon_16x16;
-    }
-
-    return null;
-  }
-
-  public static getLogo(appearanceSettings: AppearanceInterface, defaultLogoLight: string, defaultLogoDark: string, backgroundColor: string) {
-    const isDark = (appearanceSettings.logoDark) ? this.isDark(backgroundColor) : false;
-    if (isDark) return this.getLogoDark(appearanceSettings, defaultLogoDark);
-    else return this.getLogoLight(appearanceSettings, defaultLogoLight);
-  }
-
-  private static isDark(backgroundColor: string) {
-    let valid = false;
-    let r = 0;
-    let g = 0;
-    let b = 0;
-
-    if (backgroundColor.match(/#[0-9a-fA-F]{6}/)) {
-      r = this.getHexValue(backgroundColor.substring(1, 3));
-      g = this.getHexValue(backgroundColor.substring(3, 5));
-      b = this.getHexValue(backgroundColor.substring(5, 7));
-      valid = true;
-    } else if (backgroundColor.match(/#[0-9a-fA-F]{3}/)) {
-      r = this.getHexValue(backgroundColor.substring(1, 2));
-      g = this.getHexValue(backgroundColor.substring(2, 3));
-      b = this.getHexValue(backgroundColor.substring(3, 4));
-      valid = true;
-    }
-
-    if (!valid) return false;
-    else {
-      //HSP brightness formula.  Some colors have a bigger impact on our perceived brightness than others.
-      const rWeight = .299 * Math.pow(r, 2);
-      const gWeight = .587 * Math.pow(g, 2);
-      const bWeight = .114 * Math.pow(b, 2);
-      const brightness = Math.sqrt(rWeight + gWeight + bWeight);
-      //return brightness < 128;  //
-      return brightness < 156;
-    }
-
-  }
-
-  private static getHexValue(hex: string) {
-    let result = parseInt(hex, 16);
-    if (hex.length === 1) result = result * 16;
-    return result;
-  }
-
-}
+
+export interface AppearanceInterface { primaryColor?: string, primaryContrast?: string, secondaryColor?: string, secondaryContrast?: string, logoLight?: string, logoDark?: string, favicon_400x400?: string, favicon_16x16?: string }
+
+export class AppearanceHelper {
+
+  public static getLogoDark(appearanceSettings: AppearanceInterface, defaultLogo: string) {
+    return (appearanceSettings?.logoDark) ? appearanceSettings.logoDark : defaultLogo;
+  }
+
+  public static getLogoLight(appearanceSettings: AppearanceInterface, defaultLogo: string) {
+    return (appearanceSettings?.logoLight) ? appearanceSettings.logoLight : defaultLogo;
+  }
+
+  public static getFavicon(appearanceSettings: AppearanceInterface, size: "400" | "16") {
+    if (size === "400") {
+      return appearanceSettings?.favicon_400x400;
+    }
+
+    if (size === "16") {
+      return appearanceSettings?.favicon_16x16;
+    }
+
+    return null;
+  }
+
+  public static getLogo(appearanceSettings: AppearanceInterface, defaultLogoLight: string, defaultLogoDark: string, backgroundColor: string) {
+    const isDark = (appearanceSettings.logoDark) ? this.isDark(backgroundColor) : false;
+    if (isDark) return this.getLogoDark(appearanceSettings, defaultLogoDark);
+    else return this.getLogoLight(appearanceSettings, defaultLogoLight);
+  }
+
+  private static isDark(backgroundColor: string) {
+    let valid = false;
+    let r = 0;
+    let g = 0;
+    let b = 0;
+
+    if (backgroundColor.match(/#[0-9a-fA-F]{6}/)) {
+      r = this.getHexValue(backgroundColor.substring(1, 3));
+      g = this.getHexValue(backgroundColor.substring(3, 5));
+      b = this.getHexValue(backgroundColor.substring(5, 7));
+      valid = true;
+    } else if (backgroundColor.match(/#[0-9a-fA-F]{3}/)) {
+      r = this.getHexValue(backgroundColor.substring(1, 2));
+      g = this.getHexValue(backgroundColor.substring(2, 3));
+      b = this.getHexValue(backgroundColor.substring(3, 4));
+      valid = true;
+    }
+
+    if (!valid) return false;
+    else {
+      //HSP brightness formula.  Some colors have a bigger impact on our perceived brightness than others.
+      const rWeight = .299 * Math.pow(r, 2);
+      const gWeight = .587 * Math.pow(g, 2);
+      const bWeight = .114 * Math.pow(b, 2);
+      const brightness = Math.sqrt(rWeight + gWeight + bWeight);
+      //return brightness < 128;  //
+      return brightness < 156;
+    }
+
+  }
+
+  private static getHexValue(hex: string) {
+    let result = parseInt(hex, 16);
+    if (hex.length === 1) result = result * 16;
+    return result;
+  }
+
+}