spice-js 2.6.52 → 2.6.54

package/build/models/SpiceModel.js

@@ -19,8 +19,6 @@ 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); }); }; }
 
-global.mapping_dept = "*";
-
 var co = require("co");
 
 var regeneratorRuntime = require("regenerator-runtime");
@@ -37,7 +35,8 @@ var SDate = require("sonover-date"),
     _external_modifier_loaded = Symbol(),
     _skip_cache = Symbol(),
     _serializers = Symbol(),
-    _level = Symbol(); //const _type = Symbol("type");
+    _level = Symbol(),
+    _mapping_dept = Symbol(); //const _type = Symbol("type");
 
 
 var that;
@@ -59,20 +58,21 @@ class SpiceModel {
     }
 
     try {
-      var _args$args, _args2, _args2$args, _args3, _args3$args, _args4, _args4$args;
+      var _args2, _args2$args, _args$args, _args3, _args3$args, _args4, _args4$args, _args5, _args5$args;
 
       var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
 
       var Database = require("spice-" + dbtype);
 
+      this[_mapping_dept] = ((_args2 = args) == null ? void 0 : (_args2$args = _args2.args) == null ? void 0 : _args2$args.mapping_dept) || 100;
       this.type = "";
       this.collection = args.connection;
       this[_args] = args.args;
       this[_external_modifier_loaded] = false;
       this[_disable_lifecycle_events] = ((_args$args = args.args) == null ? void 0 : _args$args.disable_lifecycle_events) || false;
-      this[_ctx] = (_args2 = args) == null ? void 0 : (_args2$args = _args2.args) == null ? void 0 : _args2$args.ctx;
-      this[_skip_cache] = ((_args3 = args) == null ? void 0 : (_args3$args = _args3.args) == null ? void 0 : _args3$args.skip_cache) || false;
-      this[_level] = ((_args4 = args) == null ? void 0 : (_args4$args = _args4.args) == null ? void 0 : _args4$args._level) || 0;
+      this[_ctx] = (_args3 = args) == null ? void 0 : (_args3$args = _args3.args) == null ? void 0 : _args3$args.ctx;
+      this[_skip_cache] = ((_args4 = args) == null ? void 0 : (_args4$args = _args4.args) == null ? void 0 : _args4$args.skip_cache) || false;
+      this[_level] = ((_args5 = args) == null ? void 0 : (_args5$args = _args5.args) == null ? void 0 : _args5$args._level) || 0;
       this[_hooks] = {
         create: {
           before: [],
@@ -566,9 +566,7 @@ class SpiceModel {
 
     return _asyncToGenerator(function* () {
       try {
-        var _args5;
-
-        global.mapping_dept = ((_args5 = args) == null ? void 0 : _args5.mapping_dept) ? Number(args.mapping_dept) : global.mapping_dept;
+        if (args.mapping_dept) _this4[_mapping_dept] = args.mapping_dept;
 
         if (!args) {
           args = {};
@@ -993,9 +991,10 @@ class SpiceModel {
       }
 
       try {
-        var _args6, _args7, _args8, _args9;
+        var _args6, _args7, _args8;
 
         args.columns = _this12.prepColumns(args.columns);
+        if (args.mapping_dept) _this12[_mapping_dept] = args.mapping_dept;
         var nestings = [..._this12.extractNestings((_args6 = args) == null ? void 0 : _args6.query, _this12.type), ..._this12.extractNestings((_args7 = args) == null ? void 0 : _args7.columns, _this12.type), ..._this12.extractNestings((_args8 = args) == null ? void 0 : _args8.sort, _this12.type)];
 
         var mappedNestings = _.compact(_.uniq(nestings).map(nesting => {
@@ -1028,7 +1027,6 @@ class SpiceModel {
 
         args.limit = Number(args.limit) || undefined;
         args.offset = Number(args.offset) || 0;
-        global.mapping_dept = ((_args9 = args) == null ? void 0 : _args9.mapping_dept) ? Number(args.mapping_dept) : global.mapping_dept;
         args.sort = args.sort ? args.sort.split(",").map(item => item.includes(".") ? item : "`" + _this12.type + "`." + _this12.formatSortComponent(item)).join(",") : "`" + _this12.type + "`.created_at DESC";
 
         if (args.skip_hooks !== true) {
@@ -1158,7 +1156,9 @@ class SpiceModel {
         data = Array.of(data);
       }
 
-      if (_this15[_level] < global.mapping_dept || global.mapping_dept == "*") {
+      _this15[_mapping_dept];
+
+      if (_this15[_level] + 1 < _this15[_mapping_dept]) {
         var classes = _.isArray(Class) ? Class : [Class];
         var ids = [];
 
@@ -1171,7 +1171,8 @@ class SpiceModel {
         var returned_all = yield Promise.allSettled(_.map(classes, obj => {
           return new obj(_extends({}, _this15[_args], {
             skip_cache: _this15[_skip_cache],
-            _level: _this15[_level] + 1
+            _level: _this15[_level] + 1,
+            mapping_dept: _this15[_mapping_dept]
           })).getMulti({
             skip_hooks: true,
             ids: ids
@@ -1205,7 +1206,7 @@ class SpiceModel {
         data = Array.of(data);
       }
 
-      if (_this16[_level] < global.mapping_dept || global.mapping_dept == "*") {
+      if (_this16[_level] + 1 < _this16[_mapping_dept]) {
         var ids = [];
 
         _.each(data, result => {
@@ -1228,7 +1229,8 @@ class SpiceModel {
         var returned_all = yield Promise.allSettled(_.map(classes, obj => {
           return new obj(_extends({}, _this16[_args], {
             skip_cache: _this16[_skip_cache],
-            _level: _this16[_level] + 1
+            _level: _this16[_level] + 1,
+            mapping_dept: _this16[_mapping_dept]
           })).getMulti({
             skip_hooks: true,
             ids: ids

package/package.json

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

package/src/models/SpiceModel.js

@@ -1,5 +1,5 @@
 "use strict";
-global.mapping_dept = "*";
+
 import { MapType, DataType } from "..";
 let co = require("co");
 var regeneratorRuntime = require("regenerator-runtime");
@@ -19,9 +19,11 @@ var SDate = require("sonover-date"),
   _external_modifier_loaded = Symbol(),
   _skip_cache = Symbol(),
   _serializers = Symbol(),
-  _level = Symbol();
+  _level = Symbol(),
+  _mapping_dept = Symbol();
 
 //const _type = Symbol("type");
+
 let that;
 if (!Promise.allSettled) {
   Promise.allSettled = (promises) =>
@@ -45,6 +47,7 @@ export default class SpiceModel {
       var dbtype =
         spice.config.database.connections[args.connection].type || "couchbase";
       let Database = require(`spice-${dbtype}`);
+      this[_mapping_dept] = args?.args?.mapping_dept || 100;
       this.type = "";
       this.collection = args.connection;
       this[_args] = args.args;
@@ -476,9 +479,7 @@ export default class SpiceModel {
 
   async get(args) {
     try {
-      global.mapping_dept = args?.mapping_dept
-        ? Number(args.mapping_dept)
-        : global.mapping_dept;
+      if (args.mapping_dept) this[_mapping_dept] = args.mapping_dept;
 
       if (!args) {
         args = {};
@@ -876,9 +877,13 @@ export default class SpiceModel {
           nesting.type === Array ||
           nesting.type === "array"
         ) {
-          return `LEFT NEST \`${fixCollection(nesting.reference)}\` AS \`${nesting.alias}\` ON KEYS \`${this.type}\`.\`${nesting.alias}\``;
+          return `LEFT NEST \`${fixCollection(nesting.reference)}\` AS \`${
+            nesting.alias
+          }\` ON KEYS \`${this.type}\`.\`${nesting.alias}\``;
         } else {
-          return `LEFT JOIN \`${fixCollection(nesting.reference)}\` AS \`${nesting.alias}\` ON KEYS \`${this.type}\`.\`${nesting.alias}\``;
+          return `LEFT JOIN \`${fixCollection(nesting.reference)}\` AS \`${
+            nesting.alias
+          }\` ON KEYS \`${this.type}\`.\`${nesting.alias}\``;
         }
       })
       .join(" ");
@@ -897,6 +902,7 @@ export default class SpiceModel {
   async list(args = {}) {
     try {
       args.columns = this.prepColumns(args.columns);
+      if (args.mapping_dept) this[_mapping_dept] = args.mapping_dept;
 
       const nestings = [
         ...this.extractNestings(args?.query, this.type),
@@ -937,9 +943,6 @@ export default class SpiceModel {
 
       args.limit = Number(args.limit) || undefined;
       args.offset = Number(args.offset) || 0;
-      global.mapping_dept = args?.mapping_dept
-        ? Number(args.mapping_dept)
-        : global.mapping_dept;
       args.sort = args.sort
         ? args.sort
             .split(",")
@@ -1080,8 +1083,9 @@ export default class SpiceModel {
     if (!original_is_array) {
       data = Array.of(data);
     }
+    this[_mapping_dept];
 
-    if (this[_level] < global.mapping_dept || global.mapping_dept == "*") {
+    if (this[_level] + 1 < this[_mapping_dept]) {
       let classes = _.isArray(Class) ? Class : [Class];
 
       let ids = [];
@@ -1100,6 +1104,7 @@ export default class SpiceModel {
             ...this[_args],
             skip_cache: this[_skip_cache],
             _level: this[_level] + 1,
+            mapping_dept: this[_mapping_dept],
           }).getMulti({
             skip_hooks: true,
             ids: ids,
@@ -1137,8 +1142,7 @@ export default class SpiceModel {
     if (!original_is_array) {
       data = Array.of(data);
     }
-
-    if (this[_level] < global.mapping_dept || global.mapping_dept == "*") {
+    if (this[_level] + 1 < this[_mapping_dept]) {
       let ids = [];
       _.each(data, (result) => {
         let value = [];
@@ -1162,6 +1166,7 @@ export default class SpiceModel {
             ...this[_args],
             skip_cache: this[_skip_cache],
             _level: this[_level] + 1,
+            mapping_dept: this[_mapping_dept],
           }).getMulti({
             skip_hooks: true,
             ids: ids,