ui-formatter 0.0.3 → 0.0.5

package/lib/index.js

@@ -157,7 +157,7 @@ function pad3(n) {
   return n < 10 ? "00" + n : "0" + n.toString();
 }
 function formatNumber(v, scale, d, g) {
-  if (!v) {
+  if (v == null) {
     return "";
   }
   if (!d && !g) {
@@ -190,28 +190,12 @@ exports.formatNumber = formatNumber;
 var formatter = (function () {
   function formatter() {
   }
-  formatter.removePhoneFormat = function (phone) {
-    if (phone) {
-      return phone.replace(formatter.phone, "");
-    }
-    else {
-      return phone;
-    }
-  };
-  formatter.removeFaxFormat = function (fax) {
-    if (fax) {
-      return fax.replace(formatter.phone, "");
-    }
-    else {
-      return fax;
-    }
-  };
   formatter.formatPhone = function (phone) {
     if (!phone) {
       return "";
     }
     var s = phone;
-    var x = formatter.removePhoneFormat(phone);
+    var x = removePhoneFormat(phone);
     if (x.length === 10) {
       var USNumber = x.match(formatter.usPhone);
       if (USNumber != null) {
@@ -238,7 +222,7 @@ var formatter = (function () {
       return "";
     }
     var s = fax;
-    var x = formatter.removePhoneFormat(fax);
+    var x = removePhoneFormat(fax);
     var l = x.length;
     if (l <= 6) {
       s = x;
@@ -263,17 +247,18 @@ var formatter = (function () {
     }
     return s;
   };
+  formatter.fax = / |\-|\.|\(|\)/g;
   formatter.phone = / |\-|\.|\(|\)/g;
   formatter.usPhone = /(\d{3})(\d{3})(\d{4})/;
   return formatter;
 }());
 exports.formatter = formatter;
 function removePhoneFormat(phone) {
-  return formatter.removePhoneFormat(phone);
+  return phone ? phone.replace(formatter.phone, "") : "";
 }
 exports.removePhoneFormat = removePhoneFormat;
 function removeFaxFormat(fax) {
-  return formatter.removeFaxFormat(fax);
+  return fax ? fax.replace(formatter.fax, "") : "";
 }
 exports.removeFaxFormat = removeFaxFormat;
 function formatPhone(phone) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-formatter",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Validate data",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -145,8 +145,8 @@ function pad3(n: number): string {
   return n < 10 ? "00" + n : "0" + n.toString()
 }
 
-export function formatNumber(v: number, scale?: number, d?: string | null, g?: string): any {
-  if (!v) {
+export function formatNumber(v?: number | null, scale?: number, d?: string | null, g?: string): any {
+  if (v == null) {
     return ""
   }
   if (!d && !g) {
@@ -177,22 +177,9 @@ export function formatNumber(v: number, scale?: number, d?: string | null, g?: s
 // tslint:disable-next-line:class-name
 export class formatter {
   // private static _preg = / |\+|\-|\.|\(|\)/g;
+  static fax = / |\-|\.|\(|\)/g
   static phone = / |\-|\.|\(|\)/g
   static usPhone = /(\d{3})(\d{3})(\d{4})/
-  static removePhoneFormat(phone: string): string {
-    if (phone) {
-      return phone.replace(formatter.phone, "")
-    } else {
-      return phone
-    }
-  }
-  static removeFaxFormat(fax: string): string {
-    if (fax) {
-      return fax.replace(formatter.phone, "")
-    } else {
-      return fax
-    }
-  }
   static formatPhone(phone?: string | null): string {
     if (!phone) {
       return ""
@@ -200,7 +187,7 @@ export class formatter {
     // reformat phone number
     // 555 123-4567 or (+1) 555 123-4567
     let s = phone
-    const x = formatter.removePhoneFormat(phone)
+    const x = removePhoneFormat(phone)
     if (x.length === 10) {
       const USNumber = x.match(formatter.usPhone)
       if (USNumber != null) {
@@ -226,7 +213,7 @@ export class formatter {
     // reformat phone number
     // 035-456745 or 02-1234567
     let s = fax
-    const x = formatter.removePhoneFormat(fax)
+    const x = removePhoneFormat(fax)
     const l = x.length
     if (l <= 6) {
       s = x
@@ -248,11 +235,11 @@ export class formatter {
     return s
   }
 }
-export function removePhoneFormat(phone: string): string {
-  return formatter.removePhoneFormat(phone)
+export function removePhoneFormat(phone?: string): string {
+  return phone ? phone.replace(formatter.phone, "") : ""
 }
-export function removeFaxFormat(fax: string): string {
-  return formatter.removeFaxFormat(fax)
+export function removeFaxFormat(fax?: string): string {
+  return fax ? fax.replace(formatter.fax, "") : ""
 }
 export function formatPhone(phone?: string | null): string {
   return formatter.formatPhone(phone)