bootpress 6.0.0 → 6.0.2

package/helpers/index.d.ts

@@ -7,6 +7,8 @@ type TypeMap = {
     "boolean[]": boolean[],
     "number": number,
     "number[]": number[],
+    "integer": number,
+    "integer[]": number[]
 }
 
 type ValidTypeKeys = keyof TypeMap;

package/helpers/index.js

@@ -34,9 +34,9 @@ function asBoolean(o, errorMessage = undefined, errorStatus = 400) {
         return validBooleanStrings.get(lowercased);
     } else if (typeof o === "boolean") {
         return o;
-    } else if (typeof o === "number"){
-        if(o === 1) return true;
-        if(o === 0) return false;
+    } else if (typeof o === "number") {
+        if (o === 1) return true;
+        if (o === 0) return false;
     }
     throw new HttpError(errorStatus, errorMessage);
 }
@@ -90,7 +90,7 @@ function asSchema(o, schema) {
             }
         }
         const expectedType = schemaKeyValues[i][1];
-        const errorMessage = o[key] == null ? `Value of ${key} should have been a ${expectedType} but it's null` : `Value of ${key} should have been a ${expectedType} but it's a ${typeof o[key]}`;
+        // const errorMessage = o[key] == null ? `Value of ${key} should have been a ${expectedType} but it's null` : `Value of ${key} should have been a ${expectedType} but it's a ${typeof o[key]}`;
 
         if (typeof expectedType === "object") {
             if (Array.isArray(expectedType)) {
@@ -103,20 +103,7 @@ function asSchema(o, schema) {
             }
         }
         else if (typeof expectedType === "string") {
-            if (expectedType.endsWith("[]")) {
-                const elementType = expectedType.replace("[]", "");
-                for (let j = 0; j < o[key].length; j++) {
-                    if (typeof o[key][j] !== elementType) {
-                        throw new HttpError(400, `Each element of ${key} should have been a ${elementType} but a ${typeof o[key][j]} is present (${o[key][j]})`);
-                    }
-                }
-                result[key] = o[key];
-            }
-            else if (typeof o[key] === expectedType) {
-                result[key] = o[key];
-            } else {
-                throw new HttpError(400, errorMessage);
-            }
+            result[key] = as(o[key], expectedType, key);
         }
         else {
             throw new HttpError(500, `Type of a schema key should be a primitive type or another schema`);
@@ -133,9 +120,9 @@ function schema(schema) {
 function asArrayOf(o, elementType) {
     if (Array.isArray(o)) {
         for (let i = 0; i < o.length; i++) {
-            if(elementType === "integer"){
+            if (elementType === "integer") {
                 asInteger(o[i]);
-            }else if(typeof o[i] != elementType){
+            } else if (typeof o[i] != elementType) {
                 throw new HttpError(400, `Each element in array should have been a ${elementType} but ${o[i]} is present with type ${typeof o[i]}`);
             }
         }
@@ -145,49 +132,50 @@ function asArrayOf(o, elementType) {
     }
 }
 
-function as(o, type) {
+function as(o, type, namedErrorVariable = o) {
     if (typeof type == "string") {
         if (type.endsWith("[]")) {
             // array check
             const elementType = type.replace("[]", "");
             return asArrayOf(o, elementType);
-        } else {
-            if(type.endsWith("?") && o == null){
+        } else { // non array types:
+            if (type.endsWith("?") && o == null) {
                 return null;
-            }else if(type.endsWith("?") && o != null ){
+            } else if (type.endsWith("?") && o != null) {
                 const actualType = type.replace("?", "");
                 return as(o, actualType);
             }
             // primitive check
             switch (type) {
                 case "string":
-                    return asString(o);
+                    return asString(o, `Type of ${namedErrorVariable} should have been a string but it's ${o == null ? "null" : typeof o}`);
                 case "number":
-                    return asNumber(o);
+                    return asNumber(o, `Type of ${namedErrorVariable} should have been a number but it's ${o == null ? "null" : typeof o}`);
                 case "boolean":
-                    return asBoolean(o);
+                    return asBoolean(o, `Type of ${namedErrorVariable} should have been a boolean but it's ${o == null ? "null" : typeof o}`);
                 case "integer":
-                    return asInteger(o);
+                    return asInteger(o, `Type of ${namedErrorVariable} should have been an integer but it's ${o == null ? "null" : typeof o}`);
                 default:
                     throw new HttpError(500, `Unsupported type ${type}`);
             }
         }
     } else if (typeof type == "object" && type != null) {
         if (Array.isArray(type)) {
-            if(type.length > 1){
+            if (type.length > 1) {
                 throw new HttpError(500, `You can define only one schema for types ArrayOf<Schema>`);
-            }else if (type.length < 1){
+            } else if (type.length < 1) {
                 throw new HttpError(500, `You must define a schema for types ArrayOf<Schema>`);
             }
             // array schema validation
-            if(!Array.isArray(o)){
+            if (!Array.isArray(o)) {
                 throw new HttpError(400, `Provided value should have been an array. (${JSON.stringify(o)})`)
             }
             const providedSchema = type[0];
-            for(let i = 0; i < o.length; i++){
-                asSchema(o[i], providedSchema);
+            let result = [];
+            for (let i = 0; i < o.length; i++) {
+                result.push(asSchema(o[i], providedSchema));
             }
-            return o;
+            return result;
         } else {
             // schema validation
             return asSchema(o, type);

package/index.d.ts

@@ -17,13 +17,14 @@ declare function Restify(target: any, key: string, desc: PropertyDescriptor): Pr
 
 declare function PassBody(serviceFunction: RequestHandler | RequsetHandlerWithArgs): RequestHandler
 declare function PassBodyAs(type: ValidTypeKeys | JsSchema | ArraySchema ): (serviceFunction: RequestHandler | RequsetHandlerWithArgs) => RequestHandler
-declare function PassRequest(serviceFunction: RequestHandler | RequsetHandlerWithArgs): RequestHandler
 declare function PassAllParams(serviceFunction: RequestHandler | RequsetHandlerWithArgs): RequestHandler
 declare function PassAllQueries(serviceFunction: RequestHandler | RequsetHandlerWithArgs): RequestHandler
 declare function PassAllCookies(serviceFunction: RequestHandler | RequsetHandlerWithArgs): RequestHandler
 declare function PassParams(...paramNames: string[]): (serviceFunction: RequestHandler | RequsetHandlerWithArgs) => RequestHandler
 declare function PassQueries(...queryNames: string[]): (serviceFunction: RequestHandler | RequsetHandlerWithArgs) => RequestHandler
 declare function PassCookies(...cookieNames: string[]): (serviceFunction: RequestHandler | RequsetHandlerWithArgs) => RequestHandler
+declare function PassRequest(serviceFunction: RequestHandler | RequsetHandlerWithArgs): RequestHandler
+declare function PassResponse(serviceFunction: RequestHandler | RequsetHandlerWithArgs): RequestHandler
 
 export {
     RestService,
@@ -37,5 +38,6 @@ export {
     PassAllCookies,
     PassBody,
     PassBodyAs,
-    PassRequest
+    PassRequest,
+    PassResponse
 }

package/index.js

@@ -8,6 +8,14 @@ const protectedProperties = [
     "toLocaleString"
 ]
 
+function reply(res, status, data) {
+    if (typeof data == "object") {
+        res.status(status).json(data);
+    } else {
+        res.status(status).send(data);
+    }
+}
+
 function RestService(service) {
     if (typeof service == "function") {
         try {
@@ -36,9 +44,9 @@ function RestService(service) {
                                 } else if (result === null) {
                                     throw new HttpError(200, "Your method is executed but it returned null. At least a value is expected to be returned.");
                                 }
-                                res.status(result.status || 200).json(result.data || result);
+                                reply(res, result.status || 200, result.data || result)
                             } catch (e) {
-                                res.status(e.status || 500).send(e.message || e);
+                                reply(res, e.status || 500, e.message || e);
                             }
                         }),
                     configurable: keyvalue[1].configurable,
@@ -58,10 +66,10 @@ function RestMethod(callback) {
     return (req, res) => {
         try {
             const result = callback();
-            res.status(result.status || 200).json(result.data || result);
+            reply(res, result.status || 200, result.data || result);
             return result;
         } catch (e) {
-            res.status(e.status || 500).json(e.message || e);
+            reply(res, e.status || 500, e.message || e)
         }
     }
 }
@@ -74,10 +82,10 @@ function Restify(target, key, desc) {
             return (req, res) => {
                 try {
                     const result = oldFunc(...args);
-                    res.status(result.status || 200).json(result.data || result);
+                    reply(res, result.status || 200, result.data || result);
                     return result;
                 } catch (e) {
-                    res.status(e.status || 500).json(e.message || e);
+                    reply(res, e.status || 500, e.message || e);
                 }
             }
         }).bind(target)
@@ -163,9 +171,20 @@ function PassBodyAs(type) {
         return (...args) => {
             if (isRequstHandlerArgs(args)) {
                 const req = args.at(-3); const res = args.at(-2);
-                return actualHandler(as(req.body, type))(req, res);
+                try {
+                    return actualHandler(as(req.body, type))(req, res);
+                } catch (e) {
+                    reply(res, e.status || 500, e.message || e);
+                }
+
             } else {
-                return (req, res) => actualHandler(...args, as(req.body, type))(req, res);
+                return (req, res) => {
+                    try{
+                        return actualHandler(...args, as(req.body, type))(req, res);
+                    }catch(e){
+                        reply(res, e.status || 500, e.message || e)
+                    }
+                }
             }
         }
     }
@@ -182,6 +201,17 @@ function PassRequest(actualHandler) {
     }
 }
 
+function PassResponse(actualHandler) {
+    return (...args) => {
+        if (isRequstHandlerArgs(args)) {
+            const req = args.at(-3); const res = args.at(-2);
+            return actualHandler(res)(req, res);
+        } else {
+            return (req, res) => actualHandler(...args, res)(req, res)
+        }
+    }
+}
+
 function PassAllCookies(actualHandler) {
     return (...args) => {
         if (isRequstHandlerArgs(args)) {
@@ -219,5 +249,6 @@ module.exports = {
     PassCookies,
     PassBody,
     PassBodyAs,
-    PassRequest
+    PassRequest,
+    PassResponse
 }

package/package.json

@@ -1,33 +1,33 @@
-{
-  "name": "bootpress",
-  "version": "6.0.0",
-  "description": "REST service methods for express",
-  "main": "index.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ufukbakan/bootpress.git"
-  },
-  "keywords": [
-    "bootpress",
-    "express",
-    "rest",
-    "service",
-    "methods",
-    "spring",
-    "boot",
-    "like"
-  ],
-  "author": "Ufuk Bakan",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/ufukbakan/bootpress/issues"
-  },
-  "homepage": "https://github.com/ufukbakan/bootpress#readme",
-  "dependencies": {
-    "express": "^4.18.2"
-  },
-  "devDependencies": {
-    "@types/express": "^4.17.17",
-    "typescript": "^4.9.5"
-  }
-}
+{
+  "name": "bootpress",
+  "version": "6.0.2",
+  "description": "REST service methods for express",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ufukbakan/bootpress.git"
+  },
+  "keywords": [
+    "bootpress",
+    "express",
+    "rest",
+    "service",
+    "methods",
+    "spring",
+    "boot",
+    "like"
+  ],
+  "author": "Ufuk Bakan",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/ufukbakan/bootpress/issues"
+  },
+  "homepage": "https://github.com/ufukbakan/bootpress#readme",
+  "dependencies": {
+    "express": "^4.18.2"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.17",
+    "typescript": "^4.9.5"
+  }
+}