web-one 0.0.4 → 0.0.6

package/lib/form.js

@@ -8,12 +8,11 @@ function fromFormData(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);
+  const obj = {};
+  const keys = formData.keys();
+  for (const key of keys) {
+    const attr = attrs[key];
+    const v = formData.get(key);
     if (attr) {
       obj[key] = v;
       if (v && typeof v === "string") {
@@ -23,7 +22,7 @@ function fromFormDataWithAttributes(formData, attrs, includeUndefine, includeErr
           }
         }
         else if (attr.type === "datetime" || attr.type === "date") {
-          var d = new Date(v);
+          const d = new Date(v);
           if (d.toString() !== "Invalid Date") {
             obj[key] = d;
           }
@@ -35,11 +34,11 @@ function fromFormDataWithAttributes(formData, attrs, includeUndefine, includeErr
           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++) {
+          const s = v.split(",");
+          const nums = [];
+          for (let i = 0; i < s.length; i++) {
             if (!isNaN(s[i])) {
-              var num = parseFloat(s[i]);
+              const num = parseFloat(s[i]);
               nums.push(num);
             }
             else if (includeErrorForNumbers) {

package/lib/index.js

@@ -4,43 +4,88 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./form"));
-var resources = (function () {
-  function resources() {
-  }
-  resources.limits = [12, 24, 60, 100, 120, 180, 300, 600];
-  resources.page = "page";
-  resources.limit = "limit";
-  resources.defaultLimit = 12;
-  resources.sort = "sort";
-  return resources;
-}());
+class resources {
+}
 exports.resources = resources;
-function removePage(obj) {
-  var arr = [];
-  var keys = Object.keys(obj);
-  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var k = keys_1[_i];
-    if (k !== resources.page) {
-      var v = obj[k];
-      arr.push(k + "=" + encodeURI(v));
+resources.limits = [12, 24, 60, 100, 120, 180, 300, 600];
+resources.page = "page";
+resources.limit = "limit";
+resources.defaultLimit = 12;
+resources.sort = "sort";
+function getRecordValue(v) {
+  if (typeof v === "string") {
+    return v;
+  }
+  else if (Array.isArray(v)) {
+    return v.length > 0 ? v[v.length - 1] : undefined;
+  }
+  return undefined;
+}
+exports.getRecordValue = getRecordValue;
+function removePage(obj, pageKey) {
+  const arr = [];
+  const keys = Object.keys(obj);
+  const page = pageKey ? pageKey : resources.page;
+  for (const k of keys) {
+    if (k !== page) {
+      const v = obj[k];
+      if (typeof v === "string") {
+        arr.push(`${k}=${encodeURI(v)}`);
+      }
+      else if (Array.isArray(v)) {
+        const x = v;
+        if (x.length > 0) {
+          arr.push(`${k}=${encodeURI(x[x.length - 1])}`);
+        }
+      }
     }
   }
   return arr.length === 0 ? "" : arr.join("&");
 }
 exports.removePage = removePage;
-function removeSort(obj) {
-  var arr = [];
-  var keys = Object.keys(obj);
-  for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
-    var k = keys_2[_i];
-    if (k !== resources.sort) {
-      var v = obj[k];
-      arr.push(k + "=" + encodeURI(v));
+function removeSort(obj, sortKey) {
+  const arr = [];
+  const keys = Object.keys(obj);
+  const sort = sortKey ? sortKey : resources.sort;
+  for (const k of keys) {
+    if (k !== sort) {
+      const v = obj[k];
+      if (typeof v === "string") {
+        arr.push(`${k}=${encodeURI(v)}`);
+      }
+      else if (Array.isArray(v)) {
+        const x = v;
+        if (x.length > 0) {
+          arr.push(`${k}=${encodeURI(x[x.length - 1])}`);
+        }
+      }
     }
   }
   return arr.length === 0 ? "" : arr.join("&");
 }
 exports.removeSort = removeSort;
+function removeLimit(obj, limitKey, pageKey) {
+  const arr = [];
+  const keys = Object.keys(obj);
+  const page = pageKey ? pageKey : resources.page;
+  const limit = limitKey ? limitKey : resources.limit;
+  for (const k of keys) {
+    if (k !== page && k !== limit) {
+      const v = obj[k];
+      if (typeof v === "string") {
+        arr.push(`${k}=${encodeURI(v)}`);
+      }
+      else if (Array.isArray(v)) {
+        const x = v;
+        if (x.length > 0) {
+          arr.push(`${k}=${encodeURI(x[x.length - 1])}`);
+        }
+      }
+    }
+  }
+  return arr.length === 0 ? "" : arr.join("&");
+}
+exports.removeLimit = removeLimit;
 function getSortString(field, sort) {
   if (field === sort.field) {
     return sort.type === "-" ? field : "-" + field;
@@ -48,25 +93,42 @@ function getSortString(field, sort) {
   return field;
 }
 exports.getSortString = getSortString;
-function buildFilter(obj, dates, nums, arr) {
-  var filter = fromParams(obj, arr);
-  filter[resources.page] = getPage(filter[resources.page]);
-  filter[resources.limit] = getLimit(filter[resources.limit]);
+function buildFilter(obj, defaultLimit, dates, nums, arr, limitKey, pageKey) {
+  const filter = fromParams(obj, arr);
+  const page = pageKey ? pageKey : resources.page;
+  const limit = limitKey ? limitKey : resources.limit;
+  filter[page] = getPage(filter[page]);
+  filter[limit] = getLimit(filter[limit], defaultLimit);
   format(filter, dates, nums);
   return filter;
 }
 exports.buildFilter = buildFilter;
 function fromParams(obj, arr) {
-  var s = {};
-  var keys = Object.keys(obj);
-  for (var _i = 0, keys_3 = keys; _i < keys_3.length; _i++) {
-    var key = keys_3[_i];
+  const s = {};
+  const keys = Object.keys(obj);
+  for (const key of keys) {
     if (inArray(key, arr)) {
-      var x = obj[key].split(",");
-      setValue(s, key, x);
+      const v = obj[key];
+      if (typeof v === "string") {
+        const x = v.split(",");
+        setValue(s, key, x);
+      }
+      else if (Array.isArray(v)) {
+        const x = v;
+        setValue(s, key, x);
+      }
     }
     else {
-      setValue(s, key, obj[key]);
+      const v = obj[key];
+      if (typeof v === "string") {
+        setValue(s, key, v);
+      }
+      else if (Array.isArray(v)) {
+        const x = v;
+        if (x.length > 0) {
+          setValue(s, key, x[x.length - 1]);
+        }
+      }
     }
   }
   return s;
@@ -76,8 +138,7 @@ function inArray(s, arr) {
   if (!arr || arr.length === 0) {
     return false;
   }
-  for (var _i = 0, arr_1 = arr; _i < arr_1.length; _i++) {
-    var a = arr_1[_i];
+  for (const a of arr) {
     if (s === a) {
       return true;
     }
@@ -86,26 +147,26 @@ function inArray(s, arr) {
 }
 exports.inArray = inArray;
 function setValue(o, key, value) {
-  var obj = o;
-  var replaceKey = key.replace(/\[/g, ".[").replace(/\.\./g, ".");
+  const obj = o;
+  let replaceKey = key.replace(/\[/g, ".[").replace(/\.\./g, ".");
   if (replaceKey.indexOf(".") === 0) {
     replaceKey = replaceKey.slice(1, replaceKey.length);
   }
-  var keys = replaceKey.split(".");
-  var firstKey = keys.shift();
+  const keys = replaceKey.split(".");
+  const firstKey = keys.shift();
   if (!firstKey) {
     return;
   }
-  var isArrayKey = /\[([0-9]+)\]/.test(firstKey);
+  const isArrayKey = /\[([0-9]+)\]/.test(firstKey);
   if (keys.length > 0) {
-    var firstKeyValue = obj[firstKey] || {};
-    var returnValue = setValue(firstKeyValue, keys.join("."), value);
+    const firstKeyValue = obj[firstKey] || {};
+    const returnValue = setValue(firstKeyValue, keys.join("."), value);
     return setKey(obj, isArrayKey, firstKey, returnValue);
   }
   return setKey(obj, isArrayKey, firstKey, value);
 }
 exports.setValue = setValue;
-var setKey = function (_object, _isArrayKey, _key, _nextValue) {
+const setKey = (_object, _isArrayKey, _key, _nextValue) => {
   if (_isArrayKey) {
     if (_object.length > _key) {
       _object[_key] = _nextValue;
@@ -119,8 +180,8 @@ var setKey = function (_object, _isArrayKey, _key, _nextValue) {
   }
   return _object;
 };
-var _datereg = "/Date(";
-var _re = /-?\d+/;
+const _datereg = "/Date(";
+const _re = /-?\d+/;
 function toDate(v) {
   if (!v) {
     return null;
@@ -131,11 +192,11 @@ function toDate(v) {
   else if (typeof v === "number") {
     return new Date(v);
   }
-  var i = v.indexOf(_datereg);
+  const i = v.indexOf(_datereg);
   if (i >= 0) {
-    var m = _re.exec(v);
+    const m = _re.exec(v);
     if (m !== null) {
-      var d = parseInt(m[0], 10);
+      const d = parseInt(m[0], 10);
       return new Date(d);
     }
     else {
@@ -147,23 +208,22 @@ function toDate(v) {
       return new Date(v);
     }
     else {
-      var d = parseInt(v, 10);
+      const d = parseInt(v, 10);
       return new Date(d);
     }
   }
 }
 function format(obj, dates, nums) {
-  var o = obj;
+  const o = obj;
   if (dates && dates.length > 0) {
-    for (var _i = 0, dates_1 = dates; _i < dates_1.length; _i++) {
-      var s = dates_1[_i];
-      var v = o[s];
+    for (const s of dates) {
+      const v = o[s];
       if (v) {
         if (v instanceof Date) {
           continue;
         }
         if (typeof v === "string" || typeof v === "number") {
-          var d = toDate(v);
+          const d = toDate(v);
           if (d) {
             if (!(d instanceof Date) || d.toString() === "Invalid Date") {
               delete o[s];
@@ -174,15 +234,14 @@ function format(obj, dates, nums) {
           }
         }
         else if (typeof v === "object") {
-          var keys = Object.keys(v);
-          for (var _a = 0, keys_4 = keys; _a < keys_4.length; _a++) {
-            var key = keys_4[_a];
-            var v2 = v[key];
+          const keys = Object.keys(v);
+          for (const key of keys) {
+            const v2 = v[key];
             if (v2 instanceof Date) {
               continue;
             }
             if (typeof v2 === "string" || typeof v2 === "number") {
-              var d2 = toDate(v2);
+              const d2 = toDate(v2);
               if (d2) {
                 if (!(d2 instanceof Date) || d2.toString() === "Invalid Date") {
                   delete v[key];
@@ -198,9 +257,8 @@ function format(obj, dates, nums) {
     }
   }
   if (nums && nums.length > 0) {
-    for (var _b = 0, nums_1 = nums; _b < nums_1.length; _b++) {
-      var s = nums_1[_b];
-      var v = o[s];
+    for (const s of nums) {
+      const v = o[s];
       if (v) {
         if (v instanceof Date) {
           delete o[s];
@@ -215,15 +273,14 @@ function format(obj, dates, nums) {
             continue;
           }
           else {
-            var i = parseFloat(v);
+            const i = parseFloat(v);
             o[s] = i;
           }
         }
         else if (typeof v === "object") {
-          var keys = Object.keys(v);
-          for (var _c = 0, keys_5 = keys; _c < keys_5.length; _c++) {
-            var key = keys_5[_c];
-            var v2 = v[key];
+          const keys = Object.keys(v);
+          for (const key of keys) {
+            const v2 = v[key];
             if (v2 instanceof Date) {
               delete o[key];
               continue;
@@ -236,7 +293,7 @@ function format(obj, dates, nums) {
                 delete v[key];
               }
               else {
-                var i = parseFloat(v2);
+                const i = parseFloat(v2);
                 v[key] = i;
               }
             }
@@ -261,8 +318,19 @@ function buildSort(s) {
 }
 exports.buildSort = buildSort;
 function buildSortFromParams(params) {
-  var s = params[resources.sort];
-  return buildSort(s);
+  const s = params[resources.sort];
+  if (s !== undefined) {
+    if (typeof s === "string") {
+      return buildSort(s);
+    }
+    else if (Array.isArray(s)) {
+      const x = s;
+      if (x.length > 0) {
+        return buildSort(x[x.length - 1]);
+      }
+    }
+  }
+  return buildSort(undefined);
 }
 exports.buildSortFromParams = buildSortFromParams;
 function renderSort(field, sort) {
@@ -273,11 +341,11 @@ function renderSort(field, sort) {
 }
 exports.renderSort = renderSort;
 function buildSortSearch(params, fields, sortStr) {
-  var search = removeSort(params);
-  var sort = buildSort(sortStr);
-  var sorts = {};
-  var prefix = search.length > 0 ? "?" + search + "&" : "?";
-  for (var i = 0; i < fields.length; i++) {
+  const search = removeSort(params);
+  const sort = buildSort(sortStr);
+  let sorts = {};
+  const prefix = search.length > 0 ? "?" + search + "&" : "?";
+  for (let i = 0; i < fields.length; i++) {
     sorts[fields[i]] = {
       url: prefix + resources.sort + "=" + getSortString(fields[i], sort),
       tag: renderSort(fields[i], sort),
@@ -286,20 +354,19 @@ function buildSortSearch(params, fields, sortStr) {
   return sorts;
 }
 exports.buildSortSearch = buildSortSearch;
-function formatInteger(v, groupSeparator) {
-  if (groupSeparator === void 0) { groupSeparator = ","; }
+function formatInteger(v, groupSeparator = ",") {
   if (v == null || !Number.isFinite(v)) {
     return "";
   }
-  var isNegative = v < 0;
-  var n = Math.abs(Math.trunc(v));
+  const isNegative = v < 0;
+  let n = Math.abs(Math.trunc(v));
   if (n < 1000) {
-    return isNegative ? "-" + n : "" + n;
+    return isNegative ? `-${n}` : `${n}`;
   }
-  var result = "";
-  var count = 0;
+  let result = "";
+  let count = 0;
   while (n > 0) {
-    var digit = n % 10;
+    const digit = n % 10;
     n = (n / 10) | 0;
     if (count > 0 && count % 3 === 0) {
       result = groupSeparator + result;
@@ -307,7 +374,7 @@ function formatInteger(v, groupSeparator) {
     result = digit + result;
     count++;
   }
-  return isNegative ? "-" + result : result;
+  return isNegative ? `-${result}` : result;
 }
 exports.formatInteger = formatInteger;
 function formatNumber(v, scale, d, g) {
@@ -321,12 +388,12 @@ function formatNumber(v, scale, d, g) {
   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++) {
+  const s = scale === 0 || scale ? v.toFixed(scale) : v.toString();
+  const x = s.split(".", 2);
+  const y = x[0];
+  const arr = [];
+  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);
@@ -342,13 +409,13 @@ function formatNumber(v, scale, d, g) {
 }
 exports.formatNumber = formatNumber;
 function getPage(page) {
-  var num = getNumber(page);
+  const num = getNumber(page);
   return num === undefined || num < 1 ? 1 : num;
 }
 exports.getPage = getPage;
-function getLimit(limit) {
-  var num = getNumber(limit);
-  return num === undefined || num < 1 ? resources.defaultLimit : num;
+function getLimit(limit, defaultLimit) {
+  const num = getNumber(limit);
+  return num === undefined || num < 1 ? defaultLimit : num;
 }
 exports.getLimit = getLimit;
 function getNumber(num, defaultNum) {
@@ -366,19 +433,17 @@ function clone(obj) {
     return obj;
   }
   if (Array.isArray(obj)) {
-    var arr = [];
-    for (var _i = 0, obj_1 = obj; _i < obj_1.length; _i++) {
-      var sub_1 = obj_1[_i];
-      var c = clone(sub_1);
+    const arr = [];
+    for (const sub of obj) {
+      const c = clone(sub);
       arr.push(c);
     }
     return arr;
   }
-  var x = {};
-  var keys = Object.keys(obj);
-  for (var _a = 0, keys_6 = keys; _a < keys_6.length; _a++) {
-    var k = keys_6[_a];
-    var v = obj[k];
+  const x = {};
+  const keys = Object.keys(obj);
+  for (const k of keys) {
+    const v = obj[k];
     if (v instanceof Date) {
       x[k] = new Date(v.getTime());
     }
@@ -400,29 +465,29 @@ function datetimeToString(date) {
   if (!date || date === "") {
     return undefined;
   }
-  var d2 = typeof date !== "string" ? date : new Date(date);
-  var year = d2.getFullYear();
-  var month = pad(d2.getMonth() + 1);
-  var day = pad(d2.getDate());
-  var hours = pad(d2.getHours());
-  var minutes = pad(d2.getMinutes());
-  var seconds = pad(d2.getSeconds());
-  return year + "-" + month + "-" + day + "T" + hours + ":" + minutes + ":" + seconds;
+  const d2 = typeof date !== "string" ? date : new Date(date);
+  const year = d2.getFullYear();
+  const month = pad(d2.getMonth() + 1);
+  const day = pad(d2.getDate());
+  const hours = pad(d2.getHours());
+  const minutes = pad(d2.getMinutes());
+  const seconds = pad(d2.getSeconds());
+  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
 }
 exports.datetimeToString = datetimeToString;
 function formatDate(d, format) {
   if (!d || !format) {
     return "";
   }
-  var y = d.getFullYear();
-  var m = d.getMonth() + 1;
-  var day = d.getDate();
-  var out = "";
-  var i = 0;
+  const y = d.getFullYear();
+  const m = d.getMonth() + 1;
+  const day = d.getDate();
+  let out = "";
+  let i = 0;
   while (i < format.length) {
-    var c = format.charCodeAt(i);
+    const c = format.charCodeAt(i);
     if (c === 121) {
-      var len = count(format, i, 121);
+      const len = count(format, i, 121);
       if (len >= 4) {
         out += y.toString();
         i += 4;
@@ -434,13 +499,13 @@ function formatDate(d, format) {
       continue;
     }
     if (c === 77) {
-      var len = count(format, i, 77);
+      const 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);
+      const len = count(format, i, 100);
       out += len >= 2 ? pad(day) : day.toString();
       i += len >= 2 ? 2 : 1;
       continue;
@@ -457,7 +522,7 @@ function shortYear(y) {
     : "" + ((y % 100 + 100) % 100);
 }
 function count(s, i, ch) {
-  var n = 0;
+  let n = 0;
   while (i + n < s.length && s.charCodeAt(i + n) === ch) {
     n++;
   }
@@ -467,7 +532,7 @@ function formatDateTime(date, dateFormat) {
   if (!date) {
     return "";
   }
-  var sd = formatDate(date, dateFormat);
+  const sd = formatDate(date, dateFormat);
   if (sd.length === 0) {
     return sd;
   }
@@ -478,7 +543,7 @@ function formatLongDateTime(date, dateFormat) {
   if (!date) {
     return "";
   }
-  var sd = formatDate(date, dateFormat);
+  const sd = formatDate(date, dateFormat);
   if (sd.length === 0) {
     return sd;
   }
@@ -489,7 +554,7 @@ function formatFullDateTime(date, dateFormat, s) {
   if (!date) {
     return "";
   }
-  var sd = formatDate(date, dateFormat);
+  const sd = formatDate(date, dateFormat);
   if (sd.length === 0) {
     return sd;
   }
@@ -505,12 +570,12 @@ function formatLongTime(d) {
 }
 exports.formatLongTime = formatLongTime;
 function formatFullTime(d, s) {
-  var se = s && s.length > 0 ? s : ".";
+  const se = s && s.length > 0 ? s : ".";
   return formatLongTime(d) + se + pad3(d.getMilliseconds());
 }
 exports.formatFullTime = formatFullTime;
 function dateToString(d, milli) {
-  var s = "" + d.getFullYear() + pad(d.getMonth() + 1) + pad(d.getDate()) + pad(d.getHours()) + pad(d.getMinutes()) + pad(d.getSeconds());
+  const s = `${d.getFullYear()}${pad(d.getMonth() + 1)}${pad(d.getDate())}${pad(d.getHours())}${pad(d.getMinutes())}${pad(d.getSeconds())}`;
   if (milli) {
     return s + pad3(d.getMilliseconds());
   }
@@ -526,58 +591,54 @@ function pad3(n) {
   }
   return n < 10 ? "00" + n : "0" + n.toString();
 }
-var formatter = (function () {
-  function formatter() {
-  }
-  formatter.removePhoneFormat = function (phone) {
+class formatter {
+  static removePhoneFormat(phone) {
     if (phone) {
       return phone.replace(formatter.phone, "");
     }
     else {
       return phone;
     }
-  };
-  formatter.formatPhone = function (phone) {
+  }
+  static formatPhone(phone) {
     if (!phone) {
       return "";
     }
-    var s = phone;
-    var x = formatter.removePhoneFormat(phone);
+    let s = phone;
+    const x = formatter.removePhoneFormat(phone);
     if (x.length === 10) {
-      var USNumber = x.match(formatter.usPhone);
+      const USNumber = x.match(formatter.usPhone);
       if (USNumber != null) {
-        s = USNumber[1] + " " + USNumber[2] + "-" + USNumber[3];
+        s = `${USNumber[1]} ${USNumber[2]}-${USNumber[3]}`;
       }
     }
     else if (x.length <= 3 && x.length > 0) {
       s = x;
     }
     else if (x.length > 3 && x.length < 7) {
-      s = x.substring(0, 3) + " " + x.substring(3, x.length);
+      s = `${x.substring(0, 3)} ${x.substring(3, x.length)}`;
     }
     else if (x.length >= 7 && x.length < 10) {
-      s = x.substring(0, 3) + " " + x.substring(3, 6) + "-" + x.substring(6, x.length);
+      s = `${x.substring(0, 3)} ${x.substring(3, 6)}-${x.substring(6, x.length)}`;
     }
     else if (x.length >= 11) {
-      var l = x.length;
-      s = x.substring(0, l - 7) + " " + x.substring(l - 7, l - 4) + "-" + x.substring(l - 4, l);
+      const l = x.length;
+      s = `${x.substring(0, l - 7)} ${x.substring(l - 7, l - 4)}-${x.substring(l - 4, l)}`;
     }
     return s;
-  };
-  formatter.phone = / |\-|\.|\(|\)/g;
-  formatter.usPhone = /(\d{3})(\d{3})(\d{4})/;
-  return formatter;
-}());
+  }
+}
 exports.formatter = formatter;
+formatter.phone = / |\-|\.|\(|\)/g;
+formatter.usPhone = /(\d{3})(\d{3})(\d{4})/;
 function formatPhone(phone) {
   return formatter.formatPhone(phone);
 }
 exports.formatPhone = formatPhone;
 function rebuildPath(items, lang) {
-  for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
-    var item = items_1[_i];
-    item.path = item.type === "content" ? "/" + lang + item.path : item.path + "?lang=" + lang;
-    var children = item.children;
+  for (const item of items) {
+    item.path = item.type === "content" ? `/${lang}${item.path}` : `${item.path}?lang=${lang}`;
+    const children = item.children;
     if (children && children.length > 0) {
       rebuildPath(children, lang);
     }
@@ -604,18 +665,16 @@ function subMenuItem(p1, p2) {
   return sub(p1.sequence, p2.sequence);
 }
 function toMenuItems(m) {
-  var ps = getRoot(m);
-  for (var _i = 0, ps_1 = ps; _i < ps_1.length; _i++) {
-    var p = ps_1[_i];
+  const ps = getRoot(m);
+  for (const p of ps) {
     getChildren(p, m);
   }
   return ps.sort(subMenuItem);
 }
 exports.toMenuItems = toMenuItems;
 function getRoot(ms) {
-  var ps = [];
-  for (var _i = 0, ms_1 = ms; _i < ms_1.length; _i++) {
-    var m = ms_1[_i];
+  const ps = [];
+  for (const m of ms) {
     if (!m.parent || m.parent.length === 0) {
       delete m.parent;
       ps.push(m);
@@ -624,9 +683,8 @@ function getRoot(ms) {
   return ps.sort(subMenuItem);
 }
 function getChildren(m, all) {
-  var children = [];
-  for (var _i = 0, all_1 = all; _i < all_1.length; _i++) {
-    var s = all_1[_i];
+  const children = [];
+  for (const s of all) {
     if (s.parent === m.id) {
       delete s.parent;
       children.push(s);
@@ -638,3 +696,7 @@ function getChildren(m, all) {
     m.children = children;
   }
 }
+function cloneArray(arr) {
+  return arr.map(item => (Object.assign({}, item)));
+}
+exports.cloneArray = cloneArray;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-one",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "Web utilities",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -7,36 +7,75 @@ export class resources {
   static defaultLimit = 12
   static sort = "sort"
 }
-export interface StringMap {
-  [key: string]: string
-}
-export interface Params {
-  params: StringMap
-  searchParams: StringMap
+export function getRecordValue(v: string | string[] | undefined): string | undefined {
+  if (typeof v === "string") {
+    return v
+  } else if (Array.isArray(v)) {
+    return v.length > 0 ? v[v.length - 1] : undefined
+  }
+  return undefined
 }
-export function removePage(obj: StringMap): string {
+export type StringMap = Record<string, string | string[] | undefined>
+export function removePage(obj: Record<string, string | string[] | undefined>, pageKey?: string): string {
   const arr: string[] = []
   const keys = Object.keys(obj)
+  const page = pageKey ? pageKey : resources.page
   for (const k of keys) {
-    if (k !== resources.page) {
+    if (k !== page) {
       const v = obj[k]
-      arr.push(`${k}=${encodeURI(v)}`)
+      if (typeof v === "string") {
+        arr.push(`${k}=${encodeURI(v)}`)
+      } else if (Array.isArray(v)) {
+        const x = v as string[]
+        if (x.length > 0) {
+          arr.push(`${k}=${encodeURI(x[x.length - 1])}`)
+        }
+      }
     }
   }
   return arr.length === 0 ? "" : arr.join("&")
 }
 
-export function removeSort(obj: StringMap): string {
+export function removeSort(obj: Record<string, string | string[] | undefined>, sortKey?: string): string {
+  const arr: string[] = []
+  const keys = Object.keys(obj)
+  const sort = sortKey ? sortKey : resources.sort
+  for (const k of keys) {
+    if (k !== sort) {
+      const v = obj[k]
+      if (typeof v === "string") {
+        arr.push(`${k}=${encodeURI(v)}`)
+      } else if (Array.isArray(v)) {
+        const x = v as string[]
+        if (x.length > 0) {
+          arr.push(`${k}=${encodeURI(x[x.length - 1])}`)
+        }
+      }
+    }
+  }
+  return arr.length === 0 ? "" : arr.join("&")
+}
+export function removeLimit(obj: Record<string, string | string[] | undefined>, limitKey?: string, pageKey?: string): string {
   const arr: string[] = []
   const keys = Object.keys(obj)
+  const page = pageKey ? pageKey : resources.page
+  const limit = limitKey ? limitKey : resources.limit
   for (const k of keys) {
-    if (k !== resources.sort) {
+    if (k !== page && k !== limit) {
       const v = obj[k]
-      arr.push(`${k}=${encodeURI(v)}`)
+      if (typeof v === "string") {
+        arr.push(`${k}=${encodeURI(v)}`)
+      } else if (Array.isArray(v)) {
+        const x = v as string[]
+        if (x.length > 0) {
+          arr.push(`${k}=${encodeURI(x[x.length - 1])}`)
+        }
+      }
     }
   }
   return arr.length === 0 ? "" : arr.join("&")
 }
+
 export type SearchParams = {
   q?: string
   page?: string
@@ -60,22 +99,39 @@ export function getSortString(field: string, sort: Sort): string {
   }
   return field
 }
-export function buildFilter<T>(obj: StringMap, dates?: string[], nums?: string[], arr?: string[]): T {
+export function buildFilter<T>(obj: Record<string, string | string[] | undefined>, defaultLimit: number,dates?: string[], nums?: string[], arr?: string[], limitKey?: string, pageKey?: string): T {
   const filter: any = fromParams<T>(obj, arr)
-  filter[resources.page] = getPage(filter[resources.page] as string)
-  filter[resources.limit] = getLimit(filter[resources.limit] as string)
+  const page = pageKey ? pageKey : resources.page
+  const limit = limitKey ? limitKey : resources.limit
+  filter[page] = getPage(filter[page] as string)
+  filter[limit] = getLimit(filter[limit] as string, defaultLimit)
   format(filter, dates, nums)
   return filter
 }
-export function fromParams<T>(obj: StringMap, arr?: string[]): T {
+export function fromParams<T>(obj: Record<string, string | string[] | undefined>, arr?: string[]): T {
   const s: any = {}
   const keys = Object.keys(obj)
   for (const key of keys) {
     if (inArray(key, arr)) {
-      const x = (obj[key] as string).split(",")
-      setValue(s, key, x)
+      const v = obj[key]
+      if (typeof v === "string") {
+        const x = v.split(",")
+        setValue(s, key, x)
+      } else if (Array.isArray(v)) {
+        const x: string[] = v as string[]
+        setValue(s, key, x)
+      }
+      
     } else {
-      setValue(s, key, obj[key] as string)
+      const v = obj[key]
+      if (typeof v === "string") {
+        setValue(s, key, v)
+      } else if (Array.isArray(v)) {
+        const x: string[] = v as string[]
+        if (x.length > 0) {
+          setValue(s, key, x[x.length - 1])
+        }
+      }
     }
   }
   return s
@@ -247,9 +303,19 @@ export function buildSort(s?: string): Sort {
     return { field: s.startsWith("+") ? s.substring(1) : s, type: "+" }
   }
 }
-export function buildSortFromParams(params: StringMap): Sort {
-  const s = params[resources.sort] as string
-  return buildSort(s)
+export function buildSortFromParams(params: Record<string, string | string[] | undefined>): Sort {
+  const s = params[resources.sort]
+  if (s !== undefined) {
+    if (typeof s === "string") {
+      return buildSort(s)  
+    } else if (Array.isArray(s)) {
+      const x: string[] = s as string[]
+      if (x.length > 0) {
+        return buildSort(x[x.length - 1])    
+      }
+    }
+  }
+  return buildSort(undefined)
 }
 export function renderSort(field: string, sort: Sort): string {
   if (field === sort.field) {
@@ -257,7 +323,7 @@ export function renderSort(field: string, sort: Sort): string {
   }
   return ""
 }
-export function buildSortSearch(params: StringMap, fields: string[], sortStr?: string): SortMap {
+export function buildSortSearch(params: Record<string, string | string[] | undefined>, fields: string[], sortStr?: string): SortMap {
   const search = removeSort(params)
   const sort = buildSort(sortStr)
   let sorts: SortMap = {}
@@ -334,9 +400,9 @@ export function getPage(page?: string): number {
   const num = getNumber(page)
   return num === undefined || num < 1 ? 1 : num
 }
-export function getLimit(limit?: string): number {
+export function getLimit(limit: string | undefined, defaultLimit: number): number {
   const num = getNumber(limit)
-  return num === undefined || num < 1 ? resources.defaultLimit : num
+  return num === undefined || num < 1 ? defaultLimit : num
 }
 export function getNumber(num?: string, defaultNum?: number): number | undefined {
   return !num || num.length === 0 ? defaultNum : isNaN(num as any) ? undefined : parseInt(num, 10)
@@ -631,3 +697,7 @@ function getChildren(m: Category, all: Category[]) {
     m.children = children
   }
 }
+
+export function cloneArray<T>(arr: T[]): T[] {
+  return arr.map(item => ({ ...item }));
+}

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compileOnSave": true,
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "baseUrl": "./src",
     "outDir": "./lib",
     "module": "commonjs",