refactor: DF-380 - Move enums to separate types file

src/server/plugins/engine/outputFormatters/adapter/v1.test.ts

@@ -10,9 +10,9 @@ import {
 } from '~/src/server/plugins/engine/models/types.js'
 import { format } from '~/src/server/plugins/engine/outputFormatters/adapter/v1.js'
 import { buildFormContextRequest } from '~/src/server/plugins/engine/pageControllers/__stubs__/request.js'
+import { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/index.js'
 import {
   FileStatus,
-  FormAdapterSubmissionSchemaVersion,
   UploadStatus,
   type FileState,
   type FormAdapterSubmissionMessagePayload

src/server/plugins/engine/outputFormatters/adapter/v1.ts

@@ -7,8 +7,8 @@ import { type checkFormStatus } from '~/src/server/plugins/engine/helpers.js'
 import { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
 import { type DetailItem } from '~/src/server/plugins/engine/models/types.js'
 import { format as machineV2 } from '~/src/server/plugins/engine/outputFormatters/machine/v2.js'
+import { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/enums.js'
 import {
-  FormAdapterSubmissionSchemaVersion,
   type FormAdapterSubmissionMessageData,
   type FormAdapterSubmissionMessagePayload,
   type FormContext

src/server/plugins/engine/types.ts

@@ -21,6 +21,11 @@ import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
 import { type RichFormValue } from '~/src/server/plugins/engine/outputFormatters/machine/v2.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 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,
@@ -190,17 +195,10 @@ export interface UploadInitiateResponse {
   statusUrl: string
 }
 
-export enum UploadStatus {
-  initiated = 'initiated',
-  pending = 'pending',
-  ready = 'ready'
-}
-
-export enum FileStatus {
-  complete = 'complete',
-  rejected = 'rejected',
-  pending = 'pending'
-}
+export {
+  FileStatus,
+  UploadStatus
+} from '~/src/server/plugins/engine/types/enums.js'
 
 export type UploadState = FileState[]
 
@@ -414,10 +412,6 @@ export interface FormAdapterSubmissionMessageData {
   files: Record<string, Record<string, string>[]>
 }
 
-export enum FormAdapterSubmissionSchemaVersion {
-  V1 = 1
-}
-
 export interface FormAdapterSubmissionMessagePayload {
   meta: FormAdapterSubmissionMessageMeta
   data: FormAdapterSubmissionMessageData

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

@@ -0,0 +1,15 @@
+export enum UploadStatus {
+  initiated = 'initiated',
+  pending = 'pending',
+  ready = 'ready'
+}
+
+export enum FileStatus {
+  complete = 'complete',
+  rejected = 'rejected',
+  pending = 'pending'
+}
+
+export enum FormAdapterSubmissionSchemaVersion {
+  V1 = 1
+}

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

@@ -41,11 +41,7 @@ export type {
   UploadStatusResponse
 } from '~/src/server/plugins/engine/types.js'
 
-export {
-  FileStatus,
-  FormAdapterSubmissionSchemaVersion,
-  UploadStatus
-} from '~/src/server/plugins/engine/types.js'
+export { FileStatus, UploadStatus } from '~/src/server/plugins/engine/types.js'
 
 export type {
   Detail,
@@ -94,3 +90,4 @@ export type {
 export type { RichFormValue } from '~/src/server/plugins/engine/outputFormatters/machine/v2.js'
 
 export * from '~/src/server/plugins/engine/types/schema.js'
+export { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/enums.js'

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

@@ -1,12 +1,12 @@
 import { FormStatus } from '@defra/forms-model'
 
+import { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/enums.js'
 import {
   formAdapterSubmissionMessageDataSchema,
   formAdapterSubmissionMessageMetaSchema,
   formAdapterSubmissionMessagePayloadSchema
 } from '~/src/server/plugins/engine/types/schema.js'
 import {
-  FormAdapterSubmissionSchemaVersion,
   type FormAdapterSubmissionMessageData,
   type FormAdapterSubmissionMessageMeta,
   type FormAdapterSubmissionMessagePayload

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

@@ -7,8 +7,8 @@ import {
 } from '@defra/forms-model'
 import Joi from 'joi'
 
+import { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/enums.js'
 import {
-  FormAdapterSubmissionSchemaVersion,
   type FormAdapterSubmissionMessageData,
   type FormAdapterSubmissionMessageMeta,
   type FormAdapterSubmissionMessagePayload