@fjell/lib-sequelize 4.4.13 → 4.4.15

package/dist/index.cjs

@@ -79,7 +79,7 @@ const createDefinition = (kta, scopes, libOptions)=>{
 };
 
 //Recursive implementation of jSON.stringify;
-const general.stringifyJSON = function(obj, visited = new Set()) {
+const stringifyJSON = function(obj, visited = new Set()) {
     const arrOfKeyVals = [];
     const arrVals = [];
     let objKeys = [];
@@ -94,7 +94,7 @@ const general.stringifyJSON = function(obj, visited = new Set()) {
             // Add array to visited before processing its elements
             visited.add(obj);
             obj.forEach(function(el) {
-                arrVals.push(general.stringifyJSON(el, visited));
+                arrVals.push(stringifyJSON(el, visited));
             });
             return '[' + arrVals + ']';
         }
@@ -112,7 +112,7 @@ const general.stringifyJSON = function(obj, visited = new Set()) {
             else if (typeof keyValOut === 'string') arrOfKeyVals.push(keyOut + '"' + keyValOut + '"');
             else if (typeof keyValOut === 'boolean' || typeof keyValOut === 'number' || keyValOut === null) arrOfKeyVals.push(keyOut + keyValOut);
             else if (keyValOut instanceof Object) {
-                arrOfKeyVals.push(keyOut + general.stringifyJSON(keyValOut, visited));
+                arrOfKeyVals.push(keyOut + stringifyJSON(keyValOut, visited));
             }
         });
         return '{' + arrOfKeyVals + '}';
@@ -122,7 +122,7 @@ const general.stringifyJSON = function(obj, visited = new Set()) {
 
 const logger$g = logger$1.default.get('sequelize', 'QueryBuilder');
 const addDeleteQuery = (options, model)=>{
-    logger$g.default(`QueryBuilder adding delete query with options: ${general.stringifyJSON(options)}`);
+    logger$g.default(`QueryBuilder adding delete query with options: ${stringifyJSON(options)}`);
     if (model.getAttributes().deletedAt) {
         options.where['deletedAt'] = {
             [sequelize.Op.eq]: null
@@ -135,7 +135,7 @@ const addDeleteQuery = (options, model)=>{
     return options;
 };
 const addEventQueries = (options, events, model)=>{
-    logger$g.default(`QueryBuilder adding event queries with options: ${general.stringifyJSON(options)}, events: ${general.stringifyJSON(events)}`);
+    logger$g.default(`QueryBuilder adding event queries with options: ${stringifyJSON(options)}, events: ${stringifyJSON(events)}`);
     Object.keys(events).forEach((key)=>{
         if (!model.getAttributes()[`${key}At`]) {
             throw new Error(`Event ${key} is not supported on this model, column ${key}At not found`);
@@ -169,22 +169,22 @@ const addEventQueries = (options, events, model)=>{
 };
 // Add the references to the query
 const addReferenceQueries = (options, references, model)=>{
-    logger$g.default(`QueryBuilder adding reference queries with options: ${general.stringifyJSON(options)}, references: ${general.stringifyJSON(references)}`);
+    logger$g.default(`QueryBuilder adding reference queries with options: ${stringifyJSON(options)}, references: ${stringifyJSON(references)}`);
     Object.keys(references).forEach((key)=>{
-        logger$g.default(`QueryBuilder adding reference query for key: ${key}, references: ${general.stringifyJSON(references)}`);
+        logger$g.default(`QueryBuilder adding reference query for key: ${key}, references: ${stringifyJSON(references)}`);
         if (!model.getAttributes()[`${key}Id`]) {
             throw new Error(`Reference ${key} is not supported on this model, column ${key}Id not found`);
         }
         if (core.isPriKey(references[key])) {
             const priKey = references[key];
             if (priKey.pk == null || priKey.pk === '' || typeof priKey.pk === 'object' && Object.keys(priKey.pk).length === 0) {
-                logger$g.error(`Reference key '${key}' has invalid pk value: ${general.stringifyJSON(priKey.pk)}`, {
+                logger$g.error(`Reference key '${key}' has invalid pk value: ${stringifyJSON(priKey.pk)}`, {
                     priKey,
                     references
                 });
-                throw new Error(`Reference key '${key}' has invalid pk value: ${general.stringifyJSON(priKey.pk)}`);
+                throw new Error(`Reference key '${key}' has invalid pk value: ${stringifyJSON(priKey.pk)}`);
             }
-            logger$g.trace(`[QueryBuilder] Setting reference where clause: ${key}Id = ${general.stringifyJSON(priKey.pk)} (type: ${typeof priKey.pk})`);
+            logger$g.trace(`[QueryBuilder] Setting reference where clause: ${key}Id = ${stringifyJSON(priKey.pk)} (type: ${typeof priKey.pk})`);
             options.where[`${key}Id`] = {
                 [sequelize.Op.eq]: priKey.pk
             };
@@ -267,7 +267,7 @@ const addAssociationCondition = (conditions, condition, model)=>{
         });
         throw new Error(`Association condition for '${associationName}.${attributeName}' has undefined/null value`);
     }
-    logger$g.trace(`[QueryBuilder] Setting association condition: ${sequelizeAssociationColumn} = ${general.stringifyJSON(condition.value)} (type: ${typeof condition.value})`);
+    logger$g.trace(`[QueryBuilder] Setting association condition: ${sequelizeAssociationColumn} = ${stringifyJSON(condition.value)} (type: ${typeof condition.value})`);
     conditions[sequelizeAssociationColumn] = {
         [conditionOp]: condition.value
     };
@@ -285,7 +285,7 @@ const addAttributeCondition = (conditions, condition, model)=>{
         });
         throw new Error(`Attribute condition for '${conditionColumn}' has undefined/null value`);
     }
-    logger$g.trace(`[QueryBuilder] Setting attribute condition: ${conditionColumn} = ${general.stringifyJSON(condition.value)} (type: ${typeof condition.value})`);
+    logger$g.trace(`[QueryBuilder] Setting attribute condition: ${conditionColumn} = ${stringifyJSON(condition.value)} (type: ${typeof condition.value})`);
     conditions[conditionColumn] = {
         [conditionOp]: condition.value
     };
@@ -356,12 +356,12 @@ const addAssociationIncludes = (options, model)=>{
     return options;
 };
 const buildQuery = (itemQuery, model)=>{
-    logger$g.default(`QueryBuilder build called with itemQuery: ${general.stringifyJSON(itemQuery)}`);
+    logger$g.default(`QueryBuilder build called with itemQuery: ${stringifyJSON(itemQuery)}`);
     let options = {
         where: {}
     };
     if (itemQuery.compoundCondition) {
-        logger$g.default(`QueryBuilder adding conditions: ${general.stringifyJSON(itemQuery.compoundCondition)}`);
+        logger$g.default(`QueryBuilder adding conditions: ${stringifyJSON(itemQuery.compoundCondition)}`);
         options = addCompoundCondition(options, itemQuery.compoundCondition, model);
     }
     // If the model has a deletedAt column, we need to add a delete query
@@ -983,22 +983,22 @@ const processRow = async (row, keyTypes, referenceDefinitions, aggregationDefini
         let item = row.get({
             plain: true
         });
-        logger$a.default('Adding Key to Item with Key Types: %s', general.stringifyJSON(keyTypes));
+        logger$a.default('Adding Key to Item with Key Types: %s', stringifyJSON(keyTypes));
         item = addKey(row, item, keyTypes);
         item = populateEvents(item);
-        logger$a.default('Key Added to Item: %s', general.stringifyJSON(item.key));
+        logger$a.default('Key Added to Item: %s', stringifyJSON(item.key));
         // Mark this item as in progress to detect circular references
         operationContext.markInProgress(item.key);
         try {
             if (referenceDefinitions && referenceDefinitions.length > 0) {
                 for (const referenceDefinition of referenceDefinitions){
-                    logger$a.default('Processing Reference for %s to %s', item.key.kt, general.stringifyJSON(referenceDefinition.kta));
+                    logger$a.default('Processing Reference for %s to %s', item.key.kt, stringifyJSON(referenceDefinition.kta));
                     item = await buildReference(item, referenceDefinition, registry, operationContext);
                 }
             }
             if (aggregationDefinitions && aggregationDefinitions.length > 0) {
                 for (const aggregationDefinition of aggregationDefinitions){
-                    logger$a.default('Processing Aggregation for %s from %s', item.key.kt, general.stringifyJSON(aggregationDefinition.kta));
+                    logger$a.default('Processing Aggregation for %s from %s', item.key.kt, stringifyJSON(aggregationDefinition.kta));
                     item = await buildAggregation(item, aggregationDefinition, registry, operationContext);
                 }
             }
@@ -1008,7 +1008,7 @@ const processRow = async (row, keyTypes, referenceDefinitions, aggregationDefini
             // Mark this item as complete
             operationContext.markComplete(item.key);
         }
-        logger$a.default('Processed Row: %j', general.stringifyJSON(item));
+        logger$a.default('Processed Row: %j', stringifyJSON(item));
         return item;
     });
 };
@@ -1071,11 +1071,11 @@ const all.getAllOperation = (models, definition, registry)=>{
             // Handle direct location keys (simple foreign key constraints)
             for (const locKey of directLocations){
                 if (locKey.lk === undefined || locKey.lk == null || locKey.lk === '' || typeof locKey.lk === 'object' && Object.keys(locKey.lk).length === 0) {
-                    logger$9.error(`Location key '${locKey.kt}' has invalid lk value: ${general.stringifyJSON(locKey.lk)}`, {
+                    logger$9.error(`Location key '${locKey.kt}' has invalid lk value: ${stringifyJSON(locKey.lk)}`, {
                         locKey,
                         locations: loc
                     });
-                    throw new Error(`Location key '${locKey.kt}' has invalid lk value: ${general.stringifyJSON(locKey.lk)}`);
+                    throw new Error(`Location key '${locKey.kt}' has invalid lk value: ${stringifyJSON(locKey.lk)}`);
                 }
                 const foreignKeyField = locKey.kt + 'Id';
                 // Check if this field already has a condition from the itemQuery
@@ -1083,7 +1083,7 @@ const all.getAllOperation = (models, definition, registry)=>{
                     logger$9.debug(`[ALL] Field ${foreignKeyField} already constrained by itemQuery, skipping location constraint to avoid conflicts`);
                     continue; // Skip this location constraint to avoid conflicts
                 }
-                logger$9.trace(`[ALL] Setting direct location where clause: ${foreignKeyField} = ${general.stringifyJSON(locKey.lk)} (type: ${typeof locKey.lk})`);
+                logger$9.trace(`[ALL] Setting direct location where clause: ${foreignKeyField} = ${stringifyJSON(locKey.lk)} (type: ${typeof locKey.lk})`);
                 options.where[foreignKeyField] = {
                     [sequelize.Op.eq]: locKey.lk
                 };
@@ -1091,11 +1091,11 @@ const all.getAllOperation = (models, definition, registry)=>{
             // Handle hierarchical location keys (requires relationship traversal)
             for (const locKey of hierarchicalLocations){
                 if (locKey.lk === undefined || locKey.lk == null || locKey.lk === '' || typeof locKey.lk === 'object' && Object.keys(locKey.lk).length === 0) {
-                    logger$9.error(`Hierarchical location key '${locKey.kt}' has invalid lk value: ${general.stringifyJSON(locKey.lk)}`, {
+                    logger$9.error(`Hierarchical location key '${locKey.kt}' has invalid lk value: ${stringifyJSON(locKey.lk)}`, {
                         locKey,
                         locations: loc
                     });
-                    throw new Error(`Hierarchical location key '${locKey.kt}' has invalid lk value: ${general.stringifyJSON(locKey.lk)}`);
+                    throw new Error(`Hierarchical location key '${locKey.kt}' has invalid lk value: ${stringifyJSON(locKey.lk)}`);
                 }
                 const relationshipInfo = relationshipUtils.buildRelationshipPath(model, locKey.kt, kta);
                 if (relationshipInfo.found && relationshipInfo.path) {
@@ -1105,7 +1105,7 @@ const all.getAllOperation = (models, definition, registry)=>{
                         continue; // Skip this location constraint to avoid conflicts
                     }
                     // Add the relationship constraint using the path
-                    logger$9.trace(`[ALL] Setting hierarchical location where clause: ${relationshipInfo.path} = ${general.stringifyJSON(locKey.lk)} (type: ${typeof locKey.lk})`);
+                    logger$9.trace(`[ALL] Setting hierarchical location where clause: ${relationshipInfo.path} = ${stringifyJSON(locKey.lk)} (type: ${typeof locKey.lk})`);
                     options.where[relationshipInfo.path] = {
                         [sequelize.Op.eq]: locKey.lk
                     };
@@ -1368,7 +1368,7 @@ const getCreateOperation = (models, definition, registry)=>{
         }
         // Create the record
         try {
-            logger$8.trace(`[CREATE] Executing ${model.name}.create() with data: ${general.stringifyJSON(itemData)}`);
+            logger$8.trace(`[CREATE] Executing ${model.name}.create() with data: ${stringifyJSON(itemData)}`);
             const createdRecord = await model.create(itemData);
             // Add key and events
             const processedRecord = await processRow(createdRecord, kta, references, aggregations, registry);
@@ -1393,7 +1393,7 @@ const getFindOperation = (models, definition, registry)=>{
         if (finders && finders[finder]) {
             const finderMethod = finders[finder];
             if (finderMethod) {
-                logger$7.trace(`[FIND] Executing finder '${finder}' on ${models[0].name} with params: ${general.stringifyJSON(finderParams)}, locations: ${general.stringifyJSON(locations)}`);
+                logger$7.trace(`[FIND] Executing finder '${finder}' on ${models[0].name} with params: ${stringifyJSON(finderParams)}, locations: ${stringifyJSON(locations)}`);
                 const results = await finderMethod(finderParams, locations);
                 if (results && results.length > 0) {
                     const processedResults = await Promise.all(results.map(async (row)=>{
@@ -1480,7 +1480,7 @@ const getGetOperation = (models, definition, registry)=>{
             logger$6.default('Composite key query', {
                 queryOptions
             });
-            logger$6.trace(`[GET] Executing ${model.name}.findOne() with options: ${general.stringifyJSON(queryOptions)}`);
+            logger$6.trace(`[GET] Executing ${model.name}.findOne() with options: ${stringifyJSON(queryOptions)}`);
             item = await model.findOne(queryOptions);
         }
         if (!item) {
@@ -1575,7 +1575,7 @@ registry)=>{
             const comKey = key;
             const queryOptions = processCompositeKey(comKey, model, kta);
             logger$4.default(`Remove composite key query for ${model.name} with where fields: ${queryOptions.where ? Object.keys(queryOptions.where).join(', ') : 'none'}`);
-            logger$4.debug(`[REMOVE] Executing ${model.name}.findOne() with options: ${general.stringifyJSON(queryOptions)}`);
+            logger$4.debug(`[REMOVE] Executing ${model.name}.findOne() with options: ${stringifyJSON(queryOptions)}`);
             item = await model.findOne(queryOptions);
         }
         if (!item) {
@@ -1693,7 +1693,7 @@ const getUpdateOperation = (models, definition, registry)=>{
                 queryOptions.include = mergeIncludes([], additionalIncludes);
             }
             logger$3.default(`Update composite key query for ${model.name} with where fields: ${queryOptions.where ? Object.keys(queryOptions.where).join(', ') : 'none'}`);
-            logger$3.trace(`[UPDATE] Executing ${model.name}.findOne() with options: ${general.stringifyJSON(queryOptions)}`);
+            logger$3.trace(`[UPDATE] Executing ${model.name}.findOne() with options: ${stringifyJSON(queryOptions)}`);
             response = await model.findOne(queryOptions);
         }
         if (response) {
@@ -1705,7 +1705,7 @@ const getUpdateOperation = (models, definition, registry)=>{
             logger$3.default(`Update found ${model.name} record to modify`);
             logger$3.default(`Update properties configured: ${Object.keys(updateProps).join(', ')}`);
             // Update the object
-            logger$3.trace(`[UPDATE] Executing ${model.name}.update() with properties: ${general.stringifyJSON(updateProps)}`);
+            logger$3.trace(`[UPDATE] Executing ${model.name}.update() with properties: ${stringifyJSON(updateProps)}`);
             response = await response.update(updateProps);
             // Populate the key and events
             const processedItem = await processRow(response, kta, references, aggregations, registry);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjell/lib-sequelize",
-  "version": "4.4.13",
+  "version": "4.4.15",
   "license": "Apache-2.0",
   "keywords": [
     "library",