express-ext 0.3.7 → 0.3.9

package/lib/search.js

@@ -3,6 +3,22 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var http_1 = require('./http');
 var resources_1 = require('./resources');
 var et = '';
+function queryPage(req, filter) {
+  var field = req.query[resources_1.resources.page];
+  var v = field ? field.toString() : undefined;
+  if (!v || v.length === 0) {
+    filter[resources_1.resources.page] = 1;
+    return 1;
+  }
+  if (isNaN(v)) {
+    filter[resources_1.resources.page] = 1;
+    return 1;
+  }
+  var n = parseFloat(v);
+  filter[resources_1.resources.page] = n;
+  return n;
+}
+exports.queryPage = queryPage;
 function getOffset(limit, page) {
   var offset = limit * (page - 1);
   return offset < 0 ? 0 : offset;
@@ -229,7 +245,7 @@ function clone(obj) {
   return x;
 }
 exports.clone = clone;
-function cloneFilter(obj, page, limit) {
+function cloneFilter(obj, limit, page) {
   var f = clone(obj);
   if (!obj.hasOwnProperty(resources_1.resources.page)) {
     obj[resources_1.resources.page] = page;

package/package.json

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

package/src/search.ts

@@ -36,6 +36,21 @@ export interface SearchResult<T> {
   last?: boolean;
 }
 
+export function queryPage<F extends Filter>(req: Request, filter?: F): number {
+  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;
+  }
+  const n = parseFloat(v);
+  (filter as any)[resources.page] = n;
+  return n;
+}
 export function getOffset(limit: number, page: number): number {
   const offset = limit * (page - 1);
   return offset < 0 ? 0 : offset;
@@ -250,7 +265,7 @@ export function clone(obj: any): any {
   }
   return x;
 }
-export function cloneFilter<F extends Filter>(obj: F, page: number, limit: number): F {
+export function cloneFilter<F extends Filter>(obj: F, limit: number, page: number): F {
   const f = clone(obj);
   if (!obj.hasOwnProperty(resources.page)) {
     (obj as any)[resources.page] = page;