@amcharts/amcharts5 5.2.49 → 5.3.0

package/.internal/core/util/NumberFormatter.js

@@ -1,4 +1,3 @@
-import { __extends } from "tslib";
 import { Entity } from "./Entity";
 import { TextFormatter } from "./TextFormatter";
 import * as $object from "./Object";
@@ -10,62 +9,48 @@ import * as $type from "./Type";
  * @see {@link https://www.amcharts.com/docs/v5/concepts/formatters/formatting-numbers/} for more info
  * @important
  */
-var NumberFormatter = /** @class */ (function (_super) {
-    __extends(NumberFormatter, _super);
-    function NumberFormatter() {
-        return _super !== null && _super.apply(this, arguments) || this;
+export class NumberFormatter extends Entity {
+    _setDefaults() {
+        // Defaults
+        this._setDefault("negativeBase", 0);
+        this._setDefault("numberFormat", "#,###.#####");
+        this._setDefault("smallNumberThreshold", 1.00);
+        const bns = "_big_number_suffix_";
+        const sns = "_small_number_suffix_";
+        const bs = "_byte_suffix_";
+        this._setDefault("bigNumberPrefixes", [
+            { "number": 1e+3, "suffix": this._t(bns + "3") },
+            { "number": 1e+6, "suffix": this._t(bns + "6") },
+            { "number": 1e+9, "suffix": this._t(bns + "9") },
+            { "number": 1e+12, "suffix": this._t(bns + "12") },
+            { "number": 1e+15, "suffix": this._t(bns + "15") },
+            { "number": 1e+18, "suffix": this._t(bns + "18") },
+            { "number": 1e+21, "suffix": this._t(bns + "21") },
+            { "number": 1e+24, "suffix": this._t(bns + "24") }
+        ]);
+        this._setDefault("smallNumberPrefixes", [
+            { "number": 1e-24, "suffix": this._t(sns + "24") },
+            { "number": 1e-21, "suffix": this._t(sns + "21") },
+            { "number": 1e-18, "suffix": this._t(sns + "18") },
+            { "number": 1e-15, "suffix": this._t(sns + "15") },
+            { "number": 1e-12, "suffix": this._t(sns + "12") },
+            { "number": 1e-9, "suffix": this._t(sns + "9") },
+            { "number": 1e-6, "suffix": this._t(sns + "6") },
+            { "number": 1e-3, "suffix": this._t(sns + "3") }
+        ]);
+        this._setDefault("bytePrefixes", [
+            { "number": 1, suffix: this._t(bs + "B") },
+            { "number": 1024, suffix: this._t(bs + "KB") },
+            { "number": 1048576, suffix: this._t(bs + "MB") },
+            { "number": 1073741824, suffix: this._t(bs + "GB") },
+            { "number": 1099511627776, suffix: this._t(bs + "TB") },
+            { "number": 1125899906842624, suffix: this._t(bs + "PB") }
+        ]);
+        super._setDefaults();
+    }
+    _beforeChanged() {
+        super._beforeChanged();
     }
-    Object.defineProperty(NumberFormatter.prototype, "_setDefaults", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            // Defaults
-            this._setDefault("negativeBase", 0);
-            this._setDefault("numberFormat", "#,###.#####");
-            this._setDefault("smallNumberThreshold", 1.00);
-            var bns = "_big_number_suffix_";
-            var sns = "_small_number_suffix_";
-            var bs = "_byte_suffix_";
-            this._setDefault("bigNumberPrefixes", [
-                { "number": 1e+3, "suffix": this._t(bns + "3") },
-                { "number": 1e+6, "suffix": this._t(bns + "6") },
-                { "number": 1e+9, "suffix": this._t(bns + "9") },
-                { "number": 1e+12, "suffix": this._t(bns + "12") },
-                { "number": 1e+15, "suffix": this._t(bns + "15") },
-                { "number": 1e+18, "suffix": this._t(bns + "18") },
-                { "number": 1e+21, "suffix": this._t(bns + "21") },
-                { "number": 1e+24, "suffix": this._t(bns + "24") }
-            ]);
-            this._setDefault("smallNumberPrefixes", [
-                { "number": 1e-24, "suffix": this._t(sns + "24") },
-                { "number": 1e-21, "suffix": this._t(sns + "21") },
-                { "number": 1e-18, "suffix": this._t(sns + "18") },
-                { "number": 1e-15, "suffix": this._t(sns + "15") },
-                { "number": 1e-12, "suffix": this._t(sns + "12") },
-                { "number": 1e-9, "suffix": this._t(sns + "9") },
-                { "number": 1e-6, "suffix": this._t(sns + "6") },
-                { "number": 1e-3, "suffix": this._t(sns + "3") }
-            ]);
-            this._setDefault("bytePrefixes", [
-                { "number": 1, suffix: this._t(bs + "B") },
-                { "number": 1024, suffix: this._t(bs + "KB") },
-                { "number": 1048576, suffix: this._t(bs + "MB") },
-                { "number": 1073741824, suffix: this._t(bs + "GB") },
-                { "number": 1099511627776, suffix: this._t(bs + "TB") },
-                { "number": 1125899906842624, suffix: this._t(bs + "PB") }
-            ]);
-            _super.prototype._setDefaults.call(this);
-        }
-    });
-    Object.defineProperty(NumberFormatter.prototype, "_beforeChanged", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            _super.prototype._beforeChanged.call(this);
-        }
-    });
     /**
      * Formats the number according to specific format.
      *
@@ -73,61 +58,56 @@ var NumberFormatter = /** @class */ (function (_super) {
      * @param format  Format to apply
      * @return Formatted number
      */
-    Object.defineProperty(NumberFormatter.prototype, "format", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (value, format, precision) {
-            // no format passed in or "Number"
-            if (format == null || ($type.isString(format) && format.toLowerCase() === "number")) {
-                format = this.get("numberFormat", "");
-            }
-            // Init return value
-            var formatted;
-            // Cast to number just in case
-            // TODO: maybe use better casting
-            var source = Number(value);
-            // Is it a built-in format or Intl.NumberFormatOptions
-            if ($type.isObject(format)) {
-                try {
-                    if (this.get("intlLocales")) {
-                        return new Intl.NumberFormat(this.get("intlLocales"), format).format(source);
-                    }
-                    else {
-                        return new Intl.NumberFormat(undefined, format).format(source);
-                    }
+    format(value, format, precision) {
+        // no format passed in or "Number"
+        if (format == null || ($type.isString(format) && format.toLowerCase() === "number")) {
+            format = this.get("numberFormat", "");
+        }
+        // Init return value
+        let formatted;
+        // Cast to number just in case
+        // TODO: maybe use better casting
+        let source = Number(value);
+        // Is it a built-in format or Intl.NumberFormatOptions
+        if ($type.isObject(format)) {
+            try {
+                if (this.get("intlLocales")) {
+                    return new Intl.NumberFormat(this.get("intlLocales"), format).format(source);
                 }
-                catch (e) {
-                    return "Invalid";
+                else {
+                    return new Intl.NumberFormat(undefined, format).format(source);
                 }
             }
+            catch (e) {
+                return "Invalid";
+            }
+        }
+        else {
+            // Clean format
+            format = $utils.cleanFormat(format);
+            // Get format info (it will also deal with parser caching)
+            let info = this.parseFormat(format, this._root.language);
+            // format and replace the number
+            let details;
+            if (source > this.get("negativeBase")) {
+                details = info.positive;
+            }
+            else if (source < this.get("negativeBase")) {
+                details = info.negative;
+            }
             else {
-                // Clean format
-                format = $utils.cleanFormat(format);
-                // Get format info (it will also deal with parser caching)
-                var info = this.parseFormat(format, this._root.language);
-                // format and replace the number
-                var details = void 0;
-                if (source > this.get("negativeBase")) {
-                    details = info.positive;
-                }
-                else if (source < this.get("negativeBase")) {
-                    details = info.negative;
-                }
-                else {
-                    details = info.zero;
-                }
-                // Adjust precision
-                if (precision != null && !details.mod) {
-                    details = $object.copy(details);
-                    details.decimals.active = source == 0 ? 0 : precision;
-                }
-                // Format
-                formatted = details.template.split($type.PLACEHOLDER).join(this.applyFormat(source, details));
+                details = info.zero;
             }
-            return formatted;
+            // Adjust precision
+            if (precision != null && !details.mod) {
+                details = $object.copy(details);
+                details.decimals.active = source == 0 ? 0 : precision;
+            }
+            // Format
+            formatted = details.template.split($type.PLACEHOLDER).join(this.applyFormat(source, details));
         }
-    });
+        return formatted;
+    }
     /**
      * Parses supplied format into structured object which can be used to format
      * the number.
@@ -136,188 +116,182 @@ var NumberFormatter = /** @class */ (function (_super) {
      * @param language Language
      * @ignore
      */
-    Object.defineProperty(NumberFormatter.prototype, "parseFormat", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (format, language) {
-            // Check cache
-            // TODO
-            // let cached = this.getCache(format);
-            // if (cached != null) {
-            // 	return cached;
-            // }
-            var _this = this;
-            var thousandSeparator = language.translateEmpty("_thousandSeparator");
-            var decimalSeparator = language.translateEmpty("_decimalSeparator");
-            // init format parse info holder
-            var info = {
-                "positive": {
-                    "thousands": {
-                        "active": -1,
-                        "passive": -1,
-                        "interval": -1,
-                        "separator": thousandSeparator
-                    },
-                    "decimals": {
-                        "active": -1,
-                        "passive": -1,
-                        "separator": decimalSeparator
-                    },
-                    "template": "",
-                    "source": "",
-                    "parsed": false
+    parseFormat(format, language) {
+        // Check cache
+        // TODO
+        // let cached = this.getCache(format);
+        // if (cached != null) {
+        // 	return cached;
+        // }
+        const thousandSeparator = language.translateEmpty("_thousandSeparator");
+        const decimalSeparator = language.translateEmpty("_decimalSeparator");
+        // init format parse info holder
+        let info = {
+            "positive": {
+                "thousands": {
+                    "active": -1,
+                    "passive": -1,
+                    "interval": -1,
+                    "separator": thousandSeparator
                 },
-                "negative": {
-                    "thousands": {
-                        "active": -1,
-                        "passive": -1,
-                        "interval": -1,
-                        "separator": thousandSeparator
-                    },
-                    "decimals": {
-                        "active": -1,
-                        "passive": -1,
-                        "separator": decimalSeparator
-                    },
-                    "template": "",
-                    "source": "",
-                    "parsed": false
+                "decimals": {
+                    "active": -1,
+                    "passive": -1,
+                    "separator": decimalSeparator
                 },
-                "zero": {
-                    "thousands": {
-                        "active": -1,
-                        "passive": -1,
-                        "interval": -1,
-                        "separator": thousandSeparator
-                    },
-                    "decimals": {
-                        "active": -1,
-                        "passive": -1,
-                        "separator": decimalSeparator
-                    },
-                    "template": "",
-                    "source": "",
-                    "parsed": false
-                }
-            };
-            // Escape double vertical bars (that mean display one vertical bar)
-            format = format.replace("||", $type.PLACEHOLDER2);
-            // Split it up and deal with different formats
-            var parts = format.split("|");
-            info.positive.source = parts[0];
-            if (typeof parts[2] === "undefined") {
-                info.zero = info.positive;
-            }
-            else {
-                info.zero.source = parts[2];
+                "template": "",
+                "source": "",
+                "parsed": false
+            },
+            "negative": {
+                "thousands": {
+                    "active": -1,
+                    "passive": -1,
+                    "interval": -1,
+                    "separator": thousandSeparator
+                },
+                "decimals": {
+                    "active": -1,
+                    "passive": -1,
+                    "separator": decimalSeparator
+                },
+                "template": "",
+                "source": "",
+                "parsed": false
+            },
+            "zero": {
+                "thousands": {
+                    "active": -1,
+                    "passive": -1,
+                    "interval": -1,
+                    "separator": thousandSeparator
+                },
+                "decimals": {
+                    "active": -1,
+                    "passive": -1,
+                    "separator": decimalSeparator
+                },
+                "template": "",
+                "source": "",
+                "parsed": false
             }
-            if (typeof parts[1] === "undefined") {
-                info.negative = info.positive;
+        };
+        // Escape double vertical bars (that mean display one vertical bar)
+        format = format.replace("||", $type.PLACEHOLDER2);
+        // Split it up and deal with different formats
+        let parts = format.split("|");
+        info.positive.source = parts[0];
+        if (typeof parts[2] === "undefined") {
+            info.zero = info.positive;
+        }
+        else {
+            info.zero.source = parts[2];
+        }
+        if (typeof parts[1] === "undefined") {
+            info.negative = info.positive;
+        }
+        else {
+            info.negative.source = parts[1];
+        }
+        // Parse each
+        $object.each(info, (_part, item) => {
+            // Already parsed
+            if (item.parsed) {
+                return;
             }
-            else {
-                info.negative.source = parts[1];
+            // Check cached
+            // TODO
+            // if (typeof this.getCache(item.source) !== "undefined") {
+            // 	info[part] = this.getCache(item.source);
+            // 	return;
+            // }
+            // Begin parsing
+            let partFormat = item.source;
+            // Just "Number"?
+            if (partFormat.toLowerCase() === "number") {
+                partFormat = this.get("numberFormat", "#,###.#####");
             }
-            // Parse each
-            $object.each(info, function (_part, item) {
-                // Already parsed
-                if (item.parsed) {
-                    return;
-                }
-                // Check cached
-                // TODO
-                // if (typeof this.getCache(item.source) !== "undefined") {
-                // 	info[part] = this.getCache(item.source);
-                // 	return;
-                // }
-                // Begin parsing
-                var partFormat = item.source;
-                // Just "Number"?
-                if (partFormat.toLowerCase() === "number") {
-                    partFormat = _this.get("numberFormat", "#,###.#####");
-                }
-                // Let TextFormatter split into chunks
-                var chunks = TextFormatter.chunk(partFormat, true);
-                for (var i = 0; i < chunks.length; i++) {
-                    var chunk = chunks[i];
-                    // replace back double vertical bar
-                    chunk.text = chunk.text.replace($type.PLACEHOLDER2, "|");
-                    if (chunk.type === "value") {
-                        // Parse format
-                        // Look for codes
-                        var matches = chunk.text.match(/[#0.,]+[ ]?[abespABESP%!]?[abespABESP‰!]?/);
-                        if (matches) {
-                            if (matches === null || matches[0] === "") {
-                                // no codes here - assume string
-                                // nothing to do here
-                                item.template += chunk.text;
+            // Let TextFormatter split into chunks
+            let chunks = TextFormatter.chunk(partFormat, true);
+            for (let i = 0; i < chunks.length; i++) {
+                let chunk = chunks[i];
+                // replace back double vertical bar
+                chunk.text = chunk.text.replace($type.PLACEHOLDER2, "|");
+                if (chunk.type === "value") {
+                    // Parse format
+                    // Look for codes
+                    let matches = chunk.text.match(/[#0.,]+[ ]?[abespABESP%!]?[abespABESP‰!]?/);
+                    if (matches) {
+                        if (matches === null || matches[0] === "") {
+                            // no codes here - assume string
+                            // nothing to do here
+                            item.template += chunk.text;
+                        }
+                        else {
+                            // look for the format modifiers at the end
+                            let mods = matches[0].match(/[abespABESP%‰!]{2}|[abespABESP%‰]{1}$/);
+                            if (mods) {
+                                item.mod = mods[0].toLowerCase();
+                                item.modSpacing = matches[0].match(/[ ]{1}[abespABESP%‰!]{1}$/) ? true : false;
+                            }
+                            // break the format up
+                            let a = matches[0].split(".");
+                            // Deal with thousands
+                            if (a[0] === "") {
+                                // No directives for thousands
+                                // Leave default settings (no formatting)
                             }
                             else {
-                                // look for the format modifiers at the end
-                                var mods = matches[0].match(/[abespABESP%‰!]{2}|[abespABESP%‰]{1}$/);
-                                if (mods) {
-                                    item.mod = mods[0].toLowerCase();
-                                    item.modSpacing = matches[0].match(/[ ]{1}[abespABESP%‰!]{1}$/) ? true : false;
-                                }
-                                // break the format up
-                                var a = matches[0].split(".");
-                                // Deal with thousands
-                                if (a[0] === "") {
-                                    // No directives for thousands
-                                    // Leave default settings (no formatting)
+                                // Counts
+                                item.thousands.active = (a[0].match(/0/g) || []).length;
+                                item.thousands.passive = (a[0].match(/\#/g) || []).length + item.thousands.active;
+                                // Separator interval
+                                let b = a[0].split(",");
+                                if (b.length === 1) {
+                                    // No thousands separators
+                                    // Do nothing
                                 }
                                 else {
-                                    // Counts
-                                    item.thousands.active = (a[0].match(/0/g) || []).length;
-                                    item.thousands.passive = (a[0].match(/\#/g) || []).length + item.thousands.active;
-                                    // Separator interval
-                                    var b = a[0].split(",");
-                                    if (b.length === 1) {
-                                        // No thousands separators
-                                        // Do nothing
-                                    }
-                                    else {
-                                        // Use length fo the last chunk as thousands length
-                                        item.thousands.interval = (b.pop() || "").length;
-                                        if (item.thousands.interval === 0) {
-                                            item.thousands.interval = -1;
-                                        }
+                                    // Use length fo the last chunk as thousands length
+                                    item.thousands.interval = (b.pop() || "").length;
+                                    if (item.thousands.interval === 0) {
+                                        item.thousands.interval = -1;
                                     }
                                 }
-                                // Deal with decimals
-                                if (typeof (a[1]) === "undefined") {
-                                    // No directives for decimals
-                                    // Leave at defaults (no formatting)
-                                }
-                                else {
-                                    // Counts
-                                    item.decimals.active = (a[1].match(/0/g) || []).length;
-                                    item.decimals.passive = (a[1].match(/\#/g) || []).length + item.decimals.active;
-                                }
-                                // Add special code to template
-                                item.template += chunk.text.split(matches[0]).join($type.PLACEHOLDER);
                             }
+                            // Deal with decimals
+                            if (typeof (a[1]) === "undefined") {
+                                // No directives for decimals
+                                // Leave at defaults (no formatting)
+                            }
+                            else {
+                                // Counts
+                                item.decimals.active = (a[1].match(/0/g) || []).length;
+                                item.decimals.passive = (a[1].match(/\#/g) || []).length + item.decimals.active;
+                            }
+                            // Add special code to template
+                            item.template += chunk.text.split(matches[0]).join($type.PLACEHOLDER);
                         }
                     }
-                    else {
-                        // Quoted string - take it as it is
-                        item.template += chunk.text;
-                    }
                 }
-                // Apply style formatting
-                //item.template = getTextFormatter().format(item.template, this.outputFormat);
-                // Save cache
-                // TODO
-                //this.setCache(item.source, item);
-                // Mark this as parsed
-                item.parsed = true;
-            });
-            // Save cache (the whole thing)
+                else {
+                    // Quoted string - take it as it is
+                    item.template += chunk.text;
+                }
+            }
+            // Apply style formatting
+            //item.template = getTextFormatter().format(item.template, this.outputFormat);
+            // Save cache
             // TODO
-            //this.setCache(format, info);
-            return info;
-        }
-    });
+            //this.setCache(item.source, item);
+            // Mark this as parsed
+            item.parsed = true;
+        });
+        // Save cache (the whole thing)
+        // TODO
+        //this.setCache(format, info);
+        return info;
+    }
     /**
      * Applies parsed format to a numeric value.
      *
@@ -326,172 +300,161 @@ var NumberFormatter = /** @class */ (function (_super) {
      * @return Formatted number
      * @ignore
      */
-    Object.defineProperty(NumberFormatter.prototype, "applyFormat", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (value, details) {
-            // Use absolute values
-            var negative = value < 0;
-            value = Math.abs(value);
-            // Recalculate according to modifier
-            var prefix = "", suffix = "";
-            var mods = details.mod ? details.mod.split("") : [];
-            if (mods.indexOf("b") !== -1) {
-                var a_1 = this.applyPrefix(value, this.get("bytePrefixes"), mods.indexOf("!") !== -1);
-                value = a_1[0];
-                prefix = a_1[1];
-                suffix = a_1[2];
-                if (details.modSpacing) {
-                    suffix = " " + suffix;
-                }
+    applyFormat(value, details) {
+        // Use absolute values
+        let negative = value < 0;
+        value = Math.abs(value);
+        // Recalculate according to modifier
+        let prefix = "", suffix = "";
+        let mods = details.mod ? details.mod.split("") : [];
+        if (mods.indexOf("b") !== -1) {
+            let a = this.applyPrefix(value, this.get("bytePrefixes"), mods.indexOf("!") !== -1);
+            value = a[0];
+            prefix = a[1];
+            suffix = a[2];
+            if (details.modSpacing) {
+                suffix = " " + suffix;
             }
-            else if (mods.indexOf("a") !== -1) {
-                var a_2 = this.applyPrefix(value, value < this.get("smallNumberThreshold") ? this.get("smallNumberPrefixes") : this.get("bigNumberPrefixes"), mods.indexOf("!") !== -1);
-                value = a_2[0];
-                prefix = a_2[1];
-                suffix = a_2[2];
-                if (details.modSpacing) {
-                    suffix = " " + suffix;
-                }
-            }
-            else if (mods.indexOf("p") !== -1) {
-                var ol = Math.min(value.toString().length + 2, 21);
-                //value *= 100;
-                value = parseFloat(value.toPrecision(ol));
-                prefix = this._root.language.translate("_percentPrefix");
-                suffix = this._root.language.translate("_percentSuffix");
-                if (prefix == "" && suffix == "") {
-                    suffix = "%";
-                }
+        }
+        else if (mods.indexOf("a") !== -1) {
+            let a = this.applyPrefix(value, value < this.get("smallNumberThreshold") ? this.get("smallNumberPrefixes") : this.get("bigNumberPrefixes"), mods.indexOf("!") !== -1);
+            value = a[0];
+            prefix = a[1];
+            suffix = a[2];
+            if (details.modSpacing) {
+                suffix = " " + suffix;
             }
-            else if (mods.indexOf("%") !== -1) {
-                var ol = Math.min(value.toString().length + 2, 21);
-                value *= 100;
-                value = parseFloat(value.toPrecision(ol));
+        }
+        else if (mods.indexOf("p") !== -1) {
+            let ol = Math.min(value.toString().length + 2, 21);
+            //value *= 100;
+            value = parseFloat(value.toPrecision(ol));
+            prefix = this._root.language.translate("_percentPrefix");
+            suffix = this._root.language.translate("_percentSuffix");
+            if (prefix == "" && suffix == "") {
                 suffix = "%";
             }
-            else if (mods.indexOf("‰") !== -1) {
-                var ol = Math.min(value.toString().length + 3, 21);
-                value *= 1000;
-                value = parseFloat(value.toPrecision(ol));
-                suffix = "‰";
-            }
-            // Round to passive
-            if (mods.indexOf("e") !== -1) {
-                // convert the value to exponential
-                var exp = void 0;
-                if (details.decimals.passive >= 0) {
-                    exp = value.toExponential(details.decimals.passive).split("e");
-                }
-                else {
-                    exp = value.toExponential().split("e");
-                }
-                value = Number(exp[0]);
-                suffix = "e" + exp[1];
-                if (details.modSpacing) {
-                    suffix = " " + suffix;
-                }
-            }
-            else if (details.decimals.passive === 0) {
-                value = Math.round(value);
+        }
+        else if (mods.indexOf("%") !== -1) {
+            let ol = Math.min(value.toString().length + 2, 21);
+            value *= 100;
+            value = parseFloat(value.toPrecision(ol));
+            suffix = "%";
+        }
+        else if (mods.indexOf("‰") !== -1) {
+            let ol = Math.min(value.toString().length + 3, 21);
+            value *= 1000;
+            value = parseFloat(value.toPrecision(ol));
+            suffix = "‰";
+        }
+        // Round to passive
+        if (mods.indexOf("e") !== -1) {
+            // convert the value to exponential
+            let exp;
+            if (details.decimals.passive >= 0) {
+                exp = value.toExponential(details.decimals.passive).split("e");
             }
-            else if (details.decimals.passive > 0) {
-                var d = Math.pow(10, details.decimals.passive);
-                value = Math.round(value * d) / d;
+            else {
+                exp = value.toExponential().split("e");
             }
-            // Init return value
-            var res = "";
-            // Calc integer and decimal parts
-            var a = $type.numberToString(value).split(".");
-            // Format integers
-            var ints = a[0];
-            // Pad integers to active length
-            if (ints.length < details.thousands.active) {
-                ints = Array(details.thousands.active - ints.length + 1).join("0") + ints;
+            value = Number(exp[0]);
+            suffix = "e" + exp[1];
+            if (details.modSpacing) {
+                suffix = " " + suffix;
             }
-            // Insert thousands separators
-            if (details.thousands.interval > 0) {
-                var ip = [];
-                var intsr = ints.split("").reverse().join("");
-                for (var i = 0, len = ints.length; i <= len; i += details.thousands.interval) {
-                    var c = intsr.substr(i, details.thousands.interval).split("").reverse().join("");
-                    if (c !== "") {
-                        ip.unshift(c);
-                    }
+        }
+        else if (details.decimals.passive === 0) {
+            value = Math.round(value);
+        }
+        else if (details.decimals.passive > 0) {
+            let d = Math.pow(10, details.decimals.passive);
+            value = Math.round(value * d) / d;
+        }
+        // Init return value
+        let res = "";
+        // Calc integer and decimal parts
+        let a = $type.numberToString(value).split(".");
+        // Format integers
+        let ints = a[0];
+        // Pad integers to active length
+        if (ints.length < details.thousands.active) {
+            ints = Array(details.thousands.active - ints.length + 1).join("0") + ints;
+        }
+        // Insert thousands separators
+        if (details.thousands.interval > 0) {
+            let ip = [];
+            let intsr = ints.split("").reverse().join("");
+            for (let i = 0, len = ints.length; i <= len; i += details.thousands.interval) {
+                let c = intsr.substr(i, details.thousands.interval).split("").reverse().join("");
+                if (c !== "") {
+                    ip.unshift(c);
                 }
-                ints = ip.join(details.thousands.separator);
-            }
-            // Add integers
-            res += ints;
-            // Add decimals
-            if (a.length === 1) {
-                a.push("");
-            }
-            var decs = a[1];
-            // Fill zeros?
-            if (decs.length < details.decimals.active) {
-                decs += Array(details.decimals.active - decs.length + 1).join("0");
-            }
-            if (decs !== "") {
-                res += details.decimals.separator + decs;
             }
-            // Can't have empty return value
-            if (res === "") {
-                res = "0";
-            }
-            // Add minus sign back
-            if (value !== 0 && negative && (mods.indexOf("s") === -1)) {
-                res = "-" + res;
-            }
-            // Add suffixes/prefixes
-            if (prefix) {
-                res = prefix + res;
-            }
-            if (suffix) {
-                res += suffix;
-            }
-            return res;
+            ints = ip.join(details.thousands.separator);
         }
-    });
-    Object.defineProperty(NumberFormatter.prototype, "applyPrefix", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (value, prefixes, force) {
-            if (force === void 0) { force = false; }
-            var newvalue = value;
-            var prefix = "";
-            var suffix = "";
-            var applied = false;
-            var k = 1;
-            for (var i = 0, len = prefixes.length; i < len; i++) {
-                if (prefixes[i].number <= value) {
-                    if (prefixes[i].number === 0) {
-                        newvalue = 0;
-                    }
-                    else {
-                        newvalue = value / prefixes[i].number;
-                        k = prefixes[i].number;
-                    }
-                    prefix = prefixes[i].prefix;
-                    suffix = prefixes[i].suffix;
-                    applied = true;
+        // Add integers
+        res += ints;
+        // Add decimals
+        if (a.length === 1) {
+            a.push("");
+        }
+        let decs = a[1];
+        // Fill zeros?
+        if (decs.length < details.decimals.active) {
+            decs += Array(details.decimals.active - decs.length + 1).join("0");
+        }
+        if (decs !== "") {
+            res += details.decimals.separator + decs;
+        }
+        // Can't have empty return value
+        if (res === "") {
+            res = "0";
+        }
+        // Add minus sign back
+        if (value !== 0 && negative && (mods.indexOf("s") === -1)) {
+            res = "-" + res;
+        }
+        // Add suffixes/prefixes
+        if (prefix) {
+            res = prefix + res;
+        }
+        if (suffix) {
+            res += suffix;
+        }
+        return res;
+    }
+    applyPrefix(value, prefixes, force = false) {
+        let newvalue = value;
+        let prefix = "";
+        let suffix = "";
+        let applied = false;
+        let k = 1;
+        for (let i = 0, len = prefixes.length; i < len; i++) {
+            if (prefixes[i].number <= value) {
+                if (prefixes[i].number === 0) {
+                    newvalue = 0;
                 }
-            }
-            if (!applied && force && prefixes.length && value != 0) {
-                // Prefix was not applied. Use the first prefix.
-                newvalue = value / prefixes[0].number;
-                prefix = prefixes[0].prefix;
-                suffix = prefixes[0].suffix;
+                else {
+                    newvalue = value / prefixes[i].number;
+                    k = prefixes[i].number;
+                }
+                prefix = prefixes[i].prefix;
+                suffix = prefixes[i].suffix;
                 applied = true;
             }
-            if (applied) {
-                newvalue = parseFloat(newvalue.toPrecision(Math.min(k.toString().length + Math.floor(newvalue).toString().replace(/[^0-9]*/g, "").length, 21)));
-            }
-            return [newvalue, prefix, suffix];
         }
-    });
+        if (!applied && force && prefixes.length && value != 0) {
+            // Prefix was not applied. Use the first prefix.
+            newvalue = value / prefixes[0].number;
+            prefix = prefixes[0].prefix;
+            suffix = prefixes[0].suffix;
+            applied = true;
+        }
+        if (applied) {
+            newvalue = parseFloat(newvalue.toPrecision(Math.min(k.toString().length + Math.floor(newvalue).toString().replace(/[^0-9]*/g, "").length, 21)));
+        }
+        return [newvalue, prefix, suffix];
+    }
     /**
      * Replaces brackets with temporary placeholders.
      *
@@ -499,14 +462,9 @@ var NumberFormatter = /** @class */ (function (_super) {
      * @param text  Input text
      * @return Escaped text
      */
-    Object.defineProperty(NumberFormatter.prototype, "escape", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (text) {
-            return text.replace("||", $type.PLACEHOLDER2);
-        }
-    });
+    escape(text) {
+        return text.replace("||", $type.PLACEHOLDER2);
+    }
     /**
      * Replaces placeholders back to brackets.
      *
@@ -514,15 +472,8 @@ var NumberFormatter = /** @class */ (function (_super) {
      * @param text  Escaped text
      * @return Unescaped text
      */
-    Object.defineProperty(NumberFormatter.prototype, "unescape", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (text) {
-            return text.replace($type.PLACEHOLDER2, "|");
-        }
-    });
-    return NumberFormatter;
-}(Entity));
-export { NumberFormatter };
+    unescape(text) {
+        return text.replace($type.PLACEHOLDER2, "|");
+    }
+}
 //# sourceMappingURL=NumberFormatter.js.map