@amcharts/amcharts5 5.2.50 → 5.3.1

package/.internal/core/util/DateFormatter.js

@@ -1,87 +1,67 @@
-import { __extends } from "tslib";
 import { Entity } from "./Entity";
 import { TextFormatter } from "./TextFormatter";
 import { Timezone } from "./Timezone";
 import * as $type from "./Type";
 import * as $utils from "./Utils";
-var DateFormatter = /** @class */ (function (_super) {
-    __extends(DateFormatter, _super);
-    function DateFormatter() {
-        return _super !== null && _super.apply(this, arguments) || this;
+export class DateFormatter extends Entity {
+    _setDefaults() {
+        // Defaults
+        this._setDefault("capitalize", true);
+        this._setDefault("dateFormat", "yyyy-MM-dd");
+        super._setDefaults();
     }
-    Object.defineProperty(DateFormatter.prototype, "_setDefaults", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            // Defaults
-            this._setDefault("capitalize", true);
-            this._setDefault("dateFormat", "yyyy-MM-dd");
-            _super.prototype._setDefaults.call(this);
-        }
-    });
-    Object.defineProperty(DateFormatter.prototype, "_beforeChanged", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            _super.prototype._beforeChanged.call(this);
+    _beforeChanged() {
+        super._beforeChanged();
+    }
+    format(source, format) {
+        // Locale?
+        // TODO
+        // No format passed in or it's empty
+        if (typeof format === "undefined" || format === "") {
+            format = this.get("dateFormat", "yyyy-MM-dd");
         }
-    });
-    Object.defineProperty(DateFormatter.prototype, "format", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (source, format) {
-            // Locale?
-            // TODO
-            // No format passed in or it's empty
-            if (typeof format === "undefined" || format === "") {
-                format = this.get("dateFormat", "yyyy-MM-dd");
-            }
-            // Init return value
-            var formatted;
-            // Cast?
-            // TODO: decide if we need to cast
-            var date = source;
-            // Is it a built-in format or Intl.DateTimeFormat
-            if ($type.isObject(format)) {
-                try {
-                    var locales = this.get("intlLocales");
-                    if (locales) {
-                        return new Intl.DateTimeFormat(locales, format).format(date);
-                    }
-                    else {
-                        return new Intl.DateTimeFormat(undefined, format).format(date);
-                    }
+        // Init return value
+        let formatted;
+        // Cast?
+        // TODO: decide if we need to cast
+        let date = source;
+        // Is it a built-in format or Intl.DateTimeFormat
+        if ($type.isObject(format)) {
+            try {
+                const locales = this.get("intlLocales");
+                if (locales) {
+                    return new Intl.DateTimeFormat(locales, format).format(date);
                 }
-                catch (e) {
-                    return "Invalid";
+                else {
+                    return new Intl.DateTimeFormat(undefined, format).format(date);
                 }
             }
-            // get format info (it will also deal with parser caching)
-            var info = this.parseFormat(format);
-            // Should we apply custom time zone?
-            var timezone = this._root.timezone;
-            if (timezone && !this._root.utc) {
-                date = timezone.convertLocal(date);
-            }
-            // Check if it's a valid date
-            if (!$type.isNumber(date.getTime())) {
-                // TODO translation
-                //return this._t("Invalid date");
-                return "Invalid date";
-            }
-            // Apply format
-            formatted = this.applyFormat(date, info);
-            // Capitalize
-            if (this.get("capitalize")) {
-                formatted = formatted.replace(/^.{1}/, formatted.substr(0, 1).toUpperCase());
-            }
-            // We're done
-            return formatted;
+            catch (e) {
+                return "Invalid";
+            }
+        }
+        // get format info (it will also deal with parser caching)
+        let info = this.parseFormat(format);
+        // Should we apply custom time zone?
+        const timezone = this._root.timezone;
+        if (timezone && !this._root.utc) {
+            date = timezone.convertLocal(date);
         }
-    });
+        // Check if it's a valid date
+        if (!$type.isNumber(date.getTime())) {
+            // TODO translation
+            //return this._t("Invalid date");
+            return "Invalid date";
+        }
+        // Apply format
+        formatted = this.applyFormat(date, info);
+        // Capitalize
+        if (this.get("capitalize")) {
+            formatted = formatted.replace(/^.{1}/, formatted.substr(0, 1).toUpperCase());
+        }
+        // We're done
+        return formatted;
+    }
     /**
      * Applies format to Date.
      *
@@ -89,858 +69,784 @@ var DateFormatter = /** @class */ (function (_super) {
      * @param info      Parsed format information
      * @return Formatted date string
      */
-    Object.defineProperty(DateFormatter.prototype, "applyFormat", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (date, info) {
-            // Init return value
-            var res = info.template;
-            // Get values
-            var fullYear, month, weekday, day, hours, minutes, seconds, milliseconds, timestamp = date.getTime();
-            if (this._root.utc) {
-                fullYear = date.getUTCFullYear();
-                month = date.getUTCMonth();
-                weekday = date.getUTCDay();
-                day = date.getUTCDate();
-                hours = date.getUTCHours();
-                minutes = date.getUTCMinutes();
-                seconds = date.getUTCSeconds();
-                milliseconds = date.getUTCMilliseconds();
-            }
-            else {
-                fullYear = date.getFullYear();
-                month = date.getMonth();
-                weekday = date.getDay();
-                day = date.getDate();
-                hours = date.getHours();
-                minutes = date.getMinutes();
-                seconds = date.getSeconds();
-                milliseconds = date.getMilliseconds();
-            }
-            // Go through each part and format/replace it in template
-            for (var i = 0, len = info.parts.length; i < len; i++) {
-                var value = "";
-                switch (info.parts[i]) {
-                    case "G":
-                        value = this._t(fullYear < 0
-                            ? "_era_bc"
-                            : "_era_ad");
-                        break;
-                    case "yyyy":
-                        value = Math.abs(fullYear).toString();
-                        if (fullYear < 0) {
-                            value += this._t("_era_bc");
-                        }
-                        break;
-                    case "yyy":
-                    case "yy":
-                    case "y":
-                        value = Math.abs(fullYear).toString().substr(-info.parts[i].length);
-                        if (fullYear < 0) {
-                            value += this._t("_era_bc");
-                        }
-                        break;
-                    case "YYYY":
-                    case "YYY":
-                    case "YY":
-                    case "Y":
-                        var week = $utils.getWeek(date);
-                        var year = fullYear;
-                        if (week == 1 && (weekday > 4)) {
-                            year--;
-                        }
-                        if (info.parts[i] == "YYYY") {
-                            value = Math.abs(year).toString();
-                        }
-                        else {
-                            value = Math.abs(year).toString().substr(-info.parts[i].length);
-                        }
-                        if (year < 0) {
-                            value += this._t("_era_bc");
-                        }
-                        break;
-                    case "u":
-                        // @todo
-                        break;
-                    case "q":
-                        value = "" + Math.ceil((date.getMonth() + 1) / 3);
-                        break;
-                    case "MMMMM":
-                        value = this._t(this._getMonth(month)).substr(0, 1);
-                        break;
-                    case "MMMM":
-                        value = this._t(this._getMonth(month));
-                        break;
-                    case "MMM":
-                        value = this._t(this._getShortMonth(month));
-                        break;
-                    case "MM":
-                        value = $utils.padString(month + 1, 2, "0");
-                        break;
-                    case "M":
-                        value = (month + 1).toString();
-                        break;
-                    case "ww":
-                        value = $utils.padString($utils.getWeek(date, this._root.utc), 2, "0");
-                        break;
-                    case "w":
-                        value = $utils.getWeek(date, this._root.utc).toString();
-                        break;
-                    case "W":
-                        value = $utils.getMonthWeek(date, this._root.utc).toString();
-                        break;
-                    case "dd":
-                        value = $utils.padString(day, 2, "0");
-                        break;
-                    case "d":
-                        value = day.toString();
-                        break;
-                    case "DD":
-                    case "DDD":
-                        value = $utils.padString($utils.getYearDay(date, this._root.utc).toString(), info.parts[i].length, "0");
-                        break;
-                    case "D":
-                        value = $utils.getYearDay(date, this._root.utc).toString();
-                        break;
-                    case "F":
-                        // @todo
-                        break;
-                    case "g":
-                        // @todo
-                        break;
-                    case "t":
-                        value = this._root.language.translateFunc("_dateOrd").call(this, day);
-                        break;
-                    case "E":
-                        value = (weekday || 7).toString();
-                        break;
-                    case "EE":
-                        value = $utils.padString((weekday || 7).toString(), 2, "0");
-                        break;
-                    case "EEE":
-                    case "eee":
-                        value = this._t(this._getShortWeekday(weekday));
-                        break;
-                    case "EEEE":
-                    case "eeee":
-                        value = this._t(this._getWeekday(weekday));
-                        break;
-                    case "EEEEE":
-                    case "eeeee":
-                        value = this._t(this._getShortWeekday(weekday)).substr(0, 1);
-                        break;
-                    case "e":
-                    case "ee":
-                        value = (weekday - (this._root.locale.firstDayOfWeek || 1) + 1).toString();
-                        if (info.parts[i] == "ee") {
-                            value = $utils.padString(value, 2, "0");
-                        }
-                        break;
-                    case "a":
-                        if (hours >= 12) {
-                            value = this._t("PM");
-                        }
-                        else {
-                            value = this._t("AM");
-                        }
-                        break;
-                    case "aa":
-                        if (hours >= 12) {
-                            value = this._t("P.M.");
-                        }
-                        else {
-                            value = this._t("A.M.");
-                        }
-                        break;
-                    case "aaa":
-                        if (hours >= 12) {
-                            value = this._t("P");
-                        }
-                        else {
-                            value = this._t("A");
-                        }
-                        break;
-                    case "h":
-                        value = $utils.get12Hours(hours).toString();
-                        break;
-                    case "hh":
-                        value = $utils.padString($utils.get12Hours(hours), 2, "0");
-                        break;
-                    case "H":
-                        value = hours.toString();
-                        break;
-                    case "HH":
-                        value = $utils.padString(hours, 2, "0");
-                        break;
-                    case "K":
-                        value = $utils.get12Hours(hours, 0).toString();
-                        break;
-                    case "KK":
-                        value = $utils.padString($utils.get12Hours(hours, 0), 2, "0");
-                        break;
-                    case "k":
-                        value = (hours + 1).toString();
-                        break;
-                    case "kk":
-                        value = $utils.padString(hours + 1, 2, "0");
-                        break;
-                    case "m":
-                        value = minutes.toString();
-                        break;
-                    case "mm":
-                        value = $utils.padString(minutes, 2, "0");
-                        break;
-                    case "s":
-                        value = seconds.toString();
-                        break;
-                    case "ss":
-                        value = $utils.padString(seconds, 2, "0");
-                        break;
-                    case "S":
-                    case "SS":
-                    case "SSS":
-                        value = Math.round((milliseconds / 1000) * Math.pow(10, info.parts[i].length)).toString();
-                        break;
-                    case "x":
-                        value = timestamp.toString();
-                        break;
-                    case "n":
-                    case "nn":
-                    case "nnn":
-                        value = $utils.padString(milliseconds, info.parts[i].length, "0");
-                        break;
-                    case "z":
-                        value = $utils.getTimeZone(date, false, false, this._root.utc);
-                        break;
-                    case "zz":
-                        value = $utils.getTimeZone(date, true, false, this._root.utc);
-                        break;
-                    case "zzz":
-                        value = $utils.getTimeZone(date, false, true, this._root.utc);
-                        break;
-                    case "zzzz":
-                        value = $utils.getTimeZone(date, true, true, this._root.utc);
-                        break;
-                    case "Z":
-                    case "ZZ":
-                        var timezone = this._root.utc ? "UTC" : this._root.timezone;
-                        if (timezone instanceof Timezone) {
-                            timezone = timezone.name;
-                        }
-                        var offset = timezone ? $utils.getTimezoneOffset(timezone) : date.getTimezoneOffset();
-                        var tz = Math.abs(offset) / 60;
-                        var tzh = Math.floor(tz);
-                        var tzm = tz * 60 - tzh * 60;
-                        if (this._root.utc) {
-                            tzh = 0;
-                            tzm = 0;
-                        }
-                        if (info.parts[i] == "Z") {
-                            value = "GMT";
-                            value += offset > 0 ? "-" : "+";
-                            value += $utils.padString(tzh, 2) + ":" + $utils.padString(tzm, 2);
-                        }
-                        else {
-                            value = offset > 0 ? "-" : "+";
-                            value += $utils.padString(tzh, 2) + $utils.padString(tzm, 2);
-                        }
-                        break;
-                    case "i":
-                        value = date.toISOString();
-                        break;
-                    case "I":
-                        value = date.toUTCString();
-                        break;
-                }
-                res = res.replace($type.PLACEHOLDER, value);
+    applyFormat(date, info) {
+        // Init return value
+        let res = info.template;
+        // Get values
+        let fullYear, month, weekday, day, hours, minutes, seconds, milliseconds, timestamp = date.getTime();
+        if (this._root.utc) {
+            fullYear = date.getUTCFullYear();
+            month = date.getUTCMonth();
+            weekday = date.getUTCDay();
+            day = date.getUTCDate();
+            hours = date.getUTCHours();
+            minutes = date.getUTCMinutes();
+            seconds = date.getUTCSeconds();
+            milliseconds = date.getUTCMilliseconds();
+        }
+        else {
+            fullYear = date.getFullYear();
+            month = date.getMonth();
+            weekday = date.getDay();
+            day = date.getDate();
+            hours = date.getHours();
+            minutes = date.getMinutes();
+            seconds = date.getSeconds();
+            milliseconds = date.getMilliseconds();
+        }
+        // Go through each part and format/replace it in template
+        for (let i = 0, len = info.parts.length; i < len; i++) {
+            let value = "";
+            switch (info.parts[i]) {
+                case "G":
+                    value = this._t(fullYear < 0
+                        ? "_era_bc"
+                        : "_era_ad");
+                    break;
+                case "yyyy":
+                    value = Math.abs(fullYear).toString();
+                    if (fullYear < 0) {
+                        value += this._t("_era_bc");
+                    }
+                    break;
+                case "yyy":
+                case "yy":
+                case "y":
+                    value = Math.abs(fullYear).toString().substr(-info.parts[i].length);
+                    if (fullYear < 0) {
+                        value += this._t("_era_bc");
+                    }
+                    break;
+                case "YYYY":
+                case "YYY":
+                case "YY":
+                case "Y":
+                    let year = $utils.getWeekYear(date, this._root.utc);
+                    if (info.parts[i] == "YYYY") {
+                        value = Math.abs(year).toString();
+                    }
+                    else {
+                        value = Math.abs(year).toString().substr(-info.parts[i].length);
+                    }
+                    if (year < 0) {
+                        value += this._t("_era_bc");
+                    }
+                    break;
+                case "u":
+                    // @todo
+                    break;
+                case "q":
+                    value = "" + Math.ceil((date.getMonth() + 1) / 3);
+                    break;
+                case "MMMMM":
+                    value = this._t(this._getMonth(month)).substr(0, 1);
+                    break;
+                case "MMMM":
+                    value = this._t(this._getMonth(month));
+                    break;
+                case "MMM":
+                    value = this._t(this._getShortMonth(month));
+                    break;
+                case "MM":
+                    value = $utils.padString(month + 1, 2, "0");
+                    break;
+                case "M":
+                    value = (month + 1).toString();
+                    break;
+                case "ww":
+                    value = $utils.padString($utils.getWeek(date, this._root.utc), 2, "0");
+                    break;
+                case "w":
+                    value = $utils.getWeek(date, this._root.utc).toString();
+                    break;
+                case "W":
+                    value = $utils.getMonthWeek(date, this._root.utc).toString();
+                    break;
+                case "dd":
+                    value = $utils.padString(day, 2, "0");
+                    break;
+                case "d":
+                    value = day.toString();
+                    break;
+                case "DD":
+                case "DDD":
+                    value = $utils.padString($utils.getYearDay(date, this._root.utc).toString(), info.parts[i].length, "0");
+                    break;
+                case "D":
+                    value = $utils.getYearDay(date, this._root.utc).toString();
+                    break;
+                case "F":
+                    // @todo
+                    break;
+                case "g":
+                    // @todo
+                    break;
+                case "t":
+                    value = this._root.language.translateFunc("_dateOrd").call(this, day);
+                    break;
+                case "E":
+                    value = (weekday || 7).toString();
+                    break;
+                case "EE":
+                    value = $utils.padString((weekday || 7).toString(), 2, "0");
+                    break;
+                case "EEE":
+                case "eee":
+                    value = this._t(this._getShortWeekday(weekday));
+                    break;
+                case "EEEE":
+                case "eeee":
+                    value = this._t(this._getWeekday(weekday));
+                    break;
+                case "EEEEE":
+                case "eeeee":
+                    value = this._t(this._getShortWeekday(weekday)).substr(0, 1);
+                    break;
+                case "e":
+                case "ee":
+                    value = (weekday - (this._root.locale.firstDayOfWeek || 1) + 1).toString();
+                    if (info.parts[i] == "ee") {
+                        value = $utils.padString(value, 2, "0");
+                    }
+                    break;
+                case "a":
+                    if (hours >= 12) {
+                        value = this._t("PM");
+                    }
+                    else {
+                        value = this._t("AM");
+                    }
+                    break;
+                case "aa":
+                    if (hours >= 12) {
+                        value = this._t("P.M.");
+                    }
+                    else {
+                        value = this._t("A.M.");
+                    }
+                    break;
+                case "aaa":
+                    if (hours >= 12) {
+                        value = this._t("P");
+                    }
+                    else {
+                        value = this._t("A");
+                    }
+                    break;
+                case "h":
+                    value = $utils.get12Hours(hours).toString();
+                    break;
+                case "hh":
+                    value = $utils.padString($utils.get12Hours(hours), 2, "0");
+                    break;
+                case "H":
+                    value = hours.toString();
+                    break;
+                case "HH":
+                    value = $utils.padString(hours, 2, "0");
+                    break;
+                case "K":
+                    value = $utils.get12Hours(hours, 0).toString();
+                    break;
+                case "KK":
+                    value = $utils.padString($utils.get12Hours(hours, 0), 2, "0");
+                    break;
+                case "k":
+                    value = (hours + 1).toString();
+                    break;
+                case "kk":
+                    value = $utils.padString(hours + 1, 2, "0");
+                    break;
+                case "m":
+                    value = minutes.toString();
+                    break;
+                case "mm":
+                    value = $utils.padString(minutes, 2, "0");
+                    break;
+                case "s":
+                    value = seconds.toString();
+                    break;
+                case "ss":
+                    value = $utils.padString(seconds, 2, "0");
+                    break;
+                case "S":
+                case "SS":
+                case "SSS":
+                    value = Math.round((milliseconds / 1000) * Math.pow(10, info.parts[i].length)).toString();
+                    break;
+                case "x":
+                    value = timestamp.toString();
+                    break;
+                case "n":
+                case "nn":
+                case "nnn":
+                    value = $utils.padString(milliseconds, info.parts[i].length, "0");
+                    break;
+                case "z":
+                    value = $utils.getTimeZone(date, false, false, this._root.utc);
+                    break;
+                case "zz":
+                    value = $utils.getTimeZone(date, true, false, this._root.utc);
+                    break;
+                case "zzz":
+                    value = $utils.getTimeZone(date, false, true, this._root.utc);
+                    break;
+                case "zzzz":
+                    value = $utils.getTimeZone(date, true, true, this._root.utc);
+                    break;
+                case "Z":
+                case "ZZ":
+                    let timezone = this._root.utc ? "UTC" : this._root.timezone;
+                    if (timezone instanceof Timezone) {
+                        timezone = timezone.name;
+                    }
+                    const offset = timezone ? $utils.getTimezoneOffset(timezone) : date.getTimezoneOffset();
+                    let tz = Math.abs(offset) / 60;
+                    let tzh = Math.floor(tz);
+                    let tzm = tz * 60 - tzh * 60;
+                    if (this._root.utc) {
+                        tzh = 0;
+                        tzm = 0;
+                    }
+                    if (info.parts[i] == "Z") {
+                        value = "GMT";
+                        value += offset > 0 ? "-" : "+";
+                        value += $utils.padString(tzh, 2) + ":" + $utils.padString(tzm, 2);
+                    }
+                    else {
+                        value = offset > 0 ? "-" : "+";
+                        value += $utils.padString(tzh, 2) + $utils.padString(tzm, 2);
+                    }
+                    break;
+                case "i":
+                    value = date.toISOString();
+                    break;
+                case "I":
+                    value = date.toUTCString();
+                    break;
             }
-            return res;
+            res = res.replace($type.PLACEHOLDER, value);
         }
-    });
+        return res;
+    }
     /**
      * Parses format into structured infromation.
      *
      * @param format Format template
      */
-    Object.defineProperty(DateFormatter.prototype, "parseFormat", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (format) {
-            // Check cache
-            // TODO: implement caching of the parsed format
-            // Init format parse info holder
-            var info = {
-                "template": "",
-                "parts": []
-            };
-            // Let TextFormatter split into chunks
-            var chunks = TextFormatter.chunk(format, true);
-            for (var i = 0; i < chunks.length; i++) {
-                var chunk = chunks[i];
-                if (chunk.type === "value") {
-                    // Just "Date"?
-                    if (chunk.text.match(/^date$/i)) {
-                        var dateFormat = this.get("dateFormat", "yyyy-MM-dd");
-                        if (!$type.isString(dateFormat)) {
-                            dateFormat = "yyyy-MM-dd";
-                        }
-                        chunk.text = dateFormat;
+    parseFormat(format) {
+        // Check cache
+        // TODO: implement caching of the parsed format
+        // Init format parse info holder
+        let info = {
+            "template": "",
+            "parts": []
+        };
+        // Let TextFormatter split into chunks
+        let chunks = TextFormatter.chunk(format, true);
+        for (let i = 0; i < chunks.length; i++) {
+            let chunk = chunks[i];
+            if (chunk.type === "value") {
+                // Just "Date"?
+                if (chunk.text.match(/^date$/i)) {
+                    let dateFormat = this.get("dateFormat", "yyyy-MM-dd");
+                    if (!$type.isString(dateFormat)) {
+                        dateFormat = "yyyy-MM-dd";
                     }
-                    // Find all possible parts
-                    var matches = chunk.text.match(/G|yyyy|yyy|yy|y|YYYY|YYY|YY|Y|u|q|MMMMM|MMMM|MMM|MM|M|ww|w|W|dd|d|DDD|DD|D|F|g|EEEEE|EEEE|EEE|EE|E|eeeee|eeee|eee|ee|e|aaa|aa|a|hh|h|HH|H|KK|K|kk|k|mm|m|ss|s|SSS|SS|S|A|zzzz|zzz|zz|z|ZZ|Z|t|x|nnn|nn|n|i|I/g);
-                    // Found?
-                    if (matches) {
-                        // Populate template
-                        for (var x = 0; x < matches.length; x++) {
-                            info.parts.push(matches[x]);
-                            chunk.text = chunk.text.replace(matches[x], $type.PLACEHOLDER);
-                        }
+                    chunk.text = dateFormat;
+                }
+                // Find all possible parts
+                let matches = chunk.text.match(/G|yyyy|yyy|yy|y|YYYY|YYY|YY|Y|u|q|MMMMM|MMMM|MMM|MM|M|ww|w|W|dd|d|DDD|DD|D|F|g|EEEEE|EEEE|EEE|EE|E|eeeee|eeee|eee|ee|e|aaa|aa|a|hh|h|HH|H|KK|K|kk|k|mm|m|ss|s|SSS|SS|S|A|zzzz|zzz|zz|z|ZZ|Z|t|x|nnn|nn|n|i|I/g);
+                // Found?
+                if (matches) {
+                    // Populate template
+                    for (let x = 0; x < matches.length; x++) {
+                        info.parts.push(matches[x]);
+                        chunk.text = chunk.text.replace(matches[x], $type.PLACEHOLDER);
                     }
                 }
-                // Apply to template
-                info.template += chunk.text;
             }
-            // Save cache
-            // TODO
-            return info;
-        }
-    });
-    Object.defineProperty(DateFormatter.prototype, "_months", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            return ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+            // Apply to template
+            info.template += chunk.text;
         }
-    });
-    Object.defineProperty(DateFormatter.prototype, "_getMonth", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (index) {
-            return this._months()[index];
-        }
-    });
-    Object.defineProperty(DateFormatter.prototype, "_shortMonths", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            return ["Jan", "Feb", "Mar", "Apr", "May(short)", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-        }
-    });
-    Object.defineProperty(DateFormatter.prototype, "_getShortMonth", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (index) {
-            return this._shortMonths()[index];
-        }
-    });
-    Object.defineProperty(DateFormatter.prototype, "_weekdays", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+        // Save cache
+        // TODO
+        return info;
+    }
+    _months() {
+        return ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+    }
+    _getMonth(index) {
+        return this._months()[index];
+    }
+    _shortMonths() {
+        return ["Jan", "Feb", "Mar", "Apr", "May(short)", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+    }
+    _getShortMonth(index) {
+        return this._shortMonths()[index];
+    }
+    _weekdays() {
+        return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+    }
+    _getWeekday(index) {
+        return this._weekdays()[index];
+    }
+    _shortWeekdays() {
+        return ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+    }
+    _getShortWeekday(index) {
+        return this._shortWeekdays()[index];
+    }
+    parse(source, format) {
+        // Is it already a Date
+        if (source instanceof Date) {
+            return source;
         }
-    });
-    Object.defineProperty(DateFormatter.prototype, "_getWeekday", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (index) {
-            return this._weekdays()[index];
+        // Is it a numeric timestamp
+        if ($type.isNumber(source)) {
+            return new Date(source);
         }
-    });
-    Object.defineProperty(DateFormatter.prototype, "_shortWeekdays", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            return ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+        // No? Let's check if it's string, and try converting to it if nec
+        if (!$type.isString(source)) {
+            source = source.toString();
         }
-    });
-    Object.defineProperty(DateFormatter.prototype, "_getShortWeekday", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (index) {
-            return this._shortWeekdays()[index];
+        // Init return value
+        let res;
+        // Init RegEx for parsing
+        let reg = "";
+        // Clean format
+        format = $utils.cleanFormat(format);
+        // Clip format to length of the source string
+        format = format.substr(0, source.length);
+        // Parse format
+        let info = this.parseFormat(format);
+        // Init parsed items holder
+        let parsedIndexes = {
+            "year": -1,
+            "year3": -1,
+            "year2": -1,
+            "year1": -1,
+            "month": -1,
+            "monthShort": -1,
+            "monthLong": -1,
+            "weekdayShort": -1,
+            "weekdayLong": -1,
+            "day": -1,
+            "yearDay": -1,
+            "week": -1,
+            "hourBase0": -1,
+            "hour12Base0": -1,
+            "hourBase1": -1,
+            "hour12Base1": -1,
+            "minute": -1,
+            "second": -1,
+            "millisecond": -1,
+            "millisecondDigits": -1,
+            "am": -1,
+            "zone": -1,
+            "timestamp": -1,
+            "iso": -1
+        };
+        // Init values
+        let resValues = {
+            "year": 1970,
+            "month": 0,
+            "day": 1,
+            "hour": 0,
+            "minute": 0,
+            "second": 0,
+            "millisecond": 0,
+            "timestamp": null,
+            "offset": 0,
+            "utc": this._root.utc
+        };
+        // Index adjuster
+        let indexAdjust = 0;
+        let index = 0;
+        // Iterate through all of the parts
+        for (let i = 0; i < info.parts.length; i++) {
+            // Set current match index
+            index = i + indexAdjust + 1;
+            switch (info.parts[i]) {
+                case "yyyy":
+                case "YYYY":
+                    reg += "([0-9]{4})";
+                    parsedIndexes.year = index;
+                    break;
+                case "yyy":
+                case "YYY":
+                    reg += "([0-9]{3})";
+                    parsedIndexes.year3 = index;
+                    break;
+                case "yy":
+                case "YY":
+                    reg += "([0-9]{2})";
+                    parsedIndexes.year2 = index;
+                    break;
+                case "y":
+                case "Y":
+                    reg += "([0-9]{1})";
+                    parsedIndexes.year1 = index;
+                    break;
+                case "MMMM":
+                    reg += "(" + this.getStringList(this._months()).join("|") + ")";
+                    parsedIndexes.monthLong = index;
+                    break;
+                case "MMM":
+                    reg += "(" + this.getStringList(this._shortMonths()).join("|") + ")";
+                    parsedIndexes.monthShort = index;
+                    break;
+                case "MM":
+                case "M":
+                    reg += "([0-9]{2}|[0-9]{1})";
+                    parsedIndexes.month = index;
+                    break;
+                case "ww":
+                case "w":
+                    reg += "([0-9]{2}|[0-9]{1})";
+                    parsedIndexes.week = index;
+                    break;
+                case "dd":
+                case "d":
+                    reg += "([0-9]{2}|[0-9]{1})";
+                    parsedIndexes.day = index;
+                    break;
+                case "DDD":
+                case "DD":
+                case "D":
+                    reg += "([0-9]{3}|[0-9]{2}|[0-9]{1})";
+                    parsedIndexes.yearDay = index;
+                    break;
+                case "dddd":
+                    reg += "(" + this.getStringList(this._weekdays()).join("|") + ")";
+                    parsedIndexes.weekdayLong = index;
+                    break;
+                case "ddd":
+                    reg += "(" + this.getStringList(this._shortWeekdays()).join("|") + ")";
+                    parsedIndexes.weekdayShort = index;
+                    break;
+                case "aaa":
+                case "aa":
+                case "a":
+                    // TODO: fix (escape regex)
+                    reg += "(" + this.getStringList(["AM", "PM", "A\.M\.", "P\.M\.", "A", "P"]).join("|") + ")";
+                    parsedIndexes.am = index;
+                    break;
+                case "hh":
+                case "h":
+                    reg += "([0-9]{2}|[0-9]{1})";
+                    parsedIndexes.hour12Base1 = index;
+                    break;
+                case "HH":
+                case "H":
+                    reg += "([0-9]{2}|[0-9]{1})";
+                    parsedIndexes.hourBase0 = index;
+                    break;
+                case "KK":
+                case "K":
+                    reg += "([0-9]{2}|[0-9]{1})";
+                    parsedIndexes.hour12Base0 = index;
+                    break;
+                case "kk":
+                case "k":
+                    reg += "([0-9]{2}|[0-9]{1})";
+                    parsedIndexes.hourBase1 = index;
+                    break;
+                case "mm":
+                case "m":
+                    reg += "([0-9]{2}|[0-9]{1})";
+                    parsedIndexes.minute = index;
+                    break;
+                case "ss":
+                case "s":
+                    reg += "([0-9]{2}|[0-9]{1})";
+                    parsedIndexes.second = index;
+                    break;
+                case "SSS":
+                case "SS":
+                case "S":
+                    reg += "([0-9]{3}|[0-9]{2}|[0-9]{1})";
+                    parsedIndexes.millisecond = index;
+                    parsedIndexes.millisecondDigits = info.parts[i].length;
+                    break;
+                case "nnn":
+                case "nn":
+                case "n":
+                    reg += "([0-9]{3}|[0-9]{2}|[0-9]{1})";
+                    parsedIndexes.millisecond = index;
+                    break;
+                case "x":
+                    reg += "([0-9]{1,})";
+                    parsedIndexes.timestamp = index;
+                    break;
+                case "Z":
+                    reg += "GMT([-+]+[0-9]{2}:[0-9]{2})";
+                    parsedIndexes.zone = index;
+                    break;
+                case "ZZ":
+                    reg += "([\\-+]+[0-9]{2}[0-9]{2})";
+                    parsedIndexes.zone = index;
+                    break;
+                case "i":
+                    reg += "([0-9]{4})-?([0-9]{2})-?([0-9]{2})T?([0-9]{2}):?([0-9]{2}):?([0-9]{2})\\.?([0-9]{0,3})([zZ]|[+\\-][0-9]{2}:?[0-9]{2}|$)";
+                    parsedIndexes.iso = index;
+                    indexAdjust += 7;
+                    break;
+                case "G":
+                case "YYYY":
+                case "YYY":
+                case "YY":
+                case "Y":
+                case "MMMMM":
+                case "W":
+                case "EEEEE":
+                case "EEEE":
+                case "EEE":
+                case "EE":
+                case "E":
+                case "eeeee":
+                case "eeee":
+                case "eee":
+                case "ee":
+                case "e":
+                case "zzzz":
+                case "zzz":
+                case "zz":
+                case "z":
+                case "t":
+                    // Ignore
+                    indexAdjust--;
+                    break;
+            }
+            reg += "[^0-9]*";
         }
-    });
-    Object.defineProperty(DateFormatter.prototype, "parse", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (source, format) {
-            // Is it already a Date
-            if (source instanceof Date) {
-                return source;
-            }
-            // Is it a numeric timestamp
-            if ($type.isNumber(source)) {
-                return new Date(source);
-            }
-            // No? Let's check if it's string, and try converting to it if nec
-            if (!$type.isString(source)) {
-                source = source.toString();
-            }
-            // Init return value
-            var res;
-            // Init RegEx for parsing
-            var reg = "";
-            // Clean format
-            format = $utils.cleanFormat(format);
-            // Clip format to length of the source string
-            format = format.substr(0, source.length);
-            // Parse format
-            var info = this.parseFormat(format);
-            // Init parsed items holder
-            var parsedIndexes = {
-                "year": -1,
-                "year3": -1,
-                "year2": -1,
-                "year1": -1,
-                "month": -1,
-                "monthShort": -1,
-                "monthLong": -1,
-                "weekdayShort": -1,
-                "weekdayLong": -1,
-                "day": -1,
-                "yearDay": -1,
-                "week": -1,
-                "hourBase0": -1,
-                "hour12Base0": -1,
-                "hourBase1": -1,
-                "hour12Base1": -1,
-                "minute": -1,
-                "second": -1,
-                "millisecond": -1,
-                "millisecondDigits": -1,
-                "am": -1,
-                "zone": -1,
-                "timestamp": -1,
-                "iso": -1
-            };
-            // Init values
-            var resValues = {
-                "year": 1970,
-                "month": 0,
-                "day": 1,
-                "hour": 0,
-                "minute": 0,
-                "second": 0,
-                "millisecond": 0,
-                "timestamp": null,
-                "offset": 0,
-                "utc": this._root.utc
-            };
-            // Index adjuster
-            var indexAdjust = 0;
-            var index = 0;
-            // Iterate through all of the parts
-            for (var i = 0; i < info.parts.length; i++) {
-                // Set current match index
-                index = i + indexAdjust + 1;
-                switch (info.parts[i]) {
-                    case "yyyy":
-                    case "YYYY":
-                        reg += "([0-9]{4})";
-                        parsedIndexes.year = index;
-                        break;
-                    case "yyy":
-                    case "YYY":
-                        reg += "([0-9]{3})";
-                        parsedIndexes.year3 = index;
-                        break;
-                    case "yy":
-                    case "YY":
-                        reg += "([0-9]{2})";
-                        parsedIndexes.year2 = index;
-                        break;
-                    case "y":
-                    case "Y":
-                        reg += "([0-9]{1})";
-                        parsedIndexes.year1 = index;
-                        break;
-                    case "MMMM":
-                        reg += "(" + this.getStringList(this._months()).join("|") + ")";
-                        parsedIndexes.monthLong = index;
-                        break;
-                    case "MMM":
-                        reg += "(" + this.getStringList(this._shortMonths()).join("|") + ")";
-                        parsedIndexes.monthShort = index;
-                        break;
-                    case "MM":
-                    case "M":
-                        reg += "([0-9]{2}|[0-9]{1})";
-                        parsedIndexes.month = index;
-                        break;
-                    case "ww":
-                    case "w":
-                        reg += "([0-9]{2}|[0-9]{1})";
-                        parsedIndexes.week = index;
-                        break;
-                    case "dd":
-                    case "d":
-                        reg += "([0-9]{2}|[0-9]{1})";
-                        parsedIndexes.day = index;
-                        break;
-                    case "DDD":
-                    case "DD":
-                    case "D":
-                        reg += "([0-9]{3}|[0-9]{2}|[0-9]{1})";
-                        parsedIndexes.yearDay = index;
-                        break;
-                    case "dddd":
-                        reg += "(" + this.getStringList(this._weekdays()).join("|") + ")";
-                        parsedIndexes.weekdayLong = index;
-                        break;
-                    case "ddd":
-                        reg += "(" + this.getStringList(this._shortWeekdays()).join("|") + ")";
-                        parsedIndexes.weekdayShort = index;
-                        break;
-                    case "aaa":
-                    case "aa":
-                    case "a":
-                        // TODO: fix (escape regex)
-                        reg += "(" + this.getStringList(["AM", "PM", "A\.M\.", "P\.M\.", "A", "P"]).join("|") + ")";
-                        parsedIndexes.am = index;
-                        break;
-                    case "hh":
-                    case "h":
-                        reg += "([0-9]{2}|[0-9]{1})";
-                        parsedIndexes.hour12Base1 = index;
-                        break;
-                    case "HH":
-                    case "H":
-                        reg += "([0-9]{2}|[0-9]{1})";
-                        parsedIndexes.hourBase0 = index;
-                        break;
-                    case "KK":
-                    case "K":
-                        reg += "([0-9]{2}|[0-9]{1})";
-                        parsedIndexes.hour12Base0 = index;
-                        break;
-                    case "kk":
-                    case "k":
-                        reg += "([0-9]{2}|[0-9]{1})";
-                        parsedIndexes.hourBase1 = index;
-                        break;
-                    case "mm":
-                    case "m":
-                        reg += "([0-9]{2}|[0-9]{1})";
-                        parsedIndexes.minute = index;
-                        break;
-                    case "ss":
-                    case "s":
-                        reg += "([0-9]{2}|[0-9]{1})";
-                        parsedIndexes.second = index;
-                        break;
-                    case "SSS":
-                    case "SS":
-                    case "S":
-                        reg += "([0-9]{3}|[0-9]{2}|[0-9]{1})";
-                        parsedIndexes.millisecond = index;
-                        parsedIndexes.millisecondDigits = info.parts[i].length;
-                        break;
-                    case "nnn":
-                    case "nn":
-                    case "n":
-                        reg += "([0-9]{3}|[0-9]{2}|[0-9]{1})";
-                        parsedIndexes.millisecond = index;
-                        break;
-                    case "x":
-                        reg += "([0-9]{1,})";
-                        parsedIndexes.timestamp = index;
-                        break;
-                    case "Z":
-                        reg += "GMT([-+]+[0-9]{2}:[0-9]{2})";
-                        parsedIndexes.zone = index;
-                        break;
-                    case "ZZ":
-                        reg += "([\\-+]+[0-9]{2}[0-9]{2})";
-                        parsedIndexes.zone = index;
-                        break;
-                    case "i":
-                        reg += "([0-9]{4})-?([0-9]{2})-?([0-9]{2})T?([0-9]{2}):?([0-9]{2}):?([0-9]{2})\\.?([0-9]{0,3})([zZ]|[+\\-][0-9]{2}:?[0-9]{2}|$)";
-                        parsedIndexes.iso = index;
-                        indexAdjust += 7;
-                        break;
-                    case "G":
-                    case "YYYY":
-                    case "YYY":
-                    case "YY":
-                    case "Y":
-                    case "MMMMM":
-                    case "W":
-                    case "EEEEE":
-                    case "EEEE":
-                    case "EEE":
-                    case "EE":
-                    case "E":
-                    case "eeeee":
-                    case "eeee":
-                    case "eee":
-                    case "ee":
-                    case "e":
-                    case "zzzz":
-                    case "zzz":
-                    case "zz":
-                    case "z":
-                    case "t":
-                        // Ignore
-                        indexAdjust--;
-                        break;
-                }
-                reg += "[^0-9]*";
-            }
-            // Try matching
-            var regex = new RegExp(reg);
-            var matches = source.match(regex);
-            if (matches) {
-                // Populate the date object
-                // Full year
-                if (parsedIndexes.year > -1) {
-                    resValues.year = parseInt(matches[parsedIndexes.year]);
-                }
-                // 3-digit year
-                if (parsedIndexes.year3 > -1) {
-                    var val = parseInt(matches[parsedIndexes.year3]);
+        // Try matching
+        let regex = new RegExp(reg);
+        let matches = source.match(regex);
+        if (matches) {
+            // Populate the date object
+            // Full year
+            if (parsedIndexes.year > -1) {
+                resValues.year = parseInt(matches[parsedIndexes.year]);
+            }
+            // 3-digit year
+            if (parsedIndexes.year3 > -1) {
+                let val = parseInt(matches[parsedIndexes.year3]);
+                val += 1000;
+                resValues.year = val;
+            }
+            // 2-digit year
+            if (parsedIndexes.year2 > -1) {
+                let val = parseInt(matches[parsedIndexes.year2]);
+                if (val > 50) {
                     val += 1000;
-                    resValues.year = val;
-                }
-                // 2-digit year
-                if (parsedIndexes.year2 > -1) {
-                    var val = parseInt(matches[parsedIndexes.year2]);
-                    if (val > 50) {
-                        val += 1000;
-                    }
-                    else {
-                        val += 2000;
-                    }
-                    resValues.year = val;
-                }
-                // 1-digit year
-                if (parsedIndexes.year1 > -1) {
-                    var val = parseInt(matches[parsedIndexes.year1]);
-                    val = Math.floor((new Date().getFullYear()) / 10) * 10 + val;
-                    resValues.year = val;
-                }
-                // Full month
-                if (parsedIndexes.monthLong > -1) {
-                    resValues.month = this.resolveMonth(matches[parsedIndexes.monthLong]);
                 }
-                // Short month
-                if (parsedIndexes.monthShort > -1) {
-                    resValues.month = this.resolveShortMonth(matches[parsedIndexes.monthShort]);
-                }
-                // Numeric month
-                if (parsedIndexes.month > -1) {
-                    resValues.month = parseInt(matches[parsedIndexes.month]) - 1;
-                }
-                // Weekday
-                // @todo
-                // Week
-                if ((parsedIndexes.week > -1) && (parsedIndexes.day === -1)) {
-                    // We parse weeks ONLY if day is not explicitly set
-                    // TODO: this needs work
-                    // (but maybe later - I can hardly imagine anyone passing their dates in weeks)
-                    resValues.month = 0;
-                    resValues.day = $utils.getDayFromWeek(parseInt(matches[parsedIndexes.week]), resValues.year, 1, this._root.utc);
-                }
-                // Day
-                if (parsedIndexes.day > -1) {
-                    resValues.day = parseInt(matches[parsedIndexes.day]);
-                }
-                // Year day
-                if (parsedIndexes.yearDay > -1) {
-                    resValues.month = 0;
-                    resValues.day = parseInt(matches[parsedIndexes.yearDay]);
-                }
-                // 24 Hour (0-23)
-                if (parsedIndexes.hourBase0 > -1) {
-                    resValues.hour = parseInt(matches[parsedIndexes.hourBase0]);
-                }
-                // 24 Hour (1-24)
-                if (parsedIndexes.hourBase1 > -1) {
-                    resValues.hour = parseInt(matches[parsedIndexes.hourBase1]) - 1;
-                }
-                // 12 Hour (0-11)
-                if (parsedIndexes.hour12Base0 > -1) {
-                    var val = parseInt(matches[parsedIndexes.hour12Base0]);
-                    if (val == 11) {
-                        val = 0;
-                    }
-                    if ((parsedIndexes.am > -1) && !this.isAm(matches[parsedIndexes.am])) {
-                        val += 12;
-                    }
-                    resValues.hour = val;
-                }
-                // 12 Hour (1-12)
-                if (parsedIndexes.hour12Base1 > -1) {
-                    var val = parseInt(matches[parsedIndexes.hour12Base1]);
-                    if (val == 12) {
-                        val = 0;
-                    }
-                    if ((parsedIndexes.am > -1) && !this.isAm(matches[parsedIndexes.am])) {
-                        val += 12;
-                    }
-                    resValues.hour = val;
-                }
-                // Minute
-                if (parsedIndexes.minute > -1) {
-                    resValues.minute = parseInt(matches[parsedIndexes.minute]);
+                else {
+                    val += 2000;
                 }
-                // Second
-                if (parsedIndexes.second > -1) {
-                    resValues.second = parseInt(matches[parsedIndexes.second]);
+                resValues.year = val;
+            }
+            // 1-digit year
+            if (parsedIndexes.year1 > -1) {
+                let val = parseInt(matches[parsedIndexes.year1]);
+                val = Math.floor((new Date().getFullYear()) / 10) * 10 + val;
+                resValues.year = val;
+            }
+            // Full month
+            if (parsedIndexes.monthLong > -1) {
+                resValues.month = this.resolveMonth(matches[parsedIndexes.monthLong]);
+            }
+            // Short month
+            if (parsedIndexes.monthShort > -1) {
+                resValues.month = this.resolveShortMonth(matches[parsedIndexes.monthShort]);
+            }
+            // Numeric month
+            if (parsedIndexes.month > -1) {
+                resValues.month = parseInt(matches[parsedIndexes.month]) - 1;
+            }
+            // Weekday
+            // @todo
+            // Week
+            if ((parsedIndexes.week > -1) && (parsedIndexes.day === -1)) {
+                // We parse weeks ONLY if day is not explicitly set
+                // TODO: this needs work
+                // (but maybe later - I can hardly imagine anyone passing their dates in weeks)
+                resValues.month = 0;
+                resValues.day = $utils.getDayFromWeek(parseInt(matches[parsedIndexes.week]), resValues.year, 1, this._root.utc);
+            }
+            // Day
+            if (parsedIndexes.day > -1) {
+                resValues.day = parseInt(matches[parsedIndexes.day]);
+            }
+            // Year day
+            if (parsedIndexes.yearDay > -1) {
+                resValues.month = 0;
+                resValues.day = parseInt(matches[parsedIndexes.yearDay]);
+            }
+            // 24 Hour (0-23)
+            if (parsedIndexes.hourBase0 > -1) {
+                resValues.hour = parseInt(matches[parsedIndexes.hourBase0]);
+            }
+            // 24 Hour (1-24)
+            if (parsedIndexes.hourBase1 > -1) {
+                resValues.hour = parseInt(matches[parsedIndexes.hourBase1]) - 1;
+            }
+            // 12 Hour (0-11)
+            if (parsedIndexes.hour12Base0 > -1) {
+                let val = parseInt(matches[parsedIndexes.hour12Base0]);
+                if (val == 11) {
+                    val = 0;
                 }
-                // Millisecond
-                if (parsedIndexes.millisecond > -1) {
-                    var val = parseInt(matches[parsedIndexes.millisecond]);
-                    if (parsedIndexes.millisecondDigits == 2) {
-                        val *= 10;
-                    }
-                    else if (parsedIndexes.millisecondDigits == 1) {
-                        val *= 100;
-                    }
-                    resValues.millisecond = val;
+                if ((parsedIndexes.am > -1) && !this.isAm(matches[parsedIndexes.am])) {
+                    val += 12;
                 }
-                // Timestamp
-                if (parsedIndexes.timestamp > -1) {
-                    resValues.timestamp = parseInt(matches[parsedIndexes.timestamp]);
-                    var ts = new Date(resValues.timestamp);
-                    resValues.year = ts.getUTCFullYear();
-                    resValues.month = ts.getUTCMonth();
-                    resValues.day = ts.getUTCDate();
-                    resValues.hour = ts.getUTCHours();
-                    resValues.minute = ts.getUTCMinutes();
-                    resValues.second = ts.getUTCSeconds();
-                    resValues.millisecond = ts.getUTCMilliseconds();
+                resValues.hour = val;
+            }
+            // 12 Hour (1-12)
+            if (parsedIndexes.hour12Base1 > -1) {
+                let val = parseInt(matches[parsedIndexes.hour12Base1]);
+                if (val == 12) {
+                    val = 0;
                 }
-                // Adjust time zone
-                if (parsedIndexes.zone > -1) {
-                    resValues.offset = this.resolveTimezoneOffset(new Date(resValues.year, resValues.month, resValues.day), matches[parsedIndexes.zone]);
+                if ((parsedIndexes.am > -1) && !this.isAm(matches[parsedIndexes.am])) {
+                    val += 12;
                 }
-                // ISO
-                if (parsedIndexes.iso > -1) {
-                    resValues.year = $type.toNumber(matches[parsedIndexes.iso + 0]);
-                    resValues.month = $type.toNumber(matches[parsedIndexes.iso + 1]) - 1;
-                    resValues.day = $type.toNumber(matches[parsedIndexes.iso + 2]);
-                    resValues.hour = $type.toNumber(matches[parsedIndexes.iso + 3]);
-                    resValues.minute = $type.toNumber(matches[parsedIndexes.iso + 4]);
-                    resValues.second = $type.toNumber(matches[parsedIndexes.iso + 5]);
-                    resValues.millisecond = $type.toNumber(matches[parsedIndexes.iso + 6]);
-                    if (matches[parsedIndexes.iso + 7] == "Z" || matches[parsedIndexes.iso + 7] == "z") {
-                        resValues.utc = true;
-                    }
-                    else if (matches[parsedIndexes.iso + 7] != "") {
-                        resValues.offset = this.resolveTimezoneOffset(new Date(resValues.year, resValues.month, resValues.day), matches[parsedIndexes.iso + 7]);
-                    }
+                resValues.hour = val;
+            }
+            // Minute
+            if (parsedIndexes.minute > -1) {
+                resValues.minute = parseInt(matches[parsedIndexes.minute]);
+            }
+            // Second
+            if (parsedIndexes.second > -1) {
+                resValues.second = parseInt(matches[parsedIndexes.second]);
+            }
+            // Millisecond
+            if (parsedIndexes.millisecond > -1) {
+                let val = parseInt(matches[parsedIndexes.millisecond]);
+                if (parsedIndexes.millisecondDigits == 2) {
+                    val *= 10;
                 }
-                // Create Date object
-                if (resValues.utc) {
-                    res = new Date(Date.UTC(resValues.year, resValues.month, resValues.day, resValues.hour, resValues.minute, resValues.second, resValues.millisecond));
+                else if (parsedIndexes.millisecondDigits == 1) {
+                    val *= 100;
                 }
-                else {
-                    res = new Date(resValues.year, resValues.month, resValues.day, resValues.hour, resValues.minute + resValues.offset, resValues.second, resValues.millisecond);
+                resValues.millisecond = val;
+            }
+            // Timestamp
+            if (parsedIndexes.timestamp > -1) {
+                resValues.timestamp = parseInt(matches[parsedIndexes.timestamp]);
+                const ts = new Date(resValues.timestamp);
+                resValues.year = ts.getUTCFullYear();
+                resValues.month = ts.getUTCMonth();
+                resValues.day = ts.getUTCDate();
+                resValues.hour = ts.getUTCHours();
+                resValues.minute = ts.getUTCMinutes();
+                resValues.second = ts.getUTCSeconds();
+                resValues.millisecond = ts.getUTCMilliseconds();
+            }
+            // Adjust time zone
+            if (parsedIndexes.zone > -1) {
+                resValues.offset = this.resolveTimezoneOffset(new Date(resValues.year, resValues.month, resValues.day), matches[parsedIndexes.zone]);
+            }
+            // ISO
+            if (parsedIndexes.iso > -1) {
+                resValues.year = $type.toNumber(matches[parsedIndexes.iso + 0]);
+                resValues.month = $type.toNumber(matches[parsedIndexes.iso + 1]) - 1;
+                resValues.day = $type.toNumber(matches[parsedIndexes.iso + 2]);
+                resValues.hour = $type.toNumber(matches[parsedIndexes.iso + 3]);
+                resValues.minute = $type.toNumber(matches[parsedIndexes.iso + 4]);
+                resValues.second = $type.toNumber(matches[parsedIndexes.iso + 5]);
+                resValues.millisecond = $type.toNumber(matches[parsedIndexes.iso + 6]);
+                if (matches[parsedIndexes.iso + 7] == "Z" || matches[parsedIndexes.iso + 7] == "z") {
+                    resValues.utc = true;
+                }
+                else if (matches[parsedIndexes.iso + 7] != "") {
+                    resValues.offset = this.resolveTimezoneOffset(new Date(resValues.year, resValues.month, resValues.day), matches[parsedIndexes.iso + 7]);
                 }
             }
+            // Create Date object
+            if (resValues.utc) {
+                res = new Date(Date.UTC(resValues.year, resValues.month, resValues.day, resValues.hour, resValues.minute, resValues.second, resValues.millisecond));
+            }
             else {
-                // Didn't match anything
-                // Let's try dropping it into Date constructor and hope for the best
-                res = new Date(source);
+                res = new Date(resValues.year, resValues.month, resValues.day, resValues.hour, resValues.minute + resValues.offset, resValues.second, resValues.millisecond);
             }
-            return res;
         }
-    });
-    Object.defineProperty(DateFormatter.prototype, "resolveTimezoneOffset", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (date, zone) {
-            var value = zone.match(/([+\-]?)([0-9]{2}):?([0-9]{2})/);
-            if (value) {
-                var match = zone.match(/([+\-]?)([0-9]{2}):?([0-9]{2})/);
-                var dir = match[1];
-                var hour = match[2];
-                var minute = match[3];
-                var offset = parseInt(hour) * 60 + parseInt(minute);
-                // Adjust offset
-                // Making it negative does not seem to make sense, but it's right
-                // because of how JavaScript calculates GMT offsets
-                if (dir == "+") {
-                    offset *= -1;
-                }
-                // Check the difference in offset
-                var originalOffset = (date || new Date()).getTimezoneOffset();
-                var diff = offset - originalOffset;
-                return diff;
+        else {
+            // Didn't match anything
+            // Let's try dropping it into Date constructor and hope for the best
+            res = new Date(source);
+        }
+        return res;
+    }
+    resolveTimezoneOffset(date, zone) {
+        let value = zone.match(/([+\-]?)([0-9]{2}):?([0-9]{2})/);
+        if (value) {
+            let match = zone.match(/([+\-]?)([0-9]{2}):?([0-9]{2})/);
+            let dir = match[1];
+            let hour = match[2];
+            let minute = match[3];
+            let offset = parseInt(hour) * 60 + parseInt(minute);
+            // Adjust offset
+            // Making it negative does not seem to make sense, but it's right
+            // because of how JavaScript calculates GMT offsets
+            if (dir == "+") {
+                offset *= -1;
             }
-            return 0;
+            // Check the difference in offset
+            let originalOffset = (date || new Date()).getTimezoneOffset();
+            let diff = offset - originalOffset;
+            return diff;
         }
-    });
+        return 0;
+    }
     /**
      * Resolves month name (i.e. "December") into a month number (11).
      *
      * @param value  Month name
      * @return Month number
      */
-    Object.defineProperty(DateFormatter.prototype, "resolveMonth", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (value) {
-            // Let's try English first
-            var month = this._months().indexOf(value);
+    resolveMonth(value) {
+        // Let's try English first
+        let month = this._months().indexOf(value);
+        if (month > -1) {
+            return month;
+        }
+        // Try the translation
+        if (!this._root.language.isDefault()) {
+            month = this._root.language.translateAll(this._months()).indexOf(value);
             if (month > -1) {
                 return month;
             }
-            // Try the translation
-            if (!this._root.language.isDefault()) {
-                month = this._root.language.translateAll(this._months()).indexOf(value);
-                if (month > -1) {
-                    return month;
-                }
-            }
-            return 0;
         }
-    });
+        return 0;
+    }
     /**
      * Resolves short month name (i.e. "Dec") into a month number.
      *
      * @param value  Short month name
      * @return Month number
      */
-    Object.defineProperty(DateFormatter.prototype, "resolveShortMonth", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (value) {
-            // Let's try English first
-            var month = this._shortMonths().indexOf(value);
-            if (month > -1) {
-                return month;
-            }
-            // Maybe long month (workaround for May)
-            month = this._months().indexOf(value);
+    resolveShortMonth(value) {
+        // Let's try English first
+        let month = this._shortMonths().indexOf(value);
+        if (month > -1) {
+            return month;
+        }
+        // Maybe long month (workaround for May)
+        month = this._months().indexOf(value);
+        if (month > -1) {
+            return month;
+        }
+        // Try the translation
+        if (this._root.language && !this._root.language.isDefault()) {
+            month = this._root.language.translateAll(this._shortMonths()).indexOf(value);
             if (month > -1) {
                 return month;
             }
-            // Try the translation
-            if (this._root.language && !this._root.language.isDefault()) {
-                month = this._root.language.translateAll(this._shortMonths()).indexOf(value);
-                if (month > -1) {
-                    return month;
-                }
-            }
-            return 0;
         }
-    });
+        return 0;
+    }
     /**
      * Checks if passed in string represents AM/PM notation in many of its
      * versions.
@@ -948,40 +854,28 @@ var DateFormatter = /** @class */ (function (_super) {
      * @param value  Source string
      * @return Is it AM/PM?
      */
-    Object.defineProperty(DateFormatter.prototype, "isAm", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (value) {
-            var list = this.getStringList(["AM", "A.M.", "A"]);
-            return list.indexOf(value.toUpperCase()) > -1;
-        }
-    });
+    isAm(value) {
+        let list = this.getStringList(["AM", "A.M.", "A"]);
+        return list.indexOf(value.toUpperCase()) > -1;
+    }
     /**
      * Translates list of strings.
      *
      * @param list  Source strings
      * @return Translated strings
      */
-    Object.defineProperty(DateFormatter.prototype, "getStringList", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (list) {
-            var res = [];
-            for (var i = 0; i < list.length; i++) {
-                // translate?
-                if (this._root.language) {
-                    res.push($utils.escapeForRgex(this._t(list[i])));
-                }
-                else {
-                    res.push($utils.escapeForRgex(list[i]));
-                }
+    getStringList(list) {
+        let res = [];
+        for (let i = 0; i < list.length; i++) {
+            // translate?
+            if (this._root.language) {
+                res.push($utils.escapeForRgex(this._t(list[i])));
+            }
+            else {
+                res.push($utils.escapeForRgex(list[i]));
             }
-            return res;
         }
-    });
-    return DateFormatter;
-}(Entity));
-export { DateFormatter };
+        return res;
+    }
+}
 //# sourceMappingURL=DateFormatter.js.map