Upgrade: [dependabot] - bump vitest from 3.2.4 to 4.1.2

package.json

@@ -35,7 +35,7 @@
     "@eslint/js": "^10.0.1",
     "@types/aws-lambda": "^8.10.161",
     "@types/node": "^25.5.2",
-    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/coverage-v8": "^4.1.2",
     "@typescript-eslint/eslint-plugin": "^8.57.2",
     "@typescript-eslint/parser": "^8.57.1",
     "aws-lambda": "^1.0.7",
@@ -46,7 +46,7 @@
     "globals": "^17.4.0",
     "ts-node": "^10.9.2",
     "vite-tsconfig-paths": "^6.1.1",
-    "vitest": "^3.2.4",
+    "vitest": "^4.1.2",
     "typescript": "^6.0.2",
     "typescript-eslint": "^8.57.2"
   },

packages/cpsuLambda/src/handler.ts

@@ -1,6 +1,6 @@
 import {APIGatewayProxyResult} from "aws-lambda"
 import middy from "@middy/core"
-import {MiddlewareGenerator} from "./middleware"
+import {MiddlewareApplicator} from "./middleware"
 import {Logger} from "@aws-lambda-powertools/logger"
 import {Result} from "pratica"
 import {Bundle, Task} from "fhir/r4"
@@ -18,7 +18,7 @@ type EventWithHeaders = {
   }
 }
 type HandlerConfig<Event, Message> = {
-  middleware: Array<MiddlewareGenerator>
+  middleware: Array<MiddlewareApplicator>
   params: HandlerParams<Event, Message>
   logger: Logger
   schema?: object
@@ -70,10 +70,10 @@ function append_headers(headers: Record<string, string>, logger: Logger) {
  *  Creates a new Lambda handler with the specified handler function and middleware.
  */
 export const newHandler = <Event extends EventWithHeaders, Message>(handlerConfig: HandlerConfig<Event, Message>) => {
-  const newHandler = middy((event: Event) => generic_handler(event, handlerConfig.params, handlerConfig.logger))
+  let newHandler = middy((event: Event) => generic_handler(event, handlerConfig.params, handlerConfig.logger))
 
-  for (const middleware_generator of handlerConfig.middleware) {
-    newHandler.use(middleware_generator(handlerConfig.logger, handlerConfig.schema))
+  for (const middleware_applicator of handlerConfig.middleware) {
+    newHandler = middleware_applicator(newHandler, handlerConfig.logger, handlerConfig.schema)
   }
 
   return newHandler

packages/cpsuLambda/src/middleware.ts

@@ -1,19 +1,26 @@
 import inputOutputLogger from "@middy/input-output-logger"
 import httpHeaderNormalizer from "@middy/http-header-normalizer"
 import {injectLambdaContext} from "@aws-lambda-powertools/logger/middleware"
-import middy from "@middy/core"
+import {MiddyfiedHandler} from "@middy/core"
+import {APIGatewayProxyResult} from "aws-lambda"
 import {Logger} from "@aws-lambda-powertools/logger"
 import validator from "@middy/validator"
 import {transpileSchema} from "@middy/validator/transpile"
 import {validationErrorHandler} from "./errorHandler"
 
-export type MiddlewareGenerator = (logger: Logger, schema?: object) => middy.MiddlewareObj
+export type MiddlewareApplicator = <Event>(
+  handler: MiddyfiedHandler<Event, APIGatewayProxyResult>,
+  logger: Logger,
+  schema?: object
+) => MiddyfiedHandler<Event, APIGatewayProxyResult>
 
-export const MIDDLEWARE: Record<string, MiddlewareGenerator> = {
-  injectLambdaContext: (logger) => injectLambdaContext(logger, {clearState: true}),
-  httpHeaderNormalizer: () => httpHeaderNormalizer() as middy.MiddlewareObj,
-  inputOutputLogger: (logger) =>
-    inputOutputLogger({
+export const MIDDLEWARE: Record<string, MiddlewareApplicator> = {
+  injectLambdaContext: (handler, logger) =>
+    handler.use(injectLambdaContext(logger, {clearState: true})),
+  httpHeaderNormalizer: (handler) =>
+    handler.use(httpHeaderNormalizer()),
+  inputOutputLogger: (handler, logger) =>
+    handler.use(inputOutputLogger({
       logger: (request) => {
         const response = (request as {response?: unknown} | null | undefined)?.response
         if (response === undefined) {
@@ -22,9 +29,11 @@ export const MIDDLEWARE: Record<string, MiddlewareGenerator> = {
           logger.debug("inputOutputLogger response", {response})
         }
       }
-    }),
-  validator: (logger, schema) => validator({eventSchema: transpileSchema(schema as object)}),
-  validationErrorHandler: (logger) => validationErrorHandler({logger: logger})
+    })),
+  validator: (handler, logger, schema) =>
+    handler.use(validator({eventSchema: transpileSchema(schema as object)})),
+  validationErrorHandler: (handler, logger) =>
+    handler.use(validationErrorHandler({logger: logger}))
 }
 
 export const DEFAULT_HANDLER_MIDDLEWARE = [

packages/nhsNotifyLambda/tests/testAuth.test.ts

@@ -68,7 +68,9 @@ describe("tokenExchange", () => {
       },
       sign: vi.fn().mockImplementation(() => Promise.resolve("signed.jwt.token"))
     }
-    mockSignJWTConstructor.mockImplementation(() => fakeJwtInstance)
+    mockSignJWTConstructor.mockImplementation(function() {
+      return fakeJwtInstance
+    })
 
     // Mock the HTTP call
     nock(`${host}`)
@@ -101,18 +103,20 @@ describe("tokenExchange", () => {
     }
 
     mockImportPKCS8.mockImplementation(() => Promise.resolve("imported"))
-    mockSignJWTConstructor.mockImplementation(() => ({
-      setProtectedHeader() {
-        return this
-      },
-      setIssuedAt() {
-        return this
-      },
-      setExpirationTime() {
-        return this
-      },
-      sign: vi.fn().mockImplementation(() => Promise.resolve("jwt-tkn"))
-    }))
+    mockSignJWTConstructor.mockImplementation(function() {
+      return ({
+        setProtectedHeader() {
+          return this
+        },
+        setIssuedAt() {
+          return this
+        },
+        setExpirationTime() {
+          return this
+        },
+        sign: vi.fn().mockImplementation(() => Promise.resolve("jwt-tkn"))
+      })
+    })
 
     nock(`${host}`)
       .post("/oauth2/token")
@@ -131,18 +135,20 @@ describe("tokenExchange", () => {
     }
 
     mockImportPKCS8.mockImplementation(() => Promise.resolve("imported"))
-    mockSignJWTConstructor.mockImplementation(() => ({
-      setProtectedHeader() {
-        return this
-      },
-      setIssuedAt() {
-        return this
-      },
-      setExpirationTime() {
-        return this
-      },
-      sign: vi.fn().mockImplementation(() => Promise.resolve("jwt-tkn"))
-    }))
+    mockSignJWTConstructor.mockImplementation(function() {
+      return ({
+        setProtectedHeader() {
+          return this
+        },
+        setIssuedAt() {
+          return this
+        },
+        setExpirationTime() {
+          return this
+        },
+        sign: vi.fn().mockImplementation(() => Promise.resolve("jwt-tkn"))
+      })
+    })
 
     nock(`${host}`)
       .post("/oauth2/token")

packages/nhsNotifyLambda/tests/testHelpers.ts

@@ -10,9 +10,9 @@ vi.mock("@aws-sdk/client-sqs", async (importOriginal) => {
   const sqs = await importOriginal<typeof import("@aws-sdk/client-sqs")>()
   return {
     ...sqs,
-    SQSClient: vi.fn().mockImplementation(() => ({
-      send: mockSend
-    }))
+    SQSClient: vi.fn(class {
+      send = mockSend
+    })
   }
 })
 

packages/nhsNotifyLambda/tests/testNhsNotifyLambda.test.ts

@@ -59,11 +59,11 @@ vi.mock(
   "@aws-lambda-powertools/logger",
   async () => ({
     __esModule: true,
-    Logger: vi.fn().mockImplementation(() => ({
-      info: mockInfo,
-      error: mockError,
-      warn: mockWarn
-    }))
+    Logger: vi.fn(class {
+      info = mockInfo
+      error = mockError
+      warn = mockWarn
+    })
   })
 )
 

packages/nhsNotifyLambda/tests/testUtils.test.ts

@@ -42,9 +42,9 @@ vi.mock(
   "@aws-lambda-powertools/parameters/ssm",
   async () => ({
     __esModule: true,
-    SSMProvider: vi.fn().mockImplementation(() => ({
-      getParametersByName: mockGetParametersByName
-    }))
+    SSMProvider: vi.fn(class {
+      getParametersByName = mockGetParametersByName
+    })
   })
 )
 

packages/postDatedLambda/tests/testDatabaseClient.test.ts

@@ -18,9 +18,9 @@ vi.mock("@aws-sdk/client-dynamodb", async () => {
   const dynamo = await vi.importActual<typeof import("@aws-sdk/client-dynamodb")>("@aws-sdk/client-dynamodb")
   return {
     ...dynamo,
-    DynamoDBClient: vi.fn().mockImplementation(() => ({
-      send: mockSend
-    }))
+    DynamoDBClient: vi.fn(class {
+      send = mockSend
+    })
   }
 })
 const {

packages/postDatedLambda/tests/testSqs.test.ts

@@ -20,9 +20,9 @@ vi.mock("@aws-sdk/client-sqs", async () => {
   const sqs = await vi.importActual<typeof import("@aws-sdk/client-sqs")>("@aws-sdk/client-sqs")
   return {
     ...sqs,
-    SQSClient: vi.fn().mockImplementation(() => ({
-      send: mockSend
-    }))
+    SQSClient: vi.fn(class {
+      send = mockSend
+    })
   }
 })
 

packages/updatePrescriptionStatus/tests/testDatabaseClient.test.ts

@@ -18,7 +18,9 @@ vi.mock(
     const mod = await importOriginal()
     return {
       ...mod,
-      DynamoDBClient: vi.fn().mockImplementation(() => ({send: mockSend}))
+      DynamoDBClient: vi.fn(class {
+        send = mockSend
+      })
     }
   }
 )

packages/updatePrescriptionStatus/tests/testHandler.test.ts

@@ -54,7 +54,9 @@ vi.mock("@aws-sdk/client-dynamodb", async (importOriginal) => {
   const mod = await importOriginal<typeof import("@aws-sdk/client-dynamodb")>()
   return {
     ...mod,
-    DynamoDBClient: vi.fn().mockImplementation(() => ({send: dynamoDBMockSend}))
+    DynamoDBClient: vi.fn(class {
+      send = dynamoDBMockSend
+    })
   }
 })
 

packages/updatePrescriptionStatus/tests/testPrescriptionIntercept.test.ts

@@ -34,7 +34,9 @@ vi.mock("@aws-sdk/client-dynamodb", async (importOriginal) => {
   const mod = await importOriginal<typeof import("@aws-sdk/client-dynamodb")>()
   return {
     ...mod,
-    DynamoDBClient: vi.fn().mockImplementation(() => ({send: mockSend}))
+    DynamoDBClient: vi.fn(class {
+      send = mockSend
+    })
   }
 })
 

packages/updatePrescriptionStatus/tests/testSqsClient.test.ts

@@ -30,7 +30,9 @@ vi.mock("@aws-sdk/client-sqs", async (importOriginal: () => Promise<typeof impor
   const mod = await importOriginal()
   return {
     ...mod,
-    SQSClient: vi.fn().mockImplementation(() => ({send: mockSend}))
+    SQSClient: vi.fn(class {
+      send = mockSend
+    })
   }
 })