Merge pull request #383 from spencermountain/dev

Dev
spencermountain · Apr 12, 2023 · 53f68ca · 53f68ca
2 parents 59b27f0 + 495dba3
commit 53f68ca
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/builds/spacetime.cjs b/builds/spacetime.cjs
@@ -1,4 +1,4 @@
-/* spencermountain/spacetime 7.4.2 Apache 2.0 */
+/* spencermountain/spacetime 7.4.3 Apache 2.0 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -2940,7 +2940,11 @@
     if (n <= 0) {
       n = 0;
     } else if (n >= 365) {
-      n = 364;
+      if (isLeapYear(s.year())) {
+        n = 365;
+      } else {
+        n = 364;
+      }
     }
     s = s.startOf('year');
     s = s.add(n, 'day');
@@ -4016,7 +4020,7 @@
   };
   var whereIts$1 = whereIts;
 
-  var version = '7.4.2';
+  var version = '7.4.3';
 
   const main = (input, tz, options) => new Spacetime(input, tz, options);
 

diff --git a/builds/spacetime.min.js b/builds/spacetime.min.js
diff --git a/builds/spacetime.mjs b/builds/spacetime.mjs
diff --git a/changelog.md b/changelog.md
@@ -9,6 +9,9 @@ This project follows semVer, where:
 
  -->
 
+ ### 7.4.3 [April 2023]
+ - **[fix]** - support leap-years in setting dayOfYear() #382
+
  ### 7.4.2 [Mar 2023]
  - **[change]** - Iran off of dst #379
  - **[change]** - mexico off of dst #378

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spacetime",
-  "version": "7.4.2",
+  "version": "7.4.3",
   "description": "figure-out dates across timezones",
   "main": "src/index.js",
   "unpkg": "builds/spacetime.min.js",

diff --git a/scratch.js b/scratch.js
@@ -3,4 +3,7 @@ import spacetime from './src/index.js'
 
 // spacetime.extend(require('./plugins/holiday'))
 
-const assignmentDate = spacetime("2022-11-21T00:00:00.000Z").i18n({}).format("{day-short}, {month-short}, {date}, {year}");
+let s = spacetime()
+s = s.year(2020)
+s = s.dayOfYear(366);
+console.log(s.json())
diff --git a/src/_version.js b/src/_version.js
@@ -1 +1 @@
-export default '7.4.2'
+export default '7.4.3'
diff --git a/src/methods/set/set.js b/src/methods/set/set.js
@@ -243,7 +243,11 @@ const dayOfYear = function (s, n, goFwd) {
   if (n <= 0) {
     n = 0
   } else if (n >= 365) {
-    n = 364
+    if (isLeapYear(s.year())) {
+      n = 365
+    } else {
+      n = 364
+    }
   }
   s = s.startOf('year')
   s = s.add(n, 'day')