@defra/forms-model 3.0.480 → 3.0.482

package/src/form/form-editor/types.ts

@@ -357,13 +357,15 @@ export type FormEditorInputQuestionDetails = Pick<
   | 'jsEnabled'
 >
 
+type ListValue = string | boolean | number
+
 export interface ListItem {
   id?: string
   text?: string
   hint?: {
     text: string
   }
-  value?: string | boolean
+  value?: ListValue
 }
 
 export interface ListLabel {
@@ -374,7 +376,7 @@ export interface ListLabel {
 export interface ListElement extends ListItem {
   readonly id: string
   text: string
-  value: string | boolean
+  value: ListValue
   label?: ListLabel
 }
 
@@ -385,7 +387,7 @@ export interface ReadonlyHint {
 export interface ListItemReadonly extends ListElement {
   readonly text: string
   readonly hint?: ReadonlyHint
-  readonly value: string | boolean
+  readonly value: ListValue
   readonly label?: ListLabel
 }
 
@@ -401,7 +403,7 @@ export interface QuestionSessionState {
     radioId?: string
     radioText?: string
     radioHint?: string
-    radioValue?: string | boolean
+    radioValue?: ListValue
     expanded?: boolean
   }
   listItems?: ListItem[]

package/src/form/form-metadata/index.ts

@@ -120,12 +120,9 @@ export const privacyNoticeUrlSchema = Joi.string()
   .description('URL to the privacy notice for this form')
 
 export const notificationEmailAddressSchema = Joi.string()
-  .email({ tlds: { allow: ['uk'] } })
+  .email()
   .trim()
-  .pattern(/\.gov\.uk$|\.org\.uk$/)
-  .description(
-    'Email address to receive form submission notifications, must be a .gov.uk or .org.uk address'
-  )
+  .description('Email address to receive form submission notifications')
 
 export const authoredAtSchema = Joi.date()
   .iso()

package/src/form/utils/index.ts

@@ -1 +1,2 @@
 export { findStartPage } from '~/src/form/utils/find-start-page.js'
+export { findDefinitionListFromComponent } from '~/src/form/utils/list.js'

package/src/form/utils/list.ts

@@ -0,0 +1,25 @@
+import { type ListComponentsDef } from '~/src/components/types.js'
+import {
+  type FormDefinition,
+  type List
+} from '~/src/form/form-definition/types.js'
+
+/**
+ * Given a SelectionComponent finds the associated list
+ * @param {ListComponentsDef} selectionComponent
+ * @param {FormDefinition} definition
+ * @returns {List}
+ */
+export function findDefinitionListFromComponent(
+  selectionComponent: ListComponentsDef,
+  definition: FormDefinition
+): List {
+  const listId = selectionComponent.list
+  const list = definition.lists.find((list) => list.id === listId)
+
+  if (list === undefined) {
+    throw new Error('List not found')
+  }
+
+  return list
+}

package/src/index.ts

@@ -29,3 +29,4 @@ export type * from '~/src/form/form-metadata/types.js'
 export type * from '~/src/form/form-submission/types.js'
 export type * from '~/src/form/form-editor/preview/types.js'
 export type * from '~/src/form/form-editor/types.js'
+export type * from '~/src/form/form-editor/macros/types.js'

package/src/stubs.ts

@@ -10,3 +10,4 @@ export { buildRepeaterPage } from '~/src/__stubs__/pages.js'
 export { buildFileUploadPage } from '~/src/__stubs__/pages.js'
 export { buildSummaryPage } from '~/src/__stubs__/pages.js'
 export { buildQuestionPage } from '~/src/__stubs__/pages.js'
+export { buildMarkdownComponent } from '~/src/__stubs__/components.js'