Skip to content

Commit eeb03d4

Browse files
committed
removed accidental linting fixes
1 parent da8a606 commit eeb03d4

12 files changed

Lines changed: 24 additions & 31 deletions

packages/amqp/lib/AbstractAmqpConsumer.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@ export abstract class AbstractAmqpConsumer<
270270
return null
271271
}
272272
const handler = this.handlerContainer.resolveHandler(processedMessageMetadata.messageType)
273+
if (!handler.messageLogFormatter) {
274+
return null
275+
}
273276
return handler.messageLogFormatter(processedMessageMetadata.message)
274277
}
275278

packages/core/lib/events/DomainEventEmitter.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ describe('DomainEventEmitter', () => {
204204
expect(emitResult.message).toEqual({
205205
id: expect.any(String),
206206
metadata: {
207-
correlationId: createdEventPayload.metadata!.correlationId!,
207+
correlationId: createdEventPayload.metadata?.correlationId!,
208208
originatedFrom: 'service',
209209
producedBy: undefined,
210210
schemaVersion: '1',

packages/core/lib/queues/HandlerContainer.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ export type Prehandler<MessagePayloadSchema extends object, ExecutionContext, Pr
5555
next: (result: PrehandlerResult) => void,
5656
) => void
5757

58-
export const defaultLogFormatter = <MessagePayloadSchema>(message: MessagePayloadSchema) => message
59-
6058
export type HandlerConfigOptions<
6159
MessagePayloadSchema extends object,
6260
ExecutionContext,
@@ -98,7 +96,7 @@ export class MessageHandlerConfig<
9896
PrehandlerOutput,
9997
BarrierOutput
10098
>
101-
public readonly messageLogFormatter: LogFormatter<MessagePayloadSchema>
99+
public readonly messageLogFormatter?: LogFormatter<MessagePayloadSchema>
102100
public readonly preHandlerBarrier?: BarrierCallback<
103101
MessagePayloadSchema,
104102
ExecutionContext,
@@ -126,7 +124,7 @@ export class MessageHandlerConfig<
126124
this.definition = eventDefinition
127125
this.messageType = options?.messageType
128126
this.handler = handler
129-
this.messageLogFormatter = options?.messageLogFormatter ?? defaultLogFormatter
127+
this.messageLogFormatter = options?.messageLogFormatter
130128
this.preHandlerBarrier = options?.preHandlerBarrier
131129
this.preHandlers = options?.preHandlers ?? []
132130
}

packages/core/test/queues/HandlerContainer.spec.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,20 +106,6 @@ describe('MessageHandlerConfigBuilder', () => {
106106
expect(config.messageLogFormatter).toBe(messageLogFormatter)
107107
expect(config.preHandlers).toEqual([])
108108
})
109-
110-
it('should use default log formatter when not provided', () => {
111-
const handler = () => Promise.resolve({ result: 'success' as const })
112-
113-
const config = new MessageHandlerConfig(USER_MESSAGE_SCHEMA, handler)
114-
115-
const testMessage: UserMessage = {
116-
type: 'user.created',
117-
userId: '123',
118-
email: 'test@example.com',
119-
}
120-
121-
expect(config.messageLogFormatter(testMessage)).toEqual(testMessage)
122-
})
123109
})
124110
})
125111

packages/gcp-pubsub/lib/pubsub/AbstractPubSubConsumer.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,9 @@ export abstract class AbstractPubSubConsumer<
869869
return null
870870
}
871871
const handler = this.handlerContainer.resolveHandler(processedMessageMetadata.messageType)
872+
if (!handler.messageLogFormatter) {
873+
return null
874+
}
872875
return handler.messageLogFormatter(processedMessageMetadata.message)
873876
}
874877

packages/sns/lib/utils/snsInitter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export async function initSnsSqs(
111111
queueName = splitUrl[splitUrl.length - 1]!
112112
} else {
113113
// biome-ignore lint/style/noNonNullAssertion: It's ok
114-
queueName = creationConfig!.queue.QueueName!
114+
queueName = creationConfig?.queue.QueueName!
115115
}
116116

117117
return {

packages/sns/test/publishers/SnsPermissionPublisher.multiStorePayloadOffloading.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ describe('SnsPermissionPublisher - multi-store payload offloading', () => {
132132
// Check that the published message's body is a pointer to the offloaded payload
133133
expect(receivedSnsMessages.length).toBe(1)
134134
const snsMessageBodyParseResult = SNS_MESSAGE_BODY_SCHEMA.safeParse(
135-
JSON.parse(receivedSnsMessages[0].Body!),
135+
JSON.parse(receivedSnsMessages[0]!.Body!),
136136
)
137137
expect(snsMessageBodyParseResult.success).toBe(true)
138138

packages/sns/test/publishers/SnsPermissionPublisher.payloadOffloading.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ describe('SnsPermissionPublisher - single-store payload offloading', () => {
130130
// Check that the published message's body is a pointer to the offloaded payload.
131131
expect(receivedSnsMessages.length).toBe(1)
132132
const snsMessageBodyParseResult = SNS_MESSAGE_BODY_SCHEMA.safeParse(
133-
JSON.parse(receivedSnsMessages[0].Body!),
133+
JSON.parse(receivedSnsMessages[0]!.Body!),
134134
)
135135
expect(snsMessageBodyParseResult.success).toBe(true)
136136

packages/sns/test/utils/snsSubscriber.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ describe('snsSubscriber', () => {
144144

145145
const subscriptionAttributes = await getSubscriptionAttributes(
146146
snsClient,
147-
updatedSubscription.SubscriptionArn!,
147+
updatedSubscription!.SubscriptionArn!,
148148
)
149149
expect(subscriptionAttributes).toEqual({
150150
result: {

packages/sqs/lib/fakes/TestSqsPublisher.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('TestSqsPublisher', () => {
6464
consumer.stop()
6565

6666
expect(receivedMessages).toHaveLength(1)
67-
const body = JSON.parse(receivedMessages[0]!.Body!)
67+
const body = JSON.parse(receivedMessages[0]?.Body!)
6868
expect(body).toEqual({
6969
totally: 'arbitrary',
7070
data: { nested: true },
@@ -95,7 +95,7 @@ describe('TestSqsPublisher', () => {
9595
consumer.stop()
9696

9797
expect(receivedMessages).toHaveLength(1)
98-
const body = JSON.parse(receivedMessages[0]!.Body!)
98+
const body = JSON.parse(receivedMessages[0]?.Body!)
9999
expect(body).toEqual({ incomplete: 'message' })
100100
})
101101

@@ -133,7 +133,7 @@ describe('TestSqsPublisher', () => {
133133
consumer.stop()
134134

135135
expect(receivedMessages).toHaveLength(1)
136-
const body = JSON.parse(receivedMessages[0]!.Body!)
136+
const body = JSON.parse(receivedMessages[0]?.Body!)
137137
expect(body).toEqual(complexMessage)
138138
})
139139
})
@@ -160,7 +160,7 @@ describe('TestSqsPublisher', () => {
160160
consumer.stop()
161161

162162
expect(receivedMessages).toHaveLength(1)
163-
const body = JSON.parse(receivedMessages[0]!.Body!)
163+
const body = JSON.parse(receivedMessages[0]?.Body!)
164164
expect(body).toEqual({ test: 'queueName' })
165165
})
166166
})
@@ -193,7 +193,7 @@ describe('TestSqsPublisher', () => {
193193
sqsConsumer.stop()
194194

195195
expect(receivedMessages).toHaveLength(1)
196-
const body = JSON.parse(receivedMessages[0]!.Body!)
196+
const body = JSON.parse(receivedMessages[0]?.Body!)
197197
expect(body).toEqual({ test: 'consumer' })
198198

199199
await consumer.close()
@@ -240,7 +240,7 @@ describe('TestSqsPublisher', () => {
240240
consumer.stop()
241241

242242
expect(receivedMessages).toHaveLength(1)
243-
const body = JSON.parse(receivedMessages[0]!.Body!)
243+
const body = JSON.parse(receivedMessages[0]?.Body!)
244244
expect(body).toEqual({ test: 'publisher' })
245245
})
246246

@@ -292,7 +292,7 @@ describe('TestSqsPublisher', () => {
292292
consumer.stop()
293293

294294
expect(receivedMessages).toHaveLength(1)
295-
const body = JSON.parse(receivedMessages[0]!.Body!)
295+
const body = JSON.parse(receivedMessages[0]?.Body!)
296296
expect(body).toEqual({ test: 'fifo-message' })
297297
})
298298
})

0 commit comments

Comments
 (0)