monastery 1.42.2 → 1.42.4

package/changelog.md

@@ -2,6 +2,10 @@
 
 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.
 
+### [1.42.4](https://github.com/boycce/monastery/compare/1.42.3...1.42.4) (2024-04-30)
+
+### [1.42.3](https://github.com/boycce/monastery/compare/1.42.2...1.42.3) (2024-04-30)
+
 ### [1.42.2](https://github.com/boycce/monastery/compare/1.42.1...1.42.2) (2023-10-31)
 
 ### [1.42.1](https://github.com/boycce/monastery/compare/1.42.0...1.42.1) (2023-10-09)

package/lib/index.js

@@ -80,14 +80,23 @@ let arrayWithSchema = function(array, schema) {
   return array
 }
 
-let models = async function(pathname, waitForIndexes) {
+let models = async function(pathname, opts) {
   /**
    * Setup model definitions from a folder location
    * @param {string} pathname
+   * @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'
   }
@@ -97,12 +106,17 @@ let models = async function(pathname, waitForIndexes) {
     if (!filename.match(/\.[cm]?js$/)) continue
     let name = filename.replace('.js', '')
     let filepath = path.join(pathname, filename)
-    // We can't use require() here since we need to be able to import both CJS and ES6 modules
-    let definition = ((await import(filepath))||{}).default
-    // When a commonJS project uses babel (e.g. `nodemon -r @babel/register`, similar to `-r esm`), import() 
-    // will return ES6 model definitions in another nested `default` object
-    if (definition && definition.default) definition = definition.default
-    if (!definition) throw new Error(`The model definition for '${name}' must export a default object`)
+    let definition
+    if (commonJs) {
+      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
+      // When a commonJS project uses babel (e.g. `nodemon -r @babel/register`, similar to `-r esm`), import() 
+      // will return ES6 model definitions in another nested `default` object
+      if (definition && definition.default) definition = definition.default
+      if (!definition) throw new Error(`The model definition for '${name}' must export a default object`)
+    }
     // Wait for indexes to be created?
     if (waitForIndexes) out[name] = await this.model(name, { ...definition, waitForIndexes })
     else out[name] = this.model(name, definition)

package/package.json

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