ui-formatter 0.0.8 → 0.1.0

package/lib/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var et = "";
 function getDateFormat(profile) {
-  return "M/D/YYYY";
+  return "M/d/yyyy";
 }
 exports.getDateFormat = getDateFormat;
 function addDays(d, n) {
@@ -11,73 +11,58 @@ function addDays(d, n) {
   return newDate;
 }
 exports.addDays = addDays;
-function formatDate(d, dateFormat, full, upper) {
-  if (!d) {
-    return et;
-  }
-  var format = dateFormat && dateFormat.length > 0 ? dateFormat : "M/D/YYYY";
-  if (upper) {
-    format = format.toUpperCase();
-  }
-  var arr = [et, et, et];
-  var items = format.split(/\/|\.| |-/);
-  var iday = items.indexOf("D");
-  var im = items.indexOf("M");
-  var iyear = items.indexOf("YYYY");
-  var fm = full ? full : false;
-  var fd = full ? full : false;
-  var fy = true;
-  if (iday === -1) {
-    iday = items.indexOf("DD");
-    fd = true;
-  }
-  if (im === -1) {
-    im = items.indexOf("MM");
-    fm = true;
-  }
-  if (iyear === -1) {
-    iyear = items.indexOf("YY");
-    fy = full ? full : false;
+function formatDate(d, format) {
+  if (!d || !format) {
+    return "";
   }
-  arr[iday] = getD(d.getDate(), fd);
-  arr[im] = getD(d.getMonth() + 1, fm);
-  arr[iyear] = getYear(d.getFullYear(), fy);
-  var s = detectSeparator(format);
-  var e = detectLastSeparator(format);
-  var l = items.length === 4 ? format[format.length - 1] : et;
-  return arr[0] + s + arr[1] + e + arr[2] + l;
-}
-exports.formatDate = formatDate;
-function detectSeparator(format) {
-  var len = format.length;
-  for (var i = 0; i < len; i++) {
-    var c = format[i];
-    if (!((c >= "A" && c <= "Z") || (c >= "a" && c <= "z"))) {
-      return c;
+  var y = d.getFullYear();
+  var m = d.getMonth() + 1;
+  var day = d.getDate();
+  var out = "";
+  var i = 0;
+  while (i < format.length) {
+    var c = format.charCodeAt(i);
+    if (c === 121) {
+      var len = count(format, i, 121);
+      if (len >= 4) {
+        out += y.toString();
+        i += 4;
+      }
+      else {
+        out += shortYear(y);
+        i += 2;
+      }
+      continue;
     }
-  }
-  return "/";
-}
-function detectLastSeparator(format) {
-  var len = format.length - 3;
-  for (var i = len; i > -0; i--) {
-    var c = format[i];
-    if (!((c >= "A" && c <= "Z") || (c >= "a" && c <= "z"))) {
-      return c;
+    if (c === 77) {
+      var len = count(format, i, 77);
+      out += len >= 2 ? pad(m) : m.toString();
+      i += len >= 2 ? 2 : 1;
+      continue;
     }
+    if (c === 100) {
+      var len = count(format, i, 100);
+      out += len >= 2 ? pad(day) : day.toString();
+      i += len >= 2 ? 2 : 1;
+      continue;
+    }
+    out += format[i];
+    i++;
   }
-  return "/";
+  return out;
 }
-function getYear(y, full) {
-  if (full || (y <= 99 && y >= -99)) {
-    return y.toString();
-  }
-  var s = y.toString();
-  return s.substring(s.length - 2);
+exports.formatDate = formatDate;
+function shortYear(y) {
+  return (y % 100 + 100) % 100 < 10
+    ? "0" + ((y % 100 + 100) % 100)
+    : "" + ((y % 100 + 100) % 100);
 }
-exports.getYear = getYear;
-function getD(n, fu) {
-  return fu ? pad(n) : n.toString();
+function count(s, i, ch) {
+  var n = 0;
+  while (i + n < s.length && s.charCodeAt(i + n) === ch) {
+    n++;
+  }
+  return n;
 }
 function datetimeToString(date) {
   if (!date || date === et) {
@@ -93,33 +78,33 @@ function datetimeToString(date) {
   return year + "-" + month + "-" + day + "T" + hours + ":" + minutes + ":" + seconds;
 }
 exports.datetimeToString = datetimeToString;
-function formatDateTime(date, dateFormat, full, upper) {
+function formatDateTime(date, dateFormat) {
   if (!date) {
     return et;
   }
-  var sd = formatDate(date, dateFormat, full, upper);
+  var sd = formatDate(date, dateFormat);
   if (sd.length === 0) {
     return sd;
   }
   return sd + " " + formatTime(date);
 }
 exports.formatDateTime = formatDateTime;
-function formatLongDateTime(date, dateFormat, full, upper) {
+function formatLongDateTime(date, dateFormat) {
   if (!date) {
     return et;
   }
-  var sd = formatDate(date, dateFormat, full, upper);
+  var sd = formatDate(date, dateFormat);
   if (sd.length === 0) {
     return sd;
   }
   return sd + " " + formatLongTime(date);
 }
 exports.formatLongDateTime = formatLongDateTime;
-function formatFullDateTime(date, dateFormat, s, full, upper) {
+function formatFullDateTime(date, dateFormat, s) {
   if (!date) {
     return et;
   }
-  var sd = formatDate(date, dateFormat, full, upper);
+  var sd = formatDate(date, dateFormat);
   if (sd.length === 0) {
     return sd;
   }

package/package.json

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

package/src/index.ts

@@ -1,7 +1,7 @@
 const et = ""
 
 export function getDateFormat(profile?: string): string {
-  return "M/D/YYYY"
+  return "M/d/yyyy"
 }
 
 export function addDays(d: Date, n: number): Date {
@@ -9,71 +9,66 @@ export function addDays(d: Date, n: number): Date {
   newDate.setDate(newDate.getDate() + n)
   return newDate
 }
-export function formatDate(d: Date | null | undefined, dateFormat?: string, full?: boolean, upper?: boolean): string {
-  if (!d) {
-    return et
-  }
-  let format = dateFormat && dateFormat.length > 0 ? dateFormat : "M/D/YYYY"
-  if (upper) {
-    format = format.toUpperCase()
-  }
-  let arr = [et, et, et]
-  const items = format.split(/\/|\.| |-/)
-  let iday = items.indexOf("D")
-  let im = items.indexOf("M")
-  let iyear = items.indexOf("YYYY")
-  let fm = full ? full : false
-  let fd = full ? full : false
-  let fy = true
-  if (iday === -1) {
-    iday = items.indexOf("DD")
-    fd = true
-  }
-  if (im === -1) {
-    im = items.indexOf("MM")
-    fm = true
-  }
-  if (iyear === -1) {
-    iyear = items.indexOf("YY")
-    fy = full ? full : false
+export function formatDate(d: Date | null | undefined, format?: string): any {
+  if (!d || !format) {
+    return ""
   }
-  arr[iday] = getD(d.getDate(), fd)
-  arr[im] = getD(d.getMonth() + 1, fm)
-  arr[iyear] = getYear(d.getFullYear(), fy)
-  const s = detectSeparator(format)
-  const e = detectLastSeparator(format)
-  const l = items.length === 4 ? format[format.length - 1] : et
-  return arr[0] + s + arr[1] + e + arr[2] + l
-}
-function detectSeparator(format: string): string {
-  const len = format.length
-  for (let i = 0; i < len; i++) {
-    const c = format[i]
-    if (!((c >= "A" && c <= "Z") || (c >= "a" && c <= "z"))) {
-      return c
+  const y = d.getFullYear()
+  const m = d.getMonth() + 1
+  const day = d.getDate()
+
+  let out = ""
+  let i = 0
+
+  while (i < format.length) {
+    const c = format.charCodeAt(i)
+
+    // yyyy / yy
+    if (c === 121 /* y */) {
+      const len = count(format, i, 121)
+      if (len >= 4) {
+        out += y.toString()
+        i += 4
+      } else {
+        out += shortYear(y)
+        i += 2
+      }
+      continue
     }
-  }
-  return "/"
-}
-function detectLastSeparator(format: string): string {
-  const len = format.length - 3
-  for (let i = len; i > -0; i--) {
-    const c = format[i]
-    if (!((c >= "A" && c <= "Z") || (c >= "a" && c <= "z"))) {
-      return c
+
+    // MM / M
+    if (c === 77 /* M */) {
+      const len = count(format, i, 77)
+      out += len >= 2 ? pad(m) : m.toString()
+      i += len >= 2 ? 2 : 1
+      continue
     }
+
+    // dd / d
+    if (c === 100 /* d */) {
+      const len = count(format, i, 100)
+      out += len >= 2 ? pad(day) : day.toString()
+      i += len >= 2 ? 2 : 1
+      continue
+    }
+
+    // literal char
+    out += format[i]
+    i++
   }
-  return "/"
+  return out
 }
-export function getYear(y: number, full?: boolean): string {
-  if (full || (y <= 99 && y >= -99)) {
-    return y.toString()
-  }
-  const s = y.toString()
-  return s.substring(s.length - 2)
+function shortYear(y: number): string {
+  return (y % 100 + 100) % 100 < 10
+    ? "0" + ((y % 100 + 100) % 100)
+    : "" + ((y % 100 + 100) % 100)
 }
-function getD(n: number, fu: boolean): string {
-  return fu ? pad(n) : n.toString()
+function count(s: string, i: number, ch: number): number {
+  let n = 0
+  while (i + n < s.length && s.charCodeAt(i + n) === ch) {
+    n++
+  }
+  return n
 }
 export function datetimeToString(date?: Date | string): any {
   if (!date || date === et) {
@@ -88,31 +83,31 @@ export function datetimeToString(date?: Date | string): any {
   const seconds = pad(d2.getSeconds())
   return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`
 }
-export function formatDateTime(date: Date | null | undefined, dateFormat?: string, full?: boolean, upper?: boolean): any {
+export function formatDateTime(date: Date | null | undefined, dateFormat?: string): any {
   if (!date) {
     return et
   }
-  const sd = formatDate(date, dateFormat, full, upper)
+  const sd = formatDate(date, dateFormat)
   if (sd.length === 0) {
     return sd
   }
   return sd + " " + formatTime(date)
 }
-export function formatLongDateTime(date: Date | null | undefined, dateFormat?: string, full?: boolean, upper?: boolean): any {
+export function formatLongDateTime(date: Date | null | undefined, dateFormat?: string): any {
   if (!date) {
     return et
   }
-  const sd = formatDate(date, dateFormat, full, upper)
+  const sd = formatDate(date, dateFormat)
   if (sd.length === 0) {
     return sd
   }
   return sd + " " + formatLongTime(date)
 }
-export function formatFullDateTime(date: Date | null | undefined, dateFormat?: string, s?: string, full?: boolean, upper?: boolean): any {
+export function formatFullDateTime(date: Date | null | undefined, dateFormat?: string, s?: string): any {
   if (!date) {
     return et
   }
-  const sd = formatDate(date, dateFormat, full, upper)
+  const sd = formatDate(date, dateFormat)
   if (sd.length === 0) {
     return sd
   }