@jmruthers/pace-core 0.5.180 → 0.5.182

package/src/services/OrganisationService.ts

@@ -19,6 +19,16 @@ import type {
 } from '../types/organisation';
 import { setOrganisationContext } from '../utils/context/organisationContext';
 import { logger } from '../utils/core/logger';
+import { assertUserId, assertOrganisationId } from '../types/core';
+
+// Type for RPC response from data_user_organisation_roles_get
+interface OrganisationRoleRpcResponse {
+  user_id: string;
+  organisation_id: string;
+  role: 'org_admin' | 'leader' | 'member' | 'supporter';
+  status: 'active' | 'inactive' | 'suspended';
+  [key: string]: unknown;
+}
 
 export class OrganisationService extends BaseService implements IOrganisationService {
   private _selectedOrganisation: Organisation | null = null;
@@ -112,7 +122,7 @@ export class OrganisationService extends BaseService implements IOrganisationSer
     // If user logs out, allow re-initialization when they log back in
     if (wasAuthenticated && !isAuthenticated) {
       // Reset BaseService initialization state to allow re-initialization
-      (this as any).isInitialized = false;
+      this.resetInitialization();
     }
     
     this.notify();
@@ -150,7 +160,7 @@ export class OrganisationService extends BaseService implements IOrganisationSer
   }
 
   validateOrganisationAccess(orgId: string): boolean {
-    return this._userMemberships.some((m: any) => 
+    return this._userMemberships.some((m) => 
       m.organisation_id === orgId && 
       m.status === 'active' &&
       m.revoked_at === null
@@ -179,12 +189,12 @@ export class OrganisationService extends BaseService implements IOrganisationSer
 
   getPrimaryOrganisation(): Organisation | null {
     // Look for org_admin role first, then leader, then member
-    const rolePriority = ['org_admin', 'leader', 'member'];
+    const rolePriority = ['org_admin', 'leader', 'member'] as const;
     
     for (const role of rolePriority) {
-      const membership = this._userMemberships.find((m: any) => m.role === role);
+      const membership = this._userMemberships.find((m) => m.role === role);
       if (membership) {
-        return this._organisations.find((org: any) => org.id === membership.organisation_id) || null;
+        return this._organisations.find((org) => org.id === membership.organisation_id) || null;
       }
     }
     
@@ -262,8 +272,6 @@ export class OrganisationService extends BaseService implements IOrganisationSer
     }
 
     try {
-      logger.debug('OrganisationService', 'Setting database organisation context for:', organisation.id);
-      
       // Add timeout to prevent hanging
       const timeoutPromise = new Promise((_, reject) => {
         setTimeout(() => reject(new Error('Context setting timeout after 5 seconds')), 5000);
@@ -273,7 +281,7 @@ export class OrganisationService extends BaseService implements IOrganisationSer
       
       await Promise.race([contextPromise, timeoutPromise]);
       
-      logger.debug('OrganisationService', 'Database organisation context set successfully');
+      // Database organisation context set successfully
       this._isContextReady = true;
       this.notify();
     } catch (error) {
@@ -287,10 +295,6 @@ export class OrganisationService extends BaseService implements IOrganisationSer
   }
 
   private async loadUserOrganisations(): Promise<void> {
-    // Add call tracking to detect race conditions
-    const callId = Math.random().toString(36).substr(2, 9);
-    logger.debug('OrganisationService', `Starting loadUserOrganisations call ${callId}`);
-    
     if (!this.user || !this.session || !this.supabaseClient) {
       // Clear state when no user, session, or supabase client
       this._selectedOrganisation = null;
@@ -304,7 +308,6 @@ export class OrganisationService extends BaseService implements IOrganisationSer
 
     // Additional check to prevent loading during auth state changes
     if (this.isLoadingRef) {
-      logger.debug("OrganisationService", "Already loading, skipping duplicate load");
       // Ensure loading state is correct
       this._isLoading = true;
       this.notify();
@@ -314,7 +317,6 @@ export class OrganisationService extends BaseService implements IOrganisationSer
     // Prevent rapid retries - minimum 2 seconds between attempts
     const now = Date.now();
     if (now - this.lastLoadTimeRef < 2000) {
-      logger.debug("OrganisationService", "Too soon since last load, skipping");
       // Ensure loading state is correct
       if (this._organisations.length > 0 || this._selectedOrganisation) {
         this._isLoading = false;
@@ -341,18 +343,10 @@ export class OrganisationService extends BaseService implements IOrganisationSer
     this.notify();
       
     try {
-      logger.debug("OrganisationService", "Supabase client ready:", {
-        isConnected: !!this.supabaseClient,
-        hasAuth: !!this.supabaseClient.auth,
-        hasRpc: !!this.supabaseClient.rpc
-      });
-      
       // Get user's organisation memberships using secure RPC function
       // Only get actual members (org_admin, leader, member) - exclude supporters
       let memberships, membershipError;
       try {
-        logger.debug("OrganisationService", "Making RPC call to data_user_organisation_roles_get...");
-        
         // Add timeout and abort signal to prevent hanging RPC calls
         const timeoutPromise = new Promise((_, reject) => {
           const timeoutId = setTimeout(() => reject(new Error('RPC call timeout after 10 seconds')), 10000);
@@ -372,22 +366,20 @@ export class OrganisationService extends BaseService implements IOrganisationSer
           throw new Error('Request aborted');
         }
         
-        const result = await Promise.race([rpcPromise, timeoutPromise]) as any;
-        
-        logger.debug("OrganisationService", "RPC call completed:", {
-          hasData: !!result.data,
-          hasError: !!result.error,
-          dataLength: result.data?.length || 0,
-          errorMessage: result.error?.message || 'No error'
-        });
+        const result = await Promise.race([rpcPromise, timeoutPromise]) as { data: OrganisationRoleRpcResponse[] | null; error: Error | null };
         
         // Filter to only actual members (org_admin, leader, member) - exclude supporters
-        memberships = result.data?.filter((role: any) => 
+        // Map to branded types when filtering
+        memberships = result.data?.filter((role) => 
           ['org_admin', 'leader', 'member'].includes(role.role)
-        ) || [];
+        ).map((m) => ({
+          ...m,
+          user_id: assertUserId(m.user_id),
+          organisation_id: assertOrganisationId(m.organisation_id),
+        })) || [];
         membershipError = result.error;
-      } catch (queryError: any) {
-        membershipError = queryError;
+      } catch (queryError) {
+        membershipError = queryError instanceof Error ? queryError : new Error(String(queryError));
       }
 
       if (membershipError) {
@@ -395,7 +387,6 @@ export class OrganisationService extends BaseService implements IOrganisationSer
         
         // If RPC fails with timeout, try direct database query as fallback
         if (membershipError.message?.includes('timeout')) {
-          logger.debug("OrganisationService", "RPC timed out, trying direct database query as fallback...");
           try {
             // Check if request was aborted before making fallback query
             if (abortSignal.aborted) {
@@ -439,8 +430,12 @@ export class OrganisationService extends BaseService implements IOrganisationSer
               throw membershipError; // Throw original error
             }
             
-            logger.debug("OrganisationService", "Fallback query successful, got", fallbackData?.length || 0, "memberships");
-            memberships = fallbackData || [];
+            // Map to branded types
+            memberships = fallbackData?.map((m) => ({
+              ...m,
+              user_id: assertUserId(m.user_id),
+              organisation_id: assertOrganisationId(m.organisation_id),
+            })) || [];
             membershipError = null;
           } catch (fallbackErr) {
             logger.error("OrganisationService", "Fallback query failed:", fallbackErr);
@@ -457,7 +452,7 @@ export class OrganisationService extends BaseService implements IOrganisationSer
 
       // Get organisation details for the memberships
       const organisationIds = memberships
-        .map((m: any) => m.organisation_id)
+        .map((m) => m.organisation_id)
         .filter((id: string) => {
           // Better validation to prevent empty string UUID errors
           if (!id || typeof id !== 'string') {
@@ -503,7 +498,7 @@ export class OrganisationService extends BaseService implements IOrganisationSer
 
       // Create a map of organisation_id to role from the memberships data
       const roleMap = new Map<string, string>();
-      memberships?.forEach((membership: any) => {
+      memberships?.forEach((membership) => {
         roleMap.set(membership.organisation_id, membership.role);
       });
 
@@ -516,6 +511,7 @@ export class OrganisationService extends BaseService implements IOrganisationSer
       }
 
       this._organisations = activeOrgs;
+      // Memberships already have branded types from earlier mapping
       this._userMemberships = memberships as OrganisationMembership[];
       
       // Store role map in component state for later use
@@ -551,7 +547,7 @@ export class OrganisationService extends BaseService implements IOrganisationSer
       
       // 2. Fall back to org_admin role organisation (highest privilege)
       if (!initialOrg) {
-        const adminMembership = memberships.find((m: any) => m.role === 'org_admin');
+        const adminMembership = memberships.find((m) => m.role === 'org_admin');
         if (adminMembership) {
           const foundOrg = organisations.find((org) => org.id === adminMembership.organisation_id);
           if (foundOrg) {

package/src/services/__tests__/AuthService.restoreSession.test.ts

@@ -7,8 +7,12 @@ function createSupabaseMock() {
     getSession: vi.fn().mockResolvedValue({ data: { session: null }, error: null }),
     getUser: vi.fn(), // should not be called when session is null
     onAuthStateChange: vi.fn().mockImplementation((cb: any) => {
-      // Provide a subscription-like object
-      return { unsubscribe: () => {} } as any;
+      // Provide a subscription-like object with data.subscription structure
+      const subscription = { unsubscribe: () => {} };
+      return { 
+        data: { subscription },
+        error: null
+      } as any;
     }),
   } as any;
 

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

@@ -10,7 +10,8 @@
 
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { EventService } from '../EventService';
-import { Event } from '../../types/unified';
+import { Event } from '../../types/event';
+import { assertOrganisationId } from '../../types/core';
 
 // Don't mock the logger - it now works in test mode
 // We'll spy on the Logger class methods in beforeEach to verify calls
@@ -62,34 +63,62 @@ const mockOrganisation = {
 
 const mockSetSelectedEventId = vi.fn();
 
+// Raw RPC response data (what comes from database)
+const mockEventRpcData = {
+  event_id: 'event-1',
+  event_name: 'Test Event',
+  event_code: 'test-event',
+  event_date: '2025-01-01T00:00:00Z',
+  event_venue: 'Test Venue',
+  event_participants: 100,
+  event_colours: '#FF0000',
+  organisation_id: 'org-1',
+  is_visible: true
+};
+
+const mockEvent2RpcData = {
+  event_id: 'event-2',
+  event_name: 'Future Event',
+  event_code: 'future-event',
+  event_date: '2025-12-31T00:00:00Z',
+  event_venue: 'Future Venue',
+  event_participants: 200,
+  event_colours: '#00FF00',
+  organisation_id: 'org-1',
+  is_visible: true
+};
+
+// Transformed Event objects (what EventService returns after transformation)
 const mockEvent: Event = {
   id: 'event-1',
   event_id: 'event-1',
   event_name: 'Test Event',
+  event_code: 'test-event',
   event_date: '2025-01-01T00:00:00Z',
   event_venue: 'Test Venue',
   event_participants: 100,
   event_colours: '#FF0000',
   event_logo: '',
-  organisation_id: 'org-1',
+  organisation_id: assertOrganisationId('org-1'),
   is_visible: true,
-  name: 'Test Event',
-  start_date: '2025-01-01T00:00:00Z'
+  created_at: expect.any(String),
+  updated_at: expect.any(String)
 };
 
 const mockEvent2: Event = {
   id: 'event-2',
   event_id: 'event-2',
   event_name: 'Future Event',
+  event_code: 'future-event',
   event_date: '2025-12-31T00:00:00Z',
   event_venue: 'Future Venue',
   event_participants: 200,
   event_colours: '#00FF00',
   event_logo: '',
-  organisation_id: 'org-1',
+  organisation_id: assertOrganisationId('org-1'),
   is_visible: true,
-  name: 'Future Event',
-  start_date: '2025-12-31T00:00:00Z'
+  created_at: expect.any(String),
+  updated_at: expect.any(String)
 };
 
 describe('EventService', () => {
@@ -140,7 +169,7 @@ describe('EventService', () => {
 
     it('should fetch events on initialization', async () => {
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -176,7 +205,7 @@ describe('EventService', () => {
   describe('Event Operations', () => {
     beforeEach(async () => {
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -226,8 +255,13 @@ describe('EventService', () => {
       // Clear the mock call count from the beforeEach initialization
       vi.clearAllMocks();
       
+      const newEventRpcData = {
+        ...mockEventRpcData,
+        event_id: 'event-3',
+        event_name: 'New Event'
+      };
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2, newEvent],
+        data: [mockEventRpcData, mockEvent2RpcData, newEventRpcData],
         error: null
       });
 
@@ -242,7 +276,7 @@ describe('EventService', () => {
     beforeEach(async () => {
       // Set up mock data before creating service
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -268,19 +302,19 @@ describe('EventService', () => {
     });
 
     it('should return most recent past event when no future events', async () => {
-      const pastEvent1: Event = {
-        ...mockEvent,
+      const pastEvent1RpcData = {
+        ...mockEventRpcData,
         event_id: 'event-past-1',
         event_date: '2020-01-01T00:00:00Z'
       };
-      const pastEvent2: Event = {
-        ...mockEvent,
+      const pastEvent2RpcData = {
+        ...mockEventRpcData,
         event_id: 'event-past-2',
         event_date: '2021-06-15T00:00:00Z' // More recent past event
       };
 
       mockSupabase.rpc.mockResolvedValue({
-        data: [pastEvent1, pastEvent2],
+        data: [pastEvent1RpcData, pastEvent2RpcData],
         error: null
       });
 
@@ -335,7 +369,7 @@ describe('EventService', () => {
       );
 
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -367,7 +401,7 @@ describe('EventService', () => {
       );
 
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -389,7 +423,7 @@ describe('EventService', () => {
   describe('State Management', () => {
     it('should notify subscribers when state changes', async () => {
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent],
+        data: [mockEventRpcData],
         error: null
       });
 
@@ -456,7 +490,7 @@ describe('EventService', () => {
     it('should auto-select next event when no event is selected', async () => {
       // Set up mock data before creating service
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -480,7 +514,7 @@ describe('EventService', () => {
     it('should not auto-select when user has cleared event', async () => {
       // Set up mock data before calling initialize
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -491,7 +525,7 @@ describe('EventService', () => {
 
       // Refresh events
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -505,7 +539,7 @@ describe('EventService', () => {
   describe('Persistence', () => {
     it('should persist event selection across sessions', async () => {
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -527,7 +561,7 @@ describe('EventService', () => {
       mockSecureStorage.getItem.mockResolvedValue('event-1');
 
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -574,7 +608,7 @@ describe('EventService', () => {
 
     it('should clear events when switching to different organisation', async () => {
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent],
+        data: [mockEventRpcData],
         error: null
       });
 
@@ -599,7 +633,7 @@ describe('EventService', () => {
 
     it('should clear event selection when user changes', async () => {
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent],
+        data: [mockEventRpcData],
         error: null
       });
 
@@ -624,7 +658,7 @@ describe('EventService', () => {
 
     it('should clear event selection when user logs out', async () => {
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent],
+        data: [mockEventRpcData],
         error: null
       });
 
@@ -651,7 +685,7 @@ describe('EventService', () => {
       mockSecureStorage.getItem.mockResolvedValue('event-1');
 
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -814,7 +848,7 @@ describe('EventService', () => {
         event_participants: 100,
         event_colours: '#FF0000',
         event_logo: '',
-        organisation_id: 'org-1',
+        organisation_id: assertOrganisationId('org-1'),
         is_visible: true,
         name: 'Later Event',
         start_date: futureDate1.toISOString()
@@ -829,7 +863,7 @@ describe('EventService', () => {
         event_participants: 100,
         event_colours: '#00FF00',
         event_logo: '',
-        organisation_id: 'org-1',
+        organisation_id: assertOrganisationId('org-1'),
         is_visible: true,
         name: 'Earlier Event',
         start_date: futureDate2.toISOString()
@@ -883,7 +917,7 @@ describe('EventService', () => {
       mockSecureStorage.getItem.mockResolvedValue(null);
 
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -904,7 +938,7 @@ describe('EventService', () => {
 
     it('should not auto-select when user has explicitly cleared event', async () => {
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent, mockEvent2],
+        data: [mockEventRpcData, mockEvent2RpcData],
         error: null
       });
 
@@ -929,7 +963,7 @@ describe('EventService', () => {
       localStorage.setItem('_sec_pace-core-selected-event', 'old-encrypted');
 
       mockSupabase.rpc.mockResolvedValue({
-        data: [mockEvent],
+        data: [mockEventRpcData],
         error: null
       });
 

package/src/services/interfaces/IEventService.ts

@@ -8,7 +8,7 @@
  * Defines the contract for event management functionality.
  */
 
-import { Event } from '../../types/unified';
+import { Event } from '../../types/event';
 
 export interface IEventService {
   // Event state

package/src/styles/core.css

@@ -85,7 +85,7 @@
     font-size: 2.5rem;
     font-weight: 700;
     line-height: 1.2;
-    color: var(--color-main-600);
+    color: var(--color-main-700);
   }
 
   h2 {
@@ -99,7 +99,7 @@
     font-size: 1.75rem;
     font-weight: 600;
     line-height: 1.4;
-    color: var(--color-main-700);
+    color: var(--color-main-600);
   }
 
   h4 {

package/src/styles/index.ts

@@ -15,7 +15,7 @@
  * 
  * @example
  * ```tsx
- * // Import theming runtime
+ * // For dynamic theming, import from theming/runtime
  * import { applyPalette, clearPalette } from '@jmruthers/pace-core/theming/runtime';
  * ```
  */
@@ -45,7 +45,3 @@ export function getStylePath(style: keyof typeof styleConfig): string {
 export function getAllStylePaths(): string[] {
   return Object.values(styleConfig).map(config => config.path);
 }
-
-// Re-export theming runtime for convenience
-export { applyPalette, clearPalette, generateSSRThemeCSS, isDynamicThemingActive, getCurrentThemeData, parseAndNormalizeEventColours } from '../theming/runtime';
-export type { PaletteData, ColorPalette, ColorShade } from '../theming/runtime';

package/src/types/__tests__/guards.test.ts

@@ -9,7 +9,7 @@
 
 import { describe, it, expect } from 'vitest';
 import { isAuthErrorCode, isUser, isSession } from '../guards';
-import { AuthErrorCode } from '../unified';
+import { AuthErrorCode } from '../core';
 
 describe('Type Guards', () => {
   describe('isAuthErrorCode', () => {

package/src/types/__tests__/type-validation.test.ts

@@ -11,7 +11,6 @@ import type {
   Session,
   Event,
   Organisation,
-  AccessLevel,
   PermissionString,
   UserPermissions,
   ValidationError,

package/src/types/auth.ts

@@ -1,10 +1,17 @@
 /**
- * @file Auth related types
+ * @file Authentication Types
  * @package @jmruthers/pace-core
  * @module Types/Auth
- * @since 0.1.0
+ * @since 1.0.0
+ * 
+ * Type definitions for authentication, sessions, and user management.
  */
 
+import type { AuthError, AuthErrorCode } from './core';
+
+/**
+ * Session restoration state for tracking Supabase session hydration
+ */
 export interface SessionRestorationState {
   /** True while Supabase is hydrating the local session */
   isRestoring: boolean;
@@ -13,3 +20,36 @@ export interface SessionRestorationState {
   /** Error encountered during restoration (timeout or Supabase error) */
   restorationError: Error | null;
 }
+
+/**
+ * Standard Supabase User type
+ * Matches @supabase/supabase-js User interface
+ */
+export interface User {
+  id: string;
+  email?: string;
+  created_at: string;
+  updated_at: string;
+  email_confirmed_at?: string;
+  last_sign_in_at?: string;
+  user_metadata?: Record<string, unknown>;
+  app_metadata?: Record<string, unknown>;
+}
+
+/**
+ * Standard Supabase Session type
+ * Matches @supabase/supabase-js Session interface
+ */
+export interface Session {
+  access_token: string;
+  refresh_token?: string;
+  expires_in: number;
+  expires_at: number;
+  token_type: string;
+  user: User;
+  provider_token?: string;
+  provider_refresh_token?: string;
+}
+
+// Re-export error types for convenience
+export type { AuthError, AuthErrorCode } from './core';