Merge pull request #65 from castore-dev/take-learnings-from-real-life

fix: rework types following real life usage pbs
castore-dev · Mar 14, 2023 · 28901b6 · 28901b6
2 parents 5bbe173 + 899ccad
commit 28901b6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 25 deletions.
diff --git a/packages/core/src/messaging/message.ts b/packages/core/src/messaging/message.ts
@@ -9,29 +9,21 @@ import type {
 
 export type NotificationMessage<
   EVENT_STORE_ID extends string = string,
-  EVENT_DETAILS extends EventDetail = EventDetail,
-> = EVENT_DETAILS extends infer EVENT_DETAIL
-  ? EVENT_DETAIL extends EventDetail
-    ? {
-        eventStoreId: EVENT_STORE_ID;
-        event: EVENT_DETAIL;
-      }
-    : never
-  : never;
+  EVENT_DETAIL extends EventDetail = EventDetail,
+> = {
+  eventStoreId: EVENT_STORE_ID;
+  event: EVENT_DETAIL;
+};
 
 export type StateCarryingMessage<
   EVENT_STORE_ID extends string = string,
-  EVENT_DETAILS extends EventDetail = EventDetail,
+  EVENT_DETAIL extends EventDetail = EventDetail,
   AGGREGATE extends Aggregate = Aggregate,
-> = EVENT_DETAILS extends infer EVENT_DETAIL
-  ? EVENT_DETAIL extends EventDetail
-    ? {
-        eventStoreId: EVENT_STORE_ID;
-        event: EVENT_DETAIL;
-        aggregate: AGGREGATE;
-      }
-    : never
-  : never;
+> = {
+  eventStoreId: EVENT_STORE_ID;
+  event: EVENT_DETAIL;
+  aggregate: AGGREGATE;
+};
 
 export type Message = NotificationMessage | StateCarryingMessage;
 

diff --git a/packages/in-memory-message-bus-adapter/src/message.ts b/packages/in-memory-message-bus-adapter/src/message.ts
@@ -20,12 +20,9 @@ export type InMemoryMessageBusMessage<
 > = Prettify<
   EVENT_STORE_IDS extends infer EVENT_STORE_ID
     ? EVENT_STORE_ID extends string
-      ? EVENT_TYPES extends infer EVENT_TYPE
-        ? Extract<
-            MESSAGE,
-            { eventStoreId: EVENT_STORE_IDS; event: { type: EVENT_TYPE } }
-          >
-        : never
+      ? Extract<MESSAGE, { eventStoreId: EVENT_STORE_ID }> & {
+          event: { type: EVENT_TYPES };
+        }
       : never
     : never
 >;