Merge pull request #26 from BoolJS/develop

Recursively load database models

Author: pandres95

lib/api/loaders/database.js

@@ -1,12 +1,35 @@
 'use strict';
 
+const isFunction = obj => !!(obj && obj.constructor && obj.call && obj.apply);
+
 const { Plugins, Error } = require('booljs.api');
 
+/**
+ * @private
+ * @description Recursively fetches models
+ * @param {Object} instance - The application instance
+ * @param {Object} models - The models Object
+ * @param {Object} loader - The loader used to try loading the model
+ * @param {Object} connection - The connection (if any) used by the driver
+ * @return {Promise}
+ */
+exports.fetchModels = async function (instance, models, loader, connection) {
+    for (let model in models) {
+        if (!isFunction(models[model])) {
+            await exports.fetchModels(instance, models[model], loader, connection);
+        } else if (models[model].prototype instanceof loader.modelClass()) {
+            instance.insertComponent(model, await loader.fetchModels(
+                instance, model, models[model], connection
+            ), models);
+        }
+    }
+}
+
 /**
  * @private
  * @description Loads database from a DatabaseLoader plugin
- * @param {Object} _instance - The application instance
- * @param {Object} _loader - An existing database loader
+ * @param {Object} instance - The application instance
+ * @param {Object} drivers - An existing list of database drivers
  * @return {Promise}
  */
 module.exports = async function DatabaseLoader (instance, drivers) {
@@ -22,12 +45,6 @@ module.exports = async function DatabaseLoader (instance, drivers) {
         );
 
         let { models } = instance.getComponents();
-        for (let model in models) {
-            if (models[model].prototype instanceof loader.modelClass()) {
-                instance.insertComponent(model, await loader.fetchModels(
-                    instance, model, models[model], connection
-                ), models);
-            }
-        }
+        await exports.fetchModels(instance, models, loader, connection);
     }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "booljs",
-  "version": "0.7.15",
+  "version": "0.7.16",
   "description": "Bool MVC Framework - Bootstraping Unit",
   "main": "lib/index.js",
   "license": "GPL-3.0",