spice-js 2.7.2 → 2.7.3

package/build/models/SpiceModel.js

@@ -704,50 +704,75 @@ class SpiceModel {
     var _this6 = this;
 
     return _asyncToGenerator(function* () {
-      try {
-        if (!args) {
-          args = {};
-        }
+      var _this6$_ctx;
 
-        if (args.skip_hooks != true) {
-          yield _this6.run_hook(_this6, "list", "before");
-        }
+      // ⚡ Profiling: use track() for proper async context forking
+      var p = (_this6$_ctx = _this6[_ctx]) == null ? void 0 : _this6$_ctx.profiler;
+
+      var doGetMulti =
+      /*#__PURE__*/
+      function () {
+        var _ref5 = _asyncToGenerator(function* () {
+          if (!args) {
+            args = {};
+          }
 
-        _.remove(args.ids, o => o == undefined);
+          if (args.skip_hooks != true) {
+            yield _this6.run_hook(_this6, "list", "before");
+          }
 
-        var key = "multi-get::" + _this6.type + "::" + _.join(args.ids, "|");
+          _.remove(args.ids, o => o == undefined);
 
-        var results = [];
+          var key = "multi-get::" + _this6.type + "::" + _.join(args.ids, "|");
 
-        if (args.ids.length > 0) {
-          if (_this6.shouldUseCache(_this6.type)) {
-            var cached_results = yield _this6.getCacheProviderObject(_this6.type).get(key);
-            results = cached_results == null ? void 0 : cached_results.value;
+          var results = [];
 
-            if ((cached_results == null ? void 0 : cached_results.value) === undefined || (yield _this6.shouldForceRefresh(cached_results))) {
-              results = yield _this6.database.multi_get(args.ids, true);
+          if (args.ids.length > 0) {
+            if (_this6.shouldUseCache(_this6.type)) {
+              var cached_results = yield _this6.getCacheProviderObject(_this6.type).get(key);
+              results = cached_results == null ? void 0 : cached_results.value;
 
-              _this6.getCacheProviderObject(_this6.type).set(key, {
-                value: results,
-                time: new Date().getTime()
-              }, _this6.getCacheConfig(_this6.type));
+              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, {
+                  value: results,
+                  time: new Date().getTime()
+                }, _this6.getCacheConfig(_this6.type));
+              }
+            } else {
+              results = yield _this6.database.multi_get(args.ids, true);
             }
-          } else {
-            results = yield _this6.database.multi_get(args.ids, true);
           }
-        }
 
-        _.remove(results, o => o.type != _this6.type);
+          _.remove(results, o => o.type != _this6.type);
 
-        if (args.skip_read_serialize != true && args.skip_serialize != true) {
-          results = yield _this6.do_serialize(results, "read", {}, args, (yield _this6.propsToBeRemoved(results)));
-        }
+          if (args.skip_read_serialize != true && args.skip_serialize != true) {
+            results = yield _this6.do_serialize(results, "read", {}, args, (yield _this6.propsToBeRemoved(results)));
+          }
+
+          if (args.skip_hooks != true) {
+            yield _this6.run_hook(results, "list", "after", args.context);
+          }
+
+          return results;
+        });
+
+        return function doGetMulti() {
+          return _ref5.apply(this, arguments);
+        };
+      }();
 
-        if (args.skip_hooks != true) {
-          yield _this6.run_hook(results, "list", "after", args.context);
+      try {
+        if (p) {
+          var _args9, _args9$ids;
+
+          return yield p.track(_this6.type + ".getMulti", doGetMulti, {
+            ids_count: ((_args9 = args) == null ? void 0 : (_args9$ids = _args9.ids) == null ? void 0 : _args9$ids.length) || 0
+          });
         }
 
-        return results;
+        return yield doGetMulti();
       } catch (e) {
         console.warn(e.stack);
         throw e;
@@ -796,7 +821,7 @@ class SpiceModel {
       var doUpdate =
       /*#__PURE__*/
       function () {
-        var _ref5 = _asyncToGenerator(function* () {
+        var _ref6 = _asyncToGenerator(function* () {
           _this8.updated_at = new SDate().now();
           var results = yield _this8.database.get(args.id);
           var item_exist = yield _this8.exist(results);
@@ -855,7 +880,7 @@ class SpiceModel {
         });
 
         return function doUpdate() {
-          return _ref5.apply(this, arguments);
+          return _ref6.apply(this, arguments);
         };
       }();
 
@@ -890,7 +915,7 @@ class SpiceModel {
       var doCreate =
       /*#__PURE__*/
       function () {
-        var _ref7 = _asyncToGenerator(function* () {
+        var _ref8 = _asyncToGenerator(function* () {
           var form;
           _this9.created_at = new SDate().now();
           args = _.defaults(args, {
@@ -950,7 +975,7 @@ class SpiceModel {
         });
 
         return function doCreate() {
-          return _ref7.apply(this, arguments);
+          return _ref8.apply(this, arguments);
         };
       }();
 
@@ -1000,7 +1025,7 @@ class SpiceModel {
       var doDelete =
       /*#__PURE__*/
       function () {
-        var _ref9 = _asyncToGenerator(function* () {
+        var _ref10 = _asyncToGenerator(function* () {
           var item_exist = yield _this11.exist(args.id);
 
           if (!item_exist) {
@@ -1018,7 +1043,7 @@ class SpiceModel {
           var dbOperation =
           /*#__PURE__*/
           function () {
-            var _ref10 = _asyncToGenerator(function* () {
+            var _ref11 = _asyncToGenerator(function* () {
               if (args.hard) {
                 delete_response = yield _this11.database.delete(args.id);
 
@@ -1031,7 +1056,7 @@ class SpiceModel {
             });
 
             return function dbOperation() {
-              return _ref10.apply(this, arguments);
+              return _ref11.apply(this, arguments);
             };
           }();
 
@@ -1049,7 +1074,7 @@ class SpiceModel {
         });
 
         return function doDelete() {
-          return _ref9.apply(this, arguments);
+          return _ref10.apply(this, arguments);
         };
       }();
 
@@ -1218,12 +1243,12 @@ class SpiceModel {
 
   createJoinSection(mappedNestings) {
     if (!mappedNestings || mappedNestings.length === 0) return "";
-    return mappedNestings.map((_ref11) => {
+    return mappedNestings.map((_ref12) => {
       var {
         alias,
         reference,
         is_array
-      } = _ref11;
+      } = _ref12;
       var keyspace = (0, _fix.fixCollection)(reference);
 
       if (is_array === true) {
@@ -1319,13 +1344,13 @@ class SpiceModel {
       var doList =
       /*#__PURE__*/
       function () {
-        var _ref12 = _asyncToGenerator(function* () {
-          var _args9, _args10, _args11;
+        var _ref13 = _asyncToGenerator(function* () {
+          var _args10, _args11, _args12;
 
           if (args.mapping_dept) _this12[_mapping_dept] = args.mapping_dept;
           if (args.mapping_dept_exempt) _this12[_mapping_dept_exempt] = args.mapping_dept_exempt; // Find alias tokens from query/columns/sort
 
-          var nestings = [..._this12.extractNestings(((_args9 = args) == null ? void 0 : _args9.query) || "", _this12.type), ..._this12.extractNestings(((_args10 = args) == null ? void 0 : _args10.columns) || "", _this12.type), ..._this12.extractNestings(((_args11 = args) == null ? void 0 : _args11.sort) || "", _this12.type)]; // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
+          var nestings = [..._this12.extractNestings(((_args10 = args) == null ? void 0 : _args10.query) || "", _this12.type), ..._this12.extractNestings(((_args11 = args) == null ? void 0 : _args11.columns) || "", _this12.type), ..._this12.extractNestings(((_args12 = args) == null ? void 0 : _args12.sort) || "", _this12.type)]; // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
 
           var mappedNestings = _.compact(_.uniq(nestings).map(alias => {
             var prop = _this12.props[alias];
@@ -1416,17 +1441,17 @@ class SpiceModel {
         });
 
         return function doList() {
-          return _ref12.apply(this, arguments);
+          return _ref13.apply(this, arguments);
         };
       }();
 
       try {
         if (p) {
-          var _args12, _args13;
+          var _args13, _args14;
 
           return yield p.track(_this12.type + ".list", doList, {
-            limit: (_args12 = args) == null ? void 0 : _args12.limit,
-            offset: (_args13 = args) == null ? void 0 : _args13.offset
+            limit: (_args13 = args) == null ? void 0 : _args13.limit,
+            offset: (_args14 = args) == null ? void 0 : _args14.offset
           });
         }
 
@@ -1450,7 +1475,7 @@ class SpiceModel {
       var doFetch =
       /*#__PURE__*/
       function () {
-        var _ref13 = _asyncToGenerator(function* () {
+        var _ref14 = _asyncToGenerator(function* () {
           if (args.is_custom_query === "true" && args.ids.length > 0) {
             return yield _this13.database.query(query);
           } else if (args.is_full_text === "true") {
@@ -1462,7 +1487,7 @@ class SpiceModel {
         });
 
         return function doFetch() {
-          return _ref13.apply(this, arguments);
+          return _ref14.apply(this, arguments);
         };
       }();
 
@@ -1474,12 +1499,12 @@ class SpiceModel {
     })();
   }
 
-  addHook(_ref14) {
+  addHook(_ref15) {
     var {
       operation,
       when,
       execute
-    } = _ref14;
+    } = _ref15;
 
     this[_hooks][operation][when].push(execute);
   }
@@ -1613,6 +1638,11 @@ class SpiceModel {
     var _this15 = this;
 
     return _asyncToGenerator(function* () {
+      var _this15$_ctx;
+
+      // ⚡ Get profiler for proper async context forking
+      var p = (_this15$_ctx = _this15[_ctx]) == null ? void 0 : _this15$_ctx.profiler;
+
       var original_is_array = _.isArray(data);
 
       if (!original_is_array) {
@@ -1633,19 +1663,40 @@ class SpiceModel {
         }); // Build the path for child models
 
 
-        var childPath = _this15[_current_path] ? _this15[_current_path] + "." + source_property : source_property;
-        var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-          return new obj(_extends({}, _this15[_args], {
-            skip_cache: _this15[_skip_cache],
-            _level: _this15[_level] + 1,
-            mapping_dept: _this15[_mapping_dept],
-            mapping_dept_exempt: _this15[_mapping_dept_exempt],
-            _current_path: childPath
-          })).getMulti({
-            skip_hooks: true,
-            ids: ids
+        var childPath = _this15[_current_path] ? _this15[_current_path] + "." + source_property : source_property; // ⚡ Wrap in profiler track() to ensure proper async context for child operations
+
+        var fetchRelated =
+        /*#__PURE__*/
+        function () {
+          var _ref16 = _asyncToGenerator(function* () {
+            return yield Promise.allSettled(_.map(classes, obj => {
+              return new obj(_extends({}, _this15[_args], {
+                skip_cache: _this15[_skip_cache],
+                _level: _this15[_level] + 1,
+                mapping_dept: _this15[_mapping_dept],
+                mapping_dept_exempt: _this15[_mapping_dept_exempt],
+                _current_path: childPath
+              })).getMulti({
+                skip_hooks: true,
+                ids: ids
+              });
+            }));
           });
-        }));
+
+          return function fetchRelated() {
+            return _ref16.apply(this, arguments);
+          };
+        }();
+
+        var returned_all;
+
+        if (p && ids.length > 0) {
+          returned_all = yield p.track(_this15.type + ".map." + source_property, fetchRelated, {
+            ids_count: ids.length
+          });
+        } else {
+          returned_all = yield fetchRelated();
+        }
 
         var ug = _.flatten(_.compact(_.map(returned_all, returned_obj => {
           if (returned_obj.status == "fulfilled") return returned_obj.value;
@@ -1668,6 +1719,11 @@ class SpiceModel {
     var _this16 = this;
 
     return _asyncToGenerator(function* () {
+      var _this16$_ctx;
+
+      // ⚡ Get profiler for proper async context forking
+      var p = (_this16$_ctx = _this16[_ctx]) == null ? void 0 : _this16$_ctx.profiler;
+
       var original_is_array = _.isArray(data);
 
       if (!original_is_array) {
@@ -1698,28 +1754,45 @@ class SpiceModel {
 
         var childPath = _this16[_current_path] ? _this16[_current_path] + "." + source_property : source_property;
 
-        var classes = _.compact(_.isArray(Class) ? Class : [Class]);
+        var classes = _.compact(_.isArray(Class) ? Class : [Class]); // ⚡ Wrap in profiler track() to ensure proper async context for child operations
+
+
+        var fetchRelated =
+        /*#__PURE__*/
+        function () {
+          var _ref17 = _asyncToGenerator(function* () {
+            return yield Promise.allSettled(_.map(classes, obj => {
+              return new obj(_extends({}, _this16[_args], {
+                skip_cache: _this16[_skip_cache],
+                _level: _this16[_level] + 1,
+                mapping_dept: _this16[_mapping_dept],
+                mapping_dept_exempt: _this16[_mapping_dept_exempt],
+                _current_path: childPath
+              })).getMulti({
+                skip_hooks: true,
+                ids: ids
+              });
+            }));
+          });
+
+          return function fetchRelated() {
+            return _ref17.apply(this, arguments);
+          };
+        }();
+
+        var returned_all;
 
-        var returned_all = yield Promise.allSettled(_.map(classes, obj => {
-          return new obj(_extends({}, _this16[_args], {
-            skip_cache: _this16[_skip_cache],
-            _level: _this16[_level] + 1,
-            mapping_dept: _this16[_mapping_dept],
-            mapping_dept_exempt: _this16[_mapping_dept_exempt],
-            _current_path: childPath
-          })).getMulti({
-            skip_hooks: true,
-            ids: ids
+        if (p && ids.length > 0) {
+          returned_all = yield p.track(_this16.type + ".mapArray." + source_property, fetchRelated, {
+            ids_count: ids.length
           });
-        }));
+        } else {
+          returned_all = yield fetchRelated();
+        }
 
         var returned_objects = _.flatten(_.compact(_.map(returned_all, returned_obj => {
           if (returned_obj.status == "fulfilled") return returned_obj.value;
         })));
-        /* let returned_objects = await new Class().getMulti({
-        ids: ids,
-        }); */
-
 
         _.each(data, result => {
           if (_.isString(result[store_property])) {
@@ -1740,13 +1813,13 @@ class SpiceModel {
     })();
   }
 
-  addModifier(_ref15) {
+  addModifier(_ref18) {
     var {
       when,
       execute,
       field = null,
       sourceField = null
-    } = _ref15;
+    } = _ref18;
 
     if (this[_serializers][when]) {
       // Store as object with field info for column-based filtering
@@ -1905,7 +1978,7 @@ class SpiceModel {
       var doSerialize =
       /*#__PURE__*/
       function () {
-        var _ref16 = _asyncToGenerator(function* () {
+        var _ref19 = _asyncToGenerator(function* () {
           var _this18$_serializers, _this18$_serializers$;
 
           // Early exit if serialization should not run.
@@ -1996,7 +2069,7 @@ class SpiceModel {
         });
 
         return function doSerialize() {
-          return _ref16.apply(this, arguments);
+          return _ref19.apply(this, arguments);
         };
       }();
 

package/package.json

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

package/src/models/SpiceModel.js

@@ -606,7 +606,10 @@ export default class SpiceModel {
   }
 
   async getMulti(args) {
-    try {
+    // ⚡ Profiling: use track() for proper async context forking
+    const p = this[_ctx]?.profiler;
+
+    const doGetMulti = async () => {
       if (!args) {
         args = {};
       }
@@ -653,6 +656,15 @@ export default class SpiceModel {
       }
 
       return results;
+    };
+
+    try {
+      if (p) {
+        return await p.track(`${this.type}.getMulti`, doGetMulti, {
+          ids_count: args?.ids?.length || 0,
+        });
+      }
+      return await doGetMulti();
     } catch (e) {
       console.warn(e.stack);
       throw e;
@@ -1445,6 +1457,9 @@ export default class SpiceModel {
   }
 
   async mapToObject(data, Class, source_property, store_property, property) {
+    // ⚡ Get profiler for proper async context forking
+    const p = this[_ctx]?.profiler;
+
     let original_is_array = _.isArray(data);
     if (!original_is_array) {
       data = Array.of(data);
@@ -1469,21 +1484,36 @@ export default class SpiceModel {
           `${this[_current_path]}.${source_property}`
         : source_property;
 
-      var returned_all = await Promise.allSettled(
-        _.map(classes, (obj) => {
-          return new obj({
-            ...this[_args],
-            skip_cache: this[_skip_cache],
-            _level: this[_level] + 1,
-            mapping_dept: this[_mapping_dept],
-            mapping_dept_exempt: this[_mapping_dept_exempt],
-            _current_path: childPath,
-          }).getMulti({
-            skip_hooks: true,
-            ids: ids,
-          });
-        })
-      );
+      // ⚡ Wrap in profiler track() to ensure proper async context for child operations
+      const fetchRelated = async () => {
+        return await Promise.allSettled(
+          _.map(classes, (obj) => {
+            return new obj({
+              ...this[_args],
+              skip_cache: this[_skip_cache],
+              _level: this[_level] + 1,
+              mapping_dept: this[_mapping_dept],
+              mapping_dept_exempt: this[_mapping_dept_exempt],
+              _current_path: childPath,
+            }).getMulti({
+              skip_hooks: true,
+              ids: ids,
+            });
+          })
+        );
+      };
+
+      var returned_all;
+      if (p && ids.length > 0) {
+        returned_all = await p.track(
+          `${this.type}.map.${source_property}`,
+          fetchRelated,
+          { ids_count: ids.length }
+        );
+      } else {
+        returned_all = await fetchRelated();
+      }
+
       let ug = _.flatten(
         _.compact(
           _.map(returned_all, (returned_obj) => {
@@ -1511,6 +1541,9 @@ export default class SpiceModel {
     store_property,
     property
   ) {
+    // ⚡ Get profiler for proper async context forking
+    const p = this[_ctx]?.profiler;
+
     let original_is_array = _.isArray(data);
     if (!original_is_array) {
       data = Array.of(data);
@@ -1540,21 +1573,36 @@ export default class SpiceModel {
         : source_property;
 
       let classes = _.compact(_.isArray(Class) ? Class : [Class]);
-      var returned_all = await Promise.allSettled(
-        _.map(classes, (obj) => {
-          return new obj({
-            ...this[_args],
-            skip_cache: this[_skip_cache],
-            _level: this[_level] + 1,
-            mapping_dept: this[_mapping_dept],
-            mapping_dept_exempt: this[_mapping_dept_exempt],
-            _current_path: childPath,
-          }).getMulti({
-            skip_hooks: true,
-            ids: ids,
-          });
-        })
-      );
+
+      // ⚡ Wrap in profiler track() to ensure proper async context for child operations
+      const fetchRelated = async () => {
+        return await Promise.allSettled(
+          _.map(classes, (obj) => {
+            return new obj({
+              ...this[_args],
+              skip_cache: this[_skip_cache],
+              _level: this[_level] + 1,
+              mapping_dept: this[_mapping_dept],
+              mapping_dept_exempt: this[_mapping_dept_exempt],
+              _current_path: childPath,
+            }).getMulti({
+              skip_hooks: true,
+              ids: ids,
+            });
+          })
+        );
+      };
+
+      var returned_all;
+      if (p && ids.length > 0) {
+        returned_all = await p.track(
+          `${this.type}.mapArray.${source_property}`,
+          fetchRelated,
+          { ids_count: ids.length }
+        );
+      } else {
+        returned_all = await fetchRelated();
+      }
 
       var returned_objects = _.flatten(
         _.compact(
@@ -1564,9 +1612,6 @@ export default class SpiceModel {
         )
       );
 
-      /* let returned_objects = await new Class().getMulti({
-      ids: ids,
-    }); */
       _.each(data, (result) => {
         if (_.isString(result[store_property])) {
           result[store_property] = [result[store_property]];