ui-formatter 0.1.0 → 0.1.1

package/lib/index.js

@@ -141,35 +141,88 @@ function pad3(n) {
   }
   return n < 10 ? "00" + n : "0" + n.toString();
 }
-function formatNumber(v, scale, d, g) {
-  if (v == null) {
+function formatInteger(v, groupSeparator) {
+  if (groupSeparator === void 0) { groupSeparator = ","; }
+  if (v == null || !Number.isFinite(v)) {
     return "";
   }
-  if (!d && !g) {
-    g = ",";
-    d = ".";
+  var isNegative = v < 0;
+  var n = Math.abs(Math.trunc(v));
+  if (n < 1000) {
+    return isNegative ? "-" + n : "" + n;
   }
-  else if (!g) {
-    g = d === "," ? "." : ",";
+  var buffer = new Array(32);
+  var i = buffer.length;
+  var digitCount = 0;
+  while (n > 0) {
+    if (digitCount > 0 && digitCount % 3 === 0) {
+      buffer[--i] = groupSeparator;
+    }
+    var digit = n % 10;
+    buffer[--i] = String.fromCharCode(48 + digit);
+    n = Math.floor(n / 10);
+    digitCount++;
+  }
+  if (isNegative) {
+    buffer[--i] = "-";
   }
-  var s = scale === 0 || scale ? v.toFixed(scale) : v.toString();
-  var x = s.split(".", 2);
-  var y = x[0];
-  var arr = [];
-  var len = y.length - 1;
-  for (var k = 0; k < len; k++) {
-    arr.push(y[len - k]);
-    if ((k + 1) % 3 === 0) {
-      arr.push(g);
+  return buffer.slice(i).join("");
+}
+exports.formatInteger = formatInteger;
+function formatNumber(v, precision, decimalSeparator, groupSeparator) {
+  if (precision === void 0) { precision = 0; }
+  if (v == null || !Number.isFinite(v)) {
+    return "";
+  }
+  var d = ".";
+  var g = ",";
+  if (decimalSeparator && groupSeparator) {
+    d = decimalSeparator;
+    g = groupSeparator;
+  }
+  else if (decimalSeparator && !groupSeparator) {
+    d = decimalSeparator;
+    if (d === "٫") {
+      g = "٬";
+    }
+    else {
+      g = d === "," ? "." : ",";
     }
   }
-  arr.push(y[0]);
-  if (x.length === 1) {
-    return arr.reverse().join("");
+  var negative = v < 0;
+  var s = Math.abs(v).toFixed(precision);
+  var dot = s.indexOf(".");
+  var intEnd = dot >= 0 ? dot : s.length;
+  var fracLen = dot >= 0 ? s.length - dot - 1 : 0;
+  var intLen = intEnd;
+  var groups = intLen > 3 ? ((intLen - 1) / 3) | 0 : 0;
+  var outLen = (negative ? 1 : 0) + intLen + groups * g.length + (fracLen > 0 ? d.length + fracLen : 0);
+  var out = new Array(outLen);
+  var p = 0;
+  if (negative) {
+    out[p++] = "-";
+  }
+  var firstGroup = intLen % 3;
+  if (firstGroup === 0) {
+    firstGroup = 3;
   }
-  else {
-    return arr.reverse().join("") + d + x[1];
+  for (var i = 0; i < intLen; i++) {
+    if (i > 0 && (i === firstGroup || (i > firstGroup && (i - firstGroup) % 3 === 0))) {
+      for (var j = 0; j < g.length; j++) {
+        out[p++] = g[j];
+      }
+    }
+    out[p++] = s[i];
+  }
+  if (fracLen > 0) {
+    for (var j = 0; j < d.length; j++) {
+      out[p++] = d[j];
+    }
+    for (var i = dot + 1; i < s.length; i++) {
+      out[p++] = s[i];
+    }
   }
+  return out.join("");
 }
 exports.formatNumber = formatNumber;
 var formatter = (function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-formatter",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Format web UI",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -140,33 +140,114 @@ function pad3(n: number): string {
   return n < 10 ? "00" + n : "0" + n.toString()
 }
 
-export function formatNumber(v?: number | null, scale?: number, d?: string | null, g?: string): any {
-  if (v == null) {
+export function formatInteger(v: number | null | undefined, groupSeparator: string = ","): any {
+  if (v == null || !Number.isFinite(v)) {
     return ""
   }
-  if (!d && !g) {
-    g = ","
-    d = "."
-  } else if (!g) {
-    g = d === "," ? "." : ","
+
+  const isNegative = v < 0
+  let n = Math.abs(Math.trunc(v))
+
+  // Fast path
+  if (n < 1000) {
+    return isNegative ? `-${n}` : `${n}`
   }
-  const s = scale === 0 || scale ? v.toFixed(scale) : v.toString()
-  const x = s.split(".", 2)
-  const y = x[0]
-  const arr: string[] = []
-  const len = y.length - 1
-  for (let k = 0; k < len; k++) {
-    arr.push(y[len - k])
-    if ((k + 1) % 3 === 0) {
-      arr.push(g)
+
+  // Max length:
+  // digits (up to 16 for JS safe int) + separators (~5) + sign
+  const buffer = new Array(32)
+  let i = buffer.length
+
+  let digitCount = 0
+
+  while (n > 0) {
+    // Insert separator every 3 digits
+    if (digitCount > 0 && digitCount % 3 === 0) {
+      buffer[--i] = groupSeparator
     }
+
+    const digit = n % 10
+    buffer[--i] = String.fromCharCode(48 + digit)
+
+    n = Math.floor(n / 10) // safe version
+    digitCount++
   }
-  arr.push(y[0])
-  if (x.length === 1) {
-    return arr.reverse().join("")
-  } else {
-    return arr.reverse().join("") + d + x[1]
+
+  if (isNegative) {
+    buffer[--i] = "-"
   }
+
+  // Slice only used portion and join once
+  return buffer.slice(i).join("")
+}
+export function formatNumber(v?: number | null, precision = 0, decimalSeparator?: string | null, groupSeparator?: string | null): any {
+  if (v == null || !Number.isFinite(v)) {
+    return ""
+  }
+  let d = "."
+  let g = ","
+  if (decimalSeparator && groupSeparator) {
+    d = decimalSeparator
+    g = groupSeparator
+  } else if (decimalSeparator && !groupSeparator) {
+    d = decimalSeparator
+    if (d === "٫") {
+      g = "٬"
+    } else {
+      g = d === "," ? "." : ","
+    }
+  }
+  const negative = v < 0
+
+  // unavoidable allocation
+  const s = Math.abs(v).toFixed(precision)
+
+  const dot = s.indexOf(".")
+
+  const intEnd = dot >= 0 ? dot : s.length
+  const fracLen = dot >= 0 ? s.length - dot - 1 : 0
+
+  const intLen = intEnd
+  const groups = intLen > 3 ? ((intLen - 1) / 3) | 0 : 0
+
+  const outLen = (negative ? 1 : 0) + intLen + groups * g.length + (fracLen > 0 ? d.length + fracLen : 0)
+
+  const out = new Array<string>(outLen)
+
+  let p = 0
+
+  if (negative) {
+    out[p++] = "-"
+  }
+
+  // integer part
+  let firstGroup = intLen % 3
+  if (firstGroup === 0) {
+    firstGroup = 3
+  }
+
+  for (let i = 0; i < intLen; i++) {
+    if (i > 0 && (i === firstGroup || (i > firstGroup && (i - firstGroup) % 3 === 0))) {
+      for (let j = 0; j < g.length; j++) {
+        out[p++] = g[j]
+      }
+    }
+
+    out[p++] = s[i]
+  }
+
+  // fractional part
+  if (fracLen > 0) {
+    for (let j = 0; j < d.length; j++) {
+      out[p++] = d[j]
+    }
+
+    for (let i = dot + 1; i < s.length; i++) {
+      out[p++] = s[i]
+    }
+  }
+
+  return out.join("")
 }
 
 // tslint:disable-next-line:class-name