spice-js 2.5.4 → 2.5.8

package/src/loaders/index.js

@@ -2,7 +2,8 @@ import path from "path";
 import fs from "fs";
 import _ from "lodash";
 
-let ordered_modules = ["logger", "error", "database", "views", "routes"];
+let ordered_modules = ["map", "logger", "error", "database"];
+let last_modules = ["views", "routes"];
 export async function load() {
   try {
     /* console.log('loading from array')*/
@@ -10,14 +11,14 @@ export async function load() {
     let bootstrap_path = path.resolve(
       path.join(spice.module_root_path, "/bootstrap")
     );
-    
+
     let app_bootstrap_path = path.resolve(
       path.join(spice.root_path, "/bootstrap")
     );
 
     /* console.log('MODULE Bootstrap directory', bootstrap_path);
         console.log('APP Bootstrap directory', app_bootstrap_path); */
-
+    console.log("Loading Ordered Files", ordered_modules);
     for (let file of ordered_modules) {
       let mod = require(path.join(bootstrap_path, file));
       if (_.isFunction(mod)) {
@@ -33,7 +34,8 @@ export async function load() {
         console.log("Loading:", file);
         if (
           file != "index.js" &&
-          !_.includes(ordered_modules, file.split(".")[0])
+          !_.includes(ordered_modules, file.split(".")[0]) &&
+          !_.includes(last_modules, file.split(".")[0])
         ) {
           let mod = require(path.join(loadder_path, file.split(".")[0]));
           if (_.isFunction(mod)) {
@@ -42,6 +44,14 @@ export async function load() {
         }
       }
     }
+
+    for (let file of last_modules) {
+      let mod = require(path.join(bootstrap_path, file));
+      if (_.isFunction(mod)) {
+        await mod();
+      }
+      console.log("loaded", file);
+    }
   } catch (e) {
     console.log(e.stack);
   }

package/src/models/SpiceModel.js

@@ -242,7 +242,10 @@ export default class SpiceModel {
     return _.join(returnVal, "|");
   }
 
-  getValidationRules(method = "POST", { complete = false, pick = [], omit = [] } = {}) {
+  getValidationRules(
+    method = "POST",
+    { complete = false, pick = [], omit = [] } = {}
+  ) {
     let rules = {};
     let filters = {};
     let working_properties = this.props;
@@ -743,14 +746,17 @@ export default class SpiceModel {
               case "string": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  execute: async (data) =>
-                    await this.mapToObject(
+                  execute: async (data) => {
+                    return await this.mapToObject(
                       data,
-                      properties[i].map.reference,
+                      _.isString(properties[i].map.reference)
+                        ? spice.models[properties[i].map.reference]
+                        : properties[i].map.reference,
                       i,
                       properties[i].map.destination || i,
                       properties[i]
-                    ),
+                    );
+                  },
                 });
                 break;
               }
@@ -758,14 +764,25 @@ export default class SpiceModel {
               case "array": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  execute: async (data) =>
-                    await this.mapToObjectArray(
+                  execute: async (data) => {
+                    console.log(
+                      _.isString(properties[i].map.reference),
+                      _.isString(properties[i].map.reference)
+                        ? spice.models[properties[i].map.reference]
+                        : properties[i].map.reference,
+                      spice.models,
+                      properties[i].map.reference
+                    );
+                    return await this.mapToObjectArray(
                       data,
-                      properties[i].map.reference,
+                      _.isString(properties[i].map.reference)
+                        ? spice.models[properties[i].map.reference]
+                        : properties[i].map.reference,
                       i,
                       properties[i].map.destination || i,
                       properties[i]
-                    ),
+                    );
+                  },
                 });
                 break;
               }

package/src/storage/Storage.js

@@ -1,28 +1,30 @@
-var views = require('koa-views');
+var views = require("koa-views");
 const path = require("path");
-const juice = require('juice');
-import _ from 'lodash';
-
+const juice = require("juice");
+import _ from "lodash";
 
 export default class Storage {
+  constructor(args = {}) {
+    this.driver_name = args.driver_name || spice.config.storage.default_driver;
+    this.driver_options = _.merge(
+      spice.config.storage.drivers[this.driver_name],
+      args.options
+    );
+    //console.log(this.driver_name, spice.config.storage.providers)
+    this.Driver = spice.config.storage.providers[this.driver_name];
+  }
 
-    constructor(args = {}) {
-        this.driver_name = args.driver_name || spice.config.storage.default_driver;
-        this.driver_options = _.merge(spice.config.storage.drivers[this.driver_name], args.options);
-        //console.log(this.driver_name, spice.config.storage.providers)
-        this.Driver = spice.config.storage.providers[this.driver_name];
-    }
-
-
-    async save({files, path,
-        options,
-    }) {
-        if (options) {
-            this.driver_options = _.merge(this.driver_options, options);
-        }
-        //console.log(this.Driver);
-        let driver = new this.Driver(this.driver_options);
-
-        return await driver.save({files, path});
+  async save({ files, path, options }) {
+    if (options) {
+      this.driver_options = _.merge(this.driver_options, options);
     }
-}
+    //console.log(this.Driver);
+    let driver = new this.Driver(this.driver_options);
+    return await driver.save({
+      files,
+      path: this.driver_options.base_path
+        ? `${this.driver_options.base_path}/${path}`
+        : path,
+    });
+  }
+}