Fix types for view context

Author: alexluckett

src/server/plugins/engine/plugin.ts

@@ -6,6 +6,7 @@ import { hasFormComponents, slugSchema } from '@defra/forms-model'
 import Boom from '@hapi/boom'
 import {
   type Plugin,
+  type PluginProperties,
   type ResponseObject,
   type ResponseToolkit,
   type RouteOptions,
@@ -95,9 +96,7 @@ export interface PluginOptions {
     baseLayoutPath: string
     paths: string[]
   }
-  viewContext: (
-    request: FormRequest | FormRequestPayload | null
-  ) => Promise<Record<string, unknown>>
+  viewContext: PluginProperties['forms-engine-plugin']['viewContext']
 }
 
 export const plugin = {

src/typings/hapi/index.d.ts

@@ -5,7 +5,6 @@ import { type ServerYar, type Yar } from '@hapi/yar'
 import { type Logger } from 'pino'
 
 import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
-import { type context } from '~/src/server/plugins/engine/nunjucks.js'
 import {
   type FormRequest,
   type FormRequestPayload
@@ -22,7 +21,9 @@ declare module '@hapi/hapi' {
     'forms-engine-plugin': {
       baseLayoutPath: string
       cacheService: CacheService
-      viewContext: context
+      viewContext?: (
+        request: FormRequest | FormRequestPayload | null
+      ) => Record<string, unknown> | Promise<Record<string, unknown>>
     }
   }