express-ext 0.5.4 → 0.5.5

package/lib/search.js

@@ -61,8 +61,8 @@ function getLimit(req, filter) {
   if (filter) {
     var v0 = filter[resources_1.resources.limit]
     if (v0 == undefined) {
-      var field = req.query[resources_1.resources.limit]
-      var v_2 = field ? field.toString() : undefined
+      var field_2 = req.query[resources_1.resources.limit]
+      var v_2 = field_2 ? field_2.toString() : undefined
       if (!v_2 || v_2.length === 0) {
         filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
         return resources_1.resources.defaultLimit
@@ -87,8 +87,8 @@ function getLimit(req, filter) {
       }
     }
   }
-  var fieldxxx = req.query[resources_1.resources.limit]
-  var v = fieldxxx ? fieldxxx.toString() : undefined
+  var field = req.query[resources_1.resources.limit]
+  var v = field ? field.toString() : undefined
   if (!v || v.length === 0) {
     if (filter) {
       filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
@@ -437,6 +437,37 @@ function initializeConfig(conf) {
 exports.initializeConfig = initializeConfig
 function fromRequest(req, arr) {
   var s = req.method === "GET" ? fromUrl(req, arr) : req.body
+  var page = s[resources_1.resources.page]
+  if (page) {
+    if (isNaN(page)) {
+      s[resources_1.resources.page] = 1
+    } else {
+      var n = parseFloat(page)
+      if (n < 1) {
+        n = 1
+      }
+      s[resources_1.resources.page] = n
+    }
+  } else {
+    s[resources_1.resources.page] = 1
+  }
+  var limit = s[resources_1.resources.limit]
+  if (limit) {
+    if (isNaN(page)) {
+      s[resources_1.resources.limit] = resources_1.resources.defaultLimit
+    } else {
+      var n = parseFloat(limit)
+      if (n < 1) {
+        n = resources_1.resources.defaultLimit
+      }
+      s[resources_1.resources.page] = n
+    }
+  } else {
+    s[resources_1.resources.limit] = resources_1.resources.defaultLimit
+  }
+  if (resources_1.resources.partial.length > 0) {
+    delete s[resources_1.resources.partial]
+  }
   return s
 }
 exports.fromRequest = fromRequest

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "express-ext",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/search.ts

@@ -120,8 +120,8 @@ export function getLimit<F extends Filter>(req: Request, filter?: F): number {
       }
     }
   }
-  const fieldxxx = req.query[resources.limit]
-  const v = fieldxxx ? fieldxxx.toString() : undefined
+  const field = req.query[resources.limit]
+  const v = field ? field.toString() : undefined
   if (!v || v.length === 0) {
     if (filter) {
       ;(filter as any)[resources.limit] = resources.defaultLimit
@@ -450,6 +450,38 @@ export function initializeConfig(conf?: SearchConfig): SearchConfig | undefined
 }
 export function fromRequest<S>(req: Request, arr?: string[]): S {
   const s: any = req.method === "GET" ? fromUrl(req, arr) : req.body
+  const page = s[resources.page]
+  if (page) {
+    if (isNaN(page as any)) {
+      s[resources.page] = 1
+    } else {
+      let n = parseFloat(page)
+      if (n < 1) {
+        n = 1
+      }
+      s[resources.page] = n
+    }
+  } else {
+    s[resources.page] = 1
+  }
+
+  const limit = s[resources.limit]
+  if (limit) {
+    if (isNaN(page as any)) {
+      s[resources.limit] = resources.defaultLimit
+    } else {
+      let n = parseFloat(limit)
+      if (n < 1) {
+        n = resources.defaultLimit
+      }
+      s[resources.page] = n
+    }
+  } else {
+    s[resources.limit] = resources.defaultLimit
+  }
+  if (resources.partial.length > 0) {
+    delete s[resources.partial]
+  }
   return s
 }
 export function buildArray(arr?: string[], s0?: string, s1?: string, s2?: string): string[] {