@defra/lis-infra-ui-services 0.47.0 → 0.48.0

package/README.md

@@ -47,7 +47,6 @@ import { createNunjucksConfig } from '@defra/lis-infra-ui-services/nunjucks/plug
 const nunjucksConfig = createNunjucksConfig({
   config, // reads root, assetPath, serviceName, isProduction, nunjucks.watch, nunjucks.noCache
   logger,
-  getRequestBasePath,
   moduleId: 'cattle-home' // spokes only
 })
 
@@ -62,22 +61,24 @@ individual `/nunjucks/format-currency`, `/nunjucks/format-date` and `/nunjucks/q
 subpaths. `/nunjucks/globals` exports `PERMISSIONS` and `govukRebrand` (always `true`, which turns
 on the GOV.UK rebrand in templates).
 
-### Base path
+### Asset path
 
-Hubs serve spokes under a path prefix. `createBasePathHelpersForConfig` gives the helpers
-`getRequestBasePath`, `buildAppPath`, `isPrefixedRequest`, `getRouteVariants` and `getAssetPaths`. The
-prefix comes from the module in `@defra/lis-hubs-infra-registry`.
+A hub serves its built CSS and JavaScript at its configured `assetPath`. A spoke serves its own at
+its `assets` mount from `@defra/lis-hubs-infra-registry` (`/assets/cattle-home`), which the hub
+proxies to it unchanged, so the same URL works through a hub or directly.
+`createAssetPathHelpers` resolves that root once; `getAssetPaths` feeds the static files plugin and
+the Nunjucks context derives the same root itself from `moduleId`.
 
 ```js
-import { createBasePathHelpersForConfig } from '@defra/lis-infra-ui-services/base-path'
+import { createAssetPathHelpers } from '@defra/lis-infra-ui-services/asset-path'
 
-const { getRequestBasePath, getAssetPaths } = createBasePathHelpersForConfig({
+const { getAssetPaths } = createAssetPathHelpers({
   moduleId: 'cattle-home', // leave out in a hub
   assetPath: config.get('assetPath')
 })
 ```
 
-The standalone functions of the same names are exported too.
+The standalone `getAssetRoot` is exported too.
 
 ### Static files
 
@@ -246,7 +247,6 @@ The contact link on these pages comes from the `errorPages` option of `createNun
 createNunjucksConfig({
   config,
   logger,
-  getRequestBasePath,
   errorPages: {
     contactHref:
       'https://www.gov.uk/government/organisations/british-cattle-movement-service' // default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/lis-infra-ui-services",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "description": "UI-Services shared definitions for the livestock taxonomy topology.",
   "main": "src/index.js",
   "repository": {
@@ -9,7 +9,7 @@
   },
   "exports": {
     ".": "./src/index.js",
-    "./base-path": "./src/base-path.js",
+    "./asset-path": "./src/asset-path.js",
     "./config-formats": "./src/config-formats.js",
     "./cookies": "./src/cookies/index.js",
     "./cookies/cookies-policy": "./src/cookies/cookies-policy.js",
@@ -77,13 +77,13 @@
   "peerDependencies": {
     "@defra/lis-hubs-infra-access": ">=0.29.0 <1.0.0",
     "@defra/lis-hubs-infra-core": ">=0.4.0 <1.0.0",
-    "@defra/lis-hubs-infra-registry": ">=0.6.0 <1.0.0",
+    "@defra/lis-hubs-infra-registry": ">=0.13.0 <1.0.0",
     "govuk-frontend": ">=6.5.0 <7.0.0"
   },
   "devDependencies": {
     "@defra/lis-hubs-infra-access": "^0.35.0",
     "@defra/lis-hubs-infra-core": "^0.17.0",
-    "@defra/lis-hubs-infra-registry": "^0.6.0",
+    "@defra/lis-hubs-infra-registry": "^0.13.0",
     "@defra/lis-infra-eslint-config": "^0.6.0",
     "@hapi/hapi": "^21.4.10",
     "@vitest/coverage-istanbul": "^4.1.10",

package/src/asset-path.js

@@ -0,0 +1,31 @@
+import { getMountPath } from '@defra/lis-hubs-infra-registry'
+
+/**
+ * Where an app's built CSS and JavaScript are served from. A hub serves its
+ * own at its configured asset path. A spoke serves its own at its `assets`
+ * mount from the registry, which the hub proxies to it unchanged, so the
+ * same URL works whether the spoke is reached through a hub or directly.
+ *
+ * @param {{ moduleId?: string, assetPath: string }} options the module id of a spoke (leave out in a hub) and the hub's own asset path
+ * @returns {string}
+ */
+export function getAssetRoot({ moduleId, assetPath }) {
+  return moduleId ? getMountPath(moduleId, 'assets') : assetPath
+}
+
+/**
+ * @param {{ moduleId?: string, assetPath: string }} options
+ * @returns {{ getAssetRoot: () => string, getAssetPaths: () => string[] }}
+ */
+export function createAssetPathHelpers({ moduleId, assetPath }) {
+  const assetRoot = getAssetRoot({ moduleId, assetPath })
+
+  return {
+    getAssetRoot() {
+      return assetRoot
+    },
+    getAssetPaths() {
+      return [assetRoot]
+    }
+  }
+}

package/src/asset-path.test.js

@@ -0,0 +1,89 @@
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+import { getMountPath } from '@defra/lis-hubs-infra-registry'
+import { createAssetPathHelpers, getAssetRoot } from './asset-path.js'
+
+vi.mock('@defra/lis-hubs-infra-registry', () => ({ getMountPath: vi.fn() }))
+
+const mocks = {
+  getMountPath: vi.mocked(getMountPath)
+}
+
+describe('getAssetRoot()', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  test('is the assets mount of the module when a moduleId is given', () => {
+    // Arrange
+    mocks.getMountPath.mockReturnValue('/assets/cattle-register')
+
+    // Act
+    const result = getAssetRoot({
+      moduleId: 'cattle-register',
+      assetPath: '/public'
+    })
+
+    // Assert
+    expect(mocks.getMountPath).toHaveBeenCalledWith('cattle-register', 'assets')
+    expect(result).toBe('/assets/cattle-register')
+  })
+
+  test('is the configured asset path when no moduleId is given', () => {
+    // Act
+    const result = getAssetRoot({ assetPath: '/public' })
+
+    // Assert
+    expect(result).toBe('/public')
+    expect(mocks.getMountPath).not.toHaveBeenCalled()
+  })
+
+  test('propagates an unknown module', () => {
+    // Arrange
+    mocks.getMountPath.mockImplementation(() => {
+      throw new Error('No module registered with id "unknown"')
+    })
+
+    // Act
+    let error
+    try {
+      getAssetRoot({ moduleId: 'unknown', assetPath: '/public' })
+    } catch (e) {
+      error = e
+    }
+
+    // Assert
+    expect(error).toEqual(new Error('No module registered with id "unknown"'))
+  })
+})
+
+describe('createAssetPathHelpers()', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  test('resolves the asset root once and serves assets there', () => {
+    // Arrange
+    mocks.getMountPath.mockReturnValue('/assets/cattle-register')
+
+    // Act
+    const helpers = createAssetPathHelpers({
+      moduleId: 'cattle-register',
+      assetPath: '/public'
+    })
+
+    // Assert
+    expect(helpers.getAssetRoot()).toBe('/assets/cattle-register')
+    expect(helpers.getAssetPaths()).toEqual(['/assets/cattle-register'])
+    expect(mocks.getMountPath).toHaveBeenCalledTimes(1)
+  })
+
+  test('serves a hub its own asset path', () => {
+    // Act
+    const helpers = createAssetPathHelpers({ assetPath: '/public' })
+
+    // Assert
+    expect(helpers.getAssetRoot()).toBe('/public')
+    expect(helpers.getAssetPaths()).toEqual(['/public'])
+  })
+})

package/src/nunjucks/context.js

@@ -3,6 +3,8 @@ import path from 'node:path'
 import { hasPermission } from '@defra/lis-hubs-infra-access/authorization'
 import { HUBS, getModuleById } from '@defra/lis-hubs-infra-registry'
 
+import { getAssetRoot } from '../asset-path.js'
+
 import { COOKIES_PATH, getCookiesPolicy } from '../cookies/cookies-policy.js'
 
 const HUB_SERVICE_NAME_PREFIX = 'lis-hubs-'
@@ -57,12 +59,11 @@ function createPermissionCheck(request) {
  */
 
 /**
- * @param {{ config: object, getRequestBasePath: Function, logger: object, readFileSync: Function, moduleId?: string, errorPages?: ErrorPageLinks }} options
+ * @param {{ config: object, logger: object, readFileSync: Function, moduleId?: string, errorPages?: ErrorPageLinks }} options
  * @returns {Function}
  */
 export function createNunjucksContextBuilder({
   config,
-  getRequestBasePath,
   logger,
   readFileSync,
   moduleId,
@@ -72,6 +73,10 @@ export function createNunjucksContextBuilder({
     contactHref: errorPages.contactHref ?? BCMS_CONTACT_HREF
   }
   const sectionName = moduleId ? (getModuleById(moduleId)?.label ?? null) : null
+  const assetRoot = getAssetRoot({
+    moduleId,
+    assetPath: config.get('assetPath')
+  })
   const manifestPath = path.join(
     config.get('root'),
     '.public/.vite/manifest.json'
@@ -93,8 +98,6 @@ export function createNunjucksContextBuilder({
       }
     }
 
-    const requestBasePath = getRequestBasePath(request)
-    const assetRoot = `${requestBasePath}${config.get('assetPath')}`
     const requestHubId = resolveHubId(request)
 
     return {

package/src/nunjucks/context.test.js

@@ -1,8 +1,14 @@
 import assert from 'node:assert/strict'
-import { describe, expect, test } from 'vitest'
+import { describe, expect, test, vi } from 'vitest'
 
+import { getMountPath } from '@defra/lis-hubs-infra-registry'
 import { createNunjucksContextBuilder } from './context.js'
 
+vi.mock('@defra/lis-hubs-infra-registry', async (importOriginal) => ({
+  ...(await importOriginal()),
+  getMountPath: vi.fn()
+}))
+
 function createConfig(overrides = {}) {
   const values = {
     root: '/workspace/example-app',
@@ -23,7 +29,6 @@ test('createNunjucksContextBuilder resolves built asset paths from the Vite mani
   const loggerMessages = []
   const contextBuilder = createNunjucksContextBuilder({
     config: createConfig(),
-    getRequestBasePath: () => '',
     logger: {
       error(loggedError, message) {
         loggerMessages.push(message)
@@ -51,7 +56,6 @@ test('createNunjucksContextBuilder falls back to the source asset path without l
   const loggerMessages = []
   const contextBuilder = createNunjucksContextBuilder({
     config: createConfig(),
-    getRequestBasePath: () => '',
     logger: {
       error(loggedError, message) {
         loggerMessages.push(message)
@@ -75,7 +79,6 @@ test('createNunjucksContextBuilder resolves sectionName from the module registry
   const loggerMessages = []
   const contextBuilder = createNunjucksContextBuilder({
     config: createConfig(),
-    getRequestBasePath: () => '',
     logger: {
       error(loggedError, message) {
         loggerMessages.push(message)
@@ -95,7 +98,6 @@ test('createNunjucksContextBuilder leaves sectionName null when no moduleId is g
   const loggerMessages = []
   const contextBuilder = createNunjucksContextBuilder({
     config: createConfig(),
-    getRequestBasePath: () => '',
     logger: {
       error(loggedError, message) {
         loggerMessages.push(message)
@@ -114,7 +116,6 @@ test('createNunjucksContextBuilder logs once when the Vite manifest is unavailab
   const loggerMessages = []
   const contextBuilder = createNunjucksContextBuilder({
     config: createConfig({ isProduction: true }),
-    getRequestBasePath: () => '',
     logger: {
       error(loggedError, message) {
         loggerMessages.push(message)
@@ -134,11 +135,12 @@ test('createNunjucksContextBuilder logs once when the Vite manifest is unavailab
   assert.deepEqual(loggerMessages, ['Vite manifest.json not found'])
 })
 
-test('createNunjucksContextBuilder always sets serviceUrl to the hub root even when rendered under a spoke base path', () => {
+test('createNunjucksContextBuilder serves a spoke its assets from its assets mount, with serviceUrl still the hub root', () => {
   const loggerMessages = []
+  vi.mocked(getMountPath).mockReturnValue('/assets/cattle-register')
   const contextBuilder = createNunjucksContextBuilder({
     config: createConfig(),
-    getRequestBasePath: () => '/cattle/register',
+    moduleId: 'cattle-register',
     logger: {
       error(loggedError, message) {
         loggerMessages.push(message)
@@ -155,15 +157,19 @@ test('createNunjucksContextBuilder always sets serviceUrl to the hub root even w
 
   const context = contextBuilder({ headers: {}, path: '/' })
 
+  expect(getMountPath).toHaveBeenCalledWith('cattle-register', 'assets')
   assert.equal(context.serviceUrl, '/')
-  assert.equal(context.assetPath, '/cattle/register/public/assets')
+  assert.equal(context.assetPath, '/assets/cattle-register/assets')
+  assert.equal(
+    context.getAssetPath('src/client/stylesheets/application.scss'),
+    '/assets/cattle-register/assets/application-123.css'
+  )
   assert.deepEqual(loggerMessages, [])
 })
 
 function createSignedInContextBuilder() {
   return createNunjucksContextBuilder({
     config: createConfig(),
-    getRequestBasePath: () => '',
     logger: { error: () => undefined },
     readFileSync: () => '{}'
   })
@@ -252,7 +258,6 @@ describe('createNunjucksContextBuilder() hub flags', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}',
       moduleId: 'cattle-register'
@@ -275,7 +280,6 @@ describe('createNunjucksContextBuilder() hub flags', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}',
       moduleId: 'cattle-register'
@@ -298,7 +302,6 @@ describe('createNunjucksContextBuilder() hub flags', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}',
       moduleId: 'cattle-register'
@@ -317,7 +320,6 @@ describe('createNunjucksContextBuilder() hub flags', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}',
       moduleId: 'cattle-register'
@@ -342,7 +344,6 @@ describe('createNunjucksContextBuilder() errorPages', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}'
     })
@@ -362,7 +363,6 @@ describe('createNunjucksContextBuilder() errorPages', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}',
       errorPages: {
@@ -384,7 +384,6 @@ describe('createNunjucksContextBuilder() errorPages', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}',
       errorPages: { contactHref: undefined }
@@ -407,7 +406,6 @@ describe('createNunjucksContextBuilder() hasPermission()', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}'
     })
@@ -436,7 +434,6 @@ describe('createNunjucksContextBuilder() hasPermission()', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}'
     })
@@ -465,7 +462,6 @@ describe('createNunjucksContextBuilder() hasPermission()', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}'
     })
@@ -494,7 +490,6 @@ describe('createNunjucksContextBuilder() hasPermission()', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}'
     })
@@ -523,7 +518,6 @@ describe('createNunjucksContextBuilder() hasPermission()', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}'
     })
@@ -543,7 +537,6 @@ describe('createNunjucksContextBuilder() hasPermission()', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}'
     })
@@ -571,7 +564,6 @@ describe('createNunjucksContextBuilder() hasPermission()', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}'
     })
@@ -597,7 +589,6 @@ describe('createNunjucksContextBuilder() hasPermission()', () => {
     // Arrange
     const contextBuilder = createNunjucksContextBuilder({
       config: createConfig(),
-      getRequestBasePath: () => '',
       logger: {},
       readFileSync: () => '{}'
     })

package/src/nunjucks/plugin.js

@@ -99,16 +99,10 @@ function buildNunjucksEnvironment({
 
 /**
  * @import { ErrorPageLinks } from './context.js'
- * @param {{ config: object, logger: object, getRequestBasePath: Function, moduleId?: string, errorPages?: ErrorPageLinks }} options
+ * @param {{ config: object, logger: object, moduleId?: string, errorPages?: ErrorPageLinks }} options
  * @returns {object}
  */
-export function createNunjucksConfig({
-  config,
-  logger,
-  getRequestBasePath,
-  moduleId,
-  errorPages
-}) {
+export function createNunjucksConfig({ config, logger, moduleId, errorPages }) {
   const projectRoot = config.get('root')
   const infrastructureRoot = path.resolve(
     path.dirname(fileURLToPath(import.meta.url)),
@@ -124,7 +118,6 @@ export function createNunjucksConfig({
 
   const context = createNunjucksContextBuilder({
     config,
-    getRequestBasePath,
     logger,
     readFileSync,
     moduleId,

package/src/nunjucks/plugin.test.js

@@ -46,7 +46,7 @@ describe('createNunjucksConfig()', () => {
     rmSync(projectRoot, { recursive: true, force: true })
   })
 
-  test('defaults to an empty base path when no moduleId is given', () => {
+  test('builds a config for a hub when no moduleId is given', () => {
     // Arrange
     const config = {
       get: vi.fn((key) => (key === 'root' ? projectRoot : false))
@@ -55,8 +55,7 @@ describe('createNunjucksConfig()', () => {
     // Act
     const nunjucksConfig = createNunjucksConfig({
       config,
-      logger: {},
-      getRequestBasePath: vi.fn()
+      logger: {}
     })
 
     // Assert
@@ -77,8 +76,7 @@ describe('createNunjucksConfig()', () => {
     // Act
     createNunjucksConfig({
       config,
-      logger: {},
-      getRequestBasePath: vi.fn()
+      logger: {}
     })
 
     // Assert
@@ -101,7 +99,6 @@ describe('createNunjucksConfig()', () => {
     const nunjucksConfig = createNunjucksConfig({
       config,
       logger: {},
-      getRequestBasePath: vi.fn(() => ''),
       errorPages
     })
     const context = nunjucksConfig.options.context({ headers: {}, path: '/' })

package/src/base-path.js

@@ -1,148 +0,0 @@
-/** @import { Request } from '@hapi/hapi' */
-
-import { getBasePathForModule } from '@defra/lis-hubs-infra-registry'
-
-function normalizePath(path) {
-  if (!path || path === '/') {
-    return '/'
-  }
-
-  return path.startsWith('/') ? path : `/${path}`
-}
-
-function normalizeBasePath(path) {
-  if (!path) {
-    return ''
-  }
-
-  const normalizedPath = normalizePath(path)
-
-  return normalizedPath === '/' ? '' : normalizedPath
-}
-
-function getForwardedPrefix(request) {
-  const forwardedPrefix = request?.headers?.['x-forwarded-prefix']
-
-  if (typeof forwardedPrefix !== 'string') {
-    return ''
-  }
-
-  return normalizeBasePath(forwardedPrefix.trim())
-}
-
-/**
- * @param {{ request: Request, basePath: string }} options
- * @returns {boolean}
- */
-export function isPrefixedRequest({ request, basePath }) {
-  const normalizedBasePath = normalizeBasePath(basePath)
-
-  if (!normalizedBasePath || !request) {
-    return false
-  }
-
-  const forwardedPrefix = getForwardedPrefix(request)
-
-  if (forwardedPrefix) {
-    return forwardedPrefix === normalizedBasePath
-  }
-
-  return (
-    request.path === normalizedBasePath ||
-    request.path.startsWith(`${normalizedBasePath}/`)
-  )
-}
-
-/**
- * @param {{ request: Request, basePath: string }} options
- * @returns {string}
- */
-export function getRequestBasePath({ request, basePath }) {
-  const normalizedBasePath = normalizeBasePath(basePath)
-
-  return isPrefixedRequest({ request, basePath: normalizedBasePath })
-    ? normalizedBasePath
-    : ''
-}
-
-/**
- * @param {{ request: Request, routePath?: string, basePath?: string }} options
- * @returns {string}
- */
-export function buildAppPath({ request, routePath = '/', basePath = '' }) {
-  const requestBasePath = getRequestBasePath({ request, basePath })
-  const normalizedPath = normalizePath(routePath)
-
-  if (normalizedPath === '/') {
-    return requestBasePath || '/'
-  }
-
-  return `${requestBasePath}${normalizedPath}`
-}
-
-/**
- * @param {{ routePath?: string, basePath?: string }} options
- * @returns {string[]}
- */
-export function getRouteVariants({
-  routePath = '/',
-  basePath: _basePath = ''
-}) {
-  const normalizedPath = normalizePath(routePath)
-  return [normalizedPath]
-}
-
-/**
- * @param {{ basePath?: string, assetPath: string }} options
- * @returns {string[]}
- */
-export function getAssetPaths({ basePath: _basePath = '', assetPath }) {
-  return [assetPath]
-}
-
-/**
- * @param {{ moduleId?: string, assetPath: string }} options
- * @returns {object}
- */
-export function createBasePathHelpersForConfig({ moduleId, assetPath }) {
-  const basePath = moduleId ? getBasePathForModule(moduleId) : ''
-
-  function getBasePath() {
-    return basePath
-  }
-
-  return {
-    getBasePath,
-    isPrefixedRequest(request) {
-      return isPrefixedRequest({
-        request,
-        basePath: getBasePath()
-      })
-    },
-    getRequestBasePath(request) {
-      return getRequestBasePath({
-        request,
-        basePath: getBasePath()
-      })
-    },
-    buildAppPath(request, routePath = '/') {
-      return buildAppPath({
-        request,
-        routePath,
-        basePath: getBasePath()
-      })
-    },
-    getRouteVariants(routePath = '/') {
-      return getRouteVariants({
-        routePath,
-        basePath: getBasePath()
-      })
-    },
-    getAssetPaths() {
-      return getAssetPaths({
-        basePath: getBasePath(),
-        assetPath
-      })
-    }
-  }
-}

package/src/base-path.test.js

@@ -1,294 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from 'vitest'
-
-import { getBasePathForModule } from '@defra/lis-hubs-infra-registry'
-import {
-  buildAppPath,
-  createBasePathHelpersForConfig,
-  getAssetPaths,
-  getRequestBasePath,
-  getRouteVariants,
-  isPrefixedRequest
-} from './base-path.js'
-
-vi.mock('@defra/lis-hubs-infra-registry')
-
-const mocks = {
-  getBasePathForModule: vi.mocked(getBasePathForModule)
-}
-
-describe('isPrefixedRequest()', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  test('detects a forwarded prefix that matches the configured base path', () => {
-    // Arrange
-    const request = {
-      path: '/about',
-      headers: {
-        'x-forwarded-prefix': '/chicken/move'
-      }
-    }
-
-    // Act
-    const result = isPrefixedRequest({ request, basePath: '/chicken/move' })
-
-    // Assert
-    expect(result).toBe(true)
-  })
-
-  test('ignores a forwarded prefix that does not match the configured base path', () => {
-    // Arrange
-    const request = {
-      path: '/about',
-      headers: {
-        'x-forwarded-prefix': '/goat/move'
-      }
-    }
-
-    // Act
-    const result = isPrefixedRequest({ request, basePath: '/chicken/move' })
-
-    // Assert
-    expect(result).toBe(false)
-  })
-})
-
-describe('getRequestBasePath()', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  test('preserves direct requests to the configured base path', () => {
-    // Arrange
-    const request = {
-      path: '/chicken/move/about',
-      headers: {}
-    }
-
-    // Act
-    const result = getRequestBasePath({ request, basePath: '/chicken/move' })
-
-    // Assert
-    expect(result).toBe('/chicken/move')
-  })
-})
-
-describe('buildAppPath()', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  test('uses the forwarded prefix for outbound paths when present', () => {
-    // Arrange
-    const request = {
-      path: '/about',
-      headers: {
-        'x-forwarded-prefix': '/chicken/move'
-      }
-    }
-
-    // Act
-    const result = buildAppPath({
-      request,
-      routePath: '/more-info',
-      basePath: '/chicken/move'
-    })
-
-    // Assert
-    expect(result).toBe('/chicken/move/more-info')
-  })
-
-  test('returns just the base path for the root route', () => {
-    // Arrange
-    const request = {
-      path: '/chicken/move',
-      headers: {}
-    }
-
-    // Act
-    const result = buildAppPath({
-      request,
-      routePath: '/',
-      basePath: '/chicken/move'
-    })
-
-    // Assert
-    expect(result).toBe('/chicken/move')
-  })
-
-  test('falls back to / for the root route with no base path', () => {
-    // Arrange
-    const request = {
-      path: '/',
-      headers: {}
-    }
-
-    // Act
-    const result = buildAppPath({ request, routePath: '/' })
-
-    // Assert
-    expect(result).toBe('/')
-  })
-})
-
-describe('getRouteVariants()', () => {
-  test('only returns the internal route path', () => {
-    // Arrange
-    const routePath = '/about'
-
-    // Act
-    const result = getRouteVariants({ routePath, basePath: '/chicken/move' })
-
-    // Assert
-    expect(result).toEqual(['/about'])
-  })
-})
-
-describe('getAssetPaths()', () => {
-  test('only returns the internal asset path', () => {
-    // Arrange
-    const assetPath = '/public'
-
-    // Act
-    const result = getAssetPaths({ basePath: '/chicken/move', assetPath })
-
-    // Assert
-    expect(result).toEqual(['/public'])
-  })
-})
-
-describe('createBasePathHelpersForConfig()', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  test('resolves the base path from the module registry when moduleId is given', () => {
-    // Arrange
-    mocks.getBasePathForModule.mockReturnValue('/cattle/register')
-
-    // Act
-    const helpers = createBasePathHelpersForConfig({
-      moduleId: 'cattle-register',
-      assetPath: '/public'
-    })
-
-    // Assert
-    expect(mocks.getBasePathForModule).toHaveBeenCalledWith('cattle-register')
-    expect(helpers.getBasePath()).toBe('/cattle/register')
-  })
-
-  test('defaults to an empty base path when no moduleId is given', () => {
-    // Arrange
-    // Act
-    const helpers = createBasePathHelpersForConfig({ assetPath: '/public' })
-
-    // Assert
-    expect(helpers.getBasePath()).toBe('')
-    expect(mocks.getBasePathForModule).not.toHaveBeenCalled()
-  })
-
-  test('binds the resolved base path to isPrefixedRequest', () => {
-    // Arrange
-    mocks.getBasePathForModule.mockReturnValue('/cattle/register')
-    const helpers = createBasePathHelpersForConfig({
-      moduleId: 'cattle-register',
-      assetPath: '/public'
-    })
-    const request = {
-      path: '/cattle/register/about',
-      headers: {}
-    }
-
-    // Act
-    const result = helpers.isPrefixedRequest(request)
-
-    // Assert
-    expect(result).toBe(true)
-  })
-
-  test('binds the resolved base path to getRequestBasePath', () => {
-    // Arrange
-    mocks.getBasePathForModule.mockReturnValue('/cattle/register')
-    const helpers = createBasePathHelpersForConfig({
-      moduleId: 'cattle-register',
-      assetPath: '/public'
-    })
-    const request = {
-      path: '/cattle/register/about',
-      headers: {}
-    }
-
-    // Act
-    const result = helpers.getRequestBasePath(request)
-
-    // Assert
-    expect(result).toBe('/cattle/register')
-  })
-
-  test('binds the resolved base path to buildAppPath', () => {
-    // Arrange
-    mocks.getBasePathForModule.mockReturnValue('/cattle/register')
-    const helpers = createBasePathHelpersForConfig({
-      moduleId: 'cattle-register',
-      assetPath: '/public'
-    })
-    const request = {
-      path: '/cattle/register/about',
-      headers: {}
-    }
-
-    // Act
-    const result = helpers.buildAppPath(request, '/more-info')
-
-    // Assert
-    expect(result).toBe('/cattle/register/more-info')
-  })
-
-  test('binds the resolved base path to getRouteVariants', () => {
-    // Arrange
-    mocks.getBasePathForModule.mockReturnValue('/cattle/register')
-    const helpers = createBasePathHelpersForConfig({
-      moduleId: 'cattle-register',
-      assetPath: '/public'
-    })
-
-    // Act
-    const result = helpers.getRouteVariants('/about')
-
-    // Assert
-    expect(result).toEqual(['/about'])
-  })
-
-  test('defaults buildAppPath and getRouteVariants to the root route path', () => {
-    // Arrange
-    mocks.getBasePathForModule.mockReturnValue('/cattle/register')
-    const helpers = createBasePathHelpersForConfig({
-      moduleId: 'cattle-register',
-      assetPath: '/public'
-    })
-    const request = {
-      path: '/cattle/register',
-      headers: {}
-    }
-
-    // Act
-    const appPath = helpers.buildAppPath(request)
-    const routeVariants = helpers.getRouteVariants()
-
-    // Assert
-    expect(appPath).toBe('/cattle/register')
-    expect(routeVariants).toEqual(['/'])
-  })
-
-  test('binds the configured asset path to getAssetPaths', () => {
-    // Arrange
-    const helpers = createBasePathHelpersForConfig({ assetPath: '/public' })
-
-    // Act
-    const result = helpers.getAssetPaths()
-
-    // Assert
-    expect(result).toEqual(['/public'])
-  })
-})