spice-js 2.6.52 → 2.6.53

package/package.json

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