spice-js 2.6.34 → 2.6.36

package/build/models/SpiceModel.js

@@ -883,7 +883,7 @@ class SpiceModel {
 
     return _asyncToGenerator(function* () {
       try {
-        var _args4, _args5, _args6;
+        var _args4, _args5, _args6, _args7;
 
         if (!args) {
           args = {};
@@ -938,16 +938,56 @@ class SpiceModel {
         }
 
         function extractNestings(string, localType) {
-          var returnVal = [];
-          var regex = /(\w+)\./g;
+          var returnVal = []; // Regex for nested properties, including backtick-quoted ones
+
+          var regex = /(`?\w+`?)\.(`?\w+`?)/g;
           var match;
 
-          while (match = regex.exec(string)) {
-            if (match[1] != localType) returnVal.push(match[1]);
+          while ((match = regex.exec(string)) !== null) {
+            var first = match[1].replace(/`/g, "");
+            var second = match[2].replace(/`/g, "");
+
+            if (first !== localType) {
+              returnVal.push(first);
+            }
+          } // Regex for ANY/EVERY clauses
+
+
+          var queryRegex = /(ANY|EVERY)\s+\w+\s+IN\s+`?(\w+)`?/g;
+          var queryMatch;
+
+          while ((queryMatch = queryRegex.exec(string)) !== null) {
+            returnVal.push(queryMatch[2]);
           }
 
-          return returnVal;
+          return [...new Set(returnVal)]; // Remove duplicates
         }
+        /* function extractNestings(string, localType) {
+          let returnVal = [];
+          let regex = /(\w+)\.(\w+)/g;
+          let match;
+           while ((match = regex.exec(string)) !== null) {
+            if (match[1] !== localType) {
+              returnVal.push(match[1]);
+            } else {
+              returnVal.push(match[2]);
+            }
+          }
+           return [...new Set(returnVal)]; // Remove duplicates
+        } */
+
+        /*  function extractNestings(string, localType) {
+          let returnVal = [];
+          let regex = /(\w+)\./g;
+          let match = regex.exec(string);
+          console.log("Local:", localType, match);
+          while (match) {
+            if (match[1] != localType) returnVal.push(match[1]);
+          }
+          return returnVal;
+        } */
+        //console.log("Query", args?.query);
+
 
         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)];
 
@@ -960,6 +1000,7 @@ class SpiceModel {
                 return {
                   alias: nesting,
                   reference: prop.map.reference.toLowerCase(),
+                  type: prop.type,
                   value_field: prop.map.value_field
                 };
               }
@@ -972,7 +1013,11 @@ class SpiceModel {
           var joinSection = "";
 
           _.each(nestings, nesting => {
-            joinSection += "LEFT JOIN `" + nesting.reference + "` AS `" + nesting.alias + "` ON KEYS `" + that.type + "`.`" + nesting.alias + "` ";
+            if (nesting.type == _2.DataType.ARRAY || nesting.type == Array || nesting.type == "array") {
+              joinSection += "NEST `" + nesting.reference + "` AS `" + nesting.alias + "` ON KEYS `" + that.type + "`.`" + nesting.alias + "` ";
+            } else {
+              joinSection += "LEFT JOIN `" + nesting.reference + "` AS `" + nesting.alias + "` ON KEYS `" + that.type + "`.`" + nesting.alias + "` ";
+            }
           });
 
           return joinSection;
@@ -980,6 +1025,7 @@ class SpiceModel {
 
         var _join = createJoinSection(mappedNestings);
 
+        console.log("Props", that.type, nestings, _join, (_args7 = args) == null ? void 0 : _args7.query);
         args._join = _join;
 
         if (args.is_full_text && args.is_full_text === "true" || args.is_custom_query && args.is_custom_query === "true") {

package/package.json

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

package/src/models/SpiceModel.js

@@ -151,7 +151,7 @@ export default class SpiceModel {
       for (let i in args.props) {
         if (args.args != undefined) {
           if (args.args[i] != undefined) {
-            switch (args.props[i]?.type) {
+            switch (args.props[i].type) {
               case String:
               case "string": {
                 this[i] = args.args[i];
@@ -236,7 +236,7 @@ export default class SpiceModel {
         let returned = await new this[_ctx].state.process_fields().process(
           this[_ctx],
           data,
-          this?.type
+          this.type
         );
         return returned;
       } else {
@@ -453,7 +453,7 @@ export default class SpiceModel {
 
   async shouldForceRefresh(response) {
     let obj = this.getCacheProviderObject();
-    let monitor_record = await obj.get(`monitor::${this?.type}`);
+    let monitor_record = await obj.get(`monitor::${this.type}`);
     if (monitor_record == undefined) {
       return false;
     }
@@ -466,7 +466,7 @@ export default class SpiceModel {
   setMonitor() {
     let current_time = new Date().getTime();
     let obj = this.getCacheProviderObject();
-    let key = `monitor::${this?.type}`;
+    let key = `monitor::${this.type}`;
     let value = { time: current_time };
     obj.set(key, value, { ttl: 0 });
   }
@@ -480,10 +480,10 @@ export default class SpiceModel {
         if (args.skip_hooks != true) {
           await this.run_hook(args, "get", "before");
         }
-        let key = `get::${this?.type}::${args.id}`;
+        let key = `get::${this.type}::${args.id}`;
         let results = {};
-        if (this.shouldUseCache(this?.type)) {
-          let cached_results = await this.getCacheProviderObject(this?.type).get(
+        if (this.shouldUseCache(this.type)) {
+          let cached_results = await this.getCacheProviderObject(this.type).get(
             key
           );
 
@@ -491,30 +491,30 @@ export default class SpiceModel {
           if (
             cached_results?.value == undefined ||
             (await this.shouldForceRefresh(cached_results)) ||
-            this?.type == "workflow"
+            this.type == "workflow"
           ) {
             results = await this.database.get(args.id);
-            await this.getCacheProviderObject(this?.type).set(
+            await this.getCacheProviderObject(this.type).set(
               key,
               { value: results, time: new Date().getTime() },
-              this.getCacheConfig(this?.type)
+              this.getCacheConfig(this.type)
             );
           }
         } else {
           results = await this.database.get(args.id);
         }
 
-        if (results?.type != undefined) {
-          if (results.type != this?.type)
-            throw new Error(`${this?.type} does not exist type`);
+        if (results.type != undefined) {
+          if (results.type != this.type)
+            throw new Error(`${this.type} does not exist type`);
         }
 
-        if (results?._type != undefined) {
-          if (results._type != this?.type)
-            throw new Error(`${this?.type} does not exist _type`);
+        if (results._type != undefined) {
+          if (results._type != this.type)
+            throw new Error(`${this.type} does not exist _type`);
         }
 
-        if (results?.deleted == undefined || results?.deleted == false) {
+        if (results.deleted == undefined || results.deleted == false) {
           if (args.skip_read_serialize != true && args.skip_serialize != true) {
             results = await this.do_serialize(
               results,
@@ -529,7 +529,7 @@ export default class SpiceModel {
           }
           return results;
         } else {
-          throw new Error(`${this?.type} does not exist`);
+          throw new Error(`${this.type} does not exist`);
         }
       }
     } catch (e) {
@@ -556,11 +556,11 @@ export default class SpiceModel {
         await this.run_hook(this, "list", "before");
       }
       _.remove(args.ids, (o) => o == undefined);
-      let key = `multi-get::${this?.type}::${_.join(args.ids, "|")}`;
+      let key = `multi-get::${this.type}::${_.join(args.ids, "|")}`;
       let results = [];
       if (args.ids.length > 0) {
-        if (this.shouldUseCache(this?.type)) {
-          let cached_results = await this.getCacheProviderObject(this?.type).get(
+        if (this.shouldUseCache(this.type)) {
+          let cached_results = await this.getCacheProviderObject(this.type).get(
             key
           );
           results = cached_results?.value;
@@ -569,17 +569,17 @@ export default class SpiceModel {
             (await this.shouldForceRefresh(cached_results))
           ) {
             results = await this.database.multi_get(args.ids, true);
-            this.getCacheProviderObject(this?.type).set(
+            this.getCacheProviderObject(this.type).set(
               key,
               { value: results, time: new Date().getTime() },
-              this.getCacheConfig(this?.type)
+              this.getCacheConfig(this.type)
             );
           }
         } else {
           results = await this.database.multi_get(args.ids, true);
         }
       }
-      _.remove(results, (o) => o?.type != this?.type);
+      _.remove(results, (o) => o.type != this.type);
       if (args.skip_read_serialize != true && args.skip_serialize != true) {
         results = await this.do_serialize(
           results,
@@ -605,22 +605,22 @@ export default class SpiceModel {
     try {
       if (_.isString(data)) {
         let result = await this.database.get(data);
-        if (result?.type)
-          if (result.type != this?.type) {
+        if (result.type)
+          if (result.type != this.type) {
             return false;
           }
-        if (result?._type)
-          if (result._type != this?.type) {
+        if (result._type)
+          if (result._type != this.type) {
             return false;
           }
       } else {
-        if (data?.type)
-          if (data.type != this?.type) {
+        if (data.type)
+          if (data.type != this.type) {
             return false;
           }
 
-        if (data?._type)
-          if (data._type != this?.type) {
+        if (data._type)
+          if (data._type != this.type) {
             return false;
           }
       }
@@ -636,7 +636,7 @@ export default class SpiceModel {
       let results = await this.database.get(args.id);
       let item_exist = await this.exist(results);
       if (!item_exist) {
-        throw new Error(`${this?.type} does not exist. in update`);
+        throw new Error(`${this.type} does not exist. in update`);
       }
       delete results["id"];
       _.defaults(this, results);
@@ -697,7 +697,7 @@ export default class SpiceModel {
     try {
       let form;
       this.created_at = new SDate().now();
-      args = _.defaults(args, { id_prefix: this?.type });
+      args = _.defaults(args, { id_prefix: this.type });
       if (args.body) {
         form = _.defaults({}, args.body);
         form.created_at = this.created_at;
@@ -753,7 +753,7 @@ export default class SpiceModel {
     let item_exist = await this.exist(args.id);
 
     if (!item_exist) {
-      throw new Error(`${this?.type} does not exist.`);
+      throw new Error(`${this.type} does not exist.`);
     }
     let results = await this.database.get(args.id);
     try {
@@ -831,20 +831,64 @@ export default class SpiceModel {
         }
         return data;
       }
+
       function extractNestings(string, localType) {
         let returnVal = [];
-        let regex = /(\w+)\./g;
+
+        // Regex for nested properties, including backtick-quoted ones
+        let regex = /(`?\w+`?)\.(`?\w+`?)/g;
+        let match;
+
+        while ((match = regex.exec(string)) !== null) {
+          let first = match[1].replace(/`/g, "");
+          let second = match[2].replace(/`/g, "");
+          if (first !== localType) {
+            returnVal.push(first);
+          }
+        }
+        // Regex for ANY/EVERY clauses
+        let queryRegex = /(ANY|EVERY)\s+\w+\s+IN\s+`?(\w+)`?/g;
+        let queryMatch;
+
+        while ((queryMatch = queryRegex.exec(string)) !== null) {
+          returnVal.push(queryMatch[2]);
+        }
+
+        return [...new Set(returnVal)]; // Remove duplicates
+      }
+
+      /* function extractNestings(string, localType) {
+        let returnVal = [];
+        let regex = /(\w+)\.(\w+)/g;
         let match;
-        while ((match = regex.exec(string))) {
+
+        while ((match = regex.exec(string)) !== null) {
+          if (match[1] !== localType) {
+            returnVal.push(match[1]);
+          } else {
+            returnVal.push(match[2]);
+          }
+        }
+
+        return [...new Set(returnVal)]; // Remove duplicates
+      } */
+      /*  function extractNestings(string, localType) {
+        let returnVal = [];
+        let regex = /(\w+)\./g;
+        let match = regex.exec(string);
+        console.log("Local:", localType, match);
+        while (match) {
           if (match[1] != localType) returnVal.push(match[1]);
         }
         return returnVal;
-      }
+      } */
+
+      //console.log("Query", args?.query);
 
       let nestings = [
-        ...extractNestings(args?.query, this?.type),
-        ...extractNestings(args?.columns, this?.type),
-        ...extractNestings(args?.sort, this?.type),
+        ...extractNestings(args?.query, this.type),
+        ...extractNestings(args?.columns, this.type),
+        ...extractNestings(args?.sort, this.type),
       ];
       let mappedNestings = _.compact(
         _.map(_.uniq(nestings), (nesting) => {
@@ -855,6 +899,7 @@ export default class SpiceModel {
                 return {
                   alias: nesting,
                   reference: prop.map.reference.toLowerCase(),
+                  type: prop.type,
                   value_field: prop.map.value_field,
                 };
               }
@@ -867,11 +912,21 @@ export default class SpiceModel {
         //create join section with nestings
         let joinSection = "";
         _.each(nestings, (nesting) => {
-          joinSection += `LEFT JOIN \`${nesting.reference}\` AS \`${nesting.alias}\` ON KEYS \`${that.type}\`.\`${nesting.alias}\` `;
+          if (
+            nesting.type == DataType.ARRAY ||
+            nesting.type == Array ||
+            nesting.type == "array"
+          ) {
+            joinSection += `NEST \`${nesting.reference}\` AS \`${nesting.alias}\` ON KEYS \`${that.type}\`.\`${nesting.alias}\` `;
+          } else {
+            joinSection += `LEFT JOIN \`${nesting.reference}\` AS \`${nesting.alias}\` ON KEYS \`${that.type}\`.\`${nesting.alias}\` `;
+          }
         });
         return joinSection;
       }
       let _join = createJoinSection(mappedNestings);
+      console.log("Props", that.type, nestings, _join, args?.query);
+
       args._join = _join;
 
       if (
@@ -886,9 +941,9 @@ export default class SpiceModel {
           if (args.query) {
             query =
               args.query +
-              ` AND (\`${this?.type}\`.deleted = false OR \`${this?.type}\`.deleted IS MISSING) `;
+              ` AND (\`${this.type}\`.deleted = false OR \`${this.type}\`.deleted IS MISSING) `;
           } else {
-            query = `(\`${this?.type}\`.deleted = false OR \`${this?.type}\`.deleted IS MISSING) `;
+            query = `(\`${this.type}\`.deleted = false OR \`${this.type}\`.deleted IS MISSING) `;
           }
         }
       }
@@ -913,7 +968,7 @@ export default class SpiceModel {
       }
 
       if (!args.sort) {
-        args.sort = `\`${this?.type}\`.created_at DESC`;
+        args.sort = `\`${this.type}\`.created_at DESC`;
       } else {
         let 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
@@ -921,7 +976,7 @@ export default class SpiceModel {
         for (let i = 0; i < sort_array.length; i++) {
           if (!sort_array[i].includes(".")) {
             new_sort_array.push(
-              `\`${this?.type}\`.${formatSortComponent(sort_array[i])}`
+              `\`${this.type}\`.${formatSortComponent(sort_array[i])}`
             );
           } else {
             new_sort_array.push(sort_array[i]);
@@ -936,15 +991,15 @@ export default class SpiceModel {
         return str.replace(/[^a-zA-Z0-9]/g, "");
       }
       let key = removeSpaceAndSpecialCharacters(
-        `list::${this?.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}`
+        `list::${this.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}`
       );
 
       let results;
       if (args.is_custom_query && args.is_custom_query === "true") {
         if (args.ids.length > 0) {
-          if (this.shouldUseCache(this?.type)) {
+          if (this.shouldUseCache(this.type)) {
             let cached_results = await this.getCacheProviderObject(
-              this?.type
+              this.type
             ).get(key);
             results = cached_results?.value;
             if (
@@ -952,10 +1007,10 @@ export default class SpiceModel {
               (await this.shouldForceRefresh(cached_results))
             ) {
               results = await this.database.query(query);
-              this.getCacheProviderObject(this?.type).set(
+              this.getCacheProviderObject(this.type).set(
                 key,
                 { value: results, time: new Date().getTime() },
-                this.getCacheConfig(this?.type)
+                this.getCacheConfig(this.type)
               );
             }
           } else {
@@ -964,9 +1019,9 @@ export default class SpiceModel {
         }
       } else {
         if (args.is_full_text && args.is_full_text === "true") {
-          if (this.shouldUseCache(this?.type)) {
+          if (this.shouldUseCache(this.type)) {
             let cached_results = await this.getCacheProviderObject(
-              this?.type
+              this.type
             ).get(key);
             results = cached_results?.value;
             if (
@@ -974,21 +1029,21 @@ export default class SpiceModel {
               (await this.shouldForceRefresh(cached_results))
             ) {
               results = await this.database.full_text_search(
-                this?.type,
+                this.type,
                 query || "",
                 args.limit,
                 args.offset,
                 args._join
               );
-              this.getCacheProviderObject(this?.type).set(
+              this.getCacheProviderObject(this.type).set(
                 key,
                 { value: results, time: new Date().getTime() },
-                this.getCacheConfig(this?.type)
+                this.getCacheConfig(this.type)
               );
             }
           } else {
             results = await this.database.full_text_search(
-              this?.type,
+              this.type,
               query || "",
               args.limit,
               args.offset,
@@ -996,16 +1051,16 @@ export default class SpiceModel {
             );
           }
         } else {
-          if (this.shouldUseCache(this?.type)) {
+          if (this.shouldUseCache(this.type)) {
             let cached_results = await this.getCacheProviderObject(
-              this?.type
+              this.type
             ).get(key);
             results = cached_results?.value;
             let shouleForceRefresh =
               await this.shouldForceRefresh(cached_results);
             if (cached_results?.value == undefined || shouleForceRefresh) {
               results = await this.database.search(
-                this?.type,
+                this.type,
                 args.columns || "",
                 query || "",
                 args.limit,
@@ -1015,15 +1070,15 @@ export default class SpiceModel {
                 args.statement_consistent,
                 args._join
               );
-              this.getCacheProviderObject(this?.type).set(
+              this.getCacheProviderObject(this.type).set(
                 key,
                 { value: results, time: new Date().getTime() },
-                this.getCacheConfig(this?.type)
+                this.getCacheConfig(this.type)
               );
             }
           } else {
             results = await this.database.search(
-              this?.type,
+              this.type,
               args.columns || "",
               query || "",
               args.limit,
@@ -1046,7 +1101,7 @@ export default class SpiceModel {
             await this.propsToBeRemoved(results.data)
           );
         }
-        if (this?.type == "resourcedetail");
+        if (this.type == "resourcedetail");
 
         if (args.skip_hooks != true) {
           await this.run_hook(results.data, "list", "after");
@@ -1075,7 +1130,7 @@ export default class SpiceModel {
             operation: op,
             when,
             old_data,
-            resource: this?.type,
+            resource: this.type,
             ctx: this[_ctx],
           },
         });
@@ -1120,9 +1175,6 @@ export default class SpiceModel {
 
     let ids = [];
     _.each(data, (result) => {
-      if (!result || result== "undefined") {
-        result = {};
-      }
       if (
         _.isString(result[source_property]) &&
         result[source_property] != ""
@@ -1151,9 +1203,6 @@ export default class SpiceModel {
     );
 
     data = _.map(data, (result) => {
-      if (!result || result== "undefined") {
-        result = {};
-      }
       let result_found =
         _.find(ug, (g) => {
           return g.id == result[source_property];
@@ -1178,9 +1227,6 @@ export default class SpiceModel {
     let ids = [];
     _.each(data, (result) => {
       let value = [];
-      if (!result || result== "undefined") {
-        result = {};
-      }
 
       if (_.isArray(result[source_property])) {
         value = result[source_property];
@@ -1219,9 +1265,6 @@ export default class SpiceModel {
       ids: ids,
     }); */
     _.each(data, (result) => {
-      if (!result || result== "undefined") {
-        result = {};
-      }
       if (_.isString(result[store_property])) {
         result[store_property] = [result[store_property]];
       }
@@ -1324,16 +1367,16 @@ export default class SpiceModel {
 
       if (this.shouldSerializerRun(args, type)) {
         if (
-          this?.type != "" &&
-          this?.type != undefined &&
+          this.type != "" &&
+          this.type != undefined &&
           this[_external_modifier_loaded] != true
         ) {
-          this.addExternalModifiers(this?.type);
+          this.addExternalModifiers(this.type);
           this[_external_modifier_loaded] = true;
         }
         for (let i of this[_serializers][type]["modifiers"]) {
           try {
-            data = await i(data, old_data, this[_ctx], this?.type);
+            data = await i(data, old_data, this[_ctx], this.type);
           } catch (e) {
             console.log(e.stack);
           }