@defra/lis-infra-ui-services 0.15.0 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/lis-infra-ui-services",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "UI-Services shared definitions for the livestock taxonomy topology.",
   "main": "src/index.js",
   "repository": {

package/src/nunjucks/format-age.js

@@ -3,8 +3,8 @@ import { intervalToDuration, isDate, isValid, parseISO } from 'date-fns'
 /**
  * @param {Date | string} dateOfBirth
  * @param {Date} [now]
- * @returns {string} e.g. "3 years, 6 months", "3 years" for a whole number
- *   of years, or "6 months" for an animal under a year old. Empty when there
+ * @returns {string} e.g. "3 years, 6 months", "3 years, 0 months" or
+ *   "0 years, 6 months", or "Less than 1 month" under a month. Empty when there
  *   is no usable date of birth - missing, unparseable or in the future - so
  *   a page never shows a made-up age.
  */
@@ -26,12 +26,8 @@ export function formatAge(dateOfBirth, now = new Date()) {
   const yearsText = `${years} year${years === 1 ? '' : 's'}`
   const monthsText = `${months} month${months === 1 ? '' : 's'}`
 
-  if (years === 0) {
-    return months === 0 ? 'Less than 1 month' : monthsText
-  }
-
-  if (months === 0) {
-    return yearsText
+  if (years === 0 && months === 0) {
+    return 'Less than 1 month'
   }
 
   return `${yearsText}, ${monthsText}`

package/src/nunjucks/format-age.test.js

@@ -27,7 +27,7 @@ describe('formatAge()', () => {
     expect(age).toBe('1 year, 1 month')
   })
 
-  test('it omits the months when the age is a whole number of years', () => {
+  test('it shows 0 months when the age is a whole number of years', () => {
     // Arrange
     const dateOfBirth = '2023-08-19'
     const now = new Date('2026-09-11')
@@ -36,10 +36,10 @@ describe('formatAge()', () => {
     const age = formatAge(dateOfBirth, now)
 
     // Assert
-    expect(age).toBe('3 years')
+    expect(age).toBe('3 years, 0 months')
   })
 
-  test('it uses the singular "year" for a whole number of exactly 1 year', () => {
+  test('it uses the singular "year" for exactly 1 year and 0 months', () => {
     // Arrange
     const dateOfBirth = '2025-08-19'
     const now = new Date('2026-09-11')
@@ -48,10 +48,10 @@ describe('formatAge()', () => {
     const age = formatAge(dateOfBirth, now)
 
     // Assert
-    expect(age).toBe('1 year')
+    expect(age).toBe('1 year, 0 months')
   })
 
-  test('it shows only the months for an animal under a year old', () => {
+  test('it shows 0 years for an animal under a year old', () => {
     // Arrange
     const dateOfBirth = '2026-03-10'
     const now = new Date('2026-09-10')
@@ -60,7 +60,7 @@ describe('formatAge()', () => {
     const age = formatAge(dateOfBirth, now)
 
     // Assert
-    expect(age).toBe('6 months')
+    expect(age).toBe('0 years, 6 months')
   })
 
   test('it uses the singular "month" for an animal exactly 1 month old', () => {
@@ -72,7 +72,7 @@ describe('formatAge()', () => {
     const age = formatAge(dateOfBirth, now)
 
     // Assert
-    expect(age).toBe('1 month')
+    expect(age).toBe('0 years, 1 month')
   })
 
   test('it shows "Less than 1 month" for an animal under a month old', () => {