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

package/.server/server/plugins/engine/pageControllers/PageController.d.ts

@@ -1,11 +1,11 @@
 import { type Events, type FormDefinition, type Page, type Section } from '@defra/forms-model';
 import { type Lifecycle, type RouteOptions, type Server } from '@hapi/hapi';
-import { type ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js';
-import { type FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js';
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js';
-import { type ExecutableCondition } from '~/src/server/plugins/engine/models/types.js';
-import { type FormContext, type PageViewModelBase } from '~/src/server/plugins/engine/types.js';
-import { type FormRequest, type FormRequestPayload, type FormRequestPayloadRefs, type FormRequestRefs, type FormResponseToolkit } from '~/src/server/routes/types.js';
+import { type ComponentCollection } from '../../../../server/plugins/engine/components/ComponentCollection.js';
+import { type FormComponent } from '../../../../server/plugins/engine/components/FormComponent.js';
+import { type FormModel } from '../../../../server/plugins/engine/models/index.js';
+import { type ExecutableCondition } from '../../../../server/plugins/engine/models/types.js';
+import { type FormContext, type PageViewModelBase } from '../../../../server/plugins/engine/types.js';
+import { type FormRequest, type FormRequestPayload, type FormRequestPayloadRefs, type FormRequestRefs, type FormResponseToolkit } from '../../../../server/routes/types.js';
 export declare class PageController {
     /**
      * The base class for all page controllers. Page controllers are responsible for generating the get and post route handlers when a user navigates to `/{id}/{path*}`.

package/.server/server/plugins/engine/pageControllers/QuestionPageController.d.ts

@@ -1,12 +1,12 @@
 import { type Link, type Page } from '@defra/forms-model';
 import { type RouteOptions } from '@hapi/hapi';
 import { type ValidationErrorItem } from 'joi';
-import { ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js';
-import { type BackLink } from '~/src/server/plugins/engine/components/types.js';
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js';
-import { PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js';
-import { type AnyFormRequest, type FormContext, type FormContextRequest, type FormPageViewModel, type FormPayload, type FormPayloadParams, type FormState, type FormStateValue, type FormSubmissionState } from '~/src/server/plugins/engine/types.js';
-import { type FormRequest, type FormRequestPayload, type FormRequestPayloadRefs, type FormRequestRefs, type FormResponseToolkit } from '~/src/server/routes/types.js';
+import { ComponentCollection } from '../../../../server/plugins/engine/components/ComponentCollection.js';
+import { type BackLink } from '../../../../server/plugins/engine/components/types.js';
+import { type FormModel } from '../../../../server/plugins/engine/models/index.js';
+import { PageController } from '../../../../server/plugins/engine/pageControllers/PageController.js';
+import { type AnyFormRequest, type FormContext, type FormContextRequest, type FormPageViewModel, type FormPayload, type FormPayloadParams, type FormState, type FormStateValue, type FormSubmissionState } from '../../../../server/plugins/engine/types.js';
+import { type FormRequest, type FormRequestPayload, type FormRequestPayloadRefs, type FormRequestRefs, type FormResponseToolkit } from '../../../../server/routes/types.js';
 export declare class QuestionPageController extends PageController {
     collection: ComponentCollection;
     errorSummaryTitle: string;
@@ -35,11 +35,11 @@ export declare class QuestionPageController extends PageController {
      */
     getFormParams(request?: FormContextRequest): FormPayloadParams;
     getStateFromValidForm(request: FormContextRequest, state: FormSubmissionState, payload: FormPayload): FormState;
-    getErrors(details?: ValidationErrorItem[]): import("~/src/server/plugins/engine/types.js").FormSubmissionError[] | undefined;
+    getErrors(details?: ValidationErrorItem[]): import("../../../../server/plugins/engine/types.js").FormSubmissionError[] | undefined;
     getState(request: AnyFormRequest): Promise<FormSubmissionState>;
     setState(request: AnyFormRequest, state: FormSubmissionState): Promise<FormSubmissionState>;
     mergeState(request: AnyFormRequest, state: FormSubmissionState, update: object): Promise<FormSubmissionState>;
-    filterConditionalComponents(viewModel: FormPageViewModel, model: FormModel, evaluationState: Partial<Record<string, FormStateValue>>): import("~/src/server/plugins/engine/components/types.js").ComponentViewModel[];
+    filterConditionalComponents(viewModel: FormPageViewModel, model: FormModel, evaluationState: Partial<Record<string, FormStateValue>>): import("../../../../server/plugins/engine/components/types.js").ComponentViewModel[];
     makeGetRouteHandler(): (request: FormRequest, context: FormContext, h: FormResponseToolkit) => Promise<import("@hapi/hapi").ResponseObject>;
     hasMissingNotificationEmail(request: FormRequest, context: FormContext): Promise<boolean>;
     /**

package/.server/server/plugins/engine/pageControllers/RepeatPageController.d.ts

@@ -1,8 +1,8 @@
 import { type PageRepeat, type Repeat } from '@defra/forms-model';
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js';
-import { QuestionPageController } from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js';
-import { type FormContext, type FormContextRequest, type FormPageViewModel, type FormPayload, type FormSubmissionState, type RepeatItemState, type RepeatListState, type RepeaterSummaryPageViewModel } from '~/src/server/plugins/engine/types.js';
-import { FormAction, type FormRequest, type FormRequestPayload, type FormResponseToolkit } from '~/src/server/routes/types.js';
+import { type FormModel } from '../../../../server/plugins/engine/models/index.js';
+import { QuestionPageController } from '../../../../server/plugins/engine/pageControllers/QuestionPageController.js';
+import { type FormContext, type FormContextRequest, type FormPageViewModel, type FormPayload, type FormSubmissionState, type RepeatItemState, type RepeatListState, type RepeaterSummaryPageViewModel } from '../../../../server/plugins/engine/types.js';
+import { FormAction, type FormRequest, type FormRequestPayload, type FormResponseToolkit } from '../../../../server/routes/types.js';
 export declare class RepeatPageController extends QuestionPageController {
     pageDef: PageRepeat;
     listSummaryViewName: string;
@@ -11,7 +11,7 @@ export declare class RepeatPageController extends QuestionPageController {
     allowSaveAndExit: boolean;
     constructor(model: FormModel, pageDef: PageRepeat);
     get keys(): string[];
-    getFormParams(request?: FormContextRequest): import("~/src/server/plugins/engine/types.js").FormPayloadParams;
+    getFormParams(request?: FormContextRequest): import("../../../../server/plugins/engine/types.js").FormPayloadParams;
     getFormDataFromState(request: FormContextRequest | undefined, state: FormSubmissionState): {
         action?: FormAction;
         confirm?: true;

package/.server/server/plugins/engine/pageControllers/StartPageController.d.ts

@@ -1,6 +1,6 @@
-import { QuestionPageController } from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js';
-import { type FormContext } from '~/src/server/plugins/engine/types.js';
-import { type FormRequest } from '~/src/server/routes/types.js';
+import { QuestionPageController } from '../../../../server/plugins/engine/pageControllers/QuestionPageController.js';
+import { type FormContext } from '../../../../server/plugins/engine/types.js';
+import { type FormRequest } from '../../../../server/routes/types.js';
 export declare class StartPageController extends QuestionPageController {
     /**
      * The controller which is used when Page["controller"] is defined as "./pages/start.js"
@@ -12,7 +12,7 @@ export declare class StartPageController extends QuestionPageController {
         isStartPage: boolean;
         components: import("../components/types.js").ComponentViewModel[];
         context: FormContext;
-        errors?: import("~/src/server/plugins/engine/types.js").FormSubmissionError[];
+        errors?: import("../../../../server/plugins/engine/types.js").FormSubmissionError[];
         hasMissingNotificationEmail?: boolean;
         allowSaveAndExit: boolean;
         showSubmitButton?: boolean;

package/.server/server/plugins/engine/pageControllers/StatusPageController.d.ts

@@ -1,8 +1,8 @@
 import { type PageStatus } from '@defra/forms-model';
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js';
-import { QuestionPageController } from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js';
-import { type FormContext } from '~/src/server/plugins/engine/types.js';
-import { type FormRequest, type FormResponseToolkit } from '~/src/server/routes/types.js';
+import { type FormModel } from '../../../../server/plugins/engine/models/index.js';
+import { QuestionPageController } from '../../../../server/plugins/engine/pageControllers/QuestionPageController.js';
+import { type FormContext } from '../../../../server/plugins/engine/types.js';
+import { type FormRequest, type FormResponseToolkit } from '../../../../server/routes/types.js';
 export declare class StatusPageController extends QuestionPageController {
     pageDef: PageStatus;
     allowSaveAndExit: boolean;

package/.server/server/plugins/engine/pageControllers/SummaryPageController.d.ts

@@ -1,10 +1,10 @@
 import { type FormMetadata, type Page } from '@defra/forms-model';
 import { type RouteOptions } from '@hapi/hapi';
-import { SummaryViewModel, type FormModel } from '~/src/server/plugins/engine/models/index.js';
-import { type Detail, type DetailItem } from '~/src/server/plugins/engine/models/types.js';
-import { QuestionPageController } from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js';
-import { type FormContext, type FormContextRequest } from '~/src/server/plugins/engine/types.js';
-import { type FormRequest, type FormRequestPayload, type FormRequestPayloadRefs, type FormResponseToolkit } from '~/src/server/routes/types.js';
+import { SummaryViewModel, type FormModel } from '../../../../server/plugins/engine/models/index.js';
+import { type Detail, type DetailItem } from '../../../../server/plugins/engine/models/types.js';
+import { QuestionPageController } from '../../../../server/plugins/engine/pageControllers/QuestionPageController.js';
+import { type FormContext, type FormContextRequest } from '../../../../server/plugins/engine/types.js';
+import { type FormRequest, type FormRequestPayload, type FormRequestPayloadRefs, type FormResponseToolkit } from '../../../../server/routes/types.js';
 export declare class SummaryPageController extends QuestionPageController {
     pageDef: Page;
     allowSaveAndExit: boolean;

package/.server/server/plugins/engine/pageControllers/TerminalPageController.d.ts

@@ -1,8 +1,8 @@
 import { type PageTerminal } from '@defra/forms-model';
 import { type ResponseObject } from '@hapi/hapi';
-import { QuestionPageController } from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js';
-import { type FormContext } from '~/src/server/plugins/engine/types.js';
-import { type FormRequestPayload, type FormResponseToolkit } from '~/src/server/routes/types.js';
+import { QuestionPageController } from '../../../../server/plugins/engine/pageControllers/QuestionPageController.js';
+import { type FormContext } from '../../../../server/plugins/engine/types.js';
+import { type FormRequestPayload, type FormResponseToolkit } from '../../../../server/routes/types.js';
 export declare class TerminalPageController extends QuestionPageController {
     pageDef: PageTerminal;
     allowSaveAndExit: boolean;

package/.server/server/plugins/engine/pageControllers/__stubs__/request.d.ts

@@ -1,4 +1,4 @@
-import { type FormContextRequest } from '~/src/server/plugins/engine/types.js';
-import { type FormRequest } from '~/src/server/routes/types.js';
+import { type FormContextRequest } from '../../../../../server/plugins/engine/types.js';
+import { type FormRequest } from '../../../../../server/routes/types.js';
 export declare function buildFormRequest(request: Omit<FormRequest, 'server' | 'yar'>): FormRequest;
 export declare function buildFormContextRequest(request: Omit<FormContextRequest, 'server' | 'yar'>): FormContextRequest;

package/.server/server/plugins/engine/pageControllers/errors.d.ts

@@ -1,4 +1,4 @@
-import { type FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js';
+import { type FormComponent } from '../../../../server/plugins/engine/components/FormComponent.js';
 export declare enum PaymentErrorTypes {
     PaymentExpired = "PaymentExpired",
     PaymentIncomplete = "PaymentIncomplete",

package/.server/server/plugins/engine/pageControllers/helpers/pages.d.ts

@@ -1,6 +1,6 @@
 import { type Page } from '@defra/forms-model';
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js';
-import * as PageControllers from '~/src/server/plugins/engine/pageControllers/index.js';
+import { type FormModel } from '../../../../../server/plugins/engine/models/index.js';
+import * as PageControllers from '../../../../../server/plugins/engine/pageControllers/index.js';
 export type PageControllerClass = InstanceType<PageControllerType>;
 export type PageControllerType = (typeof PageControllers)[keyof typeof PageControllers];
 /**

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

@@ -1,13 +1,13 @@
-import { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js';
-import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js';
-import { type AnyFormRequest, type FormContext } from '~/src/server/plugins/engine/types.js';
-import { type FormQuery } from '~/src/server/routes/types.js';
+import { type FormModel } from '../../../../../server/plugins/engine/models/FormModel.js';
+import { type PageControllerClass } from '../../../../../server/plugins/engine/pageControllers/helpers/pages.js';
+import { type AnyFormRequest, type FormContext } from '../../../../../server/plugins/engine/types.js';
+import { type FormQuery } from '../../../../../server/routes/types.js';
 export declare function stripParam(query: FormQuery, paramToRemove: string): FormQuery | undefined;
 /**
  * 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 declare function prefillStateFromQueryParameters(request: AnyFormRequest, page: PageControllerClass): Promise<boolean>;
 /**

package/.server/server/plugins/engine/pageControllers/helpers/state.js

@@ -34,7 +34,7 @@ export function stripParam(query, paramToRemove) {
  * 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, page) {
   const {

package/.server/server/plugins/engine/pageControllers/helpers/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","names":["ControllerType","getHiddenFields","getCacheService","CURRENT_PAGE_PATH_KEY","STATE_NOT_YET_VALIDATED","isValidUUID","GUID_LENGTH","paramLookupFunctions","formId","val","services","formTitle","meta","formsService","getFormMetadataById","title","key","value","stripParam","query","paramToRemove","params","Object","entries","keys","length","undefined","prefillStateFromQueryParameters","request","page","model","hiddenFieldNames","Set","def","map","field","name","size","has","lookupFunc","res","formData","getState","mergeState","checkSaveAndExitRepeater","context","potentiallyInvalidState","state","originalPath","repeaterPaths","pages","filter","controller","Repeat","p","basePath","path","segments","split","lastSegment","at","guidStartIndex","originalPathWithoutGuid","substring","includes","copyNotYetValidatedState","url","pathname","payload","cacheService","server","setState"],"sources":["../../../../../../src/server/plugins/engine/pageControllers/helpers/state.ts"],"sourcesContent":["import { ControllerType, getHiddenFields } from '@defra/forms-model'\n\nimport { getCacheService } from '~/src/server/plugins/engine/helpers.js'\nimport {\n  CURRENT_PAGE_PATH_KEY,\n  STATE_NOT_YET_VALIDATED\n} from '~/src/server/plugins/engine/index.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'\nimport { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'\nimport {\n  type AnyFormRequest,\n  type FormContext,\n  type FormStateValue,\n  type FormValue\n} from '~/src/server/plugins/engine/types.js'\nimport { type FormQuery } from '~/src/server/routes/types.js'\nimport { type Services } from '~/src/server/types.js'\nimport { isValidUUID } from '~/src/server/utils/utils.js'\n\nconst GUID_LENGTH = 36\n\n/**\n * A series of functions that can transform a pre-fill input parameter e.g lookup a form title based on form id\n */\nconst paramLookupFunctions = {\n  formId: async (val: string, services: Services) => {\n    let formTitle\n    if (val) {\n      const meta = await services.formsService.getFormMetadataById(val)\n      formTitle = meta.title\n    }\n    return {\n      key: 'formName',\n      value: formTitle\n    }\n  }\n} as Partial<\n  Record<\n    string,\n    (\n      val: string,\n      services: Services\n    ) => Promise<{ key: string; value: string | undefined }>\n  >\n>\n\nexport function stripParam(query: FormQuery, paramToRemove: string) {\n  const params = {} as Record<string, FormStateValue | undefined>\n  for (const [key, value = ''] of Object.entries(query)) {\n    if (key !== paramToRemove) {\n      params[key] = value\n    }\n  }\n  return Object.keys(params).length ? (params as FormQuery) : undefined\n}\n\n/**\n * Any hidden parameters defined in the FormDefinition may be pre-filled by URL parameter values.\n * Other parameters are ignored for security reasons.\n * @param request\n * @param model\n */\nexport async function prefillStateFromQueryParameters(\n  request: AnyFormRequest,\n  page: PageControllerClass\n): Promise<boolean> {\n  const { model } = page\n\n  const hiddenFieldNames = new Set(\n    getHiddenFields(model.def).map((field) => field.name)\n  )\n\n  if (!hiddenFieldNames.size) {\n    return false\n  }\n\n  // Remove 'returnUrl' param\n  const query = stripParam(request.query, 'returnUrl')\n\n  if (!query) {\n    return false\n  }\n\n  const params = {} as Record<string, FormStateValue | undefined>\n\n  for (const [key, value = ''] of Object.entries(query)) {\n    if (hiddenFieldNames.has(key)) {\n      const lookupFunc = paramLookupFunctions[key]\n      if (lookupFunc) {\n        const res = await lookupFunc(value, model.services)\n        // Store original value and result\n        params[key] = value\n        params[res.key] = res.value\n      } else {\n        params[key] = value\n      }\n    }\n  }\n\n  const formData = await page.getState(request)\n  await page.mergeState(request, formData, params)\n\n  return true\n}\n\n/**\n * Checks whether the save-and-exit finished on a repeater with partial state\n * @param context - the form context\n */\nexport function checkSaveAndExitRepeater(\n  context: FormContext,\n  model: FormModel\n) {\n  const potentiallyInvalidState = context.state[STATE_NOT_YET_VALIDATED] as\n    | Record<string, FormValue>\n    | undefined\n  if (!potentiallyInvalidState) {\n    return\n  }\n\n  const originalPath = potentiallyInvalidState[CURRENT_PAGE_PATH_KEY]\n\n  const repeaterPaths = model.def.pages\n    .filter((page) => page.controller === ControllerType.Repeat)\n    .map((p) => `/${model.basePath}${p.path}/`)\n\n  if (typeof originalPath !== 'string') {\n    return undefined\n  }\n\n  const segments = originalPath.split('/')\n  const lastSegment = segments.at(-1) ?? ''\n\n  if (!isValidUUID(lastSegment)) {\n    return undefined\n  }\n\n  const guidStartIndex = originalPath.length - GUID_LENGTH\n  const originalPathWithoutGuid = originalPath.substring(0, guidStartIndex)\n\n  if (!repeaterPaths.includes(originalPathWithoutGuid)) {\n    return undefined\n  }\n\n  return originalPath\n}\n\n/**\n * Copies any potentially invalid state into the payload, and removes those values from state\n * NOTE - this method has a side-effect on 'context.state' and 'context.payload'\n * @param request - the form request\n * @param context - the form context\n */\nexport async function copyNotYetValidatedState(\n  request: AnyFormRequest,\n  context: FormContext\n) {\n  const potentiallyInvalidState = context.state[STATE_NOT_YET_VALIDATED] as\n    | Record<string, FormValue>\n    | undefined\n  if (!potentiallyInvalidState) {\n    return\n  }\n\n  const originalPath = potentiallyInvalidState[CURRENT_PAGE_PATH_KEY]\n\n  if (originalPath && originalPath === request.url.pathname) {\n    context.payload = {\n      ...context.payload,\n      ...potentiallyInvalidState,\n      [CURRENT_PAGE_PATH_KEY]: undefined\n    }\n\n    // Remove any temporary 'not yet validated' state now it's been copied to the payload\n    if (context.state[STATE_NOT_YET_VALIDATED]) {\n      context.state[STATE_NOT_YET_VALIDATED] = undefined\n    }\n\n    const cacheService = getCacheService(request.server)\n    await cacheService.setState(request, context.state)\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"state.js","names":["ControllerType","getHiddenFields","getCacheService","CURRENT_PAGE_PATH_KEY","STATE_NOT_YET_VALIDATED","isValidUUID","GUID_LENGTH","paramLookupFunctions","formId","val","services","formTitle","meta","formsService","getFormMetadataById","title","key","value","stripParam","query","paramToRemove","params","Object","entries","keys","length","undefined","prefillStateFromQueryParameters","request","page","model","hiddenFieldNames","Set","def","map","field","name","size","has","lookupFunc","res","formData","getState","mergeState","checkSaveAndExitRepeater","context","potentiallyInvalidState","state","originalPath","repeaterPaths","pages","filter","controller","Repeat","p","basePath","path","segments","split","lastSegment","at","guidStartIndex","originalPathWithoutGuid","substring","includes","copyNotYetValidatedState","url","pathname","payload","cacheService","server","setState"],"sources":["../../../../../../src/server/plugins/engine/pageControllers/helpers/state.ts"],"sourcesContent":["import { ControllerType, getHiddenFields } from '@defra/forms-model'\n\nimport { getCacheService } from '~/src/server/plugins/engine/helpers.js'\nimport {\n  CURRENT_PAGE_PATH_KEY,\n  STATE_NOT_YET_VALIDATED\n} from '~/src/server/plugins/engine/index.js'\nimport { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'\nimport { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'\nimport {\n  type AnyFormRequest,\n  type FormContext,\n  type FormStateValue,\n  type FormValue\n} from '~/src/server/plugins/engine/types.js'\nimport { type FormQuery } from '~/src/server/routes/types.js'\nimport { type Services } from '~/src/server/types.js'\nimport { isValidUUID } from '~/src/server/utils/utils.js'\n\nconst GUID_LENGTH = 36\n\n/**\n * A series of functions that can transform a pre-fill input parameter e.g lookup a form title based on form id\n */\nconst paramLookupFunctions = {\n  formId: async (val: string, services: Services) => {\n    let formTitle\n    if (val) {\n      const meta = await services.formsService.getFormMetadataById(val)\n      formTitle = meta.title\n    }\n    return {\n      key: 'formName',\n      value: formTitle\n    }\n  }\n} as Partial<\n  Record<\n    string,\n    (\n      val: string,\n      services: Services\n    ) => Promise<{ key: string; value: string | undefined }>\n  >\n>\n\nexport function stripParam(query: FormQuery, paramToRemove: string) {\n  const params = {} as Record<string, FormStateValue | undefined>\n  for (const [key, value = ''] of Object.entries(query)) {\n    if (key !== paramToRemove) {\n      params[key] = value\n    }\n  }\n  return Object.keys(params).length ? (params as FormQuery) : undefined\n}\n\n/**\n * Any hidden parameters defined in the FormDefinition may be pre-filled by URL parameter values.\n * Other parameters are ignored for security reasons.\n * @param request\n * @param page\n */\nexport async function prefillStateFromQueryParameters(\n  request: AnyFormRequest,\n  page: PageControllerClass\n): Promise<boolean> {\n  const { model } = page\n\n  const hiddenFieldNames = new Set(\n    getHiddenFields(model.def).map((field) => field.name)\n  )\n\n  if (!hiddenFieldNames.size) {\n    return false\n  }\n\n  // Remove 'returnUrl' param\n  const query = stripParam(request.query, 'returnUrl')\n\n  if (!query) {\n    return false\n  }\n\n  const params = {} as Record<string, FormStateValue | undefined>\n\n  for (const [key, value = ''] of Object.entries(query)) {\n    if (hiddenFieldNames.has(key)) {\n      const lookupFunc = paramLookupFunctions[key]\n      if (lookupFunc) {\n        const res = await lookupFunc(value, model.services)\n        // Store original value and result\n        params[key] = value\n        params[res.key] = res.value\n      } else {\n        params[key] = value\n      }\n    }\n  }\n\n  const formData = await page.getState(request)\n  await page.mergeState(request, formData, params)\n\n  return true\n}\n\n/**\n * Checks whether the save-and-exit finished on a repeater with partial state\n * @param context - the form context\n */\nexport function checkSaveAndExitRepeater(\n  context: FormContext,\n  model: FormModel\n) {\n  const potentiallyInvalidState = context.state[STATE_NOT_YET_VALIDATED] as\n    | Record<string, FormValue>\n    | undefined\n  if (!potentiallyInvalidState) {\n    return\n  }\n\n  const originalPath = potentiallyInvalidState[CURRENT_PAGE_PATH_KEY]\n\n  const repeaterPaths = model.def.pages\n    .filter((page) => page.controller === ControllerType.Repeat)\n    .map((p) => `/${model.basePath}${p.path}/`)\n\n  if (typeof originalPath !== 'string') {\n    return undefined\n  }\n\n  const segments = originalPath.split('/')\n  const lastSegment = segments.at(-1) ?? ''\n\n  if (!isValidUUID(lastSegment)) {\n    return undefined\n  }\n\n  const guidStartIndex = originalPath.length - GUID_LENGTH\n  const originalPathWithoutGuid = originalPath.substring(0, guidStartIndex)\n\n  if (!repeaterPaths.includes(originalPathWithoutGuid)) {\n    return undefined\n  }\n\n  return originalPath\n}\n\n/**\n * Copies any potentially invalid state into the payload, and removes those values from state\n * NOTE - this method has a side-effect on 'context.state' and 'context.payload'\n * @param request - the form request\n * @param context - the form context\n */\nexport async function copyNotYetValidatedState(\n  request: AnyFormRequest,\n  context: FormContext\n) {\n  const potentiallyInvalidState = context.state[STATE_NOT_YET_VALIDATED] as\n    | Record<string, FormValue>\n    | undefined\n  if (!potentiallyInvalidState) {\n    return\n  }\n\n  const originalPath = potentiallyInvalidState[CURRENT_PAGE_PATH_KEY]\n\n  if (originalPath && originalPath === request.url.pathname) {\n    context.payload = {\n      ...context.payload,\n      ...potentiallyInvalidState,\n      [CURRENT_PAGE_PATH_KEY]: undefined\n    }\n\n    // Remove any temporary 'not yet validated' state now it's been copied to the payload\n    if (context.state[STATE_NOT_YET_VALIDATED]) {\n      context.state[STATE_NOT_YET_VALIDATED] = undefined\n    }\n\n    const cacheService = getCacheService(request.server)\n    await cacheService.setState(request, context.state)\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -1,5 +1,5 @@
 import { type SubmitPayload } from '@defra/forms-model';
-import { type DetailItem, type DetailItemField } from '~/src/server/plugins/engine/models/types.js';
+import { type DetailItem, type DetailItemField } from '../../../../../server/plugins/engine/models/types.js';
 export interface SubmitRecord {
     name: string;
     title: string;

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

@@ -1,8 +1,8 @@
-export { StartPageController } from '~/src/server/plugins/engine/pageControllers/StartPageController.js';
+export { StartPageController } from '../../../../server/plugins/engine/pageControllers/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';
+QuestionPageController as PageController } from '../../../../server/plugins/engine/pageControllers/QuestionPageController.js';
+export { TerminalPageController } from '../../../../server/plugins/engine/pageControllers/TerminalPageController.js';
+export { SummaryPageController } from '../../../../server/plugins/engine/pageControllers/SummaryPageController.js';
+export { StatusPageController } from '../../../../server/plugins/engine/pageControllers/StatusPageController.js';
+export { FileUploadPageController } from '../../../../server/plugins/engine/pageControllers/FileUploadPageController.js';
+export { RepeatPageController } from '../../../../server/plugins/engine/pageControllers/RepeatPageController.js';

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

@@ -1,5 +1,5 @@
 import { type Server } from '@hapi/hapi';
-import { type PluginOptions } from '~/src/server/plugins/engine/types.js';
+import { type PluginOptions } from '../../../server/plugins/engine/types.js';
 export declare const plugin: {
     name: string;
     dependencies: string[];

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

@@ -1,4 +1,4 @@
 import { type ResponseToolkit, type ServerRoute } from '@hapi/hapi';
-import { type FormRequest, type FormRequestRefs } from '~/src/server/routes/types.js';
+import { type FormRequest, type FormRequestRefs } from '../../../../server/routes/types.js';
 export declare function getHandler(request: FormRequest, h: Pick<ResponseToolkit, 'response'>): Promise<import("@hapi/hapi").ResponseObject>;
 export declare function getRoutes(): ServerRoute<FormRequestRefs>[];

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

@@ -1,7 +1,7 @@
 import { type ResponseObject, type ResponseToolkit, type Server } from '@hapi/hapi';
-import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js';
-import { type AnyFormRequest, type FormContext, type OnRequestCallback, type PluginOptions } from '~/src/server/plugins/engine/types.js';
-import { type FormRequest, type FormResponseToolkit } from '~/src/server/routes/types.js';
+import { type PageControllerClass } from '../../../../server/plugins/engine/pageControllers/helpers/pages.js';
+import { type AnyFormRequest, type FormContext, type OnRequestCallback, type PluginOptions } from '../../../../server/plugins/engine/types.js';
+import { type FormRequest, type FormResponseToolkit } from '../../../../server/routes/types.js';
 export declare function redirectOrMakeHandler(request: AnyFormRequest, h: FormResponseToolkit, onRequest: OnRequestCallback | undefined, makeHandler: (page: PageControllerClass, context: FormContext) => ResponseObject | Promise<ResponseObject>): Promise<symbol | ResponseObject>;
 export declare function makeLoadFormPreHandler(server: Server, options: PluginOptions): (request: AnyFormRequest, h: ResponseToolkit) => Promise<symbol>;
 export declare function dispatchHandler(request: FormRequest, h: FormResponseToolkit): ResponseObject;

package/.server/server/plugins/engine/routes/payment-helper.d.ts

@@ -33,6 +33,6 @@ export function buildPaymentInfo(action: string, outcome: string, reason: string
  */
 export function convertPenceToPounds(amount: number): string;
 import type { Request } from '@hapi/hapi';
-import type { FormsService } from '~/src/server/types.js';
-import type { PaymentSessionData } from '~/src/server/plugins/payment/types.js';
-import type { GetPaymentResponse } from '~/src/server/plugins/payment/types.js';
+import type { FormsService } from '../../../../server/types.js';
+import type { PaymentSessionData } from '../../../../server/plugins/payment/types.js';
+import type { GetPaymentResponse } from '../../../../server/plugins/payment/types.js';

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

@@ -63,7 +63,7 @@ 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 '../../../../server/plugins/payment/types.js'
+ * @import { FormsService } from '../../../../server/types.js'
  */
 //# sourceMappingURL=payment-helper.js.map

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

@@ -159,10 +159,10 @@ 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 '../../../../server/plugins/payment/types.js'
+ * @import { PaymentState } from '../../../../server/plugins/engine/components/PaymentField.types.js'
+ * @import { ExternalStateAppendage, FormState } from '../../../../server/plugins/engine/types.js'
+ * @import { PluginOptions } from '../../../../server/plugins/engine/types.js'
+ * @import { FormsService } from '../../../../server/types.js'
  */
 //# sourceMappingURL=payment.js.map

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

@@ -182,6 +182,6 @@ describe('Payment routes', () => {
 
 /**
  * @import { Server } from '@hapi/hapi'
- * @import { PaymentResponseState } from '~/src/server/plugins/payment/types.js'
+ * @import { PaymentResponseState } from '../../../../server/plugins/payment/types.js'
  */
 //# sourceMappingURL=payment.test.js.map

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

@@ -1,6 +1,6 @@
 import { type ResponseObject, type RouteOptions, type ServerRoute } from '@hapi/hapi';
-import { type OnRequestCallback, type PreparePageEventRequestOptions } from '~/src/server/plugins/engine/types.js';
-import { type FormRequest, type FormRequestPayload, type FormRequestPayloadRefs, type FormRequestRefs, type FormResponseToolkit } from '~/src/server/routes/types.js';
+import { type OnRequestCallback, type PreparePageEventRequestOptions } from '../../../../server/plugins/engine/types.js';
+import { type FormRequest, type FormRequestPayload, type FormRequestPayloadRefs, type FormRequestRefs, type FormResponseToolkit } from '../../../../server/routes/types.js';
 export declare function makeGetHandler(preparePageEventRequestOptions?: PreparePageEventRequestOptions, onRequest?: OnRequestCallback): (request: FormRequest, h: FormResponseToolkit) => ResponseObject | Promise<symbol | ResponseObject>;
 export declare function makePostHandler(preparePageEventRequestOptions?: PreparePageEventRequestOptions, onRequest?: OnRequestCallback): (request: FormRequestPayload, h: FormResponseToolkit) => Promise<symbol | ResponseObject>;
 export declare function getRoutes(getRouteOptions: RouteOptions<FormRequestRefs>, postRouteOptions: RouteOptions<FormRequestPayloadRefs>, preparePageEventRequestOptions?: PreparePageEventRequestOptions, onRequest?: OnRequestCallback): (ServerRoute<FormRequestRefs> | ServerRoute<FormRequestPayloadRefs>)[];

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

@@ -1,4 +1,4 @@
 import { type RouteOptions, type ServerRoute } from '@hapi/hapi';
-import { type OnRequestCallback } from '~/src/server/plugins/engine/types.js';
-import { type FormRequestPayloadRefs, type FormRequestRefs } from '~/src/server/routes/types.js';
+import { type OnRequestCallback } from '../../../../../server/plugins/engine/types.js';
+import { type FormRequestPayloadRefs, type FormRequestRefs } from '../../../../../server/routes/types.js';
 export declare function getRoutes(getRouteOptions: RouteOptions<FormRequestRefs>, postRouteOptions: RouteOptions<FormRequestPayloadRefs>, onRequest?: OnRequestCallback): (ServerRoute<FormRequestRefs> | ServerRoute<FormRequestPayloadRefs>)[];

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

@@ -1,4 +1,4 @@
 import { type RouteOptions, type ServerRoute } from '@hapi/hapi';
-import { type OnRequestCallback } from '~/src/server/plugins/engine/types.js';
-import { type FormRequestPayloadRefs, type FormRequestRefs } from '~/src/server/routes/types.js';
+import { type OnRequestCallback } from '../../../../../server/plugins/engine/types.js';
+import { type FormRequestPayloadRefs, type FormRequestRefs } from '../../../../../server/routes/types.js';
 export declare function getRoutes(getRouteOptions: RouteOptions<FormRequestRefs>, postRouteOptions: RouteOptions<FormRequestPayloadRefs>, onRequest?: OnRequestCallback): (ServerRoute<FormRequestRefs> | ServerRoute<FormRequestPayloadRefs>)[];

package/.server/server/plugins/engine/services/index.d.ts

@@ -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 "../../../../server/plugins/engine/services/formsService.js";
+export * as formSubmissionService from "../../../../server/plugins/engine/services/formSubmissionService.js";
+export * as outputService from "../../../../server/plugins/engine/services/notifyService.js";

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

@@ -1,8 +1,8 @@
 import { type FormMetadata, type SubmitResponsePayload } from '@defra/forms-model';
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js';
-import { type DetailItem } from '~/src/server/plugins/engine/models/types.js';
-import { type FormContext } from '~/src/server/plugins/engine/types.js';
-import { type FormRequestPayload } from '~/src/server/routes/types.js';
+import { type FormModel } from '../../../../server/plugins/engine/models/index.js';
+import { type DetailItem } from '../../../../server/plugins/engine/models/types.js';
+import { type FormContext } from '../../../../server/plugins/engine/types.js';
+import { type FormRequestPayload } from '../../../../server/routes/types.js';
 /**
  * Optional GOV.UK Notify service for consumers who want email notifications
  * Can be disabled by not providing notifyTemplateId in config

package/.server/server/plugins/engine/services/uploadService.d.ts

@@ -10,5 +10,5 @@ export function initiateUpload(path: string, retrievalKey: string, mimeTypesCsv?
  * @param {string} uploadId - the ID of the upload
  */
 export function getUploadStatus(uploadId: string): Promise<UploadStatusResponse | undefined>;
-import type { UploadInitiateResponse } from '~/src/server/plugins/engine/types.js';
-import type { UploadStatusResponse } from '~/src/server/plugins/engine/types.js';
+import type { UploadInitiateResponse } from '../../../../server/plugins/engine/types.js';
+import type { UploadStatusResponse } from '../../../../server/plugins/engine/types.js';

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

@@ -48,6 +48,6 @@ export async function getUploadStatus(uploadId) {
 }
 
 /**
- * @import { UploadInitiateResponse, UploadStatusResponse } from '~/src/server/plugins/engine/types.js'
+ * @import { UploadInitiateResponse, UploadStatusResponse } from '../../../../server/plugins/engine/types.js'
  */
 //# sourceMappingURL=uploadService.js.map

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

@@ -1,10 +1,10 @@
-export type { AnyFormRequest, AnyRequest, CheckAnswers, ErrorMessageTemplate, ErrorMessageTemplateList, FeaturedFormPageViewModel, FileState, FilterFunction, FormAdapterSubmissionMessage, FormAdapterSubmissionMessageData, FormAdapterSubmissionMessageMeta, FormAdapterSubmissionMessageMetaSerialised, FormAdapterSubmissionMessagePayload, FormAdapterSubmissionService, FormContext, FormContextRequest, FormPageViewModel, FormPayload, FormPayloadParams, FormState, FormStateValue, FormSubmissionError, FormSubmissionState, FormValidationResult, FormValue, GlobalFunction, ItemDeletePageViewModel, OnRequestCallback, PageViewModel, PageViewModelBase, PluginOptions, PreparePageEventRequestOptions, RepeatItemState, RepeatListState, RepeaterSummaryPageViewModel, SummaryList, SummaryListAction, SummaryListRow, TempFileState, UploadInitiateResponse, UploadStatusFileResponse, UploadStatusResponse } from '~/src/server/plugins/engine/types.js';
-export { FileStatus, UploadStatus } from '~/src/server/plugins/engine/types.js';
-export type { Detail, DetailItem, DetailItemBase, DetailItemField, DetailItemRepeat, ExecutableCondition } from '~/src/server/plugins/engine/models/types.js';
-export type { BackLink, ComponentText, ComponentViewModel, Content, DateInputItem, DatePartsState, EastingNorthingState, Label, LatLongState, ListItem, ListItemLabel, MonthYearState, ViewModel } from '~/src/server/plugins/engine/components/types.js';
-export type { UkAddressState } from '~/src/server/plugins/engine/components/UkAddressField.js';
-export type { FormParams, FormQuery, FormRequest, FormRequestPayload, FormRequestPayloadRefs, FormRequestRefs, FormResponseToolkit } from '~/src/server/routes/types.js';
-export { FormAction, FormStatus } from '~/src/server/routes/types.js';
-export type { FormSubmissionService, FormsService, OutputService, RouteConfig, Services } from '~/src/server/types.js';
-export * from '~/src/server/plugins/engine/types/schema.js';
-export { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/enums.js';
+export type { AnyFormRequest, AnyRequest, CheckAnswers, ErrorMessageTemplate, ErrorMessageTemplateList, FeaturedFormPageViewModel, FileState, FilterFunction, FormAdapterSubmissionMessage, FormAdapterSubmissionMessageData, FormAdapterSubmissionMessageMeta, FormAdapterSubmissionMessageMetaSerialised, FormAdapterSubmissionMessagePayload, FormAdapterSubmissionService, FormContext, FormContextRequest, FormPageViewModel, FormPayload, FormPayloadParams, FormState, FormStateValue, FormSubmissionError, FormSubmissionState, FormValidationResult, FormValue, GlobalFunction, ItemDeletePageViewModel, OnRequestCallback, PageViewModel, PageViewModelBase, PluginOptions, PreparePageEventRequestOptions, RepeatItemState, RepeatListState, RepeaterSummaryPageViewModel, SummaryList, SummaryListAction, SummaryListRow, TempFileState, UploadInitiateResponse, UploadStatusFileResponse, UploadStatusResponse } from '../../../../server/plugins/engine/types.js';
+export { FileStatus, UploadStatus } from '../../../../server/plugins/engine/types.js';
+export type { Detail, DetailItem, DetailItemBase, DetailItemField, DetailItemRepeat, ExecutableCondition } from '../../../../server/plugins/engine/models/types.js';
+export type { BackLink, ComponentText, ComponentViewModel, Content, DateInputItem, DatePartsState, EastingNorthingState, Label, LatLongState, ListItem, ListItemLabel, MonthYearState, ViewModel } from '../../../../server/plugins/engine/components/types.js';
+export type { UkAddressState } from '../../../../server/plugins/engine/components/UkAddressField.js';
+export type { FormParams, FormQuery, FormRequest, FormRequestPayload, FormRequestPayloadRefs, FormRequestRefs, FormResponseToolkit } from '../../../../server/routes/types.js';
+export { FormAction, FormStatus } from '../../../../server/routes/types.js';
+export type { FormSubmissionService, FormsService, OutputService, RouteConfig, Services } from '../../../../server/types.js';
+export * from '../../../../server/plugins/engine/types/schema.js';
+export { FormAdapterSubmissionSchemaVersion } from '../../../../server/plugins/engine/types/enums.js';

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

@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import { type FormAdapterSubmissionMessageData, type FormAdapterSubmissionMessageMeta, type FormAdapterSubmissionMessagePayload, type FormAdapterSubmissionMessageResult } from '~/src/server/plugins/engine/types.js';
+import { type FormAdapterSubmissionMessageData, type FormAdapterSubmissionMessageMeta, type FormAdapterSubmissionMessagePayload, type FormAdapterSubmissionMessageResult } from '../../../../server/plugins/engine/types.js';
 export declare const formAdapterSubmissionMessageMetaSchema: Joi.ObjectSchema<FormAdapterSubmissionMessageMeta>;
 export declare const formAdapterSubmissionMessageDataSchema: Joi.ObjectSchema<FormAdapterSubmissionMessageData>;
 export declare const formAdapterSubmissionMessageResultSchema: Joi.ObjectSchema<FormAdapterSubmissionMessageResult>;

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

@@ -1,23 +1,32 @@
 import { type ComponentDef, type Event, type FormVersionMetadata, type Item, type List, type Page, type PaymentFieldComponent, type UkAddressFieldComponent } from '@defra/forms-model';
 import { type PluginProperties, type Request, type ResponseObject } from '@hapi/hapi';
 import { type JoiExpression, type ValidationErrorItem } from 'joi';
-import { type UkAddressState } from '~/src/server/plugins/engine/components/UkAddressField.js';
-import { type Component } from '~/src/server/plugins/engine/components/helpers/components.js';
-import { type FileUploadField, type PaymentField } from '~/src/server/plugins/engine/components/index.js';
-import { type BackLink, type ComponentText, type ComponentViewModel, type DatePartsState, 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';
-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';
-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';
+import { type UkAddressState } from '../../../server/plugins/engine/components/UkAddressField.js';
+import { type Component } from '../../../server/plugins/engine/components/helpers/components.js';
+import { type FileUploadField, type PaymentField } from '../../../server/plugins/engine/components/index.js';
+import { type BackLink, type ComponentText, type ComponentViewModel, type DatePartsState, type EastingNorthingState, type LatLongState, type MonthYearState } from '../../../server/plugins/engine/components/types.js';
+import { type FormModel } from '../../../server/plugins/engine/models/index.js';
+import { type DetailItemField } from '../../../server/plugins/engine/models/types.js';
+import { type PageController } from '../../../server/plugins/engine/pageControllers/PageController.js';
+import { type PageControllerClass } from '../../../server/plugins/engine/pageControllers/helpers/pages.js';
+import { type QuestionPageController } from '../../../server/plugins/engine/pageControllers/index.js';
+import { type FileStatus, type FormAdapterSubmissionSchemaVersion, type UploadStatus } from '../../../server/plugins/engine/types/enums.js';
+import { type ViewContext } from '../../../server/plugins/nunjucks/types.js';
+import { type FormAction, type FormRequest, type FormRequestPayload, type FormResponseToolkit, type FormStatus } from '../../../server/routes/types.js';
+import { type CacheService } from '../../../server/services/cacheService.js';
+import { type RequestOptions } from '../../../server/services/httpService.js';
+import { type Services } from '../../../server/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 } }`
@@ -143,7 +152,7 @@ export interface UploadInitiateResponse {
     uploadUrl: string;
     statusUrl: string;
 }
-export { FileStatus, UploadStatus } from '~/src/server/plugins/engine/types/enums.js';
+export { FileStatus, UploadStatus } from '../../../server/plugins/engine/types/enums.js';
 export type UploadState = FileState[];
 export type FileUpload = {
     fileId: string;