web-one 0.0.1 → 0.0.3

package/lib/form.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function fromFormData(formData, attrs, includeUndefine, includeErrorForNumbers) {
+  if (!attrs) {
+    return fromFormDataWithAttributes(formData, {}, includeUndefine, includeErrorForNumbers);
+  }
+  return fromFormDataWithAttributes(formData, attrs, includeUndefine, includeErrorForNumbers);
+}
+exports.fromFormData = fromFormData;
+function fromFormDataWithAttributes(formData, attrs, includeUndefine, includeErrorForNumbers) {
+  var obj = {};
+  var keys = formData.keys();
+  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+    var key = keys_1[_i];
+    var attr = attrs[key];
+    var v = formData.get(key);
+    if (attr) {
+      obj[key] = v;
+      if (v && typeof v === "string") {
+        if (attr.type === "number" || attr.type === "integer") {
+          if (!isNaN(v)) {
+            obj[key] = parseFloat(v);
+          }
+        }
+        else if (attr.type === "datetime" || attr.type === "date") {
+          var d = new Date(v);
+          if (d.toString() !== "Invalid Date") {
+            obj[key] = d;
+          }
+        }
+        else if (attr.type === "boolean") {
+          obj[key] = v === "true";
+        }
+        else if (attr.type === "strings") {
+          obj[key] = v.split(",");
+        }
+        else if (attr.type === "integers" || attr.type === "numbers") {
+          var s = v.split(",");
+          var nums = [];
+          for (var i = 0; i < s.length; i++) {
+            if (!isNaN(s[i])) {
+              var num = parseFloat(s[i]);
+              nums.push(num);
+            }
+            else if (includeErrorForNumbers) {
+              nums.push(s[i]);
+            }
+          }
+          obj[key] = nums;
+        }
+      }
+    }
+    else if (includeUndefine) {
+      obj[key] = v;
+    }
+  }
+  return obj;
+}
+exports.fromFormDataWithAttributes = fromFormDataWithAttributes;

package/lib/index.js

@@ -1,5 +1,9 @@
 "use strict";
+function __export(m) {
+  for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
 Object.defineProperty(exports, "__esModule", { value: true });
+__export(require("./form"));
 var resources = (function () {
   function resources() {
   }
@@ -282,6 +286,61 @@ function buildSortSearch(params, fields, sortStr) {
   return sorts;
 }
 exports.buildSortSearch = buildSortSearch;
+function formatInteger(v, groupSeparator) {
+  if (groupSeparator === void 0) { groupSeparator = ","; }
+  if (v == null || !Number.isFinite(v)) {
+    return "";
+  }
+  var isNegative = v < 0;
+  var n = Math.abs(Math.trunc(v));
+  if (n < 1000) {
+    return isNegative ? "-" + n : "" + n;
+  }
+  var result = "";
+  var count = 0;
+  while (n > 0) {
+    var digit = n % 10;
+    n = (n / 10) | 0;
+    if (count > 0 && count % 3 === 0) {
+      result = groupSeparator + result;
+    }
+    result = digit + result;
+    count++;
+  }
+  return isNegative ? "-" + result : result;
+}
+exports.formatInteger = formatInteger;
+function formatNumber(v, scale, d, g) {
+  if (v == null) {
+    return "";
+  }
+  if (!d && !g) {
+    g = ",";
+    d = ".";
+  }
+  else if (!g) {
+    g = d === "," ? "." : ",";
+  }
+  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);
+    }
+  }
+  arr.push(y[0]);
+  if (x.length === 1) {
+    return arr.reverse().join("");
+  }
+  else {
+    return arr.reverse().join("") + d + x[1];
+  }
+}
+exports.formatNumber = formatNumber;
 function getDateFormat(profile) {
   return "M/D/YYYY";
 }
@@ -355,101 +414,86 @@ function datetimeToString(date) {
   return year + "-" + month + "-" + day + "T" + hours + ":" + minutes + ":" + seconds;
 }
 exports.datetimeToString = datetimeToString;
-function formatDate(d, dateFormat, full, upper) {
-  if (!d) {
+function formatDate(d, format) {
+  if (!d || !format) {
     return "";
   }
-  var format = dateFormat && dateFormat.length > 0 ? dateFormat : "M/D/YYYY";
-  if (upper) {
-    format = format.toUpperCase();
-  }
-  var arr = ["", "", ""];
-  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;
-  }
-  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] : "";
-  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 formatDateTime(date, dateFormat, full, upper) {
+function formatDateTime(date, dateFormat) {
   if (!date) {
     return "";
   }
-  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 "";
   }
-  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 "";
   }
-  var sd = formatDate(date, dateFormat, full, upper);
+  var sd = formatDate(date, dateFormat);
   if (sd.length === 0) {
     return sd;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "web-one",
-  "version": "0.0.1",
-  "description": "Validate data",
+  "version": "0.0.3",
+  "description": "Web utilities",
   "main": "./lib/index.js",
   "types": "./src/index.ts",
   "scripts": {

package/src/form.ts

@@ -0,0 +1,59 @@
+export type DataType = 'ObjectId' | 'date' | 'datetime' | 'time'
+  | 'boolean' | 'number' | 'integer' | 'string' | 'text'
+  | 'object' | 'array' | 'binary'
+  | 'primitives' | 'booleans' | 'numbers' | 'integers' | 'strings' | 'dates' | 'datetimes' | 'times';
+
+export interface Attribute {
+  type?: DataType;
+}
+export interface Attributes {
+  [key: string]: Attribute;
+}
+export function fromFormData<T>(formData: FormData, attrs?: Attributes, includeUndefine?: boolean, includeErrorForNumbers?: boolean): T {
+  if (!attrs) {
+    return fromFormDataWithAttributes(formData, {}, includeUndefine, includeErrorForNumbers)
+  }
+  return fromFormDataWithAttributes(formData, attrs, includeUndefine, includeErrorForNumbers)
+}
+export function fromFormDataWithAttributes<T>(formData: FormData, attrs: Attributes, includeUndefine?: boolean, includeErrorForNumbers?: boolean): T {
+  const obj = {} as any
+  const keys = formData.keys()
+  for (const key of keys) {
+    const attr: Attribute = attrs[key]
+    const v = formData.get(key)
+    if (attr) {
+      obj[key] = v
+      if (v && typeof v === "string") {
+        if (attr.type === "number" || attr.type === "integer") {
+          if (!isNaN(v as any)) {
+            obj[key] = parseFloat(v)
+          }
+        } else if (attr.type === "datetime" || attr.type === "date") {
+          const d = new Date(v)
+          if (d.toString() !== "Invalid Date") {
+            obj[key] = d
+          }
+        } else if (attr.type === "boolean") {
+          obj[key] = v === "true"
+        } else if (attr.type === "strings") {
+          obj[key] = v.split(",")
+        } else if (attr.type === "integers" || attr.type === "numbers") {
+          const s = v.split(",")
+          const nums = []
+          for (let i = 0; i < s.length; i++) {
+            if (!isNaN(s[i] as any)) {
+              const num = parseFloat(s[i])
+              nums.push(num)
+            } else if (includeErrorForNumbers) {
+              nums.push(s[i])
+            }
+          }
+          obj[key] = nums
+        }
+      }
+    } else if (includeUndefine) {
+      obj[key] = v
+    }
+  }
+  return obj
+}

package/src/index.ts

@@ -1,3 +1,5 @@
+export * from "./form"
+
 export class resources {
   static limits = [12, 24, 60, 100, 120, 180, 300, 600]
   static page = "page"
@@ -269,6 +271,65 @@ export function buildSortSearch(params: StringMap, fields: string[], sortStr?: s
   return sorts
 }
 
+export function formatInteger(v?: number | null, groupSeparator: string = ","): string {
+  if (v == null || !Number.isFinite(v)) {
+    return ""
+  }
+
+  const isNegative = v < 0
+  let n = Math.abs(Math.trunc(v))
+
+  // Fast path for small numbers (no separator needed)
+  if (n < 1000) {
+    return isNegative ? `-${n}` : `${n}`
+  }
+
+  let result = ""
+  let count = 0
+
+  while (n > 0) {
+    const digit = n % 10
+    n = (n / 10) | 0 // faster floor for positive integers
+
+    if (count > 0 && count % 3 === 0) {
+      result = groupSeparator + result
+    }
+
+    result = digit + result
+    count++
+  }
+
+  return isNegative ? `-${result}` : result
+}
+export function formatNumber(v?: number | null, scale?: number, d?: string | null, g?: string): string {
+  if (v == null) {
+    return ""
+  }
+  if (!d && !g) {
+    g = ","
+    d = "."
+  } else if (!g) {
+    g = d === "," ? "." : ","
+  }
+  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)
+    }
+  }
+  arr.push(y[0])
+  if (x.length === 1) {
+    return arr.reverse().join("")
+  } else {
+    return arr.reverse().join("") + d + x[1]
+  }
+}
+
 export function getDateFormat(profile?: string): string {
   return "M/D/YYYY"
 }
@@ -335,97 +396,92 @@ export function datetimeToString(date?: Date | string): string | undefined {
   return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`
 }
 
-export function formatDate(d: Date | null | undefined, dateFormat?: string, full?: boolean, upper?: boolean): string {
-  if (!d) {
+export function formatDate(d: Date | null | undefined, format?: string): string {
+  if (!d || !format) {
     return ""
   }
-  let format = dateFormat && dateFormat.length > 0 ? dateFormat : "M/D/YYYY"
-  if (upper) {
-    format = format.toUpperCase()
-  }
-  let arr = ["", "", ""]
-  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
-  }
-  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] : ""
-  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 formatDateTime(date: Date | null | undefined, dateFormat?: string, full?: boolean, upper?: boolean): string {
+export function formatDateTime(date: Date | null | undefined, dateFormat?: string): string {
   if (!date) {
     return ""
   }
-  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): string {
+export function formatLongDateTime(date: Date | null | undefined, dateFormat?: string): string {
   if (!date) {
     return ""
   }
-  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): string {
+export function formatFullDateTime(date: Date | null | undefined, dateFormat?: string, s?: string): string {
   if (!date) {
     return ""
   }
-  const sd = formatDate(date, dateFormat, full, upper)
+  const sd = formatDate(date, dateFormat)
   if (sd.length === 0) {
     return sd
   }

package/tsconfig.json

@@ -14,7 +14,10 @@
     "removeComments": true,
     "lib": [
       "es5",
-      "es6"
+      "es6",
+      "es7",
+      "dom",
+      "dom.iterable"
     ]
   },
   "include": [