@geekmidas/constructs 0.0.12 → 0.0.13

package/src/endpoints/TestEndpointAdaptor.ts

@@ -1,4 +1,4 @@
-import type { AuditableAction, AuditStorage } from '@geekmidas/audit';
+import type { AuditStorage, AuditableAction } from '@geekmidas/audit';
 import { EnvironmentParser } from '@geekmidas/envkit';
 import type { EventPublisher } from '@geekmidas/events';
 import type { Logger } from '@geekmidas/logger';
@@ -14,13 +14,13 @@ import {
 import type { StandardSchemaV1 } from '@standard-schema/spec';
 import { publishConstructEvents } from '../publisher';
 import type { HttpMethod } from '../types';
-import type { MappedAudit } from './audit';
 import {
   type CookieOptions,
   Endpoint,
   type EndpointSchemas,
   ResponseBuilder,
 } from './Endpoint';
+import type { MappedAudit } from './audit';
 import {
   createAuditContext,
   executeWithAuditTransaction,
@@ -195,10 +195,29 @@ export class TestEndpointAdaptor<
       logger.warn('No auditor storage service available');
     }
 
+    // Resolve database service if configured
+    const rawDb = this.endpoint.databaseService
+      ? await this.serviceDiscovery
+          .register([this.endpoint.databaseService])
+          .then(
+            (s) =>
+              s[this.endpoint.databaseService!.serviceName as keyof typeof s],
+          )
+      : undefined;
+
     // Execute handler with automatic audit transaction support
     const result = await executeWithAuditTransaction(
       auditContext,
       async (auditor) => {
+        // Use audit transaction as db only if the storage uses the same database service
+        const sameDatabase =
+          auditContext?.storage?.databaseServiceName &&
+          auditContext.storage.databaseServiceName ===
+            this.endpoint.databaseService?.serviceName;
+        const db = sameDatabase
+          ? (auditor?.getTransaction?.() ?? rawDb)
+          : rawDb;
+
         const responseBuilder = new ResponseBuilder();
         const response = await this.endpoint.handler(
           {
@@ -211,6 +230,7 @@ export class TestEndpointAdaptor<
             header,
             cookie,
             auditor,
+            db,
           } as any,
           responseBuilder,
         );

package/src/endpoints/__tests__/AmazonApiGatewayV1EndpointAdaptor.spec.ts

@@ -469,7 +469,7 @@ describe('AmazonApiGatewayV1Endpoint', () => {
           services: [],
           logger: mockLogger,
           timeout: undefined,
-        memorySize: undefined,
+          memorySize: undefined,
           status: undefined,
           getSession: undefined,
           authorize: undefined,

package/src/endpoints/__tests__/AmazonApiGatewayV2EndpointAdaptor.audits.spec.ts

@@ -1,11 +1,11 @@
 import type {
-  AuditableAction,
   AuditRecord,
   AuditStorage,
+  AuditableAction,
 } from '@geekmidas/audit';
 import { EnvironmentParser } from '@geekmidas/envkit';
 import type { Logger } from '@geekmidas/logger';
-import { ServiceDiscovery, type Service } from '@geekmidas/services';
+import { type Service, ServiceDiscovery } from '@geekmidas/services';
 import { createMockContext, createMockV2Event } from '@geekmidas/testkit/aws';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { z } from 'zod';

package/src/endpoints/__tests__/AmazonApiGatewayV2EndpointAdaptor.events.spec.ts

@@ -76,7 +76,7 @@ describe('AmazonApiGatewayV2Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
-        memorySize: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -152,7 +152,7 @@ describe('AmazonApiGatewayV2Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
-        memorySize: undefined,
+      memorySize: undefined,
       status: 201,
       getSession: undefined,
       authorize: undefined,
@@ -242,7 +242,7 @@ describe('AmazonApiGatewayV2Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
-        memorySize: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -311,7 +311,7 @@ describe('AmazonApiGatewayV2Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
-        memorySize: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -371,7 +371,7 @@ describe('AmazonApiGatewayV2Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
-        memorySize: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -441,7 +441,7 @@ describe('AmazonApiGatewayV2Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
-        memorySize: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -522,7 +522,7 @@ describe('AmazonApiGatewayV2Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
-        memorySize: undefined,
+      memorySize: undefined,
       status: 201,
       getSession: undefined,
       authorize: undefined,
@@ -600,7 +600,7 @@ describe('AmazonApiGatewayV2Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
-        memorySize: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -678,7 +678,7 @@ describe('AmazonApiGatewayV2Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
-        memorySize: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,

package/src/endpoints/__tests__/AmazonApiGatewayV2EndpointAdaptor.kysely-audit.integration.spec.ts

@@ -1,7 +1,7 @@
 import type { AuditableAction } from '@geekmidas/audit';
 import {
-  KyselyAuditStorage,
   type AuditLogTable,
+  KyselyAuditStorage,
 } from '@geekmidas/audit/kysely';
 import { EnvironmentParser } from '@geekmidas/envkit';
 import type { Logger } from '@geekmidas/logger';
@@ -174,7 +174,10 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         audits,
       });
 
-      const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint as any);
+      const adapter = new AmazonApiGatewayV2Endpoint(
+        envParser,
+        endpoint as any,
+      );
       const handler = adapter.handler;
 
       const event = createMockV2Event({
@@ -252,7 +255,10 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         audits,
       });
 
-      const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint as any);
+      const adapter = new AmazonApiGatewayV2Endpoint(
+        envParser,
+        endpoint as any,
+      );
       const handler = adapter.handler;
 
       const event = createMockV2Event({
@@ -299,15 +305,21 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         route: '/users',
         method: 'POST',
         fn: async (
-          ctx: EndpointContext<undefined, [], Logger, unknown, TestAuditAction>,
+          ctx: EndpointContext<
+            undefined,
+            [],
+            Logger,
+            unknown,
+            TestAuditAction,
+            undefined,
+            KyselyAuditStorage<TestDatabase>
+          >,
         ) => {
-          // Manual audit in handler
-          if (ctx.auditor) {
-            ctx.auditor.audit('user.created', {
-              userId: 42,
-              email: 'manual@example.com',
-            });
-          }
+          // Manual audit in handler - auditor is guaranteed to exist when TAuditStorage is configured
+          ctx.auditor.audit('user.created', {
+            userId: 42,
+            email: 'manual@example.com',
+          });
 
           return { id: 42, email: 'manual@example.com' };
         },
@@ -327,7 +339,10 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         audits: [],
       });
 
-      const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint as any);
+      const adapter = new AmazonApiGatewayV2Endpoint(
+        envParser,
+        endpoint as any,
+      );
       const handler = adapter.handler;
 
       const event = createMockV2Event({
@@ -377,15 +392,21 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         route: '/users',
         method: 'POST',
         fn: async (
-          ctx: EndpointContext<undefined, [], Logger, unknown, TestAuditAction>,
+          ctx: EndpointContext<
+            undefined,
+            [],
+            Logger,
+            unknown,
+            TestAuditAction,
+            undefined,
+            KyselyAuditStorage<TestDatabase>
+          >,
         ) => {
-          // Manual audit before failure
-          if (ctx.auditor) {
-            ctx.auditor.audit('user.created', {
-              userId: 99,
-              email: 'shouldnotexist@example.com',
-            });
-          }
+          // Manual audit before failure - auditor is guaranteed to exist
+          ctx.auditor.audit('user.created', {
+            userId: 99,
+            email: 'shouldnotexist@example.com',
+          });
 
           // Fail after audit
           throw new Error('Handler failed after audit');
@@ -406,7 +427,10 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         audits: [],
       });
 
-      const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint as any);
+      const adapter = new AmazonApiGatewayV2Endpoint(
+        envParser,
+        endpoint as any,
+      );
       const handler = adapter.handler;
 
       const event = createMockV2Event({
@@ -463,7 +487,9 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
             [typeof databaseService],
             Logger,
             unknown,
-            TestAuditAction
+            TestAuditAction,
+            undefined,
+            KyselyAuditStorage<TestDatabase>
           >,
         ) => {
           const database = ctx.services.database;
@@ -475,13 +501,11 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
             .returningAll()
             .executeTakeFirstOrThrow();
 
-          // Record audit
-          if (ctx.auditor) {
-            ctx.auditor.audit('user.created', {
-              userId: user.id,
-              email: user.email,
-            });
-          }
+          // Record audit - auditor is guaranteed to exist
+          ctx.auditor.audit('user.created', {
+            userId: user.id,
+            email: user.email,
+          });
 
           return { id: user.id, email: user.email };
         },
@@ -501,7 +525,10 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         audits: [],
       });
 
-      const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint as any);
+      const adapter = new AmazonApiGatewayV2Endpoint(
+        envParser,
+        endpoint as any,
+      );
       const handler = adapter.handler;
 
       const event = createMockV2Event({
@@ -566,15 +593,21 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         route: '/users',
         method: 'POST',
         fn: async (
-          ctx: EndpointContext<undefined, [], Logger, unknown, TestAuditAction>,
+          ctx: EndpointContext<
+            undefined,
+            [],
+            Logger,
+            unknown,
+            TestAuditAction,
+            undefined,
+            KyselyAuditStorage<TestDatabase>
+          >,
         ) => {
-          // Manual audit
-          if (ctx.auditor) {
-            ctx.auditor.audit('user.updated', {
-              userId: 100,
-              changes: ['verified'],
-            });
-          }
+          // Manual audit - auditor is guaranteed to exist
+          ctx.auditor.audit('user.updated', {
+            userId: 100,
+            changes: ['verified'],
+          });
 
           return { id: 100, email: 'combined@example.com' };
         },
@@ -594,7 +627,10 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         audits,
       });
 
-      const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint as any);
+      const adapter = new AmazonApiGatewayV2Endpoint(
+        envParser,
+        endpoint as any,
+      );
       const handler = adapter.handler;
 
       const event = createMockV2Event({
@@ -679,7 +715,10 @@ describe('AmazonApiGatewayV2Endpoint Kysely Audit Integration', () => {
         },
       });
 
-      const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint as any);
+      const adapter = new AmazonApiGatewayV2Endpoint(
+        envParser,
+        endpoint as any,
+      );
       const handler = adapter.handler;
 
       const event = createMockV2Event({

package/src/endpoints/__tests__/Endpoint.cookies.spec.ts

@@ -163,7 +163,9 @@ describe('Endpoint.createCookies', () => {
     });
 
     it('should preserve case in cookie names when getting all', () => {
-      const cookieFn = Endpoint.createCookies('Session=abc; session=xyz; TOKEN=123');
+      const cookieFn = Endpoint.createCookies(
+        'Session=abc; session=xyz; TOKEN=123',
+      );
 
       const allCookies = cookieFn();
 

package/src/endpoints/__tests__/Endpoint.manifest.spec.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
+import { z } from 'zod';
 import { Endpoint } from '../Endpoint';
 import { SuccessStatus } from '../Endpoint';
-import { z } from 'zod';
 
 describe('Endpoint manifest fields', () => {
   it('should store timeout and memorySize', () => {

package/src/endpoints/__tests__/EndpointBuilder.audit.spec.ts

@@ -1,7 +1,7 @@
 import type {
-  AuditableAction,
   AuditRecord,
   AuditStorage,
+  AuditableAction,
 } from '@geekmidas/audit';
 import type { Service } from '@geekmidas/services';
 import { describe, expect, it } from 'vitest';
@@ -130,7 +130,10 @@ describe('EndpointBuilder audit methods', () => {
     });
 
     it('should allow chaining auditor and actor in any order', () => {
-      const actorExtractor: ActorExtractor = () => ({ id: '123', type: 'user' });
+      const actorExtractor: ActorExtractor = () => ({
+        id: '123',
+        type: 'user',
+      });
 
       // auditor then actor
       const endpoint1 = new EndpointBuilder('/users', 'POST')
@@ -207,7 +210,11 @@ describe('EndpointBuilder audit methods', () => {
         .output(outputSchema)
         .auditor(auditStorageService)
         .audit<TestAuditAction>(audits)
-        .handle(async () => ({ id: '123', email: 'test@test.com', active: true }));
+        .handle(async () => ({
+          id: '123',
+          email: 'test@test.com',
+          active: true,
+        }));
 
       expect(endpoint.audits).toBe(audits);
     });
@@ -273,7 +280,11 @@ describe('EndpointBuilder audit methods', () => {
       const endpoint = new EndpointBuilder('/users', 'POST')
         .output(outputSchema)
         .audit<TestAuditAction>(audits)
-        .handle(async () => ({ id: '123', email: 'test@test.com', active: true }));
+        .handle(async () => ({
+          id: '123',
+          email: 'test@test.com',
+          active: true,
+        }));
 
       // Verify the when function works
       const whenFn = endpoint.audits[0].when!;
@@ -321,20 +332,29 @@ describe('EndpointBuilder audit methods', () => {
             userId: response.id,
             email: response.email,
           }),
-          entityId: (response) => ({ userId: response.id, orgId: response.orgId }),
+          entityId: (response) => ({
+            userId: response.id,
+            orgId: response.orgId,
+          }),
         },
       ];
 
       const endpoint = new EndpointBuilder('/users', 'POST')
         .output(outputSchema)
         .audit<TestAuditAction>(audits)
-        .handle(async () => ({ id: '123', orgId: 'org-1', email: 'test@test.com' }));
+        .handle(async () => ({
+          id: '123',
+          orgId: 'org-1',
+          email: 'test@test.com',
+        }));
 
       const entityIdFn = endpoint.audits[0].entityId!;
-      expect(entityIdFn({ id: 'u-1', orgId: 'o-1', email: 'a@b.com' })).toEqual({
-        userId: 'u-1',
-        orgId: 'o-1',
-      });
+      expect(entityIdFn({ id: 'u-1', orgId: 'o-1', email: 'a@b.com' })).toEqual(
+        {
+          userId: 'u-1',
+          orgId: 'o-1',
+        },
+      );
     });
   });
 
@@ -370,7 +390,11 @@ describe('EndpointBuilder audit methods', () => {
         .auditor(auditStorageService)
         .actor(actorExtractor)
         .audit<TestAuditAction>(audits)
-        .handle(async () => ({ id: '123', email: 'test@test.com', active: true }));
+        .handle(async () => ({
+          id: '123',
+          email: 'test@test.com',
+          active: true,
+        }));
 
       expect(endpoint.auditorStorageService).toBe(auditStorageService);
       expect(endpoint.actorExtractor).toBe(actorExtractor);

package/src/endpoints/__tests__/EndpointFactory.authorizers.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { EndpointFactory } from '../EndpointFactory';
 import { z } from 'zod';
+import { EndpointFactory } from '../EndpointFactory';
 
 describe('EndpointFactory.authorizers', () => {
   it('should create factory with available authorizers', () => {
@@ -45,13 +45,17 @@ describe('EndpointFactory.authorizers', () => {
         // @ts-expect-error - testing invalid authorizer
         .authorizer('invalid')
         .handle(async () => ({ success: true }));
-    }).toThrow('Authorizer "invalid" not found in available authorizers: iam, jwt');
+    }).toThrow(
+      'Authorizer "invalid" not found in available authorizers: iam, jwt',
+    );
   });
 
   it('should allow endpoints without authorizers', () => {
     const factory = new EndpointFactory().authorizers(['iam', 'jwt'] as const);
 
-    const endpoint = factory.get('/public').handle(async () => ({ success: true }));
+    const endpoint = factory
+      .get('/public')
+      .handle(async () => ({ success: true }));
 
     expect(endpoint.authorizer).toBeUndefined();
   });
@@ -96,10 +100,16 @@ describe('EndpointFactory.authorizers', () => {
     const factory = new EndpointFactory().authorizers(['iam', 'jwt'] as const);
 
     // This should compile with valid authorizer
-    factory.get('/test1').authorizer('iam').handle(async () => ({}));
+    factory
+      .get('/test1')
+      .authorizer('iam')
+      .handle(async () => ({}));
 
     // This should compile with valid authorizer
-    factory.get('/test2').authorizer('jwt').handle(async () => ({}));
+    factory
+      .get('/test2')
+      .authorizer('jwt')
+      .handle(async () => ({}));
 
     // This should not compile with invalid authorizer (tested via TypeScript)
     // factory.get('/test3').authorizer('invalid').handle(async () => ({}));
@@ -142,12 +152,30 @@ describe('EndpointFactory.authorizers', () => {
   it('should work with all HTTP methods', () => {
     const factory = new EndpointFactory().authorizers(['jwt'] as const);
 
-    const getEndpoint = factory.get('/users').authorizer('jwt').handle(async () => ({ users: [] }));
-    const postEndpoint = factory.post('/users').authorizer('jwt').handle(async () => ({ id: '1' }));
-    const putEndpoint = factory.put('/users/:id').authorizer('jwt').handle(async () => ({ updated: true }));
-    const patchEndpoint = factory.patch('/users/:id').authorizer('jwt').handle(async () => ({ patched: true }));
-    const deleteEndpoint = factory.delete('/users/:id').authorizer('jwt').handle(async () => ({ deleted: true }));
-    const optionsEndpoint = factory.options('/users').authorizer('jwt').handle(async () => ({}));
+    const getEndpoint = factory
+      .get('/users')
+      .authorizer('jwt')
+      .handle(async () => ({ users: [] }));
+    const postEndpoint = factory
+      .post('/users')
+      .authorizer('jwt')
+      .handle(async () => ({ id: '1' }));
+    const putEndpoint = factory
+      .put('/users/:id')
+      .authorizer('jwt')
+      .handle(async () => ({ updated: true }));
+    const patchEndpoint = factory
+      .patch('/users/:id')
+      .authorizer('jwt')
+      .handle(async () => ({ patched: true }));
+    const deleteEndpoint = factory
+      .delete('/users/:id')
+      .authorizer('jwt')
+      .handle(async () => ({ deleted: true }));
+    const optionsEndpoint = factory
+      .options('/users')
+      .authorizer('jwt')
+      .handle(async () => ({}));
 
     expect(getEndpoint.authorizer).toEqual({ name: 'jwt' });
     expect(postEndpoint.authorizer).toEqual({ name: 'jwt' });
@@ -195,9 +223,18 @@ describe('EndpointFactory.authorizers', () => {
       'jwt',
     ] as const);
 
-    const endpoint1 = factory.get('/user').authorizer('jwt-user').handle(async () => ({}));
-    const endpoint2 = factory.get('/admin').authorizer('jwt-admin').handle(async () => ({}));
-    const endpoint3 = factory.get('/api').authorizer('jwt').handle(async () => ({}));
+    const endpoint1 = factory
+      .get('/user')
+      .authorizer('jwt-user')
+      .handle(async () => ({}));
+    const endpoint2 = factory
+      .get('/admin')
+      .authorizer('jwt-admin')
+      .handle(async () => ({}));
+    const endpoint3 = factory
+      .get('/api')
+      .authorizer('jwt')
+      .handle(async () => ({}));
 
     expect(endpoint1.authorizer).toEqual({ name: 'jwt-user' });
     expect(endpoint2.authorizer).toEqual({ name: 'jwt-admin' });

package/src/endpoints/__tests__/EndpointFactory.reference-audit.spec.ts

@@ -1,7 +1,7 @@
-import { describe, expect, it } from 'vitest';
 import { ConsoleLogger } from '@geekmidas/logger/console';
-import { EndpointFactory } from '../EndpointFactory';
 import type { Service } from '@geekmidas/services';
+import { describe, expect, it } from 'vitest';
+import { EndpointFactory } from '../EndpointFactory';
 
 const ServiceA = {
   serviceName: 'a' as const,
@@ -132,9 +132,9 @@ describe('EndpointFactory - Reference Sharing Audit', () => {
       const builder2 = factory.post('/b');
 
       // Function should be the same reference
-      expect((builder1 as any)._authorize === (builder2 as any)._authorize).toBe(
-        true,
-      );
+      expect(
+        (builder1 as any)._authorize === (builder2 as any)._authorize,
+      ).toBe(true);
       expect((builder1 as any)._authorize).toBe(authFn);
     });
 
@@ -146,9 +146,9 @@ describe('EndpointFactory - Reference Sharing Audit', () => {
       const builder2 = factory.post('/b');
 
       // Function should be the same reference
-      expect((builder1 as any)._getSession === (builder2 as any)._getSession).toBe(
-        true,
-      );
+      expect(
+        (builder1 as any)._getSession === (builder2 as any)._getSession,
+      ).toBe(true);
       expect((builder1 as any)._getSession).toBe(sessionFn);
     });
   });

package/src/endpoints/__tests__/EndpointFactory.state-isolation.spec.ts

@@ -1,6 +1,6 @@
+import type { Service } from '@geekmidas/services';
 import { describe, expect, it } from 'vitest';
 import { EndpointFactory } from '../EndpointFactory';
-import type { Service } from '@geekmidas/services';
 
 const CacheService = {
   serviceName: 'cache' as const,
@@ -25,7 +25,10 @@ describe('EndpointFactory - State Isolation', () => {
       .post('/user')
       .handle(() => ({}));
 
-    const endpoint2 = factory.services([CacheService]).get('/user').handle(() => ({}));
+    const endpoint2 = factory
+      .services([CacheService])
+      .get('/user')
+      .handle(() => ({}));
 
     expect(endpoint1.services.map((s) => s.serviceName)).toEqual([
       'cache',
@@ -92,13 +95,13 @@ describe('EndpointFactory - State Isolation', () => {
 
   it('should support base router pattern with extended services', () => {
     // Create a base router with default services
-    const r = new EndpointFactory().services([
-      CacheService,
-      DatabaseService,
-    ]);
+    const r = new EndpointFactory().services([CacheService, DatabaseService]);
 
     // Create endpoint with additional service
-    const getUsers = r.services([CacheService]).get('/users').handle(() => ({}));
+    const getUsers = r
+      .services([CacheService])
+      .get('/users')
+      .handle(() => ({}));
 
     // Create endpoint with just base services
     const createUser = r.post('/users').handle(() => ({}));
@@ -125,10 +128,7 @@ describe('EndpointFactory - State Isolation', () => {
     } satisfies Service<'additional', any>;
 
     // Create a base router with default services
-    const r = new EndpointFactory().services([
-      CacheService,
-      DatabaseService,
-    ]);
+    const r = new EndpointFactory().services([CacheService, DatabaseService]);
 
     // Create endpoint with additional service
     const getUsers = r