customerio-expo-plugin 2.7.1 → 2.7.3

package/plugin/src/utils/config.ts

@@ -1,4 +1,5 @@
 import type { CustomerIOPluginOptionsIOS, NativeSDKConfig, RichPushConfig } from '../types/cio-types';
+import { logger } from './logger';
 
 /**
  * Merges config values with env values for backward compatibility.
@@ -25,12 +26,12 @@ function mergeConfigWithEnvValues(
         `  config.region: "${nativeRegion}"\n` +
         `  env.region: "${envRegion}"`;
 
-      console.error(errorMessage);
+      logger.error(errorMessage);
       throw new Error(errorMessage);
     }
 
     // Values match - warn about redundant configuration
-    console.warn(
+    logger.warn(
       `Both 'config' and 'ios.pushNotification.env' are provided with matching values. ` +
       `Consider removing 'ios.pushNotification.env' since 'config' is already specified.`
     );

package/plugin/src/utils/logger.ts

@@ -0,0 +1,37 @@
+// Use CUSTOMERIO_DEBUG_MODE if defined; otherwise enable in development mode only
+const VERBOSE_MODE =
+  process.env.CUSTOMERIO_DEBUG_MODE !== undefined
+    ? process.env.CUSTOMERIO_DEBUG_MODE === 'true'
+    : process.env.NODE_ENV === 'development';
+const PREFIX = '[CustomerIO]';
+const formatMessage = (message: string): string => `${PREFIX} ${message}`;
+
+export const logger = {
+  format: formatMessage,
+
+  error: (message: string, ...args: unknown[]): void => {
+    console.error(formatMessage(message), ...args);
+  },
+
+  warn: (message: string, ...args: unknown[]): void => {
+    console.warn(formatMessage(message), ...args);
+  },
+
+  info: (message: string, ...args: unknown[]): void => {
+    if (VERBOSE_MODE) {
+      console.info(formatMessage(message), ...args);
+    }
+  },
+
+  log: (message: string, ...args: unknown[]): void => {
+    if (VERBOSE_MODE) {
+      console.log(formatMessage(message), ...args);
+    }
+  },
+
+  debug: (message: string, ...args: unknown[]): void => {
+    if (VERBOSE_MODE) {
+      console.debug(formatMessage(message), ...args);
+    }
+  }
+};

package/plugin/src/utils/validation.ts

@@ -1,21 +1,51 @@
-import type { NativeSDKConfig } from '../types/cio-types';
+import type { NativeSDKConfig, RichPushConfig } from '../types/cio-types';
+import { logger } from './logger';
 
-function validateRequired(value: unknown, fieldName: string, context: string): void {
-  if (value === undefined || value === null) {
-    throw new Error(`${context}: ${fieldName} is required, received: ${value}`);
+/**
+ * Validates a condition and handles errors based on CUSTOMERIO_STRICT_MODE flag.
+ * @param isValid - Function that returns true if validation passes
+ * @param messageFactory - Function that returns the error message if validation fails
+ * @returns true if validation passes, false if it fails
+ */
+function validate(isValid: () => boolean, messageFactory: () => string): boolean {
+  if (isValid()) {
+    return true;
   }
-}
 
-function validateString(value: unknown, fieldName: string, context: string): void {
-  if (value !== undefined && (typeof value !== 'string' || value.trim() === '')) {
-    throw new Error(`${context}: ${fieldName} must be a non-empty string, received: ${typeof value === 'string' ? `"${value}"` : value}`);
+  // Throw errors unless explicitly disabled, default to strict validation
+  const message = messageFactory();
+  // Throw an error if strict mode is enabled, log a warning otherwise
+  if (process.env.CUSTOMERIO_STRICT_MODE === 'true') {
+    throw new Error(logger.format(message));
+  } else {
+    logger.warn(message);
   }
+  return false;
 }
 
-function validateBoolean(value: unknown, fieldName: string, context: string): void {
-  if (value !== undefined && typeof value !== 'boolean') {
-    throw new Error(`${context}: ${fieldName} must be a boolean, received: ${value}`);
-  }
+function isUndefined(value: unknown): boolean {
+  return value === undefined;
+}
+
+function validateRequired(value: unknown, fieldName: string, context: string): boolean {
+  return validate(
+    () => !isUndefined(value) && value !== null,
+    () => `${context}: ${fieldName} is required, received: ${value}`
+  );
+}
+
+function validateString(value: unknown, fieldName: string, context: string): boolean {
+  return validate(
+    () => isUndefined(value) || (typeof value === 'string' && value.trim() !== ''),
+    () => `${context}: ${fieldName} must be a non-empty string, received: ${typeof value === 'string' ? `"${value}"` : value}`
+  );
+}
+
+function validateBoolean(value: unknown, fieldName: string, context: string): boolean {
+  return validate(
+    () => isUndefined(value) || typeof value === 'boolean',
+    () => `${context}: ${fieldName} must be a boolean, received: ${value}`
+  );
 }
 
 function validateEnum<T extends string>(
@@ -23,32 +53,66 @@ function validateEnum<T extends string>(
   fieldName: string,
   allowedValues: readonly T[],
   context: string
-): void {
-  if (value === undefined) return;
+): boolean {
+  if (isUndefined(value)) return true;
 
-  validateString(value, fieldName, context);
-
-  const lowerValue = (value as string).toLowerCase();
-  const lowerAllowedValues = allowedValues.map(v => v.toLowerCase());
-  if (!lowerAllowedValues.includes(lowerValue)) {
-    const valuesStr = allowedValues.map(v => `"${v}"`).join(', ');
-    throw new Error(`${context}: ${fieldName} must be one of ${valuesStr}, received: ${value}`);
+  // First validate it's a string
+  if (!validateString(value, fieldName, context)) {
+    return false;
   }
+
+  // Then validate it's in the allowed values
+  return validate(
+    () => {
+      const lowerValue = (value as string).toLowerCase();
+      const lowerAllowedValues = allowedValues.map(v => v.toLowerCase());
+      return lowerAllowedValues.includes(lowerValue);
+    },
+    () => {
+      const valuesStr = allowedValues.map(v => `"${v}"`).join(', ');
+      return `${context}: ${fieldName} must be one of ${valuesStr}, received: ${value}`;
+    }
+  );
 }
 
-function validateNativeSDKConfig(config: NativeSDKConfig): void {
+function validateRegion(value: unknown, fieldName: string, context: string): boolean {
+  return validateEnum(value, fieldName, ['US', 'EU'], context);
+}
+
+function validateNativeSDKConfig(config: NativeSDKConfig): boolean {
   const context = 'NativeSDKConfig';
 
-  validateRequired(config.cdpApiKey, 'cdpApiKey', context);
-  validateString(config.cdpApiKey, 'cdpApiKey', context);
+  let isValid = true;
+
+  isValid = validateRequired(config.cdpApiKey, 'cdpApiKey', context) && isValid;
+  isValid = validateString(config.cdpApiKey, 'cdpApiKey', context) && isValid;
+  isValid = validateRegion(config.region, 'region', context) && isValid;
+  isValid = validateEnum(config.screenViewUse, 'screenViewUse', ['all', 'inapp'], context) && isValid;
+  isValid = validateEnum(config.logLevel, 'logLevel', ['none', 'error', 'info', 'debug'], context) && isValid;
+  isValid = validateBoolean(config.autoTrackDeviceAttributes, 'autoTrackDeviceAttributes', context) && isValid;
+  isValid = validateBoolean(config.trackApplicationLifecycleEvents, 'trackApplicationLifecycleEvents', context) && isValid;
+  isValid = validateString(config.siteId, 'siteId', context) && isValid;
+  isValid = validateString(config.migrationSiteId, 'migrationSiteId', context) && isValid;
 
-  validateEnum(config.region, 'region', ['US', 'EU'] as const, context);
-  validateEnum(config.screenViewUse, 'screenViewUse', ['all', 'inapp'] as const, context);
-  validateEnum(config.logLevel, 'logLevel', ['none', 'error', 'info', 'debug'] as const, context);
-  validateBoolean(config.autoTrackDeviceAttributes, 'autoTrackDeviceAttributes', context);
-  validateBoolean(config.trackApplicationLifecycleEvents, 'trackApplicationLifecycleEvents', context);
-  validateString(config.siteId, 'siteId', context);
-  validateString(config.migrationSiteId, 'migrationSiteId', context);
+  return isValid;
 }
 
-export { validateNativeSDKConfig };
+function validateRichPushConfig(config: RichPushConfig | undefined): boolean {
+  const context = 'NotificationServiceExtension';
+
+  let isValid = true;
+
+  isValid = validateRequired(config?.cdpApiKey, 'cdpApiKey', context) && isValid;
+  isValid = validateString(config?.cdpApiKey, 'cdpApiKey', context) && isValid;
+  isValid = validateRegion(config?.region, 'region', context) && isValid;
+
+  return isValid;
+}
+
+export {
+  validateNativeSDKConfig,
+  validateRequired,
+  validateRichPushConfig,
+  validateString
+};
+

package/plugin/src/utils/xcode.ts

@@ -1,6 +1,7 @@
 import type { XcodeProject } from "@expo/config-plugins";
 import path from 'path';
 import { FileManagement } from "../helpers/utils/fileManagement";
+import { logger } from './logger';
 
 /**
  * Gets an existing CustomerIO group or creates a new one in the Xcode project
@@ -68,7 +69,7 @@ export function copyFileToXcode({
     xcodeProject.addSourceFile(`${projectName}/${targetFileName}`, null, customerIOGroup);
     return destinationPath;
   } catch (error) {
-    console.warn(`Failed to add ${targetFileName} to Xcode project:`, error);
+    logger.warn(`Failed to add ${targetFileName} to Xcode project:`, error);
     throw error;
   }
 }