spice-js 2.5.13 → 2.5.14

package/build/bootstrap/database.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 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); } }
 
@@ -7,6 +7,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 spice.database = {};
 spice.database.connections = {};
 spice.database.clusters = {};
+spice.database.scopes = {};
+spice.database.buckets = {};
 
 function connect() {
   return _connect.apply(this, arguments);
@@ -25,6 +27,8 @@ function _connect() {
           var result = yield connection.connect(key, value);
           spice.database.connections[result.connection] = result.collection;
           spice.database.clusters[result.connection] = result.cluster;
+          spice.database.scopes[result.connection] = result.scope;
+          spice.database.buckets[result.connection] = result.bucket;
         }
       }
     } catch (e) {
@@ -35,5 +39,4 @@ function _connect() {
   return _connect.apply(this, arguments);
 }
 
-module.exports = connect;
-;
+module.exports = connect;

package/build/bootstrap/map.js

@@ -23,8 +23,13 @@ try {
     /*#__PURE__*/
     function () {
       var _ref = _asyncToGenerator(function* (file) {
-        spice[resource][file.split(".")[0].toLowerCase()] = (yield Promise.resolve("" + _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;
+        var file_name = file.split(".")[0];
+        spice[resource][file_name.toLowerCase()] = (yield Promise.resolve("" + _path.default.join(paths, file)).then(s => _interopRequireWildcard(require(s)))).default;
+        spice[resource][file_name] = (yield Promise.resolve("" + _path.default.join(paths, file)).then(s => _interopRequireWildcard(require(s)))).default;
+
+        if (resource == "models") {
+          new spice[resource][file_name]({});
+        }
       });
 
       return function (_x) {

package/build/loaders/index.js

@@ -15,7 +15,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); }); }; }
 
-var ordered_modules = ["map", "logger", "error", "database"];
+var ordered_modules = ["database", "map", "logger", "error"];
 var last_modules = ["views", "routes"];
 
 function load() {

package/build/models/SpiceModel.js

@@ -85,7 +85,10 @@ class SpiceModel {
         delete args.args["ctx"];
       }
 
-      this[_database] = new Database(args.connection || "default");
+      this[_database] = new Database(args.connection || "default", {
+        collection: args.collection,
+        scope: args.scope
+      });
       this[_props] = args.props;
 
       for (var i in args.props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.5.13",
+  "version": "2.5.14",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/bootstrap/database.js

@@ -1,20 +1,23 @@
-'use strict';
+"use strict";
 
 spice.database = {};
 spice.database.connections = {};
-spice.database.clusters = {}
+spice.database.clusters = {};
+spice.database.scopes = {};
+spice.database.buckets = {};
 
 async function connect() {
   try {
     for (let key in spice.config.database.connections) {
       let value = spice.config.database.connections[key];
-
       if (value.enabled) {
         let Database = require(`spice-${value.type}`);
         let connection = new Database();
         let result = await connection.connect(key, value);
         spice.database.connections[result.connection] = result.collection;
         spice.database.clusters[result.connection] = result.cluster;
+        spice.database.scopes[result.connection] = result.scope;
+        spice.database.buckets[result.connection] = result.bucket;
       }
     }
   } catch (e) {
@@ -23,4 +26,3 @@ async function connect() {
   }
 }
 module.exports = connect;
-;

package/src/bootstrap/map.js

@@ -8,12 +8,16 @@ try {
     require("fs")
       .readdirSync(paths)
       .forEach(async function (file) {
-        spice[resource][file.split(".")[0].toLowerCase()] = (
+        let file_name = file.split(".")[0];
+        spice[resource][file_name.toLowerCase()] = (
           await import(path.join(paths, file))
         ).default;
-        spice[resource][file.split(".")[0]] = (
+        spice[resource][file_name] = (
           await import(path.join(paths, file))
         ).default;
+        if (resource == "models") {
+          new spice[resource][file_name]({});
+        }
       });
   });
 } catch (error) {

package/src/loaders/index.js

@@ -2,7 +2,7 @@ import path from "path";
 import fs from "fs";
 import _ from "lodash";
 
-let ordered_modules = ["map", "logger", "error", "database"];
+let ordered_modules = ["database", "map", "logger", "error"];
 let last_modules = ["views", "routes"];
 export async function load() {
   try {

package/src/models/SpiceModel.js

@@ -72,7 +72,10 @@ export default class SpiceModel {
       if (args.args) {
         delete args.args["ctx"];
       }
-      this[_database] = new Database(args.connection || "default");
+      this[_database] = new Database(args.connection || "default", {
+        collection: args.collection,
+        scope: args.scope,
+      });
       this[_props] = args.props;
       for (let i in args.props) {
         if (args.args != undefined) {