@defra/forms-engine-plugin 5.0.0-alpha.3 → 5.0.0-alpha.31

package/src/server/plugins/postcode-lookup/views/postcode-lookup-details.html

@@ -33,7 +33,7 @@
             <!-- Postcode lookup select -->
             <!-- Postcode lookup details display -->
             {%- set detailsHtml -%}
-              <strong>{{ details.postcodeQuery }}</strong>{% if details.buildingNameQuery %} and <strong>{{ details.buildingNameQuery }}</strong>{% endif %}
+              <strong>{{ details.postcodeQuery }}</strong>{% if details.buildingNameQuery %} {{ t('common.and')}} <strong>{{ details.buildingNameQuery }}</strong>{% endif %}
             {%- endset -%}
 
             {% if hasAddresses %}
@@ -72,9 +72,9 @@
           {{ govukButton(buttons.continueButton) }}
 
           {% if buttons.manualLink %}
-            <p class="govuk-body">or <a class="govuk-link govuk-link--no-visited-state" href="{{ buttons.manualLink.href }}">{{buttons.manualLink.text}}</a></p>
+            <p class="govuk-body">{{ t('common.or')}} <a class="govuk-link govuk-link--no-visited-state" href="{{ buttons.manualLink.href }}">{{buttons.manualLink.text}}</a></p>
           {% elif buttons.detailsLink %}
-            <p class="govuk-body">or <a class="govuk-link govuk-link--no-visited-state" href="{{ buttons.detailsLink.href }}">{{buttons.detailsLink.text}}</a></p>
+            <p class="govuk-body">{{ t('common.or')}} <a class="govuk-link govuk-link--no-visited-state" href="{{ buttons.detailsLink.href }}">{{buttons.detailsLink.text}}</a></p>
           {% endif %}
         </div>
       </form>

package/src/server/utils/type-utils.ts

@@ -1,14 +1,4 @@
-import Joi, {
-  type JoiExpression,
-  type LanguageMessages,
-  type LanguageMessagesExt
-} from 'joi'
-
-export function convertToLanguageMessages(
-  extLanguageMessages: LanguageMessagesExt
-): LanguageMessages {
-  return extLanguageMessages as unknown as LanguageMessages
-}
+import Joi, { type JoiExpression } from 'joi'
 
 export function createJoiExpression(expr: string): JoiExpression {
   return Joi.expression(expr) as unknown as JoiExpression

package/src/server/utils/utils.js

@@ -44,6 +44,24 @@ export function resolveLanguage(request) {
 }
 
 /**
- * @import { FormMetadata } from '@defra/forms-model'
+ * Create a comma-separated list with the last seperator being 'or'
+ * @param { string[] | undefined } items
+ * @param {string} [finalSeparator]
+ */
+export function joinWithOr(items, finalSeparator = 'or') {
+  if (!items || items.length === 0) {
+    return ''
+  }
+  if (items.length === 1) {
+    return items[0]
+  }
+  if (items.length === 2) {
+    return `${items[0]} ${finalSeparator} ${items[1]}`
+  }
+
+  return `${items.slice(0, -1).join(', ')} ${finalSeparator} ${items.at(-1)}`
+}
+
+/**
  * @import { AnyFormRequest } from '../plugins/engine/types.js'
  */

package/src/typings/geodesy/index.d.ts

@@ -0,0 +1,18 @@
+declare module 'geodesy/osgridref.js' {
+  export class LatLon {
+    constructor(lat: number, lon: number, height?: number)
+    get latitude(): number
+    get longitude(): number
+    get height(): number
+    toOsGrid(): OsGridRef
+  }
+
+  export default class OsGridRef {
+    constructor(easting: number, northing: number)
+    easting: number
+    northing: number
+    toLatLon(): LatLon
+    toString(digits?: number): string
+    static parse(gridref: string): OsGridRef
+  }
+}

package/src/typings/hapi/index.d.ts

@@ -11,6 +11,7 @@ import { type FormModel } from '../../server/plugins/engine/models/index.js'
 import {
   type AnyFormRequest,
   type FormSubmissionError,
+  type GenerateReferenceNumberHandler,
   type PluginOptions
 } from '../../server/plugins/engine/types.ts'
 import { type CacheService } from '../../server/services/index.js'
@@ -41,6 +42,7 @@ declare module '@hapi/hapi' {
       getLanguage?: PluginOptions['getLanguage']
       baseUrl: string
       services: PluginOptions['services']
+      generateReferenceNumber: GenerateReferenceNumberHandler
     }
   }