express-ext 0.5.7 → 0.5.9

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/lib/view.js

@@ -1,78 +1,77 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
 function buildAndCheckId(req, res, keys) {
-  var id = buildId(req, keys);
+  var id = buildId(req, keys)
   if (!id) {
-    res.status(400).end('invalid parameters');
-    return undefined;
+    res.status(400).end("invalid parameters")
+    return undefined
   }
-  return id;
+  return id
 }
-exports.buildAndCheckId = buildAndCheckId;
+exports.buildAndCheckId = buildAndCheckId
 function buildId(req, attrs) {
   if (!attrs || attrs.length === 0) {
-    var id = req.params['id'];
+    var id = req.params["id"]
     if (id && id.length > 0) {
-      return id;
+      return id
     }
-    return undefined;
+    return undefined
   }
   if (attrs && attrs.length === 1) {
-    var id = req.params['id'];
-    var n = attrs[0].name;
+    var id = req.params["id"]
+    var n = attrs[0].name
     if ((!id || id.length === 0) && n && n.length > 0) {
-      id = req.params[n];
+      id = req.params[n]
     }
     if (id && id.length > 0) {
-      if (attrs[0].type === 'integer' || attrs[0].type === 'number') {
+      if (attrs[0].type === "integer" || attrs[0].type === "number") {
         if (isNaN(id)) {
-          return undefined;
+          return undefined
         }
-        var v = parseFloat(id);
-        return v;
+        var v = parseFloat(id)
+        return v
       }
-      return id;
+      return id
     }
   }
-  var ids = {};
+  var ids = {}
   for (var _i = 0, attrs_1 = attrs; _i < attrs_1.length; _i++) {
-    var attr = attrs_1[_i];
+    var attr = attrs_1[_i]
     if (!attr.name) {
-      return undefined;
+      return undefined
     }
-    var v = req.params[attr.name];
+    var v = req.params[attr.name]
     if (!v) {
-      return undefined;
+      return undefined
     }
-    if (attr.type === 'integer' || attr.type === 'number') {
+    if (attr.type === "integer" || attr.type === "number") {
       if (isNaN(v)) {
-        return undefined;
+        return undefined
       }
-      ids[attr.name] = parseFloat(v);
+      ids[attr.name] = parseFloat(v)
+    } else {
+      ids[attr.name] = v
     }
-    else {
-      ids[attr.name] = v;
-    }
-    return ids;
+    return ids
   }
 }
-exports.buildId = buildId;
+exports.buildId = buildId
 function buildKeys(attrs) {
   if (!attrs) {
-    return undefined;
+    return undefined
   }
-  var keys = Object.keys(attrs);
-  var ats = [];
+  var keys = Object.keys(attrs)
+  var ats = []
   for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var key = keys_1[_i];
-    var attr = attrs[key];
+    var key = keys_1[_i]
+    var attr = attrs[key]
     if (attr) {
       if (attr.key === true) {
-        var at = { name: key, type: attr.type };
-        ats.push(at);
+        var at = { name: key, type: attr.type }
+        ats.push(at)
       }
     }
   }
-  return ats;
+  return ats
 }
-exports.buildKeys = buildKeys;
+exports.buildKeys = buildKeys

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "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 {

package/src/view.ts

@@ -11,14 +11,14 @@ export function buildAndCheckId<ID>(req: Request, res: Response, keys?: Attribut
 }
 export function buildId<T>(req: Request, attrs?: Attribute[]): T | undefined {
   if (!attrs || attrs.length === 0) {
-    const id = req.params["id"]
+    const id = req.params["id"] as string
     if (id && id.length > 0) {
       return id as any
     }
     return undefined
   }
   if (attrs && attrs.length === 1) {
-    let id = req.params["id"]
+    let id = req.params["id"] as string
     const n = attrs[0].name
     if ((!id || id.length === 0) && n && n.length > 0) {
       id = req.params[n]