@geekmidas/constructs 0.0.17 → 0.0.19

package/dist/{processAudits-DfcB-X-4.mjs.map → processAudits-CW7z5Kj9.mjs.map}

@@ -1 +1 @@
-{"version":3,"file":"processAudits-DfcB-X-4.mjs","names":["endpoint: Endpoint<\n    any,\n    any,\n    any,\n    OutSchema,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction\n  >","response: InferStandardSchema<OutSchema>","serviceDiscovery: ServiceDiscovery<any, any>","logger: TLogger","ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  }","existingAuditor?: Auditor<TAuditAction>","auditor: Auditor<TAuditAction>","actor: AuditActor","endpoint: Endpoint<\n    any,\n    any,\n    any,\n    any,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction,\n    TDatabase,\n    TDatabaseServiceName\n  >","auditContext: AuditExecutionContext<TAuditAction> | undefined","handler: (auditor?: Auditor<TAuditAction>) => Promise<T>","onComplete?: (response: T, auditor: Auditor<TAuditAction>) => Promise<void>","response"],"sources":["../src/endpoints/processAudits.ts"],"sourcesContent":["import type {\n  AuditActor,\n  AuditStorage,\n  AuditableAction,\n  Auditor,\n} from '@geekmidas/audit';\nimport { DefaultAuditor } from '@geekmidas/audit';\nimport { withAuditableTransaction } from '@geekmidas/audit/kysely';\nimport type { Logger } from '@geekmidas/logger';\nimport type { InferStandardSchema } from '@geekmidas/schema';\nimport type { Service, ServiceDiscovery } from '@geekmidas/services';\nimport type { StandardSchemaV1 } from '@standard-schema/spec';\nimport type { CookieFn, Endpoint, HeaderFn } from './Endpoint';\nimport type { ActorExtractor, MappedAudit } from './audit';\n\n/**\n * Process declarative audit definitions after successful endpoint execution.\n * Similar to publishConstructEvents for events.\n *\n * @param endpoint - The endpoint with audit configuration\n * @param response - The handler response to generate audit payloads from\n * @param serviceDiscovery - Service discovery for registering audit storage\n * @param logger - Logger for debug/error messages\n * @param ctx - Request context (session, headers, cookies, services)\n * @param existingAuditor - Optional existing auditor instance (e.g., from handler context).\n *                          If provided, uses this auditor (with its stored transaction).\n *                          If not provided, creates a new auditor.\n */\nexport async function processEndpointAudits<\n  TServices extends Service[] = [],\n  TSession = unknown,\n  TLogger extends Logger = Logger,\n  OutSchema extends StandardSchemaV1 | undefined = undefined,\n  TAuditStorage extends AuditStorage | undefined = undefined,\n  TAuditStorageServiceName extends string = string,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n>(\n  endpoint: Endpoint<\n    any,\n    any,\n    any,\n    OutSchema,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction\n  >,\n  response: InferStandardSchema<OutSchema>,\n  serviceDiscovery: ServiceDiscovery<any, any>,\n  logger: TLogger,\n  ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  },\n  existingAuditor?: Auditor<TAuditAction>,\n): Promise<void> {\n  try {\n    const audits = endpoint.audits as MappedAudit<TAuditAction, OutSchema>[];\n\n    // If we have an existing auditor (from handler context), we need to flush\n    // any manual audits it collected, even if there are no declarative audits\n    const hasExistingRecords =\n      existingAuditor && existingAuditor.getRecords().length > 0;\n\n    // Skip if no declarative audits and no existing records to flush\n    if (!audits?.length && !hasExistingRecords) {\n      logger.debug('No audits to process');\n      return;\n    }\n\n    // If no auditor storage service and we have things to process, warn\n    if (!endpoint.auditorStorageService) {\n      if (hasExistingRecords || audits?.length) {\n        logger.warn('No auditor storage service available');\n      }\n      return;\n    }\n\n    // Get or create auditor\n    let auditor: Auditor<TAuditAction>;\n\n    if (existingAuditor) {\n      // Use existing auditor (preserves stored transaction and manual audits)\n      auditor = existingAuditor;\n      logger.debug('Using existing auditor from handler context');\n    } else {\n      // Create new auditor (backward compatibility)\n      const services = await serviceDiscovery.register([\n        endpoint.auditorStorageService,\n      ]);\n      const storage = services[\n        endpoint.auditorStorageService.serviceName\n      ] as AuditStorage;\n\n      // Extract actor if configured\n      let actor: AuditActor = { id: 'system', type: 'system' };\n      if (endpoint.actorExtractor) {\n        try {\n          actor = await (\n            endpoint.actorExtractor as ActorExtractor<\n              TServices,\n              TSession,\n              TLogger\n            >\n          )({\n            services: ctx.services as any,\n            session: ctx.session,\n            header: ctx.header,\n            cookie: ctx.cookie,\n            logger,\n          });\n        } catch (error) {\n          logger.error(error as Error, 'Failed to extract actor for audits');\n          // Continue with system actor\n        }\n      }\n\n      auditor = new DefaultAuditor<TAuditAction>({\n        actor,\n        storage,\n        metadata: {\n          endpoint: endpoint.route,\n          method: endpoint.method,\n        },\n      });\n    }\n\n    // Process each declarative audit\n    if (audits?.length) {\n      for (const audit of audits) {\n        logger.debug({ audit: audit.type }, 'Processing declarative audit');\n\n        // Check when condition\n        if (audit.when && !audit.when(response as any)) {\n          logger.debug(\n            { audit: audit.type },\n            'Audit skipped due to when condition',\n          );\n          continue;\n        }\n\n        // Extract payload\n        const payload = audit.payload(response as any);\n\n        // Extract entityId if configured\n        const entityId = audit.entityId?.(response as any);\n\n        // Record the audit\n        auditor.audit(audit.type as any, payload as any, {\n          table: audit.table,\n          entityId,\n        });\n      }\n    }\n\n    // Flush audits to storage\n    // Note: If existingAuditor has a stored transaction (via setTransaction),\n    // flush() will use it automatically\n    const recordCount = auditor.getRecords().length;\n    if (recordCount > 0) {\n      // Check if auditor has a stored transaction (for logging purposes)\n      const trx =\n        'getTransaction' in auditor\n          ? (auditor as { getTransaction(): unknown }).getTransaction()\n          : undefined;\n      logger.debug(\n        { auditCount: recordCount, hasTransaction: !!trx },\n        'Flushing audits',\n      );\n      await auditor.flush();\n    }\n  } catch (error) {\n    logger.error(error as Error, 'Failed to process audits');\n    // Don't rethrow - audit failures shouldn't fail the request\n  }\n}\n\n/**\n * Context for audit-aware handler execution.\n */\nexport interface AuditExecutionContext<\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n> {\n  /** The auditor instance for recording audits */\n  auditor: Auditor<TAuditAction>;\n  /** The audit storage instance */\n  storage: AuditStorage;\n}\n\n/**\n * Create audit context for handler execution.\n * Returns the auditor and storage for use in the handler.\n *\n * @param endpoint - The endpoint with audit configuration\n * @param serviceDiscovery - Service discovery for getting audit storage\n * @param logger - Logger for debug/error messages\n * @param ctx - Request context for actor extraction\n * @returns Audit context with auditor and storage, or undefined if not configured\n */\nexport async function createAuditContext<\n  TServices extends Service[] = [],\n  TSession = unknown,\n  TLogger extends Logger = Logger,\n  TAuditStorage extends AuditStorage | undefined = undefined,\n  TAuditStorageServiceName extends string = string,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n  TDatabase = undefined,\n  TDatabaseServiceName extends string = string,\n>(\n  endpoint: Endpoint<\n    any,\n    any,\n    any,\n    any,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction,\n    TDatabase,\n    TDatabaseServiceName\n  >,\n  serviceDiscovery: ServiceDiscovery<any, any>,\n  logger: TLogger,\n  ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  },\n): Promise<AuditExecutionContext<TAuditAction> | undefined> {\n  if (!endpoint.auditorStorageService) {\n    return undefined;\n  }\n\n  const services = await serviceDiscovery.register([\n    endpoint.auditorStorageService,\n  ]);\n  const storage = services[\n    endpoint.auditorStorageService.serviceName\n  ] as AuditStorage;\n\n  // Extract actor if configured\n  let actor: AuditActor = { id: 'system', type: 'system' };\n  if (endpoint.actorExtractor) {\n    try {\n      actor = await (\n        endpoint.actorExtractor as ActorExtractor<TServices, TSession, TLogger>\n      )({\n        services: ctx.services as any,\n        session: ctx.session,\n        header: ctx.header,\n        cookie: ctx.cookie,\n        logger,\n      });\n    } catch (error) {\n      logger.error(error as Error, 'Failed to extract actor for audits');\n    }\n  }\n\n  const auditor = new DefaultAuditor<TAuditAction>({\n    actor,\n    storage,\n    metadata: {\n      endpoint: endpoint.route,\n      method: endpoint.method,\n    },\n  });\n\n  return { auditor, storage };\n}\n\n/**\n * Execute a handler with automatic audit transaction support.\n * If the audit storage has a database (via getDatabase()), wraps execution\n * in a transaction so audits are atomic with handler's database operations.\n *\n * @param auditContext - The audit context from createAuditContext\n * @param handler - The handler function to execute (receives auditor)\n * @param onComplete - Called after handler with response, to process declarative audits\n * @returns The handler result\n */\nexport async function executeWithAuditTransaction<\n  T,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n>(\n  auditContext: AuditExecutionContext<TAuditAction> | undefined,\n  handler: (auditor?: Auditor<TAuditAction>) => Promise<T>,\n  onComplete?: (response: T, auditor: Auditor<TAuditAction>) => Promise<void>,\n): Promise<T> {\n  // No audit context - just run handler\n  if (!auditContext) {\n    return handler(undefined);\n  }\n\n  const { auditor, storage } = auditContext;\n\n  // Check if storage has a database for transactional execution\n  const db = storage.getDatabase?.();\n\n  if (db) {\n    // Wrap in transaction - audits are atomic with handler operations\n    return withAuditableTransaction(db as any, auditor as any, async () => {\n      const response = await handler(auditor);\n\n      // Process declarative audits within the transaction\n      if (onComplete) {\n        await onComplete(response, auditor);\n      }\n\n      // Audits are flushed by withAuditableTransaction before commit\n      return response;\n    });\n  }\n\n  // No database - run handler and flush audits after\n  const response = await handler(auditor);\n\n  if (onComplete) {\n    await onComplete(response, auditor);\n  }\n\n  // Flush audits (no transaction)\n  await auditor.flush();\n\n  return response;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AA4BA,eAAsB,sBAYpBA,UAcAC,UACAC,kBACAC,QACAC,KAMAC,iBACe;AACf,KAAI;EACF,MAAM,SAAS,SAAS;EAIxB,MAAM,qBACJ,mBAAmB,gBAAgB,YAAY,CAAC,SAAS;AAG3D,OAAK,QAAQ,WAAW,oBAAoB;AAC1C,UAAO,MAAM,uBAAuB;AACpC;EACD;AAGD,OAAK,SAAS,uBAAuB;AACnC,OAAI,sBAAsB,QAAQ,OAChC,QAAO,KAAK,uCAAuC;AAErD;EACD;EAGD,IAAIC;AAEJ,MAAI,iBAAiB;AAEnB,aAAU;AACV,UAAO,MAAM,8CAA8C;EAC5D,OAAM;GAEL,MAAM,WAAW,MAAM,iBAAiB,SAAS,CAC/C,SAAS,qBACV,EAAC;GACF,MAAM,UAAU,SACd,SAAS,sBAAsB;GAIjC,IAAIC,QAAoB;IAAE,IAAI;IAAU,MAAM;GAAU;AACxD,OAAI,SAAS,eACX,KAAI;AACF,YAAQ,MAAM,AACZ,SAAS,eAKT;KACA,UAAU,IAAI;KACd,SAAS,IAAI;KACb,QAAQ,IAAI;KACZ,QAAQ,IAAI;KACZ;IACD,EAAC;GACH,SAAQ,OAAO;AACd,WAAO,MAAM,OAAgB,qCAAqC;GAEnE;AAGH,aAAU,IAAI,eAA6B;IACzC;IACA;IACA,UAAU;KACR,UAAU,SAAS;KACnB,QAAQ,SAAS;IAClB;GACF;EACF;AAGD,MAAI,QAAQ,OACV,MAAK,MAAM,SAAS,QAAQ;AAC1B,UAAO,MAAM,EAAE,OAAO,MAAM,KAAM,GAAE,+BAA+B;AAGnE,OAAI,MAAM,SAAS,MAAM,KAAK,SAAgB,EAAE;AAC9C,WAAO,MACL,EAAE,OAAO,MAAM,KAAM,GACrB,sCACD;AACD;GACD;GAGD,MAAM,UAAU,MAAM,QAAQ,SAAgB;GAG9C,MAAM,WAAW,MAAM,WAAW,SAAgB;AAGlD,WAAQ,MAAM,MAAM,MAAa,SAAgB;IAC/C,OAAO,MAAM;IACb;GACD,EAAC;EACH;EAMH,MAAM,cAAc,QAAQ,YAAY,CAAC;AACzC,MAAI,cAAc,GAAG;GAEnB,MAAM,MACJ,oBAAoB,UAChB,AAAC,QAA0C,gBAAgB;AAEjE,UAAO,MACL;IAAE,YAAY;IAAa,kBAAkB;GAAK,GAClD,kBACD;AACD,SAAM,QAAQ,OAAO;EACtB;CACF,SAAQ,OAAO;AACd,SAAO,MAAM,OAAgB,2BAA2B;CAEzD;AACF;;;;;;;;;;;AA2BD,eAAsB,mBAapBC,UAgBAN,kBACAC,QACAC,KAM0D;AAC1D,MAAK,SAAS,sBACZ;CAGF,MAAM,WAAW,MAAM,iBAAiB,SAAS,CAC/C,SAAS,qBACV,EAAC;CACF,MAAM,UAAU,SACd,SAAS,sBAAsB;CAIjC,IAAIG,QAAoB;EAAE,IAAI;EAAU,MAAM;CAAU;AACxD,KAAI,SAAS,eACX,KAAI;AACF,UAAQ,MAAM,AACZ,SAAS,eACT;GACA,UAAU,IAAI;GACd,SAAS,IAAI;GACb,QAAQ,IAAI;GACZ,QAAQ,IAAI;GACZ;EACD,EAAC;CACH,SAAQ,OAAO;AACd,SAAO,MAAM,OAAgB,qCAAqC;CACnE;CAGH,MAAM,UAAU,IAAI,eAA6B;EAC/C;EACA;EACA,UAAU;GACR,UAAU,SAAS;GACnB,QAAQ,SAAS;EAClB;CACF;AAED,QAAO;EAAE;EAAS;CAAS;AAC5B;;;;;;;;;;;AAYD,eAAsB,4BAOpBE,cACAC,SACAC,YACY;AAEZ,MAAK,aACH,QAAO,eAAkB;CAG3B,MAAM,EAAE,SAAS,SAAS,GAAG;CAG7B,MAAM,KAAK,QAAQ,eAAe;AAElC,KAAI,GAEF,QAAO,yBAAyB,IAAW,SAAgB,YAAY;EACrE,MAAMC,aAAW,MAAM,QAAQ,QAAQ;AAGvC,MAAI,WACF,OAAM,WAAWA,YAAU,QAAQ;AAIrC,SAAOA;CACR,EAAC;CAIJ,MAAM,WAAW,MAAM,QAAQ,QAAQ;AAEvC,KAAI,WACF,OAAM,WAAW,UAAU,QAAQ;AAIrC,OAAM,QAAQ,OAAO;AAErB,QAAO;AACR"}
+{"version":3,"file":"processAudits-CW7z5Kj9.mjs","names":["endpoint: Endpoint<\n    any,\n    any,\n    any,\n    OutSchema,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction\n  >","response: InferStandardSchema<OutSchema>","serviceDiscovery: ServiceDiscovery<any, any>","logger: TLogger","ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  }","existingAuditor?: Auditor<TAuditAction>","auditor: Auditor<TAuditAction>","actor: AuditActor","endpoint: Endpoint<\n    any,\n    any,\n    any,\n    any,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction,\n    TDatabase,\n    TDatabaseServiceName\n  >","auditContext: AuditExecutionContext<TAuditAction> | undefined","handler: (auditor?: Auditor<TAuditAction>) => Promise<T>","onComplete?: (response: T, auditor: Auditor<TAuditAction>) => Promise<void>","response"],"sources":["../src/endpoints/processAudits.ts"],"sourcesContent":["import type {\n  AuditActor,\n  AuditStorage,\n  AuditableAction,\n  Auditor,\n} from '@geekmidas/audit';\nimport { DefaultAuditor } from '@geekmidas/audit';\nimport { withAuditableTransaction } from '@geekmidas/audit/kysely';\nimport type { Logger } from '@geekmidas/logger';\nimport type { InferStandardSchema } from '@geekmidas/schema';\nimport type { Service, ServiceDiscovery } from '@geekmidas/services';\nimport type { StandardSchemaV1 } from '@standard-schema/spec';\nimport type { CookieFn, Endpoint, HeaderFn } from './Endpoint';\nimport type { ActorExtractor, MappedAudit } from './audit';\n\n/**\n * Process declarative audit definitions after successful endpoint execution.\n * Similar to publishConstructEvents for events.\n *\n * @param endpoint - The endpoint with audit configuration\n * @param response - The handler response to generate audit payloads from\n * @param serviceDiscovery - Service discovery for registering audit storage\n * @param logger - Logger for debug/error messages\n * @param ctx - Request context (session, headers, cookies, services)\n * @param existingAuditor - Optional existing auditor instance (e.g., from handler context).\n *                          If provided, uses this auditor (with its stored transaction).\n *                          If not provided, creates a new auditor.\n */\nexport async function processEndpointAudits<\n  TServices extends Service[] = [],\n  TSession = unknown,\n  TLogger extends Logger = Logger,\n  OutSchema extends StandardSchemaV1 | undefined = undefined,\n  TAuditStorage extends AuditStorage | undefined = undefined,\n  TAuditStorageServiceName extends string = string,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n>(\n  endpoint: Endpoint<\n    any,\n    any,\n    any,\n    OutSchema,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction\n  >,\n  response: InferStandardSchema<OutSchema>,\n  serviceDiscovery: ServiceDiscovery<any, any>,\n  logger: TLogger,\n  ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  },\n  existingAuditor?: Auditor<TAuditAction>,\n): Promise<void> {\n  try {\n    const audits = endpoint.audits as MappedAudit<TAuditAction, OutSchema>[];\n\n    // If we have an existing auditor (from handler context), we need to flush\n    // any manual audits it collected, even if there are no declarative audits\n    const hasExistingRecords =\n      existingAuditor && existingAuditor.getRecords().length > 0;\n\n    // Skip if no declarative audits and no existing records to flush\n    if (!audits?.length && !hasExistingRecords) {\n      logger.debug('No audits to process');\n      return;\n    }\n\n    // If no auditor storage service and we have things to process, warn\n    if (!endpoint.auditorStorageService) {\n      if (hasExistingRecords || audits?.length) {\n        logger.warn('No auditor storage service available');\n      }\n      return;\n    }\n\n    // Get or create auditor\n    let auditor: Auditor<TAuditAction>;\n\n    if (existingAuditor) {\n      // Use existing auditor (preserves stored transaction and manual audits)\n      auditor = existingAuditor;\n      logger.debug('Using existing auditor from handler context');\n    } else {\n      // Create new auditor (backward compatibility)\n      const services = await serviceDiscovery.register([\n        endpoint.auditorStorageService,\n      ]);\n      const storage = services[\n        endpoint.auditorStorageService.serviceName\n      ] as AuditStorage;\n\n      // Extract actor if configured\n      let actor: AuditActor = { id: 'system', type: 'system' };\n      if (endpoint.actorExtractor) {\n        try {\n          actor = await (\n            endpoint.actorExtractor as ActorExtractor<\n              TServices,\n              TSession,\n              TLogger\n            >\n          )({\n            services: ctx.services as any,\n            session: ctx.session,\n            header: ctx.header,\n            cookie: ctx.cookie,\n            logger,\n          });\n        } catch (error) {\n          logger.error(error as Error, 'Failed to extract actor for audits');\n          // Continue with system actor\n        }\n      }\n\n      auditor = new DefaultAuditor<TAuditAction>({\n        actor,\n        storage,\n        metadata: {\n          endpoint: endpoint.route,\n          method: endpoint.method,\n        },\n      });\n    }\n\n    // Process each declarative audit\n    if (audits?.length) {\n      for (const audit of audits) {\n        logger.debug({ audit: audit.type }, 'Processing declarative audit');\n\n        // Check when condition\n        if (audit.when && !audit.when(response as any)) {\n          logger.debug(\n            { audit: audit.type },\n            'Audit skipped due to when condition',\n          );\n          continue;\n        }\n\n        // Extract payload\n        const payload = audit.payload(response as any);\n\n        // Extract entityId if configured\n        const entityId = audit.entityId?.(response as any);\n\n        // Record the audit\n        auditor.audit(audit.type as any, payload as any, {\n          table: audit.table,\n          entityId,\n        });\n      }\n    }\n\n    // Flush audits to storage\n    // Note: If existingAuditor has a stored transaction (via setTransaction),\n    // flush() will use it automatically\n    const recordCount = auditor.getRecords().length;\n    if (recordCount > 0) {\n      // Check if auditor has a stored transaction (for logging purposes)\n      const trx =\n        'getTransaction' in auditor\n          ? (auditor as { getTransaction(): unknown }).getTransaction()\n          : undefined;\n      logger.debug(\n        { auditCount: recordCount, hasTransaction: !!trx },\n        'Flushing audits',\n      );\n      await auditor.flush();\n    }\n  } catch (error) {\n    logger.error(error as Error, 'Failed to process audits');\n    // Don't rethrow - audit failures shouldn't fail the request\n  }\n}\n\n/**\n * Context for audit-aware handler execution.\n */\nexport interface AuditExecutionContext<\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n> {\n  /** The auditor instance for recording audits */\n  auditor: Auditor<TAuditAction>;\n  /** The audit storage instance */\n  storage: AuditStorage;\n}\n\n/**\n * Create audit context for handler execution.\n * Returns the auditor and storage for use in the handler.\n *\n * @param endpoint - The endpoint with audit configuration\n * @param serviceDiscovery - Service discovery for getting audit storage\n * @param logger - Logger for debug/error messages\n * @param ctx - Request context for actor extraction\n * @returns Audit context with auditor and storage, or undefined if not configured\n */\nexport async function createAuditContext<\n  TServices extends Service[] = [],\n  TSession = unknown,\n  TLogger extends Logger = Logger,\n  TAuditStorage extends AuditStorage | undefined = undefined,\n  TAuditStorageServiceName extends string = string,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n  TDatabase = undefined,\n  TDatabaseServiceName extends string = string,\n>(\n  endpoint: Endpoint<\n    any,\n    any,\n    any,\n    any,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction,\n    TDatabase,\n    TDatabaseServiceName\n  >,\n  serviceDiscovery: ServiceDiscovery<any, any>,\n  logger: TLogger,\n  ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  },\n): Promise<AuditExecutionContext<TAuditAction> | undefined> {\n  if (!endpoint.auditorStorageService) {\n    return undefined;\n  }\n\n  const services = await serviceDiscovery.register([\n    endpoint.auditorStorageService,\n  ]);\n  const storage = services[\n    endpoint.auditorStorageService.serviceName\n  ] as AuditStorage;\n\n  // Extract actor if configured\n  let actor: AuditActor = { id: 'system', type: 'system' };\n  if (endpoint.actorExtractor) {\n    try {\n      actor = await (\n        endpoint.actorExtractor as ActorExtractor<TServices, TSession, TLogger>\n      )({\n        services: ctx.services as any,\n        session: ctx.session,\n        header: ctx.header,\n        cookie: ctx.cookie,\n        logger,\n      });\n    } catch (error) {\n      logger.error(error as Error, 'Failed to extract actor for audits');\n    }\n  }\n\n  const auditor = new DefaultAuditor<TAuditAction>({\n    actor,\n    storage,\n    metadata: {\n      endpoint: endpoint.route,\n      method: endpoint.method,\n    },\n  });\n\n  return { auditor, storage };\n}\n\n/**\n * Execute a handler with automatic audit transaction support.\n * If the audit storage has a database (via getDatabase()), wraps execution\n * in a transaction so audits are atomic with handler's database operations.\n *\n * @param auditContext - The audit context from createAuditContext\n * @param handler - The handler function to execute (receives auditor)\n * @param onComplete - Called after handler with response, to process declarative audits\n * @returns The handler result\n */\nexport async function executeWithAuditTransaction<\n  T,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n>(\n  auditContext: AuditExecutionContext<TAuditAction> | undefined,\n  handler: (auditor?: Auditor<TAuditAction>) => Promise<T>,\n  onComplete?: (response: T, auditor: Auditor<TAuditAction>) => Promise<void>,\n): Promise<T> {\n  // No audit context - just run handler\n  if (!auditContext) {\n    return handler(undefined);\n  }\n\n  const { auditor, storage } = auditContext;\n\n  // Check if storage has a database for transactional execution\n  const db = storage.getDatabase?.();\n\n  if (db) {\n    // Wrap in transaction - audits are atomic with handler operations\n    return withAuditableTransaction(db as any, auditor as any, async () => {\n      const response = await handler(auditor);\n\n      // Process declarative audits within the transaction\n      if (onComplete) {\n        await onComplete(response, auditor);\n      }\n\n      // Audits are flushed by withAuditableTransaction before commit\n      return response;\n    });\n  }\n\n  // No database - run handler and flush audits after\n  const response = await handler(auditor);\n\n  if (onComplete) {\n    await onComplete(response, auditor);\n  }\n\n  // Flush audits (no transaction)\n  await auditor.flush();\n\n  return response;\n}\n"],"mappings":"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"}

package/dist/{processAudits-BFokHhCO.cjs → processAudits-MHp5_fc7.cjs}

@@ -171,4 +171,4 @@ Object.defineProperty(exports, 'processEndpointAudits', {
     return processEndpointAudits;
   }
 });
-//# sourceMappingURL=processAudits-BFokHhCO.cjs.map
+//# sourceMappingURL=processAudits-MHp5_fc7.cjs.map

package/dist/{processAudits-BFokHhCO.cjs.map → processAudits-MHp5_fc7.cjs.map}

@@ -1 +1 @@
-{"version":3,"file":"processAudits-BFokHhCO.cjs","names":["endpoint: Endpoint<\n    any,\n    any,\n    any,\n    OutSchema,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction\n  >","response: InferStandardSchema<OutSchema>","serviceDiscovery: ServiceDiscovery<any, any>","logger: TLogger","ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  }","existingAuditor?: Auditor<TAuditAction>","auditor: Auditor<TAuditAction>","actor: AuditActor","DefaultAuditor","endpoint: Endpoint<\n    any,\n    any,\n    any,\n    any,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction,\n    TDatabase,\n    TDatabaseServiceName\n  >","auditContext: AuditExecutionContext<TAuditAction> | undefined","handler: (auditor?: Auditor<TAuditAction>) => Promise<T>","onComplete?: (response: T, auditor: Auditor<TAuditAction>) => Promise<void>","response"],"sources":["../src/endpoints/processAudits.ts"],"sourcesContent":["import type {\n  AuditActor,\n  AuditStorage,\n  AuditableAction,\n  Auditor,\n} from '@geekmidas/audit';\nimport { DefaultAuditor } from '@geekmidas/audit';\nimport { withAuditableTransaction } from '@geekmidas/audit/kysely';\nimport type { Logger } from '@geekmidas/logger';\nimport type { InferStandardSchema } from '@geekmidas/schema';\nimport type { Service, ServiceDiscovery } from '@geekmidas/services';\nimport type { StandardSchemaV1 } from '@standard-schema/spec';\nimport type { CookieFn, Endpoint, HeaderFn } from './Endpoint';\nimport type { ActorExtractor, MappedAudit } from './audit';\n\n/**\n * Process declarative audit definitions after successful endpoint execution.\n * Similar to publishConstructEvents for events.\n *\n * @param endpoint - The endpoint with audit configuration\n * @param response - The handler response to generate audit payloads from\n * @param serviceDiscovery - Service discovery for registering audit storage\n * @param logger - Logger for debug/error messages\n * @param ctx - Request context (session, headers, cookies, services)\n * @param existingAuditor - Optional existing auditor instance (e.g., from handler context).\n *                          If provided, uses this auditor (with its stored transaction).\n *                          If not provided, creates a new auditor.\n */\nexport async function processEndpointAudits<\n  TServices extends Service[] = [],\n  TSession = unknown,\n  TLogger extends Logger = Logger,\n  OutSchema extends StandardSchemaV1 | undefined = undefined,\n  TAuditStorage extends AuditStorage | undefined = undefined,\n  TAuditStorageServiceName extends string = string,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n>(\n  endpoint: Endpoint<\n    any,\n    any,\n    any,\n    OutSchema,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction\n  >,\n  response: InferStandardSchema<OutSchema>,\n  serviceDiscovery: ServiceDiscovery<any, any>,\n  logger: TLogger,\n  ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  },\n  existingAuditor?: Auditor<TAuditAction>,\n): Promise<void> {\n  try {\n    const audits = endpoint.audits as MappedAudit<TAuditAction, OutSchema>[];\n\n    // If we have an existing auditor (from handler context), we need to flush\n    // any manual audits it collected, even if there are no declarative audits\n    const hasExistingRecords =\n      existingAuditor && existingAuditor.getRecords().length > 0;\n\n    // Skip if no declarative audits and no existing records to flush\n    if (!audits?.length && !hasExistingRecords) {\n      logger.debug('No audits to process');\n      return;\n    }\n\n    // If no auditor storage service and we have things to process, warn\n    if (!endpoint.auditorStorageService) {\n      if (hasExistingRecords || audits?.length) {\n        logger.warn('No auditor storage service available');\n      }\n      return;\n    }\n\n    // Get or create auditor\n    let auditor: Auditor<TAuditAction>;\n\n    if (existingAuditor) {\n      // Use existing auditor (preserves stored transaction and manual audits)\n      auditor = existingAuditor;\n      logger.debug('Using existing auditor from handler context');\n    } else {\n      // Create new auditor (backward compatibility)\n      const services = await serviceDiscovery.register([\n        endpoint.auditorStorageService,\n      ]);\n      const storage = services[\n        endpoint.auditorStorageService.serviceName\n      ] as AuditStorage;\n\n      // Extract actor if configured\n      let actor: AuditActor = { id: 'system', type: 'system' };\n      if (endpoint.actorExtractor) {\n        try {\n          actor = await (\n            endpoint.actorExtractor as ActorExtractor<\n              TServices,\n              TSession,\n              TLogger\n            >\n          )({\n            services: ctx.services as any,\n            session: ctx.session,\n            header: ctx.header,\n            cookie: ctx.cookie,\n            logger,\n          });\n        } catch (error) {\n          logger.error(error as Error, 'Failed to extract actor for audits');\n          // Continue with system actor\n        }\n      }\n\n      auditor = new DefaultAuditor<TAuditAction>({\n        actor,\n        storage,\n        metadata: {\n          endpoint: endpoint.route,\n          method: endpoint.method,\n        },\n      });\n    }\n\n    // Process each declarative audit\n    if (audits?.length) {\n      for (const audit of audits) {\n        logger.debug({ audit: audit.type }, 'Processing declarative audit');\n\n        // Check when condition\n        if (audit.when && !audit.when(response as any)) {\n          logger.debug(\n            { audit: audit.type },\n            'Audit skipped due to when condition',\n          );\n          continue;\n        }\n\n        // Extract payload\n        const payload = audit.payload(response as any);\n\n        // Extract entityId if configured\n        const entityId = audit.entityId?.(response as any);\n\n        // Record the audit\n        auditor.audit(audit.type as any, payload as any, {\n          table: audit.table,\n          entityId,\n        });\n      }\n    }\n\n    // Flush audits to storage\n    // Note: If existingAuditor has a stored transaction (via setTransaction),\n    // flush() will use it automatically\n    const recordCount = auditor.getRecords().length;\n    if (recordCount > 0) {\n      // Check if auditor has a stored transaction (for logging purposes)\n      const trx =\n        'getTransaction' in auditor\n          ? (auditor as { getTransaction(): unknown }).getTransaction()\n          : undefined;\n      logger.debug(\n        { auditCount: recordCount, hasTransaction: !!trx },\n        'Flushing audits',\n      );\n      await auditor.flush();\n    }\n  } catch (error) {\n    logger.error(error as Error, 'Failed to process audits');\n    // Don't rethrow - audit failures shouldn't fail the request\n  }\n}\n\n/**\n * Context for audit-aware handler execution.\n */\nexport interface AuditExecutionContext<\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n> {\n  /** The auditor instance for recording audits */\n  auditor: Auditor<TAuditAction>;\n  /** The audit storage instance */\n  storage: AuditStorage;\n}\n\n/**\n * Create audit context for handler execution.\n * Returns the auditor and storage for use in the handler.\n *\n * @param endpoint - The endpoint with audit configuration\n * @param serviceDiscovery - Service discovery for getting audit storage\n * @param logger - Logger for debug/error messages\n * @param ctx - Request context for actor extraction\n * @returns Audit context with auditor and storage, or undefined if not configured\n */\nexport async function createAuditContext<\n  TServices extends Service[] = [],\n  TSession = unknown,\n  TLogger extends Logger = Logger,\n  TAuditStorage extends AuditStorage | undefined = undefined,\n  TAuditStorageServiceName extends string = string,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n  TDatabase = undefined,\n  TDatabaseServiceName extends string = string,\n>(\n  endpoint: Endpoint<\n    any,\n    any,\n    any,\n    any,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction,\n    TDatabase,\n    TDatabaseServiceName\n  >,\n  serviceDiscovery: ServiceDiscovery<any, any>,\n  logger: TLogger,\n  ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  },\n): Promise<AuditExecutionContext<TAuditAction> | undefined> {\n  if (!endpoint.auditorStorageService) {\n    return undefined;\n  }\n\n  const services = await serviceDiscovery.register([\n    endpoint.auditorStorageService,\n  ]);\n  const storage = services[\n    endpoint.auditorStorageService.serviceName\n  ] as AuditStorage;\n\n  // Extract actor if configured\n  let actor: AuditActor = { id: 'system', type: 'system' };\n  if (endpoint.actorExtractor) {\n    try {\n      actor = await (\n        endpoint.actorExtractor as ActorExtractor<TServices, TSession, TLogger>\n      )({\n        services: ctx.services as any,\n        session: ctx.session,\n        header: ctx.header,\n        cookie: ctx.cookie,\n        logger,\n      });\n    } catch (error) {\n      logger.error(error as Error, 'Failed to extract actor for audits');\n    }\n  }\n\n  const auditor = new DefaultAuditor<TAuditAction>({\n    actor,\n    storage,\n    metadata: {\n      endpoint: endpoint.route,\n      method: endpoint.method,\n    },\n  });\n\n  return { auditor, storage };\n}\n\n/**\n * Execute a handler with automatic audit transaction support.\n * If the audit storage has a database (via getDatabase()), wraps execution\n * in a transaction so audits are atomic with handler's database operations.\n *\n * @param auditContext - The audit context from createAuditContext\n * @param handler - The handler function to execute (receives auditor)\n * @param onComplete - Called after handler with response, to process declarative audits\n * @returns The handler result\n */\nexport async function executeWithAuditTransaction<\n  T,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n>(\n  auditContext: AuditExecutionContext<TAuditAction> | undefined,\n  handler: (auditor?: Auditor<TAuditAction>) => Promise<T>,\n  onComplete?: (response: T, auditor: Auditor<TAuditAction>) => Promise<void>,\n): Promise<T> {\n  // No audit context - just run handler\n  if (!auditContext) {\n    return handler(undefined);\n  }\n\n  const { auditor, storage } = auditContext;\n\n  // Check if storage has a database for transactional execution\n  const db = storage.getDatabase?.();\n\n  if (db) {\n    // Wrap in transaction - audits are atomic with handler operations\n    return withAuditableTransaction(db as any, auditor as any, async () => {\n      const response = await handler(auditor);\n\n      // Process declarative audits within the transaction\n      if (onComplete) {\n        await onComplete(response, auditor);\n      }\n\n      // Audits are flushed by withAuditableTransaction before commit\n      return response;\n    });\n  }\n\n  // No database - run handler and flush audits after\n  const response = await handler(auditor);\n\n  if (onComplete) {\n    await onComplete(response, auditor);\n  }\n\n  // Flush audits (no transaction)\n  await auditor.flush();\n\n  return response;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AA4BA,eAAsB,sBAYpBA,UAcAC,UACAC,kBACAC,QACAC,KAMAC,iBACe;AACf,KAAI;EACF,MAAM,SAAS,SAAS;EAIxB,MAAM,qBACJ,mBAAmB,gBAAgB,YAAY,CAAC,SAAS;AAG3D,OAAK,QAAQ,WAAW,oBAAoB;AAC1C,UAAO,MAAM,uBAAuB;AACpC;EACD;AAGD,OAAK,SAAS,uBAAuB;AACnC,OAAI,sBAAsB,QAAQ,OAChC,QAAO,KAAK,uCAAuC;AAErD;EACD;EAGD,IAAIC;AAEJ,MAAI,iBAAiB;AAEnB,aAAU;AACV,UAAO,MAAM,8CAA8C;EAC5D,OAAM;GAEL,MAAM,WAAW,MAAM,iBAAiB,SAAS,CAC/C,SAAS,qBACV,EAAC;GACF,MAAM,UAAU,SACd,SAAS,sBAAsB;GAIjC,IAAIC,QAAoB;IAAE,IAAI;IAAU,MAAM;GAAU;AACxD,OAAI,SAAS,eACX,KAAI;AACF,YAAQ,MAAM,AACZ,SAAS,eAKT;KACA,UAAU,IAAI;KACd,SAAS,IAAI;KACb,QAAQ,IAAI;KACZ,QAAQ,IAAI;KACZ;IACD,EAAC;GACH,SAAQ,OAAO;AACd,WAAO,MAAM,OAAgB,qCAAqC;GAEnE;AAGH,aAAU,IAAIC,iCAA6B;IACzC;IACA;IACA,UAAU;KACR,UAAU,SAAS;KACnB,QAAQ,SAAS;IAClB;GACF;EACF;AAGD,MAAI,QAAQ,OACV,MAAK,MAAM,SAAS,QAAQ;AAC1B,UAAO,MAAM,EAAE,OAAO,MAAM,KAAM,GAAE,+BAA+B;AAGnE,OAAI,MAAM,SAAS,MAAM,KAAK,SAAgB,EAAE;AAC9C,WAAO,MACL,EAAE,OAAO,MAAM,KAAM,GACrB,sCACD;AACD;GACD;GAGD,MAAM,UAAU,MAAM,QAAQ,SAAgB;GAG9C,MAAM,WAAW,MAAM,WAAW,SAAgB;AAGlD,WAAQ,MAAM,MAAM,MAAa,SAAgB;IAC/C,OAAO,MAAM;IACb;GACD,EAAC;EACH;EAMH,MAAM,cAAc,QAAQ,YAAY,CAAC;AACzC,MAAI,cAAc,GAAG;GAEnB,MAAM,MACJ,oBAAoB,UAChB,AAAC,QAA0C,gBAAgB;AAEjE,UAAO,MACL;IAAE,YAAY;IAAa,kBAAkB;GAAK,GAClD,kBACD;AACD,SAAM,QAAQ,OAAO;EACtB;CACF,SAAQ,OAAO;AACd,SAAO,MAAM,OAAgB,2BAA2B;CAEzD;AACF;;;;;;;;;;;AA2BD,eAAsB,mBAapBC,UAgBAP,kBACAC,QACAC,KAM0D;AAC1D,MAAK,SAAS,sBACZ;CAGF,MAAM,WAAW,MAAM,iBAAiB,SAAS,CAC/C,SAAS,qBACV,EAAC;CACF,MAAM,UAAU,SACd,SAAS,sBAAsB;CAIjC,IAAIG,QAAoB;EAAE,IAAI;EAAU,MAAM;CAAU;AACxD,KAAI,SAAS,eACX,KAAI;AACF,UAAQ,MAAM,AACZ,SAAS,eACT;GACA,UAAU,IAAI;GACd,SAAS,IAAI;GACb,QAAQ,IAAI;GACZ,QAAQ,IAAI;GACZ;EACD,EAAC;CACH,SAAQ,OAAO;AACd,SAAO,MAAM,OAAgB,qCAAqC;CACnE;CAGH,MAAM,UAAU,IAAIC,iCAA6B;EAC/C;EACA;EACA,UAAU;GACR,UAAU,SAAS;GACnB,QAAQ,SAAS;EAClB;CACF;AAED,QAAO;EAAE;EAAS;CAAS;AAC5B;;;;;;;;;;;AAYD,eAAsB,4BAOpBE,cACAC,SACAC,YACY;AAEZ,MAAK,aACH,QAAO,eAAkB;CAG3B,MAAM,EAAE,SAAS,SAAS,GAAG;CAG7B,MAAM,KAAK,QAAQ,eAAe;AAElC,KAAI,GAEF,QAAO,uDAAyB,IAAW,SAAgB,YAAY;EACrE,MAAMC,aAAW,MAAM,QAAQ,QAAQ;AAGvC,MAAI,WACF,OAAM,WAAWA,YAAU,QAAQ;AAIrC,SAAOA;CACR,EAAC;CAIJ,MAAM,WAAW,MAAM,QAAQ,QAAQ;AAEvC,KAAI,WACF,OAAM,WAAW,UAAU,QAAQ;AAIrC,OAAM,QAAQ,OAAO;AAErB,QAAO;AACR"}
+{"version":3,"file":"processAudits-MHp5_fc7.cjs","names":["endpoint: Endpoint<\n    any,\n    any,\n    any,\n    OutSchema,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction\n  >","response: InferStandardSchema<OutSchema>","serviceDiscovery: ServiceDiscovery<any, any>","logger: TLogger","ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  }","existingAuditor?: Auditor<TAuditAction>","auditor: Auditor<TAuditAction>","actor: AuditActor","DefaultAuditor","endpoint: Endpoint<\n    any,\n    any,\n    any,\n    any,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction,\n    TDatabase,\n    TDatabaseServiceName\n  >","auditContext: AuditExecutionContext<TAuditAction> | undefined","handler: (auditor?: Auditor<TAuditAction>) => Promise<T>","onComplete?: (response: T, auditor: Auditor<TAuditAction>) => Promise<void>","response"],"sources":["../src/endpoints/processAudits.ts"],"sourcesContent":["import type {\n  AuditActor,\n  AuditStorage,\n  AuditableAction,\n  Auditor,\n} from '@geekmidas/audit';\nimport { DefaultAuditor } from '@geekmidas/audit';\nimport { withAuditableTransaction } from '@geekmidas/audit/kysely';\nimport type { Logger } from '@geekmidas/logger';\nimport type { InferStandardSchema } from '@geekmidas/schema';\nimport type { Service, ServiceDiscovery } from '@geekmidas/services';\nimport type { StandardSchemaV1 } from '@standard-schema/spec';\nimport type { CookieFn, Endpoint, HeaderFn } from './Endpoint';\nimport type { ActorExtractor, MappedAudit } from './audit';\n\n/**\n * Process declarative audit definitions after successful endpoint execution.\n * Similar to publishConstructEvents for events.\n *\n * @param endpoint - The endpoint with audit configuration\n * @param response - The handler response to generate audit payloads from\n * @param serviceDiscovery - Service discovery for registering audit storage\n * @param logger - Logger for debug/error messages\n * @param ctx - Request context (session, headers, cookies, services)\n * @param existingAuditor - Optional existing auditor instance (e.g., from handler context).\n *                          If provided, uses this auditor (with its stored transaction).\n *                          If not provided, creates a new auditor.\n */\nexport async function processEndpointAudits<\n  TServices extends Service[] = [],\n  TSession = unknown,\n  TLogger extends Logger = Logger,\n  OutSchema extends StandardSchemaV1 | undefined = undefined,\n  TAuditStorage extends AuditStorage | undefined = undefined,\n  TAuditStorageServiceName extends string = string,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n>(\n  endpoint: Endpoint<\n    any,\n    any,\n    any,\n    OutSchema,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction\n  >,\n  response: InferStandardSchema<OutSchema>,\n  serviceDiscovery: ServiceDiscovery<any, any>,\n  logger: TLogger,\n  ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  },\n  existingAuditor?: Auditor<TAuditAction>,\n): Promise<void> {\n  try {\n    const audits = endpoint.audits as MappedAudit<TAuditAction, OutSchema>[];\n\n    // If we have an existing auditor (from handler context), we need to flush\n    // any manual audits it collected, even if there are no declarative audits\n    const hasExistingRecords =\n      existingAuditor && existingAuditor.getRecords().length > 0;\n\n    // Skip if no declarative audits and no existing records to flush\n    if (!audits?.length && !hasExistingRecords) {\n      logger.debug('No audits to process');\n      return;\n    }\n\n    // If no auditor storage service and we have things to process, warn\n    if (!endpoint.auditorStorageService) {\n      if (hasExistingRecords || audits?.length) {\n        logger.warn('No auditor storage service available');\n      }\n      return;\n    }\n\n    // Get or create auditor\n    let auditor: Auditor<TAuditAction>;\n\n    if (existingAuditor) {\n      // Use existing auditor (preserves stored transaction and manual audits)\n      auditor = existingAuditor;\n      logger.debug('Using existing auditor from handler context');\n    } else {\n      // Create new auditor (backward compatibility)\n      const services = await serviceDiscovery.register([\n        endpoint.auditorStorageService,\n      ]);\n      const storage = services[\n        endpoint.auditorStorageService.serviceName\n      ] as AuditStorage;\n\n      // Extract actor if configured\n      let actor: AuditActor = { id: 'system', type: 'system' };\n      if (endpoint.actorExtractor) {\n        try {\n          actor = await (\n            endpoint.actorExtractor as ActorExtractor<\n              TServices,\n              TSession,\n              TLogger\n            >\n          )({\n            services: ctx.services as any,\n            session: ctx.session,\n            header: ctx.header,\n            cookie: ctx.cookie,\n            logger,\n          });\n        } catch (error) {\n          logger.error(error as Error, 'Failed to extract actor for audits');\n          // Continue with system actor\n        }\n      }\n\n      auditor = new DefaultAuditor<TAuditAction>({\n        actor,\n        storage,\n        metadata: {\n          endpoint: endpoint.route,\n          method: endpoint.method,\n        },\n      });\n    }\n\n    // Process each declarative audit\n    if (audits?.length) {\n      for (const audit of audits) {\n        logger.debug({ audit: audit.type }, 'Processing declarative audit');\n\n        // Check when condition\n        if (audit.when && !audit.when(response as any)) {\n          logger.debug(\n            { audit: audit.type },\n            'Audit skipped due to when condition',\n          );\n          continue;\n        }\n\n        // Extract payload\n        const payload = audit.payload(response as any);\n\n        // Extract entityId if configured\n        const entityId = audit.entityId?.(response as any);\n\n        // Record the audit\n        auditor.audit(audit.type as any, payload as any, {\n          table: audit.table,\n          entityId,\n        });\n      }\n    }\n\n    // Flush audits to storage\n    // Note: If existingAuditor has a stored transaction (via setTransaction),\n    // flush() will use it automatically\n    const recordCount = auditor.getRecords().length;\n    if (recordCount > 0) {\n      // Check if auditor has a stored transaction (for logging purposes)\n      const trx =\n        'getTransaction' in auditor\n          ? (auditor as { getTransaction(): unknown }).getTransaction()\n          : undefined;\n      logger.debug(\n        { auditCount: recordCount, hasTransaction: !!trx },\n        'Flushing audits',\n      );\n      await auditor.flush();\n    }\n  } catch (error) {\n    logger.error(error as Error, 'Failed to process audits');\n    // Don't rethrow - audit failures shouldn't fail the request\n  }\n}\n\n/**\n * Context for audit-aware handler execution.\n */\nexport interface AuditExecutionContext<\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n> {\n  /** The auditor instance for recording audits */\n  auditor: Auditor<TAuditAction>;\n  /** The audit storage instance */\n  storage: AuditStorage;\n}\n\n/**\n * Create audit context for handler execution.\n * Returns the auditor and storage for use in the handler.\n *\n * @param endpoint - The endpoint with audit configuration\n * @param serviceDiscovery - Service discovery for getting audit storage\n * @param logger - Logger for debug/error messages\n * @param ctx - Request context for actor extraction\n * @returns Audit context with auditor and storage, or undefined if not configured\n */\nexport async function createAuditContext<\n  TServices extends Service[] = [],\n  TSession = unknown,\n  TLogger extends Logger = Logger,\n  TAuditStorage extends AuditStorage | undefined = undefined,\n  TAuditStorageServiceName extends string = string,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n  TDatabase = undefined,\n  TDatabaseServiceName extends string = string,\n>(\n  endpoint: Endpoint<\n    any,\n    any,\n    any,\n    any,\n    TServices,\n    TLogger,\n    TSession,\n    any,\n    any,\n    TAuditStorage,\n    TAuditStorageServiceName,\n    TAuditAction,\n    TDatabase,\n    TDatabaseServiceName\n  >,\n  serviceDiscovery: ServiceDiscovery<any, any>,\n  logger: TLogger,\n  ctx: {\n    session: TSession;\n    header: HeaderFn;\n    cookie: CookieFn;\n    services: Record<string, unknown>;\n  },\n): Promise<AuditExecutionContext<TAuditAction> | undefined> {\n  if (!endpoint.auditorStorageService) {\n    return undefined;\n  }\n\n  const services = await serviceDiscovery.register([\n    endpoint.auditorStorageService,\n  ]);\n  const storage = services[\n    endpoint.auditorStorageService.serviceName\n  ] as AuditStorage;\n\n  // Extract actor if configured\n  let actor: AuditActor = { id: 'system', type: 'system' };\n  if (endpoint.actorExtractor) {\n    try {\n      actor = await (\n        endpoint.actorExtractor as ActorExtractor<TServices, TSession, TLogger>\n      )({\n        services: ctx.services as any,\n        session: ctx.session,\n        header: ctx.header,\n        cookie: ctx.cookie,\n        logger,\n      });\n    } catch (error) {\n      logger.error(error as Error, 'Failed to extract actor for audits');\n    }\n  }\n\n  const auditor = new DefaultAuditor<TAuditAction>({\n    actor,\n    storage,\n    metadata: {\n      endpoint: endpoint.route,\n      method: endpoint.method,\n    },\n  });\n\n  return { auditor, storage };\n}\n\n/**\n * Execute a handler with automatic audit transaction support.\n * If the audit storage has a database (via getDatabase()), wraps execution\n * in a transaction so audits are atomic with handler's database operations.\n *\n * @param auditContext - The audit context from createAuditContext\n * @param handler - The handler function to execute (receives auditor)\n * @param onComplete - Called after handler with response, to process declarative audits\n * @returns The handler result\n */\nexport async function executeWithAuditTransaction<\n  T,\n  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<\n    string,\n    unknown\n  >,\n>(\n  auditContext: AuditExecutionContext<TAuditAction> | undefined,\n  handler: (auditor?: Auditor<TAuditAction>) => Promise<T>,\n  onComplete?: (response: T, auditor: Auditor<TAuditAction>) => Promise<void>,\n): Promise<T> {\n  // No audit context - just run handler\n  if (!auditContext) {\n    return handler(undefined);\n  }\n\n  const { auditor, storage } = auditContext;\n\n  // Check if storage has a database for transactional execution\n  const db = storage.getDatabase?.();\n\n  if (db) {\n    // Wrap in transaction - audits are atomic with handler operations\n    return withAuditableTransaction(db as any, auditor as any, async () => {\n      const response = await handler(auditor);\n\n      // Process declarative audits within the transaction\n      if (onComplete) {\n        await onComplete(response, auditor);\n      }\n\n      // Audits are flushed by withAuditableTransaction before commit\n      return response;\n    });\n  }\n\n  // No database - run handler and flush audits after\n  const response = await handler(auditor);\n\n  if (onComplete) {\n    await onComplete(response, auditor);\n  }\n\n  // Flush audits (no transaction)\n  await auditor.flush();\n\n  return response;\n}\n"],"mappings":"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"}

package/dist/subscribers/AWSLambdaSubscriberAdaptor.cjs

@@ -1,3 +1,3 @@
-const require_AWSLambdaSubscriberAdaptor = require('../AWSLambdaSubscriberAdaptor-Dum5bkw3.cjs');
+const require_AWSLambdaSubscriberAdaptor = require('../AWSLambdaSubscriberAdaptor-DVC4VAQR.cjs');
 
 exports.AWSLambdaSubscriber = require_AWSLambdaSubscriberAdaptor.AWSLambdaSubscriber;

package/dist/subscribers/AWSLambdaSubscriberAdaptor.mjs

@@ -1,3 +1,3 @@
-import { AWSLambdaSubscriber } from "../AWSLambdaSubscriberAdaptor-CyFh7MN8.mjs";
+import { AWSLambdaSubscriber } from "../AWSLambdaSubscriberAdaptor-BLHDyqzQ.mjs";
 
 export { AWSLambdaSubscriber };

package/dist/subscribers/index.d.cts

@@ -1,10 +1,10 @@
 import "../Construct-dI_rgdSp.cjs";
 import { Subscriber } from "../Subscriber-BhzqUzs-.cjs";
 import { SubscriberBuilder } from "../SubscriberBuilder-BCVkp-ga.cjs";
-import * as _geekmidas_logger3 from "@geekmidas/logger";
+import * as _geekmidas_logger9 from "@geekmidas/logger";
 
 //#region src/subscribers/index.d.ts
-declare const s: SubscriberBuilder<[], _geekmidas_logger3.Logger, undefined, undefined, string, []>;
+declare const s: SubscriberBuilder<[], _geekmidas_logger9.Logger, undefined, undefined, string, []>;
 //#endregion
 export { Subscriber, SubscriberBuilder, s };
 //# sourceMappingURL=index.d.cts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/constructs",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "private": false,
   "type": "module",
   "exports": {
@@ -66,14 +66,14 @@
     "lodash.set": "~4.3.2",
     "lodash.uniqby": "~4.7.0",
     "openapi-types": "~12.1.3",
-    "@geekmidas/audit": "0.0.5",
+    "@geekmidas/audit": "0.0.6",
+    "@geekmidas/errors": "0.0.1",
     "@geekmidas/cache": "0.0.7",
     "@geekmidas/events": "0.0.2",
-    "@geekmidas/logger": "0.0.1",
-    "@geekmidas/services": "0.0.1",
     "@geekmidas/rate-limit": "0.1.0",
     "@geekmidas/schema": "0.0.2",
-    "@geekmidas/errors": "0.0.1"
+    "@geekmidas/logger": "0.0.1",
+    "@geekmidas/services": "0.0.1"
   },
   "devDependencies": {
     "@types/lodash.compact": "~3.0.9",

package/src/endpoints/EndpointFactory.ts

@@ -9,10 +9,10 @@ import { ConsoleLogger } from '@geekmidas/logger/console';
 import type { Service } from '@geekmidas/services';
 import uniqBy from 'lodash.uniqby';
 import type { HttpMethod } from '../types';
-import type { ActorExtractor } from './audit';
 import type { Authorizer } from './Authorizer';
 import type { AuthorizeFn, SessionFn } from './Endpoint';
 import { EndpointBuilder } from './EndpointBuilder';
+import type { ActorExtractor } from './audit';
 
 const DEFAULT_LOGGER = new ConsoleLogger() as any;
 
@@ -26,9 +26,10 @@ export class EndpointFactory<
   TAuthorizers extends readonly string[] = readonly string[],
   TAuditStorage extends AuditStorage<any> | undefined = undefined,
   TAuditStorageServiceName extends string = string,
-  TAuditAction extends AuditableAction<string, unknown> = ExtractStorageAuditAction<
-    NonNullable<TAuditStorage>
-  >,
+  TAuditAction extends AuditableAction<
+    string,
+    unknown
+  > = ExtractStorageAuditAction<NonNullable<TAuditStorage>>,
   TDatabase = undefined,
   TDatabaseServiceName extends string = string,
 > {
@@ -366,7 +367,11 @@ export class EndpointFactory<
       defaultAuditorStorage: this.defaultAuditorStorage,
       defaultDatabaseService: this.defaultDatabaseService,
       defaultActorExtractor: this
-        .defaultActorExtractor as unknown as ActorExtractor<TServices, TSession, L>,
+        .defaultActorExtractor as unknown as ActorExtractor<
+        TServices,
+        TSession,
+        L
+      >,
     });
   }
 
@@ -462,7 +467,11 @@ export class EndpointFactory<
       defaultAuditorStorage: this.defaultAuditorStorage,
       defaultDatabaseService: this.defaultDatabaseService,
       defaultActorExtractor: this
-        .defaultActorExtractor as unknown as ActorExtractor<TServices, T, TLogger>,
+        .defaultActorExtractor as unknown as ActorExtractor<
+        TServices,
+        T,
+        TLogger
+      >,
     });
   }
 
@@ -558,7 +567,8 @@ export class EndpointFactory<
       defaultAuthorizerName: this.defaultAuthorizerName,
       defaultAuditorStorage: storage,
       defaultDatabaseService: this.defaultDatabaseService,
-      defaultActorExtractor: this.defaultActorExtractor as unknown as ActorExtractor<
+      defaultActorExtractor: this
+        .defaultActorExtractor as unknown as ActorExtractor<
         TServices,
         TSession,
         TLogger

package/src/endpoints/TestEndpointAdaptor.ts

@@ -1,4 +1,5 @@
-import type { AuditStorage, AuditableAction } from '@geekmidas/audit';
+import type { AuditActor, AuditStorage, AuditableAction } from '@geekmidas/audit';
+import { DefaultAuditor } from '@geekmidas/audit';
 import { EnvironmentParser } from '@geekmidas/envkit';
 import type { EventPublisher } from '@geekmidas/events';
 import type { Logger } from '@geekmidas/logger';
@@ -22,7 +23,7 @@ import {
 } from './Endpoint';
 import type { MappedAudit } from './audit';
 import {
-  createAuditContext,
+  type AuditExecutionContext,
   executeWithAuditTransaction,
 } from './processAudits';
 
@@ -85,6 +86,8 @@ export class TestEndpointAdaptor<
     string,
     unknown
   >,
+  TDatabase = undefined,
+  TDatabaseServiceName extends string = string,
 > {
   static getDefaultServiceDiscover<
     TRoute extends string,
@@ -102,6 +105,8 @@ export class TestEndpointAdaptor<
       string,
       unknown
     >,
+    TDatabase = undefined,
+    TDatabaseServiceName extends string = string,
   >(
     endpoint: Endpoint<
       TRoute,
@@ -115,7 +120,9 @@ export class TestEndpointAdaptor<
       TEventPublisherServiceName,
       TAuditStorage,
       TAuditStorageServiceName,
-      TAuditAction
+      TAuditAction,
+      TDatabase,
+      TDatabaseServiceName
     >,
   ) {
     return ServiceDiscovery.getInstance(
@@ -136,7 +143,9 @@ export class TestEndpointAdaptor<
       TEventPublisherServiceName,
       TAuditStorage,
       TAuditStorageServiceName,
-      TAuditAction
+      TAuditAction,
+      TDatabase,
+      TDatabaseServiceName
     >,
     private serviceDiscovery: ServiceDiscovery<
       any,
@@ -149,7 +158,11 @@ export class TestEndpointAdaptor<
       TInput,
       TServices,
       TEventPublisher,
-      TEventPublisherServiceName
+      TEventPublisherServiceName,
+      TAuditStorage,
+      TAuditStorageServiceName,
+      TDatabase,
+      TDatabaseServiceName
     >,
   ): Promise<TestHttpResponse<InferStandardSchema<TOutSchema>>> {
     const body = await this.endpoint.parseInput((ctx as any).body, 'body');
@@ -173,18 +186,39 @@ export class TestEndpointAdaptor<
       cookie,
     });
 
-    // Create audit context if audit storage is configured
-    const auditContext = await createAuditContext(
-      this.endpoint,
-      this.serviceDiscovery,
-      logger,
-      {
-        session,
-        header,
-        cookie,
-        services: ctx.services as Record<string, unknown>,
-      },
-    );
+    // Create audit context if audit storage is provided
+    // The auditorStorage instance is required when endpoint uses .auditor()
+    const auditorStorage = (ctx as any).auditorStorage as TAuditStorage;
+    let auditContext: AuditExecutionContext<TAuditAction> | undefined;
+
+    if (auditorStorage) {
+      // Extract actor if configured
+      let actor: AuditActor = { id: 'system', type: 'system' };
+      if (this.endpoint.actorExtractor) {
+        try {
+          actor = await this.endpoint.actorExtractor({
+            services: ctx.services as any,
+            session,
+            header,
+            cookie,
+            logger,
+          });
+        } catch (error) {
+          logger.error(error as Error, 'Failed to extract actor for audits');
+        }
+      }
+
+      const auditor = new DefaultAuditor<TAuditAction>({
+        actor,
+        storage: auditorStorage as AuditStorage,
+        metadata: {
+          endpoint: this.endpoint.route,
+          method: this.endpoint.method,
+        },
+      });
+
+      auditContext = { auditor, storage: auditorStorage as AuditStorage };
+    }
 
     // Warn if declarative audits are configured but no audit storage
     const audits = this.endpoint.audits as MappedAudit<
@@ -195,28 +229,18 @@ 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;
+    // Use database instance directly from context
+    // The database instance is required when endpoint uses .database()
+    const rawDb = (ctx as any).database as TDatabase;
 
     // 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;
+        // Use audit transaction as db if available (when storage has same database)
+        // For testing, the tester controls whether to use transactional auditing
+        const trx = auditor?.getTransaction?.();
+        const db = trx ?? rawDb;
 
         const responseBuilder = new ResponseBuilder();
         const response = await this.endpoint.handler(
@@ -299,7 +323,11 @@ export class TestEndpointAdaptor<
       TInput,
       TServices,
       TEventPublisher,
-      TEventPublisherServiceName
+      TEventPublisherServiceName,
+      TAuditStorage,
+      TAuditStorageServiceName,
+      TDatabase,
+      TDatabaseServiceName
     >,
   ): Promise<InferStandardSchema<TOutSchema>> {
     const response = await this.fullRequest(ctx);
@@ -307,13 +335,41 @@ export class TestEndpointAdaptor<
   }
 }
 
+/**
+ * Conditional audit storage requirement - required when TAuditStorage is configured
+ */
+type AuditStorageRequirement<
+  TAuditStorage extends AuditStorage | undefined = undefined,
+> = TAuditStorage extends undefined
+  ? {}
+  : {
+      /** Audit storage instance - required when endpoint uses .auditor() */
+      auditorStorage: TAuditStorage;
+    };
+
+/**
+ * Conditional database requirement - required when TDatabase is configured
+ */
+type DatabaseRequirement<TDatabase = undefined> = TDatabase extends undefined
+  ? {}
+  : {
+      /** Database instance - required when endpoint uses .database() */
+      database: TDatabase;
+    };
+
 export type TestRequestAdaptor<
   TInput extends EndpointSchemas = {},
   TServices extends Service[] = [],
   TEventPublisher extends EventPublisher<any> | undefined = undefined,
   TEventPublisherServiceName extends string = string,
+  TAuditStorage extends AuditStorage | undefined = undefined,
+  _TAuditStorageServiceName extends string = string,
+  TDatabase = undefined,
+  _TDatabaseServiceName extends string = string,
 > = {
   services: ServiceRecord<TServices>;
   headers: Record<string, string>;
   publisher?: Service<TEventPublisherServiceName, TEventPublisher>;
-} & InferComposableStandardSchema<TInput>;
+} & InferComposableStandardSchema<TInput> &
+  AuditStorageRequirement<TAuditStorage> &
+  DatabaseRequirement<TDatabase>;