Merge branch 'master' into dev

spencermountain · Jul 30, 2024 · 59bcf11 · 59bcf11
2 parents fabb6e3 + b7088bc
commit 59bcf11
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/plugins/dates/builds/compromise-dates.cjs b/plugins/dates/builds/compromise-dates.cjs
@@ -5110,7 +5110,7 @@
         input.month = 'sep';
       }
       // set it to the beginning of the given unit
-      let d = spacetime(input, context.timezone, { today: today });
+      let d = spacetime(input, context.timezone, { today: today, dmy: context.dmy });
       Object.defineProperty(this, 'd', {
         enumerable: false,
         writable: true,

diff --git a/plugins/dates/builds/compromise-dates.min.js b/plugins/dates/builds/compromise-dates.min.js
diff --git a/plugins/dates/builds/compromise-dates.mjs b/plugins/dates/builds/compromise-dates.mjs
diff --git a/plugins/dates/src/api/parse/one/units/Unit.js b/plugins/dates/src/api/parse/one/units/Unit.js
@@ -17,7 +17,7 @@ class Unit {
       input.month = 'sep'
     }
     // set it to the beginning of the given unit
-    let d = spacetime(input, context.timezone, { today: today })
+    let d = spacetime(input, context.timezone, { today: today, dmy: context.dmy })
     Object.defineProperty(this, 'd', {
       enumerable: false,
       writable: true,

diff --git a/plugins/dates/tests/dmy.test.js b/plugins/dates/tests/dmy.test.js
@@ -0,0 +1,19 @@
+import test from 'tape'
+import nlp from './_lib.js'
+
+test('dmy option falsy', function (t) {
+  t.equal('March 26', nlp('03/26').dates().format('{month} {date}').text(), 'WITHOUT dmy option')
+  t.equal('March 26', nlp('03/26').dates({dmy:false}).format('{month} {date}').text(), 'WITHOUT dmy option')
+  t.equal('March 26', nlp('26/03').dates().format('{month} {date}').text(), 'WITHOUT dmy option')
+  t.equal('March 26', nlp('26/03').dates({dmy:false}).format('{month} {date}').text(), 'WITHOUT dmy option')
+  t.equal('March 4', nlp('03/04').dates().format('{month} {date}').text(), 'WITHOUT dmy option')
+  t.equal('March 4', nlp('03/04').dates({dmy:false}).format('{month} {date}').text(), 'WITHOUT dmy option')
+
+  t.end()
+})
+
+test('dmy option true', function (t) {
+  t.equal('April 3', nlp('03/04').dates({dmy: true}).format('{month} {date}').text(), 'WITH dmy option')
+
+  t.end()
+})