@bedrockio/model 0.11.1 → 0.11.3

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.11.3
+
+- Added warning when id field not passed for unique check.
+
+## 0.11.2
+
+- Fixed issue with non-async hooks hanging.
+- Further verson bumps.
+
 ## 0.11.1
 
 - Changed default sort field in search to `_id`.

package/dist/cjs/soft-delete.js

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.applySoftDelete = applySoftDelete;
 exports.assertUnique = assertUnique;
 var _lodash = require("lodash");
+var _warn = _interopRequireDefault(require("./warn"));
 var _query = require("./query");
 var _errors = require("./errors");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function applySoftDelete(schema) {
   applyQueries(schema);
   applyUniqueConstraints(schema);
@@ -32,7 +34,7 @@ async function assertUnique(options) {
   };
   const exists = await model.exists(query);
   if (exists) {
-    const message = getUniqueErrorMessage(model, field);
+    const message = getUniqueErrorMessage(field, options);
     throw new _errors.UniqueConstraintError(message, {
       model,
       field,
@@ -40,7 +42,11 @@ async function assertUnique(options) {
     });
   }
 }
-function getUniqueErrorMessage(model, field) {
+function getUniqueErrorMessage(field, options) {
+  const {
+    id,
+    model
+  } = options;
   const {
     modelName
   } = model;
@@ -48,6 +54,9 @@ function getUniqueErrorMessage(model, field) {
     const name = field === 'phone' ? 'phone number' : field;
     return `A user with that ${name} already exists.`;
   } else {
+    if (!id) {
+      (0, _warn.default)('Note "id" field was not passed to exclude self for unique check.');
+    }
     return `"${field}" already exists.`;
   }
 }
@@ -485,6 +494,8 @@ function runHook(query, fn, check, next, args) {
     const ret = fn.apply(query, args);
     if (ret instanceof Promise) {
       ret.finally(next);
+    } else {
+      next();
     }
   } else {
     next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.11.1",
+  "version": "0.11.3",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -31,7 +31,7 @@
   },
   "peerDependencies": {
     "@bedrockio/yada": "^1.4.1",
-    "mongoose": "^8.13.0"
+    "mongoose": "^8.13.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.26.4",
@@ -40,18 +40,18 @@
     "@bedrockio/eslint-plugin": "^1.1.7",
     "@bedrockio/prettier-config": "^1.0.2",
     "@bedrockio/yada": "^1.4.1",
-    "@shelf/jest-mongodb": "^4.3.2",
+    "@shelf/jest-mongodb": "^5.1.0",
     "eslint": "^9.19.0",
     "jest": "^29.7.0",
     "jest-environment-node": "^29.7.0",
-    "mongodb": "^6.12.0",
-    "mongoose": "^8.13.0",
+    "mongodb": "^6.15.0",
+    "mongoose": "^8.13.1",
     "prettier": "^3.4.2",
     "typescript": "^5.7.2"
   },
   "prettier": "@bedrockio/prettier-config",
   "volta": {
-    "node": "23.7.0",
+    "node": "22.14.0",
     "yarn": "1.22.22"
   }
 }

package/src/soft-delete.js

@@ -1,5 +1,7 @@
 import { isEqual } from 'lodash';
 
+import warn from './warn';
+
 import { wrapQuery } from './query';
 import { UniqueConstraintError } from './errors';
 
@@ -24,8 +26,9 @@ export async function assertUnique(options) {
   };
 
   const exists = await model.exists(query);
+
   if (exists) {
-    const message = getUniqueErrorMessage(model, field);
+    const message = getUniqueErrorMessage(field, options);
     throw new UniqueConstraintError(message, {
       model,
       field,
@@ -34,12 +37,16 @@ export async function assertUnique(options) {
   }
 }
 
-function getUniqueErrorMessage(model, field) {
+function getUniqueErrorMessage(field, options) {
+  const { id, model } = options;
   const { modelName } = model;
   if (modelName === 'User' && !field.includes('.')) {
     const name = field === 'phone' ? 'phone number' : field;
     return `A user with that ${name} already exists.`;
   } else {
+    if (!id) {
+      warn('Note "id" field was not passed to exclude self for unique check.');
+    }
     return `"${field}" already exists.`;
   }
 }
@@ -538,6 +545,8 @@ function runHook(query, fn, check, next, args) {
     const ret = fn.apply(query, args);
     if (ret instanceof Promise) {
       ret.finally(next);
+    } else {
+      next();
     }
   } else {
     next();

package/types/soft-delete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"soft-delete.d.ts","sourceRoot":"","sources":["../src/soft-delete.js"],"names":[],"mappings":"AAKA,mDAIC;AAED,0DAuBC"}
+{"version":3,"file":"soft-delete.d.ts","sourceRoot":"","sources":["../src/soft-delete.js"],"names":[],"mappings":"AAOA,mDAIC;AAED,0DAwBC"}