core-express 0.1.0 → 0.1.1

package/src/view.ts

@@ -1,59 +1,73 @@
-import {Request} from 'express';
-import {Attribute, Attributes} from './metadata';
+import { Request, Response } from "express"
+import { Attribute, Attributes } from "./metadata"
 
-export function buildId<T>(req: Request, attrs?: Attribute[]): T {
-  if (!attrs) {
-    const id = req.params['id'];
+export function buildAndCheckId<ID>(req: Request, res: Response, keys?: Attribute[]): ID | undefined {
+  const id = buildId<ID>(req, keys)
+  if (!id) {
+    res.status(400).end("invalid parameters")
+    return undefined
+  }
+  return id
+}
+export function buildId<T>(req: Request, attrs?: Attribute[]): T | undefined {
+  if (!attrs || attrs.length === 0) {
+    const id = req.params["id"] as string
     if (id && id.length > 0) {
-      return id as any;
+      return id as any
     }
-    return null;
+    return undefined
   }
   if (attrs && attrs.length === 1) {
-    const key = (attrs[0].name ? attrs[0].name : 'id');
-    const id = req.params[key];
+    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] as string
+    }
     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 as any)) {
-          return null;
+          return undefined
         }
-        const v = parseFloat(id);
-        return v as any;
+        const v = parseFloat(id)
+        return v as any
       }
-      return id as any;
+      return id as any
     }
   }
-  const ids: any = {};
+  const ids: any = {}
   for (const attr of attrs) {
-    const v = req.params[attr.name];
+    if (!attr.name) {
+      return undefined
+    }
+    const v = req.params[attr.name]
     if (!v) {
-      return null;
+      return undefined
     }
-    if (attr.type === 'integer' || attr.type === 'number') {
+    if (attr.type === "integer" || attr.type === "number") {
       if (isNaN(v as any)) {
-        return null;
+        return undefined
       }
-      ids[attr.name] = parseFloat(v);
+      ids[attr.name] = parseFloat(v as string)
     } else {
-      ids[attr.name] = v;
+      ids[attr.name] = v
     }
-    return ids;
+    return ids
   }
 }
-export function buildKeys(attrs: Attributes): Attribute[] {
+export function buildKeys(attrs: Attributes): Attribute[] | undefined {
   if (!attrs) {
-    return undefined;
+    return undefined
   }
-  const keys: string[] = Object.keys(attrs);
-  const ats: Attribute[] = [];
+  const keys: string[] = Object.keys(attrs)
+  const ats: Attribute[] = []
   for (const key of keys) {
-    const attr: Attribute = attrs[key];
+    const attr: Attribute = attrs[key]
     if (attr) {
       if (attr.key === true) {
-        const at: Attribute = {name: key, type: attr.type};
-        ats.push(at);
+        const at: Attribute = { name: key, type: attr.type }
+        ats.push(at)
       }
     }
   }
-  return ats;
+  return ats
 }

package/tsconfig.json

@@ -6,6 +6,7 @@
     "outDir": "./lib",
     "module": "commonjs",
     "moduleResolution": "node",
+    "strict": true,
     "pretty": true,
     "sourceMap": false,
     "declaration": false,

package/lib/response.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function handleError(err, res, log) {
-  if (log) {
-    log(err);
-    res.status(500).end('Internal Server Error');
-  }
-  else {
-    res.status(500).end(err);
-  }
-}
-exports.handleError = handleError;

package/src/response.ts

@@ -1,10 +0,0 @@
-import {Response} from 'express';
-
-export function handleError(err: any, res: Response, log?: (msg: string, ctx?: any) => void) {
-  if (log) {
-    log(err as any);
-    res.status(500).end('Internal Server Error');
-  } else {
-    res.status(500).end(err);
-  }
-}