spice-js 2.6.81 → 2.6.84

package/build/cache/providers/SpiceCache.js

@@ -12,8 +12,7 @@ var crypto = require("crypto");
 
 function generateCacheKey(input) {
   // Create an MD5 hash of the input string and return it in hexadecimal format
-  //return crypto.createHash("md5").update(input).digest("hex");
-  return input;
+  return crypto.createHash("md5").update(input).digest("hex"); //return input;
 }
 
 module.exports = class SpiceCache {

package/build/models/SpiceModel.js

@@ -67,7 +67,7 @@ class SpiceModel {
 
       var Database = require("spice-" + dbtype);
 
-      this[_mapping_dept] = ((_args2 = args) == null ? void 0 : (_args2$args = _args2.args) == null ? void 0 : _args2$args.mapping_dept) || 2;
+      this[_mapping_dept] = ((_args2 = args) == null ? void 0 : (_args2$args = _args2.args) == null ? void 0 : _args2$args.mapping_dept) || process.env.MAPPING_DEPT || 3;
       this[_mapping_dept_exempt] = ((_args3 = args) == null ? void 0 : (_args3$args = _args3.args) == null ? void 0 : _args3$args.mapping_dept_exempt) || [];
       this.type = "";
       this.collection = args.connection;
@@ -1745,14 +1745,16 @@ class SpiceModel {
     var {
       when,
       execute,
-      field = null
+      field = null,
+      sourceField = null
     } = _ref15;
 
     if (this[_serializers][when]) {
       // Store as object with field info for column-based filtering
       this[_serializers][when]["modifiers"].push({
         execute,
-        field
+        field,
+        sourceField
       });
     }
   }
@@ -1779,6 +1781,8 @@ class SpiceModel {
 
     var _loop = function _loop(i) {
       if (properties[i].map) {
+        console.log("properties[i].map", properties[i].map);
+
         switch (properties[i].map.type) {
           case _2.MapType.MODEL:
             {
@@ -1792,6 +1796,8 @@ class SpiceModel {
                       when: properties[i].map.when || "read",
                       field: destinationField,
                       // ⚡ Track which field this modifier populates
+                      sourceField: i,
+                      // ⚡ Track source property for column filtering
                       execute: function () {
                         var _execute = _asyncToGenerator(function* (data) {
                           return yield _this17.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, destinationField, properties[i]);
@@ -1815,6 +1821,8 @@ class SpiceModel {
                       when: properties[i].map.when || "read",
                       field: destinationField,
                       // ⚡ Track which field this modifier populates
+                      sourceField: i,
+                      // ⚡ Track source property for column filtering
                       execute: function () {
                         var _execute2 = _asyncToGenerator(function* (data) {
                           return yield _this17.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, destinationField, properties[i]);
@@ -1910,6 +1918,8 @@ class SpiceModel {
 
 
           if (_this18.type && !_this18[_external_modifier_loaded]) {
+            console.trace("adding external modifiers", _this18.type);
+
             _this18.addExternalModifiers(_this18.type);
 
             _this18[_external_modifier_loaded] = true;
@@ -1925,8 +1935,9 @@ class SpiceModel {
           var genericModifiers = [];
 
           for (var modifier of modifiers) {
-            // Skip field-specific modifiers if columns specified and field not requested
-            if (requestedColumns && modifier.field && !requestedColumns.has(modifier.field)) {
+            console.log("modifier", modifier); // Skip field-specific modifiers if columns specified and neither source nor destination field is requested
+
+            if (requestedColumns && modifier.field && !requestedColumns.has(modifier.field) && !(modifier.sourceField && requestedColumns.has(modifier.sourceField))) {
               continue;
             } // Field modifiers have a .field property and .execute function - they can run in parallel
 

package/package.json

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

package/src/cache/providers/SpiceCache.js

@@ -3,8 +3,8 @@ const crypto = require("crypto");
 
 function generateCacheKey(input) {
   // Create an MD5 hash of the input string and return it in hexadecimal format
-  //return crypto.createHash("md5").update(input).digest("hex");
-  return input;
+  return crypto.createHash("md5").update(input).digest("hex");
+  //return input;
 }
 
 module.exports = class SpiceCache {

package/src/models/SpiceModel.js

@@ -53,7 +53,8 @@ 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 || 2;
+      this[_mapping_dept] =
+        args?.args?.mapping_dept || process.env.MAPPING_DEPT || 3;
       this[_mapping_dept_exempt] = args?.args?.mapping_dept_exempt || [];
       this.type = "";
       this.collection = args.connection;
@@ -1589,10 +1590,14 @@ export default class SpiceModel {
     return original_is_array ? data : data[0];
   }
 
-  addModifier({ when, execute, field = null }) {
+  addModifier({ when, execute, field = null, sourceField = null }) {
     if (this[_serializers][when]) {
       // Store as object with field info for column-based filtering
-      this[_serializers][when]["modifiers"].push({ execute, field });
+      this[_serializers][when]["modifiers"].push({
+        execute,
+        field,
+        sourceField,
+      });
     }
   }
 
@@ -1611,6 +1616,7 @@ export default class SpiceModel {
   createMofifier(properties) {
     for (let i in properties) {
       if (properties[i].map) {
+        console.log("properties[i].map", properties[i].map);
         switch (properties[i].map.type) {
           case MapType.MODEL: {
             const destinationField = properties[i].map.destination || i;
@@ -1620,6 +1626,7 @@ export default class SpiceModel {
                 this.addModifier({
                   when: properties[i].map.when || "read",
                   field: destinationField, // ⚡ Track which field this modifier populates
+                  sourceField: i, // ⚡ Track source property for column filtering
                   execute: async (data) => {
                     return await this.mapToObject(
                       data,
@@ -1639,6 +1646,7 @@ export default class SpiceModel {
                 this.addModifier({
                   when: properties[i].map.when || "read",
                   field: destinationField, // ⚡ Track which field this modifier populates
+                  sourceField: i, // ⚡ Track source property for column filtering
                   execute: async (data) => {
                     return await this.mapToObjectArray(
                       data,
@@ -1711,6 +1719,7 @@ export default class SpiceModel {
 
       // Add external modifiers only once.
       if (this.type && !this[_external_modifier_loaded]) {
+        console.trace("adding external modifiers", this.type);
         this.addExternalModifiers(this.type);
         this[_external_modifier_loaded] = true;
       }
@@ -1726,11 +1735,13 @@ export default class SpiceModel {
       const genericModifiers = [];
 
       for (const modifier of modifiers) {
-        // Skip field-specific modifiers if columns specified and field not requested
+        console.log("modifier", modifier);
+        // Skip field-specific modifiers if columns specified and neither source nor destination field is requested
         if (
           requestedColumns &&
           modifier.field &&
-          !requestedColumns.has(modifier.field)
+          !requestedColumns.has(modifier.field) &&
+          !(modifier.sourceField && requestedColumns.has(modifier.sourceField))
         ) {
           continue;
         }