Merge pull request #298 from leduyquang753/applyDuration

Make `applyDuration` reversible

Author: camertron

Diff for: src/duration.ts

@@ -86,12 +86,21 @@ export class Duration {
 
 export function applyDuration(date: Date | number, duration: Duration): Date {
   const r = new Date(date)
-  r.setFullYear(r.getFullYear() + duration.years)
-  r.setMonth(r.getMonth() + duration.months)
-  r.setDate(r.getDate() + duration.weeks * 7 + duration.days)
-  r.setHours(r.getHours() + duration.hours)
-  r.setMinutes(r.getMinutes() + duration.minutes)
-  r.setSeconds(r.getSeconds() + duration.seconds)
+  if (duration.sign < 0) {
+    r.setUTCSeconds(r.getUTCSeconds() + duration.seconds)
+    r.setUTCMinutes(r.getUTCMinutes() + duration.minutes)
+    r.setUTCHours(r.getUTCHours() + duration.hours)
+    r.setUTCDate(r.getUTCDate() + duration.weeks * 7 + duration.days)
+    r.setUTCMonth(r.getUTCMonth() + duration.months)
+    r.setUTCFullYear(r.getUTCFullYear() + duration.years)
+  } else {
+    r.setUTCFullYear(r.getUTCFullYear() + duration.years)
+    r.setUTCMonth(r.getUTCMonth() + duration.months)
+    r.setUTCDate(r.getUTCDate() + duration.weeks * 7 + duration.days)
+    r.setUTCHours(r.getUTCHours() + duration.hours)
+    r.setUTCMinutes(r.getUTCMinutes() + duration.minutes)
+    r.setUTCSeconds(r.getUTCSeconds() + duration.seconds)
+  }
   return r
 }
 

Diff for: test/duration.ts

@@ -81,16 +81,19 @@ suite('duration', function () {
   })
 
   suite('applyDuration', function () {
-    const referenceDate = '2022-10-21T16:48:44.104Z'
     const tests = new Set([
-      {input: 'P4Y', expected: '2026-10-21T16:48:44.104Z'},
-      {input: '-P4Y', expected: '2018-10-21T16:48:44.104Z'},
-      {input: '-P3MT5M', expected: '2022-07-21T16:43:44.104Z'},
-      {input: 'P1Y2M3DT4H5M6S', expected: '2023-12-24T20:53:50.104Z'},
-      {input: 'P5W', expected: '2022-11-25T16:48:44.104Z'},
-      {input: '-P5W', expected: '2022-09-16T16:48:44.104Z'},
+      {referenceDate: '2022-10-21T16:48:44.104Z', input: 'P5W', expected: '2022-11-25T16:48:44.104Z'},
+      {referenceDate: '2022-11-25T16:48:44.104Z', input: '-P5W', expected: '2022-10-21T16:48:44.104Z'},
+      {referenceDate: '2022-07-21T16:43:44.104Z', input: 'P3MT5M', expected: '2022-10-21T16:48:44.104Z'},
+      {referenceDate: '2022-10-21T16:48:44.104Z', input: '-P3MT5M', expected: '2022-07-21T16:43:44.104Z'},
+      {referenceDate: '2022-10-21T16:48:44.104Z', input: 'P4Y', expected: '2026-10-21T16:48:44.104Z'},
+      {referenceDate: '2026-10-21T16:48:44.104Z', input: '-P4Y', expected: '2022-10-21T16:48:44.104Z'},
+      {referenceDate: '2022-10-21T16:48:44.104Z', input: 'P1Y2M3DT4H5M6S', expected: '2023-12-24T20:53:50.104Z'},
+      {referenceDate: '2023-12-24T20:53:50.104Z', input: '-P1Y2M3DT4H5M6S', expected: '2022-10-21T16:48:44.104Z'},
+      {referenceDate: '2023-08-15T00:00:00.000Z', input: 'P1Y3M25D', expected: '2024-12-10T00:00:00.000Z'},
+      {referenceDate: '2024-12-10T00:00:00.000Z', input: '-P1Y3M25D', expected: '2023-08-15T00:00:00.000Z'},
     ])
-    for (const {input, expected} of tests) {
+    for (const {referenceDate, input, expected} of tests) {
       test(`${referenceDate} -> ${input} -> ${expected}`, () => {
         assert.equal(applyDuration(new Date(referenceDate), Duration.from(input))?.toISOString(), expected)
       })