date-and-time 3.4.1 → 3.6.0

package/esm/plugin/timezone.mjs

@@ -455,7 +455,7 @@ var plugin = function (proto, date) {
         'Alaska Daylight Time': 'AKDT', 'Alaska Standard Time': 'AKST', 'Almaty Standard Time': 'ALMT',
         'Almaty Summer Time': 'ALMST', 'Amazon Standard Time': 'AMT', 'Amazon Summer Time': 'AMST',
         'Anadyr Standard Time': 'ANAT', 'Anadyr Summer Time': 'ANAST', 'Apia Daylight Time': 'WSDT',
-        'Apia Standard Time': 'WSST', 'Aqtau Standard Time': 'AQTT', 'Aqtau Summer Time': 'AQTT',
+        'Apia Standard Time': 'WSST', 'Aqtau Standard Time': 'AQTT', 'Aqtau Summer Time': 'AQTST',
         'Aqtobe Standard Time': 'AQTT', 'Aqtobe Summer Time': 'AQST', 'Arabian Daylight Time': 'ADT',
         'Arabian Standard Time': 'AST', 'Argentina Standard Time': 'ART', 'Argentina Summer Time': 'ARST',
         'Armenia Standard Time': 'AMT', 'Armenia Summer Time': 'AMST', 'Atlantic Daylight Time': 'ADT',
@@ -471,19 +471,18 @@ var plugin = function (proto, date) {
         'Central Indonesia Time': 'WITA', 'Central Standard Time': 'CST', 'Chamorro Standard Time': 'ChST',
         'Chatham Daylight Time': 'CHADT', 'Chatham Standard Time': 'CHAST', 'Chile Standard Time': 'CLT',
         'Chile Summer Time': 'CLST', 'China Daylight Time': 'CDT', 'China Standard Time': 'CST',
-        'Choibalsan Standard Time': 'CHOT', 'Choibalsan Summer Time': 'CHOST', 'Christmas Island Time': 'CXT',
-        'Chuuk Time': 'CHUT', 'Cocos Islands Time': 'CCT', 'Colombia Standard Time': 'COT',
-        'Colombia Summer Time': 'COST', 'Cook Islands Half Summer Time': 'CKHST', 'Cook Islands Standard Time': 'CKT',
-        'Coordinated Universal Time': 'UTC', 'Cuba Daylight Time': 'CDT', 'Cuba Standard Time': 'CST',
-        'Davis Time': 'DAVT', 'Dumont-d’Urville Time': 'DDUT', 'East Africa Time': 'EAT',
-        'East Greenland Standard Time': 'EGST', 'East Greenland Summer Time': 'EGST', 'East Kazakhstan Time': 'ALMT',
-        'East Timor Time': 'TLT', 'Easter Island Standard Time': 'EAST', 'Easter Island Summer Time': 'EASST',
-        'Eastern Daylight Time': 'EDT', 'Eastern European Standard Time': 'EET', 'Eastern European Summer Time': 'EEST',
-        'Eastern Indonesia Time': 'WIT', 'Eastern Standard Time': 'EST', 'Ecuador Time': 'ECT',
-        'Falkland Islands Standard Time': 'FKST', 'Falkland Islands Summer Time': 'FKDT', 'Fernando de Noronha Standard Time': 'FNT',
-        'Fernando de Noronha Summer Time': 'FNST', 'Fiji Standard Time': 'FJT', 'Fiji Summer Time': 'FJST',
-        'French Guiana Time': 'GFT', 'French Southern & Antarctic Time': 'TFT', 'Further-eastern European Time': 'FET',
-        'GMT': 'GMT', 'Galapagos Time': 'GALT', 'Gambier Time': 'GAMT',
+        'Christmas Island Time': 'CXT', 'Chuuk Time': 'CHUT', 'Cocos Islands Time': 'CCT',
+        'Colombia Standard Time': 'COT', 'Colombia Summer Time': 'COST', 'Cook Islands Half Summer Time': 'CKHST',
+        'Cook Islands Standard Time': 'CKT', 'Coordinated Universal Time': 'UTC', 'Cuba Daylight Time': 'CDT',
+        'Cuba Standard Time': 'CST', 'Davis Time': 'DAVT', 'Dumont-d’Urville Time': 'DDUT',
+        'East Africa Time': 'EAT', 'East Greenland Standard Time': 'EGT', 'East Greenland Summer Time': 'EGST',
+        'East Kazakhstan Time': 'ALMT', 'East Timor Time': 'TLT', 'Easter Island Standard Time': 'EAST',
+        'Easter Island Summer Time': 'EASST', 'Eastern Daylight Time': 'EDT', 'Eastern European Standard Time': 'EET',
+        'Eastern European Summer Time': 'EEST', 'Eastern Indonesia Time': 'WIT', 'Eastern Standard Time': 'EST',
+        'Ecuador Time': 'ECT', 'Falkland Islands Standard Time': 'FKST', 'Falkland Islands Summer Time': 'FKDT',
+        'Fernando de Noronha Standard Time': 'FNT', 'Fernando de Noronha Summer Time': 'FNST', 'Fiji Standard Time': 'FJT',
+        'Fiji Summer Time': 'FJST', 'French Guiana Time': 'GFT', 'French Southern & Antarctic Time': 'TFT',
+        'Further-eastern European Time': 'FET', 'Galapagos Time': 'GALT', 'Gambier Time': 'GAMT',
         'Georgia Standard Time': 'GET', 'Georgia Summer Time': 'GEST', 'Gilbert Islands Time': 'GILT',
         'Greenwich Mean Time': 'GMT', 'Guam Standard Time': 'ChST', 'Gulf Standard Time': 'GST',
         'Guyana Time': 'GYT', 'Hawaii-Aleutian Daylight Time': 'HADT', 'Hawaii-Aleutian Standard Time': 'HAST',
@@ -495,7 +494,7 @@ var plugin = function (proto, date) {
         'Korean Daylight Time': 'KDT', 'Korean Standard Time': 'KST', 'Kosrae Time': 'KOST',
         'Krasnoyarsk Standard Time': 'KRAT', 'Krasnoyarsk Summer Time': 'KRAST', 'Kyrgyzstan Time': 'KGT',
         'Lanka Time': 'LKT', 'Line Islands Time': 'LINT', 'Lord Howe Daylight Time': 'LHDT',
-        'Lord Howe Standard Time': 'LHST', 'Macao Standard Time': 'CST', 'Macao Summer Time': 'CDST',
+        'Lord Howe Standard Time': 'LHST', 'Macao Standard Time': 'CST', 'Macao Summer Time': 'CDT',
         'Magadan Standard Time': 'MAGT', 'Magadan Summer Time': 'MAGST', 'Malaysia Time': 'MYT',
         'Maldives Time': 'MVT', 'Marquesas Time': 'MART', 'Marshall Islands Time': 'MHT',
         'Mauritius Standard Time': 'MUT', 'Mauritius Summer Time': 'MUST', 'Mawson Time': 'MAWT',
@@ -508,7 +507,7 @@ var plugin = function (proto, date) {
         'North Mariana Islands Time': 'ChST', 'Novosibirsk Standard Time': 'NOVT', 'Novosibirsk Summer Time': 'NOVST',
         'Omsk Standard Time': 'OMST', 'Omsk Summer Time': 'OMSST', 'Pacific Daylight Time': 'PDT',
         'Pacific Standard Time': 'PST', 'Pakistan Standard Time': 'PKT', 'Pakistan Summer Time': 'PKST',
-        'Palau Time': 'PWT', 'Papua New Guinea Time': 'PGT', 'Paraguay Standard Time': 'PYST',
+        'Palau Time': 'PWT', 'Papua New Guinea Time': 'PGT', 'Paraguay Standard Time': 'PYT',
         'Paraguay Summer Time': 'PYST', 'Peru Standard Time': 'PET', 'Peru Summer Time': 'PEST',
         'Petropavlovsk-Kamchatski Standard Time': 'PETT', 'Petropavlovsk-Kamchatski Summer Time': 'PETST', 'Philippine Standard Time': 'PST',
         'Philippine Summer Time': 'PHST', 'Phoenix Islands Time': 'PHOT', 'Pitcairn Time': 'PIT',
@@ -519,7 +518,7 @@ var plugin = function (proto, date) {
         'Singapore Standard Time': 'SGT', 'Solomon Islands Time': 'SBT', 'South Africa Standard Time': 'SAST',
         'South Georgia Time': 'GST', 'St. Pierre & Miquelon Daylight Time': 'PMDT', 'St. Pierre & Miquelon Standard Time': 'PMST',
         'Suriname Time': 'SRT', 'Syowa Time': 'SYOT', 'Tahiti Time': 'TAHT',
-        'Taipei Daylight Time': 'TDT', 'Taipei Standard Time': 'CST', 'Tajikistan Time': 'TJT',
+        'Taipei Daylight Time': 'CDT', 'Taipei Standard Time': 'CST', 'Tajikistan Time': 'TJT',
         'Tokelau Time': 'TKT', 'Tonga Standard Time': 'TOT', 'Tonga Summer Time': 'TOST',
         'Turkmenistan Standard Time': 'TMT', 'Tuvalu Time': 'TVT', 'Ulaanbaatar Standard Time': 'ULAT',
         'Ulaanbaatar Summer Time': 'ULAST', 'Uruguay Standard Time': 'UYT', 'Uruguay Summer Time': 'UYST',
@@ -535,36 +534,59 @@ var plugin = function (proto, date) {
     };
     var options = {
         hour12: false, weekday: 'short', year: 'numeric', month: 'numeric', day: 'numeric',
-        hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 3
+        hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 3,
+        timeZone: 'UTC'
     };
-    var formatTZ = function (dateObj, arg, timeZone) {
-        var parts = (function () {
-            options.timeZone = timeZone || undefined;
-            var array = new Intl.DateTimeFormat('en-US', options).formatToParts(dateObj);
-            var values = {};
+    var cache = {
+        utc: new Intl.DateTimeFormat('en-US', options)
+    };
+    var getDateTimeFormat = function (timeZone) {
+        if (timeZone) {
+            var tz = timeZone.toLowerCase();
 
-            for (var i = 0, len = array.length; i < len; i++) {
-                var type = array[i].type;
-                var value = array[i].value;
+            if (!cache[tz]) {
+                options.timeZone = timeZone;
+                cache[tz] = new Intl.DateTimeFormat('en-US', options);
+            }
+            return cache[tz];
+        }
+        options.timeZone = undefined;
+        return new Intl.DateTimeFormat('en-US', options);
+    };
+    var formatToParts = function (dateTimeFormat, dateObjOrTime) {
+        var array = dateTimeFormat.formatToParts(dateObjOrTime),
+            values = {};
 
-                switch (type) {
-                case 'weekday':
-                    values[type] = 'SunMonTueWedThuFriSat'.indexOf(value) / 3;
-                    break;
-                case 'hour':
-                    values[type] = value % 24;
-                    break;
-                case 'year':
-                case 'month':
-                case 'day':
-                case 'minute':
-                case 'second':
-                case 'fractionalSecond':
-                    values[type] = value | 0;
-                }
+        for (var i = 0, len = array.length; i < len; i++) {
+            var type = array[i].type,
+                value = array[i].value;
+
+            switch (type) {
+            case 'weekday':
+                values[type] = 'SunMonTueWedThuFriSat'.indexOf(value) / 3;
+                break;
+            case 'hour':
+                values[type] = value % 24;
+                break;
+            case 'year':
+            case 'month':
+            case 'day':
+            case 'minute':
+            case 'second':
+            case 'fractionalSecond':
+                values[type] = value | 0;
             }
-            return values;
-        }());
+        }
+        return values;
+    };
+    var getTimeFromParts = function (parts) {
+        return Date.UTC(
+            parts.year, parts.month - (parts.year < 100 ? 1900 * 12 + 1 : 1), parts.day,
+            parts.hour, parts.minute, parts.second, parts.fractionalSecond
+        );
+    };
+    var formatTZ = function (dateObj, arg, timeZone) {
+        var parts = formatToParts(getDateTimeFormat(timeZone), dateObj);
 
         return date.format({
             getFullYear: function () { return parts.year; },
@@ -577,18 +599,14 @@ var plugin = function (proto, date) {
             getDay: function () { return parts.weekday; },
             getTime: function () { return dateObj.getTime(); },
             getTimezoneOffset: function () {
-                return (dateObj.getTime() - Date.UTC(
-                    parts.year, parts.month - (parts.year < 100 ? 1900 * 12 + 1 : 1), parts.day,
-                    parts.hour, parts.minute, parts.second, parts.fractionalSecond
-                )) / 60000 | 0;
+                return (dateObj.getTime() - getTimeFromParts(parts)) / 60000 | 0;
             },
             getTimezoneName: function () { return timeZone || undefined; }
         }, arg);
     };
-    var parseTZ = function (dateString, arg, timeZone) {
-        var pattern = typeof arg === 'string' ? date.compile(arg) : arg;
-        var dateObj = date.parse(dateString, pattern, !!timeZone);
-
+    var parseTZ = function (arg1, arg2, timeZone) {
+        var pattern = typeof arg2 === 'string' ? date.compile(arg2) : arg2;
+        var time = typeof arg1 === 'string' ? date.parse(arg1, pattern, !!timeZone).getTime() : arg1;
         var hasZ = function (array) {
             for (var i = 1, len = array.length; i < len; i++) {
                 if (!array[i].indexOf('Z')) {
@@ -598,8 +616,8 @@ var plugin = function (proto, date) {
             return false;
         };
 
-        if (!timeZone || hasZ(pattern) || timeZone.toUpperCase() === 'UTC') {
-            return dateObj;
+        if (!timeZone || hasZ(pattern) || timeZone.toUpperCase() === 'UTC' || isNaN(time)) {
+            return new Date(time);
         }
 
         var getOffset = function (timeZoneName) {
@@ -612,19 +630,17 @@ var plugin = function (proto, date) {
             return Array.isArray(value) ? value : [];
         };
 
-        options.timeZone = 'UTC';
-        var dateString2 = new Intl.DateTimeFormat('en-US', options).format(dateObj);
-        options.timeZone = timeZone || undefined;
-        var dateTimeFormat = new Intl.DateTimeFormat('en-US', options);
+        var utc = getDateTimeFormat('UTC');
+        var tz = getDateTimeFormat(timeZone);
         var offset = getOffset(timeZone);
-        var comparer = function (d) {
-            return dateString2 === dateTimeFormat.format(d);
-        };
 
-        for (var j = 0, len2 = offset.length; j < len2; j++) {
-            var d = dateObj.getTime() - offset[j] * 1000;
-            if (comparer(d)) {
-                return new Date(d);
+        for (var i = 0; i < 2; i++) {
+            var targetString = utc.format(time - i * 24 * 60 * 60 * 1000);
+
+            for (var j = 0, len = offset.length; j < len; j++) {
+                if (tz.format(time - (offset[j] + i * 24 * 60 * 60) * 1000) === targetString) {
+                    return new Date(time - offset[j] * 1000);
+                }
             }
         }
         return new Date(NaN);
@@ -632,6 +648,39 @@ var plugin = function (proto, date) {
     var transformTZ = function (dateString, arg1, arg2, timeZone) {
         return formatTZ(date.parse(dateString, arg1), arg2, timeZone);
     };
+    var normalizeDateParts = function (parts, adjustEOM) {
+        var d = new Date(Date.UTC(
+            parts.year, parts.month - (parts.year < 100 ? 1900 * 12 + 1 : 1), parts.day
+        ));
+
+        if (adjustEOM && d.getUTCDate() < parts.day) {
+            d.setUTCDate(0);
+        }
+        parts.year = d.getUTCFullYear();
+        parts.month = d.getUTCMonth() + 1;
+        parts.day = d.getUTCDate();
+
+        return parts;
+    };
+    var addYearsTZ = function (dateObj, years, timeZone) {
+        return addMonthsTZ(dateObj, years * 12, timeZone);
+    };
+    var addMonthsTZ = function (dateObj, months, timeZone) {
+        var parts = formatToParts(getDateTimeFormat(timeZone), dateObj);
+
+        parts.month += months;
+        var dateObj2 = parseTZ(getTimeFromParts(normalizeDateParts(parts, true)), [], timeZone);
+
+        return isNaN(dateObj2.getTime()) ? date.addMonths(dateObj, months, true) : dateObj2;
+    };
+    var addDaysTZ = function (dateObj, days, timeZone) {
+        var parts = formatToParts(getDateTimeFormat(timeZone), dateObj);
+
+        parts.day += days;
+        var dateObj2 = parseTZ(getTimeFromParts(normalizeDateParts(parts, false)), [], timeZone);
+
+        return isNaN(dateObj2.getTime()) ? date.addDays(dateObj, days, true) : dateObj2;
+    };
 
     var name = 'timezone';
 
@@ -663,7 +712,10 @@ var plugin = function (proto, date) {
         extender: {
             formatTZ: formatTZ,
             parseTZ: parseTZ,
-            transformTZ: transformTZ
+            transformTZ: transformTZ,
+            addYearsTZ: addYearsTZ,
+            addMonthsTZ: addMonthsTZ,
+            addDaysTZ: addDaysTZ
         }
     });
     return name;

package/package.json

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

package/plugin/timezone.d.ts

@@ -74,6 +74,33 @@ declare module '../date-and-time' {
      * @returns A formatted string
      */
     export function transformTZ(dateString: string, compiledObj1: string[], compiledObj2: string[], timeZone?: string): string;
+
+    /**
+     * Adding years considering time zones
+     * @param dateObj - A Date object
+     * @param years - The number of years to add
+     * @param [timeZone] - The time zone to use for the calculation
+     * @returns The Date object after adding the specified number of years
+     */
+    export function addYearsTZ(dateObj: Date, years: number, timeZone?: string): Date;
+
+    /**
+     * Adding months considering time zones
+     * @param dateObj - A Date object
+     * @param months - The number of months to add
+     * @param [timeZone] - The time zone to use for the calculation
+     * @returns The Date object after adding the specified number of months
+     */
+    export function addMonthsTZ(dateObj: Date, months: number, timeZone?: string): Date;
+
+    /**
+     * Adding days considering time zones
+     * @param dateObj - A Date object
+     * @param days - The number of days to add
+     * @param [timeZone] - The time zone to use for the calculation
+     * @returns The Date object after adding the specified number of days
+     */
+    export function addDaysTZ(dateObj: Date, days: number, timeZone?: string): Date;
 }
 
 export default function (proto: unknown, date?: unknown): string;

package/plugin/timezone.js

@@ -461,7 +461,7 @@
             'Alaska Daylight Time': 'AKDT', 'Alaska Standard Time': 'AKST', 'Almaty Standard Time': 'ALMT',
             'Almaty Summer Time': 'ALMST', 'Amazon Standard Time': 'AMT', 'Amazon Summer Time': 'AMST',
             'Anadyr Standard Time': 'ANAT', 'Anadyr Summer Time': 'ANAST', 'Apia Daylight Time': 'WSDT',
-            'Apia Standard Time': 'WSST', 'Aqtau Standard Time': 'AQTT', 'Aqtau Summer Time': 'AQTT',
+            'Apia Standard Time': 'WSST', 'Aqtau Standard Time': 'AQTT', 'Aqtau Summer Time': 'AQTST',
             'Aqtobe Standard Time': 'AQTT', 'Aqtobe Summer Time': 'AQST', 'Arabian Daylight Time': 'ADT',
             'Arabian Standard Time': 'AST', 'Argentina Standard Time': 'ART', 'Argentina Summer Time': 'ARST',
             'Armenia Standard Time': 'AMT', 'Armenia Summer Time': 'AMST', 'Atlantic Daylight Time': 'ADT',
@@ -477,19 +477,18 @@
             'Central Indonesia Time': 'WITA', 'Central Standard Time': 'CST', 'Chamorro Standard Time': 'ChST',
             'Chatham Daylight Time': 'CHADT', 'Chatham Standard Time': 'CHAST', 'Chile Standard Time': 'CLT',
             'Chile Summer Time': 'CLST', 'China Daylight Time': 'CDT', 'China Standard Time': 'CST',
-            'Choibalsan Standard Time': 'CHOT', 'Choibalsan Summer Time': 'CHOST', 'Christmas Island Time': 'CXT',
-            'Chuuk Time': 'CHUT', 'Cocos Islands Time': 'CCT', 'Colombia Standard Time': 'COT',
-            'Colombia Summer Time': 'COST', 'Cook Islands Half Summer Time': 'CKHST', 'Cook Islands Standard Time': 'CKT',
-            'Coordinated Universal Time': 'UTC', 'Cuba Daylight Time': 'CDT', 'Cuba Standard Time': 'CST',
-            'Davis Time': 'DAVT', 'Dumont-d’Urville Time': 'DDUT', 'East Africa Time': 'EAT',
-            'East Greenland Standard Time': 'EGST', 'East Greenland Summer Time': 'EGST', 'East Kazakhstan Time': 'ALMT',
-            'East Timor Time': 'TLT', 'Easter Island Standard Time': 'EAST', 'Easter Island Summer Time': 'EASST',
-            'Eastern Daylight Time': 'EDT', 'Eastern European Standard Time': 'EET', 'Eastern European Summer Time': 'EEST',
-            'Eastern Indonesia Time': 'WIT', 'Eastern Standard Time': 'EST', 'Ecuador Time': 'ECT',
-            'Falkland Islands Standard Time': 'FKST', 'Falkland Islands Summer Time': 'FKDT', 'Fernando de Noronha Standard Time': 'FNT',
-            'Fernando de Noronha Summer Time': 'FNST', 'Fiji Standard Time': 'FJT', 'Fiji Summer Time': 'FJST',
-            'French Guiana Time': 'GFT', 'French Southern & Antarctic Time': 'TFT', 'Further-eastern European Time': 'FET',
-            'GMT': 'GMT', 'Galapagos Time': 'GALT', 'Gambier Time': 'GAMT',
+            'Christmas Island Time': 'CXT', 'Chuuk Time': 'CHUT', 'Cocos Islands Time': 'CCT',
+            'Colombia Standard Time': 'COT', 'Colombia Summer Time': 'COST', 'Cook Islands Half Summer Time': 'CKHST',
+            'Cook Islands Standard Time': 'CKT', 'Coordinated Universal Time': 'UTC', 'Cuba Daylight Time': 'CDT',
+            'Cuba Standard Time': 'CST', 'Davis Time': 'DAVT', 'Dumont-d’Urville Time': 'DDUT',
+            'East Africa Time': 'EAT', 'East Greenland Standard Time': 'EGT', 'East Greenland Summer Time': 'EGST',
+            'East Kazakhstan Time': 'ALMT', 'East Timor Time': 'TLT', 'Easter Island Standard Time': 'EAST',
+            'Easter Island Summer Time': 'EASST', 'Eastern Daylight Time': 'EDT', 'Eastern European Standard Time': 'EET',
+            'Eastern European Summer Time': 'EEST', 'Eastern Indonesia Time': 'WIT', 'Eastern Standard Time': 'EST',
+            'Ecuador Time': 'ECT', 'Falkland Islands Standard Time': 'FKST', 'Falkland Islands Summer Time': 'FKDT',
+            'Fernando de Noronha Standard Time': 'FNT', 'Fernando de Noronha Summer Time': 'FNST', 'Fiji Standard Time': 'FJT',
+            'Fiji Summer Time': 'FJST', 'French Guiana Time': 'GFT', 'French Southern & Antarctic Time': 'TFT',
+            'Further-eastern European Time': 'FET', 'Galapagos Time': 'GALT', 'Gambier Time': 'GAMT',
             'Georgia Standard Time': 'GET', 'Georgia Summer Time': 'GEST', 'Gilbert Islands Time': 'GILT',
             'Greenwich Mean Time': 'GMT', 'Guam Standard Time': 'ChST', 'Gulf Standard Time': 'GST',
             'Guyana Time': 'GYT', 'Hawaii-Aleutian Daylight Time': 'HADT', 'Hawaii-Aleutian Standard Time': 'HAST',
@@ -501,7 +500,7 @@
             'Korean Daylight Time': 'KDT', 'Korean Standard Time': 'KST', 'Kosrae Time': 'KOST',
             'Krasnoyarsk Standard Time': 'KRAT', 'Krasnoyarsk Summer Time': 'KRAST', 'Kyrgyzstan Time': 'KGT',
             'Lanka Time': 'LKT', 'Line Islands Time': 'LINT', 'Lord Howe Daylight Time': 'LHDT',
-            'Lord Howe Standard Time': 'LHST', 'Macao Standard Time': 'CST', 'Macao Summer Time': 'CDST',
+            'Lord Howe Standard Time': 'LHST', 'Macao Standard Time': 'CST', 'Macao Summer Time': 'CDT',
             'Magadan Standard Time': 'MAGT', 'Magadan Summer Time': 'MAGST', 'Malaysia Time': 'MYT',
             'Maldives Time': 'MVT', 'Marquesas Time': 'MART', 'Marshall Islands Time': 'MHT',
             'Mauritius Standard Time': 'MUT', 'Mauritius Summer Time': 'MUST', 'Mawson Time': 'MAWT',
@@ -514,7 +513,7 @@
             'North Mariana Islands Time': 'ChST', 'Novosibirsk Standard Time': 'NOVT', 'Novosibirsk Summer Time': 'NOVST',
             'Omsk Standard Time': 'OMST', 'Omsk Summer Time': 'OMSST', 'Pacific Daylight Time': 'PDT',
             'Pacific Standard Time': 'PST', 'Pakistan Standard Time': 'PKT', 'Pakistan Summer Time': 'PKST',
-            'Palau Time': 'PWT', 'Papua New Guinea Time': 'PGT', 'Paraguay Standard Time': 'PYST',
+            'Palau Time': 'PWT', 'Papua New Guinea Time': 'PGT', 'Paraguay Standard Time': 'PYT',
             'Paraguay Summer Time': 'PYST', 'Peru Standard Time': 'PET', 'Peru Summer Time': 'PEST',
             'Petropavlovsk-Kamchatski Standard Time': 'PETT', 'Petropavlovsk-Kamchatski Summer Time': 'PETST', 'Philippine Standard Time': 'PST',
             'Philippine Summer Time': 'PHST', 'Phoenix Islands Time': 'PHOT', 'Pitcairn Time': 'PIT',
@@ -525,7 +524,7 @@
             'Singapore Standard Time': 'SGT', 'Solomon Islands Time': 'SBT', 'South Africa Standard Time': 'SAST',
             'South Georgia Time': 'GST', 'St. Pierre & Miquelon Daylight Time': 'PMDT', 'St. Pierre & Miquelon Standard Time': 'PMST',
             'Suriname Time': 'SRT', 'Syowa Time': 'SYOT', 'Tahiti Time': 'TAHT',
-            'Taipei Daylight Time': 'TDT', 'Taipei Standard Time': 'CST', 'Tajikistan Time': 'TJT',
+            'Taipei Daylight Time': 'CDT', 'Taipei Standard Time': 'CST', 'Tajikistan Time': 'TJT',
             'Tokelau Time': 'TKT', 'Tonga Standard Time': 'TOT', 'Tonga Summer Time': 'TOST',
             'Turkmenistan Standard Time': 'TMT', 'Tuvalu Time': 'TVT', 'Ulaanbaatar Standard Time': 'ULAT',
             'Ulaanbaatar Summer Time': 'ULAST', 'Uruguay Standard Time': 'UYT', 'Uruguay Summer Time': 'UYST',
@@ -541,36 +540,59 @@
         };
         var options = {
             hour12: false, weekday: 'short', year: 'numeric', month: 'numeric', day: 'numeric',
-            hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 3
+            hour: 'numeric', minute: 'numeric', second: 'numeric', fractionalSecondDigits: 3,
+            timeZone: 'UTC'
         };
-        var formatTZ = function (dateObj, arg, timeZone) {
-            var parts = (function () {
-                options.timeZone = timeZone || undefined;
-                var array = new Intl.DateTimeFormat('en-US', options).formatToParts(dateObj);
-                var values = {};
+        var cache = {
+            utc: new Intl.DateTimeFormat('en-US', options)
+        };
+        var getDateTimeFormat = function (timeZone) {
+            if (timeZone) {
+                var tz = timeZone.toLowerCase();
 
-                for (var i = 0, len = array.length; i < len; i++) {
-                    var type = array[i].type;
-                    var value = array[i].value;
+                if (!cache[tz]) {
+                    options.timeZone = timeZone;
+                    cache[tz] = new Intl.DateTimeFormat('en-US', options);
+                }
+                return cache[tz];
+            }
+            options.timeZone = undefined;
+            return new Intl.DateTimeFormat('en-US', options);
+        };
+        var formatToParts = function (dateTimeFormat, dateObjOrTime) {
+            var array = dateTimeFormat.formatToParts(dateObjOrTime),
+                values = {};
 
-                    switch (type) {
-                    case 'weekday':
-                        values[type] = 'SunMonTueWedThuFriSat'.indexOf(value) / 3;
-                        break;
-                    case 'hour':
-                        values[type] = value % 24;
-                        break;
-                    case 'year':
-                    case 'month':
-                    case 'day':
-                    case 'minute':
-                    case 'second':
-                    case 'fractionalSecond':
-                        values[type] = value | 0;
-                    }
+            for (var i = 0, len = array.length; i < len; i++) {
+                var type = array[i].type,
+                    value = array[i].value;
+
+                switch (type) {
+                case 'weekday':
+                    values[type] = 'SunMonTueWedThuFriSat'.indexOf(value) / 3;
+                    break;
+                case 'hour':
+                    values[type] = value % 24;
+                    break;
+                case 'year':
+                case 'month':
+                case 'day':
+                case 'minute':
+                case 'second':
+                case 'fractionalSecond':
+                    values[type] = value | 0;
                 }
-                return values;
-            }());
+            }
+            return values;
+        };
+        var getTimeFromParts = function (parts) {
+            return Date.UTC(
+                parts.year, parts.month - (parts.year < 100 ? 1900 * 12 + 1 : 1), parts.day,
+                parts.hour, parts.minute, parts.second, parts.fractionalSecond
+            );
+        };
+        var formatTZ = function (dateObj, arg, timeZone) {
+            var parts = formatToParts(getDateTimeFormat(timeZone), dateObj);
 
             return date.format({
                 getFullYear: function () { return parts.year; },
@@ -583,18 +605,14 @@
                 getDay: function () { return parts.weekday; },
                 getTime: function () { return dateObj.getTime(); },
                 getTimezoneOffset: function () {
-                    return (dateObj.getTime() - Date.UTC(
-                        parts.year, parts.month - (parts.year < 100 ? 1900 * 12 + 1 : 1), parts.day,
-                        parts.hour, parts.minute, parts.second, parts.fractionalSecond
-                    )) / 60000 | 0;
+                    return (dateObj.getTime() - getTimeFromParts(parts)) / 60000 | 0;
                 },
                 getTimezoneName: function () { return timeZone || undefined; }
             }, arg);
         };
-        var parseTZ = function (dateString, arg, timeZone) {
-            var pattern = typeof arg === 'string' ? date.compile(arg) : arg;
-            var dateObj = date.parse(dateString, pattern, !!timeZone);
-
+        var parseTZ = function (arg1, arg2, timeZone) {
+            var pattern = typeof arg2 === 'string' ? date.compile(arg2) : arg2;
+            var time = typeof arg1 === 'string' ? date.parse(arg1, pattern, !!timeZone).getTime() : arg1;
             var hasZ = function (array) {
                 for (var i = 1, len = array.length; i < len; i++) {
                     if (!array[i].indexOf('Z')) {
@@ -604,8 +622,8 @@
                 return false;
             };
 
-            if (!timeZone || hasZ(pattern) || timeZone.toUpperCase() === 'UTC') {
-                return dateObj;
+            if (!timeZone || hasZ(pattern) || timeZone.toUpperCase() === 'UTC' || isNaN(time)) {
+                return new Date(time);
             }
 
             var getOffset = function (timeZoneName) {
@@ -618,19 +636,17 @@
                 return Array.isArray(value) ? value : [];
             };
 
-            options.timeZone = 'UTC';
-            var dateString2 = new Intl.DateTimeFormat('en-US', options).format(dateObj);
-            options.timeZone = timeZone || undefined;
-            var dateTimeFormat = new Intl.DateTimeFormat('en-US', options);
+            var utc = getDateTimeFormat('UTC');
+            var tz = getDateTimeFormat(timeZone);
             var offset = getOffset(timeZone);
-            var comparer = function (d) {
-                return dateString2 === dateTimeFormat.format(d);
-            };
 
-            for (var j = 0, len2 = offset.length; j < len2; j++) {
-                var d = dateObj.getTime() - offset[j] * 1000;
-                if (comparer(d)) {
-                    return new Date(d);
+            for (var i = 0; i < 2; i++) {
+                var targetString = utc.format(time - i * 24 * 60 * 60 * 1000);
+
+                for (var j = 0, len = offset.length; j < len; j++) {
+                    if (tz.format(time - (offset[j] + i * 24 * 60 * 60) * 1000) === targetString) {
+                        return new Date(time - offset[j] * 1000);
+                    }
                 }
             }
             return new Date(NaN);
@@ -638,6 +654,39 @@
         var transformTZ = function (dateString, arg1, arg2, timeZone) {
             return formatTZ(date.parse(dateString, arg1), arg2, timeZone);
         };
+        var normalizeDateParts = function (parts, adjustEOM) {
+            var d = new Date(Date.UTC(
+                parts.year, parts.month - (parts.year < 100 ? 1900 * 12 + 1 : 1), parts.day
+            ));
+
+            if (adjustEOM && d.getUTCDate() < parts.day) {
+                d.setUTCDate(0);
+            }
+            parts.year = d.getUTCFullYear();
+            parts.month = d.getUTCMonth() + 1;
+            parts.day = d.getUTCDate();
+
+            return parts;
+        };
+        var addYearsTZ = function (dateObj, years, timeZone) {
+            return addMonthsTZ(dateObj, years * 12, timeZone);
+        };
+        var addMonthsTZ = function (dateObj, months, timeZone) {
+            var parts = formatToParts(getDateTimeFormat(timeZone), dateObj);
+
+            parts.month += months;
+            var dateObj2 = parseTZ(getTimeFromParts(normalizeDateParts(parts, true)), [], timeZone);
+
+            return isNaN(dateObj2.getTime()) ? date.addMonths(dateObj, months, true) : dateObj2;
+        };
+        var addDaysTZ = function (dateObj, days, timeZone) {
+            var parts = formatToParts(getDateTimeFormat(timeZone), dateObj);
+
+            parts.day += days;
+            var dateObj2 = parseTZ(getTimeFromParts(normalizeDateParts(parts, false)), [], timeZone);
+
+            return isNaN(dateObj2.getTime()) ? date.addDays(dateObj, days, true) : dateObj2;
+        };
 
         var name = 'timezone';
 
@@ -669,7 +718,10 @@
             extender: {
                 formatTZ: formatTZ,
                 parseTZ: parseTZ,
-                transformTZ: transformTZ
+                transformTZ: transformTZ,
+                addYearsTZ: addYearsTZ,
+                addMonthsTZ: addMonthsTZ,
+                addDaysTZ: addDaysTZ
             }
         });
         return name;