Merge pull request #91 from knowledgecode/develop

Develop

Author: knowledgecode

README.md

@@ -25,16 +25,16 @@ npm i date-and-time
 
 ## Recent Changes
 
+- 3.4.1
+  - Fixed an issue where `formatTZ()` would output 0:00 as 24:00 in 24-hour format in Node.js.
+
 - 3.4.0
   - Added `zz` (time zone name) and `z` (time zone name abbreviation) tokens to the `timezone` plugin.
   - Fixed an issue where token extensions by other plugins were not reflected in functions provided by the `timezone` plugin.
 
 - 3.3.0
   - Refactored `format()`, `isValid()`, and `preparse()`, further improved performance.
 
-- 3.2.0
-  - Refactored `compile()`, `format()`, and `preparse()`, slightly improved performance.
-
 ## Usage
 
 - ES Modules:

esm/plugin/timezone.es.js

@@ -551,10 +551,12 @@ var plugin = function (proto, date) {
                 case 'weekday':
                     values[type] = 'SunMonTueWedThuFriSat'.indexOf(value) / 3;
                     break;
+                case 'hour':
+                    values[type] = value % 24;
+                    break;
                 case 'year':
                 case 'month':
                 case 'day':
-                case 'hour':
                 case 'minute':
                 case 'second':
                 case 'fractionalSecond':

esm/plugin/timezone.mjs

@@ -551,10 +551,12 @@ var plugin = function (proto, date) {
                 case 'weekday':
                     values[type] = 'SunMonTueWedThuFriSat'.indexOf(value) / 3;
                     break;
+                case 'hour':
+                    values[type] = value % 24;
+                    break;
                 case 'year':
                 case 'month':
                 case 'day':
-                case 'hour':
                 case 'minute':
                 case 'second':
                 case 'fractionalSecond':

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "date-and-time",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "A Minimalist DateTime utility for Node.js and the browser",
   "main": "date-and-time.js",
   "module": "esm/date-and-time.es.js",
@@ -52,7 +52,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "expect.js": "^0.3.1",
     "mocha": "^10.6.0",
-    "rollup": "^4.18.0",
+    "rollup": "^4.18.1",
     "tsd": "^0.31.1"
   }
 }

package.json

@@ -557,10 +557,12 @@
                     case 'weekday':
                         values[type] = 'SunMonTueWedThuFriSat'.indexOf(value) / 3;
                         break;
+                    case 'hour':
+                        values[type] = value % 24;
+                        break;
                     case 'year':
                     case 'month':
                     case 'day':
-                    case 'hour':
                     case 'minute':
                     case 'second':
                     case 'fractionalSecond':

plugin/timezone.js

@@ -551,10 +551,12 @@ var plugin = function (proto, date) {
                 case 'weekday':
                     values[type] = 'SunMonTueWedThuFriSat'.indexOf(value) / 3;
                     break;
+                case 'hour':
+                    values[type] = value % 24;
+                    break;
                 case 'year':
                 case 'month':
                 case 'day':
-                case 'hour':
                 case 'minute':
                 case 'second':
                 case 'fractionalSecond':
@@ -667,4 +669,4 @@ var plugin = function (proto, date) {
     return name;
 };
 
-export default plugin;
+export default plugin;