spice-js 2.5.4 → 2.5.8

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 {
@@ -857,7 +856,7 @@ class SpiceModel {
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute = _asyncToGenerator(function* (data) {
-                          return yield _this10.mapToObject(data, properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
+                          return yield _this10.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 
                         function execute(_x) {
@@ -878,7 +877,8 @@ class SpiceModel {
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute2 = _asyncToGenerator(function* (data) {
-                          return yield _this10.mapToObjectArray(data, properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
+                          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]);
                         });
 
                         function execute(_x2) {

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/gulpfile.js

@@ -1,34 +1,37 @@
-var gulp = require('gulp');
-var babel = require('gulp-babel');
+var gulp = require("gulp");
+var babel = require("gulp-babel");
 var paths = {};
-paths.src = './src/**/*.js';
+paths.src = "./src/**/*.js";
 
-gulp.task('build_spice', () =>
-  gulp.src(paths.src)
-    .pipe(babel({
-      presets: [
-        [
-          "@babel/preset-env",
-          {
-            "targets": {
-              "esmodules": true,
-              "node": "current",
+gulp.task("build_spice", () =>
+  gulp
+    .src(paths.src)
+    .pipe(
+      babel({
+        presets: [
+          [
+            "@babel/preset-env",
+            {
+              loose: true,
+              targets: {
+                esmodules: true,
+                node: "current",
+              },
             },
-
-          },
+          ],
+        ],
+        plugins: [
+          ["@babel/plugin-proposal-class-properties", { loose: true }],
+          ["@babel/plugin-proposal-export-namespace-from", { loose: true }],
+          ["@babel/plugin-proposal-export-default-from", { loose: true }],
         ],
-      ],
-      plugins: [
-        ['@babel/plugin-proposal-class-properties', { "loose": true }],
-        "@babel/plugin-proposal-export-namespace-from",
-        "@babel/plugin-proposal-export-default-from",
-      ],
-    }))
-    .pipe(gulp.dest('build'))
+      })
+    )
+    .pipe(gulp.dest("build"))
 );
 
 // Default task
-gulp.task('default', gulp.series('build_spice'));
-gulp.task('watch', function () {
-  gulp.watch(paths.src, gulp.series('build_spice'));
+gulp.task("default", gulp.series("build_spice"));
+gulp.task("watch", function () {
+  gulp.watch(paths.src, gulp.series("build_spice"));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.5.4",
+  "version": "2.5.8",
   "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",

package/src/bootstrap/event.js

@@ -1,9 +1,9 @@
 import path from "path";
 import _ from "lodash";
-const EventEmitter = require("events").EventEmitter;
-const myEmitter = new EventEmitter();
+const EventEmitter = require("events");
+class MyEmitter extends EventEmitter { }
+const myEmitter = new MyEmitter();
 spice.EventEmitter = myEmitter;
-
 let eventingManifest = require(path.resolve(
   path.join(spice.root_path, "/eventing/manifest.js")
 ));
@@ -16,7 +16,6 @@ _.each(eventingManifest.default, (entry) => {
       new entry.event().driver || spice.config.event.default_driver
     ];
   let processor = new Processor();
-  console.log(processor);
   _.each(entry.handlers, (handler) => {
     processor.on(topic, new handler().handle);
   });

package/src/bootstrap/map.js

@@ -0,0 +1,18 @@
+import path from "path";
+
+try {
+  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) {
+        spice[resource][file.split(".")[0]] = (
+          await import(path.join(paths, file))
+        ).default;
+      });
+  });
+} catch (error) {
+  console.log(error);
+}

package/src/events/providers/SocketEventDriver.js

@@ -1,11 +1,11 @@
-import io from "socket.io-client";
-export default class SpiceEventDriver {
-  dispatch({ topic, data } = {}) {
+//import io from "socket.io-client";
+export default class SocketEventDriver {
+  /*dispatch({ topic, data } = {}) {
     spice.io.broadcast(topic, data);
   }
 
   on(topic, callback) {
     var socket = io("http://localhost:3005");
     socket.on(topic, callback);
-  }
+  }*/
 }

package/src/events/providers/SpiceEventDriver.js

@@ -1,4 +1,4 @@
-export default class SocketEventDriver {
+export default class SpiceEventDriver {
   dispatch({ topic, data } = {}) {
     spice.EventEmitter.emit(topic, data);
   }

package/src/index.js

@@ -74,6 +74,12 @@ export default class Spice {
 
       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) => {
+        console.log("Connection Up", sock);
+      });
       app.use(
         koaSwagger({
           hideTopbar: true,