web-one 0.0.5 → 0.0.7

package/lib/index.js

@@ -12,11 +12,22 @@ resources.page = "page";
 resources.limit = "limit";
 resources.defaultLimit = 12;
 resources.sort = "sort";
-function removePage(obj) {
+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 !== resources.page) {
+    if (k !== page) {
       const v = obj[k];
       if (typeof v === "string") {
         arr.push(`${k}=${encodeURI(v)}`);
@@ -32,11 +43,12 @@ function removePage(obj) {
   return arr.length === 0 ? "" : arr.join("&");
 }
 exports.removePage = removePage;
-function removeSort(obj) {
+function removeSort(obj, sortKey) {
   const arr = [];
   const keys = Object.keys(obj);
+  const sort = sortKey ? sortKey : resources.sort;
   for (const k of keys) {
-    if (k !== resources.sort) {
+    if (k !== sort) {
       const v = obj[k];
       if (typeof v === "string") {
         arr.push(`${k}=${encodeURI(v)}`);
@@ -52,6 +64,28 @@ function removeSort(obj) {
   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;
@@ -59,10 +93,12 @@ function getSortString(field, sort) {
   return field;
 }
 exports.getSortString = getSortString;
-function buildFilter(obj, dates, nums, arr) {
+function buildFilter(obj, defaultLimit, dates, nums, arr, limitKey, pageKey) {
   const filter = fromParams(obj, arr);
-  filter[resources.page] = getPage(filter[resources.page]);
-  filter[resources.limit] = getLimit(filter[resources.limit]);
+  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;
 }
@@ -297,13 +333,13 @@ function buildSortFromParams(params) {
   return buildSort(undefined);
 }
 exports.buildSortFromParams = buildSortFromParams;
-function renderSort(field, sort) {
+function getSortType(field, sort) {
   if (field === sort.field) {
-    return sort.type === "-" ? "<i class='sort-down'></i>" : "<i class='sort-up'></i>";
+    return sort.type === "-" ? "-" : "+";
   }
-  return "";
+  return undefined;
 }
-exports.renderSort = renderSort;
+exports.getSortType = getSortType;
 function buildSortSearch(params, fields, sortStr) {
   const search = removeSort(params);
   const sort = buildSort(sortStr);
@@ -312,7 +348,7 @@ function buildSortSearch(params, fields, sortStr) {
   for (let i = 0; i < fields.length; i++) {
     sorts[fields[i]] = {
       url: prefix + resources.sort + "=" + getSortString(fields[i], sort),
-      tag: renderSort(fields[i], sort),
+      type: getSortType(fields[i], sort),
     };
   }
   return sorts;
@@ -377,9 +413,9 @@ function getPage(page) {
   return num === undefined || num < 1 ? 1 : num;
 }
 exports.getPage = getPage;
-function getLimit(limit) {
+function getLimit(limit, defaultLimit) {
   const num = getNumber(limit);
-  return num === undefined || num < 1 ? resources.defaultLimit : num;
+  return num === undefined || num < 1 ? defaultLimit : num;
 }
 exports.getLimit = getLimit;
 function getNumber(num, defaultNum) {
@@ -660,3 +696,19 @@ function getChildren(m, all) {
     m.children = children;
   }
 }
+function cloneArray(arr) {
+  return arr.map(item => (Object.assign({}, item)));
+}
+exports.cloneArray = cloneArray;
+function getOffset(limit, page, firstLimit) {
+  const p = page && page > 0 ? page : 1;
+  if (firstLimit && firstLimit > 0) {
+    const offset = limit * (p - 2) + firstLimit;
+    return offset < 0 ? 0 : offset;
+  }
+  else {
+    const offset = limit * (p - 1);
+    return offset < 0 ? 0 : offset;
+  }
+}
+exports.getOffset = getOffset;

package/package.json

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

package/src/index.ts

@@ -7,12 +7,21 @@ export class resources {
   static defaultLimit = 12
   static sort = "sort"
 }
+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 type StringMap = Record<string, string | string[] | undefined>
-export function removePage(obj: Record<string, string | string[] | undefined>): string {
+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]
       if (typeof v === "string") {
         arr.push(`${k}=${encodeURI(v)}`)
@@ -27,11 +36,12 @@ export function removePage(obj: Record<string, string | string[] | undefined>):
   return arr.length === 0 ? "" : arr.join("&")
 }
 
-export function removeSort(obj: Record<string, string | string[] | undefined>): 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 !== resources.sort) {
+    if (k !== sort) {
       const v = obj[k]
       if (typeof v === "string") {
         arr.push(`${k}=${encodeURI(v)}`)
@@ -45,6 +55,27 @@ export function removeSort(obj: Record<string, string | string[] | undefined>):
   }
   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 !== page && k !== limit) {
+      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 type SearchParams = {
   q?: string
   page?: string
@@ -57,7 +88,7 @@ export interface Sort {
 }
 export interface SortType {
   url: string
-  tag: string
+  type?: "+" | "-"
 }
 export interface SortMap {
   [key: string]: SortType
@@ -68,10 +99,12 @@ export function getSortString(field: string, sort: Sort): string {
   }
   return field
 }
-export function buildFilter<T>(obj: Record<string, string | string[] | undefined>, 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
 }
@@ -284,11 +317,11 @@ export function buildSortFromParams(params: Record<string, string | string[] | u
   }
   return buildSort(undefined)
 }
-export function renderSort(field: string, sort: Sort): string {
+export function getSortType(field: string, sort: Sort): "-" | "+" | undefined {
   if (field === sort.field) {
-    return sort.type === "-" ? "<i class='sort-down'></i>" : "<i class='sort-up'></i>"
+    return sort.type === "-" ? "-" : "+"
   }
-  return ""
+  return undefined
 }
 export function buildSortSearch(params: Record<string, string | string[] | undefined>, fields: string[], sortStr?: string): SortMap {
   const search = removeSort(params)
@@ -298,12 +331,11 @@ export function buildSortSearch(params: Record<string, string | string[] | undef
   for (let i = 0; i < fields.length; i++) {
     sorts[fields[i]] = {
       url: prefix + resources.sort + "=" + getSortString(fields[i], sort),
-      tag: renderSort(fields[i], sort),
+      type: getSortType(fields[i], sort),
     }
   }
   return sorts
 }
-
 export function formatInteger(v?: number | null, groupSeparator: string = ","): string {
   if (v == null || !Number.isFinite(v)) {
     return ""
@@ -367,9 +399,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)
@@ -664,3 +696,18 @@ function getChildren(m: Category, all: Category[]) {
     m.children = children
   }
 }
+
+export function cloneArray<T>(arr: T[]): T[] {
+  return arr.map(item => ({ ...item }));
+}
+
+export function getOffset(limit: number, page?: number, firstLimit?: number): number {
+  const p = page && page > 0 ? page : 1
+  if (firstLimit && firstLimit > 0) {
+    const offset = limit * (p - 2) + firstLimit
+    return offset < 0 ? 0 : offset
+  } else {
+    const offset = limit * (p - 1)
+    return offset < 0 ? 0 : offset
+  }
+}