express-ext 0.5.3 → 0.5.5

package/lib/search.js

@@ -3,6 +3,114 @@ Object.defineProperty(exports, "__esModule", { value: true })
 var http_1 = require("./http")
 var resources_1 = require("./resources")
 var et = ""
+function getPage(req, filter) {
+  if (filter) {
+    var v0 = filter[resources_1.resources.page]
+    if (v0 == undefined) {
+      var field_1 = req.query[resources_1.resources.page]
+      var v_1 = field_1 ? field_1.toString() : undefined
+      if (!v_1 || v_1.length === 0) {
+        filter[resources_1.resources.page] = 1
+        return 1
+      }
+      if (isNaN(v_1)) {
+        filter[resources_1.resources.page] = 1
+        return 1
+      } else {
+        var n_1 = parseFloat(v_1)
+        if (n_1 < 1) {
+          n_1 = 1
+        }
+        filter[resources_1.resources.page] = n_1
+        return n_1
+      }
+    } else if (typeof v0 === "number") {
+      if (v0 > 0) {
+        return v0
+      } else {
+        filter[resources_1.resources.page] = 1
+        return 1
+      }
+    }
+  }
+  var field = req.query[resources_1.resources.page]
+  var v = field ? field.toString() : undefined
+  if (!v || v.length === 0) {
+    if (filter) {
+      filter[resources_1.resources.page] = 1
+    }
+    return 1
+  }
+  if (isNaN(v)) {
+    if (filter) {
+      filter[resources_1.resources.page] = 1
+    }
+    return 1
+  }
+  var n = parseFloat(v)
+  if (n < 1) {
+    n = 1
+  }
+  if (filter) {
+    filter[resources_1.resources.page] = n
+  }
+  return n
+}
+exports.getPage = getPage
+function getLimit(req, filter) {
+  if (filter) {
+    var v0 = filter[resources_1.resources.limit]
+    if (v0 == 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
+      }
+      if (isNaN(v_2)) {
+        filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
+        return 1
+      } else {
+        var n_2 = parseFloat(v_2)
+        if (n_2 < 1) {
+          n_2 = resources_1.resources.defaultLimit
+        }
+        filter[resources_1.resources.limit] = n_2
+        return n_2
+      }
+    } else if (typeof v0 === "number") {
+      if (v0 > 0) {
+        return v0
+      } else {
+        filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
+        return resources_1.resources.defaultLimit
+      }
+    }
+  }
+  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
+    }
+    return resources_1.resources.defaultLimit
+  }
+  if (isNaN(v)) {
+    if (filter) {
+      filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
+    }
+    return resources_1.resources.defaultLimit
+  }
+  var n = parseFloat(v)
+  if (n < 1) {
+    n = resources_1.resources.defaultLimit
+  }
+  if (filter) {
+    filter[resources_1.resources.limit] = n
+  }
+  return n
+}
+exports.getLimit = getLimit
 function queryLimit(req) {
   return http_1.queryNumber(req, resources_1.resources.limit, resources_1.resources.defaultLimit)
 }
@@ -329,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.3",
+  "version": "0.5.5",
   "description": "express-ext",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/search.ts

@@ -36,6 +36,113 @@ export interface SearchResult<T> {
   last?: boolean
 }
 
+export function getPage<F extends Filter>(req: Request, filter?: F): number {
+  if (filter) {
+    const v0 = (filter as any)[resources.page]
+    if (v0 == undefined) {
+      const field = req.query[resources.page]
+      const v = field ? field.toString() : undefined
+      if (!v || v.length === 0) {
+        ;(filter as any)[resources.page] = 1
+        return 1
+      }
+      if (isNaN(v as any)) {
+        ;(filter as any)[resources.page] = 1
+        return 1
+      } else {
+        let n = parseFloat(v)
+        if (n < 1) {
+          n = 1
+        }
+        ;(filter as any)[resources.page] = n
+        return n
+      }
+    } else if (typeof v0 === "number") {
+      if (v0 > 0) {
+        return v0
+      } else {
+        ;(filter as any)[resources.page] = 1
+        return 1
+      }
+    }
+  }
+  const field = req.query[resources.page]
+  const v = field ? field.toString() : undefined
+  if (!v || v.length === 0) {
+    if (filter) {
+      ;(filter as any)[resources.page] = 1
+    }
+    return 1
+  }
+  if (isNaN(v as any)) {
+    if (filter) {
+      ;(filter as any)[resources.page] = 1
+    }
+    return 1
+  }
+  let n = parseFloat(v)
+  if (n < 1) {
+    n = 1
+  }
+  if (filter) {
+    ;(filter as any)[resources.page] = n
+  }
+  return n
+}
+
+export function getLimit<F extends Filter>(req: Request, filter?: F): number {
+  if (filter) {
+    const v0 = (filter as any)[resources.limit]
+    if (v0 == undefined) {
+      const field = req.query[resources.limit]
+      const v = field ? field.toString() : undefined
+      if (!v || v.length === 0) {
+        ;(filter as any)[resources.limit] = resources.defaultLimit
+        return resources.defaultLimit
+      }
+      if (isNaN(v as any)) {
+        ;(filter as any)[resources.limit] = resources.defaultLimit
+        return 1
+      } else {
+        let n = parseFloat(v)
+        if (n < 1) {
+          n = resources.defaultLimit
+        }
+        ;(filter as any)[resources.limit] = n
+        return n
+      }
+    } else if (typeof v0 === "number") {
+      if (v0 > 0) {
+        return v0
+      } else {
+        ;(filter as any)[resources.limit] = resources.defaultLimit
+        return resources.defaultLimit
+      }
+    }
+  }
+  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
+    }
+    return resources.defaultLimit
+  }
+  if (isNaN(v as any)) {
+    if (filter) {
+      ;(filter as any)[resources.limit] = resources.defaultLimit
+    }
+    return resources.defaultLimit
+  }
+  let n = parseFloat(v)
+  if (n < 1) {
+    n = resources.defaultLimit
+  }
+  if (filter) {
+    ;(filter as any)[resources.limit] = n
+  }
+  return n
+}
 export function queryLimit(req: Request): number {
   return queryNumber(req, resources.limit, resources.defaultLimit)
 }
@@ -343,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[] {