monastery 2.2.3 → 2.2.4

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.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)
 
 ### [2.2.2](https://github.com/boycce/monastery/compare/2.2.1...2.2.2) (2024-04-07)

package/lib/index.js

@@ -80,10 +80,12 @@ let arrayWithSchema = function(array, schema) {
   return array
 }
 
-let models = async function(pathname, waitForIndexes) {
+let models = async function(pathname, waitForIndexes, commonJs) {
   /**
    * 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()
    * @return {Promise(object)} - e.g. { user: , article: , .. }
    * @this Manager
    */
@@ -97,12 +99,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(require('path').join(path, filename)).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": "2.2.3",
+  "version": "2.2.4",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",