Merge pull request #59 from BoolJS/develop

Several fixes on bootstrapping process

lib/api/folder/list.js

@@ -32,12 +32,12 @@ module.exports = class FolderList {
 
     /** @ignore */
     get paths () {
-        return this.subfolders;
+        return this[Subfolders];
     }
 
     /** @ignore */
     get base () {
-        return this.base;
+        return this[BasePath];
     }
 
     /** @ignore */
@@ -49,6 +49,14 @@ module.exports = class FolderList {
         }
     }
 
+    has (key) {
+        return this[Subfolders][key] !== undefined;
+    }
+
+    set (key, location) {
+        this.loadSubfolderProperties(key, location);
+    }
+
     loadSubfolderProperties (key, location) {
         Object.defineProperty(this, key, {
             /** @ignore */

lib/api/folder/read.js

@@ -43,7 +43,7 @@ exports.readFiles = async function (instance, component, route, files) {
                 throw new Error(0, 'E_INVALIDFILENAME', 'The file name format is invalid');
             } else {
                 instance.insertComponent(filenameInfo.name,
-                    await new Reader().readCode(filenameInfo.ext, filename), component);
+                    await Reader.readCode(filenameInfo.ext, filename), component);
             }
         }
     }

lib/api/index.js

@@ -59,6 +59,11 @@ module.exports = class BoolJSBootstrapper {
      * @return {BoolJSBootstrapper} The loaded application instance
      */
     setFolder (key, folder) {
+        if (!this.folders.has(key)) {
+            this.folders.set(key, folder);
+            return this;
+        }
+
         this.folders[key] = folder;
         return this;
     }
@@ -150,7 +155,7 @@ module.exports = class BoolJSBootstrapper {
         for (var route in _.omit(this.folders.paths, 'configuration')) {
             this.instance.insertComponent(route, {});
 
-            await this.Folder.read(
+            await Folder.read(
                 this.instance,
                 this.instance.getComponents()[route],
                 this.folders[route]
@@ -245,6 +250,6 @@ module.exports = class BoolJSBootstrapper {
             return this.run();
         }
 
-        this.bootstrap();
+        return this.bootstrap();
     }
 };

lib/api/loaders/database.js

@@ -63,6 +63,8 @@ exports.fetchModel = async function (instance, loaders, { models, key }) {
             }
         };
     }
+
+    return Model;
 };
 
 /**
@@ -79,7 +81,7 @@ module.exports = async function DatabaseLoader (instance, drivers) {
     const loaders = await exports.openDatabases(instance, drivers);
 
     for (const { models, key } of modelsList) {
-        const Model = exports
+        const Model = await exports
             .fetchModel(instance, loaders, { models, key });
         instance.insertComponent(key, Model, models);
     }

lib/api/loaders/server/router.js

@@ -5,7 +5,7 @@ const { Plugins, RouteMiddleware } = require('@booljs/api');
 
 function matchPolicies (middlewareList, condition) {
     return middlewareList.filter(middleware => {
-        for (const policy of middleware.policies) {
+        for (const policy of Object.values(middleware.policies)) {
             if (condition(middleware, policy)) {
                 return true;
             }

package.json

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