spice-js 2.5.18 → 2.5.21

package/build/bootstrap/map.js

@@ -2,6 +2,8 @@
 
 var _path = _interopRequireDefault(require("path"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
@@ -14,15 +16,16 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 try {
   var resources = ["models", "controllers", "schemas"];
-  resources.every(resource => {
-    var paths = _path.default.join(spice.root_path, resource);
 
-    spice[resource] = {};
+  _lodash.default.each(resources,
+  /*#__PURE__*/
+  function () {
+    var _ref = _asyncToGenerator(function* (resource) {
+      var paths = _path.default.join(spice.root_path, resource);
+
+      spice[resource] = {};
 
-    require("fs").readdirSync(paths).forEach(
-    /*#__PURE__*/
-    function () {
-      var _ref = _asyncToGenerator(function* (file) {
+      for (var file of require("fs").readdirSync(paths)) {
         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;
@@ -30,13 +33,15 @@ try {
         if (resource == "models") {
           new spice[resource][file_name]({});
         }
-      });
+      }
+
+      console.log(resource, spice[resource]);
+    });
 
-      return function (_x) {
-        return _ref.apply(this, arguments);
-      };
-    }());
-  });
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }());
 } catch (error) {
-  console.log(error);
+  console.log("Error Happened", error);
 }

package/build/models/SpiceModel.js

@@ -93,6 +93,20 @@ class SpiceModel {
         collection: args.collection,
         scope: args.scope
       });
+
+      function removeDynamicProps(props) {
+        var returnVal = {};
+
+        for (var i in props) {
+          if (!_.has(props[i], "source") || _.get(props[i], "source") == "static") {
+            returnVal[i] = props[i];
+          }
+        }
+
+        return returnVal;
+      }
+
+      args.props = removeDynamicProps(args.props);
       this[_props] = args.props;
 
       for (var i in args.props) {

package/package.json

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

package/src/bootstrap/map.js

@@ -1,25 +1,24 @@
 import path from "path";
-
+import _ from "lodash";
 try {
   let resources = ["models", "controllers", "schemas"];
-  resources.every((resource) => {
+  _.each(resources, async function (resource) {
     let paths = path.join(spice.root_path, resource);
     spice[resource] = {};
-    require("fs")
-      .readdirSync(paths)
-      .forEach(async function (file) {
-        let file_name = file.split(".")[0];
-        spice[resource][file_name.toLowerCase()] = (
-          await import(path.join(paths, file))
-        ).default;
-        spice[resource][file_name] = (
-          await import(path.join(paths, file))
-        ).default;
-        if (resource == "models") {
-          new spice[resource][file_name]({});
-        }
-      });
+    for (let file of require("fs").readdirSync(paths)) {
+      let file_name = file.split(".")[0];
+      spice[resource][file_name.toLowerCase()] = (
+        await import(path.join(paths, file))
+      ).default;
+      spice[resource][file_name] = (
+        await import(path.join(paths, file))
+      ).default;
+      if (resource == "models") {
+        new spice[resource][file_name]({});
+      }
+    }
+    console.log(resource, spice[resource]);
   });
 } catch (error) {
-  console.log(error);
+  console.log("Error Happened", error);
 }

package/src/bootstrap/seed.js

@@ -1,16 +1,19 @@
 import path from "path";
+import fs from "fs-extra";
 
 spice.seeds = {};
 
 let paths = path.join(spice.root_path, "seeds");
-require("fs")
-  .readdirSync(paths)
-  .forEach(function (file) {
-    if (file != "index.js") {
-      let seed = require(path.join(paths, file));
-      spice.seeds[file.split(".")[0]] = seed;
-      if (seed.run) {
-        seed.run();
+if (fs.existsSync(paths)) {
+  require("fs")
+    .readdirSync(paths)
+    .forEach(function (file) {
+      if (file != "index.js") {
+        let seed = require(path.join(paths, file));
+        spice.seeds[file.split(".")[0]] = seed;
+        if (seed.run) {
+          seed.run();
+        }
       }
-    }
-  });
+    });
+}

package/src/models/SpiceModel.js

@@ -50,7 +50,7 @@ export default class SpiceModel {
           before: [],
           after: [],
         },
-        update: {                                                    
+        update: {
           before: [],
           after: [],
         },
@@ -69,14 +69,30 @@ export default class SpiceModel {
           cleaners: [],
         },
       };
+
       this.deleted = false;
       if (args.args) {
         delete args.args["ctx"];
       }
+
       this[_database] = new Database(args.connection || "default", {
         collection: args.collection,
         scope: args.scope,
       });
+
+      function removeDynamicProps(props) {
+        let returnVal = {};
+        for (let i in props) {
+          if (
+            !_.has(props[i], "source") ||
+            _.get(props[i], "source") == "static"
+          ) {
+            returnVal[i] = props[i];
+          }
+        }
+        return returnVal;
+      }
+      args.props = removeDynamicProps(args.props);
       this[_props] = args.props;
       for (let i in args.props) {
         if (args.args != undefined) {