@jmruthers/pace-core 0.5.135 → 0.5.136

package/src/utils/{appIdResolver.test.ts → app/appIdResolver.test.ts}

@@ -12,6 +12,20 @@ import { getAppId, getAppIds, CachedAppIdResolver } from './appIdResolver';
 import type { SupabaseClient } from '@supabase/supabase-js';
 import type { Database } from '../types/database';
 
+// Mock the Logger module
+vi.mock('../core/logger', () => {
+  const mockLoggerInstance = {
+    error: vi.fn(),
+  };
+  return {
+    createLogger: vi.fn(() => mockLoggerInstance),
+  };
+});
+
+// Get the mock instance after mock is set up
+import { createLogger } from '../core/logger';
+const getMockLogger = () => createLogger('test');
+
 // Mock Supabase client
 const createMockSupabaseClient = () => {
   const queryBuilder = {
@@ -44,6 +58,8 @@ describe('App ID Resolver', () => {
     vi.clearAllMocks();
     mockSupabase = createMockSupabaseClient();
     mockQueryBuilder = mockSupabase.queryBuilder;
+    const logger = getMockLogger();
+    vi.mocked(logger.error).mockClear();
   });
 
     describe('getAppId', () => {
@@ -79,35 +95,29 @@ describe('App ID Resolver', () => {
         error: { message: 'Database error' }
       });
 
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
       const result = await getAppId(mockSupabase as any, 'MY_APP');
 
       expect(result).toBeNull();
-      expect(consoleSpy).toHaveBeenCalledWith(
+      const logger = getMockLogger();
+      expect(vi.mocked(logger.error)).toHaveBeenCalledWith(
         'Failed to resolve app ID for app name:',
         'MY_APP',
         { message: 'Database error' }
       );
-
-      consoleSpy.mockRestore();
     });
 
     it('handles exceptions gracefully', async () => {
       mockQueryBuilder.single.mockRejectedValue(new Error('Network error'));
 
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
       const result = await getAppId(mockSupabase as any, 'MY_APP');
 
       expect(result).toBeNull();
-      expect(consoleSpy).toHaveBeenCalledWith(
+      const logger = getMockLogger();
+      expect(vi.mocked(logger.error)).toHaveBeenCalledWith(
         'Error resolving app ID for app name:',
         'MY_APP',
         expect.any(Error)
       );
-
-      consoleSpy.mockRestore();
     });
 
     it('handles null/undefined app name', async () => {
@@ -199,18 +209,15 @@ describe('App ID Resolver', () => {
       mockQueryBuilder.or.mockReturnValue(mockChain);
       mockQueryBuilder.eq.mockReturnValue(mockChain);
 
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
       const result = await getAppIds(mockSupabase as any, ['MY_APP', 'ANOTHER_APP']);
 
       expect(result).toEqual({});
-      expect(consoleSpy).toHaveBeenCalledWith(
+      const logger = getMockLogger();
+      expect(vi.mocked(logger.error)).toHaveBeenCalledWith(
         'Failed to resolve app IDs for app names:',
         ['MY_APP', 'ANOTHER_APP'],
         { message: 'Database error' }
       );
-
-      consoleSpy.mockRestore();
     });
 
     it('handles exceptions gracefully', async () => {
@@ -224,18 +231,15 @@ describe('App ID Resolver', () => {
       mockQueryBuilder.or.mockReturnValue(mockChain);
       mockQueryBuilder.eq.mockReturnValue(mockChain);
 
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
       const result = await getAppIds(mockSupabase as any, ['MY_APP', 'ANOTHER_APP']);
 
       expect(result).toEqual({});
-      expect(consoleSpy).toHaveBeenCalledWith(
+      const logger = getMockLogger();
+      expect(vi.mocked(logger.error)).toHaveBeenCalledWith(
         'Error resolving app IDs for app names:',
         ['MY_APP', 'ANOTHER_APP'],
         expect.any(Error)
       );
-
-      consoleSpy.mockRestore();
     });
 
     it('handles null/undefined app names array', async () => {
@@ -304,18 +308,15 @@ describe('App ID Resolver', () => {
         error: { message: 'Database error' }
       });
 
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
       const result = await resolver.getAppId(mockSupabase as any, 'MY_APP');
 
       expect(result).toBeNull();
-      expect(consoleSpy).toHaveBeenCalledWith(
+      const logger = getMockLogger();
+      expect(vi.mocked(logger.error)).toHaveBeenCalledWith(
         'Failed to resolve app ID for app name:',
         'MY_APP',
         { message: 'Database error' }
       );
-
-      consoleSpy.mockRestore();
     });
 
     it('clears cache correctly', async () => {
@@ -412,18 +413,15 @@ describe('App ID Resolver', () => {
     it('handles network timeouts', async () => {
       mockQueryBuilder.single.mockRejectedValue(new Error('Request timeout'));
 
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
       const result = await getAppId(mockSupabase as any, 'MY_APP');
 
       expect(result).toBeNull();
-      expect(consoleSpy).toHaveBeenCalledWith(
+      const logger = getMockLogger();
+      expect(vi.mocked(logger.error)).toHaveBeenCalledWith(
         'Error resolving app ID for app name:',
         'MY_APP',
         expect.any(Error)
       );
-
-      consoleSpy.mockRestore();
     });
 
     it('handles malformed responses', async () => {

package/src/utils/{appIdResolver.ts → app/appIdResolver.ts}

@@ -8,7 +8,10 @@
  */
 
 import type { SupabaseClient } from '@supabase/supabase-js';
-import type { Database } from '../types/database';
+import type { Database } from '../../types/database';
+import { createLogger } from '../core/logger';
+
+const log = createLogger('AppIdResolver');
 
 /**
  * Resolves an app name to its corresponding app ID
@@ -30,13 +33,13 @@ export async function getAppId(
       .single();
 
     if (error) {
-      console.error('Failed to resolve app ID for app name:', appName, error);
+      log.error('Failed to resolve app ID for app name:', appName, error);
       return null;
     }
 
     return (data as { id: string } | null)?.id || null;
   } catch (error) {
-    console.error('Error resolving app ID for app name:', appName, error);
+    log.error('Error resolving app ID for app name:', appName, error);
     return null;
   }
 }
@@ -64,7 +67,7 @@ export async function getAppIds(
       .eq('is_active', true);
 
     if (error) {
-      console.error('Failed to resolve app IDs for app names:', appNames, error);
+      log.error('Failed to resolve app IDs for app names:', appNames, error);
       return {};
     }
 
@@ -88,7 +91,7 @@ export async function getAppIds(
 
     return result;
   } catch (error) {
-    console.error('Error resolving app IDs for app names:', appNames, error);
+    log.error('Error resolving app IDs for app names:', appNames, error);
     return {};
   }
 }

package/src/utils/{appNameResolver.test.ts → app/appNameResolver.test.ts}

@@ -9,7 +9,7 @@ import {
   getAppNameFromEnvironment,
   getCurrentAppName,
   setRBACAppName
-} from '../utils/appNameResolver';
+} from '../../utils/app/appNameResolver';
 
 describe('App Name Resolver - Simple Tests', () => {
   describe('Function Existence', () => {

package/src/utils/{appNameResolver.ts → app/appNameResolver.ts}

@@ -3,6 +3,10 @@
  * Priority: package.json > environment variables > fallback
  */
 
+import { createLogger } from '../core/logger';
+
+const log = createLogger('AppNameResolver');
+
 interface PackageJson {
   name: string;
   [key: string]: any;
@@ -49,7 +53,7 @@ export function getAppNameFromPackageJson(): string | null {
       }
     } catch (error) {
       // package.json not found or not readable
-      console.warn('[RBAC] Could not read app name from package.json:', error);
+      log.warn('Could not read app name from package.json:', error);
     }
   }
   

package/src/utils/{organisationContext.ts → context/organisationContext.ts}

@@ -9,6 +9,9 @@
  */
 
 import type { SupabaseClient } from '@supabase/supabase-js';
+import { createLogger } from '../core/logger';
+
+const log = createLogger('organisationContext');
 
 /**
  * Set organisation context in the database session
@@ -45,14 +48,14 @@ export async function setOrganisationContext(
     if (error) {
       // Function might not exist yet - this is expected during migration
       // Silent fail - will fall back to client-side filtering
-      console.log('[organisationContext] RPC function not available or failed, continuing without database context');
+      log.debug('RPC function not available or failed, continuing without database context');
     } else {
-      console.log('[organisationContext] Organisation context set in database successfully');
+      log.debug('Organisation context set in database successfully');
     }
   } catch (error) {
     // Handle any other errors gracefully
     // Silent fail - will fall back to client-side filtering
-    console.log('[organisationContext] Failed to set database context, continuing without it:', error);
+    log.debug('Failed to set database context, continuing without it:', error);
   }
 }
 

package/src/utils/{sessionTracking.ts → context/sessionTracking.ts}

@@ -1,4 +1,7 @@
 import type { SupabaseClient } from '@supabase/supabase-js';
+import { createLogger } from '../core/logger';
+
+const log = createLogger('SessionTracking');
 
 // Define the tracking parameters locally since old RBAC types are removed
 interface TrackUserSessionParams {
@@ -33,13 +36,13 @@ export function useSessionTracking(supabaseClient: SupabaseClient, appName?: str
         .single();
       
       if (error || !data) {
-        console.warn('App not found or inactive:', appName);
+        log.warn('App not found or inactive:', appName);
         return undefined;
       }
       
       return data.id;
     } catch (error) {
-      console.error('Failed to resolve app ID:', error);
+      log.error('Failed to resolve app ID:', error);
       return undefined;
     }
   };
@@ -51,7 +54,7 @@ export function useSessionTracking(supabaseClient: SupabaseClient, appName?: str
     try {
       const { data: { user } } = await supabaseClient.auth.getUser();
       if (!user) {
-        console.warn('No authenticated user found for session tracking');
+        log.warn('No authenticated user found for session tracking');
         return;
       }
 
@@ -73,12 +76,10 @@ export function useSessionTracking(supabaseClient: SupabaseClient, appName?: str
       });
       
       if (error) {
-        console.error('Failed to track event switch session:', error);
-      } else {
-        console.log('Event switch session tracked successfully');
+        log.error('Failed to track event switch session:', error);
       }
     } catch (error) {
-      console.error('Failed to track event switch:', error);
+      log.error('Failed to track event switch:', error);
     }
   };
 
@@ -89,7 +90,7 @@ export function useSessionTracking(supabaseClient: SupabaseClient, appName?: str
     try {
       const { data: { user } } = await supabaseClient.auth.getUser();
       if (!user) {
-        console.warn('No authenticated user found for session tracking');
+        log.warn('No authenticated user found for session tracking');
         return;
       }
 
@@ -110,12 +111,10 @@ export function useSessionTracking(supabaseClient: SupabaseClient, appName?: str
       });
       
       if (error) {
-        console.error('Failed to track session expiration:', error);
-      } else {
-        console.log('Session expiration tracked successfully');
+        log.error('Failed to track session expiration:', error);
       }
     } catch (error) {
-      console.error('Failed to track session expiration:', error);
+      log.error('Failed to track session expiration:', error);
     }
   };
 

package/src/utils/{logger.ts → core/logger.ts}

@@ -41,10 +41,12 @@ export class Logger {
   };
 
   /**
-   * Check if we're in development mode
+   * Check if we're in development or test mode
+   * Allows logging in both development and test environments
    */
   private static get isDevelopment(): boolean {
-    return import.meta.env.MODE === 'development';
+    const mode = import.meta.env.MODE;
+    return mode === 'development' || mode === 'test';
   }
 
   /**

package/src/utils/{deviceFingerprint.ts → device/deviceFingerprint.ts}

@@ -3,7 +3,7 @@
  * @description Enhanced device fingerprinting with encryption and security measures
  */
 
-import { secureStorage } from './secureStorage';
+import { secureStorage } from '../security/secureStorage';
 
 export interface DeviceFingerprint {
   hash: string;

package/src/utils/{lazyLoad.tsx → dynamic/lazyLoad.tsx}

@@ -1,5 +1,5 @@
 import React, { Suspense, ComponentType, lazy } from 'react';
-import { LoadingSpinner } from '../components/LoadingSpinner/LoadingSpinner';
+import { LoadingSpinner } from '../../components/LoadingSpinner/LoadingSpinner';
 
 interface LazyLoadOptions {
   fallback?: React.ReactNode;
@@ -39,6 +39,6 @@ export function createLazyComponent<T extends ComponentType<any>>(
  * Lazy-loaded DataTable component
  */
 export const LazyDataTable = createLazyComponent(
-  () => import('../components/DataTable').then(module => ({ default: module.DataTable })),
+  () => import('../../components/DataTable').then(module => ({ default: module.DataTable })),
   'DataTable'
 );

package/src/utils/{file-reference.test.ts → file-reference/__tests__/file-reference.test.ts}

@@ -4,13 +4,13 @@
  */
 
 import { vi } from 'vitest';
-import { FileReferenceServiceImpl, createFileReferenceService, uploadFileWithReference } from './file-reference';
-import { FileCategory } from '../types/file-reference';
-import { createMockSupabaseClient } from '../__tests__/helpers/test-utils';
+import { FileReferenceServiceImpl, createFileReferenceService, uploadFileWithReference } from '../index';
+import { FileCategory } from '../../../types/file-reference';
+import { createMockSupabaseClient } from '../../../__tests__/helpers/test-utils';
 
 // Mock dependencies
-import * as organisationContext from './organisationContext';
-import * as storageHelpers from './storage/helpers';
+import * as organisationContext from '../../context/organisationContext';
+import * as storageHelpers from '../../storage/helpers';
 
 const mockSetOrganisationContext = vi.fn();
 const mockUploadFile = vi.fn();

package/src/utils/{file-reference.ts → file-reference/index.ts}

@@ -8,10 +8,13 @@ import {
   FileReferenceService, 
   FileUploadResult,
   FileCategory 
-} from '../types/file-reference';
-import { uploadFile, getPublicUrl, getSignedUrl, deleteFile, extractFileMetadata } from './storage/helpers';
-import { setOrganisationContext } from './organisationContext';
-import { invalidateFileDisplayCache } from '../hooks/useFileDisplay';
+} from '../../types/file-reference';
+import { uploadFile, getPublicUrl, getSignedUrl, deleteFile, extractFileMetadata } from '../storage/helpers';
+import { setOrganisationContext } from '../context/organisationContext';
+import { invalidateFileDisplayCache } from '../../hooks/useFileDisplay';
+import { createLogger } from '../core/logger';
+
+const log = createLogger('FileReferenceService');
 
 export class FileReferenceServiceImpl implements FileReferenceService {
   constructor(private supabase: SupabaseClient) {}
@@ -121,7 +124,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
 
       return fileRef as FileReference;
     } catch (error) {
-      console.error('Error creating file reference:', error);
+      log.error('Error creating file reference:', error);
       throw error;
     }
   }
@@ -145,7 +148,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
 
       return data as FileReference;
     } catch (error) {
-      console.error('Error getting file reference:', error);
+      log.error('Error getting file reference:', error);
       throw error;
     }
   }
@@ -178,7 +181,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
         return await this.getSignedUrl(table_name, record_id, organisation_id);
       }
     } catch (error) {
-      console.error('Error getting file URL:', error);
+      log.error('Error getting file URL:', error);
       throw error;
     }
   }
@@ -211,7 +214,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
 
       return signedUrlResult?.url || null;
     } catch (error) {
-      console.error('Error getting signed URL:', error);
+      log.error('Error getting signed URL:', error);
       throw error;
     }
   }
@@ -231,7 +234,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
 
       return data as FileReference;
     } catch (error) {
-      console.error('Error updating file reference:', error);
+      log.error('Error updating file reference:', error);
       throw error;
     }
   }
@@ -260,7 +263,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
 
       return true;
     } catch (error) {
-      console.error('Error deleting file reference:', error);
+      log.error('Error deleting file reference:', error);
       throw error;
     }
   }
@@ -296,7 +299,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
 
       return (fullData || []) as FileReference[];
     } catch (error) {
-      console.error('Error listing file references:', error);
+      log.error('Error listing file references:', error);
       throw error;
     }
   }
@@ -316,7 +319,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
 
       return data || 0;
     } catch (error) {
-      console.error('Error getting file count:', error);
+      log.error('Error getting file count:', error);
       throw error;
     }
   }
@@ -339,7 +342,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
 
       return data[0] as FileReference;
     } catch (error) {
-      console.error('Error getting file reference by ID:', error);
+      log.error('Error getting file reference by ID:', error);
       throw error;
     }
   }
@@ -354,12 +357,6 @@ export class FileReferenceServiceImpl implements FileReferenceService {
       // CRITICAL: Use RPC function to get files by category - this correctly filters on file_metadata->>'category'
       // NOTE: We MUST use RPC function. Direct queries with .eq('category', ...) will FAIL with HTTP 406
       // because there is NO 'category' column. The category is stored in the JSONB file_metadata field.
-      console.log('[FileReferenceService.getFilesByCategory] Calling RPC function:', {
-        table_name,
-        record_id,
-        category,
-        organisation_id
-      });
       const { data, error } = await this.supabase
         .rpc('data_file_reference_by_category_list', {
           p_table_name: table_name,
@@ -370,7 +367,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
 
       if (error) {
         // Provide clear error message about category filtering
-        console.error('[FileReferenceService.getFilesByCategory] RPC ERROR:', {
+        log.error('RPC ERROR getting files by category:', {
           error,
           errorCode: error.code,
           errorMessage: error.message,
@@ -387,14 +384,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
       // RPC returns partial data with: id, file_path, file_metadata, is_public, created_at
       // We have table_name, record_id, organisation_id from function parameters
       // We can construct FileReference objects directly without another query (avoiding RLS issues)
-      console.log('[FileReferenceService.getFilesByCategory] RPC response received:', {
-        dataLength: data?.length || 0,
-        data: data ? data.slice(0, 2) : null, // Log first 2 items for debugging
-        fullDataAvailable: data?.every((item: any) => item.id && item.file_path && item.file_metadata)
-      });
-
       if (!data || data.length === 0) {
-        console.log('[FileReferenceService.getFilesByCategory] No data from RPC, returning empty array');
         return [];
       }
 
@@ -406,7 +396,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
           const fileCategory = item.file_metadata?.category;
           const matches = fileCategory === category;
           if (!matches) {
-            console.warn('[FileReferenceService.getFilesByCategory] File category mismatch in RPC response:', {
+            log.warn('File category mismatch in RPC response:', {
               fileId: item.id,
               expectedCategory: category,
               actualCategory: fileCategory
@@ -431,17 +421,9 @@ export class FileReferenceServiceImpl implements FileReferenceService {
           return fileRef;
         });
 
-      console.log('[FileReferenceService.getFilesByCategory] Constructed file references from RPC response:', {
-        count: fileReferences.length,
-        firstFileId: fileReferences[0]?.id,
-        firstFilePath: fileReferences[0]?.file_path,
-        firstFileIsPublic: fileReferences[0]?.is_public,
-        firstFileHasAllRequiredFields: !!(fileReferences[0]?.id && fileReferences[0]?.file_path && fileReferences[0]?.file_metadata && fileReferences[0]?.table_name && fileReferences[0]?.record_id && fileReferences[0]?.organisation_id)
-      });
-
       return fileReferences;
     } catch (error) {
-      console.error('Error getting files by category:', error);
+      log.error('Error getting files by category:', error);
       throw error;
     }
   }
@@ -449,7 +431,7 @@ export class FileReferenceServiceImpl implements FileReferenceService {
   async uploadMultipleFiles(
     options: FileUploadOptions,
     files: File[]
-  ): Promise<import('../types/file-reference').BulkUploadResult> {
+  ): Promise<import('../../types/file-reference').BulkUploadResult> {
     const success: FileReference[] = [];
     const failed: { file: File; error: string }[] = [];
     const results: Array<{ file: File; result: FileUploadResult | null; error?: string }> = [];