@fjell/lib-sequelize 4.4.4 → 4.4.8

package/dist/es/ops/all.js

@@ -3,8 +3,30 @@ import { buildQuery } from '../QueryBuilder.js';
 import LibLogger from '../logger.js';
 import { processRow } from '../RowProcessor.js';
 import { Op } from 'sequelize';
+import { buildRelationshipPath } from '../util/relationshipUtils.js';
+import { contextManager } from '../OperationContext.js';
 
 const logger = LibLogger.get('sequelize', 'ops', 'all');
+// Helper function to merge includes avoiding duplicates
+const mergeIncludes = (existingIncludes, newIncludes)=>{
+    const mergedIncludes = [
+        ...existingIncludes
+    ];
+    for (const newInclude of newIncludes){
+        const existingIndex = mergedIncludes.findIndex((existing)=>existing.as === newInclude.as && existing.model === newInclude.model);
+        if (existingIndex === -1) {
+            mergedIncludes.push(newInclude);
+        } else if (newInclude.include && mergedIncludes[existingIndex].include) {
+            mergedIncludes[existingIndex].include = [
+                ...mergedIncludes[existingIndex].include,
+                ...newInclude.include
+            ];
+        } else if (newInclude.include) {
+            mergedIncludes[existingIndex].include = newInclude.include;
+        }
+    }
+    return mergedIncludes;
+};
 const getAllOperation = (models, definition, registry)=>{
     const { coordinate, options: { references, aggregations } } = definition;
     //#region Query
@@ -14,29 +36,64 @@ const getAllOperation = (models, definition, registry)=>{
             locations
         });
         const loc = locations || [];
-        // SQ Libs don't support locations
-        if (loc.length > 1) {
-            throw new Error('Not implemented for more than one location key');
-        }
-        // We have the model here?
         // @ts-ignore
         const model = models[0];
-        // We have the model here?
+        // Build base query from itemQuery
         const options = buildQuery(itemQuery, model);
-        // If this has a location array, we need to add a where clause
-        if (loc.length === 1) {
-            const locKeyType = loc[0].kt;
-            if (model.associations[locKeyType]) {
-                const association = model.associations[locKeyType];
+        // Handle location keys if present
+        if (loc.length > 0) {
+            const { kta } = coordinate;
+            const directLocations = [];
+            const hierarchicalLocations = [];
+            const additionalIncludes = [];
+            // Categorize location keys as direct or hierarchical
+            for (const locKey of loc){
+                const relationshipInfo = buildRelationshipPath(model, locKey.kt, kta, true);
+                if (!relationshipInfo.found) {
+                    const errorMessage = `Location key '${locKey.kt}' cannot be resolved on model '${model.name}' or through its relationships.`;
+                    logger.error(errorMessage, {
+                        locations: loc,
+                        kta
+                    });
+                    throw new Error(errorMessage);
+                }
+                if (relationshipInfo.isDirect) {
+                    directLocations.push(locKey);
+                } else {
+                    hierarchicalLocations.push(locKey);
+                }
+            }
+            // Handle direct location keys (simple foreign key constraints)
+            for (const locKey of directLocations){
+                const foreignKeyField = locKey.kt + 'Id';
                 options.where = {
                     ...options.where,
-                    [association.foreignKey]: {
-                        [Op.eq]: loc[0].lk
+                    [foreignKeyField]: {
+                        [Op.eq]: locKey.lk
                     }
                 };
-            } else {
-                logger.error('Location key type not found in sequelize model association for: %s', locKeyType);
-                throw new Error('Location key type not found in model');
+            }
+            // Handle hierarchical location keys (requires relationship traversal)
+            for (const locKey of hierarchicalLocations){
+                const relationshipInfo = buildRelationshipPath(model, locKey.kt, kta);
+                if (relationshipInfo.found && relationshipInfo.path) {
+                    // Add the relationship constraint using the path
+                    options.where = {
+                        ...options.where,
+                        [relationshipInfo.path]: {
+                            [Op.eq]: locKey.lk
+                        }
+                    };
+                    // Add necessary includes for the relationship traversal
+                    if (relationshipInfo.includes) {
+                        additionalIncludes.push(...relationshipInfo.includes);
+                    }
+                }
+            }
+            // Merge additional includes with existing includes
+            if (additionalIncludes.length > 0) {
+                const existingIncludes = options.include || [];
+                options.include = mergeIncludes(existingIncludes, additionalIncludes);
             }
         }
         logger.default('Configured this Item Query', {
@@ -45,9 +102,11 @@ const getAllOperation = (models, definition, registry)=>{
         });
         const matchingItems = await model.findAll(options);
         // this.logger.default('Matching Items', { matchingItems });
+        // Get the current context from context manager
+        const context = contextManager.getCurrentContext();
         // TODO: Move this Up!
         return await Promise.all(matchingItems.map(async (row)=>{
-            const processedRow = await processRow(row, coordinate.kta, references, aggregations, registry);
+            const processedRow = await processRow(row, coordinate.kta, references, aggregations, registry, context);
             return validateKeys(processedRow, coordinate.kta);
         }));
     };
@@ -55,4 +114,4 @@ const getAllOperation = (models, definition, registry)=>{
 };
 
 export { getAllOperation };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmpzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsifQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmpzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9

package/dist/es/ops/get.js

@@ -3,6 +3,7 @@ import LibLogger from '../logger.js';
 import { processRow } from '../RowProcessor.js';
 import { NotFoundError } from '@fjell/lib';
 import { buildRelationshipPath } from '../util/relationshipUtils.js';
+import { contextManager } from '../OperationContext.js';
 
 const logger = LibLogger.get('sequelize', 'ops', 'get');
 // Helper function to process composite key and build query options
@@ -71,11 +72,13 @@ const getGetOperation = (models, definition, registry)=>{
         if (!item) {
             throw new NotFoundError('get', coordinate, key);
         } else {
-            return validateKeys(await processRow(item, kta, references, aggregations, registry), kta);
+            // Get the current context from context manager
+            const context = contextManager.getCurrentContext();
+            return validateKeys(await processRow(item, kta, references, aggregations, registry, context), kta);
         }
     };
     return get;
 };
 
 export { getGetOperation };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LmpzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LmpzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9

package/dist/es/ops/update.js

@@ -5,8 +5,30 @@ import LibLogger from '../logger.js';
 import { processRow } from '../RowProcessor.js';
 import { stringifyJSON } from '../util/general.js';
 import { NotFoundError } from '@fjell/lib';
+import { Op } from 'sequelize';
+import { buildRelationshipPath } from '../util/relationshipUtils.js';
 
 const logger = LibLogger.get('sequelize', 'ops', 'update');
+// Helper function to merge includes avoiding duplicates
+const mergeIncludes = (existingIncludes, newIncludes)=>{
+    const mergedIncludes = [
+        ...existingIncludes
+    ];
+    for (const newInclude of newIncludes){
+        const existingIndex = mergedIncludes.findIndex((existing)=>existing.as === newInclude.as && existing.model === newInclude.model);
+        if (existingIndex === -1) {
+            mergedIncludes.push(newInclude);
+        } else if (newInclude.include && mergedIncludes[existingIndex].include) {
+            mergedIncludes[existingIndex].include = [
+                ...mergedIncludes[existingIndex].include,
+                ...newInclude.include
+            ];
+        } else if (newInclude.include) {
+            mergedIncludes[existingIndex].include = newInclude.include;
+        }
+    }
+    return mergedIncludes;
+};
 const getUpdateOperation = (models, definition, registry)=>{
     const { options: { references, aggregations } } = definition;
     const update = async (key, item)=>{
@@ -22,15 +44,49 @@ const getUpdateOperation = (models, definition, registry)=>{
             const priKey = key;
             response = await model.findByPk(priKey.pk);
         } else if (isComKey(key)) {
-            var _comKey_loc_, _comKey_loc_1;
             const comKey = key;
-            // Find the model by using both of the identifiers.
-            response = await model.findOne({
-                where: {
-                    [(comKey === null || comKey === void 0 ? void 0 : (_comKey_loc_ = comKey.loc[0]) === null || _comKey_loc_ === void 0 ? void 0 : _comKey_loc_.kt) + 'Id']: comKey === null || comKey === void 0 ? void 0 : (_comKey_loc_1 = comKey.loc[0]) === null || _comKey_loc_1 === void 0 ? void 0 : _comKey_loc_1.lk,
-                    id: comKey === null || comKey === void 0 ? void 0 : comKey.pk
+            // Build query options for composite key with multiple location keys
+            const where = {
+                id: comKey.pk
+            };
+            const additionalIncludes = [];
+            // Process all location keys in the composite key
+            for (const locator of comKey.loc){
+                const relationshipInfo = buildRelationshipPath(model, locator.kt, kta, true);
+                if (!relationshipInfo.found) {
+                    const errorMessage = `Composite key locator '${locator.kt}' cannot be resolved on model '${model.name}' or through its relationships.`;
+                    logger.error(errorMessage, {
+                        key: comKey,
+                        kta
+                    });
+                    throw new Error(errorMessage);
+                }
+                if (relationshipInfo.isDirect) {
+                    // Direct foreign key field
+                    const fieldName = `${locator.kt}Id`;
+                    where[fieldName] = locator.lk;
+                } else if (relationshipInfo.path) {
+                    // Hierarchical relationship requiring traversal
+                    where[relationshipInfo.path] = {
+                        [Op.eq]: locator.lk
+                    };
+                    // Add necessary includes for relationship traversal
+                    if (relationshipInfo.includes) {
+                        additionalIncludes.push(...relationshipInfo.includes);
+                    }
                 }
+            }
+            // Build final query options
+            const queryOptions = {
+                where
+            };
+            if (additionalIncludes.length > 0) {
+                queryOptions.include = mergeIncludes([], additionalIncludes);
+            }
+            logger.default('Composite key query for update', {
+                queryOptions
             });
+            response = await model.findOne(queryOptions);
         }
         if (response) {
             // Remove the key and events
@@ -54,4 +110,4 @@ const getUpdateOperation = (models, definition, registry)=>{
 };
 
 export { getUpdateOperation };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7In0=

package/dist/es/util/relationshipUtils.js

@@ -21,8 +21,8 @@
         modelChain.push(currentModel);
     }
     // Build the full association path for the target field
-    const targetType = kta[targetIndex];
-    const associationPath = `$${associationParts.join('.')}.${targetType}Id$`;
+    const targetPrimaryKey = currentModel.primaryKeyAttribute || 'id';
+    const associationPath = `$${associationParts.join('.')}.${targetPrimaryKey}$`;
     // Build nested includes structure iteratively (clearer than recursion)
     let deepestInclude = null;
     // Build from the deepest level back to the root