@bedrockio/model 0.22.5 → 0.23.0

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.23.0
+
+- Support for Mongoose v9.
+- Other package bumps.
+
 ## 0.22.5
 
 - Remove default filename `export.csv`.

package/dist/cjs/include.js

@@ -25,7 +25,7 @@ _mongoose.default.Query.prototype.include = function include(arg) {
 function applyInclude(schema) {
   // Query Includes
 
-  schema.pre(/^find/, function (next) {
+  schema.pre(/^find/, function () {
     const filter = this.getFilter();
     if (filter.include) {
       const {
@@ -36,12 +36,10 @@ function applyInclude(schema) {
       this.populate(populate);
       delete filter.include;
     }
-    return next();
   });
-  schema.pre(/^count/, function (next) {
+  schema.pre(/^count/, function () {
     const filter = this.getFilter();
     delete filter.include;
-    return next();
   });
 
   // Static Methods

package/dist/cjs/load.js

@@ -27,8 +27,10 @@ function loadModel(definition, name) {
   try {
     const schema = (0, _schema.createSchema)(definition);
     return _mongoose.default.model(name, schema);
-  } catch (err) {
-    throw new Error(`${err.message} (loading ${name})`);
+  } catch (error) {
+    throw new Error(`${error.message} (loading ${name})`, {
+      cause: error
+    });
   }
 }
 

package/dist/cjs/soft-delete.js

@@ -69,13 +69,12 @@ function getUniqueErrorMessage(field, options) {
 function applyQueries(schema) {
   // Implementation
 
-  schema.pre(/^find|count|exists/, function (next) {
+  schema.pre(/^find|count|exists/, function () {
     const filter = this.getFilter();
     if (filter.deleted === undefined) {
       // Search non-deleted docs by default
       filter.deleted = false;
     }
-    return next();
   });
 
   // Instance Methods
@@ -303,14 +302,7 @@ function applyUniqueConstraints(schema) {
       uniquePaths
     });
   });
-  schema.pre('insertMany', async function (next, obj) {
-    // Note that in order to access the objects to be inserted
-    // we must supply the hook with at least 2 arguments, the
-    // first of which is the next hook. This typically appears
-    // as the last argument, however as we are passing an async
-    // function it appears to not stop the middleware if we
-    // don't call it directly.
-
+  schema.pre('insertMany', async function (obj) {
     await runUniqueConstraints(obj, {
       model: this,
       uniquePaths
@@ -489,25 +481,18 @@ function applyHookPatch(schema) {
 // determine the arguments to pass.
 
 function getPre(fn, check) {
-  return function (next) {
-    runHook(this, fn, check, next, arguments);
+  return function () {
+    runHook(this, fn, check, arguments);
   };
 }
 function getPost(fn, check) {
-  return function (res, next) {
-    runHook(this, fn, check, next, arguments);
+  return function () {
+    runHook(this, fn, check, arguments);
   };
 }
-function runHook(query, fn, check, next, args) {
+function runHook(query, fn, check, args) {
   if (!check || check(query)) {
-    const ret = fn.apply(query, args);
-    if (ret instanceof Promise) {
-      ret.finally(next);
-    } else {
-      next();
-    }
-  } else {
-    next();
+    return fn.apply(query, args);
   }
 }
 function getPreDelete(fn) {

package/dist/cjs/utils.js

@@ -119,7 +119,7 @@ function resolveRefPath(schema, path) {
     const rest = split.slice(i);
     let type = schema.path(base.join('.'));
     if (type instanceof SchemaTypes.Array) {
-      type = type.caster;
+      type = type.getEmbeddedSchemaType();
     }
     if (type instanceof SchemaTypes.ObjectId) {
       const {

package/dist/cjs/validation.js

@@ -465,7 +465,9 @@ function validateAccess(type, schema, allowed, options) {
           // here instead of raising a problem with the implementation.
           isAllowed = false;
         } else {
-          throw new Error(`Access validation "${error.name}" requires passing { document, authUser } to the validator.`);
+          throw new Error(`Access validation "${error.name}" requires passing { document, authUser } to the validator.`, {
+            cause: error
+          });
         }
       } else {
         throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.22.5",
+  "version": "0.23.0",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {
@@ -32,23 +32,24 @@
   },
   "peerDependencies": {
     "@bedrockio/yada": "1.x",
-    "mongoose": "8.x"
+    "mongoose": "9.x"
   },
   "devDependencies": {
-    "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.0",
-    "@babel/preset-env": "^7.26.0",
+    "@babel/cli": "^7.28.6",
+    "@babel/core": "^7.29.0",
+    "@babel/preset-env": "^7.29.0",
     "@bedrockio/eslint-plugin": "^1.3.1",
     "@bedrockio/prettier-config": "^1.1.1",
     "@bedrockio/yada": "^1.11.2",
-    "@shelf/jest-mongodb": "^5.2.2",
-    "eslint": "^9.36.0",
+    "@shelf/jest-mongodb": "^6.0.2",
+    "@swc/core": "^1.15.11",
+    "eslint": "^10.0.0",
     "jest": "^30.2.0",
     "jest-environment-node": "^30.2.0",
-    "mongodb": "^6.20.0",
-    "mongoose": "^8.19.2",
-    "prettier": "^3.6.2",
-    "typescript": "^5.9.2"
+    "mongodb": "^7.1.0",
+    "mongoose": "^9.2.0",
+    "prettier": "^3.8.1",
+    "typescript": "^5.9.3"
   },
   "prettier": "@bedrockio/prettier-config",
   "volta": {

package/src/include.js

@@ -19,7 +19,7 @@ mongoose.Query.prototype.include = function include(arg) {
 export function applyInclude(schema) {
   // Query Includes
 
-  schema.pre(/^find/, function (next) {
+  schema.pre(/^find/, function () {
     const filter = this.getFilter();
     if (filter.include) {
       const { select, populate } = getQueryParams(this, filter.include);
@@ -27,13 +27,11 @@ export function applyInclude(schema) {
       this.populate(populate);
       delete filter.include;
     }
-    return next();
   });
 
-  schema.pre(/^count/, function (next) {
+  schema.pre(/^count/, function () {
     const filter = this.getFilter();
     delete filter.include;
-    return next();
   });
 
   // Static Methods

package/src/load.js

@@ -21,8 +21,10 @@ export function loadModel(definition, name) {
   try {
     const schema = createSchema(definition);
     return mongoose.model(name, schema);
-  } catch (err) {
-    throw new Error(`${err.message} (loading ${name})`);
+  } catch (error) {
+    throw new Error(`${error.message} (loading ${name})`, {
+      cause: error,
+    });
   }
 }
 

package/src/soft-delete.js

@@ -57,13 +57,12 @@ function getUniqueErrorMessage(field, options) {
 function applyQueries(schema) {
   // Implementation
 
-  schema.pre(/^find|count|exists/, function (next) {
+  schema.pre(/^find|count|exists/, function () {
     const filter = this.getFilter();
     if (filter.deleted === undefined) {
       // Search non-deleted docs by default
       filter.deleted = false;
     }
-    return next();
   });
 
   // Instance Methods
@@ -351,14 +350,7 @@ function applyUniqueConstraints(schema) {
     });
   });
 
-  schema.pre('insertMany', async function (next, obj) {
-    // Note that in order to access the objects to be inserted
-    // we must supply the hook with at least 2 arguments, the
-    // first of which is the next hook. This typically appears
-    // as the last argument, however as we are passing an async
-    // function it appears to not stop the middleware if we
-    // don't call it directly.
-
+  schema.pre('insertMany', async function (obj) {
     await runUniqueConstraints(obj, {
       model: this,
       uniquePaths,
@@ -537,27 +529,20 @@ function applyHookPatch(schema) {
 // determine the arguments to pass.
 
 function getPre(fn, check) {
-  return function (next) {
-    runHook(this, fn, check, next, arguments);
+  return function () {
+    runHook(this, fn, check, arguments);
   };
 }
 
 function getPost(fn, check) {
-  return function (res, next) {
-    runHook(this, fn, check, next, arguments);
+  return function () {
+    runHook(this, fn, check, arguments);
   };
 }
 
-function runHook(query, fn, check, next, args) {
+function runHook(query, fn, check, args) {
   if (!check || check(query)) {
-    const ret = fn.apply(query, args);
-    if (ret instanceof Promise) {
-      ret.finally(next);
-    } else {
-      next();
-    }
-  } else {
-    next();
+    return fn.apply(query, args);
   }
 }
 

package/src/utils.js

@@ -107,7 +107,7 @@ export function resolveRefPath(schema, path) {
 
     let type = schema.path(base.join('.'));
     if (type instanceof SchemaTypes.Array) {
-      type = type.caster;
+      type = type.getEmbeddedSchemaType();
     }
 
     if (type instanceof SchemaTypes.ObjectId) {

package/src/validation.js

@@ -499,6 +499,9 @@ function validateAccess(type, schema, allowed, options) {
         } else {
           throw new Error(
             `Access validation "${error.name}" requires passing { document, authUser } to the validator.`,
+            {
+              cause: error,
+            },
           );
         }
       } else {

package/types/generated/include.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"include.d.ts","sourceRoot":"","sources":["../../src/include.js"],"names":[],"mappings":"AAkBA,gDAuEC;AAMD,uDA4BC;AAGD,yDAIC;AAaD,yEAUC"}
+{"version":3,"file":"include.d.ts","sourceRoot":"","sources":["../../src/include.js"],"names":[],"mappings":"AAkBA,gDAqEC;AAMD,uDA4BC;AAGD,yDAIC;AAaD,yEAUC"}

package/types/generated/load.d.ts

@@ -19,19 +19,71 @@ export function loadModelDir(dir: string): {
  * @param {string} name - The model or schema name.
  * @param {string} [dir] - The schema directory (defaults to `src/models/definitions`)
  */
-export function loadSchema(name: string, dir?: string): mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, any, any, any, any, mongoose.DefaultSchemaOptions, {
+export function loadSchema(name: string, dir?: string): mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any, any>, any, any, any, any, mongoose.DefaultSchemaOptions, {
     [x: number]: unknown;
     [x: symbol]: unknown;
     [x: string]: unknown;
-}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
+}, (mongoose.Document<unknown, any, {
     [x: number]: unknown;
     [x: symbol]: unknown;
     [x: string]: unknown;
-}>, any, mongoose.ResolveSchemaOptions<mongoose.DefaultSchemaOptions>> & mongoose.FlatRecord<{
+}, any, mongoose.DefaultSchemaOptions> & {
     [x: number]: unknown;
     [x: symbol]: unknown;
     [x: string]: unknown;
-}> & Required<{
+} & Required<{
+    _id: unknown;
+}> & {
+    __v: number;
+} & {
+    id: string;
+}) | (mongoose.Document<unknown, any, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, any, mongoose.DefaultSchemaOptions> & {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+} & Required<{
+    _id: unknown;
+}> & {
+    __v: number;
+}), {
+    [path: string]: mongoose.SchemaDefinitionProperty<undefined, any, any>;
+} | {
+    [x: string]: mongoose.SchemaDefinitionProperty<any, any, (mongoose.Document<unknown, any, {
+        [x: number]: unknown;
+        [x: symbol]: unknown;
+        [x: string]: unknown;
+    }, any, mongoose.DefaultSchemaOptions> & {
+        [x: number]: unknown;
+        [x: symbol]: unknown;
+        [x: string]: unknown;
+    } & Required<{
+        _id: unknown;
+    }> & {
+        __v: number;
+    } & {
+        id: string;
+    }) | (mongoose.Document<unknown, any, {
+        [x: number]: unknown;
+        [x: symbol]: unknown;
+        [x: string]: unknown;
+    }, any, mongoose.DefaultSchemaOptions> & {
+        [x: number]: unknown;
+        [x: symbol]: unknown;
+        [x: string]: unknown;
+    } & Required<{
+        _id: unknown;
+    }> & {
+        __v: number;
+    })>;
+}, {
+    [x: number]: {};
+    [x: symbol]: {};
+    [x: string]: {};
+} & Required<{
     _id: unknown;
 }> & {
     __v: number;

package/types/generated/load.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/load.js"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,sCAJW,MAAM,QACN,MAAM,OAahB;AAED;;;;;GAKG;AACH,kCAHW,MAAM,GACJ;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;CAAE,CAoBnD;AAED;;;;GAIG;AACH,iCAHW,MAAM,QACN,MAAM;;;;;;;;;;;;;;;;GAKhB;AAKD,yDAIC;qBAjEoB,UAAU"}
+{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../src/load.js"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,sCAJW,MAAM,QACN,MAAM,OAehB;AAED;;;;;GAKG;AACH,kCAHW,MAAM,GACJ;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;CAAE,CAoBnD;AAED;;;;GAIG;AACH,iCAHW,MAAM,QACN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAKhB;AAKD,yDAIC;qBAnEoB,UAAU"}

package/types/generated/utils.d.ts

@@ -1,5 +1,5 @@
 export function isEqual(a: any, b: any): boolean;
-export function isMongooseSchema(obj: any): obj is mongoose.Schema<any, any, any, any, any, any, any, any, any>;
+export function isMongooseSchema(obj: any): obj is mongoose.Schema<any, any, any, any, any, any, any, any, any, any, any>;
 export function isReferenceField(obj: any, path: any): boolean;
 export function isDateField(obj: any, path: any): boolean;
 export function isNumberField(obj: any, path: any): boolean;

package/types/generated/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.js"],"names":[],"mappings":"AAQA,iDAcC;AAED,gHAEC;AAED,+DAEC;AAED,0DAEC;AAED,4DAEC;AAED,4DAEC;AAED,2DAGC;AAOD,mDAGC;AAuBD,mDAgBC;AAKD;;;;EAoBC;AAKD,wDAEC;AAsBD,iDAYC;qBAlKoB,UAAU"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.js"],"names":[],"mappings":"AAQA,iDAcC;AAED,0HAEC;AAED,+DAEC;AAED,0DAEC;AAED,4DAEC;AAED,4DAEC;AAED,2DAGC;AAOD,mDAGC;AAuBD,mDAgBC;AAKD;;;;EAoBC;AAKD,wDAEC;AAsBD,iDAYC;qBAlKoB,UAAU"}

package/types/generated/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/validation.js"],"names":[],"mappings":"AA6DA,kDAEC;AAED,oEA4FC;AAsBD,wEAiBC;AA4UD;;;EAEC;AAED;;;EAOC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/validation.js"],"names":[],"mappings":"AA6DA,kDAEC;AAED,oEA4FC;AAsBD,wEAiBC;AA+UD;;;EAEC;AAED;;;EAOC"}