refactor: avoid redundancy of cache events

Melchyore · May 1, 2023 · aedabb2 · aedabb2
1 parent 72e9bad
commit aedabb2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/adonis-typings/cache-events.ts b/adonis-typings/cache-events.ts
@@ -5,12 +5,7 @@ declare module '@ioc:Adonis/Addons/Cache' {
     expiration?: number
   }
 
-  export enum CacheEvents {
-    Hit = 'cache:hit',
-    Missed = 'cache:missed',
-    KeyWritten = 'cache:key_written',
-    KeyForgotten = 'cache:key_forgotten'
-  }
+  export type CacheEvents = import('../src/Enums/CacheEvents').default
 
   export interface CacheEventContract extends CacheEventPayload {
     EVENT: CacheEvents
@@ -24,14 +19,18 @@ declare module '@ioc:Adonis/Addons/Cache' {
 }
 
 declare module '@ioc:Adonis/Core/Event' {
-  import type { CacheEventPayload, CacheClearEventPayload } from '@ioc:Adonis/Addons/Cache'
+  import type {
+    CacheEventPayload,
+    CacheClearEventPayload,
+    CacheEvents
+  } from '@ioc:Adonis/Addons/Cache'
 
-  export interface EventsList {
-    'cache:hit': CacheEventPayload
-    'cache:missed': CacheEventPayload
-    'cache:key_written': CacheEventPayload
-    'cache:key_forgotten': CacheEventPayload
+  type Events = {
+    [E in 'CacheEvents']: CacheEventPayload
+  } & {
     'cache:clearing': CacheClearEventPayload
     'cache:cleared': CacheClearEventPayload
   }
+
+  export interface EventsList extends Events {}
 }
diff --git a/src/Enums/CacheEvents.ts b/src/Enums/CacheEvents.ts
@@ -1,4 +1,4 @@
-export enum CacheEvents {
+enum CacheEvents {
   Hit = 'cache:hit',
   Missed = 'cache:missed',
   KeyWritten = 'cache:key_written',