monastery 2.2.4 → 2.2.5

package/changelog.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.2.5](https://github.com/boycce/monastery/compare/2.2.4...2.2.5) (2024-04-30)
+
 ### [2.2.4](https://github.com/boycce/monastery/compare/2.2.3...2.2.4) (2024-04-30)
 
 ### [2.2.3](https://github.com/boycce/monastery/compare/2.2.2...2.2.3) (2024-04-28)

package/lib/index.js

@@ -80,16 +80,23 @@ let arrayWithSchema = function(array, schema) {
   return array
 }
 
-let models = async function(pathname, waitForIndexes, commonJs) {
+let models = async function(pathname, opts) {
   /**
    * Setup model definitions from a folder location
    * @param {string} pathname
-   * @param {boolean} waitForIndexes - Wait for indexes to be created?
-   * @param {boolean} commonJs - Use commonJs require() instead of ES6 import()
+   * @param {object} opts:
+   *   @param {boolean} opts.waitForIndexes - Wait for indexes to be created?
+   *   @param {boolean} opts.commonJs - Use commonJs require() instead of ES6 import()
    * @return {Promise(object)} - e.g. { user: , article: , .. }
    * @this Manager
    */
   let out = {}
+  opts = true
+  if (opts === true) {
+    opts = { waitForIndexes: true } // legacy support
+    console.warn('Depreciating: please use `{ waitForIndexes: true }` instead of `true` in db.models(pathname, `true`)')
+  }
+  let { waitForIndexes, commonJs } = opts || {}
   if (!pathname || typeof pathname !== 'string') {
     throw 'The path must be a valid pathname'
   }
@@ -101,7 +108,7 @@ let models = async function(pathname, waitForIndexes, commonJs) {
     let filepath = path.join(pathname, filename)
     let definition
     if (commonJs) {
-      definition = require(require('path').join(path, filename)).default
+      definition = require(filepath).default
     } else {
       // We can't use require() here since we need to be able to import both CJS and ES6 modules
       definition = ((await import(filepath))||{}).default

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A straight forward MongoDB ODM built around Monk",
   "author": "Ricky Boyce",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",