@dismissible/nestjs-dismissible 0.0.2-canary.8976e84.0 → 0.0.2-canary.b0d8bfe.0

package/src/core/hook-runner.service.ts

@@ -3,10 +3,10 @@ import {
   DISMISSIBLE_HOOKS,
   IDismissibleLifecycleHook,
   IHookResult,
-} from './lifecycle-hook.interface';
+} from '@dismissible/nestjs-dismissible-hooks';
 import { DISMISSIBLE_LOGGER, IDismissibleLogger } from '@dismissible/nestjs-logger';
-import { BaseMetadata, DismissibleItemDto } from '@dismissible/nestjs-dismissible-item';
-import { IRequestContext } from '../request/request-context.interface';
+import { DismissibleItemDto } from '@dismissible/nestjs-dismissible-item';
+import { IRequestContext } from '@dismissible/nestjs-dismissible-request';
 
 /**
  * Result from running pre-hooks.
@@ -32,41 +32,67 @@ export interface IHookRunResult {
  * Service responsible for running lifecycle hooks.
  */
 @Injectable()
-export class HookRunner<TMetadata extends BaseMetadata = BaseMetadata> {
-  private readonly sortedHooks: IDismissibleLifecycleHook<TMetadata>[];
+export class HookRunner {
+  private readonly sortedHooks: IDismissibleLifecycleHook[];
 
   constructor(
     @Optional()
     @Inject(DISMISSIBLE_HOOKS)
-    hooks: IDismissibleLifecycleHook<TMetadata>[] = [],
+    hooks: IDismissibleLifecycleHook[] = [],
     @Inject(DISMISSIBLE_LOGGER)
     private readonly logger: IDismissibleLogger,
   ) {
-    // Sort hooks by priority (lower numbers first)
     this.sortedHooks = [...hooks].sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
   }
 
   /**
-   * Run pre-getOrCreate hooks.
+   * Run pre-request hooks (global - runs at start of any operation).
+   * Use for authentication, rate limiting, request validation.
    */
-  async runPreGetOrCreate(
+  async runPreRequest(
     itemId: string,
     userId: string,
     context?: IRequestContext,
   ): Promise<IHookRunResult> {
-    return this.runPreHooks('onBeforeGetOrCreate', itemId, userId, context);
+    return this.runPreHooks('onBeforeRequest', itemId, userId, context);
   }
 
   /**
-   * Run post-getOrCreate hooks.
+   * Run post-request hooks (global - runs at end of any operation).
+   * Use for audit logging, metrics, cleanup.
    */
-  async runPostGetOrCreate(
+  async runPostRequest(
     itemId: string,
-    item: DismissibleItemDto<TMetadata>,
+    item: DismissibleItemDto,
     userId: string,
     context?: IRequestContext,
   ): Promise<void> {
-    await this.runPostHooks('onAfterGetOrCreate', itemId, item, userId, context);
+    await this.runPostHooks('onAfterRequest', itemId, item, userId, context);
+  }
+
+  /**
+   * Run pre-get hooks (when item exists and is about to be returned).
+   * Receives the item for access control based on item state.
+   */
+  async runPreGet(
+    itemId: string,
+    item: DismissibleItemDto,
+    userId: string,
+    context?: IRequestContext,
+  ): Promise<IHookRunResult> {
+    return this.runPreHooksWithItem('onBeforeGet', itemId, item, userId, context);
+  }
+
+  /**
+   * Run post-get hooks (after item is returned).
+   */
+  async runPostGet(
+    itemId: string,
+    item: DismissibleItemDto,
+    userId: string,
+    context?: IRequestContext,
+  ): Promise<void> {
+    await this.runPostHooks('onAfterGet', itemId, item, userId, context);
   }
 
   /**
@@ -85,7 +111,7 @@ export class HookRunner<TMetadata extends BaseMetadata = BaseMetadata> {
    */
   async runPostCreate(
     itemId: string,
-    item: DismissibleItemDto<TMetadata>,
+    item: DismissibleItemDto,
     userId: string,
     context?: IRequestContext,
   ): Promise<void> {
@@ -108,7 +134,7 @@ export class HookRunner<TMetadata extends BaseMetadata = BaseMetadata> {
    */
   async runPostDismiss(
     itemId: string,
-    item: DismissibleItemDto<TMetadata>,
+    item: DismissibleItemDto,
     userId: string,
     context?: IRequestContext,
   ): Promise<void> {
@@ -131,7 +157,7 @@ export class HookRunner<TMetadata extends BaseMetadata = BaseMetadata> {
    */
   async runPostRestore(
     itemId: string,
-    item: DismissibleItemDto<TMetadata>,
+    item: DismissibleItemDto,
     userId: string,
     context?: IRequestContext,
   ): Promise<void> {
@@ -142,7 +168,7 @@ export class HookRunner<TMetadata extends BaseMetadata = BaseMetadata> {
    * Internal method to run pre-hooks.
    */
   private async runPreHooks(
-    hookName: keyof IDismissibleLifecycleHook<TMetadata>,
+    hookName: keyof IDismissibleLifecycleHook,
     itemId: string,
     userId: string,
     context?: IRequestContext,
@@ -180,7 +206,84 @@ export class HookRunner<TMetadata extends BaseMetadata = BaseMetadata> {
             };
           }
 
-          // Apply mutations if present
+          if (result.mutations) {
+            if (result.mutations.id !== undefined) {
+              currentId = result.mutations.id;
+            }
+            if (result.mutations.userId !== undefined) {
+              currentUserId = result.mutations.userId;
+            }
+            if (result.mutations.context && currentContext) {
+              currentContext = { ...currentContext, ...result.mutations.context };
+            }
+          }
+        } catch (error) {
+          this.logger.error(
+            `Error in hook ${hook.constructor.name}.${hookName}`,
+            error instanceof Error ? error : new Error(String(error)),
+            {
+              itemId: currentId,
+              userId: currentUserId,
+            },
+          );
+          throw error;
+        }
+      }
+    }
+
+    return {
+      proceed: true,
+      id: currentId,
+      userId: currentUserId,
+      context: currentContext,
+    };
+  }
+
+  /**
+   * Internal method to run pre-hooks that receive the item (e.g., onBeforeGet).
+   * Unlike standard pre-hooks, these receive the item for inspection/access control.
+   */
+  private async runPreHooksWithItem(
+    hookName: keyof IDismissibleLifecycleHook,
+    itemId: string,
+    item: DismissibleItemDto,
+    userId: string,
+    context?: IRequestContext,
+  ): Promise<IHookRunResult> {
+    let currentId = itemId;
+    let currentUserId = userId;
+    let currentContext = context ? { ...context } : undefined;
+
+    for (const hook of this.sortedHooks) {
+      const hookFn = hook[hookName] as
+        | ((
+            itemId: string,
+            item: DismissibleItemDto,
+            userId: string,
+            context?: IRequestContext,
+          ) => Promise<IHookResult> | IHookResult)
+        | undefined;
+
+      if (hookFn) {
+        try {
+          const result = await hookFn.call(hook, currentId, item, currentUserId, currentContext);
+
+          if (!result.proceed) {
+            this.logger.debug(`Hook ${hook.constructor.name}.${hookName} blocked operation`, {
+              itemId: currentId,
+              userId: currentUserId,
+              reason: result.reason,
+            });
+
+            return {
+              proceed: false,
+              id: currentId,
+              userId: currentUserId,
+              context: currentContext,
+              reason: result.reason,
+            };
+          }
+
           if (result.mutations) {
             if (result.mutations.id !== undefined) {
               currentId = result.mutations.id;
@@ -219,20 +322,19 @@ export class HookRunner<TMetadata extends BaseMetadata = BaseMetadata> {
    * Post-hooks run in reverse priority order.
    */
   private async runPostHooks(
-    hookName: keyof IDismissibleLifecycleHook<TMetadata>,
+    hookName: keyof IDismissibleLifecycleHook,
     itemId: string,
-    item: DismissibleItemDto<TMetadata>,
+    item: DismissibleItemDto,
     userId: string,
     context?: IRequestContext,
   ): Promise<void> {
-    // Run in reverse order for post-hooks
     const reversedHooks = [...this.sortedHooks].reverse();
 
     for (const hook of reversedHooks) {
       const hookFn = hook[hookName] as
         | ((
             itemId: string,
-            item: DismissibleItemDto<TMetadata>,
+            item: DismissibleItemDto,
             userId: string,
             context?: IRequestContext,
           ) => Promise<void> | void)
@@ -250,7 +352,6 @@ export class HookRunner<TMetadata extends BaseMetadata = BaseMetadata> {
               userId,
             },
           );
-          // Post-hooks errors are logged but don't block the operation
         }
       }
     }

package/src/core/index.ts

@@ -3,4 +3,3 @@ export * from './service-responses.interface';
 export * from './dismissible-core.service';
 export * from './hook-runner.service';
 export * from './dismissible.service';
-export * from './create-options';

package/src/core/lifecycle-hook.interface.ts

@@ -1,122 +1,7 @@
-import { BaseMetadata, DismissibleItemDto } from '@dismissible/nestjs-dismissible-item';
-import { IRequestContext } from '../request/request-context.interface';
-
-/**
- * Injection token for lifecycle hooks.
- */
-export const DISMISSIBLE_HOOKS = Symbol('DISMISSIBLE_HOOKS');
-
-/**
- * Mutations that can be applied by pre-hooks.
- */
-export interface IHookMutations {
-  /** Mutated item ID */
-  id?: string;
-
-  /** Mutated user ID */
-  userId?: string;
-
-  /** Mutated request context */
-  context?: Partial<IRequestContext>;
-}
-
-/**
- * Result returned by pre-hooks.
- */
-export interface IHookResult {
-  /** Whether the operation should proceed */
-  proceed: boolean;
-
-  /** Optional reason if the operation is blocked */
-  reason?: string;
-
-  /** Optional mutations to apply */
-  mutations?: IHookMutations;
-}
-
-/**
- * Interface for lifecycle hooks that can intercept dismissible operations.
- */
-export interface IDismissibleLifecycleHook<TMetadata extends BaseMetadata = BaseMetadata> {
-  /**
-   * Priority for hook execution (lower numbers run first).
-   * Default is 0.
-   */
-  readonly priority?: number;
-
-  /**
-   * Called before getOrCreate operation.
-   */
-  onBeforeGetOrCreate?(
-    itemId: string,
-    userId: string,
-    context?: IRequestContext,
-  ): Promise<IHookResult> | IHookResult;
-
-  /**
-   * Called after getOrCreate operation.
-   */
-  onAfterGetOrCreate?(
-    itemId: string,
-    item: DismissibleItemDto<TMetadata>,
-    userId: string,
-    context?: IRequestContext,
-  ): Promise<void> | void;
-
-  /**
-   * Called before creating a new item.
-   */
-  onBeforeCreate?(
-    itemId: string,
-    userId: string,
-    context?: IRequestContext,
-  ): Promise<IHookResult> | IHookResult;
-
-  /**
-   * Called after creating a new item.
-   */
-  onAfterCreate?(
-    itemId: string,
-    item: DismissibleItemDto<TMetadata>,
-    userId: string,
-    context?: IRequestContext,
-  ): Promise<void> | void;
-
-  /**
-   * Called before dismissing an item.
-   */
-  onBeforeDismiss?(
-    itemId: string,
-    userId: string,
-    context?: IRequestContext,
-  ): Promise<IHookResult> | IHookResult;
-
-  /**
-   * Called after dismissing an item.
-   */
-  onAfterDismiss?(
-    itemId: string,
-    item: DismissibleItemDto<TMetadata>,
-    userId: string,
-    context?: IRequestContext,
-  ): Promise<void> | void;
-
-  /**
-   * Called before restoring an item.
-   */
-  onBeforeRestore?(
-    itemId: string,
-    userId: string,
-    context?: IRequestContext,
-  ): Promise<IHookResult> | IHookResult;
-
-  /**
-   * Called after restoring an item.
-   */
-  onAfterRestore?(
-    itemId: string,
-    item: DismissibleItemDto<TMetadata>,
-    userId: string,
-    context?: IRequestContext,
-  ): Promise<void> | void;
-}
+// Re-export from hooks library for backward compatibility
+export {
+  DISMISSIBLE_HOOKS,
+  IHookMutations,
+  IHookResult,
+  IDismissibleLifecycleHook,
+} from '@dismissible/nestjs-dismissible-hooks';

package/src/core/service-responses.interface.ts

@@ -1,11 +1,11 @@
-import { BaseMetadata, DismissibleItemDto } from '@dismissible/nestjs-dismissible-item';
+import { DismissibleItemDto } from '@dismissible/nestjs-dismissible-item';
 
 /**
  * Response from getOrCreate operation.
  */
-export interface IGetOrCreateServiceResponse<TMetadata extends BaseMetadata = BaseMetadata> {
+export interface IGetOrCreateServiceResponse {
   /** The item (either retrieved or created) */
-  item: DismissibleItemDto<TMetadata>;
+  item: DismissibleItemDto;
 
   /** Whether the item was newly created */
   created: boolean;
@@ -14,21 +14,21 @@ export interface IGetOrCreateServiceResponse<TMetadata extends BaseMetadata = Ba
 /**
  * Response from dismiss operation.
  */
-export interface IDismissServiceResponse<TMetadata extends BaseMetadata = BaseMetadata> {
+export interface IDismissServiceResponse {
   /** The dismissed item */
-  item: DismissibleItemDto<TMetadata>;
+  item: DismissibleItemDto;
 
   /** The item state before dismissal */
-  previousItem: DismissibleItemDto<TMetadata>;
+  previousItem: DismissibleItemDto;
 }
 
 /**
  * Response from restore operation.
  */
-export interface IRestoreServiceResponse<TMetadata extends BaseMetadata = BaseMetadata> {
+export interface IRestoreServiceResponse {
   /** The restored item */
-  item: DismissibleItemDto<TMetadata>;
+  item: DismissibleItemDto;
 
   /** The item state before restoration */
-  previousItem: DismissibleItemDto<TMetadata>;
+  previousItem: DismissibleItemDto;
 }