@jmruthers/pace-core 0.5.181 → 0.5.183

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.test.ts

@@ -0,0 +1,21 @@
+import { getAllStylePaths, getStylePath, styleConfig } from './index';
+
+describe('styles exports', () => {
+  it('exposes metadata for the core stylesheet', () => {
+    expect(styleConfig.core).toEqual({
+      path: './core.css',
+      description: expect.stringContaining('Complete CSS foundation')
+    });
+  });
+
+  it('returns the correct path for a requested style', () => {
+    expect(getStylePath('core')).toBe('./core.css');
+  });
+
+  it('lists all available style paths exactly once', () => {
+    const allPaths = getAllStylePaths();
+
+    expect(allPaths).toEqual(['./core.css']);
+    expect(new Set(allPaths).size).toBe(allPaths.length);
+  });
+});

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__/organisation.roles.test.ts

@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest';
+import { ORGANISATION_ROLE_PERMISSIONS, type OrganisationPermission } from '../organisation';
+
+const EXPECTED_ROLE_ORDER = ['supporter', 'member', 'leader', 'org_admin'] as const;
+const ALLOWED_PERMISSIONS: OrganisationPermission[] = [
+  'view_basic',
+  'view_details',
+  'moderate_content',
+  'manage_events',
+  'manage_members',
+  'manage_settings',
+  '*'
+];
+
+describe('[types] Organisation role permissions', () => {
+  it('exposes all supported roles in a predictable order', () => {
+    expect(Object.keys(ORGANISATION_ROLE_PERMISSIONS)).toEqual(Array.from(EXPECTED_ROLE_ORDER));
+  });
+
+  it('only uses recognised permission tokens', () => {
+    Object.values(ORGANISATION_ROLE_PERMISSIONS).forEach(permissionList => {
+      permissionList.forEach(permission => {
+        expect(ALLOWED_PERMISSIONS).toContain(permission);
+      });
+    });
+  });
+
+  it('enforces progressive access (each role is a superset of the previous one)', () => {
+    const supporter = new Set(ORGANISATION_ROLE_PERMISSIONS.supporter);
+    const member = new Set(ORGANISATION_ROLE_PERMISSIONS.member);
+    const leader = new Set(ORGANISATION_ROLE_PERMISSIONS.leader);
+    const admin = new Set(ORGANISATION_ROLE_PERMISSIONS.org_admin);
+
+    supporter.forEach(permission => {
+      expect(member.has(permission)).toBe(true);
+      expect(leader.has(permission)).toBe(true);
+      expect(admin.has(permission)).toBe(true);
+    });
+
+    member.forEach(permission => {
+      expect(leader.has(permission)).toBe(true);
+      expect(admin.has(permission)).toBe(true);
+    });
+
+    leader.forEach(permission => {
+      expect(admin.has(permission)).toBe(true);
+    });
+  });
+
+  it('retains privileged capabilities for the organisation admin role', () => {
+    expect(ORGANISATION_ROLE_PERMISSIONS.org_admin).toEqual(
+      expect.arrayContaining(['manage_members', 'manage_settings'])
+    );
+  });
+});

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';