@fjell/lib-sequelize 4.4.73 → 4.4.75

package/dist/QueryBuilder.d.ts

@@ -9,5 +9,18 @@ export type QueryOptions = {
 };
 export declare const addCompoundCondition: (options: any, compoundCondition: CompoundCondition, model: ModelStatic<any>) => any;
 export declare const addCondition: (conditions: Record<string, any>, condition: Condition, model: ModelStatic<any>) => Record<string, any>;
+/**
+ * Detects aggregations that can be loaded via Sequelize INCLUDE and adds them to options.
+ * This prevents N+1 queries by using JOIN instead of separate queries per item.
+ *
+ * @param options - Query options to modify
+ * @param model - Sequelize model to check for associations
+ * @param aggregationDefinitions - Aggregation definitions from library config
+ * @returns Modified options with includes added, plus array of property names that were included
+ */
+export declare const addAggregationIncludes: (options: any, model: ModelStatic<any>, aggregationDefinitions: any[]) => {
+    options: any;
+    includedAggregations: string[];
+};
 export declare const buildQuery: (itemQuery: ItemQuery, model: ModelStatic<any>) => any;
 //# sourceMappingURL=QueryBuilder.d.ts.map

package/dist/QueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../src/QueryBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,SAAS,EAKT,SAAS,EAIV,MAAM,aAAa,CAAC;AAErB,OAAO,EAAe,WAAW,EAAM,MAAM,WAAW,CAAC;AAMzD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACtB,CAAA;AAkFD,eAAO,MAAM,oBAAoB,GAAI,SAAS,GAAG,EAAE,mBAAmB,iBAAiB,EAAE,OAAO,WAAW,CAAC,GAAG,CAAC,QAoC/G,CAAA;AAoHD,eAAO,MAAM,YAAY,GAAI,YAAY,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,SAAS,EAAE,OAAO,WAAW,CAAC,GAAG,CAAC,wBAU1G,CAAA;AAuED,eAAO,MAAM,UAAU,GACrB,WAAW,SAAS,EACpB,OAAO,WAAW,CAAC,GAAG,CAAC,KACtB,GAqDF,CAAA"}
+{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../src/QueryBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,SAAS,EAKT,SAAS,EAIV,MAAM,aAAa,CAAC;AAErB,OAAO,EAAe,WAAW,EAAM,MAAM,WAAW,CAAC;AAMzD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACtB,CAAA;AAkFD,eAAO,MAAM,oBAAoB,GAAI,SAAS,GAAG,EAAE,mBAAmB,iBAAiB,EAAE,OAAO,WAAW,CAAC,GAAG,CAAC,QAoC/G,CAAA;AAoHD,eAAO,MAAM,YAAY,GAAI,YAAY,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,SAAS,EAAE,OAAO,WAAW,CAAC,GAAG,CAAC,wBAU1G,CAAA;AAuED;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,GACjC,SAAS,GAAG,EACZ,OAAO,WAAW,CAAC,GAAG,CAAC,EACvB,wBAAwB,GAAG,EAAE,KAC5B;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,oBAAoB,EAAE,MAAM,EAAE,CAAA;CAiDhD,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,WAAW,SAAS,EACpB,OAAO,WAAW,CAAC,GAAG,CAAC,KACtB,GAqDF,CAAA"}

package/dist/RowProcessor.d.ts

@@ -5,5 +5,5 @@ import * as Library from "@fjell/lib";
 import { contextManager, createOperationContext, OperationContext } from "@fjell/lib";
 export type { OperationContext };
 export { createOperationContext, contextManager };
-export declare const processRow: <S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never>(row: Model<any, any>, keyTypes: AllItemTypeArrays<S, L1, L2, L3, L4, L5>, referenceDefinitions: SequelizeReferenceDefinition[], aggregationDefinitions: AggregationDefinition[], registry: Library.Registry, context?: OperationContext) => Promise<Item<S, L1, L2, L3, L4, L5>>;
+export declare const processRow: <S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never>(row: Model<any, any>, keyTypes: AllItemTypeArrays<S, L1, L2, L3, L4, L5>, referenceDefinitions: SequelizeReferenceDefinition[], aggregationDefinitions: AggregationDefinition[], registry: Library.Registry, context?: OperationContext, includedAggregations?: string[]) => Promise<Item<S, L1, L2, L3, L4, L5>>;
 //# sourceMappingURL=RowProcessor.d.ts.map

package/dist/RowProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RowProcessor.d.ts","sourceRoot":"","sources":["../src/RowProcessor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAIlC,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,EAEL,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAUpB,YAAY,EAAE,gBAAgB,EAAE,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,CAAC;AAElD,eAAO,MAAM,UAAU,GAAU,CAAC,SAAS,MAAM,EAC/C,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACvB,KAAK,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EACpB,UAAU,iBAAiB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAClD,sBAAsB,4BAA4B,EAAE,EACpD,wBAAwB,qBAAqB,EAAE,EAC/C,UAAU,OAAO,CAAC,QAAQ,EAC1B,UAAU,gBAAgB,KACzB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAqEvC,CAAC"}
+{"version":3,"file":"RowProcessor.d.ts","sourceRoot":"","sources":["../src/RowProcessor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAIlC,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,EAEL,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAUpB,YAAY,EAAE,gBAAgB,EAAE,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,CAAC;AAElD,eAAO,MAAM,UAAU,GAAU,CAAC,SAAS,MAAM,EAC/C,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACvB,KAAK,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EACpB,UAAU,iBAAiB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAClD,sBAAsB,4BAA4B,EAAE,EACpD,wBAAwB,qBAAqB,EAAE,EAC/C,UAAU,OAAO,CAAC,QAAQ,EAC1B,UAAU,gBAAgB,EAC1B,uBAAuB,MAAM,EAAE,KAE9B,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAwFvC,CAAC"}

package/dist/index.js

@@ -341,6 +341,46 @@ var addAssociationIncludes = (options, model) => {
   }
   return options;
 };
+var addAggregationIncludes = (options, model, aggregationDefinitions) => {
+  if (!aggregationDefinitions || aggregationDefinitions.length === 0) {
+    return { options, includedAggregations: [] };
+  }
+  const includedAggregations = [];
+  options.include = options.include || [];
+  for (const aggDef of aggregationDefinitions) {
+    const association = model.associations && model.associations[aggDef.property];
+    if (association) {
+      const alreadyIncluded = options.include.some(
+        (inc) => typeof inc === "string" && inc === aggDef.property || typeof inc === "object" && inc.as === aggDef.property
+      );
+      if (!alreadyIncluded) {
+        logger3.debug(`Auto-detected association for aggregation '${aggDef.property}' - using INCLUDE to prevent N+1`, {
+          property: aggDef.property,
+          associationType: association.associationType,
+          targetModel: association.target.name
+        });
+        options.include.push({
+          model: association.target,
+          as: aggDef.property,
+          required: false
+          // Use LEFT JOIN to preserve items without aggregations
+        });
+        includedAggregations.push(aggDef.property);
+      } else {
+        logger3.debug(`Association '${aggDef.property}' already included in query`, {
+          property: aggDef.property
+        });
+        includedAggregations.push(aggDef.property);
+      }
+    } else {
+      logger3.debug(`No association found for aggregation '${aggDef.property}' - will use separate query`, {
+        property: aggDef.property,
+        availableAssociations: Object.keys(model.associations || {})
+      });
+    }
+  }
+  return { options, includedAggregations };
+};
 var buildQuery = (itemQuery, model) => {
   logger3.default(`QueryBuilder build called with itemQuery: ${stringifyJSON(itemQuery)}`);
   let options = {
@@ -879,7 +919,7 @@ function removeAggsFromItem(item, aggregationDefinitions) {
 
 // src/RowProcessor.ts
 var logger6 = logger_default.get("sequelize", "RowProcessor");
-var processRow = async (row, keyTypes, referenceDefinitions, aggregationDefinitions, registry, context) => {
+var processRow = async (row, keyTypes, referenceDefinitions, aggregationDefinitions, registry, context, includedAggregations) => {
   logger6.default("Processing Row", { row });
   const operationContext = context || createOperationContext();
   return contextManager.withContext(operationContext, async () => {
@@ -904,8 +944,20 @@ var processRow = async (row, keyTypes, referenceDefinitions, aggregationDefiniti
       }
       if (aggregationDefinitions && aggregationDefinitions.length > 0) {
         for (const aggregationDefinition of aggregationDefinitions) {
-          logger6.default("Processing Aggregation for %s from %s", item.key.kt, stringifyJSON(aggregationDefinition.kta));
-          item = await buildAggregation(item, aggregationDefinition, registry, operationContext);
+          const alreadyLoaded = includedAggregations && includedAggregations.includes(aggregationDefinition.property) && typeof item[aggregationDefinition.property] !== "undefined";
+          if (alreadyLoaded) {
+            logger6.debug(
+              `Skipping buildAggregation for '${aggregationDefinition.property}' - already loaded via INCLUDE (N+1 prevention)`,
+              {
+                property: aggregationDefinition.property,
+                itemType: item.key.kt,
+                hasData: Array.isArray(item[aggregationDefinition.property]) ? `${item[aggregationDefinition.property].length} items` : "single item"
+              }
+            );
+          } else {
+            logger6.default("Processing Aggregation for %s from %s", item.key.kt, stringifyJSON(aggregationDefinition.kta));
+            item = await buildAggregation(item, aggregationDefinition, registry, operationContext);
+          }
         }
       }
       operationContext.setCached(item.key, item);
@@ -1148,7 +1200,13 @@ var getAllOperation = (models, definition, registry) => {
         logger7.debug(`ALL operation called on ${models[0].name} with ${locs.length} location filters: ${locs.map((loc2) => `${loc2.kt}=${loc2.lk}`).join(", ") || "none"}`);
         const loc = locs;
         const model = models[0];
-        const options = buildQuery(itemQuery ?? {}, model);
+        let options = buildQuery(itemQuery ?? {}, model);
+        const { options: optionsWithAggs, includedAggregations } = addAggregationIncludes(
+          options,
+          model,
+          aggregations || []
+        );
+        options = optionsWithAggs;
         if (loc.length > 0) {
           const { kta } = coordinate;
           const directLocations = [];
@@ -1240,7 +1298,15 @@ var getAllOperation = (models, definition, registry) => {
         const matchingItems = await model.findAll(options);
         const currentContext = contextManager.getCurrentContext();
         const items = await Promise.all(matchingItems.map(async (row) => {
-          const processedRow = await processRow(row, coordinate.kta, references || [], aggregations || [], registry, currentContext);
+          const processedRow = await processRow(
+            row,
+            coordinate.kta,
+            references || [],
+            aggregations || [],
+            registry,
+            currentContext,
+            includedAggregations
+          );
           return validateKeys(processedRow, coordinate.kta);
         }));
         logger7.debug(`[ALL] Returning ${items.length} of ${total} ${model.name} records`);
@@ -1397,7 +1463,7 @@ var getCreateOperation = (models, definition, registry) => {
       try {
         logger8.trace(`[CREATE] Executing ${model.name}.create() with data: ${stringifyJSON(itemData)}`);
         const createdRecord = await model.create(itemData);
-        const processedRecord = await processRow(createdRecord, kta, references || [], aggregations || [], registry);
+        const processedRecord = await processRow(createdRecord, kta, references || [], aggregations || [], registry, void 0, void 0);
         const result = validateKeys2(processedRecord, kta);
         logger8.debug(`[CREATE] Created ${model.name} with key: ${result.key ? JSON.stringify(result.key) : `id=${createdRecord.id}`}`);
         return result;
@@ -1438,7 +1504,7 @@ var getFindOperation = (models, definition, registry) => {
         const finderResult = await finderMethod(params, locs, findOptions);
         const processItems = async (items) => {
           return await Promise.all(items.map(async (row) => {
-            const processedRow = await processRow(row, definition.coordinate.kta, references || [], aggregations || [], registry);
+            const processedRow = await processRow(row, definition.coordinate.kta, references || [], aggregations || [], registry, void 0, void 0);
             return validateKeys3(processedRow, definition.coordinate.kta);
           }));
         };
@@ -1541,19 +1607,31 @@ var getGetOperation = (models, definition, registry) => {
         const itemKey = key;
         const model = models[0];
         let item;
+        let includedAggregations = [];
         if (isPriKey4(itemKey)) {
-          logger10.trace(`[GET] Executing ${model.name}.findByPk() with pk: ${itemKey.pk}`);
-          item = await model.findByPk(itemKey.pk);
+          let options = {};
+          const aggResult = addAggregationIncludes(options, model, aggregations || []);
+          includedAggregations = aggResult.includedAggregations;
+          options = aggResult.options;
+          logger10.trace(`[GET] Executing ${model.name}.findByPk() with pk: ${itemKey.pk} and ${includedAggregations.length} aggregation includes`);
+          item = options.include && options.include.length > 0 ? await model.findByPk(itemKey.pk, { include: options.include }) : await model.findByPk(itemKey.pk);
         } else if (isComKey4(itemKey)) {
           const comKey = itemKey;
           if (comKey.loc.length === 0) {
+            let options = {};
+            const aggResult = addAggregationIncludes(options, model, aggregations || []);
+            includedAggregations = aggResult.includedAggregations;
+            options = aggResult.options;
             logger10.debug(`[GET] Empty loc array detected - finding by primary key across all locations: ${comKey.pk}`);
-            logger10.trace(`[GET] Executing ${model.name}.findByPk() with pk: ${comKey.pk}`);
-            item = await model.findByPk(comKey.pk);
+            logger10.trace(`[GET] Executing ${model.name}.findByPk() with pk: ${comKey.pk} and ${includedAggregations.length} aggregation includes`);
+            item = options.include && options.include.length > 0 ? await model.findByPk(comKey.pk, { include: options.include }) : await model.findByPk(comKey.pk);
           } else {
-            const queryOptions = processCompositeKey(comKey, model, kta);
+            let queryOptions = processCompositeKey(comKey, model, kta);
+            const aggResult = addAggregationIncludes(queryOptions, model, aggregations || []);
+            includedAggregations = aggResult.includedAggregations;
+            queryOptions = aggResult.options;
             logger10.default("Composite key query", { queryOptions });
-            logger10.trace(`[GET] Executing ${model.name}.findOne() with options: ${stringifyJSON(queryOptions)}`);
+            logger10.trace(`[GET] Executing ${model.name}.findOne() with options: ${stringifyJSON(queryOptions)} and ${includedAggregations.length} aggregation includes`);
             item = await model.findOne(queryOptions);
           }
         }
@@ -1565,7 +1643,7 @@ var getGetOperation = (models, definition, registry) => {
           );
         }
         const currentContext = contextManager.getCurrentContext();
-        const result = validateKeys4(await processRow(item, kta, references || [], aggregations || [], registry, currentContext), kta);
+        const result = validateKeys4(await processRow(item, kta, references || [], aggregations || [], registry, currentContext, includedAggregations), kta);
         logger10.debug(`[GET] Retrieved ${model.name} with key: ${result.key ? JSON.stringify(result.key) : `id=${item.id}`}`);
         return result;
       } catch (error) {
@@ -1804,7 +1882,7 @@ var getUpdateOperation = (models, definition, registry) => {
         logger13.default(`Update properties configured: ${Object.keys(updateProps).join(", ")}`);
         logger13.trace(`[UPDATE] Executing ${model.name}.update() with properties: ${stringifyJSON(updateProps)}`);
         response = await response.update(updateProps);
-        const processedItem = await processRow(response, kta, references || [], aggregations || [], registry);
+        const processedItem = await processRow(response, kta, references || [], aggregations || [], registry, void 0, void 0);
         const returnItem = validateKeys5(processedItem, kta);
         logger13.debug(`[UPDATE] Updated ${model.name} with key: ${returnItem.key ? JSON.stringify(returnItem.key) : `id=${response.id}`}`);
         return returnItem;