anote-server-libs 0.6.8 → 0.6.10

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules\\typescript\\lib"
+}

package/models/repository/ModelDao.ts

@@ -90,9 +90,9 @@ export abstract class Dao<R, T extends Model<R>> implements ModelRepr {
         return Object.getOwnPropertyNames(storage).map(k => storage[k]);
     }
 
-    update(instance: T, client: ClientBase | ConnectionPool | Transaction): Promise<R> {
+    update(instance: T, client: ClientBase | ConnectionPool | Transaction, on?: Date): Promise<R> {
         if((<any>instance).archivedOn) return Promise.reject('Record archived!');
-        instance.updatedOn = new Date();
+        instance.updatedOn = on || new Date();
         if(this.pool) {
             const props = this.serialize(instance);
             props.push(instance.id);
@@ -105,8 +105,8 @@ export abstract class Dao<R, T extends Model<R>> implements ModelRepr {
         }
     }
 
-    create(instance: T, client?: ClientBase | Transaction): Promise<R> {
-        (<any>instance).createdOn = instance.updatedOn = new Date();
+    create(instance: T, client?: ClientBase | Transaction, on?: Date): Promise<R> {
+        (<any>instance).createdOn = instance.updatedOn = on || new Date();
         if(this.pool) {
             const props = this.serialize(instance);
             return (<ClientBase | Pool>(client || this.pool)).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
@@ -126,9 +126,9 @@ export abstract class Dao<R, T extends Model<R>> implements ModelRepr {
         }
     }
 
-    createSeveral(instances: T[], client?: ClientBase): Promise<R[]> {
+    createSeveral(instances: T[], client?: ClientBase, on?: Date): Promise<R[]> {
         if(!instances.length) return Promise.resolve([]);
-        const now = new Date();
+        const now = on || new Date();
         instances.forEach(instance => instance.updatedOn = now);
         const props = [].concat.apply([], instances.map(instance => this.serialize(instance)));
         return (client || this.pool).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '').replace(/=[^)]+\)/g, '') + ')'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.6.8",
+  "version": "0.6.10",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/services/WithBody.js

@@ -10,7 +10,7 @@ exports.ajv.addKeyword({
     schemaType: 'number',
     validate: (schema, data) => typeof data === 'number' && Math.round(data * 10 ** schema) / (10 ** schema) === data
 });
-function WithBody(schema) {
+function WithBody(schema, collapseTopLevelNulls = true) {
     if (schema.type === 'object') {
         const required = [];
         const keys = Object.getOwnPropertyNames(schema.properties);
@@ -41,6 +41,12 @@ function WithBody(schema) {
                     });
                 }
                 else {
+                    if (collapseTopLevelNulls) {
+                        Object.keys(req.body).forEach(k => {
+                            if (req.body[k] === null)
+                                delete req.body[k];
+                        });
+                    }
                     const valid = validate(req.body);
                     if (valid) {
                         return previousMethod.call(this, req, res);

package/services/WithBody.ts

@@ -9,7 +9,7 @@ ajv.addKeyword({
     validate: (schema: number, data: any) => typeof data === 'number' && Math.round(data * 10 ** schema) / (10 ** schema) === data
 });
 
-export function WithBody(schema: any) {
+export function WithBody(schema: any, collapseTopLevelNulls = true) {
     if(schema.type === 'object') {
         const required: string[] = [];
         const keys = Object.getOwnPropertyNames(schema.properties);
@@ -39,6 +39,11 @@ export function WithBody(schema: any) {
                         }
                     });
                 } else {
+                    if(collapseTopLevelNulls) {
+                        Object.keys(req.body).forEach(k => {
+                            if(req.body[k] === null) delete req.body[k];
+                        });
+                    }
                     const valid = validate(req.body);
                     if(valid) {
                         return previousMethod.call(this, req, res);