Extract vendor-specific schemas (#159)

kibertoad · May 31, 2024 · c891bf1 · c891bf1
1 parent 6c5b2d9
commit c891bf1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/packages/amqp/lib/AmqpQueuePublisherManager.ts b/packages/amqp/lib/AmqpQueuePublisherManager.ts
@@ -1,6 +1,5 @@
 import type {
   PublisherBaseEventType,
-  CommonEventDefinition,
   EventRegistry,
   MetadataFiller,
   MessageMetadataType,
@@ -9,6 +8,7 @@ import type {
   CommonCreationConfigType,
 } from '@message-queue-toolkit/core'
 import { AbstractPublisherManager } from '@message-queue-toolkit/core'
+import type { AmqpAwareEventDefinition } from '@message-queue-toolkit/schemas'
 import type z from 'zod'
 
 import type { AbstractAmqpPublisher, AMQPPublisherOptions } from './AbstractAmqpPublisher'
@@ -24,12 +24,7 @@ import type {
 import type { AmqpPublisherFactory } from './CommonAmqpPublisherFactory'
 import { CommonAmqpQueuePublisherFactory } from './CommonAmqpPublisherFactory'
 
-export type AmqpAwareEventDefinition = {
-  schemaVersion?: string
-  exchange?: string // optional if used with a direct exchange
-  queueName?: string // should only be specified for direct exchanges
-  topic?: string // used for topic exchanges
-} & CommonEventDefinition
+export type { AmqpAwareEventDefinition }
 
 export type AmqpPublisherManagerDependencies<SupportedEvents extends AmqpAwareEventDefinition[]> = {
   eventRegistry: EventRegistry<SupportedEvents>

diff --git a/packages/schemas/index.ts b/packages/schemas/index.ts
@@ -3,3 +3,6 @@ export { toDatePreprocessor } from './lib/utils/toDateProcessor'
 export * from './lib/events/eventTypes'
 export * from './lib/events/baseEventSchemas'
 export * from './lib/messages/baseMessageSchemas'
+
+export * from './lib/vendors/amqpSchemas'
+export * from './lib/vendors/snsSchemas'
diff --git a/packages/schemas/lib/vendors/amqpSchemas.ts b/packages/schemas/lib/vendors/amqpSchemas.ts
@@ -0,0 +1,8 @@
+import type { CommonEventDefinition } from '../events/eventTypes'
+
+export type AmqpAwareEventDefinition = {
+  schemaVersion?: string
+  exchange?: string // optional if used with a direct exchange
+  queueName?: string // should only be specified for direct exchanges
+  topic?: string // used for topic exchanges
+} & CommonEventDefinition
diff --git a/packages/schemas/lib/vendors/snsSchemas.ts b/packages/schemas/lib/vendors/snsSchemas.ts
@@ -0,0 +1,6 @@
+import type { CommonEventDefinition } from '../events/eventTypes'
+
+export type SnsAwareEventDefinition = {
+  schemaVersion?: string
+  snsTopic?: string
+} & CommonEventDefinition
diff --git a/packages/sns/lib/sns/SnsPublisherManager.ts b/packages/sns/lib/sns/SnsPublisherManager.ts
@@ -1,5 +1,4 @@
 import type {
-  CommonEventDefinition,
   EventRegistry,
   MessagePublishType,
   MessageSchemaType,
@@ -8,6 +7,7 @@ import type {
 } from '@message-queue-toolkit/core'
 import { AbstractPublisherManager } from '@message-queue-toolkit/core'
 import type { MessageMetadataType } from '@message-queue-toolkit/core/lib/messages/baseMessageSchemas'
+import type { SnsAwareEventDefinition } from '@message-queue-toolkit/schemas'
 import type z from 'zod'
 
 import type {
@@ -19,10 +19,7 @@ import type { SNSCreationConfig, SNSDependencies, SNSQueueLocatorType } from './
 import type { SnsPublisherFactory } from './CommonSnsPublisherFactory'
 import { CommonSnsPublisherFactory } from './CommonSnsPublisherFactory'
 
-export type SnsAwareEventDefinition = {
-  schemaVersion?: string
-  snsTopic?: string
-} & CommonEventDefinition
+export type { SnsAwareEventDefinition }
 
 export type SnsPublisherManagerDependencies<SupportedEvents extends SnsAwareEventDefinition[]> = {
   eventRegistry: EventRegistry<SupportedEvents>