react-hook-core 0.4.5 → 0.4.6

package/lib/core.js

@@ -8,8 +8,11 @@ var resources = (function () {
   resources.phone = / |-|\.|\(|\)/g;
   resources._cache = {};
   resources.cache = true;
-  resources.limit = 24;
-  resources.pages = exports.pageSizes;
+  resources.fields = "fields";
+  resources.page = "page";
+  resources.limit = "limit";
+  resources.defaultLimit = 24;
+  resources.limits = exports.pageSizes;
   resources.pageMaxSize = 7;
   return resources;
 }());

package/lib/search.js

@@ -410,17 +410,15 @@ function getPrefix(url) {
 function addParametersIntoUrl(ft, isFirstLoad, page, fields, limit) {
   if (!isFirstLoad) {
     if (!fields || fields.length === 0) {
-      fields = "fields";
+      fields = core_1.resources.fields;
     }
     if (!limit || limit.length === 0) {
-      limit = "limit";
+      limit = core_1.resources.limit;
     }
-    if (page && page > 1) {
-      if (!ft.page || ft.page <= 1) {
-        ft.page = page;
-      }
+    if (page) {
+      ft[core_1.resources.page] = page;
     }
-    var pageIndex = ft.page;
+    var pageIndex = ft[core_1.resources.page];
     if (pageIndex && !isNaN(pageIndex) && pageIndex <= 1) {
       delete ft.page;
     }
@@ -434,13 +432,13 @@ function addParametersIntoUrl(ft, isFirstLoad, page, fields, limit) {
         if (key !== fields) {
           if (typeof objValue === "string" || typeof objValue === "number") {
             if (key === limit) {
-              if (objValue !== core_1.resources.limit) {
+              if (objValue !== core_1.resources.defaultLimit) {
                 url += getPrefix(url) + (key + "=" + objValue);
               }
             }
             else {
               if (typeof objValue === "string") {
-                url += getPrefix(url) + (key + "=" + encodeURI(objValue));
+                url += getPrefix(url) + (key + "=" + encodeURIComponent(objValue));
               }
               else {
                 url += getPrefix(url) + (key + "=" + objValue);
@@ -458,7 +456,7 @@ function addParametersIntoUrl(ft, isFirstLoad, page, fields, limit) {
                   for (var _a = 0, objValue_1 = objValue; _a < objValue_1.length; _a++) {
                     var subValue = objValue_1[_a];
                     if (typeof subValue === "string") {
-                      strs.push(encodeURI(subValue));
+                      strs.push(encodeURIComponent(subValue));
                     }
                     else if (typeof subValue === "number") {
                       strs.push(subValue.toString());
@@ -478,7 +476,7 @@ function addParametersIntoUrl(ft, isFirstLoad, page, fields, limit) {
                     }
                     else {
                       if (typeof objValueLvl2 === "string") {
-                        url += getPrefix(url) + (key + "." + key2 + "=" + encodeURI(objValueLvl2));
+                        url += getPrefix(url) + (key + "." + key2 + "=" + encodeURIComponent(objValueLvl2));
                       }
                       else {
                         url += getPrefix(url) + (key + "." + key2 + "=" + objValueLvl2);

package/lib/useSearch.js

@@ -26,7 +26,7 @@ exports.callSearch = function (se, search3, showResults3, searchError3, lc, next
     page = 1;
   }
   if (!se.limit || se.limit <= 0) {
-    se.limit = core_1.resources.limit;
+    se.limit = core_1.resources.defaultLimit;
   }
   var limit = (page <= 1 && se.firstLimit && se.firstLimit > 0 ? se.firstLimit : se.limit);
   var next = (nextPageToken && nextPageToken.length > 0 ? nextPageToken : page);

package/package.json

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

package/src/core.ts

@@ -7,8 +7,11 @@ export class resources {
   static phone = / |-|\.|\(|\)/g;
   static _cache: any = {};
   static cache = true;
-  static limit = 24;
-  static pages = pageSizes;
+  static fields = "fields";
+  static page = "page";
+  static limit = "limit";
+  static defaultLimit = 24;
+  static limits = pageSizes;
   static pageMaxSize = 7;
 }
 export const size = pageSizes;

package/src/search.ts

@@ -414,17 +414,15 @@ function getPrefix(url: string): string {
 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"
+      fields = resources.fields
     }
     if (!limit || limit.length === 0) {
-      limit = "limit"
+      limit = resources.limit
     }
-    if (page && page > 1) {
-      if (!ft.page || ft.page <= 1) {
-        ft.page = page
-      }
+    if (page) {
+      (ft as any)[resources.page] = page;
     }
-    const pageIndex = ft.page
+    const pageIndex = (ft as any)[resources.page]
     if (pageIndex && !isNaN(pageIndex) && pageIndex <= 1) {
       delete ft.page
     }
@@ -437,12 +435,12 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
         if (key !== fields) {
           if (typeof objValue === "string" || typeof objValue === "number") {
             if (key === limit) {
-              if (objValue !== resources.limit) {
+              if (objValue !== resources.defaultLimit) {
                 url += getPrefix(url) + `${key}=${objValue}`
               }
             } else {
               if (typeof objValue === "string") {
-                url += getPrefix(url) + `${key}=${encodeURI(objValue)}`
+                url += getPrefix(url) + `${key}=${encodeURIComponent(objValue)}`
               } else {
                 url += getPrefix(url) + `${key}=${objValue}`
               }
@@ -456,7 +454,7 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
                   const strs: string[] = []
                   for (const subValue of objValue) {
                     if (typeof subValue === "string") {
-                      strs.push(encodeURI(subValue))
+                      strs.push(encodeURIComponent(subValue))
                     } else if (typeof subValue === "number") {
                       strs.push(subValue.toString())
                     }
@@ -472,7 +470,7 @@ export function addParametersIntoUrl<S extends Filter>(ft: S, isFirstLoad?: bool
                       url += getPrefix(url) + `${key}.${key2}=${objValueLvl2.toISOString()}`
                     } else {
                       if (typeof objValueLvl2 === "string") {
-                        url += getPrefix(url) + `${key}.${key2}=${encodeURI(objValueLvl2)}`                        
+                        url += getPrefix(url) + `${key}.${key2}=${encodeURIComponent(objValueLvl2)}`                        
                       } else {
                         url += getPrefix(url) + `${key}.${key2}=${objValueLvl2}`
                       }

package/src/useSearch.ts

@@ -19,7 +19,7 @@ export const callSearch = <T, S extends Filter>(se: S, search3: (s: S, limit?: n
     page = 1;
   }
   if (!se.limit || se.limit <= 0) {
-    se.limit = resources.limit;
+    se.limit = resources.defaultLimit;
   }
   const limit = (page <= 1 && se.firstLimit && se.firstLimit > 0 ? se.firstLimit : se.limit);
   const next = (nextPageToken && nextPageToken.length > 0 ? nextPageToken : page);