react-hook-core 0.3.1 → 0.3.2

package/lib/search.js

@@ -163,7 +163,6 @@ function changePage(com, pageIndex, pageSize) {
 }
 exports.changePage = changePage;
 function optimizeFilter(obj, searchable, fields) {
-  var sLimit = searchable.limit;
   obj.fields = fields;
   if (searchable.pageIndex && searchable.pageIndex > 1) {
     obj.page = searchable.pageIndex;
@@ -171,12 +170,7 @@ function optimizeFilter(obj, searchable, fields) {
   else {
     delete obj.page;
   }
-  if (sLimit) {
-    obj.limit = searchable.limit;
-  }
-  else {
-    obj.limit = searchable.pageSize;
-  }
+  obj.limit = searchable.pageSize;
   if (searchable.appendMode && searchable.initPageSize !== searchable.pageSize) {
     obj.firstLimit = searchable.initPageSize;
   }
@@ -418,7 +412,10 @@ function removeFormatUrl(url) {
   var startParams = url.indexOf('?');
   return startParams !== -1 ? url.substring(0, startParams) : url;
 }
-function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
+function getPrefix(url) {
+  return url.indexOf("?") >= 0 ? "&" : "?";
+}
+function addParametersIntoUrl(ft, isFirstLoad, page, fields, limit) {
   if (!isFirstLoad) {
     if (!fields || fields.length === 0) {
       fields = 'fields';
@@ -426,6 +423,11 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
     if (!limit || limit.length === 0) {
       limit = 'limit';
     }
+    if (page && page > 1) {
+      if (!ft.page || ft.page <= 1) {
+        ft.page = page;
+      }
+    }
     var pageIndex = ft.page;
     if (pageIndex && !isNaN(pageIndex) && pageIndex <= 1) {
       delete ft.page;
@@ -441,31 +443,16 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
           if (typeof objValue === 'string' || typeof objValue === 'number') {
             if (key === limit) {
               if (objValue !== resources.limit) {
-                if (url.indexOf('?') === -1) {
-                  url += "?" + key + "=" + objValue;
-                }
-                else {
-                  url += "&" + key + "=" + objValue;
-                }
+                url += getPrefix(url) + (key + "=" + objValue);
               }
             }
             else {
-              if (url.indexOf('?') === -1) {
-                url += "?" + key + "=" + objValue;
-              }
-              else {
-                url += "&" + key + "=" + objValue;
-              }
+              url += getPrefix(url) + (key + "=" + objValue);
             }
           }
           else if (typeof objValue === 'object') {
             if (objValue instanceof Date) {
-              if (url.indexOf('?') === -1) {
-                url += "?" + key + "=" + objValue.toISOString();
-              }
-              else {
-                url += "&" + key + "=" + objValue.toISOString();
-              }
+              url += getPrefix(url) + (key + "=" + objValue.toISOString());
             }
             else {
               if (Array.isArray(objValue)) {
@@ -480,12 +467,7 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
                       strs.push(subValue.toString());
                     }
                   }
-                  if (url.indexOf('?') === -1) {
-                    url += "?" + key + "=" + strs.join(',');
-                  }
-                  else {
-                    url += "&" + key + "=" + strs.join(',');
-                  }
+                  url += getPrefix(url) + (key + "=" + strs.join(','));
                 }
               }
               else {
@@ -493,21 +475,11 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
                 for (var _b = 0, keysLvl2_1 = keysLvl2; _b < keysLvl2_1.length; _b++) {
                   var key2 = keysLvl2_1[_b];
                   var objValueLvl2 = objValue[key2];
-                  if (url.indexOf('?') === -1) {
-                    if (objValueLvl2 instanceof Date) {
-                      url += "?" + key + "." + key2 + "=" + objValueLvl2.toISOString();
-                    }
-                    else {
-                      url += "?" + key + "." + key2 + "=" + objValueLvl2;
-                    }
+                  if (objValueLvl2 instanceof Date) {
+                    url += getPrefix(url) + (key + "." + key2 + "=" + objValueLvl2.toISOString());
                   }
                   else {
-                    if (objValueLvl2 instanceof Date) {
-                      url += "&" + key + "." + key2 + "=" + objValueLvl2.toISOString();
-                    }
-                    else {
-                      url += "&" + key + "." + key2 + "=" + objValueLvl2;
-                    }
+                    url += getPrefix(url) + (key + "." + key2 + "=" + objValueLvl2);
                   }
                 }
               }
@@ -519,7 +491,7 @@ function addParametersIntoUrl(ft, isFirstLoad, fields, limit) {
     var p = 'http://';
     var loc = window.location.href;
     if (loc.length >= 8) {
-      var ss = loc.substr(0, 8);
+      var ss = loc.substring(0, 8);
       if (ss === 'https://') {
         p = 'https://';
       }

package/lib/useSearch.js

@@ -40,7 +40,6 @@ exports.callSearch = function (se, search3, showResults3, searchError3, lc, next
   var fields = se.fields;
   delete se['page'];
   delete se['fields'];
-  delete se['limit'];
   delete se['firstLimit'];
   search3(s, limit, next, fields).then(function (sr) {
     showResults3(s, sr, lc);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/route.ts

@@ -1,6 +1,7 @@
+import { Filter } from "./core";
 import * as qs from "query-string";
 
-export function buildFromUrl<S>(modelT?: S): S {
+export function buildFromUrl<S extends Filter>(modelT?: S): S {
   return buildParameters<S>(window.location.search, modelT);
 }
 export function buildParameters<T>(url: string, model?: T): T {

package/src/search.ts

@@ -9,7 +9,7 @@ export class resources {
 }
 interface Filter {
   page?: number;
-  limit?: number;
+  limit: number;
   firstLimit?: number;
   fields?: string[];
   sort?: string;
@@ -40,8 +40,8 @@ export interface Sortable {
 
 export interface Pagination {
   initPageSize?: number;
-  pageSize?: number;
-  limit?: number;
+  pageSize: number;
+  // limit: number;
   pageIndex?: number;
   total?: number;
   pages?: number;
@@ -192,18 +192,14 @@ export function changePage(com: Pagination, pageIndex: number, pageSize: number)
   com.append = false;
 }
 export function optimizeFilter<S extends Filter>(obj: S, searchable: Searchable, fields?: string[]): S {
-  const sLimit = searchable.limit;
+  // const sLimit = searchable.limit;
   obj.fields = fields;
   if (searchable.pageIndex && searchable.pageIndex > 1) {
     obj.page = searchable.pageIndex;
   } else {
     delete obj.page;
   }
-  if (sLimit){
-    obj.limit = searchable.limit;
-  }else{
-    obj.limit = searchable.pageSize;
-  }
+  obj.limit = searchable.pageSize;
 
   if (searchable.appendMode && searchable.initPageSize !== searchable.pageSize) {
     obj.firstLimit = searchable.initPageSize;
@@ -216,7 +212,7 @@ export function optimizeFilter<S extends Filter>(obj: S, searchable: Searchable,
     delete obj.sort;
   }
   if(searchable) {
-    mapObjects(obj, searchable as S);
+    mapObjects(obj, searchable as any);
   }
   return obj;
 }
@@ -444,7 +440,10 @@ function removeFormatUrl(url: string): string {
 }
 
 
-export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: boolean, fields?: string, limit?: string): void {
+function getPrefix(url: string): string {
+  return url.indexOf("?") >= 0 ? "&" : "?"
+}
+export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: boolean, page?: number, fields?: string, limit?: string): void {
   if (!isFirstLoad) {
     if (!fields || fields.length === 0) {
       fields = 'fields';
@@ -452,6 +451,11 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
     if (!limit || limit.length === 0) {
       limit = 'limit';
     }
+    if (page && page > 1) {
+      if (!ft.page || ft.page <= 1) {
+        ft.page = page;
+      }
+    }
     const pageIndex = ft.page;
     if (pageIndex && !isNaN(pageIndex) && pageIndex <= 1) {
       delete ft.page;
@@ -466,30 +470,18 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
           if (typeof objValue === 'string' || typeof objValue === 'number') {
             if (key === limit) {
               if (objValue !== resources.limit) {
-                if (url.indexOf('?') === -1) {
-                  url += `?${key}=${objValue}`;
-                } else {
-                  url += `&${key}=${objValue}`;
-                }
+                url += getPrefix(url) + `${key}=${objValue}`;
               }
             } else {
-              if (url.indexOf('?') === -1) {
-                url += `?${key}=${objValue}`;
-              } else {
-                url += `&${key}=${objValue}`;
-              }
+              url += getPrefix(url) + `${key}=${objValue}`;
             }
           } else if (typeof objValue === 'object') {
             if (objValue instanceof Date) {
-              if (url.indexOf('?') === -1) {
-                url += `?${key}=${objValue.toISOString()}`;
-              } else {
-                url += `&${key}=${objValue.toISOString()}`;
-              }
+              url += getPrefix(url) + `${key}=${objValue.toISOString()}`;
             } else {
               if (Array.isArray(objValue)) {
                 if (objValue.length > 0) {
-                  const strs = [];
+                  const strs: string[] = [];
                   for (const subValue of objValue) {
                     if (typeof subValue === 'string') {
                       strs.push(subValue);
@@ -497,28 +489,16 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
                       strs.push(subValue.toString());
                     }
                   }
-                  if (url.indexOf('?') === -1) {
-                    url += `?${key}=${strs.join(',')}`;
-                  } else {
-                    url += `&${key}=${strs.join(',')}`;
-                  }
+                  url += getPrefix(url) + `${key}=${strs.join(',')}`;
                 }
               } else {
                 const keysLvl2 = Object.keys(objValue);
                 for (const key2 of keysLvl2) {
                   const objValueLvl2 = objValue[key2];
-                  if (url.indexOf('?') === -1) {
-                    if (objValueLvl2 instanceof Date) {
-                      url += `?${key}.${key2}=${objValueLvl2.toISOString()}`;
-                    } else {
-                      url += `?${key}.${key2}=${objValueLvl2}`;
-                    }
+                  if (objValueLvl2 instanceof Date) {
+                    url += getPrefix(url) + `${key}.${key2}=${objValueLvl2.toISOString()}`;
                   } else {
-                    if (objValueLvl2 instanceof Date) {
-                      url += `&${key}.${key2}=${objValueLvl2.toISOString()}`;
-                    } else {
-                      url += `&${key}.${key2}=${objValueLvl2}`;
-                    }
+                    url += getPrefix(url) + `${key}.${key2}=${objValueLvl2}`;
                   }
                 }
               }
@@ -530,7 +510,7 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
     let p = 'http://';
     const loc = window.location.href;
     if (loc.length >= 8) {
-      const ss = loc.substr(0, 8);
+      const ss = loc.substring(0, 8);
       if (ss === 'https://') {
         p = 'https://';
       }

package/src/useSearch.ts

@@ -13,7 +13,7 @@ export interface Searchable extends Pagination, Sortable {
 }
 interface Filter {
   page?: number;
-  limit?: number;
+  limit: number;
   firstLimit?: number;
   fields?: string[];
   sort?: string;
@@ -39,7 +39,7 @@ export const callSearch = <T, S extends Filter>(se: S, search3: (s: S, limit?: n
   const fields = se.fields;
   delete se['page'];
   delete se['fields'];
-  delete se['limit'];
+  // delete se['limit'];
   delete se['firstLimit'];
   search3(s, limit, next, fields).then(sr => {
     showResults3(s, sr, lc);
@@ -74,7 +74,7 @@ export interface SearchComponentParam<T, M extends Filter> {
   appendMode?: boolean;
   pageSizes?: number[];
   pageIndex?: number;
-  pageSize?: number;
+  pageSize: number;
   initPageSize?: number;
   pageMaxSize?: number;
   ignoreUrlParam?: boolean;
@@ -303,7 +303,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     const runSearch = doSearch;
     if (auto) {
       setTimeout(() => {
-        runSearch((obj2 as Searchable), true);
+        runSearch((obj2 as any), true);
       }, 0);
     }
   };

package/tsconfig.json

@@ -17,7 +17,8 @@
       "dom",
       "es6",
       "es7",
-      "es2017"
+      "es2017",
+      "es2022"
     ]
   },
   "include": [