@envive-ai/react-hooks 0.3.18 → 0.3.19

package/src/application/models/guards/api/isApiProductResponseAttributes.ts

@@ -2,11 +2,13 @@ import Logger from 'src/application/logging/logger';
 import { ResponseProductAttributes } from '@spiffy-ai/commerce-api-client';
 import { hasPropertyOfType } from '../utils';
 
+const logger = new Logger('isApiProductResponseAttributes');
+
 export const isApiProductResponseAttributes = (
   attributes: unknown,
 ): attributes is ResponseProductAttributes => {
   if (attributes == null || typeof attributes !== 'object') {
-    Logger.logError(
+    logger.logError(
       'isApiProductResponseAttributes: attributes is null or not an object',
       undefined,
       {
@@ -17,63 +19,63 @@ export const isApiProductResponseAttributes = (
   }
 
   if (!hasPropertyOfType(attributes, 'description', 'string', true)) {
-    Logger.logError('isApiProductResponseAttributes: description is not a string', undefined, {
+    logger.logError('isApiProductResponseAttributes: description is not a string', undefined, {
       attributes,
     });
     return false;
   }
 
   if (!hasPropertyOfType(attributes, 'image_url', 'string', true)) {
-    Logger.logError('isApiProductResponseAttributes: image_url is not a string', undefined, {
+    logger.logError('isApiProductResponseAttributes: image_url is not a string', undefined, {
       attributes,
     });
     return false;
   }
 
   if (!hasPropertyOfType(attributes, 'title', 'string')) {
-    Logger.logError('isApiProductResponseAttributes: title is not a string', undefined, {
+    logger.logError('isApiProductResponseAttributes: title is not a string', undefined, {
       attributes,
     });
     return false;
   }
 
   if (!hasPropertyOfType(attributes, 'url', 'string')) {
-    Logger.logError('isApiProductResponseAttributes: url is not a string', undefined, {
+    logger.logError('isApiProductResponseAttributes: url is not a string', undefined, {
       attributes,
     });
     return false;
   }
 
   if (!hasPropertyOfType(attributes, 'original_price', 'number', true)) {
-    Logger.logError('isApiProductResponseAttributes: original_price is not a number', undefined, {
+    logger.logError('isApiProductResponseAttributes: original_price is not a number', undefined, {
       attributes,
     });
     return false;
   }
 
   if (!hasPropertyOfType(attributes, 'sale_price', 'number', true)) {
-    Logger.logError('isApiProductResponseAttributes: sale_price is not a number', undefined, {
+    logger.logError('isApiProductResponseAttributes: sale_price is not a number', undefined, {
       attributes,
     });
     return false;
   }
 
   if (!hasPropertyOfType(attributes, 'average_rating', 'number', true)) {
-    Logger.logError('isApiProductResponseAttributes: average_rating is not a number', undefined, {
+    logger.logError('isApiProductResponseAttributes: average_rating is not a number', undefined, {
       attributes,
     });
     return false;
   }
 
   if (!hasPropertyOfType(attributes, 'number_reviews', 'number', true)) {
-    Logger.logError('isApiProductResponseAttributes: number_reviews is not a number', undefined, {
+    logger.logError('isApiProductResponseAttributes: number_reviews is not a number', undefined, {
       attributes,
     });
     return false;
   }
 
   if (!hasPropertyOfType(attributes, 'metadata', 'array', true)) {
-    Logger.logError('isApiProductResponseAttributes: metadata is not an array', undefined, {
+    logger.logError('isApiProductResponseAttributes: metadata is not an array', undefined, {
       attributes,
     });
     return false;

package/src/application/models/guards/api/isApiResponse.ts

@@ -2,14 +2,16 @@ import Logger from 'src/application/logging/logger';
 import { Response, ResponseCategory } from '@spiffy-ai/commerce-api-client';
 import { hasPropertyOfType } from 'src/application/models/guards/utils';
 
+const logger = new Logger('isApiResponse');
+
 export const isApiResponse = (data: unknown): data is Response => {
   if (data == null || typeof data !== 'object') {
-    Logger.logError('isApiResponse: data is null or not an object', undefined, { data });
+    logger.logError('isApiResponse: data is null or not an object', undefined, { data });
     return false;
   }
 
   if (!hasPropertyOfType(data, 'id', 'string')) {
-    Logger.logError('isApiResponse: id is not a string', undefined, { data });
+    logger.logError('isApiResponse: id is not a string', undefined, { data });
     return false;
   }
 
@@ -17,7 +19,7 @@ export const isApiResponse = (data: unknown): data is Response => {
     !hasPropertyOfType(data, 'category', 'string') ||
     !Object.values(ResponseCategory).includes(data.category as ResponseCategory)
   ) {
-    Logger.logError(
+    logger.logError(
       'isApiResponse: category is not a string or not a valid response category',
       undefined,
       { data },
@@ -26,12 +28,12 @@ export const isApiResponse = (data: unknown): data is Response => {
   }
 
   if (!hasPropertyOfType(data, 'created_at', 'string')) {
-    Logger.logError('isApiResponse: created_at is not a string', undefined, { data });
+    logger.logError('isApiResponse: created_at is not a string', undefined, { data });
     return false;
   }
 
   if (!hasPropertyOfType(data, 'attributes', 'object', true)) {
-    Logger.logError('isApiResponse: attributes is not an object', undefined, { data });
+    logger.logError('isApiResponse: attributes is not an object', undefined, { data });
     return false;
   }
 

package/src/application/models/guards/graphQL/isGraphQLColorsConfig.ts

@@ -22,9 +22,11 @@ const REQUIRED_COLOR_FIELDS = [
   'text_secondary',
 ] as const;
 
+const logger = new Logger('isGraphQLColorsConfig');
+
 export const isGraphQLColorsConfig = (data: unknown): data is GetMerchantColorsQueryData => {
   if (typeof data !== 'object' || data === null) {
-    Logger.logError('Invalid graphql response for colors config', undefined, { data });
+    logger.logError('Invalid graphql response for colors config', undefined, { data });
     return false;
   }
 
@@ -34,12 +36,12 @@ export const isGraphQLColorsConfig = (data: unknown): data is GetMerchantColorsQ
   );
 
   if (missingFields.length === REQUIRED_COLOR_FIELDS.length) {
-    Logger.logError('All color fields are missing or null', undefined);
+    logger.logError('All color fields are missing or null', undefined);
     return false;
   }
 
   if (missingFields.length > 0) {
-    Logger.logError('Missing or invalid color fields', undefined, {
+    logger.logError('Missing or invalid color fields', undefined, {
       data,
       missingFields,
     });

package/src/application/models/validators/validateGraphQLFrontendConfig.ts

@@ -10,6 +10,8 @@ import { DOMInsertionType } from 'src/merchants/domInsertion';
 import { GridInsertionType } from 'src/merchants/gridInsertion';
 import Logger from 'src/application/logging/logger';
 
+const logger = new Logger('validateGraphQLFrontendConfig');
+
 // Helper function to validate and transform PageVariantQueryData to PageVariantConfig
 export const validateAndTransformPageVariants = (
   config: Record<string, unknown>,
@@ -407,7 +409,7 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
   }
 
   if (typeof data !== 'object' || Array.isArray(data)) {
-    Logger.logWarn('Invalid GraphQL frontend config data: not an object', undefined, { data });
+    logger.logWarn('Invalid GraphQL frontend config data: not an object', undefined, { data });
     return undefined;
   }
 
@@ -419,7 +421,7 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
     typeof obj.merchant_override_css !== 'string' &&
     obj.merchant_override_css !== null
   ) {
-    Logger.logWarn(
+    logger.logWarn(
       'Invalid GraphQL frontend config data: merchant_override_css must be a string or null',
       undefined,
       { data },
@@ -434,7 +436,7 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
       obj.page_variants !== null &&
       !Array.isArray(obj.page_variants)
     ) {
-      Logger.logWarn(
+      logger.logWarn(
         'Invalid GraphQL frontend config data: page_variants must be an array or null/undefined',
         undefined,
         { data },
@@ -450,7 +452,7 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
       obj.mounting_configs !== null &&
       !Array.isArray(obj.mounting_configs)
     ) {
-      Logger.logWarn(
+      logger.logWarn(
         'Invalid GraphQL frontend config data: mounting_configs must be an array or null/undefined',
         undefined,
         { data },
@@ -466,7 +468,7 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
       obj.widget_configs !== null &&
       !Array.isArray(obj.widget_configs)
     ) {
-      Logger.logWarn(
+      logger.logWarn(
         'Invalid GraphQL frontend config data: widget_configs must be an array or null/undefined',
         undefined,
         { data },
@@ -477,7 +479,7 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
 
   // Validate ui_configs if present
   if ('ui_configs' in obj && typeof obj.ui_configs !== 'object' && obj.ui_configs !== null) {
-    Logger.logWarn(
+    logger.logWarn(
       'Invalid GraphQL frontend config data: ui_configs must be an object or null/undefined',
       undefined,
       { data },
@@ -500,14 +502,14 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
             const validatedVariant = validateAndTransformPageVariants(variant);
             validatedPageVariants.push(validatedVariant);
           } catch (error) {
-            Logger.logWarn('Invalid page variant, skipping', error, {
+            logger.logWarn('Invalid page variant, skipping', error, {
               variantId: variant.variantId,
               variant,
             });
             // Continue processing other variants
           }
         } else {
-          Logger.logWarn('Invalid page variant structure, skipping', undefined, { variant });
+          logger.logWarn('Invalid page variant structure, skipping', undefined, { variant });
         }
       }
 
@@ -535,14 +537,14 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
             const validatedConfig = validateAndTransformMountingConfig(config, item.key);
             mountingConfigsRecord[item.key] = validatedConfig;
           } catch (error) {
-            Logger.logWarn('Invalid mounting config, skipping', error, {
+            logger.logWarn('Invalid mounting config, skipping', error, {
               configKey: item.key,
               config: item.config,
             });
             // Continue processing other configs
           }
         } else {
-          Logger.logWarn('Invalid mounting config item structure, skipping', undefined, { item });
+          logger.logWarn('Invalid mounting config item structure, skipping', undefined, { item });
         }
       }
 
@@ -570,14 +572,14 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
             const validatedConfig = validateAndTransformWidgetConfig(config, item.key);
             widgetConfigsRecord[item.key] = validatedConfig;
           } catch (error) {
-            Logger.logWarn('Invalid widget config, skipping', error, {
+            logger.logWarn('Invalid widget config, skipping', error, {
               configKey: item.key,
               config: item.config,
             });
             // Continue processing other configs
           }
         } else {
-          Logger.logWarn('Invalid widget config item structure, skipping', undefined, { item });
+          logger.logWarn('Invalid widget config item structure, skipping', undefined, { item });
         }
       }
 
@@ -586,7 +588,7 @@ export const validateGraphQLFrontendConfig = (data: unknown): FrontendConfig | u
 
     return transformedData as FrontendConfig;
   } catch (error) {
-    Logger.logWarn('Failed to validate and transform GraphQL frontend config data', error, {
+    logger.logWarn('Failed to validate and transform GraphQL frontend config data', error, {
       data,
     });
     return undefined;

package/src/application/utils/analyticsUtils.ts

@@ -17,6 +17,8 @@ const NORMALIZED_ADD_TO_CART_EVENT_NAMES = ['addtocart', 'addedtocart'];
 const CHECK_DATA_LAYER_INTERVAL_MS = 500;
 const CHECK_DATA_LAYER_MAX_ATTEMPTS = 10;
 
+const logger = new Logger('analyticsUtils');
+
 /**
  * Checks if a Google Analytics event is an add_to_cart event.
  *
@@ -90,9 +92,7 @@ export const initDataLayerWrapper = (
       attempts += 1;
 
       if (attempts >= CHECK_DATA_LAYER_MAX_ATTEMPTS) {
-        Logger.logDebug(
-          `[spiffy-ai] dataLayer not available after ${CHECK_DATA_LAYER_MAX_ATTEMPTS} attempts`,
-        );
+        logger.logDebug(`dataLayer not available after ${CHECK_DATA_LAYER_MAX_ATTEMPTS} attempts`);
         return;
       }
 
@@ -100,7 +100,7 @@ export const initDataLayerWrapper = (
       return;
     }
 
-    Logger.logDebug('[spiffy-ai] dataLayer is available, wrapping push function...');
+    logger.logDebug('dataLayer is available, wrapping push function...');
     const originalPush = window.dataLayer.push;
     window.dataLayer.push = (...args: unknown[]) => {
       if (isBaseEcommerceEvent(args[0]) && isAddToCartEvent((args[0] as any).event)) {

package/src/application/utils/nextMessageRequestToApiRequest.ts

@@ -15,6 +15,8 @@ export const messageRequestToCommerceMessageRequest = (
   },
   id: data.id,
   feature_flags: data.featureFlags,
+  override_config_version: data.overrideConfigVersion,
+  override_model_datetime: data.overrideModelDatetime,
   user_events: data.userEvents?.map(userEvent => coreUserEventToApiUserEvent(userEvent)),
   generation_params: {
     model: data.generationParams?.model,

package/src/atoms/app/variant.ts

@@ -18,6 +18,8 @@ import { sessionStorageUtil } from 'src/atoms/atomStore';
 import type { PageVariantInfo } from 'src/contexts/pageContext/types';
 import { ShowFloatingButtonOptions } from 'src/contexts/types';
 
+const logger = new Logger('variant');
+
 export interface SupportedEvent extends Pick<
   SupportedEventResponse,
   'supported' | 'ready' | 'category' | 'collections' | 'top_category'
@@ -280,7 +282,7 @@ export const analyticsContextAtom = atom(get => {
   if (variantInfo.variant === VariantTypeEnum.PageVisit) {
     return getPageVisitContext(variantInfo.pageVisitCategory);
   }
-  Logger.logWarn('[envive-ai] Invalid variantInfo', undefined, { variantInfo });
+  logger.logWarn('Invalid variantInfo', undefined, { variantInfo });
   return {
     page_type: 'other',
     page_id: window.location.href,

package/src/atoms/chat/performanceMetrics.ts

@@ -3,6 +3,8 @@ import { atomWithStorage } from 'jotai/utils';
 import Logger from 'src/application/logging/logger';
 import { getAtomStore, sessionStorageUtil } from 'src/atoms/atomStore/atomStore';
 
+const logger = new Logger('performanceMetrics');
+
 export const APP_INITIAL_START_TIME_KEY = 'spiffy-app-initial-start-time';
 export const PAGE_LOAD_OFFSET_TIME_KEY = 'spiffy-page-load-offset-time';
 /**
@@ -68,7 +70,7 @@ export const logPerfMetricAtom = atom(null, (get, set, value: PerfMetricsEvents)
   const initialTimeMs = initialTimeStorageValue ? parseInt(initialTimeStorageValue, 10) : undefined;
 
   if (initialTimeMs == null) {
-    Logger.logWarn(`[spiffy-ai] No initial app start time found. Skipping...`, undefined);
+    logger.logWarn(`No initial app start time found. Skipping...`, undefined);
     return;
   }
 

package/src/atoms/envive/enviveConfig.ts

@@ -4,12 +4,14 @@ import { EnviveConfig } from 'src/contexts/types';
 import { ContextSourceEnum } from '@spiffy-ai/commerce-api-client';
 import { LocalStorageKeys } from 'src/contexts/localStorageContext';
 
+const logger = new Logger('enviveConfig');
+
 const internalEnviveConfigAtom = atom<EnviveConfig | undefined>(undefined);
 
 export const enviveConfigAtom = atom(
   get => {
     const config = get(internalEnviveConfigAtom);
-    Logger.logDebug('enviveConfig.ts: Accessing internalEnviveConfigAtom', config);
+    logger.logDebug('enviveConfig.ts: Accessing internalEnviveConfigAtom', config);
     return config; // Return undefined if not set instead of throwing
   },
   (_, set, value: EnviveConfig) => {
@@ -64,11 +66,11 @@ export const contextSourceAtom = atom(get => {
 
 export const orgLevelApiKeyAtom = atom(get => {
   const config = get(enviveConfigAtom);
-  Logger.logDebug('enviveConfig.ts: Accessing orgLevelApiKey', config);
+  logger.logDebug('enviveConfig.ts: Accessing orgLevelApiKey', config);
   return config?.orgLevelApiKey;
 });
 export const orgShortNameAtom = atom(get => {
   const config = get(enviveConfigAtom);
-  Logger.logDebug('enviveConfig.ts: Accessing orgShortName', config);
+  logger.logDebug('enviveConfig.ts: Accessing orgShortName', config);
   return config?.orgShortName;
 });

package/src/contexts/amplitudeContext/amplitudeContext.tsx

@@ -9,7 +9,7 @@ import {
 import { useLocalStorage } from 'src/contexts/localStorageContext';
 import { orgAnalyticsGoogleAnalyticsConfigAtom } from 'src/atoms/org/orgAnalyticsConfig';
 import { userIdAtom } from 'src/atoms/app';
-import { useEnviveConfig } from 'src/contexts/enviveConfigContext/enviveConfigContext';
+import { useEnviveConfig } from 'src/contexts/enviveConfigContext';
 import { useFeatureFlagService } from 'src/contexts/featureFlagServiceContext/featureFlagServiceContext';
 import {
   AmplitudeService,

package/src/contexts/enviveConfigContext/__tests__/enviveConfigContext.test.tsx

@@ -3,10 +3,11 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { Provider, useAtomValue } from 'jotai';
 import { enviveConfigAtom } from 'src/atoms/envive/enviveConfig';
 import Logger from 'src/application/logging/logger';
-import { EnviveConfigProvider, useEnviveConfig } from '../enviveConfigContext';
+import { EnviveConfigProvider } from '../enviveConfigContext';
+import { useEnviveConfig } from '../useEnviveConfig';
 
 // Mock the Logger to avoid console output in tests
-vi.spyOn(Logger, 'logDebug').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logDebug').mockImplementation(() => {});
 
 // Mock component that uses the useEnviveConfig hook
 const MockComponent: React.FC = () => {
@@ -353,7 +354,7 @@ describe('EnviveConfigProvider', () => {
 
   describe('Logger Integration', () => {
     it('should log debug message when setting config', async () => {
-      const logSpy = vi.spyOn(Logger, 'logDebug');
+      const logSpy = vi.spyOn(Logger.prototype, 'logDebug');
 
       render(
         <Provider>

package/src/contexts/enviveConfigContext/enviveConfigContext.tsx

@@ -1,11 +1,11 @@
-import React, { ReactNode, createContext, useEffect } from 'react';
-import { useAtomValue, useSetAtom } from 'jotai';
+import React, { ReactNode, useEffect, useMemo } from 'react';
+import { useSetAtom } from 'jotai';
 import { enviveConfigAtom } from 'src/atoms/envive/enviveConfig';
 import Logger from 'src/application/logging/logger';
 import { OrgConfigFeatureGate } from 'src/application/models/api/orgConfigResults';
 import { EnviveConfig } from '../types';
 
-const EnviveConfigContext = createContext<EnviveConfig | undefined>(undefined);
+const logger = new Logger('enviveConfigContext');
 
 interface EnviveConfigProviderProps {
   children: ReactNode;
@@ -52,41 +52,56 @@ export const EnviveConfigProvider: React.FC<EnviveConfigProviderProps> = ({
 }) => {
   const setEnviveConfig = useSetAtom(enviveConfigAtom);
 
-  const config: EnviveConfig = {
-    amplitudeApiKey,
-    dataResidency,
-    env,
-    baseUrl,
-    reactAppName,
-    cdnUrl,
-    contextSource,
-    orgLevelApiKey,
-    orgShortName,
-    orgId,
-    identifyingPrefix,
-    featureOverrides,
-    variantUrlOverride,
-    variantInfoOverride,
-    show,
-    enviveOn,
-    publicKey,
-    featureGates, // Add to config
-  };
+  const config: EnviveConfig = useMemo(
+    () => ({
+      amplitudeApiKey,
+      dataResidency,
+      env,
+      baseUrl,
+      reactAppName,
+      cdnUrl,
+      contextSource,
+      orgLevelApiKey,
+      orgShortName,
+      orgId,
+      identifyingPrefix,
+      featureOverrides,
+      variantUrlOverride,
+      variantInfoOverride,
+      show,
+      enviveOn,
+      publicKey,
+      featureGates,
+    }),
+    [
+      amplitudeApiKey,
+      dataResidency,
+      env,
+      baseUrl,
+      reactAppName,
+      cdnUrl,
+      contextSource,
+      orgLevelApiKey,
+      orgShortName,
+      orgId,
+      identifyingPrefix,
+      featureOverrides,
+      variantUrlOverride,
+      variantInfoOverride,
+      show,
+      enviveOn,
+      publicKey,
+      featureGates,
+    ],
+  );
 
   useEffect(() => {
     setEnviveConfig(config);
-    Logger.logDebug('EnviveConfigProvider: Setting EnviveConfig', config);
+    logger.logDebug('EnviveConfigProvider: Setting EnviveConfig', config);
   }, [setEnviveConfig, config]);
 
-  return (
-    <EnviveConfigContext.Provider value={config}>
-      {config ? children : null}
-    </EnviveConfigContext.Provider>
-  );
-};
-
-export const useEnviveConfig = (): EnviveConfig => {
-  const config = useAtomValue(enviveConfigAtom);
-
-  return config || {};
+  if (!config) {
+    return null;
+  }
+  return children;
 };

package/src/contexts/enviveConfigContext/index.ts

@@ -1 +1,2 @@
 export * from './enviveConfigContext';
+export * from './useEnviveConfig';

package/src/contexts/enviveConfigContext/useEnviveConfig.ts

@@ -0,0 +1,9 @@
+import { useAtomValue } from 'jotai';
+import { enviveConfigAtom } from 'src/atoms/envive/enviveConfig';
+import { EnviveConfig } from '../types';
+
+export const useEnviveConfig = (): EnviveConfig => {
+  const config = useAtomValue(enviveConfigAtom);
+
+  return config || {};
+};

package/src/contexts/enviveContext/WindowChatToggleBinder.tsx

@@ -1,10 +1,12 @@
 import { useEffect, useRef } from 'react';
 import { ChatElementDisplayLocationV3 } from 'src/application/models/chatElementDisplayLocationV3';
 import Logger from 'src/application/logging/logger';
-import { useEnviveConfig } from 'src/contexts/enviveConfigContext/enviveConfigContext';
+import { useEnviveConfig } from 'src/contexts/enviveConfigContext';
 import { useSalesAgent } from 'src/contexts/salesAgentContext/salesAgentContext';
 import { useChatToggle } from 'src/hooks/ChatToggle';
 
+const logger = new Logger('WindowChatToggleBinder');
+
 const attachedPrefixes = new Set<string>();
 
 export const WindowChatToggleBinder = () => {
@@ -58,11 +60,11 @@ export const WindowChatToggleBinder = () => {
         attachedPrefixes.add(spiffyAlias);
       }
 
-      Logger.logDebug(
-        `[envive-ai] Chat toggle attached at window["${identifyingPrefix}"] and window["${spiffyAlias}"]`,
+      logger.logDebug(
+        `Chat toggle attached at window["${identifyingPrefix}"] and window["${spiffyAlias}"]`,
       );
     } catch (e) {
-      Logger.logError('[envive-ai] Failed to attach Chat toggle functions', e);
+      logger.logError('Failed to attach Chat toggle functions', e);
     }
   }, [identifyingPrefix]);