spice-js 2.6.82 → 2.6.85

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

@@ -168,8 +168,7 @@ class SpiceModel {
         }
 
         return props;
-      } //console.log("Applying Overrides to :", this.collection,'||', args.collection)
-
+      }
 
       args.props = applySchemaOverrides(removeDynamicProps(args.props), args.collection);
       this[_props] = args.props;
@@ -232,7 +231,7 @@ class SpiceModel {
       that = this;
       this.createModifiersFromProps();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
     } // }
 
   }
@@ -682,7 +681,7 @@ class SpiceModel {
 
         return yield doGet();
       } catch (e) {
-        console.log(e.message, e);
+        console.warn(e.message, e);
         throw e;
       }
     })();
@@ -750,7 +749,7 @@ class SpiceModel {
 
         return results;
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -869,7 +868,7 @@ class SpiceModel {
 
         return yield doUpdate();
       } catch (e) {
-        console.log("Error on update", e, e.stack);
+        console.warn("Error on update", e, e.stack);
         throw e;
       }
     })();
@@ -962,7 +961,7 @@ class SpiceModel {
 
         return yield doCreate();
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -983,7 +982,7 @@ class SpiceModel {
         touch_response = yield _this10.database.touch(args.id, args._ttl);
         return touch_response;
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -1063,7 +1062,7 @@ class SpiceModel {
 
         return yield doDelete();
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -1433,7 +1432,7 @@ class SpiceModel {
 
         return yield doList();
       } catch (e) {
-        console.log(e.stack);
+        console.warn(e.stack);
         throw e;
       }
     })();
@@ -1745,14 +1744,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
       });
     }
   }
@@ -1792,6 +1793,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 +1818,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]);
@@ -1925,8 +1930,8 @@ 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)) {
+            // 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.82",
+  "version": "2.6.85",
   "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

@@ -157,7 +157,6 @@ export default class SpiceModel {
         }
         return props;
       }
-      //console.log("Applying Overrides to :", this.collection,'||', args.collection)
       args.props = applySchemaOverrides(
         removeDynamicProps(args.props),
         args.collection
@@ -221,7 +220,7 @@ export default class SpiceModel {
       that = this;
       this.createModifiersFromProps();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
     }
     // }
   }
@@ -592,7 +591,7 @@ export default class SpiceModel {
       }
       return await doGet();
     } catch (e) {
-      console.log(e.message, e);
+      console.warn(e.message, e);
       throw e;
     }
   }
@@ -655,7 +654,7 @@ export default class SpiceModel {
 
       return results;
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -763,7 +762,7 @@ export default class SpiceModel {
       }
       return await doUpdate();
     } catch (e) {
-      console.log("Error on update", e, e.stack);
+      console.warn("Error on update", e, e.stack);
       throw e;
     }
   }
@@ -836,7 +835,7 @@ export default class SpiceModel {
       }
       return await doCreate();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -852,7 +851,7 @@ export default class SpiceModel {
       touch_response = await this.database.touch(args.id, args._ttl);
       return touch_response;
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -902,7 +901,7 @@ export default class SpiceModel {
       }
       return await doDelete();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -1290,7 +1289,7 @@ export default class SpiceModel {
       }
       return await doList();
     } catch (e) {
-      console.log(e.stack);
+      console.warn(e.stack);
       throw e;
     }
   }
@@ -1590,10 +1589,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,
+      });
     }
   }
 
@@ -1621,6 +1624,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,
@@ -1640,6 +1644,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,
@@ -1727,11 +1732,12 @@ export default class SpiceModel {
       const genericModifiers = [];
 
       for (const modifier of modifiers) {
-        // Skip field-specific modifiers if columns specified and field not requested
+        // 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;
         }