@jmruthers/pace-core 0.5.135 → 0.5.136

package/src/services/__tests__/EventService.test.ts

@@ -12,8 +12,19 @@ import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { EventService } from '../EventService';
 import { Event } from '../../types/unified';
 
+// Don't mock the logger - it now works in test mode
+// We'll spy on the Logger class methods in beforeEach to verify calls
+import { Logger } from '../../utils/core/logger';
+
+let mockLoggerFunctions: {
+  debug: ReturnType<typeof vi.spyOn>;
+  error: ReturnType<typeof vi.spyOn>;
+  warn: ReturnType<typeof vi.spyOn>;
+  info: ReturnType<typeof vi.spyOn>;
+};
+
 // Mock secureStorage - must be defined inline in vi.mock due to hoisting
-vi.mock('../../utils/secureStorage', () => {
+vi.mock('../../utils/security/secureStorage', () => {
   const mockSecureStorage = {
     setItem: vi.fn().mockResolvedValue(undefined),
     getItem: vi.fn().mockResolvedValue(null),
@@ -25,7 +36,7 @@ vi.mock('../../utils/secureStorage', () => {
 });
 
 // Get reference to mocked secureStorage for test assertions
-import { secureStorage } from '../../utils/secureStorage';
+import { secureStorage } from '../../utils/security/secureStorage';
 const mockSecureStorage = secureStorage as any;
 
 // Mock Supabase client
@@ -86,6 +97,14 @@ describe('EventService', () => {
   let eventService: EventService;
 
   beforeEach(() => {
+    // Spy on Logger methods to verify calls (logger now works in test mode)
+    mockLoggerFunctions = {
+      debug: vi.spyOn(Logger, 'debug'),
+      error: vi.spyOn(Logger, 'error'),
+      warn: vi.spyOn(Logger, 'warn'),
+      info: vi.spyOn(Logger, 'info'),
+    };
+    
     vi.clearAllMocks();
     mockSupabase = createMockSupabaseClient();
     eventService = new EventService(
@@ -100,6 +119,11 @@ describe('EventService', () => {
 
   afterEach(() => {
     eventService.cleanup();
+    // Restore spies
+    mockLoggerFunctions.debug.mockRestore();
+    mockLoggerFunctions.error.mockRestore();
+    mockLoggerFunctions.warn.mockRestore();
+    mockLoggerFunctions.info.mockRestore();
     vi.clearAllMocks();
     // Clear localStorage
     localStorage.clear();
@@ -880,7 +904,7 @@ describe('EventService', () => {
 
   describe('Event Validation', () => {
     it('should handle validation error gracefully', () => {
-      const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      vi.clearAllMocks();
 
       const eventFromDifferentOrg: Event = {
         ...mockEvent,
@@ -890,8 +914,16 @@ describe('EventService', () => {
       // Should not throw error
       eventService.setSelectedEvent(eventFromDifferentOrg);
 
-      expect(consoleErrorSpy).toHaveBeenCalled();
-      consoleErrorSpy.mockRestore();
+      // The logger should be called synchronously when validation fails
+      expect(mockLoggerFunctions.error).toHaveBeenCalledWith(
+        'EventService',
+        'Event organisation_id does not match selected organisation',
+        expect.objectContaining({
+          eventOrganisationId: 'org-2',
+          selectedOrganisationId: 'org-1',
+          eventName: expect.any(String)
+        })
+      );
     });
 
     it('should handle missing organisation during validation', () => {

package/src/services/__tests__/InactivityService.test.ts

@@ -11,6 +11,17 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { InactivityService } from '../InactivityService';
 
+// Don't mock the logger - it now works in test mode
+// We'll spy on the Logger class methods in beforeEach to verify calls
+import { Logger } from '../../utils/core/logger';
+
+let mockLoggerFunctions: {
+  debug: ReturnType<typeof vi.spyOn>;
+  error: ReturnType<typeof vi.spyOn>;
+  warn: ReturnType<typeof vi.spyOn>;
+  info: ReturnType<typeof vi.spyOn>;
+};
+
 // Mock Supabase client
 const createMockSupabaseClient = () => ({
   auth: {
@@ -48,6 +59,14 @@ describe('InactivityService', () => {
   let mockOnIdleLogout: ReturnType<typeof vi.fn>;
 
   beforeEach(() => {
+    // Spy on Logger methods to verify calls (logger now works in test mode)
+    mockLoggerFunctions = {
+      debug: vi.spyOn(Logger, 'debug'),
+      error: vi.spyOn(Logger, 'error'),
+      warn: vi.spyOn(Logger, 'warn'),
+      info: vi.spyOn(Logger, 'info'),
+    };
+    
     mockSupabase = createMockSupabaseClient();
     mockOnIdleLogout = vi.fn();
     
@@ -64,6 +83,11 @@ describe('InactivityService', () => {
 
   afterEach(() => {
     inactivityService.cleanup();
+    // Restore spies
+    mockLoggerFunctions.debug.mockRestore();
+    mockLoggerFunctions.error.mockRestore();
+    mockLoggerFunctions.warn.mockRestore();
+    mockLoggerFunctions.info.mockRestore();
     vi.clearAllMocks();
   });
 
@@ -498,8 +522,15 @@ describe('InactivityService', () => {
     });
 
     it('should log production warning when enabled', async () => {
-      const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+      vi.clearAllMocks();
       const originalMode = import.meta.env.MODE;
+      const originalWindow = global.window;
+      
+      // Ensure window is defined for the test
+      if (typeof global.window === 'undefined') {
+        (global as any).window = {};
+      }
+      
       (import.meta.env as any).MODE = 'production';
 
       const service = new InactivityService(
@@ -514,12 +545,15 @@ describe('InactivityService', () => {
       await service.initialize();
 
       // Should log warning in production
-      expect(consoleWarnSpy).toHaveBeenCalledWith(
-        expect.stringContaining('[InactivityService] Inactivity feature enabled in production')
+      expect(mockLoggerFunctions.warn).toHaveBeenCalledWith(
+        'InactivityService',
+        'Inactivity feature enabled in production'
       );
 
       (import.meta.env as any).MODE = originalMode;
-      consoleWarnSpy.mockRestore();
+      if (originalWindow === undefined) {
+        delete (global as any).window;
+      }
       service.cleanup();
     });
   });

package/src/services/__tests__/OrganisationService.test.ts

@@ -74,7 +74,7 @@ const mockMembership2: OrganisationMembership = {
 };
 
 // Mock the organisationContext utility
-vi.mock('../../utils/organisationContext', () => ({
+vi.mock('../../utils/context/organisationContext', () => ({
   setOrganisationContext: vi.fn().mockResolvedValue(undefined)
 }));
 
@@ -157,11 +157,6 @@ describe('OrganisationService', () => {
         p_user_id: mockUser.id,
         p_organisation_id: null
       });
-      
-      // Debug: Check if state was populated
-      console.log('Memberships:', organisationService.getUserMemberships());
-      console.log('Organisations:', organisationService.getOrganisations());
-      console.log('Selected:', organisationService.getSelectedOrganisation());
     });
 
     it('should handle missing dependencies gracefully', async () => {
@@ -706,7 +701,7 @@ describe('OrganisationService', () => {
     it('should handle database context setting timeout', async () => {
       vi.useFakeTimers();
       
-      const { setOrganisationContext } = await import('../../utils/organisationContext');
+      const { setOrganisationContext } = await import('../../utils/context/organisationContext');
       vi.mocked(setOrganisationContext).mockImplementation(() => {
         return new Promise(() => {
           // Never resolves, will timeout after 5 seconds
@@ -729,7 +724,7 @@ describe('OrganisationService', () => {
     });
 
     it('should handle database context setting error', async () => {
-      const { setOrganisationContext } = await import('../../utils/organisationContext');
+      const { setOrganisationContext } = await import('../../utils/context/organisationContext');
       vi.mocked(setOrganisationContext).mockRejectedValue(new Error('Database error'));
 
       organisationService.setSelectedOrganisation(mockOrganisation);

package/src/services/base/BaseService.ts

@@ -8,6 +8,8 @@
  * All services extend this class to provide state change notifications.
  */
 
+import { logger } from '../../utils/core/logger';
+
 export type StateChangeCallback = () => void;
 
 export abstract class BaseService {
@@ -40,7 +42,7 @@ export abstract class BaseService {
       try {
         callback();
       } catch (error) {
-        console.error('[BaseService] Error in subscriber callback:', error);
+        logger.error('BaseService', 'Error in subscriber callback:', error);
       }
     });
   }

package/src/theming/__tests__/runtime.test.ts

@@ -17,6 +17,20 @@ import {
   type PaletteData
 } from '../runtime';
 
+// Mock the Logger module
+vi.mock('../../utils/core/logger', () => {
+  const mockLoggerInstance = {
+    warn: vi.fn(),
+  };
+  return {
+    createLogger: vi.fn(() => mockLoggerInstance),
+  };
+});
+
+// Get the mock instance after mock is set up
+import { createLogger } from '../../utils/core/logger';
+const getMockLogger = () => createLogger('test');
+
 // Create proper mock for style object that mimics CSSStyleDeclaration
 const createMockStyle = () => {
   const data = {
@@ -69,25 +83,18 @@ const mockDocument = {
   get documentElement() { return mockDocumentElement; },
   head: {
     appendChild: vi.fn()
+  },
+  body: {
+    innerHTML: ''
   }
 };
 
-const mockConsole = {
-  warn: vi.fn(),
-  log: vi.fn()
-};
-
 // Mock global objects
 Object.defineProperty(global, 'document', {
   value: mockDocument,
   writable: true
 });
 
-Object.defineProperty(global, 'console', {
-  value: mockConsole,
-  writable: true
-});
-
 describe('[theming] applyPalette', () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -154,7 +161,8 @@ describe('[theming] applyPalette', () => {
     };
 
     expect(() => applyPalette(palette)).not.toThrow();
-    expect(mockConsole.warn).toHaveBeenCalledWith('applyPalette: Document not available (SSR)');
+    const logger = getMockLogger();
+    expect(vi.mocked(logger.warn)).toHaveBeenCalledWith('Document not available (SSR) - palette not applied');
 
     // Restore document
     Object.defineProperty(global, 'document', {
@@ -177,7 +185,8 @@ describe('[theming] applyPalette', () => {
     };
 
     expect(() => applyPalette(palette)).not.toThrow();
-    expect(mockConsole.warn).toHaveBeenCalledWith('applyPalette: Document not available (SSR)');
+    const logger = getMockLogger();
+    expect(vi.mocked(logger.warn)).toHaveBeenCalledWith('Document not available (SSR) - palette not applied');
 
     // Restore document
     Object.defineProperty(global, 'document', {

package/src/theming/parseEventColours.ts

@@ -6,26 +6,12 @@
  * 
  * Shared utility for parsing and normalizing event_colours from database.
  * Handles multiple input formats and ensures consistent palette structure.
- * 
- * Supports:
- * - Object format: { main: {...}, sec: {...}, acc: {...} }
- * - String format: JSON string that will be parsed
- * - Legacy format: { "ev-main": {...}, "ev-sec": {...}, "ev-acc": {...} }
- * 
- * The function only includes explicitly defined color values, ensuring
- * that undefined shades are not included in the palette.
- * 
- * @example
- * ```ts
- * import { parseAndNormalizeEventColours } from '@jmruthers/pace-core/theming/parseEventColours';
- * 
- * const palette = parseAndNormalizeEventColours(event.event_colours);
- * if (palette) {
- *   applyPalette(palette);
- * }
- * ```
  */
 
+import { createLogger } from '../utils/core/logger';
+
+const log = createLogger('ParseEventColours');
+
 /**
  * Parse and normalize event_colours to PaletteData
  * 
@@ -116,7 +102,7 @@ export function parseAndNormalizeEventColours(input: unknown): { main: any; sec:
       acc: fill(acc) 
     };
   } catch (error) {
-    console.warn('[parseEventColours] Failed to parse/normalize event colours:', error);
+    log.warn('Failed to parse/normalize event colours:', error);
     return null;
   }
 }

package/src/theming/runtime.ts

@@ -6,7 +6,13 @@
  * 
  * Runtime helpers for palette replacement from organisation/event payloads.
  * Provides simple applyPalette() and clearPalette() API with SSR support.
- * 
+ */
+
+import { createLogger } from '../utils/core/logger';
+
+const log = createLogger('ThemingRuntime');
+
+/**
  * @example
  * ```ts
  * import { applyPalette, clearPalette } from '@jmruthers/pace-core/theming/runtime';
@@ -63,9 +69,7 @@ function formatOklchCss(color: ColorShade): string {
  */
 export function applyPalette(palette: PaletteData): void {
   if (typeof document === 'undefined' || document === null) {
-    if (typeof console !== 'undefined' && console?.warn) {
-      console.warn('applyPalette: Document not available (SSR)');
-    }
+    log.warn('Document not available (SSR) - palette not applied');
     return;
   }
 

package/src/types/validation.ts

@@ -102,7 +102,6 @@ export const contactFormSchema = z.object({
 
 export type LoginFormValues = z.infer<typeof loginSchema>;
 export type RegistrationFormValues = z.infer<typeof registrationSchema>;
-export type PasswordResetFormValues = z.infer<typeof passwordResetSchema>;
 export type ChangePasswordFormValues = z.infer<typeof changePasswordSchema>;
 export type UserProfileFormValues = z.infer<typeof userProfileSchema>;
 
@@ -120,11 +119,6 @@ export type SecureRegistrationFormValues = {
   csrfToken?: string;
 };
 
-export type SecurePasswordResetFormValues = {
-  email: string;
-  csrfToken?: string;
-};
-
 // ============================================================================
 // Utility Types
 // ============================================================================
@@ -139,26 +133,5 @@ export type ContactFormData = z.infer<typeof contactFormSchema>;
 // ============================================================================
 // Schema Utility Functions
 // ============================================================================
-
-export function pickSchema<T extends z.ZodObject<any, any, any>, K extends keyof z.infer<T>>(
-  schema: T,
-  keys: K[]
-): z.ZodObject<Pick<z.infer<T>, K>> {
-  const shape = Object.entries(schema.shape)
-    .filter(([key]) => keys.includes(key as K))
-    .reduce((acc, [key, value]) => {
-      (acc as Record<string, unknown>)[key] = value as unknown;
-      return acc;
-    }, {} as Record<string, unknown>);
-
-  return z.object(shape as Record<string, z.ZodTypeAny>) as z.ZodObject<Pick<z.infer<T>, K>>;
-}
-
-export function combineSchemas<T extends z.ZodObject<any, any, any>[]>(
-  schemas: T
-): z.ZodObject<any, any, any> {
-  return schemas.reduce(
-    (merged, schema) => merged.merge(schema),
-    z.object({})
-  );
-}
+// Re-exported from utils/validation/schema.ts
+export { pickSchema, combineSchemas } from '../utils/validation/schema';

package/src/utils/__tests__/appConfig.unit.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { setAppConfig, getAppConfig, getCurrentAppName, getCurrentAppId } from '../appConfig';
+import { setAppConfig, getAppConfig, getCurrentAppName, getCurrentAppId } from '../app/appConfig';
 
 describe('App Configuration Utilities', () => {
   beforeEach(() => {

package/src/utils/__tests__/audit.unit.test.ts

@@ -4,7 +4,7 @@ import {
   logAuthEvent,
   logPermissionEvent,
   logSecurityEvent
-} from '../audit';
+} from '../audit/audit';
 
 describe('Audit Logger Utility', () => {
   beforeEach(() => {

package/src/utils/__tests__/auth-utils.unit.test.ts

@@ -5,7 +5,7 @@ import {
   resetPassword,
   updatePassword,
   auditLogger
-} from '../auth-utils';
+} from '../security/auth-utils';
 
 describe('Auth Utils', () => {
   beforeEach(() => {

package/src/utils/__tests__/bundleAnalysis.unit.test.ts

@@ -25,7 +25,7 @@ describe('bundleAnalysis', () => {
 
       // Clear module cache and re-import
       vi.resetModules();
-      const { bundleAnalyzer } = await import('../bundleAnalysis');
+      const { bundleAnalyzer } = await import('../performance/bundleAnalysis');
       const result = bundleAnalyzer.analyzeBundle();
 
       expect(result).toBeNull();
@@ -39,7 +39,7 @@ describe('bundleAnalysis', () => {
 
       // Clear module cache and re-import to pick up environment change
       vi.resetModules();
-      const { bundleAnalyzer } = await import('../bundleAnalysis');
+      const { bundleAnalyzer } = await import('../performance/bundleAnalysis');
       const result = bundleAnalyzer.analyzeBundle();
 
       expect(result).toEqual({
@@ -59,7 +59,7 @@ describe('bundleAnalysis', () => {
       // Clear module cache and re-import to pick up environment change
       vi.resetModules();
       const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-      const { bundleAnalyzer } = await import('../bundleAnalysis');
+      const { bundleAnalyzer } = await import('../performance/bundleAnalysis');
       bundleAnalyzer.analyzeBundle();
 
       expect(consoleSpy).toHaveBeenCalledWith('Bundle analysis would run here in development');
@@ -79,7 +79,7 @@ describe('bundleAnalysis', () => {
       process.env.NODE_ENV = 'production';
 
       vi.resetModules();
-      const { bundleAnalyzer } = await import('../bundleAnalysis');
+      const { bundleAnalyzer } = await import('../performance/bundleAnalysis');
       bundleAnalyzer.checkTreeshaking();
 
       expect(consoleSpy.group).not.toHaveBeenCalled();
@@ -96,7 +96,7 @@ describe('bundleAnalysis', () => {
       const consoleSpy = vi.spyOn(console, 'group').mockImplementation(() => {});
       const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
       const consoleGroupEndSpy = vi.spyOn(console, 'groupEnd').mockImplementation(() => {});
-      const { bundleAnalyzer } = await import('../bundleAnalysis');
+      const { bundleAnalyzer } = await import('../performance/bundleAnalysis');
       bundleAnalyzer.checkTreeshaking();
 
       expect(consoleSpy).toHaveBeenCalledWith('Tree-shaking Analysis');
@@ -119,7 +119,7 @@ describe('bundleAnalysis', () => {
       process.env.NODE_ENV = 'production';
 
       vi.resetModules();
-      const { bundleAnalyzer } = await import('../bundleAnalysis');
+      const { bundleAnalyzer } = await import('../performance/bundleAnalysis');
       bundleAnalyzer.validateExports();
 
       expect(consoleSpy.group).not.toHaveBeenCalled();
@@ -136,7 +136,7 @@ describe('bundleAnalysis', () => {
       const consoleSpy = vi.spyOn(console, 'group').mockImplementation(() => {});
       const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
       const consoleGroupEndSpy = vi.spyOn(console, 'groupEnd').mockImplementation(() => {});
-      const { bundleAnalyzer } = await import('../bundleAnalysis');
+      const { bundleAnalyzer } = await import('../performance/bundleAnalysis');
       bundleAnalyzer.validateExports();
 
       expect(consoleSpy).toHaveBeenCalledWith('Export Validation');
@@ -156,7 +156,7 @@ describe('bundleAnalysis', () => {
   describe('bundleAnalyzer.generateReport', () => {
     it('should generate a comprehensive bundle analysis report', async () => {
       vi.resetModules();
-      const { bundleAnalyzer } = await import('../bundleAnalysis');
+      const { bundleAnalyzer } = await import('../performance/bundleAnalysis');
       const report = bundleAnalyzer.generateReport();
 
       expect(report).toContain('# Bundle Analysis Report');
@@ -173,7 +173,7 @@ describe('bundleAnalysis', () => {
 
     it('should include specific recommendations', async () => {
       vi.resetModules();
-      const { bundleAnalyzer } = await import('../bundleAnalysis');
+      const { bundleAnalyzer } = await import('../performance/bundleAnalysis');
       const report = bundleAnalyzer.generateReport();
 
       expect(report).toContain('Lazy load heavy UI components (charts, complex forms)');
@@ -190,7 +190,7 @@ describe('bundleAnalysis', () => {
       process.env.NODE_ENV = 'production';
 
       vi.resetModules();
-      const { validateImportPattern } = await import('../bundleAnalysis');
+      const { validateImportPattern } = await import('../performance/bundleAnalysis');
       validateImportPattern('lodash', ['debounce', 'throttle']);
 
       expect(consoleSpy.warn).not.toHaveBeenCalled();
@@ -204,7 +204,7 @@ describe('bundleAnalysis', () => {
 
       vi.resetModules();
       const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-      const { validateImportPattern } = await import('../bundleAnalysis');
+      const { validateImportPattern } = await import('../performance/bundleAnalysis');
       validateImportPattern('lodash', ['debounce', 'throttle', 'map', 'filter', 'reduce', 'forEach']);
 
       expect(consoleSpy).toHaveBeenCalledWith(
@@ -221,7 +221,7 @@ describe('bundleAnalysis', () => {
       process.env.NODE_ENV = 'development';
 
       vi.resetModules();
-      const { validateImportPattern } = await import('../bundleAnalysis');
+      const { validateImportPattern } = await import('../performance/bundleAnalysis');
       validateImportPattern('lodash', ['debounce', 'throttle']);
 
       expect(consoleSpy.warn).not.toHaveBeenCalled();
@@ -234,7 +234,7 @@ describe('bundleAnalysis', () => {
       process.env.NODE_ENV = 'development';
 
       vi.resetModules();
-      const { validateImportPattern } = await import('../bundleAnalysis');
+      const { validateImportPattern } = await import('../performance/bundleAnalysis');
       validateImportPattern('small-module', ['func1', 'func2', 'func3', 'func4', 'func5', 'func6']);
 
       expect(consoleSpy.warn).not.toHaveBeenCalled();
@@ -248,7 +248,7 @@ describe('bundleAnalysis', () => {
 
       vi.resetModules();
       const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-      const { validateImportPattern } = await import('../bundleAnalysis');
+      const { validateImportPattern } = await import('../performance/bundleAnalysis');
       validateImportPattern('lodash-es', ['debounce', 'throttle', 'map', 'filter', 'reduce', 'forEach']);
 
       expect(consoleSpy).toHaveBeenCalled();
@@ -263,7 +263,7 @@ describe('bundleAnalysis', () => {
 
       vi.resetModules();
       const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-      const { validateImportPattern } = await import('../bundleAnalysis');
+      const { validateImportPattern } = await import('../performance/bundleAnalysis');
       validateImportPattern('moment', ['format', 'parse', 'add', 'subtract', 'diff', 'isValid']);
 
       expect(consoleSpy).toHaveBeenCalled();
@@ -278,7 +278,7 @@ describe('bundleAnalysis', () => {
 
       vi.resetModules();
       const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-      const { validateImportPattern } = await import('../bundleAnalysis');
+      const { validateImportPattern } = await import('../performance/bundleAnalysis');
       validateImportPattern('rxjs', ['Observable', 'Subject', 'BehaviorSubject', 'map', 'filter', 'switchMap']);
 
       expect(consoleSpy).toHaveBeenCalled();
@@ -294,7 +294,7 @@ describe('bundleAnalysis', () => {
       process.env.NODE_ENV = 'production';
 
       vi.resetModules();
-      const { trackDynamicImport } = await import('../bundleAnalysis');
+      const { trackDynamicImport } = await import('../performance/bundleAnalysis');
       trackDynamicImport('some-module');
 
       expect(consoleSpy.log).not.toHaveBeenCalled();
@@ -308,7 +308,7 @@ describe('bundleAnalysis', () => {
 
       vi.resetModules();
       const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-      const { trackDynamicImport } = await import('../bundleAnalysis');
+      const { trackDynamicImport } = await import('../performance/bundleAnalysis');
       trackDynamicImport('react-hook-form');
 
       expect(consoleSpy).toHaveBeenCalledWith(
@@ -325,7 +325,7 @@ describe('bundleAnalysis', () => {
 
       vi.resetModules();
       const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-      const { trackDynamicImport } = await import('../bundleAnalysis');
+      const { trackDynamicImport } = await import('../performance/bundleAnalysis');
       trackDynamicImport('date-fns');
 
       expect(consoleSpy).toHaveBeenCalledWith(

package/src/utils/__tests__/cn.unit.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { cn } from '../cn';
+import { cn } from '../core/cn';
 
 describe('cn utility', () => {
   it('should merge class names correctly', () => {

package/src/utils/__tests__/debugLogger.test.ts

@@ -13,7 +13,7 @@
  */
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { DebugLogger } from '../debugLogger';
+import { DebugLogger } from '../core/debugLogger';
 
 describe('[unit] DebugLogger Tests', () => {
   let originalConsoleLog: typeof console.log;

package/src/utils/__tests__/deviceFingerprint.unit.test.ts

@@ -10,7 +10,7 @@ import {
   generateDeviceFingerprint,
   validateDeviceFingerprint,
   DeviceFingerprint,
-} from '../deviceFingerprint';
+} from '../device/deviceFingerprint';
 
 // Mock browser APIs
 const mockNavigator = {

package/src/utils/__tests__/dynamicUtils.unit.test.ts

@@ -11,7 +11,7 @@ import {
   lazyChartUtils,
   lazyFormUtils,
   lazyCSVUtils
-} from '../dynamicUtils';
+} from '../dynamic/dynamicUtils';
 
 // Mock dynamic imports
 vi.mock('lodash.debounce', () => ({

package/src/utils/__tests__/formatting.unit.test.ts

@@ -5,7 +5,7 @@ import {
   formatPercent,
   formatCompactNumber,
   formatFileSize
-} from '../formatting';
+} from '../formatting/formatting';
 
 describe('formatting utilities', () => {
   describe('formatDate', () => {

package/src/utils/__tests__/lazyLoad.unit.test.tsx

@@ -9,7 +9,7 @@ import React from 'react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { screen, waitFor, act } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { createLazyComponent, LazyDataTable } from '../lazyLoad';
+import { createLazyComponent, LazyDataTable } from '../dynamic/lazyLoad';
 import { LoadingSpinner } from '../../components/LoadingSpinner/LoadingSpinner';
 import { renderWithProviders } from '../../__tests__/helpers/test-utils';