spice-js 2.6.34 → 2.6.35

package/build/models/SpiceModel.js

@@ -49,6 +49,8 @@ if (!Promise.allSettled) {
 
 class SpiceModel {
   constructor(args) {
+    var _args$props$i;
+
     if (args === void 0) {
       args = {};
     }
@@ -166,7 +168,7 @@ class SpiceModel {
       for (var i in args.props) {
         if (args.args != undefined) {
           if (args.args[i] != undefined) {
-            switch (args.props[i].type) {
+            switch ((_args$props$i = args.props[i]) == null ? void 0 : _args$props$i.type) {
               case String:
               case "string":
                 {
@@ -258,7 +260,7 @@ class SpiceModel {
         var _this$_ctx, _this$_ctx$state;
 
         if ((_this$_ctx = _this[_ctx]) == null ? void 0 : (_this$_ctx$state = _this$_ctx.state) == null ? void 0 : _this$_ctx$state.process_fields) {
-          var returned = yield new _this[_ctx].state.process_fields().process(_this[_ctx], data, _this.type);
+          var returned = yield new _this[_ctx].state.process_fields().process(_this[_ctx], data, _this == null ? void 0 : _this.type);
           return returned;
         } else {
           return data;
@@ -529,7 +531,7 @@ class SpiceModel {
     return _asyncToGenerator(function* () {
       var obj = _this3.getCacheProviderObject();
 
-      var monitor_record = yield obj.get("monitor::" + _this3.type);
+      var monitor_record = yield obj.get("monitor::" + (_this3 == null ? void 0 : _this3.type));
 
       if (monitor_record == undefined) {
         return false;
@@ -546,7 +548,7 @@ class SpiceModel {
   setMonitor() {
     var current_time = new Date().getTime();
     var obj = this.getCacheProviderObject();
-    var key = "monitor::" + this.type;
+    var key = "monitor::" + (this == null ? void 0 : this.type);
     var value = {
       time: current_time
     };
@@ -565,37 +567,43 @@ class SpiceModel {
         }
 
         if (_.isString(args.id)) {
+          var _results, _results3, _results5, _results6;
+
           if (args.skip_hooks != true) {
             yield _this4.run_hook(args, "get", "before");
           }
 
-          var key = "get::" + _this4.type + "::" + args.id;
+          var key = "get::" + (_this4 == null ? void 0 : _this4.type) + "::" + args.id;
           var results = {};
 
-          if (_this4.shouldUseCache(_this4.type)) {
-            var cached_results = yield _this4.getCacheProviderObject(_this4.type).get(key);
+          if (_this4.shouldUseCache(_this4 == null ? void 0 : _this4.type)) {
+            var cached_results = yield _this4.getCacheProviderObject(_this4 == null ? void 0 : _this4.type).get(key);
             results = cached_results == null ? void 0 : cached_results.value;
 
-            if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this4.shouldForceRefresh(cached_results)) || _this4.type == "workflow") {
+            if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this4.shouldForceRefresh(cached_results)) || (_this4 == null ? void 0 : _this4.type) == "workflow") {
               results = yield _this4.database.get(args.id);
-              yield _this4.getCacheProviderObject(_this4.type).set(key, {
+              yield _this4.getCacheProviderObject(_this4 == null ? void 0 : _this4.type).set(key, {
                 value: results,
                 time: new Date().getTime()
-              }, _this4.getCacheConfig(_this4.type));
+              }, _this4.getCacheConfig(_this4 == null ? void 0 : _this4.type));
             }
           } else {
             results = yield _this4.database.get(args.id);
           }
 
-          if (results.type != undefined) {
-            if (results.type != _this4.type) throw new Error(_this4.type + " does not exist type");
+          if (((_results = results) == null ? void 0 : _results.type) != undefined) {
+            var _results2;
+
+            if (((_results2 = results) == null ? void 0 : _results2.type) != (_this4 == null ? void 0 : _this4.type)) throw new Error((_this4 == null ? void 0 : _this4.type) + " does not exist type");
           }
 
-          if (results._type != undefined) {
-            if (results._type != _this4.type) throw new Error(_this4.type + " does not exist _type");
+          if (((_results3 = results) == null ? void 0 : _results3._type) != undefined) {
+            var _results4;
+
+            if (((_results4 = results) == null ? void 0 : _results4._type) != (_this4 == null ? void 0 : _this4.type)) throw new Error((_this4 == null ? void 0 : _this4.type) + " does not exist _type");
           }
 
-          if (results.deleted == undefined || results.deleted == false) {
+          if (((_results5 = results) == null ? void 0 : _results5.deleted) == undefined || ((_results6 = results) == null ? void 0 : _results6.deleted) == false) {
             if (args.skip_read_serialize != true && args.skip_serialize != true) {
               results = yield _this4.do_serialize(results, "read", {}, args, (yield _this4.propsToBeRemoved(results)));
             }
@@ -606,7 +614,7 @@ class SpiceModel {
 
             return results;
           } else {
-            throw new Error(_this4.type + " does not exist");
+            throw new Error((_this4 == null ? void 0 : _this4.type) + " does not exist");
           }
         }
       } catch (e) {
@@ -644,29 +652,29 @@ class SpiceModel {
 
         _.remove(args.ids, o => o == undefined);
 
-        var key = "multi-get::" + _this6.type + "::" + _.join(args.ids, "|");
+        var key = "multi-get::" + (_this6 == null ? void 0 : _this6.type) + "::" + _.join(args.ids, "|");
 
         var results = [];
 
         if (args.ids.length > 0) {
-          if (_this6.shouldUseCache(_this6.type)) {
-            var cached_results = yield _this6.getCacheProviderObject(_this6.type).get(key);
+          if (_this6.shouldUseCache(_this6 == null ? void 0 : _this6.type)) {
+            var cached_results = yield _this6.getCacheProviderObject(_this6 == null ? void 0 : _this6.type).get(key);
             results = cached_results == null ? void 0 : cached_results.value;
 
             if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this6.shouldForceRefresh(cached_results))) {
               results = yield _this6.database.multi_get(args.ids, true);
 
-              _this6.getCacheProviderObject(_this6.type).set(key, {
+              _this6.getCacheProviderObject(_this6 == null ? void 0 : _this6.type).set(key, {
                 value: results,
                 time: new Date().getTime()
-              }, _this6.getCacheConfig(_this6.type));
+              }, _this6.getCacheConfig(_this6 == null ? void 0 : _this6.type));
             }
           } else {
             results = yield _this6.database.multi_get(args.ids, true);
           }
         }
 
-        _.remove(results, o => o.type != _this6.type);
+        _.remove(results, o => (o == null ? void 0 : o.type) != (_this6 == null ? void 0 : _this6.type));
 
         if (args.skip_read_serialize != true && args.skip_serialize != true) {
           results = yield _this6.do_serialize(results, "read", {}, args, (yield _this6.propsToBeRemoved(results)));
@@ -691,17 +699,17 @@ class SpiceModel {
       try {
         if (_.isString(data)) {
           var result = yield _this7.database.get(data);
-          if (result.type) if (result.type != _this7.type) {
+          if (result == null ? void 0 : result.type) if (result.type != (_this7 == null ? void 0 : _this7.type)) {
             return false;
           }
-          if (result._type) if (result._type != _this7.type) {
+          if (result == null ? void 0 : result._type) if (result._type != (_this7 == null ? void 0 : _this7.type)) {
             return false;
           }
         } else {
-          if (data.type) if (data.type != _this7.type) {
+          if (data == null ? void 0 : data.type) if (data.type != (_this7 == null ? void 0 : _this7.type)) {
             return false;
           }
-          if (data._type) if (data._type != _this7.type) {
+          if (data == null ? void 0 : data._type) if (data._type != (_this7 == null ? void 0 : _this7.type)) {
             return false;
           }
         }
@@ -723,7 +731,7 @@ class SpiceModel {
         var item_exist = yield _this8.exist(results);
 
         if (!item_exist) {
-          throw new Error(_this8.type + " does not exist. in update");
+          throw new Error((_this8 == null ? void 0 : _this8.type) + " does not exist. in update");
         }
 
         delete results["id"];
@@ -783,7 +791,7 @@ class SpiceModel {
         var form;
         _this9.created_at = new SDate().now();
         args = _.defaults(args, {
-          id_prefix: _this9.type
+          id_prefix: _this9 == null ? void 0 : _this9.type
         });
 
         if (args.body) {
@@ -840,7 +848,7 @@ class SpiceModel {
       var item_exist = yield _this10.exist(args.id);
 
       if (!item_exist) {
-        throw new Error(_this10.type + " does not exist.");
+        throw new Error((_this10 == null ? void 0 : _this10.type) + " does not exist.");
       }
 
       var results = yield _this10.database.get(args.id);
@@ -949,7 +957,7 @@ class SpiceModel {
           return returnVal;
         }
 
-        var nestings = [...extractNestings((_args4 = args) == null ? void 0 : _args4.query, _this11.type), ...extractNestings((_args5 = args) == null ? void 0 : _args5.columns, _this11.type), ...extractNestings((_args6 = args) == null ? void 0 : _args6.sort, _this11.type)];
+        var nestings = [...extractNestings((_args4 = args) == null ? void 0 : _args4.query, _this11 == null ? void 0 : _this11.type), ...extractNestings((_args5 = args) == null ? void 0 : _args5.columns, _this11 == null ? void 0 : _this11.type), ...extractNestings((_args6 = args) == null ? void 0 : _args6.sort, _this11 == null ? void 0 : _this11.type)];
 
         var mappedNestings = _.compact(_.map(_.uniq(nestings), nesting => {
           var prop = _this11.props[nesting];
@@ -989,9 +997,9 @@ class SpiceModel {
             query = _this11.makeQueryFromFilter(args.filters);
           } else {
             if (args.query) {
-              query = args.query + (" AND (`" + _this11.type + "`.deleted = false OR `" + _this11.type + "`.deleted IS MISSING) ");
+              query = args.query + (" AND (`" + (_this11 == null ? void 0 : _this11.type) + "`.deleted = false OR `" + (_this11 == null ? void 0 : _this11.type) + "`.deleted IS MISSING) ");
             } else {
-              query = "(`" + _this11.type + "`.deleted = false OR `" + _this11.type + "`.deleted IS MISSING) ";
+              query = "(`" + (_this11 == null ? void 0 : _this11.type) + "`.deleted = false OR `" + (_this11 == null ? void 0 : _this11.type) + "`.deleted IS MISSING) ";
             }
           }
         }
@@ -1018,7 +1026,7 @@ class SpiceModel {
         }
 
         if (!args.sort) {
-          args.sort = "`" + _this11.type + "`.created_at DESC";
+          args.sort = "`" + (_this11 == null ? void 0 : _this11.type) + "`.created_at DESC";
         } else {
           var sort_array = args.sort.split(","); // check the first string in each item in the array to see if it contains a . if not then add the type
 
@@ -1026,7 +1034,7 @@ class SpiceModel {
 
           for (var i = 0; i < sort_array.length; i++) {
             if (!sort_array[i].includes(".")) {
-              new_sort_array.push("`" + _this11.type + "`." + formatSortComponent(sort_array[i]));
+              new_sort_array.push("`" + (_this11 == null ? void 0 : _this11.type) + "`." + formatSortComponent(sort_array[i]));
             } else {
               new_sort_array.push(sort_array[i]);
             }
@@ -1043,22 +1051,22 @@ class SpiceModel {
           return str.replace(/[^a-zA-Z0-9]/g, "");
         }
 
-        var key = removeSpaceAndSpecialCharacters("list::" + _this11.type + "::" + args._join + "::" + query + "::" + args.limit + "::" + args.offset + "::" + args.sort + "::" + args.do_count + "::" + args.statement_consistent + "::" + args.columns + "::" + args.is_full_text + "::" + args.is_custom_query);
+        var key = removeSpaceAndSpecialCharacters("list::" + (_this11 == null ? void 0 : _this11.type) + "::" + args._join + "::" + query + "::" + args.limit + "::" + args.offset + "::" + args.sort + "::" + args.do_count + "::" + args.statement_consistent + "::" + args.columns + "::" + args.is_full_text + "::" + args.is_custom_query);
         var results;
 
         if (args.is_custom_query && args.is_custom_query === "true") {
           if (args.ids.length > 0) {
-            if (_this11.shouldUseCache(_this11.type)) {
-              var cached_results = yield _this11.getCacheProviderObject(_this11.type).get(key);
+            if (_this11.shouldUseCache(_this11 == null ? void 0 : _this11.type)) {
+              var cached_results = yield _this11.getCacheProviderObject(_this11 == null ? void 0 : _this11.type).get(key);
               results = cached_results == null ? void 0 : cached_results.value;
 
               if ((cached_results == null ? void 0 : cached_results.value) == undefined || (yield _this11.shouldForceRefresh(cached_results))) {
                 results = yield _this11.database.query(query);
 
-                _this11.getCacheProviderObject(_this11.type).set(key, {
+                _this11.getCacheProviderObject(_this11 == null ? void 0 : _this11.type).set(key, {
                   value: results,
                   time: new Date().getTime()
-                }, _this11.getCacheConfig(_this11.type));
+                }, _this11.getCacheConfig(_this11 == null ? void 0 : _this11.type));
               }
             } else {
               results = yield _this11.database.query(query);
@@ -1066,39 +1074,39 @@ class SpiceModel {
           }
         } else {
           if (args.is_full_text && args.is_full_text === "true") {
-            if (_this11.shouldUseCache(_this11.type)) {
-              var _cached_results = yield _this11.getCacheProviderObject(_this11.type).get(key);
+            if (_this11.shouldUseCache(_this11 == null ? void 0 : _this11.type)) {
+              var _cached_results = yield _this11.getCacheProviderObject(_this11 == null ? void 0 : _this11.type).get(key);
 
               results = _cached_results == null ? void 0 : _cached_results.value;
 
               if ((_cached_results == null ? void 0 : _cached_results.value) == undefined || (yield _this11.shouldForceRefresh(_cached_results))) {
-                results = yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset, args._join);
+                results = yield _this11.database.full_text_search(_this11 == null ? void 0 : _this11.type, query || "", args.limit, args.offset, args._join);
 
-                _this11.getCacheProviderObject(_this11.type).set(key, {
+                _this11.getCacheProviderObject(_this11 == null ? void 0 : _this11.type).set(key, {
                   value: results,
                   time: new Date().getTime()
-                }, _this11.getCacheConfig(_this11.type));
+                }, _this11.getCacheConfig(_this11 == null ? void 0 : _this11.type));
               }
             } else {
-              results = yield _this11.database.full_text_search(_this11.type, query || "", args.limit, args.offset, args._join);
+              results = yield _this11.database.full_text_search(_this11 == null ? void 0 : _this11.type, query || "", args.limit, args.offset, args._join);
             }
           } else {
-            if (_this11.shouldUseCache(_this11.type)) {
-              var _cached_results2 = yield _this11.getCacheProviderObject(_this11.type).get(key);
+            if (_this11.shouldUseCache(_this11 == null ? void 0 : _this11.type)) {
+              var _cached_results2 = yield _this11.getCacheProviderObject(_this11 == null ? void 0 : _this11.type).get(key);
 
               results = _cached_results2 == null ? void 0 : _cached_results2.value;
               var shouleForceRefresh = yield _this11.shouldForceRefresh(_cached_results2);
 
               if ((_cached_results2 == null ? void 0 : _cached_results2.value) == undefined || shouleForceRefresh) {
-                results = yield _this11.database.search(_this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent, args._join);
+                results = yield _this11.database.search(_this11 == null ? void 0 : _this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent, args._join);
 
-                _this11.getCacheProviderObject(_this11.type).set(key, {
+                _this11.getCacheProviderObject(_this11 == null ? void 0 : _this11.type).set(key, {
                   value: results,
                   time: new Date().getTime()
-                }, _this11.getCacheConfig(_this11.type));
+                }, _this11.getCacheConfig(_this11 == null ? void 0 : _this11.type));
               }
             } else {
-              results = yield _this11.database.search(_this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent, args._join);
+              results = yield _this11.database.search(_this11 == null ? void 0 : _this11.type, args.columns || "", query || "", args.limit, args.offset, args.sort, args.do_count, args.statement_consistent, args._join);
             }
           }
         }
@@ -1108,7 +1116,7 @@ class SpiceModel {
             results.data = yield _this11.do_serialize(results.data, "read", {}, args, (yield _this11.propsToBeRemoved(results.data)));
           }
 
-          if (_this11.type == "resourcedetail") ;
+          if ((_this11 == null ? void 0 : _this11.type) == "resourcedetail") ;
 
           if (args.skip_hooks != true) {
             yield _this11.run_hook(results.data, "list", "after");
@@ -1148,7 +1156,7 @@ class SpiceModel {
               operation: op,
               when,
               old_data,
-              resource: _this12.type,
+              resource: _this12 == null ? void 0 : _this12.type,
               ctx: _this12[_ctx]
             }
           });
@@ -1202,6 +1210,10 @@ class SpiceModel {
       var ids = [];
 
       _.each(data, result => {
+        if (!result || result == "undefined") {
+          result = {};
+        }
+
         if (_.isString(result[source_property]) && result[source_property] != "") {
           ids = _.union(ids, [result[source_property]]);
         }
@@ -1221,6 +1233,10 @@ class SpiceModel {
       })));
 
       data = _.map(data, result => {
+        if (!result || result == "undefined") {
+          result = {};
+        }
+
         var result_found = _.find(ug, g => {
           return g.id == result[source_property];
         }) || {};
@@ -1246,6 +1262,10 @@ class SpiceModel {
       _.each(data, result => {
         var value = [];
 
+        if (!result || result == "undefined") {
+          result = {};
+        }
+
         if (_.isArray(result[source_property])) {
           value = result[source_property];
         }
@@ -1278,6 +1298,10 @@ class SpiceModel {
 
 
       _.each(data, result => {
+        if (!result || result == "undefined") {
+          result = {};
+        }
+
         if (_.isString(result[store_property])) {
           result[store_property] = [result[store_property]];
         }
@@ -1403,15 +1427,15 @@ class SpiceModel {
         }
 
         if (_this16.shouldSerializerRun(args, type)) {
-          if (_this16.type != "" && _this16.type != undefined && _this16[_external_modifier_loaded] != true) {
-            _this16.addExternalModifiers(_this16.type);
+          if ((_this16 == null ? void 0 : _this16.type) != "" && (_this16 == null ? void 0 : _this16.type) != undefined && _this16[_external_modifier_loaded] != true) {
+            _this16.addExternalModifiers(_this16 == null ? void 0 : _this16.type);
 
             _this16[_external_modifier_loaded] = true;
           }
 
           for (var i of _this16[_serializers][type]["modifiers"]) {
             try {
-              data = yield i(data, old_data, _this16[_ctx], _this16.type);
+              data = yield i(data, old_data, _this16[_ctx], _this16 == null ? void 0 : _this16.type);
             } catch (e) {
               console.log(e.stack);
             }

package/package.json

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

package/src/models/SpiceModel.js

@@ -483,9 +483,9 @@ export default class SpiceModel {
         let key = `get::${this?.type}::${args.id}`;
         let results = {};
         if (this.shouldUseCache(this?.type)) {
-          let cached_results = await this.getCacheProviderObject(this?.type).get(
-            key
-          );
+          let cached_results = await this.getCacheProviderObject(
+            this?.type
+          ).get(key);
 
           results = cached_results?.value;
           if (
@@ -505,12 +505,12 @@ export default class SpiceModel {
         }
 
         if (results?.type != undefined) {
-          if (results.type != this?.type)
+          if (results?.type != this?.type)
             throw new Error(`${this?.type} does not exist type`);
         }
 
         if (results?._type != undefined) {
-          if (results._type != this?.type)
+          if (results?._type != this?.type)
             throw new Error(`${this?.type} does not exist _type`);
         }
 
@@ -560,9 +560,9 @@ export default class SpiceModel {
       let results = [];
       if (args.ids.length > 0) {
         if (this.shouldUseCache(this?.type)) {
-          let cached_results = await this.getCacheProviderObject(this?.type).get(
-            key
-          );
+          let cached_results = await this.getCacheProviderObject(
+            this?.type
+          ).get(key);
           results = cached_results?.value;
           if (
             cached_results?.value == undefined ||
@@ -1120,7 +1120,7 @@ export default class SpiceModel {
 
     let ids = [];
     _.each(data, (result) => {
-      if (!result || result== "undefined") {
+      if (!result || result == "undefined") {
         result = {};
       }
       if (
@@ -1151,7 +1151,7 @@ export default class SpiceModel {
     );
 
     data = _.map(data, (result) => {
-      if (!result || result== "undefined") {
+      if (!result || result == "undefined") {
         result = {};
       }
       let result_found =
@@ -1178,7 +1178,7 @@ export default class SpiceModel {
     let ids = [];
     _.each(data, (result) => {
       let value = [];
-      if (!result || result== "undefined") {
+      if (!result || result == "undefined") {
         result = {};
       }
 
@@ -1219,7 +1219,7 @@ export default class SpiceModel {
       ids: ids,
     }); */
     _.each(data, (result) => {
-      if (!result || result== "undefined") {
+      if (!result || result == "undefined") {
         result = {};
       }
       if (_.isString(result[store_property])) {