cosa 6.3.0 → 6.4.0

package/lib/model.js

@@ -1,4 +1,4 @@
-const joi = require('@hapi/joi');
+const joi = require('joi');
 const etag = require('etag');
 const debug = require('debug')('cosa:model');
 const objectPath = require('object-path');
@@ -7,7 +7,7 @@ const { EJSON } = require('bson');
 const Cursor = require('./cursor');
 const errors = require('./errors');
 const { ObjectId } = require('bson');
-const { pathEq, complement, pick, omit } = require('omnibelt');
+const { pathEq, complement, pick, omit, has } = require('omnibelt');
 const { buildPropertySchema } = require('./utils');
 const Immutable = require('./immutable');
 Immutable.use(require('./defined-object'));
@@ -23,6 +23,16 @@ const db = require('./db');
 // functions that are defined later on.
 let _serialize, _extend;
 
+const shouldWait = (waitType) => {
+  return (options, definition) => {
+    if (has(waitType, options)) { return options[waitType]; }
+    return definition[waitType];
+  };
+};
+
+const shouldWaitAfterSave = shouldWait('waitAfterSave');
+const shouldWaitAfterRemove = shouldWait('waitAfterRemove');
+
 const addVirtuals = (def, obj) => {
   if (def.type === 'array' && def.items && Array.isArray(obj)) {
     for (let i = 0, l = obj.length; i < l; i++) {
@@ -177,7 +187,7 @@ const _create = (data, definition) => {
       if ('function' === typeof newOrUpdatedModel.afterSaveCommit) {
         chain = chain.then(() => newOrUpdatedModel.afterSaveCommit(original, options));
       }
-      if (options.waitAfterSave) {
+      if (shouldWaitAfterSave(options, definition)) {
         await chain;
       }
     }
@@ -333,7 +343,7 @@ const _create = (data, definition) => {
       if ('function' === typeof this.afterRemoveCommit) {
         chain = chain.then(() => this.afterRemoveCommit(options));
       }
-      if (options.waitAfterRemove) {
+      if (shouldWaitAfterRemove(options, definition)) {
         await chain;
       }
     }

package/lib/utils.js

@@ -1,4 +1,4 @@
-const joi = require('@hapi/joi');
+const joi = require('joi');
 const { ObjectId } = require('bson');
 const buildPropertySchema = (name, propertyDef) => { // eslint-disable-line complexity
   let schema = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosa",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "description": "Cosa Models for MongoDB",
   "main": "lib/index.js",
   "engines": {
@@ -40,20 +40,20 @@
     "debug": "^4.3.4",
     "error": "^7.0.2",
     "etag": "^1.8.1",
-    "@hapi/joi": "^17.1.1",
-    "mongodb": "~4.10.0",
+    "joi": "^17.6.4",
+    "mongodb": "~4.11.0",
     "object-path": "^0.11.8",
     "omnibelt": "^2.1.0"
   },
   "devDependencies": {
-    "@losant/eslint-config-losant": "^1.4.4",
-    "husky": "^8.0.1",
+    "@losant/eslint-config-losant": "^1.5.0",
+    "husky": "^8.0.2",
     "lint-staged": "^13.0.3",
-    "chai": "^4.3.6",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "chai-datetime": "^1.8.0",
     "documentation": "^14.0.0",
-    "mocha": "^10.0.0",
+    "mocha": "^10.1.0",
     "string-template": "^1.0.0"
   },
   "eslintConfig": {