fix discontinued state

andrej-dyck · May 5, 2024 · feb4a22 · feb4a22
1 parent 3018c8f
commit feb4a22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/endoflife.date.test.ts b/src/endoflife.date.test.ts
@@ -1072,6 +1072,10 @@ describe('cycle-state', () => {
       cycle: { cycle: '4', eol: futureDate, discontinued: earlierDate },
       expectedState: { state: 'discontinued', onDate: earlierDate, supportEndDate: futureDate } satisfies CycleState,
     },
+    {
+      cycle: { cycle: '4', eol: futureDate, discontinued: now },
+      expectedState: { state: 'discontinued', onDate: now, supportEndDate: futureDate } satisfies CycleState,
+    },
   ])('discontinued; %j', ({ cycle, expectedState }) => {
     expect(cycleState(cycle)(now)).toEqual(expectedState)
   })

diff --git a/src/endoflife.date.ts b/src/endoflife.date.ts
@@ -83,7 +83,7 @@ export const cycleState = (cycle: Cycle) => (now: Date): CycleState => {
     isDate(support) ? support : undefined
 
   const isDiscontinued = (discontinued: Cycle['discontinued']) =>
-    discontinued === true || (isDate(discontinued) && discontinued < now)
+    discontinued === true || (isDate(discontinued) && discontinued <= now)
 
   const discontinuedDate = ({ discontinued }: Pick<Cycle, 'discontinued'>) =>
     isDate(discontinued) ? discontinued : undefined