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

package/src/server/plugins/engine/pageControllers/helpers/state.ts

@@ -1,21 +1,21 @@
 import { ControllerType, getHiddenFields } from '@defra/forms-model'
 
-import { getCacheService } from '~/src/server/plugins/engine/helpers.js'
+import { getCacheService } from '../../helpers.js'
 import {
   CURRENT_PAGE_PATH_KEY,
   STATE_NOT_YET_VALIDATED
-} from '~/src/server/plugins/engine/index.js'
-import { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
-import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'
+} from '../../index.js'
+import { type FormModel } from '../../models/FormModel.js'
+import { type PageControllerClass } from './pages.js'
 import {
   type AnyFormRequest,
   type FormContext,
   type FormStateValue,
   type FormValue
-} from '~/src/server/plugins/engine/types.js'
-import { type FormQuery } from '~/src/server/routes/types.js'
-import { type Services } from '~/src/server/types.js'
-import { isValidUUID } from '~/src/server/utils/utils.js'
+} from '../../types.js'
+import { type FormQuery } from '../../../../routes/types.js'
+import { type Services } from '../../../../types.js'
+import { isValidUUID } from '../../../../utils/utils.js'
 
 const GUID_LENGTH = 36
 
@@ -58,7 +58,7 @@ export function stripParam(query: FormQuery, paramToRemove: string) {
  * Any hidden parameters defined in the FormDefinition may be pre-filled by URL parameter values.
  * Other parameters are ignored for security reasons.
  * @param request
- * @param model
+ * @param page
  */
 export async function prefillStateFromQueryParameters(
   request: AnyFormRequest,

package/src/server/plugins/engine/pageControllers/helpers/submission.ts

@@ -1,16 +1,16 @@
 import { type SubmitPayload } from '@defra/forms-model'
 
-import { GeospatialField } from '~/src/server/plugins/engine/components/GeospatialField.js'
-import { PaymentField } from '~/src/server/plugins/engine/components/PaymentField.js'
-import { getAnswer } from '~/src/server/plugins/engine/components/helpers/components.js'
+import { GeospatialField } from '../../components/GeospatialField.js'
+import { PaymentField } from '../../components/PaymentField.js'
+import { getAnswer } from '../../components/helpers/components.js'
 import {
   type DetailItem,
   type DetailItemField
-} from '~/src/server/plugins/engine/models/types.js'
+} from '../../models/types.js'
 import {
   formatCurrency,
   formatPaymentDate
-} from '~/src/server/plugins/payment/helper.js'
+} from '../../../payment/helper.js'
 
 export interface SubmitRecord {
   name: string

package/src/server/plugins/engine/pageControllers/index.ts

@@ -1,10 +1,10 @@
-export { StartPageController } from '~/src/server/plugins/engine/pageControllers/StartPageController.js'
+export { StartPageController } from './StartPageController.js'
 export {
   QuestionPageController, // Export alongside alias
   QuestionPageController as PageController
-} from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js'
-export { TerminalPageController } from '~/src/server/plugins/engine/pageControllers/TerminalPageController.js'
-export { SummaryPageController } from '~/src/server/plugins/engine/pageControllers/SummaryPageController.js'
-export { StatusPageController } from '~/src/server/plugins/engine/pageControllers/StatusPageController.js'
-export { FileUploadPageController } from '~/src/server/plugins/engine/pageControllers/FileUploadPageController.js'
-export { RepeatPageController } from '~/src/server/plugins/engine/pageControllers/RepeatPageController.js'
+} from './QuestionPageController.js'
+export { TerminalPageController } from './TerminalPageController.js'
+export { SummaryPageController } from './SummaryPageController.js'
+export { StatusPageController } from './StatusPageController.js'
+export { FileUploadPageController } from './FileUploadPageController.js'
+export { RepeatPageController } from './RepeatPageController.js'

package/src/server/plugins/engine/pageControllers/validationOptions.ts

@@ -8,7 +8,7 @@ import joi, {
   type ValidationOptions
 } from 'joi'
 
-import { lowerFirstPreserveProperNouns } from '~/src/server/plugins/engine/components/helpers/index.js'
+import { lowerFirstPreserveProperNouns } from '../components/helpers/index.js'
 
 const opts = {
   functions: {

package/src/server/plugins/engine/plugin.ts

@@ -6,23 +6,23 @@ import {
   type ServerRoute
 } from '@hapi/hapi'
 
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
-import { validatePluginOptions } from '~/src/server/plugins/engine/options.js'
-import { getRoutes as getFileUploadStatusRoutes } from '~/src/server/plugins/engine/routes/file-upload.js'
-import { makeLoadFormPreHandler } from '~/src/server/plugins/engine/routes/index.js'
-import { getRoutes as getPaymentRoutes } from '~/src/server/plugins/engine/routes/payment.js'
-import { getRoutes as getQuestionRoutes } from '~/src/server/plugins/engine/routes/questions.js'
-import { getRoutes as getRepeaterItemDeleteRoutes } from '~/src/server/plugins/engine/routes/repeaters/item-delete.js'
-import { getRoutes as getRepeaterSummaryRoutes } from '~/src/server/plugins/engine/routes/repeaters/summary.js'
-import { type PluginOptions } from '~/src/server/plugins/engine/types.js'
-import { registerVision } from '~/src/server/plugins/engine/vision.js'
-import { mapPlugin } from '~/src/server/plugins/map/index.js'
-import { postcodeLookupPlugin } from '~/src/server/plugins/postcode-lookup/index.js'
+import { type FormModel } from './models/index.js'
+import { validatePluginOptions } from './options.js'
+import { getRoutes as getFileUploadStatusRoutes } from './routes/file-upload.js'
+import { makeLoadFormPreHandler } from './routes/index.js'
+import { getRoutes as getPaymentRoutes } from './routes/payment.js'
+import { getRoutes as getQuestionRoutes } from './routes/questions.js'
+import { getRoutes as getRepeaterItemDeleteRoutes } from './routes/repeaters/item-delete.js'
+import { getRoutes as getRepeaterSummaryRoutes } from './routes/repeaters/summary.js'
+import { type PluginOptions } from './types.js'
+import { registerVision } from './vision.js'
+import { mapPlugin } from '../map/index.js'
+import { postcodeLookupPlugin } from '../postcode-lookup/index.js'
 import {
   type FormRequestPayloadRefs,
   type FormRequestRefs
-} from '~/src/server/routes/types.js'
-import { CacheService } from '~/src/server/services/index.js'
+} from '../../routes/types.js'
+import { CacheService } from '../../services/index.js'
 
 export const plugin = {
   name: '@defra/forms-engine-plugin',

package/src/server/plugins/engine/routes/file-upload.ts

@@ -2,11 +2,11 @@ import { getErrorMessage } from '@defra/forms-model'
 import { type ResponseToolkit, type ServerRoute } from '@hapi/hapi'
 import Joi from 'joi'
 
-import { getUploadStatus } from '~/src/server/plugins/engine/services/uploadService.js'
+import { getUploadStatus } from '../services/uploadService.js'
 import {
   type FormRequest,
   type FormRequestRefs
-} from '~/src/server/routes/types.js'
+} from '../../../routes/types.js'
 
 export async function getHandler(
   request: FormRequest,

package/src/server/plugins/engine/routes/index.ts

@@ -8,12 +8,12 @@ import {
 import {
   EXTERNAL_STATE_APPENDAGE,
   EXTERNAL_STATE_PAYLOAD
-} from '~/src/server/constants.js'
-import { resolveFormModel } from '~/src/server/plugins/engine/beta/form-context.js'
+} from '../../../constants.js'
+import { resolveFormModel } from '../beta/form-context.js'
 import {
   FormComponent,
   isFormState
-} from '~/src/server/plugins/engine/components/FormComponent.js'
+} from '../components/FormComponent.js'
 import {
   checkFormStatus,
   findPage,
@@ -21,14 +21,14 @@ import {
   getPage,
   getStartPath,
   proceed
-} from '~/src/server/plugins/engine/helpers.js'
-import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'
+} from '../helpers.js'
+import { type PageControllerClass } from '../pageControllers/helpers/pages.js'
 import {
   checkSaveAndExitRepeater,
   copyNotYetValidatedState
-} from '~/src/server/plugins/engine/pageControllers/helpers/state.js'
-import { generateUniqueReference } from '~/src/server/plugins/engine/referenceNumbers.js'
-import * as defaultServices from '~/src/server/plugins/engine/services/index.js'
+} from '../pageControllers/helpers/state.js'
+import { generateUniqueReference } from '../referenceNumbers.js'
+import * as defaultServices from '../services/index.js'
 import {
   type AnyFormRequest,
   type ExternalStateAppendage,
@@ -37,11 +37,11 @@ import {
   type FormSubmissionState,
   type OnRequestCallback,
   type PluginOptions
-} from '~/src/server/plugins/engine/types.js'
+} from '../types.js'
 import {
   type FormRequest,
   type FormResponseToolkit
-} from '~/src/server/routes/types.js'
+} from '../../../routes/types.js'
 
 export async function redirectOrMakeHandler(
   request: AnyFormRequest,

package/src/server/plugins/engine/routes/payment-helper.js

@@ -1,7 +1,7 @@
 import Boom from '@hapi/boom'
 
-import { PAYMENT_SESSION_PREFIX } from '~/src/server/plugins/engine/routes/payment.js'
-import { createPaymentService } from '~/src/server/plugins/payment/helper.js'
+import { PAYMENT_SESSION_PREFIX } from './payment.js'
+import { createPaymentService } from '../../payment/helper.js'
 
 /**
  * Validates session data and retrieves payment status
@@ -75,6 +75,6 @@ export function convertPenceToPounds(amount) {
 
 /**
  * @import { Request } from '@hapi/hapi'
- * @import { GetPaymentResponse, PaymentSessionData } from '~/src/server/plugins/payment/types.js'
- * @import { FormsService } from '~/src/server/types.js'
+ * @import { GetPaymentResponse, PaymentSessionData } from '../../payment/types.js'
+ * @import { FormsService } from '../../../types.js'
  */

package/src/server/plugins/engine/routes/payment.js

@@ -2,14 +2,14 @@ import Boom from '@hapi/boom'
 import { StatusCodes } from 'http-status-codes'
 import Joi from 'joi'
 
-import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
-import { EXTERNAL_STATE_APPENDAGE } from '~/src/server/constants.js'
-import { getPluginOptions } from '~/src/server/plugins/engine/helpers.js'
+import { createLogger } from '../../../common/helpers/logging/logger.js'
+import { EXTERNAL_STATE_APPENDAGE } from '../../../constants.js'
+import { getPluginOptions } from '../helpers.js'
 import {
   buildPaymentInfo,
   convertPenceToPounds,
   getPaymentContext
-} from '~/src/server/plugins/engine/routes/payment-helper.js'
+} from './payment-helper.js'
 
 export const PAYMENT_RETURN_PATH = '/payment-callback'
 export const PAYMENT_SESSION_PREFIX = 'payment-'
@@ -195,9 +195,9 @@ function getReturnRoute() {
 
 /**
  * @import { Request, ResponseToolkit, ServerRoute } from '@hapi/hapi'
- * @import { GetPaymentResponse, PaymentSessionData } from '~/src/server/plugins/payment/types.js'
- * @import { PaymentState } from '~/src/server/plugins/engine/components/PaymentField.types.js'
- * @import { ExternalStateAppendage, FormState } from '~/src/server/plugins/engine/types.js'
- * @import { PluginOptions } from '~/src/server/plugins/engine/types.js'
- * @import { FormsService } from '~/src/server/types.js'
+ * @import { GetPaymentResponse, PaymentSessionData } from '../../payment/types.js'
+ * @import { PaymentState } from '../components/PaymentField.types.js'
+ * @import { ExternalStateAppendage, FormState } from '../types.js'
+ * @import { PluginOptions } from '../types.js'
+ * @import { FormsService } from '../../../types.js'
  */

package/src/server/plugins/engine/routes/questions.ts

@@ -11,39 +11,39 @@ import {
   normalisePath,
   proceed,
   redirectPath
-} from '~/src/server/plugins/engine/helpers.js'
+} from '../helpers.js'
 import {
   SummaryViewModel,
   type FormModel
-} from '~/src/server/plugins/engine/models/index.js'
-import { format } from '~/src/server/plugins/engine/outputFormatters/machine/v1.js'
-import { getFormSubmissionData } from '~/src/server/plugins/engine/pageControllers/SummaryPageController.js'
-import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'
+} from '../models/index.js'
+import { format } from '../outputFormatters/machine/v1.js'
+import { getFormSubmissionData } from '../pageControllers/SummaryPageController.js'
+import { type PageControllerClass } from '../pageControllers/helpers/pages.js'
 import {
   dispatchHandler,
   redirectOrMakeHandler
-} from '~/src/server/plugins/engine/routes/index.js'
+} from './index.js'
 import {
   type AnyFormRequest,
   type FormContext,
   type OnRequestCallback,
   type PreparePageEventRequestOptions
-} from '~/src/server/plugins/engine/types.js'
+} from '../types.js'
 import {
   type FormRequest,
   type FormRequestPayload,
   type FormRequestPayloadRefs,
   type FormRequestRefs,
   type FormResponseToolkit
-} from '~/src/server/routes/types.js'
+} from '../../../routes/types.js'
 import {
   actionSchema,
   crumbSchema,
   itemIdSchema,
   pathSchema,
   stateSchema
-} from '~/src/server/schemas/index.js'
-import * as httpService from '~/src/server/services/httpService.js'
+} from '../../../schemas/index.js'
+import * as httpService from '../../../services/httpService.js'
 
 async function handleHttpEvent(
   request: AnyFormRequest,

package/src/server/plugins/engine/routes/repeaters/item-delete.ts

@@ -3,17 +3,17 @@ import Boom from '@hapi/boom'
 import { type RouteOptions, type ServerRoute } from '@hapi/hapi'
 import Joi from 'joi'
 
-import { FileUploadPageController } from '~/src/server/plugins/engine/pageControllers/FileUploadPageController.js'
-import { RepeatPageController } from '~/src/server/plugins/engine/pageControllers/RepeatPageController.js'
-import { redirectOrMakeHandler } from '~/src/server/plugins/engine/routes/index.js'
-import { type OnRequestCallback } from '~/src/server/plugins/engine/types.js'
+import { FileUploadPageController } from '../../pageControllers/FileUploadPageController.js'
+import { RepeatPageController } from '../../pageControllers/RepeatPageController.js'
+import { redirectOrMakeHandler } from '../index.js'
+import { type OnRequestCallback } from '../../types.js'
 import {
   type FormRequest,
   type FormRequestPayload,
   type FormRequestPayloadRefs,
   type FormRequestRefs,
   type FormResponseToolkit
-} from '~/src/server/routes/types.js'
+} from '../../../../routes/types.js'
 import {
   actionSchema,
   confirmSchema,
@@ -21,7 +21,7 @@ import {
   itemIdSchema,
   pathSchema,
   stateSchema
-} from '~/src/server/schemas/index.js'
+} from '../../../../schemas/index.js'
 
 // Item delete GET route
 function getHandler(onRequest?: OnRequestCallback) {

package/src/server/plugins/engine/routes/repeaters/summary.ts

@@ -4,22 +4,22 @@ import Boom from '@hapi/boom'
 import { type RouteOptions, type ServerRoute } from '@hapi/hapi'
 import Joi from 'joi'
 
-import { RepeatPageController } from '~/src/server/plugins/engine/pageControllers/RepeatPageController.js'
-import { redirectOrMakeHandler } from '~/src/server/plugins/engine/routes/index.js'
-import { type OnRequestCallback } from '~/src/server/plugins/engine/types.js'
+import { RepeatPageController } from '../../pageControllers/RepeatPageController.js'
+import { redirectOrMakeHandler } from '../index.js'
+import { type OnRequestCallback } from '../../types.js'
 import {
   type FormRequest,
   type FormRequestPayload,
   type FormRequestPayloadRefs,
   type FormRequestRefs,
   type FormResponseToolkit
-} from '~/src/server/routes/types.js'
+} from '../../../../routes/types.js'
 import {
   actionSchema,
   crumbSchema,
   pathSchema,
   stateSchema
-} from '~/src/server/schemas/index.js'
+} from '../../../../schemas/index.js'
 
 function getHandler(onRequest?: OnRequestCallback) {
   return async function (request: FormRequest, h: FormResponseToolkit) {

package/src/server/plugins/engine/services/formSubmissionService.js

@@ -1,5 +1,5 @@
-import { config } from '~/src/config/index.js'
-import { postJson } from '~/src/server/services/httpService.js'
+import { config } from '../../../../config/index.js'
+import { postJson } from '../../../services/httpService.js'
 
 const submissionUrl = config.get('submissionUrl')
 

package/src/server/plugins/engine/services/index.js

@@ -1,3 +1,3 @@
-export * as formsService from '~/src/server/plugins/engine/services/formsService.js'
-export * as formSubmissionService from '~/src/server/plugins/engine/services/formSubmissionService.js'
-export * as outputService from '~/src/server/plugins/engine/services/notifyService.js'
+export * as formsService from './formsService.js'
+export * as formSubmissionService from './formSubmissionService.js'
+export * as outputService from './notifyService.js'

package/src/server/plugins/engine/services/localFormsService.js

@@ -1,5 +1,5 @@
-import { config } from '~/src/config/index.js'
-import { FileFormService } from '~/src/server/utils/file-form-service.js'
+import { config } from '../../../../config/index.js'
+import { FileFormService } from '../../../utils/file-form-service.js'
 
 // Create shared form metadata
 const now = new Date()

package/src/server/plugins/engine/services/notifyService.ts

@@ -4,15 +4,15 @@ import {
   type SubmitResponsePayload
 } from '@defra/forms-model'
 
-import { config } from '~/src/config/index.js'
-import { escapeMarkdown } from '~/src/server/plugins/engine/components/helpers/index.js'
-import { checkFormStatus } from '~/src/server/plugins/engine/helpers.js'
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
-import { type DetailItem } from '~/src/server/plugins/engine/models/types.js'
-import { getFormatter } from '~/src/server/plugins/engine/outputFormatters/index.js'
-import { type FormContext } from '~/src/server/plugins/engine/types.js'
-import { type FormRequestPayload } from '~/src/server/routes/types.js'
-import { sendNotification } from '~/src/server/utils/notify.js'
+import { config } from '../../../../config/index.js'
+import { escapeMarkdown } from '../components/helpers/index.js'
+import { checkFormStatus } from '../helpers.js'
+import { type FormModel } from '../models/index.js'
+import { type DetailItem } from '../models/types.js'
+import { getFormatter } from '../outputFormatters/index.js'
+import { type FormContext } from '../types.js'
+import { type FormRequestPayload } from '../../../routes/types.js'
+import { sendNotification } from '../../../utils/notify.js'
 
 const templateId = config.get('notifyTemplateId')
 

package/src/server/plugins/engine/services/uploadService.js

@@ -1,5 +1,5 @@
-import { config } from '~/src/config/index.js'
-import { getJson, postJson } from '~/src/server/services/httpService.js'
+import { config } from '../../../../config/index.js'
+import { getJson, postJson } from '../../../services/httpService.js'
 
 const uploaderUrl = config.get('uploaderUrl')
 const submissionUrl = config.get('submissionUrl')
@@ -60,5 +60,5 @@ export async function getUploadStatus(uploadId) {
 }
 
 /**
- * @import { UploadInitiateResponse, UploadStatusResponse } from '~/src/server/plugins/engine/types.js'
+ * @import { UploadInitiateResponse, UploadStatusResponse } from '../types.js'
  */

package/src/server/plugins/engine/types/index.ts

@@ -41,9 +41,9 @@ export type {
   UploadInitiateResponse,
   UploadStatusFileResponse,
   UploadStatusResponse
-} from '~/src/server/plugins/engine/types.js'
+} from '../types.js'
 
-export { FileStatus, UploadStatus } from '~/src/server/plugins/engine/types.js'
+export { FileStatus, UploadStatus } from '../types.js'
 
 export type {
   Detail,
@@ -52,7 +52,7 @@ export type {
   DetailItemField,
   DetailItemRepeat,
   ExecutableCondition
-} from '~/src/server/plugins/engine/models/types.js'
+} from '../models/types.js'
 
 export type {
   BackLink,
@@ -68,9 +68,9 @@ export type {
   ListItemLabel,
   MonthYearState,
   ViewModel
-} from '~/src/server/plugins/engine/components/types.js'
+} from '../components/types.js'
 
-export type { UkAddressState } from '~/src/server/plugins/engine/components/UkAddressField.js'
+export type { UkAddressState } from '../components/UkAddressField.js'
 
 export type {
   FormParams,
@@ -80,9 +80,9 @@ export type {
   FormRequestPayloadRefs,
   FormRequestRefs,
   FormResponseToolkit
-} from '~/src/server/routes/types.js'
+} from '../../../routes/types.js'
 
-export { FormAction, FormStatus } from '~/src/server/routes/types.js'
+export { FormAction, FormStatus } from '../../../routes/types.js'
 
 export type {
   FormSubmissionService,
@@ -90,7 +90,7 @@ export type {
   OutputService,
   RouteConfig,
   Services
-} from '~/src/server/types.js'
+} from '../../../types.js'
 
-export * from '~/src/server/plugins/engine/types/schema.js'
-export { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/enums.js'
+export * from './schema.js'
+export { FormAdapterSubmissionSchemaVersion } from './enums.js'

package/src/server/plugins/engine/types/schema.ts

@@ -8,13 +8,13 @@ import {
 } from '@defra/forms-model'
 import Joi from 'joi'
 
-import { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/enums.js'
+import { FormAdapterSubmissionSchemaVersion } from './enums.js'
 import {
   type FormAdapterSubmissionMessageData,
   type FormAdapterSubmissionMessageMeta,
   type FormAdapterSubmissionMessagePayload,
   type FormAdapterSubmissionMessageResult
-} from '~/src/server/plugins/engine/types.js'
+} from '../types.js'
 
 export const formAdapterSubmissionMessageMetaSchema =
   Joi.object<FormAdapterSubmissionMessageMeta>().keys({

package/src/server/plugins/engine/types.ts

@@ -15,13 +15,13 @@ import {
 } from '@hapi/hapi'
 import { type JoiExpression, type ValidationErrorItem } from 'joi'
 
-import { FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js'
-import { type UkAddressState } from '~/src/server/plugins/engine/components/UkAddressField.js'
-import { type Component } from '~/src/server/plugins/engine/components/helpers/components.js'
+import { FormComponent } from './components/FormComponent.js'
+import { type UkAddressState } from './components/UkAddressField.js'
+import { type Component } from './components/helpers/components.js'
 import {
   type FileUploadField,
   type PaymentField
-} from '~/src/server/plugins/engine/components/index.js'
+} from './components/index.js'
 import {
   type BackLink,
   type ComponentText,
@@ -30,32 +30,37 @@ import {
   type EastingNorthingState,
   type LatLongState,
   type MonthYearState
-} from '~/src/server/plugins/engine/components/types.js'
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
-import { type DetailItemField } from '~/src/server/plugins/engine/models/types.js'
-import { type PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js'
-import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'
-import { type QuestionPageController } from '~/src/server/plugins/engine/pageControllers/index.js'
+} from './components/types.js'
+import { type FormModel } from './models/index.js'
+import { type DetailItemField } from './models/types.js'
+import { type PageController } from './pageControllers/PageController.js'
+import { type PageControllerClass } from './pageControllers/helpers/pages.js'
+import { type QuestionPageController } from './pageControllers/index.js'
 import {
   type FileStatus,
   type FormAdapterSubmissionSchemaVersion,
   type UploadStatus
-} from '~/src/server/plugins/engine/types/enums.js'
-import { type ViewContext } from '~/src/server/plugins/nunjucks/types.js'
+} from './types/enums.js'
+import { type ViewContext } from '../nunjucks/types.js'
 import {
   type FormAction,
   type FormRequest,
   type FormRequestPayload,
   type FormResponseToolkit,
   type FormStatus
-} from '~/src/server/routes/types.js'
-import { type CacheService } from '~/src/server/services/cacheService.js'
-import { type RequestOptions } from '~/src/server/services/httpService.js'
-import { type Services } from '~/src/server/types.js'
+} from '../../routes/types.js'
+import { type CacheService } from '../../services/cacheService.js'
+import { type RequestOptions } from '../../services/httpService.js'
+import { type Services } from '../../types.js'
 
 export type AnyFormRequest = FormRequest | FormRequestPayload
 export type AnyRequest = Request | AnyFormRequest
 
+export interface CacheRequest {
+  yar: { id: string | undefined }
+  params: { slug?: string; state?: string }
+}
+
 /**
  * Form submission state stores the following in Redis:
  * Props containing user's submitted values as `{ [inputId]: value }` or as `{ [sectionName]: { [inputName]: value } }`
@@ -224,7 +229,7 @@ export interface UploadInitiateResponse {
 export {
   FileStatus,
   UploadStatus
-} from '~/src/server/plugins/engine/types/enums.js'
+} from './types/enums.js'
 
 export type UploadState = FileState[]
 

package/src/server/plugins/engine/validationHelpers.ts

@@ -1,11 +1,11 @@
 import { type ResponseObject } from '@hapi/hapi'
 
-import * as Components from '~/src/server/plugins/engine/components/index.js'
+import * as Components from './components/index.js'
 import {
   type FormRequestPayload,
   type FormResponseToolkit
-} from '~/src/server/plugins/engine/types/index.js'
-import { type ExternalArgs } from '~/src/server/plugins/engine/types.js'
+} from './types/index.js'
+import { type ExternalArgs } from './types.js'
 
 // Type guard for ExternalComponent
 export function isExternalComponent(

package/src/server/plugins/engine/vision.ts

@@ -11,9 +11,9 @@ import {
   VIEW_PATH,
   context,
   prepareNunjucksEnvironment
-} from '~/src/server/plugins/engine/index.js'
-import { type PluginOptions } from '~/src/server/plugins/engine/types.js'
-import { VIEW_PATH as POSTCODE_LOOKUP_VIEW_PATH } from '~/src/server/plugins/postcode-lookup/index.js'
+} from './index.js'
+import { type PluginOptions } from './types.js'
+import { VIEW_PATH as POSTCODE_LOOKUP_VIEW_PATH } from '../postcode-lookup/index.js'
 
 export async function registerVision(
   server: Server,

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

@@ -1,4 +1,4 @@
-import { getRoutes } from '~/src/server/plugins/map/routes/index.js'
+import { getRoutes } from './routes/index.js'
 
 /**
  * @satisfies {NamedPlugin<MapConfiguration>}
@@ -15,5 +15,5 @@ export const mapPlugin = {
 
 /**
  * @import { NamedPlugin } from '@hapi/hapi'
- * @import { MapConfiguration } from '~/src/server/plugins/map/types.js'
+ * @import { MapConfiguration } from './types.js'
  */