@defra/forms-engine-plugin 4.0.8 → 4.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "description": "Defra forms engine",
   "type": "module",
   "files": [
@@ -70,7 +70,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
-    "@defra/forms-model": "^3.0.574",
+    "@defra/forms-model": "^3.0.575",
     "@defra/hapi-tracing": "^1.26.0",
     "@elastic/ecs-pino-format": "^1.5.0",
     "@hapi/boom": "^10.0.1",

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

@@ -556,10 +556,17 @@ describe('EastingNorthingField', () => {
                 easting: 12345.5,
                 northing: 1234567
               }),
+              // Two errors expected: decimal input triggers both integer validation
+              // and length validation ('12345.5' is 7 chars, max is 6)
               errors: [
                 expect.objectContaining({
                   text: expect.stringMatching(
-                    /Easting for .* must be between 1 and 5 digits/
+                    /Easting for .* must be between 1 and 6 digits/
+                  )
+                }),
+                expect.objectContaining({
+                  text: expect.stringMatching(
+                    /Easting for .* must be between 1 and 6 digits/
                   )
                 })
               ]
@@ -575,7 +582,14 @@ describe('EastingNorthingField', () => {
                 easting: 12345,
                 northing: 1234567.5
               }),
+              // Two errors expected: decimal input triggers both integer validation
+              // and length validation ('1234567.5' is 9 chars, max is 7)
               errors: [
+                expect.objectContaining({
+                  text: expect.stringMatching(
+                    /Northing for .* must be between 1 and 7 digits/
+                  )
+                }),
                 expect.objectContaining({
                   text: expect.stringMatching(
                     /Northing for .* must be between 1 and 7 digits/

package/src/server/plugins/engine/components/EastingNorthingField.ts

@@ -28,10 +28,22 @@ import { convertToLanguageMessages } from '~/src/server/utils/type-utils.js'
 
 // British National Grid coordinate limits
 const DEFAULT_EASTING_MIN = 0
-const DEFAULT_EASTING_MAX = 70000
+const DEFAULT_EASTING_MAX = 700000
 const DEFAULT_NORTHING_MIN = 0
 const DEFAULT_NORTHING_MAX = 1300000
 
+// Easting length constraints (integer values only, no decimals)
+// Min: 1 char for values like "0" or single digit values
+// Max: 6 chars for values up to 700000 (British National Grid easting limit)
+const EASTING_MIN_LENGTH = 1
+const EASTING_MAX_LENGTH = 6
+
+// Northing length constraints (integer values only, no decimals)
+// Min: 1 char for values like "0" or single digit values
+// Max: 7 chars for values up to 1300000 (British National Grid northing limit)
+const NORTHING_MIN_LENGTH = 1
+const NORTHING_MAX_LENGTH = 7
+
 export class EastingNorthingField extends FormComponent {
   declare options: EastingNorthingFieldComponent['options']
   declare formSchema: ObjectSchema<FormPayload>
@@ -59,9 +71,11 @@ export class EastingNorthingField extends FormComponent {
         'number.base': messageTemplate.objectMissing,
         'number.min': `{{#label}} for ${this.title} must be between {{#limit}} and ${eastingMax}`,
         'number.max': `{{#label}} for ${this.title} must be between ${eastingMin} and {{#limit}}`,
-        'number.precision': `{{#label}} for ${this.title} must be between 1 and 5 digits`,
-        'number.integer': `{{#label}} for ${this.title} must be between 1 and 5 digits`,
-        'number.unsafe': `{{#label}} for ${this.title} must be between 1 and 5 digits`
+        'number.precision': `{{#label}} for ${this.title} must be between 1 and 6 digits`,
+        'number.integer': `{{#label}} for ${this.title} must be between 1 and 6 digits`,
+        'number.unsafe': `{{#label}} for ${this.title} must be between 1 and 6 digits`,
+        'number.minLength': `{{#label}} for ${this.title} must be between 1 and 6 digits`,
+        'number.maxLength': `{{#label}} for ${this.title} must be between 1 and 6 digits`
       })
 
     const northingValidationMessages: LanguageMessages =
@@ -72,7 +86,9 @@ export class EastingNorthingField extends FormComponent {
         'number.max': `{{#label}} for ${this.title} must be between ${northingMin} and {{#limit}}`,
         'number.precision': `{{#label}} for ${this.title} must be between 1 and 7 digits`,
         'number.integer': `{{#label}} for ${this.title} must be between 1 and 7 digits`,
-        'number.unsafe': `{{#label}} for ${this.title} must be between 1 and 7 digits`
+        'number.unsafe': `{{#label}} for ${this.title} must be between 1 and 7 digits`,
+        'number.minLength': `{{#label}} for ${this.title} must be between 1 and 7 digits`,
+        'number.maxLength': `{{#label}} for ${this.title} must be between 1 and 7 digits`
       })
 
     this.collection = new ComponentCollection(
@@ -81,7 +97,13 @@ export class EastingNorthingField extends FormComponent {
           type: ComponentType.NumberField,
           name: `${name}__easting`,
           title: 'Easting',
-          schema: { min: eastingMin, max: eastingMax, precision: 0 },
+          schema: {
+            min: eastingMin,
+            max: eastingMax,
+            precision: 0,
+            minLength: EASTING_MIN_LENGTH,
+            maxLength: EASTING_MAX_LENGTH
+          },
           options: {
             required: isRequired,
             optionalText: true,
@@ -93,7 +115,13 @@ export class EastingNorthingField extends FormComponent {
           type: ComponentType.NumberField,
           name: `${name}__northing`,
           title: 'Northing',
-          schema: { min: northingMin, max: northingMax, precision: 0 },
+          schema: {
+            min: northingMin,
+            max: northingMax,
+            precision: 0,
+            minLength: NORTHING_MIN_LENGTH,
+            maxLength: NORTHING_MAX_LENGTH
+          },
           options: {
             required: isRequired,
             optionalText: true,
@@ -179,7 +207,7 @@ export class EastingNorthingField extends FormComponent {
         {
           type: 'eastingFormat',
           template:
-            'Easting for [short description] must be between 1 and 5 digits'
+            'Easting for [short description] must be between 1 and 6 digits'
         },
         {
           type: 'northingFormat',
@@ -190,11 +218,11 @@ export class EastingNorthingField extends FormComponent {
       advancedSettingsErrors: [
         {
           type: 'eastingMin',
-          template: `Easting for [short description] must be between ${DEFAULT_EASTING_MIN} and ${DEFAULT_EASTING_MAX}`
+          template: `Easting for [short description] must be between 0 and 700000`
         },
         {
           type: 'eastingMax',
-          template: `Easting for [short description] must be between ${DEFAULT_EASTING_MIN} and ${DEFAULT_EASTING_MAX}`
+          template: `Easting for [short description] must be between 0 and 700000`
         },
         {
           type: 'northingMin',

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

@@ -149,8 +149,8 @@ describe('LatLongField', () => {
 
         const result2 = collection.validate(
           getFormData({
-            latitude: '49',
-            longitude: '-9'
+            latitude: '49.1',
+            longitude: '-8.9'
           })
         )
 
@@ -381,13 +381,7 @@ describe('LatLongField', () => {
     describe.each([
       {
         description: 'Trim empty spaces',
-        component: {
-          title: 'Example lat long',
-          name: 'myComponent',
-          type: ComponentType.LatLongField,
-          options: {},
-          schema: {}
-        } satisfies LatLongFieldComponent,
+        component: createLatLongComponent(),
         assertions: [
           {
             input: getFormData({
@@ -571,15 +565,162 @@ describe('LatLongField', () => {
           }
         ]
       },
+      {
+        description: 'Minimum precision validation',
+        component: createLatLongComponent(),
+        assertions: [
+          {
+            input: getFormData({
+              latitude: '52',
+              longitude: '-1'
+            }),
+            output: {
+              value: getFormData({
+                latitude: 52,
+                longitude: -1
+              }),
+              errors: [
+                expect.objectContaining({
+                  text: 'Latitude must have at least 1 decimal place'
+                }),
+                expect.objectContaining({
+                  text: 'Longitude must have at least 1 decimal place'
+                })
+              ]
+            }
+          },
+          {
+            input: getFormData({
+              latitude: '52.1',
+              longitude: '-1.5'
+            }),
+            output: {
+              value: getFormData({
+                latitude: 52.1,
+                longitude: -1.5
+              })
+            }
+          },
+          {
+            input: getFormData({
+              latitude: '52.123456',
+              longitude: '-1.123456'
+            }),
+            output: {
+              value: getFormData({
+                latitude: 52.123456,
+                longitude: -1.123456
+              })
+            }
+          }
+        ]
+      },
+      {
+        description: 'Length and precision validation',
+        component: createLatLongComponent(),
+        assertions: [
+          // Latitude too short
+          {
+            input: getFormData({
+              latitude: '52',
+              longitude: '-1.5'
+            }),
+            output: {
+              value: getFormData({
+                latitude: 52,
+                longitude: -1.5
+              }),
+              errors: [
+                expect.objectContaining({
+                  text: 'Latitude must have at least 1 decimal place'
+                })
+              ]
+            }
+          },
+          // Latitude too long
+          {
+            input: getFormData({
+              latitude: '52.12345678',
+              longitude: '-1.5'
+            }),
+            output: {
+              value: getFormData({
+                latitude: 52.12345678,
+                longitude: -1.5
+              }),
+              errors: [
+                expect.objectContaining({
+                  text: 'Latitude must have no more than 7 decimal places'
+                })
+              ]
+            }
+          },
+          // Longitude too short
+          {
+            input: getFormData({
+              latitude: '52.1',
+              longitude: '-1'
+            }),
+            output: {
+              value: getFormData({
+                latitude: 52.1,
+                longitude: -1
+              }),
+              errors: [
+                expect.objectContaining({
+                  text: 'Longitude must have at least 1 decimal place'
+                })
+              ]
+            }
+          },
+          // Longitude too long
+          {
+            input: getFormData({
+              latitude: '52.1',
+              longitude: '-1.12345678'
+            }),
+            output: {
+              value: getFormData({
+                latitude: 52.1,
+                longitude: -1.12345678
+              }),
+              errors: [
+                expect.objectContaining({
+                  text: 'Longitude must have no more than 7 decimal places'
+                })
+              ]
+            }
+          },
+          // Valid values
+          {
+            input: getFormData({
+              latitude: '52.1',
+              longitude: '-1.5'
+            }),
+            output: {
+              value: getFormData({
+                latitude: 52.1,
+                longitude: -1.5
+              })
+            }
+          },
+          {
+            input: getFormData({
+              latitude: '52.1234',
+              longitude: '-1.123'
+            }),
+            output: {
+              value: getFormData({
+                latitude: 52.1234,
+                longitude: -1.123
+              })
+            }
+          }
+        ]
+      },
       {
         description: 'Invalid format',
-        component: {
-          title: 'Example lat long',
-          name: 'myComponent',
-          type: ComponentType.LatLongField,
-          options: {},
-          schema: {}
-        } satisfies LatLongFieldComponent,
+        component: createLatLongComponent(),
         assertions: [
           {
             input: getFormData({
@@ -665,6 +806,22 @@ describe('LatLongField', () => {
   })
 })
 
+/**
+ * Factory function to create a default LatLongField component with optional overrides
+ */
+function createLatLongComponent(
+  overrides: Partial<LatLongFieldComponent> = {}
+): LatLongFieldComponent {
+  return {
+    title: 'Example lat long',
+    name: 'myComponent',
+    type: ComponentType.LatLongField,
+    options: {},
+    schema: {},
+    ...overrides
+  } satisfies LatLongFieldComponent
+}
+
 function getFormData(
   value:
     | { latitude?: string | number; longitude?: string | number }

package/src/server/plugins/engine/components/LatLongField.ts

@@ -23,6 +23,23 @@ import {
 } from '~/src/server/plugins/engine/types.js'
 import { convertToLanguageMessages } from '~/src/server/utils/type-utils.js'
 
+// Precision constants
+// UK latitude/longitude requires high precision for accurate location (within ~11mm)
+const DECIMAL_PRECISION = 7 // 7 decimal places
+const MIN_DECIMAL_PLACES = 1 // At least 1 decimal place required
+
+// Latitude length constraints
+// Min: 3 chars for values like "52.1" (2 digits + decimal + 1 decimal place)
+// Max: 10 chars for values like "59.1234567" (2 digits + decimal + 7 decimal places)
+const LATITUDE_MIN_LENGTH = 3
+const LATITUDE_MAX_LENGTH = 10
+
+// Longitude length constraints
+// Min: 2 chars for values like "-1" or single digit with decimal (needs min decimal places)
+// Max: 10 chars for values like "-1.1234567" (minus + 1 digit + decimal + 7 decimal places)
+const LONGITUDE_MIN_LENGTH = 2
+const LONGITUDE_MAX_LENGTH = 10
+
 export class LatLongField extends FormComponent {
   declare options: LatLongFieldComponent['options']
   declare formSchema: ObjectSchema<FormPayload>
@@ -51,6 +68,8 @@ export class LatLongField extends FormComponent {
         'number.base': messageTemplate.objectMissing,
         'number.precision':
           '{{#label}} must have no more than 7 decimal places',
+        'number.minPrecision':
+          '{{#label}} must have at least {{#minPrecision}} decimal place',
         'number.unsafe': '{{#label}} must be a valid number'
       })
 
@@ -58,14 +77,18 @@ export class LatLongField extends FormComponent {
       ...customValidationMessages,
       'number.base': `Enter a valid latitude for ${this.title} like 51.519450`,
       'number.min': `Latitude for ${this.title} must be between ${latitudeMin} and ${latitudeMax}`,
-      'number.max': `Latitude for ${this.title} must be between ${latitudeMin} and ${latitudeMax}`
+      'number.max': `Latitude for ${this.title} must be between ${latitudeMin} and ${latitudeMax}`,
+      'number.minLength': `Latitude for ${this.title} must be between 3 and 10 characters`,
+      'number.maxLength': `Latitude for ${this.title} must be between 3 and 10 characters`
     })
 
     const longitudeMessages: LanguageMessages = convertToLanguageMessages({
       ...customValidationMessages,
       'number.base': `Enter a valid longitude for ${this.title} like -0.127758`,
       'number.min': `Longitude for ${this.title} must be between ${longitudeMin} and ${longitudeMax}`,
-      'number.max': `Longitude for ${this.title} must be between ${longitudeMin} and ${longitudeMax}`
+      'number.max': `Longitude for ${this.title} must be between ${longitudeMin} and ${longitudeMax}`,
+      'number.minLength': `Longitude for ${this.title} must be between 2 and 10 characters`,
+      'number.maxLength': `Longitude for ${this.title} must be between 2 and 10 characters`
     })
 
     this.collection = new ComponentCollection(
@@ -74,7 +97,14 @@ export class LatLongField extends FormComponent {
           type: ComponentType.NumberField,
           name: `${name}__latitude`,
           title: 'Latitude',
-          schema: { min: latitudeMin, max: latitudeMax, precision: 7 },
+          schema: {
+            min: latitudeMin,
+            max: latitudeMax,
+            precision: DECIMAL_PRECISION,
+            minPrecision: MIN_DECIMAL_PLACES,
+            minLength: LATITUDE_MIN_LENGTH,
+            maxLength: LATITUDE_MAX_LENGTH
+          },
           options: {
             required: isRequired,
             optionalText: true,
@@ -87,7 +117,14 @@ export class LatLongField extends FormComponent {
           type: ComponentType.NumberField,
           name: `${name}__longitude`,
           title: 'Longitude',
-          schema: { min: longitudeMin, max: longitudeMax, precision: 7 },
+          schema: {
+            min: longitudeMin,
+            max: longitudeMax,
+            precision: DECIMAL_PRECISION,
+            minPrecision: MIN_DECIMAL_PLACES,
+            minLength: LONGITUDE_MIN_LENGTH,
+            maxLength: LONGITUDE_MAX_LENGTH
+          },
           options: {
             required: isRequired,
             optionalText: true,