anote-server-libs 0.4.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -16,6 +16,9 @@
   "author": "Mathonet Gregoire",
   "license": "MIT",
   "dependencies": {
+    "@types/memcached": "2.2.7",
+    "@types/mssql": "8.1.2",
+    "@types/pg": "8.6.6",
     "ajv": "8.12.0",
     "memcached": "2.2.2",
     "mssql": "9.1.1",
@@ -27,10 +30,7 @@
   },
   "devDependencies": {
     "@types/express": "4.17.16",
-    "@types/memcached": "2.2.7",
-    "@types/mssql": "8.1.2",
     "@types/node": "14.18.2",
-    "@types/pg": "8.6.6",
     "typescript": "4.9.4"
   }
 }

package/services/WithBody.js

@@ -2,19 +2,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WithBody = void 0;
 const ajv_1 = require("ajv");
+const ajv = new ajv_1.default();
+ajv.addKeyword({
+    keyword: 'maxDigits',
+    type: 'number',
+    schemaType: 'integer',
+    code(cxt) {
+        const { data, schema } = cxt;
+        const op = (0, ajv_1._) `!==`;
+        const roundedData = Math.round(data * 10 ** schema) / (10 ** schema);
+        cxt.fail((0, ajv_1._) `${roundedData} ${op} ${data}`);
+    }
+});
 function WithBody(schema) {
-    const ajv = new ajv_1.default();
-    ajv.addKeyword({
-        keyword: 'maxDigits',
-        type: 'number',
-        schemaType: 'integer',
-        code(cxt) {
-            const { data, schema } = cxt;
-            const op = (0, ajv_1._) `!==`;
-            const roundedData = Math.round(data * 10 ** schema) / (10 ** schema);
-            cxt.fail((0, ajv_1._) `${roundedData} ${op} ${data}`);
-        }
-    });
+    if (schema.type === 'object') {
+        const required = [];
+        const keys = Object.getOwnPropertyNames(schema.properties);
+        keys.forEach(key => {
+            if (schema.properties[key].required === true) {
+                required.push(key);
+            }
+            if (schema.properties[key].required === true || schema.properties[key].required === false) {
+                delete schema.properties[key].required;
+            }
+        });
+        schema.required = required;
+    }
     let validate = ajv.compile(schema);
     return function (_, __, descriptor) {
         if (typeof descriptor.value === 'function') {

package/services/WithBody.ts

@@ -1,21 +1,34 @@
 import {Request, Response} from 'express';
 import Ajv, {_} from 'ajv';
 
+const ajv = new Ajv();
+ajv.addKeyword({
+    keyword: 'maxDigits',
+    type: 'number',
+    schemaType: 'integer',
+    code(cxt: any) {
+        const {data, schema} = cxt;
+        const op = _`!==`;
+        const roundedData = Math.round(data * 10 ** schema) / (10 ** schema);
+        cxt.fail(_`${roundedData} ${op} ${data}`);
+    }
+});
+
 export function WithBody(schema: any) {
-    const ajv = new Ajv();
-    ajv.addKeyword({
-        keyword: 'maxDigits',
-        type: 'number',
-        schemaType: 'integer',
-        code(cxt: any) {
-            const {data, schema} = cxt;
-            const op = _`!==`;
-            const roundedData = Math.round(data * 10 ** schema) / (10 ** schema);
-            cxt.fail(_`${roundedData} ${op} ${data}`);
-        }
-    });
+    if(schema.type === 'object') {
+        const required: string[] = [];
+        const keys = Object.getOwnPropertyNames(schema.properties);
+        keys.forEach(key => {
+            if(schema.properties[key].required === true) {
+                required.push(key);
+            }
+            if(schema.properties[key].required === true || schema.properties[key].required === false) {
+                delete schema.properties[key].required;
+            }
+        });
+        schema.required = required;
+    }
     let validate = ajv.compile(schema);
-
     return function(_: any, __: string, descriptor: PropertyDescriptor) {
         if(typeof descriptor.value === 'function') {
             const previousMethod = descriptor.value;