@defra/forms-engine-plugin 4.7.2 → 4.8.0

package/src/server/plugins/engine/routes/repeaters/summary.ts

@@ -4,22 +4,22 @@ import Boom from '@hapi/boom'
 import { type RouteOptions, type ServerRoute } from '@hapi/hapi'
 import Joi from 'joi'
 
-import { RepeatPageController } from '~/src/server/plugins/engine/pageControllers/RepeatPageController.js'
-import { redirectOrMakeHandler } from '~/src/server/plugins/engine/routes/index.js'
-import { type OnRequestCallback } from '~/src/server/plugins/engine/types.js'
+import { RepeatPageController } from '../../pageControllers/RepeatPageController.js'
+import { redirectOrMakeHandler } from '../index.js'
+import { type OnRequestCallback } from '../../types.js'
 import {
   type FormRequest,
   type FormRequestPayload,
   type FormRequestPayloadRefs,
   type FormRequestRefs,
   type FormResponseToolkit
-} from '~/src/server/routes/types.js'
+} from '../../../../routes/types.js'
 import {
   actionSchema,
   crumbSchema,
   pathSchema,
   stateSchema
-} from '~/src/server/schemas/index.js'
+} from '../../../../schemas/index.js'
 
 function getHandler(onRequest?: OnRequestCallback) {
   return async function (request: FormRequest, h: FormResponseToolkit) {

package/src/server/plugins/engine/services/formSubmissionService.js

@@ -1,5 +1,5 @@
-import { config } from '~/src/config/index.js'
-import { postJson } from '~/src/server/services/httpService.js'
+import { config } from '../../../../config/index.js'
+import { postJson } from '../../../services/httpService.js'
 
 const submissionUrl = config.get('submissionUrl')
 

package/src/server/plugins/engine/services/index.js

@@ -1,3 +1,3 @@
-export * as formsService from '~/src/server/plugins/engine/services/formsService.js'
-export * as formSubmissionService from '~/src/server/plugins/engine/services/formSubmissionService.js'
-export * as outputService from '~/src/server/plugins/engine/services/notifyService.js'
+export * as formsService from './formsService.js'
+export * as formSubmissionService from './formSubmissionService.js'
+export * as outputService from './notifyService.js'

package/src/server/plugins/engine/services/localFormsService.js

@@ -1,5 +1,5 @@
-import { config } from '~/src/config/index.js'
-import { FileFormService } from '~/src/server/utils/file-form-service.js'
+import { config } from '../../../../config/index.js'
+import { FileFormService } from '../../../utils/file-form-service.js'
 
 // Create shared form metadata
 const now = new Date()

package/src/server/plugins/engine/services/notifyService.ts

@@ -4,15 +4,15 @@ import {
   type SubmitResponsePayload
 } from '@defra/forms-model'
 
-import { config } from '~/src/config/index.js'
-import { escapeMarkdown } from '~/src/server/plugins/engine/components/helpers/index.js'
-import { checkFormStatus } from '~/src/server/plugins/engine/helpers.js'
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
-import { type DetailItem } from '~/src/server/plugins/engine/models/types.js'
-import { getFormatter } from '~/src/server/plugins/engine/outputFormatters/index.js'
-import { type FormContext } from '~/src/server/plugins/engine/types.js'
-import { type FormRequestPayload } from '~/src/server/routes/types.js'
-import { sendNotification } from '~/src/server/utils/notify.js'
+import { config } from '../../../../config/index.js'
+import { escapeMarkdown } from '../components/helpers/index.js'
+import { checkFormStatus } from '../helpers.js'
+import { type FormModel } from '../models/index.js'
+import { type DetailItem } from '../models/types.js'
+import { getFormatter } from '../outputFormatters/index.js'
+import { type FormContext } from '../types.js'
+import { type FormRequestPayload } from '../../../routes/types.js'
+import { sendNotification } from '../../../utils/notify.js'
 
 const templateId = config.get('notifyTemplateId')
 

package/src/server/plugins/engine/services/uploadService.js

@@ -1,5 +1,5 @@
-import { config } from '~/src/config/index.js'
-import { getJson, postJson } from '~/src/server/services/httpService.js'
+import { config } from '../../../../config/index.js'
+import { getJson, postJson } from '../../../services/httpService.js'
 
 const uploaderUrl = config.get('uploaderUrl')
 const submissionUrl = config.get('submissionUrl')
@@ -60,5 +60,5 @@ export async function getUploadStatus(uploadId) {
 }
 
 /**
- * @import { UploadInitiateResponse, UploadStatusResponse } from '~/src/server/plugins/engine/types.js'
+ * @import { UploadInitiateResponse, UploadStatusResponse } from '../types.js'
  */

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

@@ -41,9 +41,9 @@ export type {
   UploadInitiateResponse,
   UploadStatusFileResponse,
   UploadStatusResponse
-} from '~/src/server/plugins/engine/types.js'
+} from '../types.js'
 
-export { FileStatus, UploadStatus } from '~/src/server/plugins/engine/types.js'
+export { FileStatus, UploadStatus } from '../types.js'
 
 export type {
   Detail,
@@ -52,7 +52,7 @@ export type {
   DetailItemField,
   DetailItemRepeat,
   ExecutableCondition
-} from '~/src/server/plugins/engine/models/types.js'
+} from '../models/types.js'
 
 export type {
   BackLink,
@@ -68,9 +68,9 @@ export type {
   ListItemLabel,
   MonthYearState,
   ViewModel
-} from '~/src/server/plugins/engine/components/types.js'
+} from '../components/types.js'
 
-export type { UkAddressState } from '~/src/server/plugins/engine/components/UkAddressField.js'
+export type { UkAddressState } from '../components/UkAddressField.js'
 
 export type {
   FormParams,
@@ -80,9 +80,9 @@ export type {
   FormRequestPayloadRefs,
   FormRequestRefs,
   FormResponseToolkit
-} from '~/src/server/routes/types.js'
+} from '../../../routes/types.js'
 
-export { FormAction, FormStatus } from '~/src/server/routes/types.js'
+export { FormAction, FormStatus } from '../../../routes/types.js'
 
 export type {
   FormSubmissionService,
@@ -90,7 +90,7 @@ export type {
   OutputService,
   RouteConfig,
   Services
-} from '~/src/server/types.js'
+} from '../../../types.js'
 
-export * from '~/src/server/plugins/engine/types/schema.js'
-export { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/enums.js'
+export * from './schema.js'
+export { FormAdapterSubmissionSchemaVersion } from './enums.js'

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

@@ -8,13 +8,13 @@ import {
 } from '@defra/forms-model'
 import Joi from 'joi'
 
-import { FormAdapterSubmissionSchemaVersion } from '~/src/server/plugins/engine/types/enums.js'
+import { FormAdapterSubmissionSchemaVersion } from './enums.js'
 import {
   type FormAdapterSubmissionMessageData,
   type FormAdapterSubmissionMessageMeta,
   type FormAdapterSubmissionMessagePayload,
   type FormAdapterSubmissionMessageResult
-} from '~/src/server/plugins/engine/types.js'
+} from '../types.js'
 
 export const formAdapterSubmissionMessageMetaSchema =
   Joi.object<FormAdapterSubmissionMessageMeta>().keys({

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

@@ -15,13 +15,13 @@ import {
 } from '@hapi/hapi'
 import { type JoiExpression, type ValidationErrorItem } from 'joi'
 
-import { FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js'
-import { type UkAddressState } from '~/src/server/plugins/engine/components/UkAddressField.js'
-import { type Component } from '~/src/server/plugins/engine/components/helpers/components.js'
+import { FormComponent } from './components/FormComponent.js'
+import { type UkAddressState } from './components/UkAddressField.js'
+import { type Component } from './components/helpers/components.js'
 import {
   type FileUploadField,
   type PaymentField
-} from '~/src/server/plugins/engine/components/index.js'
+} from './components/index.js'
 import {
   type BackLink,
   type ComponentText,
@@ -30,32 +30,37 @@ import {
   type EastingNorthingState,
   type LatLongState,
   type MonthYearState
-} from '~/src/server/plugins/engine/components/types.js'
-import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
-import { type DetailItemField } from '~/src/server/plugins/engine/models/types.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 QuestionPageController } from '~/src/server/plugins/engine/pageControllers/index.js'
+} from './components/types.js'
+import { type FormModel } from './models/index.js'
+import { type DetailItemField } from './models/types.js'
+import { type PageController } from './pageControllers/PageController.js'
+import { type PageControllerClass } from './pageControllers/helpers/pages.js'
+import { type QuestionPageController } from './pageControllers/index.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'
+} from './types/enums.js'
+import { type ViewContext } from '../nunjucks/types.js'
 import {
   type FormAction,
   type FormRequest,
   type FormRequestPayload,
   type FormResponseToolkit,
   type FormStatus
-} from '~/src/server/routes/types.js'
-import { type CacheService } from '~/src/server/services/cacheService.js'
-import { type RequestOptions } from '~/src/server/services/httpService.js'
-import { type Services } from '~/src/server/types.js'
+} from '../../routes/types.js'
+import { type CacheService } from '../../services/cacheService.js'
+import { type RequestOptions } from '../../services/httpService.js'
+import { type Services } from '../../types.js'
 
 export type AnyFormRequest = FormRequest | FormRequestPayload
 export type AnyRequest = Request | AnyFormRequest
 
+export interface CacheRequest {
+  yar: { id: string | undefined }
+  params: { slug?: string; state?: string }
+}
+
 /**
  * Form submission state stores the following in Redis:
  * Props containing user's submitted values as `{ [inputId]: value }` or as `{ [sectionName]: { [inputName]: value } }`
@@ -224,7 +229,7 @@ export interface UploadInitiateResponse {
 export {
   FileStatus,
   UploadStatus
-} from '~/src/server/plugins/engine/types/enums.js'
+} from './types/enums.js'
 
 export type UploadState = FileState[]
 

package/src/server/plugins/engine/validationHelpers.ts

@@ -1,11 +1,11 @@
 import { type ResponseObject } from '@hapi/hapi'
 
-import * as Components from '~/src/server/plugins/engine/components/index.js'
+import * as Components from './components/index.js'
 import {
   type FormRequestPayload,
   type FormResponseToolkit
-} from '~/src/server/plugins/engine/types/index.js'
-import { type ExternalArgs } from '~/src/server/plugins/engine/types.js'
+} from './types/index.js'
+import { type ExternalArgs } from './types.js'
 
 // Type guard for ExternalComponent
 export function isExternalComponent(

package/src/server/plugins/engine/vision.ts

@@ -11,9 +11,9 @@ import {
   VIEW_PATH,
   context,
   prepareNunjucksEnvironment
-} from '~/src/server/plugins/engine/index.js'
-import { type PluginOptions } from '~/src/server/plugins/engine/types.js'
-import { VIEW_PATH as POSTCODE_LOOKUP_VIEW_PATH } from '~/src/server/plugins/postcode-lookup/index.js'
+} from './index.js'
+import { type PluginOptions } from './types.js'
+import { VIEW_PATH as POSTCODE_LOOKUP_VIEW_PATH } from '../postcode-lookup/index.js'
 
 export async function registerVision(
   server: Server,

package/src/server/plugins/map/index.js

@@ -1,4 +1,4 @@
-import { getRoutes } from '~/src/server/plugins/map/routes/index.js'
+import { getRoutes } from './routes/index.js'
 
 /**
  * @satisfies {NamedPlugin<MapConfiguration>}
@@ -15,5 +15,5 @@ export const mapPlugin = {
 
 /**
  * @import { NamedPlugin } from '@hapi/hapi'
- * @import { MapConfiguration } from '~/src/server/plugins/map/types.js'
+ * @import { MapConfiguration } from './types.js'
  */

package/src/server/plugins/map/routes/get-os-token.js

@@ -1,4 +1,4 @@
-import { post } from '~/src/server/services/httpService.js'
+import { post } from '../../../services/httpService.js'
 
 /**
  * @type {string}
@@ -19,7 +19,9 @@ export async function getAccessToken(options) {
   }
 
   const creds = `${key}:${secret}`
-  const result = await post('https://api.os.uk/oauth2/token/v1', {
+  const postByType = /** @type {typeof post<OsTokenResponse>} */ (post)
+
+  const result = await postByType('https://api.os.uk/oauth2/token/v1', {
     headers: {
       Authorization: `Basic ${btoa(creds)}`,
       'Content-Type': 'application/x-www-form-urlencoded'
@@ -30,6 +32,10 @@ export async function getAccessToken(options) {
 
   const data = result.payload
 
+  if (!data) {
+    throw new Error('Failed to obtain OS API token')
+  }
+
   cachedToken = data.access_token
   tokenExpiry = now + (data.expires_in - 60) * 1000 // refresh early
 
@@ -37,5 +43,11 @@ export async function getAccessToken(options) {
 }
 
 /**
- * @import { MapConfiguration } from '~/src/server/plugins/map/types.js'
+ * @typedef {object} OsTokenResponse
+ * @property {string} access_token - The access token
+ * @property {number} expires_in - The expiry in seconds
+ */
+
+/**
+ * @import { MapConfiguration } from '../types.js'
  */

package/src/server/plugins/map/routes/index.js

@@ -3,12 +3,12 @@ import { resolve } from 'node:path'
 import { StatusCodes } from 'http-status-codes'
 import Joi from 'joi'
 
-import { getAccessToken } from '~/src/server/plugins/map/routes/get-os-token.js'
-import { find, nearest } from '~/src/server/plugins/map/service.js'
+import { getAccessToken } from './get-os-token.js'
+import { find, nearest } from '../service.js'
 import {
   get,
   request as httpRequest
-} from '~/src/server/services/httpService.js'
+} from '../../../services/httpService.js'
 
 /**
  * Gets the map support routes
@@ -85,7 +85,9 @@ function tileProxyRoute(options) {
 
       const url = `https://api.os.uk/maps/vector/v1/vts/tile/${z}/${y}/${x}.pbf?srs=3857`
 
-      const { payload, res } = await get(url, {
+      const getBuffer = /** @type {typeof get<Buffer>} */ (get)
+
+      const { payload, res } = await getBuffer(url, {
         headers: {
           Authorization: `Bearer ${token}`,
           Accept: 'application/x-protobuf'
@@ -188,5 +190,5 @@ function mapStyleResourceRoutes() {
 
 /**
  * @import { ServerRoute } from '@hapi/hapi'
- * @import { MapConfiguration, MapProxyGetRequestRefs, MapGeocodeGetRequestRefs, MapReverseGeocodeGetRequestRefs } from '~/src/server/plugins/map/types.js'
+ * @import { MapConfiguration, MapProxyGetRequestRefs, MapGeocodeGetRequestRefs, MapReverseGeocodeGetRequestRefs } from '../types.js'
  */

package/src/server/plugins/map/routes/vts/esri-aerial.json

@@ -0,0 +1,23 @@
+{
+  "version": 8,
+  "name": "Esri World Imagery",
+  "sources": {
+    "esri-world-imagery": {
+      "type": "raster",
+      "tiles": [
+        "https://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"
+      ],
+      "tileSize": 256,
+      "attribution": "Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics, and the GIS User Community"
+    }
+  },
+  "layers": [
+    {
+      "id": "esri-world-imagery-layer",
+      "type": "raster",
+      "source": "esri-world-imagery",
+      "minzoom": 0,
+      "maxzoom": 22
+    }
+  ]
+}

package/src/server/plugins/map/service.js

@@ -1,8 +1,8 @@
 import { getErrorMessage } from '@defra/forms-model'
 import Boom from '@hapi/boom'
 
-import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
-import { getJson } from '~/src/server/services/httpService.js'
+import { createLogger } from '../../common/helpers/logging/logger.js'
+import { getJson } from '../../services/httpService.js'
 
 const logger = createLogger()
 
@@ -22,7 +22,10 @@ function empty() {
  * @param {string} endpoint - the OS api endpoint
  */
 function logErrorAndReturnEmpty(err, endpoint) {
-  const msg = `${getErrorMessage(err)} ${(Boom.isBoom(err) && err.data?.payload?.error?.message) ?? ''}`
+  /** @type {{ payload?: { error?: { message?: string } } } | false} */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  const boomData = Boom.isBoom(err) && err.data
+  const msg = `${getErrorMessage(err)} ${(boomData && boomData.payload?.error?.message) ?? ''}`
 
   logger.error(err, `Exception occured calling OS names ${endpoint} - ${msg}}`)
 
@@ -80,5 +83,5 @@ export async function nearest(easting, northing, apiKey) {
 }
 
 /**
- * @import { OsNamesFindResponse, OsNamesFindResult } from '~/src/server/plugins/map/types.js'
+ * @import { OsNamesFindResponse, OsNamesFindResult } from './types.js'
  */

package/src/server/plugins/map/test/__stubs__/find.js

@@ -267,5 +267,5 @@ export const result = {
 }
 
 /**
- * @import { OsNamesFindResponse } from '~/src/server/plugins/map/types.js'
+ * @import { OsNamesFindResponse } from '../../types.js'
  */

package/src/server/plugins/nunjucks/context.js

@@ -4,12 +4,12 @@ import { basename, join } from 'node:path'
 import Boom from '@hapi/boom'
 import { StatusCodes } from 'http-status-codes'
 
-import { config } from '~/src/config/index.js'
-import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
+import { config } from '../../../config/index.js'
+import { createLogger } from '../../common/helpers/logging/logger.js'
 import {
   checkFormStatus,
   encodeUrl
-} from '~/src/server/plugins/engine/helpers.js'
+} from '../engine/helpers.js'
 
 const logger = createLogger()
 
@@ -94,6 +94,6 @@ export function devtoolContext(_request) {
 }
 
 /**
- * @import { ViewContext } from '~/src/server/plugins/nunjucks/types.js'
- * @import { AnyFormRequest } from '~/src/server/plugins/engine/types.js'
+ * @import { ViewContext } from './types.js'
+ * @import { AnyFormRequest } from '../engine/types.js'
  */

package/src/server/plugins/nunjucks/environment.js

@@ -4,9 +4,9 @@ import { ComponentType } from '@defra/forms-model'
 import nunjucks from 'nunjucks'
 import resolvePkg from 'resolve'
 
-import { config } from '~/src/config/index.js'
-import { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'
-import * as filters from '~/src/server/plugins/nunjucks/filters/index.js'
+import { config } from '../../../config/index.js'
+import { evaluateTemplate } from '../engine/helpers.js'
+import * as filters from './filters/index.js'
 
 const govukFrontendPath = dirname(
   resolvePkg.sync('govuk-frontend/package.json')
@@ -116,7 +116,7 @@ export function govukRebrand() {
 environment.addGlobal('govukRebrand', govukRebrand())
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
- * @import { FormSubmissionError } from '~/src/server/plugins/engine/types.js'
- * @import { ComponentViewModel } from '~/src/server/plugins/engine/components/types.js'
+ * @import { NunjucksContext } from './types.js'
+ * @import { FormSubmissionError } from '../engine/types.js'
+ * @import { ComponentViewModel } from '../engine/components/types.js'
  */

package/src/server/plugins/nunjucks/filters/answer.js

@@ -1,4 +1,4 @@
-import { getAnswer } from '~/src/server/plugins/engine/components/helpers/components.js'
+import { getAnswer } from '../../engine/components/helpers/components.js'
 
 /**
  * Nunjucks filter to get the answer for a component
@@ -22,6 +22,6 @@ export function answer(name) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
- * @import { Field } from '~/src/server/plugins/engine/components/helpers/components.js'
+ * @import { NunjucksContext } from '../types.js'
+ * @import { Field } from '../../engine/components/helpers/components.js'
  */

package/src/server/plugins/nunjucks/filters/evaluate.js

@@ -1,4 +1,4 @@
-import { evaluateTemplate } from '~/src/server/plugins/engine/helpers.js'
+import { evaluateTemplate } from '../../engine/helpers.js'
 
 /**
  * Nunjucks filter to evaluate a liquid template.
@@ -17,5 +17,5 @@ export function evaluate(template) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { NunjucksContext } from '../types.js'
  */

package/src/server/plugins/nunjucks/filters/field.js

@@ -24,5 +24,5 @@ export function field(name) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { NunjucksContext } from '../types.js'
  */

package/src/server/plugins/nunjucks/filters/href.js

@@ -1,4 +1,4 @@
-import { getPageHref } from '~/src/server/plugins/engine/index.js'
+import { getPageHref } from '../../engine/index.js'
 
 /**
  * Nunjucks filter to get the answer for a component
@@ -26,5 +26,5 @@ export function href(path) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { NunjucksContext } from '../types.js'
  */

package/src/server/plugins/nunjucks/filters/index.js

@@ -1,8 +1,8 @@
-export { highlight } from '~/src/server/plugins/nunjucks/filters/highlight.js'
-export { inspect } from '~/src/server/plugins/nunjucks/filters/inspect.js'
-export { evaluate } from '~/src/server/plugins/nunjucks/filters/evaluate.js'
-export { answer } from '~/src/server/plugins/nunjucks/filters/answer.js'
-export { href } from '~/src/server/plugins/nunjucks/filters/href.js'
-export { field } from '~/src/server/plugins/nunjucks/filters/field.js'
-export { page } from '~/src/server/plugins/nunjucks/filters/page.js'
-export { merge } from '~/src/server/plugins/nunjucks/filters/merge.js'
+export { highlight } from './highlight.js'
+export { inspect } from './inspect.js'
+export { evaluate } from './evaluate.js'
+export { answer } from './answer.js'
+export { href } from './href.js'
+export { field } from './field.js'
+export { page } from './page.js'
+export { merge } from './merge.js'

package/src/server/plugins/nunjucks/filters/page.js

@@ -20,5 +20,5 @@ export function page(path) {
 }
 
 /**
- * @import { NunjucksContext } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { NunjucksContext } from '../types.js'
  */

package/src/server/plugins/nunjucks/index.js

@@ -1,3 +1,3 @@
-export * as render from '~/src/server/plugins/nunjucks/render.js'
-export { environment } from '~/src/server/plugins/nunjucks/environment.js'
-export { plugin } from '~/src/server/plugins/nunjucks/plugin.js'
+export * as render from './render.js'
+export { environment } from './environment.js'
+export { plugin } from './plugin.js'

package/src/server/plugins/nunjucks/plugin.js

@@ -1,12 +1,12 @@
 import vision from '@hapi/vision'
 import nunjucks from 'nunjucks'
 
-import { config } from '~/src/config/index.js'
-import { context } from '~/src/server/plugins/nunjucks/context.js'
+import { config } from '../../../config/index.js'
+import { context } from './context.js'
 import {
   environment,
   paths
-} from '~/src/server/plugins/nunjucks/environment.js'
+} from './environment.js'
 
 /**
  * @type {ServerRegisterPluginObject<ServerViewsConfiguration>}

package/src/server/plugins/nunjucks/render.js

@@ -1,4 +1,4 @@
-import { environment } from '~/src/server/plugins/nunjucks/environment.js'
+import { environment } from './environment.js'
 
 /**
  * Render Nunjucks macro
@@ -38,5 +38,5 @@ export function view(viewPath, options) {
 }
 
 /**
- * @import { MacroOptions, RenderOptions } from '~/src/server/plugins/nunjucks/types.js'
+ * @import { MacroOptions, RenderOptions } from './types.js'
  */

package/src/server/plugins/nunjucks/types.js

@@ -27,5 +27,5 @@
  */
 
 /**
- * @import { FormContext } from '~/src/server/plugins/engine/types.js'
+ * @import { FormContext } from '../engine/types.js'
  */

package/src/server/plugins/payment/helper.js

@@ -1,6 +1,6 @@
 import { format } from 'date-fns'
 
-import { PaymentService } from '~/src/server/plugins/payment/service.js'
+import { PaymentService } from './service.js'
 
 export const DEFAULT_PAYMENT_HELP_URL =
   'https://www.gov.uk/government/organisations/department-for-environment-food-rural-affairs'
@@ -51,5 +51,5 @@ export function formatCurrency(amount, locale = 'en-GB', currency = 'GBP') {
 }
 
 /**
- * @import { FormsService } from '~/src/server/types.js'
+ * @import { FormsService } from '../../types.js'
  */