spice-js 2.5.6 → 2.5.10

package/build/bootstrap/database.js

@@ -19,7 +19,7 @@ function _connect() {
         var value = spice.config.database.connections[key];
 
         if (value.enabled) {
-          var Database = require("spice-".concat(value.type));
+          var Database = require("spice-" + value.type);
 
           var connection = new Database();
           var result = yield connection.connect(key, value);

package/build/bootstrap/map.js

@@ -13,8 +13,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 try {
-  var resources = ["models", "controllers"];
-  console.log(":::::::::::::STARTING MAP:::::::::::::");
+  var resources = ["models", "controllers", "schemas"];
   resources.every(resource => {
     var paths = _path.default.join(spice.root_path, resource);
 
@@ -24,8 +23,7 @@ try {
     /*#__PURE__*/
     function () {
       var _ref = _asyncToGenerator(function* (file) {
-        console.log("Loading:", file);
-        spice[resource][file.split(".")[0]] = (yield Promise.resolve("".concat(_path.default.join(paths, file))).then(s => _interopRequireWildcard(require(s)))).default;
+        spice[resource][file.split(".")[0]] = (yield Promise.resolve("" + _path.default.join(paths, file)).then(s => _interopRequireWildcard(require(s)))).default;
       });
 
       return function (_x) {

package/build/bootstrap/tasks.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = addTask;
 
 var _path = _interopRequireDefault(require("path"));
@@ -74,13 +72,16 @@ _asyncToGenerator(function* () {
   }
 });
 
-function addTask(_x4) {
+function addTask(_x4, _x5) {
   return _addTask.apply(this, arguments);
 }
 
 function _addTask() {
-  _addTask = _asyncToGenerator(function* (task) {
-    var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  _addTask = _asyncToGenerator(function* (task, params) {
+    if (params === void 0) {
+      params = null;
+    }
+
     agenda.define(task.name, task.handle);
     var parameters = params != null ? params : task.params;
     var returned_function = yield getExecuteFunction(task, parameters);
@@ -97,7 +98,7 @@ function _addTask() {
   return _addTask.apply(this, arguments);
 }
 
-function getExecuteFunction(_x5, _x6) {
+function getExecuteFunction(_x6, _x7) {
   return _getExecuteFunction.apply(this, arguments);
 }
 

package/build/docs/generator.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = generateSpec;
 
 var _path2 = _interopRequireDefault(require("path"));
@@ -23,11 +21,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 //let paths = path.join(spice.root_path, "routes");
 var tags = [];
@@ -45,7 +39,7 @@ function getPackageInfo() {
 function createPath(path) {
   return _lodash.default.join(_lodash.default.map(_lodash.default.split(path, "/"), seg => {
     if (_lodash.default.startsWith(seg, ":")) {
-      return "{".concat(_lodash.default.trim(seg, ":"), "}");
+      return "{" + _lodash.default.trim(seg, ":") + "}";
     }
 
     return seg;
@@ -142,20 +136,20 @@ function getRoutes(models) {
             if (doc_return.length > 0) {
               if (doc_return[0].type == undefined) {
                 _path.responses["200"]["schema"] = {
-                  $ref: "#/definitions/".concat(doc_return[0].description)
+                  $ref: "#/definitions/" + doc_return[0].description
                 };
               } else if (doc_return[0].type.name == "array") {
                 _path.responses["200"]["schema"] = {
                   type: doc_return[0].type.name,
                   items: {
-                    $ref: "#/definitions/".concat(doc_return[0].description)
+                    $ref: "#/definitions/" + doc_return[0].description
                   }
                 };
               } else if (doc_return[0].type.name == "object") {
                 _path.responses["200"]["schema"] = {
                   type: doc_return[0].type.name,
                   additionalProperties: {
-                    $ref: "#/definitions/".concat(doc_return[0].description)
+                    $ref: "#/definitions/" + doc_return[0].description
                   }
                 };
               }
@@ -189,7 +183,7 @@ function preparParameters(comment, defaultModel, models) {
 
       if (tag.description != undefined && IsJsonString(tag.description)) {
         var parsed_JSON = JSON.parse(tag.description);
-        param = _objectSpread(_objectSpread({}, param), parsed_JSON);
+        param = _extends({}, param, parsed_JSON);
       }
 
       if (tag.name == "" && tag.type != undefined) {
@@ -325,7 +319,7 @@ function getProperties(obj) {
     if (map != undefined && map.type == "model") {
       if (map.reference != undefined) {
         var references = _lodash.default.isArray(map.reference) ? map.reference : [map.reference];
-        var reference = "#/definitions/".concat(_lodash.default.isString(map.reference) ? map.reference : references[0].name);
+        var reference = "#/definitions/" + (_lodash.default.isString(map.reference) ? map.reference : references[0].name);
 
         if (to_return.type == "array") {
           to_return.items.$ref = reference;
@@ -433,7 +427,7 @@ function _generateSpec() {
       security: [{
         Bearer: []
       }],
-      host: "".concat(spice.config.spice.host, ":").concat(spice.config.spice.port),
+      host: spice.config.spice.host + ":" + spice.config.spice.port,
       port: 80,
       basePath: "/",
       tags: generateTags(),

package/build/events/Event.js

@@ -3,9 +3,7 @@
  */
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 var Date = require("sonover-date");
@@ -18,10 +16,10 @@ class Event {
     this.topic = args.topic;
   }
 
-  dispatch() {
+  dispatch(_temp) {
     var {
       driver
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    } = _temp === void 0 ? {} : _temp;
 
     if (driver) {
       this.driver = driver;

package/build/events/providers/EventDebugger.js

@@ -1,17 +1,15 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 class EventDebugger {
-  dispatch() {
+  dispatch(_temp) {
     var {
       topic,
       data
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    console.log(data, "dispatched on ", "\"".concat(topic, "\""));
+    } = _temp === void 0 ? {} : _temp;
+    console.log(data, "dispatched on ", "\"" + topic + "\"");
   }
 
   on(topic, callback) {}

package/build/events/providers/SocketEventDriver.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 //import io from "socket.io-client";

package/build/events/providers/SpiceEventDriver.js

@@ -1,16 +1,14 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 class SpiceEventDriver {
-  dispatch() {
+  dispatch(_temp) {
     var {
       topic,
       data
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    } = _temp === void 0 ? {} : _temp;
     spice.EventEmitter.emit(topic, data);
   }
 

package/build/index.js

@@ -1,150 +1,78 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "Event", {
-  enumerable: true,
-  get: function get() {
-    return _Event.default;
-  }
-});
-Object.defineProperty(exports, "EventDebugger", {
-  enumerable: true,
-  get: function get() {
-    return _EventDebugger.default;
-  }
-});
-Object.defineProperty(exports, "SpiceEventDriver", {
-  enumerable: true,
-  get: function get() {
-    return _SpiceEventDriver.default;
-  }
-});
-Object.defineProperty(exports, "SocketEventDriver", {
-  enumerable: true,
-  get: function get() {
-    return _SocketEventDriver.default;
-  }
-});
-Object.defineProperty(exports, "SpiceModel", {
-  enumerable: true,
-  get: function get() {
-    return _SpiceModel.default;
-  }
-});
-Object.defineProperty(exports, "Crypt", {
-  enumerable: true,
-  get: function get() {
-    return _Crypt.default;
-  }
-});
-Object.defineProperty(exports, "Serializer", {
-  enumerable: true,
-  get: function get() {
-    return _Serializer.default;
-  }
-});
-Object.defineProperty(exports, "RestHelper", {
-  enumerable: true,
-  get: function get() {
-    return _RestHelper.default;
-  }
-});
-Object.defineProperty(exports, "Mail", {
-  enumerable: true,
-  get: function get() {
-    return _Mail.default;
-  }
-});
-Object.defineProperty(exports, "DataType", {
-  enumerable: true,
-  get: function get() {
-    return _DataType.default;
-  }
-});
-Object.defineProperty(exports, "MailDebug", {
-  enumerable: true,
-  get: function get() {
-    return _Debug.default;
-  }
-});
-Object.defineProperty(exports, "DebugStorage", {
-  enumerable: true,
-  get: function get() {
-    return _Debug2.default;
-  }
-});
-Object.defineProperty(exports, "LocalStorage", {
-  enumerable: true,
-  get: function get() {
-    return _Local.default;
-  }
-});
-Object.defineProperty(exports, "Storage", {
-  enumerable: true,
-  get: function get() {
-    return _Storage.default;
-  }
-});
-Object.defineProperty(exports, "MailFile", {
-  enumerable: true,
-  get: function get() {
-    return _File.default;
-  }
-});
-Object.defineProperty(exports, "MapType", {
-  enumerable: true,
-  get: function get() {
-    return _MapType.default;
-  }
-});
-Object.defineProperty(exports, "addTask", {
-  enumerable: true,
-  get: function get() {
-    return _tasks.default;
-  }
-});
-exports.default = exports.status = void 0;
-
-var _koaSocket = _interopRequireDefault(require("koa-socket-2"));
+exports.__esModule = true;
+exports.default = exports.status = exports.addTask = exports.MapType = exports.MailFile = exports.Storage = exports.LocalStorage = exports.DebugStorage = exports.MailDebug = exports.DataType = exports.Mail = exports.RestHelper = exports.Serializer = exports.Crypt = exports.SpiceModel = exports.SocketEventDriver = exports.SpiceEventDriver = exports.EventDebugger = exports.Event = void 0;
 
 var _Event = _interopRequireDefault(require("./events/Event"));
 
+exports.Event = _Event.default;
+
 var _EventDebugger = _interopRequireDefault(require("./events/providers/EventDebugger"));
 
+exports.EventDebugger = _EventDebugger.default;
+
 var _SpiceEventDriver = _interopRequireDefault(require("./events/providers/SpiceEventDriver"));
 
+exports.SpiceEventDriver = _SpiceEventDriver.default;
+
 var _SocketEventDriver = _interopRequireDefault(require("./events/providers/SocketEventDriver"));
 
+exports.SocketEventDriver = _SocketEventDriver.default;
+
 var _SpiceModel = _interopRequireDefault(require("./models/SpiceModel"));
 
+exports.SpiceModel = _SpiceModel.default;
+
 var _Crypt = _interopRequireDefault(require("./utility/Crypt"));
 
+exports.Crypt = _Crypt.default;
+
 var _Serializer = _interopRequireDefault(require("./utility/Serializer"));
 
+exports.Serializer = _Serializer.default;
+
 var _RestHelper = _interopRequireDefault(require("./utility/RestHelper"));
 
+exports.RestHelper = _RestHelper.default;
+
 var _Status = _interopRequireDefault(require("./utility/Status"));
 
 var _Mail = _interopRequireDefault(require("./mail/Mail"));
 
+exports.Mail = _Mail.default;
+
 var _DataType = _interopRequireDefault(require("./utility/DataType"));
 
+exports.DataType = _DataType.default;
+
 var _Debug = _interopRequireDefault(require("./mail/providers/Debug"));
 
+exports.MailDebug = _Debug.default;
+
 var _Debug2 = _interopRequireDefault(require("./storage/providers/Debug"));
 
+exports.DebugStorage = _Debug2.default;
+
 var _Local = _interopRequireDefault(require("./storage/providers/Local"));
 
+exports.LocalStorage = _Local.default;
+
 var _Storage = _interopRequireDefault(require("./storage/Storage"));
 
+exports.Storage = _Storage.default;
+
 var _File = _interopRequireDefault(require("./mail/providers/File"));
 
+exports.MailFile = _File.default;
+
 var _MapType = _interopRequireDefault(require("./utility/MapType"));
 
+exports.MapType = _MapType.default;
+
 var _tasks = _interopRequireDefault(require("./bootstrap/tasks"));
 
+exports.addTask = _tasks.default;
+
 var _generator = _interopRequireDefault(require("./docs/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -153,7 +81,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var path = require("path");
+var path = require("path"); //import IO from "koa-socket-2";
+
 
 var cors = require("kcors");
 
@@ -193,7 +122,7 @@ class Spice {
   init(app) {
     return _asyncToGenerator(function* () {
       try {
-        var io = new _koaSocket.default();
+        //const io = new IO();
         app.use(cors());
 
         require("koa-qs")(app, "extended");
@@ -207,16 +136,16 @@ class Spice {
         }));
         app.use(convert(Validate()));
         spice.app = app;
-        spice.config = yield require("./loaders/config")();
-        io.attach(app);
-        spice.io = io;
-        io.on("message", (ctx, data) => {
+        spice.config = yield require("./loaders/config")(); //io.attach(app);
+        //spice.io = io; */
+
+        /* io.on("message", (ctx, data) => {
           console.log("client sent data to message endpoint", data);
-        });
+        }); */
 
-        app._io.on("connection", sock => {
+        /* app._io.on("connection", (sock) => {
           console.log("Connection Up", sock);
-        });
+        }); */
 
         app.use(koaSwagger({
           hideTopbar: true,

package/build/loaders/index.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.load = load;
 
 var _path = _interopRequireDefault(require("path"));
@@ -17,7 +15,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var ordered_modules = ["map", "logger", "error", "database", "views", "routes"];
+var ordered_modules = ["map", "logger", "error", "database"];
+var last_modules = ["views", "routes"];
 
 function load() {
   return _load.apply(this, arguments);
@@ -53,7 +52,7 @@ function _load() {
         for (var _file of _fs.default.readdirSync(loadder_path)) {
           console.log("Loading:", _file);
 
-          if (_file != "index.js" && !_lodash.default.includes(ordered_modules, _file.split(".")[0])) {
+          if (_file != "index.js" && !_lodash.default.includes(ordered_modules, _file.split(".")[0]) && !_lodash.default.includes(last_modules, _file.split(".")[0])) {
             var _mod = require(_path.default.join(loadder_path, _file.split(".")[0]));
 
             if (_lodash.default.isFunction(_mod)) {
@@ -62,6 +61,16 @@ function _load() {
           }
         }
       }
+
+      for (var _file2 of last_modules) {
+        var _mod2 = require(_path.default.join(bootstrap_path, _file2));
+
+        if (_lodash.default.isFunction(_mod2)) {
+          yield _mod2();
+        }
+
+        console.log("loaded", _file2);
+      }
     } catch (e) {
       console.log(e.stack);
     }

package/build/mail/Mail.js

@@ -1,19 +1,13 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
@@ -26,8 +20,11 @@ var path = require("path");
 var juice = require("juice");
 
 class Mail {
-  constructor() {
-    var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  constructor(args) {
+    if (args === void 0) {
+      args = {};
+    }
+
     this.nunjucksOptions = {
       map: {
         html: "nunjucks"
@@ -91,7 +88,7 @@ class Mail {
       var sendable_text = "";
 
       if (_this2.template) {
-        sendable_text = yield _this2.prepare(_objectSpread(_objectSpread({}, data), _this2));
+        sendable_text = yield _this2.prepare(_extends({}, data, _this2));
       }
 
       if (content) {

package/build/mail/providers/Debug.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -10,19 +8,24 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 class Mail {
-  constructor() {
-    var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  constructor(args) {
+    if (args === void 0) {
+      args = {};
+    }
+
     this.sender = args.sender;
     this.subject = args.subject;
     this.htmlText = args.htmlText;
   }
 
-  send(htmlText) {
-    var _arguments = arguments,
-        _this = this;
+  send(htmlText, options) {
+    var _this = this;
 
     return _asyncToGenerator(function* () {
-      var options = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : {};
+      if (options === void 0) {
+        options = {};
+      }
+
       var email = {
         to: options.to,
         from: options.sender || _this.sender,

package/build/mail/providers/File.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -16,8 +14,11 @@ var path = require('path');
 var open = require("open");
 
 class File {
-  constructor() {
-    var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  constructor(args) {
+    if (args === void 0) {
+      args = {};
+    }
+
     this.sender = args.sender;
     this.subject = args.subject;
     this.htmlText = args.htmlText;
@@ -28,12 +29,14 @@ class File {
     }
   }
 
-  send(htmlText) {
-    var _arguments = arguments,
-        _this = this;
+  send(htmlText, options) {
+    var _this = this;
 
     return _asyncToGenerator(function* () {
-      var options = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : {};
+      if (options === void 0) {
+        options = {};
+      }
+
       var email = {
         to: options.to,
         from: options.sender || _this.sender,
@@ -41,8 +44,8 @@ class File {
         htmlText: htmlText || _this.htmlText
       };
       var time = new Date().getTime();
-      fs.ensureDirSync("".concat(_this.dest, "/").concat(email.subject, "/").concat(time));
-      var full_path = "".concat(_this.dest, "/").concat(email.subject, "/").concat(time, "/to:").concat(email.to, " from:").concat(email.from, ".html");
+      fs.ensureDirSync(_this.dest + "/" + email.subject + "/" + time);
+      var full_path = _this.dest + "/" + email.subject + "/" + time + "/to:" + email.to + " from:" + email.from + ".html";
       fs.writeFileSync(full_path, email.htmlText);
       open(full_path);
     })();

package/build/models/SpiceModel.js

@@ -1,17 +1,11 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 var _2 = require("..");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
@@ -42,13 +36,15 @@ if (!Promise.allSettled) {
 }
 
 class SpiceModel {
-  constructor() {
-    var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  constructor(args) {
+    if (args === void 0) {
+      args = {};
+    }
 
     try {
       var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
 
-      var Database = require("spice-".concat(dbtype));
+      var Database = require("spice-" + dbtype);
 
       this.type = "";
       this[_hooks] = {
@@ -214,11 +210,11 @@ class SpiceModel {
         }
 
         if (i == "requires") {
-          returnVal.push("shouldExist:".concat(props[i]));
+          returnVal.push("shouldExist:" + props[i]);
         }
 
         if (i == "unique") {
-          returnVal.push("unique:".concat(this.constructor.name, ",").concat(property_name));
+          returnVal.push("unique:" + this.constructor.name + "," + property_name);
         }
 
         if (i == "type") {
@@ -298,13 +294,16 @@ class SpiceModel {
     return _.join(returnVal, "|");
   }
 
-  getValidationRules() {
-    var method = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "POST";
+  getValidationRules(method, _temp) {
+    if (method === void 0) {
+      method = "POST";
+    }
+
     var {
       complete = false,
       pick = [],
       omit = []
-    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    } = _temp === void 0 ? {} : _temp;
     var rules = {};
     var filters = {};
     var working_properties = this.props;
@@ -402,7 +401,7 @@ class SpiceModel {
           var results = yield _this.database.get(args.id);
 
           if (results.type != _this.type) {
-            throw new Error("".concat(_this.type, " does not exist"));
+            throw new Error(_this.type + " does not exist");
           }
 
           if (results.deleted == undefined || results.deleted == false) {
@@ -410,7 +409,7 @@ class SpiceModel {
             results = yield _this.do_serialize(results, "read", {}, args);
             return results;
           } else {
-            throw new Error("".concat(_this.type, " does not exist"));
+            throw new Error(_this.type + " does not exist");
           }
         }
       } catch (e) {
@@ -497,7 +496,7 @@ class SpiceModel {
         var item_exist = yield _this5.exist(results);
 
         if (!item_exist) {
-          throw new Error("".concat(_this5.type, " does not exist."));
+          throw new Error(_this5.type + " does not exist.");
         }
 
         delete results["id"];
@@ -523,7 +522,7 @@ class SpiceModel {
         yield _this5.database.update(args.id, form || _this5);
 
         if (args.skip_hooks != true) {
-          yield _this5.run_hook(_objectSpread(_objectSpread({}, _this5), {}, {
+          yield _this5.run_hook(_extends({}, _this5, {
             id: args.id
           }), "update", "after");
         }
@@ -533,7 +532,7 @@ class SpiceModel {
         }
 
         _this5.id = args.id;
-        return _objectSpread(_objectSpread({}, form), {}, {
+        return _extends({}, form, {
           id: args.id
         });
       } catch (e) {
@@ -560,7 +559,7 @@ class SpiceModel {
 
         var workingForm = form || _this6;
         _this6.updated_at = new SDate().now();
-        var id = "".concat(args.id_prefix, "-").concat(UUID.v4());
+        var id = args.id_prefix + "-" + UUID.v4();
 
         if (args && args.id) {
           id = args.id;
@@ -569,11 +568,11 @@ class SpiceModel {
         yield _this6.run_hook(workingForm, "create", "before");
         workingForm = yield _this6.do_serialize(workingForm, "write", {}, args);
         var results = yield _this6.database.insert(id, workingForm, args.expiry);
-        yield _this6.run_hook(_objectSpread(_objectSpread({}, results), {}, {
+        yield _this6.run_hook(_extends({}, results, {
           id
         }), "create", "after");
         results = yield _this6.do_serialize(results, "read", {}, args);
-        return _objectSpread(_objectSpread({}, results), {}, {
+        return _extends({}, results, {
           id
         });
       } catch (e) {
@@ -590,7 +589,7 @@ class SpiceModel {
       var item_exist = yield _this7.exist(args.id);
 
       if (!item_exist) {
-        throw new Error("".concat(_this7.type, " does not exist."));
+        throw new Error(_this7.type + " does not exist.");
       }
 
       try {
@@ -878,7 +877,6 @@ class SpiceModel {
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute2 = _asyncToGenerator(function* (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 yield _this10.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 

package/build/storage/Storage.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash"));
@@ -13,15 +11,18 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var views = require('koa-views');
+var views = require("koa-views");
 
 var path = require("path");
 
-var juice = require('juice');
+var juice = require("juice");
 
 class Storage {
-  constructor() {
-    var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  constructor(args) {
+    if (args === void 0) {
+      args = {};
+    }
+
     this.driver_name = args.driver_name || spice.config.storage.default_driver;
     this.driver_options = _lodash.default.merge(spice.config.storage.drivers[this.driver_name], args.options); //console.log(this.driver_name, spice.config.storage.providers)
 
@@ -46,7 +47,7 @@ class Storage {
       var driver = new _this.Driver(_this.driver_options);
       return yield driver.save({
         files,
-        path
+        path: _this.driver_options.base_path ? _this.driver_options.base_path + "/" + path : path
       });
     })();
   }

package/build/storage/providers/Debug.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -10,17 +8,22 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 class Mail {
-  constructor() {
-    var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  constructor(args) {
+    if (args === void 0) {
+      args = {};
+    }
+
     this.options = args;
   }
 
-  send(file) {
-    var _arguments = arguments,
-        _this = this;
+  send(file, options) {
+    var _this = this;
 
     return _asyncToGenerator(function* () {
-      var options = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : {};
+      if (options === void 0) {
+        options = {};
+      }
+
       var email = {
         to: options.to,
         from: options.sender || _this.sender,

package/build/storage/providers/Local.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash"));
@@ -22,8 +20,11 @@ var open = require("open");
 var uuid = require('uuid');
 
 class Local {
-  constructor() {
-    var args = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  constructor(args) {
+    if (args === void 0) {
+      args = {};
+    }
+
     this.args = args;
   }
 
@@ -84,12 +85,12 @@ class Local {
 
         var file_name = _lodash.default.last(uuid.v4().split("-"));
 
-        var writeStream = fs.createWriteStream("".concat(path, "/").concat(file_name, ".").concat(extension));
+        var writeStream = fs.createWriteStream(path + "/" + file_name + "." + extension);
         item.readStream.pipe(writeStream);
         item.readStream.on("end", function (err) {
           fs.unlink(item.file.path, function (obj) {});
         });
-        return "".concat(path, "/").concat(file_name, ".").concat(extension);
+        return path + "/" + file_name + "." + extension;
       });
 
       if (paths.length == 1) {

package/build/utility/Crypt.js

@@ -3,9 +3,7 @@
  * Created by chadfraser on 12/12/15.
  */
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }

package/build/utility/DataType.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 class DataType {}

package/build/utility/MapType.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 class MapType {}

package/build/utility/RestHelper.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 var _flat = _interopRequireDefault(require("flat"));
@@ -78,8 +76,8 @@ class RestHelper {
         }
 
         makeDirectory("./storage/exports");
-        makeDirectory("./storage/exports/".concat(download_type, "/"));
-        var file = path.resolve("./storage/exports/".concat(download_type, "/").concat(RestHelper.makeid(9), ".").concat(download_type));
+        makeDirectory("./storage/exports/" + download_type + "/");
+        var file = path.resolve("./storage/exports/" + download_type + "/" + RestHelper.makeid(9) + "." + download_type);
         yield fs.writeFile(file, content, function (err) {
           if (err) throw err;
         });
@@ -107,11 +105,14 @@ class RestHelper {
     return result;
   }
 
-  static prepare_collection(status) {
-    var obj = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-      data: [],
-      total: null
-    };
+  static prepare_collection(status, obj) {
+    if (obj === void 0) {
+      obj = {
+        data: [],
+        total: null
+      };
+    }
+
     var data = {
       status: status,
       type: "collection",

package/build/utility/Serializer.js

@@ -3,9 +3,7 @@
  */
 'use strict';
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.default = void 0;
 
 var _ = require('lodash');

package/build/utility/index.js

@@ -1,8 +1,6 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
 exports.copy = copy;
 exports.default = void 0;
 

package/build/val/Utility.js

@@ -4,7 +4,7 @@ var Rules = spice.classes.validate.Rules;
 
 Rules.prototype.shouldExist = function* (field, value, args, message) {
   try {
-    var loaded = require(spice.root_path + "/models/".concat(args));
+    var loaded = require(spice.root_path + ("/models/" + args));
 
     var Class = loaded.default;
     var obj = new Class();
@@ -22,12 +22,12 @@ Rules.prototype.shouldExist = function* (field, value, args, message) {
 
 Rules.prototype.unique = function* (field, value, args, message) {
   try {
-    var loaded = require(spice.root_path + "/models/".concat(args[0]));
+    var loaded = require(spice.root_path + ("/models/" + args[0]));
 
     var Class = loaded.default;
     var obj = new Class();
     var found = yield obj.list({
-      query: "".concat(args[1], " = \"").concat(value, "\"")
+      query: args[1] + " = \"" + value + "\""
     });
 
     if (found.data.length == 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.5.6",
+  "version": "2.5.10",
   "description": "spice",
   "main": "build/index.js",
   "repository": {
@@ -15,6 +15,7 @@
   "license": "ISC",
   "dependencies": {
     "agenda": "^3.1.0",
+    "caniuse-lite": "^1.0.30001283",
     "co": "^4.6.0",
     "dotenv": "^8.2.0",
     "flat": "^5.0.0",
@@ -37,6 +38,7 @@
     "regenerator-runtime": "^0.13.7",
     "socket.io-client": "^4.0.1",
     "sonover-date": "^1.0.1",
+    "spice-couchbase": "^2.0.14",
     "uuid": "^3.3.3",
     "winston": "^3.2.1"
   },

package/src/bootstrap/map.js

@@ -1,15 +1,13 @@
 import path from "path";
 
 try {
-  let resources = ["models", "controllers"];
-  console.log(":::::::::::::STARTING MAP:::::::::::::");
+  let resources = ["models", "controllers", "schemas"];
   resources.every((resource) => {
     let paths = path.join(spice.root_path, resource);
     spice[resource] = {};
     require("fs")
       .readdirSync(paths)
       .forEach(async function (file) {
-        console.log("Loading:", file);
         spice[resource][file.split(".")[0]] = (
           await import(path.join(paths, file))
         ).default;

package/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 var path = require("path");
-import IO from "koa-socket-2";
+//import IO from "koa-socket-2";
 const cors = require("kcors");
 global.spice = {};
 
@@ -55,7 +55,7 @@ export default class Spice {
 
   async init(app) {
     try {
-      const io = new IO();
+      //const io = new IO();
       app.use(cors());
       require("koa-qs")(app, "extended");
 
@@ -72,14 +72,14 @@ export default class Spice {
       spice.app = app;
       spice.config = await require("./loaders/config")();
 
-      io.attach(app);
-      spice.io = io;
-      io.on("message", (ctx, data) => {
+      //io.attach(app);
+      //spice.io = io; */
+      /* io.on("message", (ctx, data) => {
         console.log("client sent data to message endpoint", data);
-      });
-      app._io.on("connection", (sock) => {
+      }); */
+      /* app._io.on("connection", (sock) => {
         console.log("Connection Up", sock);
-      });
+      }); */
       app.use(
         koaSwagger({
           hideTopbar: true,

package/src/loaders/index.js

@@ -2,7 +2,8 @@ import path from "path";
 import fs from "fs";
 import _ from "lodash";
 
-let ordered_modules = ["map", "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')*/
@@ -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

@@ -765,14 +765,6 @@ export default class SpiceModel {
                 this.addModifier({
                   when: properties[i].map.when || "read",
                   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,
                       _.isString(properties[i].map.reference)

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,
+    });
+  }
+}