express-ext 0.5.7 → 0.5.8

package/lib/search.js

@@ -132,8 +132,7 @@ function queryPage(req, filter) {
 }
 exports.queryPage = queryPage
 function getOffset(limit, page) {
-  var offset = limit * (page - 1)
-  return offset < 0 ? 0 : offset
+  return !page || page <= 1 || limit <= 0 ? 0 : limit * (page - 1)
 }
 exports.getOffset = getOffset
 function getPageTotal(pageSize, total) {

package/package.json

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

package/src/log.ts

@@ -1,6 +1,4 @@
-import { NextFunction } from "express"
-import { ParamsDictionary, Request, Response } from "express-serve-static-core"
-import { ParsedQs } from "qs"
+import { NextFunction, Request, Response } from "express"
 import { PassThrough } from "stream"
 import { resources } from "./resources"
 
@@ -64,16 +62,12 @@ export interface Middleware {
 }
 const o = "OPTIONS"
 export class MiddlewareLogger {
-  constructor(
-    public write: (msg: string, m?: SimpleMap) => void,
-    conf?: LogConf,
-    public build?: (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, m: SimpleMap) => SimpleMap,
-  ) {
+  constructor(public write: (msg: string, m?: SimpleMap) => void, conf?: LogConf, public build?: (req: Request, m: SimpleMap) => SimpleMap) {
     this.log = this.log.bind(this)
     this.conf = createConfig(conf)
   }
   conf: MiddleLog
-  log(req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) {
+  log(req: Request, res: Response, next: NextFunction) {
     const m = req.method
     if (m !== o && this.conf.log && !skip(this.conf.skips, req.originalUrl)) {
       const start = process.hrtime()
@@ -134,18 +128,16 @@ export class MiddlewareLogger {
     }
   }
 }
-const mapResponseBody = (res: Response<any, Record<string, any>, number>, chunks: Uint8Array[]) => {
+const mapResponseBody = (res: Response, chunks: Uint8Array[]) => {
   const defaultWrite = res.write.bind(res)
   const defaultEnd = res.end.bind(res)
   const ps = new PassThrough()
 
   ps.on("data", (data: any) => chunks.push(data))
-
   ;(res as any).write = (...args: any) => {
     ;(ps as any).write(...args)
     ;(defaultWrite as any)(...args)
   }
-
   ;(res as any).end = (...args: any) => {
     ps.end(...args)
     defaultEnd(...args)

package/src/search.ts

@@ -160,9 +160,8 @@ export function queryPage<F extends Filter>(req: Request, filter?: F): number {
   ;(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
+export function getOffset(limit: number, page?: number): number {
+  return !page || page <= 1 || limit <= 0 ? 0 : limit * (page - 1)
 }
 
 export function getPageTotal(pageSize?: number, total?: number): number {