express-ext 0.5.8 → 0.5.10

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.8",
+  "version": "0.5.10",
   "description": "express-ext",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/view.ts

@@ -11,17 +11,17 @@ 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]
+      id = req.params[n] as string
     }
     if (id && id.length > 0) {
       if (attrs[0].type === "integer" || attrs[0].type === "number") {
@@ -47,7 +47,7 @@ export function buildId<T>(req: Request, attrs?: Attribute[]): T | undefined {
       if (isNaN(v as any)) {
         return undefined
       }
-      ids[attr.name] = parseFloat(v)
+      ids[attr.name] = parseFloat(v as string)
     } else {
       ids[attr.name] = v
     }