@defra/forms-engine-plugin 0.1.8 → 0.1.10

package/src/server/plugins/engine/components/CheckboxesField.test.ts

@@ -240,7 +240,7 @@ describe.each([
       it.each([...options.examples])(
         'returns text from state (single)',
         (item) => {
-          const state1 = getFormState([item.state])
+          const state1 = getFormState([item.value])
           const state2 = getFormState(null)
 
           const answer1 = getAnswer(field, state1)
@@ -260,7 +260,7 @@ describe.each([
         const item1 = options.examples[0]
         const item2 = options.examples[2]
 
-        const state = getFormState([item1.state, item2.state])
+        const state = getFormState([item1.value, item2.value])
         const answer = getAnswer(field, state)
 
         expect(answer).toBe(outdent`
@@ -272,7 +272,7 @@ describe.each([
       })
 
       it.each([...options.examples])('returns payload from state', (item) => {
-        const state1 = getFormState([item.state])
+        const state1 = getFormState([item.value])
         const state2 = getFormState(null)
 
         const payload1 = field.getFormDataFromState(state1)
@@ -283,7 +283,7 @@ describe.each([
       })
 
       it.each([...options.examples])('returns value from state', (item) => {
-        const state1 = getFormState([item.state])
+        const state1 = getFormState([item.value])
         const state2 = getFormState(null)
 
         const value1 = field.getFormValueFromState(state1)
@@ -296,13 +296,13 @@ describe.each([
       it.each([...options.examples])(
         'returns context for conditions and form submission',
         (item) => {
-          const state1 = getFormState([item.state])
+          const state1 = getFormState([item.value])
           const state2 = getFormState(null)
 
           const value1 = field.getContextValueFromState(state1)
           const value2 = field.getContextValueFromState(state2)
 
-          expect(value1).toEqual([item.state])
+          expect(value1).toEqual([item.value])
           expect(value2).toEqual([])
         }
       )
@@ -314,7 +314,7 @@ describe.each([
         const value1 = field.getStateFromValidForm(payload1)
         const value2 = field.getStateFromValidForm(payload2)
 
-        expect(value1).toEqual(getFormState([item.state]))
+        expect(value1).toEqual(getFormState([item.value]))
         expect(value2).toEqual(getFormState(null))
       })
     })

package/src/server/plugins/engine/components/List.test.ts

@@ -52,18 +52,21 @@ describe('List', () => {
       it('returns list items', () => {
         expect(guidance).toHaveProperty('items', [
           {
+            id: '52fc51fc-c75a-4b08-9c9e-6bd99b9bc49b',
             text: '1 day',
             value: 1,
             description:
               'Valid for 24 hours from the start time that you select'
           },
           {
+            id: '56b7b34f-23b3-4446-ac8e-b2443d18588e',
             text: '8 day',
             value: 8,
             description:
               'Valid for 8 consecutive days from the start time that you select'
           },
           {
+            id: '1af54fbc-eec2-4e1e-bd53-2415abf62677',
             text: '12 months',
             value: 365,
             description:

package/src/server/plugins/engine/components/RadiosField.test.ts

@@ -170,7 +170,7 @@ describe.each([
 
     describe('State', () => {
       it.each([...options.examples])('returns text from state', (item) => {
-        const state1 = getFormState(item.state)
+        const state1 = getFormState(item.value)
         const state2 = getFormState(null)
 
         const answer1 = getAnswer(field, state1)
@@ -181,7 +181,7 @@ describe.each([
       })
 
       it.each([...options.examples])('returns payload from state', (item) => {
-        const state1 = getFormState(item.state)
+        const state1 = getFormState(item.value)
         const state2 = getFormState(null)
 
         const payload1 = field.getFormDataFromState(state1)
@@ -192,7 +192,7 @@ describe.each([
       })
 
       it.each([...options.examples])('returns value from state', (item) => {
-        const state1 = getFormState(item.state)
+        const state1 = getFormState(item.value)
         const state2 = getFormState(null)
 
         const value1 = field.getFormValueFromState(state1)
@@ -205,7 +205,7 @@ describe.each([
       it.each([...options.examples])(
         'returns context for conditions and form submission',
         (item) => {
-          const state1 = getFormState(item.state)
+          const state1 = getFormState(item.value)
           const state2 = getFormState(null)
 
           const value1 = field.getContextValueFromState(state1)
@@ -223,7 +223,7 @@ describe.each([
         const value1 = field.getStateFromValidForm(payload1)
         const value2 = field.getStateFromValidForm(payload2)
 
-        expect(value1).toEqual(getFormState(item.state))
+        expect(value1).toEqual(getFormState(item.value))
         expect(value2).toEqual(getFormState(null))
       })
     })

package/src/server/plugins/engine/components/SelectField.test.ts

@@ -171,7 +171,7 @@ describe.each([
 
     describe('State', () => {
       it.each([...options.examples])('returns text from state', (item) => {
-        const state1 = getFormState(item.state)
+        const state1 = getFormState(item.value)
         const state2 = getFormState(null)
 
         const answer1 = getAnswer(field, state1)
@@ -182,7 +182,7 @@ describe.each([
       })
 
       it.each([...options.examples])('returns payload from state', (item) => {
-        const state1 = getFormState(item.state)
+        const state1 = getFormState(item.value)
         const state2 = getFormState(null)
 
         const payload1 = field.getFormDataFromState(state1)
@@ -193,7 +193,7 @@ describe.each([
       })
 
       it.each([...options.examples])('returns value from state', (item) => {
-        const state1 = getFormState(item.state)
+        const state1 = getFormState(item.value)
         const state2 = getFormState(null)
 
         const value1 = field.getFormValueFromState(state1)
@@ -206,7 +206,7 @@ describe.each([
       it.each([...options.examples])(
         'returns context for conditions and form submission',
         (item) => {
-          const state1 = getFormState(item.state)
+          const state1 = getFormState(item.value)
           const state2 = getFormState(null)
 
           const value1 = field.getContextValueFromState(state1)
@@ -224,7 +224,7 @@ describe.each([
         const value1 = field.getStateFromValidForm(payload1)
         const value2 = field.getStateFromValidForm(payload2)
 
-        expect(value1).toEqual(getFormState(item.state))
+        expect(value1).toEqual(getFormState(item.value))
         expect(value2).toEqual(getFormState(null))
       })
     })

package/src/server/plugins/engine/pageControllers/QuestionPageController.test.ts

@@ -443,6 +443,7 @@ describe('QuestionPageController', () => {
       expect(filtered[1].model.label?.text).toBe('Select from the list')
       expect(filtered[1].model.items).toEqual([
         {
+          id: expect.any(String),
           checked: false,
           condition: 'isBarnOwl',
           selected: false,
@@ -450,6 +451,7 @@ describe('QuestionPageController', () => {
           value: '1'
         },
         {
+          id: expect.any(String),
           checked: false,
           condition: 'isBarnOwl',
           selected: false,
@@ -499,6 +501,7 @@ describe('QuestionPageController', () => {
       expect(filtered[1].model.label?.text).toBe('Select from the list')
       expect(filtered[1].model.items).toEqual([
         {
+          id: expect.any(String),
           checked: false,
           condition: 'notBarnOwl',
           selected: false,
@@ -506,6 +509,7 @@ describe('QuestionPageController', () => {
           value: '3'
         },
         {
+          id: expect.any(String),
           checked: false,
           condition: 'notBarnOwl',
           selected: false,

package/src/server/utils/file-form-service.js

@@ -0,0 +1,144 @@
+import fs from 'fs/promises'
+import path from 'node:path'
+
+import YAML from 'yaml'
+
+/**
+ * FileFormService class
+ */
+export class FileFormService {
+  /**
+   * The map of form metadatas by slug
+   * @type {Map<string, FormMetadata>}
+   */
+  #metadata = new Map()
+
+  /**
+   * The map of form definitions by id
+   * @type {Map<string, FormDefinition>}
+   */
+  #definition = new Map()
+
+  /**
+   * Add form from a file
+   * @param {string} filepath - the file path
+   * @param {FormMetadata} metadata - the metadata to use for this form
+   * @returns {Promise<FormDefinition>}
+   */
+  async addForm(filepath, metadata) {
+    const definition = await this.readForm(filepath)
+
+    this.#metadata.set(metadata.slug, metadata)
+    this.#definition.set(metadata.id, definition)
+
+    return definition
+  }
+
+  /**
+   * Read the form definition from file
+   * @param {string} filepath - the file path
+   * @returns {Promise<FormDefinition>}
+   */
+  async readForm(filepath) {
+    const ext = path.extname(filepath).toLowerCase()
+
+    switch (ext) {
+      case '.json':
+        return this.readJsonForm(filepath)
+      case '.yaml':
+        return this.readYamlForm(filepath)
+      default:
+        throw new Error(`Invalid file extension '${ext}'`)
+    }
+  }
+
+  /**
+   * Read the form definition from a json file
+   * @param {string} filepath - the file path
+   * @returns {Promise<FormDefinition>}
+   */
+  async readJsonForm(filepath) {
+    /**
+     * @type {FormDefinition}
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const definition = JSON.parse(await fs.readFile(filepath, 'utf8'))
+
+    return definition
+  }
+
+  /**
+   * Read the form definition from a yaml file
+   * @param {string} filepath - the file path
+   * @returns {Promise<FormDefinition>}
+   */
+  async readYamlForm(filepath) {
+    /**
+     * @type {FormDefinition}
+     */
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const definition = YAML.parse(await fs.readFile(filepath, 'utf8'))
+
+    return definition
+  }
+
+  /**
+   * Get the form metadata by slug
+   * @param {string} slug - the form slug
+   * @returns {FormMetadata}
+   */
+  getFormMetadata(slug) {
+    const metadata = this.#metadata.get(slug)
+
+    if (!metadata) {
+      throw new Error(`Form metadata '${slug}' not found`)
+    }
+
+    return metadata
+  }
+
+  /**
+   * Get the form defintion by id
+   * @param {string} id - the form id
+   * @returns {FormDefinition}
+   */
+  getFormDefinition(id) {
+    const definition = this.#definition.get(id)
+
+    if (!definition) {
+      throw new Error(`Form definition '${id}' not found`)
+    }
+
+    return definition
+  }
+
+  /**
+   * Returns a FormsService compliant interface
+   * @returns {import('~/src/server/types.js').FormsService}
+   */
+  toFormsService() {
+    return {
+      /**
+       * Get the form metadata by slug
+       * @param {string} slug
+       * @returns {Promise<FormMetadata>}
+       */
+      getFormMetadata: (slug) => {
+        return Promise.resolve(this.getFormMetadata(slug))
+      },
+
+      /**
+       * Get the form defintion by id
+       * @param {string} id
+       * @returns {Promise<FormDefinition>}
+       */
+      getFormDefinition: (id) => {
+        return Promise.resolve(this.getFormDefinition(id))
+      }
+    }
+  }
+}
+
+/**
+ * @import { FormMetadata, FormDefinition } from '@defra/forms-model'
+ */

package/src/server/utils/file-form-service.test.js

@@ -0,0 +1,79 @@
+import { FormStatus } from '~/src/server/routes/types.js'
+import { FileFormService } from '~/src/server/utils/file-form-service.js'
+
+// Create the metadata which is shared for all forms
+const now = new Date()
+const user = { id: 'user', displayName: 'Username' }
+const author = {
+  createdAt: now,
+  createdBy: user,
+  updatedAt: now,
+  updatedBy: user
+}
+
+const metadata = {
+  id: '95e92559-968d-44ae-8666-2b1ad3dffd31',
+  slug: 'example-form',
+  title: 'Example form',
+  organisation: 'Defra',
+  teamName: 'Team name',
+  teamEmail: 'team@defra.gov.uk',
+  submissionGuidance: "Thanks for your submission, we'll be in touch",
+  notificationEmail: 'email@domain.com',
+  ...author,
+  live: author
+}
+
+describe('File Form Service', () => {
+  it('should load JSON files from disk', async () => {
+    const loader = new FileFormService()
+
+    const definition = await loader.addForm(
+      'src/server/forms/test.json',
+      metadata
+    )
+
+    const formsService = loader.toFormsService()
+    expect(await formsService.getFormMetadata(metadata.slug)).toBe(metadata)
+    expect(
+      await formsService.getFormDefinition(metadata.id, FormStatus.Draft)
+    ).toBe(definition)
+
+    expect(() => loader.getFormMetadata('invalid-slug')).toThrow(
+      "Form metadata 'invalid-slug' not found"
+    )
+    expect(() => loader.getFormDefinition('invalid-id')).toThrow(
+      "Form definition 'invalid-id' not found"
+    )
+  })
+
+  it('should load YAML files from disk', async () => {
+    const loader = new FileFormService()
+
+    const definition = await loader.addForm(
+      'src/server/forms/test.yaml',
+      metadata
+    )
+
+    const formsService = loader.toFormsService()
+    expect(await formsService.getFormMetadata(metadata.slug)).toBe(metadata)
+    expect(
+      await formsService.getFormDefinition(metadata.id, FormStatus.Draft)
+    ).toBe(definition)
+
+    expect(() => loader.getFormMetadata('invalid-slug')).toThrow(
+      "Form metadata 'invalid-slug' not found"
+    )
+    expect(() => loader.getFormDefinition('invalid-id')).toThrow(
+      "Form definition 'invalid-id' not found"
+    )
+  })
+
+  it("should throw if the file isn't JSON or YAML", async () => {
+    const loader = new FileFormService()
+
+    await expect(
+      loader.addForm('src/server/forms/test.txt', metadata)
+    ).rejects.toThrow("Invalid file extension '.txt'")
+  })
+})