MessageSchemaContainer making messageTypeField optional

Author: CarlosGamero

packages/core/lib/queues/AbstractQueueService.ts

@@ -8,7 +8,6 @@ import {
   stringValueSerializer,
 } from '@lokalise/node-core'
 import { resolveGlobalErrorLogObject } from '@lokalise/node-core'
-import type { CommonEventDefinition } from '@message-queue-toolkit/schemas'
 import type { ZodSchema, ZodType } from 'zod/v3'
 
 import {
@@ -162,13 +161,9 @@ export abstract class AbstractQueueService<
     messageTypeField: string
   }) {
     const messageSchemas = options.handlers.map((entry) => entry.schema)
-    const messageDefinitions: CommonEventDefinition[] = options.handlers
-      .map((entry) => entry.definition)
-      .filter((entry) => entry !== undefined)
 
     return new MessageSchemaContainer<MessagePayloadSchemas>({
       messageSchemas,
-      messageDefinitions,
       messageTypeField: options.messageTypeField,
     })
   }
@@ -178,11 +173,9 @@ export abstract class AbstractQueueService<
     messageTypeField: string
   }) {
     const messageSchemas = options.messageSchemas
-    const messageDefinitions: readonly CommonEventDefinition[] = []
 
     return new MessageSchemaContainer<MessagePayloadSchemas>({
       messageSchemas,
-      messageDefinitions,
       messageTypeField: options.messageTypeField,
     })
   }

packages/core/lib/queues/MessageSchemaContainer.ts

@@ -1,42 +1,53 @@
 import type { Either } from '@lokalise/node-core'
-import type { CommonEventDefinition } from '@message-queue-toolkit/schemas'
 import type { ZodSchema } from 'zod/v3'
 
 export type MessageSchemaContainerOptions<MessagePayloadSchemas extends object> = {
-  messageDefinitions: readonly CommonEventDefinition[]
   messageSchemas: readonly ZodSchema<MessagePayloadSchemas>[]
-  messageTypeField: string
+  messageTypeField?: string
 }
 
+const NO_MESSAGE_TYPE = 'NO_MESSAGE_TYPE'
+
 export class MessageSchemaContainer<MessagePayloadSchemas extends object> {
-  public readonly messageDefinitions: Record<string, CommonEventDefinition>
   private readonly messageSchemas: Record<string, ZodSchema<MessagePayloadSchemas>>
-  private readonly messageTypeField: string
+  private readonly messageTypeField?: string
 
   constructor(options: MessageSchemaContainerOptions<MessagePayloadSchemas>) {
+    if (options.messageTypeField === undefined && options.messageSchemas.length === 1) {
+      throw new Error(
+        'if messageTypeField is not provided, messageSchemas must have a single schema',
+      )
+    }
+
     this.messageTypeField = options.messageTypeField
     this.messageSchemas = this.resolveSchemaMap(options.messageSchemas)
-    this.messageDefinitions = this.resolveDefinitionsMap(options.messageDefinitions ?? [])
   }
 
   public resolveSchema(
     // biome-ignore lint/suspicious/noExplicitAny: This is expected
     message: Record<string, any>,
   ): Either<Error, ZodSchema<MessagePayloadSchemas>> {
+    if (!this.messageTypeField) {
+      return this.messageSchemas[NO_MESSAGE_TYPE]
+        ? { result: this.messageSchemas[NO_MESSAGE_TYPE] }
+        : { error: new Error('Unsupported message') }
+    }
+
     const schema = this.messageSchemas[message[this.messageTypeField]]
     if (!schema) {
-      return {
-        error: new Error(`Unsupported message type: ${message[this.messageTypeField]}`),
-      }
-    }
-    return {
-      result: schema,
+      return { error: new Error(`Unsupported message type: ${message[this.messageTypeField]}`) }
     }
+    return { result: schema }
   }
 
   private resolveSchemaMap(
     supportedSchemas: readonly ZodSchema<MessagePayloadSchemas>[],
   ): Record<string, ZodSchema<MessagePayloadSchemas>> {
+    if (!this.messageTypeField) {
+      if (!supportedSchemas[0]) return {}
+      return { [NO_MESSAGE_TYPE]: supportedSchemas[0] }
+    }
+
     return supportedSchemas.reduce(
       (acc, schema) => {
         // @ts-ignore
@@ -46,17 +57,4 @@ export class MessageSchemaContainer<MessagePayloadSchemas extends object> {
       {} as Record<string, ZodSchema<MessagePayloadSchemas>>,
     )
   }
-
-  private resolveDefinitionsMap(
-    supportedDefinitions: readonly CommonEventDefinition[],
-  ): Record<string, CommonEventDefinition> {
-    return supportedDefinitions.reduce(
-      (acc, definition) => {
-        // @ts-ignore
-        acc[definition.publisherSchema.shape[this.messageTypeField].value] = definition
-        return acc
-      },
-      {} as Record<string, CommonEventDefinition>,
-    )
-  }
 }