@defra/forms-engine-plugin 4.7.2-alpha → 4.7.3

package/src/server/plugins/map/routes/get-os-token.js

@@ -1,4 +1,4 @@
-import { post } from '~/src/server/services/httpService.js'
+import { post } from '../../../services/httpService.js'
 
 /**
  * @type {string}
@@ -19,7 +19,9 @@ export async function getAccessToken(options) {
   }
 
   const creds = `${key}:${secret}`
-  const result = await post('https://api.os.uk/oauth2/token/v1', {
+  const postByType = /** @type {typeof post<OsTokenResponse>} */ (post)
+
+  const result = await postByType('https://api.os.uk/oauth2/token/v1', {
     headers: {
       Authorization: `Basic ${btoa(creds)}`,
       'Content-Type': 'application/x-www-form-urlencoded'
@@ -30,6 +32,10 @@ export async function getAccessToken(options) {
 
   const data = result.payload
 
+  if (!data) {
+    throw new Error('Failed to obtain OS API token')
+  }
+
   cachedToken = data.access_token
   tokenExpiry = now + (data.expires_in - 60) * 1000 // refresh early
 
@@ -37,5 +43,11 @@ export async function getAccessToken(options) {
 }
 
 /**
- * @import { MapConfiguration } from '~/src/server/plugins/map/types.js'
+ * @typedef {object} OsTokenResponse
+ * @property {string} access_token - The access token
+ * @property {number} expires_in - The expiry in seconds
+ */
+
+/**
+ * @import { MapConfiguration } from '../types.js'
  */

package/src/server/plugins/map/routes/index.js

@@ -3,12 +3,12 @@ import { resolve } from 'node:path'
 import { StatusCodes } from 'http-status-codes'
 import Joi from 'joi'
 
-import { getAccessToken } from '~/src/server/plugins/map/routes/get-os-token.js'
-import { find, nearest } from '~/src/server/plugins/map/service.js'
+import { getAccessToken } from './get-os-token.js'
+import { find, nearest } from '../service.js'
 import {
   get,
   request as httpRequest
-} from '~/src/server/services/httpService.js'
+} from '../../../services/httpService.js'
 
 /**
  * Gets the map support routes
@@ -85,7 +85,9 @@ function tileProxyRoute(options) {
 
       const url = `https://api.os.uk/maps/vector/v1/vts/tile/${z}/${y}/${x}.pbf?srs=3857`
 
-      const { payload, res } = await get(url, {
+      const getBuffer = /** @type {typeof get<Buffer>} */ (get)
+
+      const { payload, res } = await getBuffer(url, {
         headers: {
           Authorization: `Bearer ${token}`,
           Accept: 'application/x-protobuf'
@@ -188,5 +190,5 @@ function mapStyleResourceRoutes() {
 
 /**
  * @import { ServerRoute } from '@hapi/hapi'
- * @import { MapConfiguration, MapProxyGetRequestRefs, MapGeocodeGetRequestRefs, MapReverseGeocodeGetRequestRefs } from '~/src/server/plugins/map/types.js'
+ * @import { MapConfiguration, MapProxyGetRequestRefs, MapGeocodeGetRequestRefs, MapReverseGeocodeGetRequestRefs } from '../types.js'
  */

package/src/server/plugins/map/service.js

@@ -1,8 +1,8 @@
 import { getErrorMessage } from '@defra/forms-model'
 import Boom from '@hapi/boom'
 
-import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
-import { getJson } from '~/src/server/services/httpService.js'
+import { createLogger } from '../../common/helpers/logging/logger.js'
+import { getJson } from '../../services/httpService.js'
 
 const logger = createLogger()
 
@@ -22,7 +22,10 @@ function empty() {
  * @param {string} endpoint - the OS api endpoint
  */
 function logErrorAndReturnEmpty(err, endpoint) {
-  const msg = `${getErrorMessage(err)} ${(Boom.isBoom(err) && err.data?.payload?.error?.message) ?? ''}`
+  /** @type {{ payload?: { error?: { message?: string } } } | false} */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  const boomData = Boom.isBoom(err) && err.data
+  const msg = `${getErrorMessage(err)} ${(boomData && boomData.payload?.error?.message) ?? ''}`
 
   logger.error(err, `Exception occured calling OS names ${endpoint} - ${msg}}`)
 
@@ -80,5 +83,5 @@ export async function nearest(easting, northing, apiKey) {
 }
 
 /**
- * @import { OsNamesFindResponse, OsNamesFindResult } from '~/src/server/plugins/map/types.js'
+ * @import { OsNamesFindResponse, OsNamesFindResult } from './types.js'
  */

package/src/server/plugins/map/test/__stubs__/find.js

@@ -267,5 +267,5 @@ export const result = {
 }
 
 /**
- * @import { OsNamesFindResponse } from '~/src/server/plugins/map/types.js'
+ * @import { OsNamesFindResponse } from '../../types.js'
  */

package/src/server/plugins/nunjucks/context.js

@@ -4,12 +4,12 @@ import { basename, join } from 'node:path'
 import Boom from '@hapi/boom'
 import { StatusCodes } from 'http-status-codes'
 
-import { config } from '~/src/config/index.js'
-import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
+import { config } from '../../../config/index.js'
+import { createLogger } from '../../common/helpers/logging/logger.js'
 import {
   checkFormStatus,
   encodeUrl
-} from '~/src/server/plugins/engine/helpers.js'
+} from '../engine/helpers.js'
 
 const logger = createLogger()
 
@@ -94,6 +94,6 @@ export function devtoolContext(_request) {
 }
 
 /**
- * @import { ViewContext } from '~/src/server/plugins/nunjucks/types.js'
- * @import { AnyFormRequest } from '~/src/server/plugins/engine/types.js'
+ * @import { ViewContext } from './types.js'
+ * @import { AnyFormRequest } from '../engine/types.js'
  */

package/src/server/plugins/nunjucks/environment.js

@@ -4,9 +4,9 @@ import { ComponentType } from '@defra/forms-model'
 import nunjucks from 'nunjucks'
 import resolvePkg from 'resolve'
 
-import { config } from '~/src/config/index.js'
-import { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'
-import * as filters from '~/src/server/plugins/nunjucks/filters/index.js'
+import { config } from '../../../config/index.js'
+import { evaluateTemplate } from '../engine/helpers.js'
+import * as filters from './filters/index.js'
 
 const govukFrontendPath = dirname(
   resolvePkg.sync('govuk-frontend/package.json')
@@ -116,7 +116,7 @@ export function govukRebrand() {
 environment.addGlobal('govukRebrand', govukRebrand())
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
- * @import { FormSubmissionError } from '~/src/server/plugins/engine/types.js'
- * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'
+ * @import { NunjucksContext } from './types.js'
+ * @import { FormSubmissionError } from '../engine/types.js'
+ * @import { ComponentViewModel } from '../engine/components/types.js'
  */

package/src/server/plugins/nunjucks/filters/answer.js

@@ -1,4 +1,4 @@
-import { getAnswer } from '~/src/server/plugins/engine/components/helpers/components.js'
+import { getAnswer } from '../../engine/components/helpers/components.js'
 
 /**
  * Nunjucks filter to get the answer for a component
@@ -22,6 +22,6 @@ export function answer(name) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
- * @import { Field } from '~/src/server/plugins/engine/components/helpers/components.js'
+ * @import { NunjucksContext } from '../types.js'
+ * @import { Field } from '../../engine/components/helpers/components.js'
  */

package/src/server/plugins/nunjucks/filters/evaluate.js

@@ -1,4 +1,4 @@
-import { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'
+import { evaluateTemplate } from '../../engine/helpers.js'
 
 /**
  * Nunjucks filter to evaluate a liquid template.
@@ -17,5 +17,5 @@ export function evaluate(template) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { NunjucksContext } from '../types.js'
  */

package/src/server/plugins/nunjucks/filters/field.js

@@ -24,5 +24,5 @@ export function field(name) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { NunjucksContext } from '../types.js'
  */

package/src/server/plugins/nunjucks/filters/href.js

@@ -1,4 +1,4 @@
-import { getPageHref } from '~/src/server/plugins/engine/index.js'
+import { getPageHref } from '../../engine/index.js'
 
 /**
  * Nunjucks filter to get the answer for a component
@@ -26,5 +26,5 @@ export function href(path) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { NunjucksContext } from '../types.js'
  */

package/src/server/plugins/nunjucks/filters/index.js

@@ -1,8 +1,8 @@
-export { highlight } from '~/src/server/plugins/nunjucks/filters/highlight.js'
-export { inspect } from '~/src/server/plugins/nunjucks/filters/inspect.js'
-export { evaluate } from '~/src/server/plugins/nunjucks/filters/evaluate.js'
-export { answer } from '~/src/server/plugins/nunjucks/filters/answer.js'
-export { href } from '~/src/server/plugins/nunjucks/filters/href.js'
-export { field } from '~/src/server/plugins/nunjucks/filters/field.js'
-export { page } from '~/src/server/plugins/nunjucks/filters/page.js'
-export { merge } from '~/src/server/plugins/nunjucks/filters/merge.js'
+export { highlight } from './highlight.js'
+export { inspect } from './inspect.js'
+export { evaluate } from './evaluate.js'
+export { answer } from './answer.js'
+export { href } from './href.js'
+export { field } from './field.js'
+export { page } from './page.js'
+export { merge } from './merge.js'

package/src/server/plugins/nunjucks/filters/page.js

@@ -20,5 +20,5 @@ export function page(path) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { NunjucksContext } from '../types.js'
  */

package/src/server/plugins/nunjucks/index.js

@@ -1,3 +1,3 @@
-export * as render from '~/src/server/plugins/nunjucks/render.js'
-export { environment } from '~/src/server/plugins/nunjucks/environment.js'
-export { plugin } from '~/src/server/plugins/nunjucks/plugin.js'
+export * as render from './render.js'
+export { environment } from './environment.js'
+export { plugin } from './plugin.js'

package/src/server/plugins/nunjucks/plugin.js

@@ -1,12 +1,12 @@
 import vision from '@hapi/vision'
 import nunjucks from 'nunjucks'
 
-import { config } from '~/src/config/index.js'
-import { context } from '~/src/server/plugins/nunjucks/context.js'
+import { config } from '../../../config/index.js'
+import { context } from './context.js'
 import {
   environment,
   paths
-} from '~/src/server/plugins/nunjucks/environment.js'
+} from './environment.js'
 
 /**
  * @type {ServerRegisterPluginObject<ServerViewsConfiguration>}

package/src/server/plugins/nunjucks/render.js

@@ -1,4 +1,4 @@
-import { environment } from '~/src/server/plugins/nunjucks/environment.js'
+import { environment } from './environment.js'
 
 /**
  * Render Nunjucks macro
@@ -38,5 +38,5 @@ export function view(viewPath, options) {
 }
 
 /**
- * @import { MacroOptions, RenderOptions } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { MacroOptions, RenderOptions } from './types.js'
  */

package/src/server/plugins/nunjucks/types.js

@@ -27,5 +27,5 @@
  */
 
 /**
- * @import { FormContext } from '~/src/server/plugins/engine/types.js'
+ * @import { FormContext } from '../engine/types.js'
  */

package/src/server/plugins/payment/helper.js

@@ -1,6 +1,6 @@
 import { format } from 'date-fns'
 
-import { PaymentService } from '~/src/server/plugins/payment/service.js'
+import { PaymentService } from './service.js'
 
 export const DEFAULT_PAYMENT_HELP_URL =
   'https://www.gov.uk/government/organisations/department-for-environment-food-rural-affairs'
@@ -51,5 +51,5 @@ export function formatCurrency(amount, locale = 'en-GB', currency = 'GBP') {
 }
 
 /**
- * @import { FormsService } from '~/src/server/types.js'
+ * @import { FormsService } from '../../types.js'
  */

package/src/server/plugins/payment/service.js

@@ -1,11 +1,11 @@
 import { StatusCodes } from 'http-status-codes'
 
-import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
+import { createLogger } from '../../common/helpers/logging/logger.js'
 import {
   buildPaymentInfo,
   convertPenceToPounds
-} from '~/src/server/plugins/engine/routes/payment-helper.js'
-import { get, post, postJson } from '~/src/server/services/httpService.js'
+} from '../engine/routes/payment-helper.js'
+import { get, post, postJson } from '../../services/httpService.js'
 
 const PAYMENT_BASE_URL = 'https://publicapi.payments.service.gov.uk'
 const PAYMENT_ENDPOINT = '/v1/payments'
@@ -231,5 +231,5 @@ export class PaymentService {
 }
 
 /**
- * @import { CreatePaymentRequest, CreatePaymentResponse, GetPaymentApiResponse, GetPaymentResponse } from '~/src/server/plugins/payment/types.js'
+ * @import { CreatePaymentRequest, CreatePaymentResponse, GetPaymentApiResponse, GetPaymentResponse } from './types.js'
  */

package/src/server/plugins/postcode-lookup/index.js

@@ -1,4 +1,4 @@
-import { getRoutes } from '~/src/server/plugins/postcode-lookup/routes/index.js'
+import { getRoutes } from './routes/index.js'
 
 export const VIEW_PATH = 'src/server/plugins/postcode-lookup/views'
 
@@ -17,5 +17,5 @@ export const postcodeLookupPlugin = {
 
 /**
  * @import { NamedPlugin } from '@hapi/hapi'
- * @import { PostcodeLookupConfiguration } from '~/src/server/plugins/postcode-lookup/types.js'
+ * @import { PostcodeLookupConfiguration } from './types.js'
  */

package/src/server/plugins/postcode-lookup/models/index.js

@@ -1,7 +1,7 @@
 import Joi from 'joi'
 
-import * as service from '~/src/server/plugins/postcode-lookup/service.js'
-import { crumbSchema } from '~/src/server/schemas/index.js'
+import * as service from '../service.js'
+import { crumbSchema } from '../../../schemas/index.js'
 
 // Field names/ids
 const postcodeQueryFieldName = 'postcodeQuery'
@@ -550,5 +550,5 @@ export function manualViewModel(data, payload, err) {
 
 /**
  * @import { ObjectSchema, ValidationErrorItem } from 'joi'
- * @import { Address, PostcodeLookupDetailsData, PostcodeLookupDetailsPayload, PostcodeLookupManualPayload, PostcodeLookupSelectPayload, PostcodeLookupSessionData } from '~/src/server/plugins/postcode-lookup/types.js'
+ * @import { Address, PostcodeLookupDetailsData, PostcodeLookupDetailsPayload, PostcodeLookupManualPayload, PostcodeLookupSelectPayload, PostcodeLookupSessionData } from '../types.js'
  */

package/src/server/plugins/postcode-lookup/routes/index.js

@@ -2,7 +2,7 @@ import Boom from '@hapi/boom'
 import { StatusCodes } from 'http-status-codes'
 import Joi from 'joi'
 
-import { EXTERNAL_STATE_APPENDAGE } from '~/src/server/constants.js'
+import { EXTERNAL_STATE_APPENDAGE } from '../../../constants.js'
 import {
   JOURNEY_BASE_URL,
   detailsPayloadSchema,
@@ -13,8 +13,8 @@ import {
   selectViewModel,
   stepSchema,
   steps
-} from '~/src/server/plugins/postcode-lookup/models/index.js'
-import * as service from '~/src/server/plugins/postcode-lookup/service.js'
+} from '../models/index.js'
+import * as service from '../service.js'
 
 const viewName = 'postcode-lookup-details'
 
@@ -170,10 +170,14 @@ function postRoute(options) {
  * @param {PostcodeLookupConfiguration} options
  */
 async function detailsPostHandler(request, h, options) {
-  const { payload } = request
   const session = getSessionState(request)
   const { ordnanceSurveyApiKey: apiKey } = options
-  const { value: details, error } = detailsPayloadSchema.validate(payload)
+
+  /** @type {{ value: PostcodeLookupDetailsPayload, error?: import('joi').ValidationError }} */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  const { value: details, error } = detailsPayloadSchema.validate(
+    request.payload
+  )
 
   let model
 
@@ -201,10 +205,12 @@ async function detailsPostHandler(request, h, options) {
  * @param {PostcodeLookupConfiguration} options
  */
 async function selectPostHandler(request, h, options) {
-  const { payload } = request
   const session = getSessionState(request)
   const { ordnanceSurveyApiKey: apiKey } = options
-  const { value: select, error } = selectPayloadSchema.validate(payload)
+
+  /** @type {{ value: PostcodeLookupSelectPayload, error?: import('joi').ValidationError }} */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  const { value: select, error } = selectPayloadSchema.validate(request.payload)
 
   if (error) {
     const model = await selectViewModel({ session, apiKey }, select, error)
@@ -232,12 +238,16 @@ async function selectPostHandler(request, h, options) {
  * @param {ResponseToolkit<PostcodeLookupPostRequestRefs>} h
  */
 function manualPostHandler(request, h) {
-  const { payload } = request
   const session = getSessionState(request)
 
-  const { value: manual, error } = manualPayloadSchema.validate(payload, {
-    abortEarly: false
-  })
+  /** @type {{ value: PostcodeLookupManualPayload, error?: import('joi').ValidationError }} */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  const { value: manual, error } = manualPayloadSchema.validate(
+    request.payload,
+    {
+      abortEarly: false
+    }
+  )
 
   if (error) {
     const model = manualViewModel(session, manual, error)
@@ -254,7 +264,7 @@ function manualPostHandler(request, h) {
 
 /**
  * @import { ResponseToolkit, ServerRoute } from '@hapi/hapi'
- * @import { PostcodeLookupManualPayload, Address, PostcodeLookupGetRequestRefs, PostcodeLookupPostRequestRefs, PostcodeLookupRequest, PostcodeLookupPostRequest, PostcodeLookupConfiguration, PostcodeLookupDispatchData, PostcodeLookupSessionData } from '~/src/server/plugins/postcode-lookup/types.js'
- * @import { FormRequestPayload, FormResponseToolkit } from '~/src/server/routes/types.js'
- * @import { ExternalStateAppendage } from '~/src/server/plugins/engine/types.js'
+ * @import { PostcodeLookupManualPayload, PostcodeLookupDetailsPayload, PostcodeLookupSelectPayload, Address, PostcodeLookupGetRequestRefs, PostcodeLookupPostRequestRefs, PostcodeLookupRequest, PostcodeLookupPostRequest, PostcodeLookupConfiguration, PostcodeLookupDispatchData, PostcodeLookupSessionData } from '../types.js'
+ * @import { FormRequestPayload, FormResponseToolkit } from '../../../routes/types.js'
+ * @import { ExternalStateAppendage } from '../../engine/types.js'
  */

package/src/server/plugins/postcode-lookup/service.js

@@ -1,8 +1,8 @@
 import { getErrorMessage } from '@defra/forms-model'
 import Boom from '@hapi/boom'
 
-import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
-import { getJson } from '~/src/server/services/httpService.js'
+import { createLogger } from '../../common/helpers/logging/logger.js'
+import { getJson } from '../../services/httpService.js'
 
 const logger = createLogger()
 
@@ -19,7 +19,10 @@ function empty() {
  * @param {string} endpoint - the OS api endpoint
  */
 function logErrorAndReturnEmpty(err, endpoint) {
-  const msg = `${getErrorMessage(err)} ${(Boom.isBoom(err) && err.data?.payload?.error?.message) ?? ''}`
+  /** @type {{ payload?: { error?: { message?: string } } } | false} */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  const boomData = Boom.isBoom(err) && err.data
+  const msg = `${getErrorMessage(err)} ${(boomData && boomData.payload?.error?.message) ?? ''}`
 
   logger.error(err, `Exception occured calling OS places ${endpoint} - ${msg}}`)
 
@@ -184,5 +187,5 @@ function titleCase(address) {
 }
 
 /**
- * @import { Address, DeliveryPointAddress, DeliveryPointAddressResult } from '~/src/server/plugins/postcode-lookup/types.js'
+ * @import { Address, DeliveryPointAddress, DeliveryPointAddressResult } from './types.js'
  */

package/src/server/plugins/postcode-lookup/types.js

@@ -139,5 +139,5 @@
 
 /**
  * @import { Request } from '@hapi/hapi'
- * @import { FormPayload } from '~/src/server/plugins/engine/types.js'
+ * @import { FormPayload } from '../engine/types.js'
  */

package/src/server/plugins/session.ts

@@ -1,7 +1,7 @@
 import { type ServerRegisterPluginObject } from '@hapi/hapi'
 import yar, { type YarOptions } from '@hapi/yar'
 
-import { config } from '~/src/config/index.js'
+import { config } from '../../config/index.js'
 
 /**
  * Yar is used for temporary session data but not form submissions, e.g. UI helpers, session flags.

package/src/server/routes/index.ts

@@ -1,2 +1,2 @@
-export { default as publicRoutes } from '~/src/server/routes/public.js'
-export { default as dummyApiRoutes } from '~/src/server/routes/dummy-api.js'
+export { default as publicRoutes } from './public.js'
+export { default as dummyApiRoutes } from './dummy-api.js'

package/src/server/routes/public.ts

@@ -2,7 +2,7 @@ import { join } from 'node:path'
 
 import { type HandlerDecorations, type ServerRoute } from '@hapi/hapi'
 
-import { config } from '~/src/config/index.js'
+import { config } from '../../config/index.js'
 
 export default [
   {

package/src/server/routes/types.ts

@@ -4,7 +4,7 @@ import {
   type ResponseToolkit
 } from '@hapi/hapi'
 
-import { type FormPayload } from '~/src/server/plugins/engine/types.js'
+import { type FormPayload } from '../plugins/engine/types.js'
 
 export interface FormQuery extends Partial<Record<string, string>> {
   /**

package/src/server/schemas/index.ts

@@ -1,7 +1,7 @@
 import Joi from 'joi'
 
-import { type FormPayloadParams } from '~/src/server/plugins/engine/types.js'
-import { FormAction, FormStatus } from '~/src/server/routes/types.js'
+import { type FormPayloadParams } from '../plugins/engine/types.js'
+import { FormAction, FormStatus } from '../routes/types.js'
 
 export const stateSchema = Joi.string<FormStatus>()
   .valid(FormStatus.Draft, FormStatus.Live)

package/src/server/secure-context.js

@@ -1,6 +1,6 @@
 import tls from 'node:tls'
 
-import { getTrustStoreCerts } from '~/src/server/utils/secure-context/get-trust-store-certs.js'
+import { getTrustStoreCerts } from './utils/secure-context/get-trust-store-certs.js'
 
 /**
  * @type {SecureContext}

package/src/server/services/cacheService.ts

@@ -2,17 +2,17 @@ import { type Server } from '@hapi/hapi'
 import * as Hoek from '@hapi/hoek'
 import unset from 'lodash/unset.js'
 
-import { config } from '~/src/config/index.js'
-import { type createServer } from '~/src/server/index.js'
+import { config } from '../../config/index.js'
+import { type createServer } from '../index.js'
 import {
   type AnyFormRequest,
-  type AnyRequest,
+  type CacheRequest,
   type FormConfirmationState,
   type FormPayload,
   type FormState,
   type FormSubmissionError,
   type FormSubmissionState
-} from '~/src/server/plugins/engine/types.js'
+} from '../plugins/engine/types.js'
 
 const partition = 'cache'
 
@@ -39,14 +39,14 @@ export class CacheService {
     this.logger = server.logger
   }
 
-  async getState(request: AnyRequest): Promise<FormSubmissionState> {
+  async getState(request: CacheRequest): Promise<FormSubmissionState> {
     const key = this.Key(request)
     const cached = await this.cache.get(key)
 
     return cached ?? {}
   }
 
-  async setState(request: AnyFormRequest, state: FormSubmissionState) {
+  async setState(request: CacheRequest, state: FormSubmissionState) {
     const key = this.Key(request)
     const ttl = config.get('sessionTimeout')
 
@@ -56,7 +56,7 @@ export class CacheService {
   }
 
   async getConfirmationState(
-    request: AnyFormRequest
+    request: CacheRequest
   ): Promise<FormConfirmationState> {
     const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)
     const value = await this.cache.get(key)
@@ -65,7 +65,7 @@ export class CacheService {
   }
 
   async setConfirmationState(
-    request: AnyFormRequest,
+    request: CacheRequest,
     confirmationState: FormConfirmationState
   ) {
     const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)
@@ -74,7 +74,7 @@ export class CacheService {
     return this.cache.set(key, confirmationState, ttl)
   }
 
-  async clearState(request: AnyFormRequest) {
+  async clearState(request: CacheRequest) {
     if (request.yar.id) {
       await this.cache.drop(this.Key(request))
     }
@@ -123,10 +123,7 @@ export class CacheService {
    * ```
    * @returns The updated state after removal
    */
-  async resetComponentStates(
-    request: AnyFormRequest,
-    componentNames: string[]
-  ) {
+  async resetComponentStates(request: CacheRequest, componentNames: string[]) {
     const state = await this.getState(request)
 
     for (const componentName of componentNames) {
@@ -142,15 +139,13 @@ export class CacheService {
    * @param request - hapi request object
    * @param additionalIdentifier - appended to the id
    */
-  Key(request: AnyRequest, additionalIdentifier?: ADDITIONAL_IDENTIFIER) {
+  Key(request: CacheRequest, additionalIdentifier?: ADDITIONAL_IDENTIFIER) {
     if (!request.yar.id) {
       throw new Error('No session ID found')
     }
 
-    // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
-    const state = (request.params.state as string) || ''
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-    const slug = (request.params.slug as string) || ''
+    const state = request.params.state ?? ''
+    const slug = request.params.slug ?? ''
     const key = `${request.yar.id}:${state}:${slug}:`
 
     return {

package/src/server/services/httpService.ts

@@ -1,6 +1,6 @@
 import Wreck from '@hapi/wreck'
 
-import { applyTraceHeaders } from '~/src/server/utils/utils.js'
+import { applyTraceHeaders } from '../utils/utils.js'
 
 export type Method = keyof Pick<typeof Wreck, 'get' | 'post' | 'put' | 'delete'>
 export type RequestOptions = Parameters<typeof Wreck.defaults>[0]