@fjell/lib-sequelize 4.4.70 → 4.4.71

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;AASpB,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,CA8DvC,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,KACzB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAqEvC,CAAC"}

package/dist/index.js

@@ -580,11 +580,11 @@ var removeEvents = (item) => {
 
 // src/processing/ReferenceBuilder.ts
 var buildSequelizeReference = async (item, referenceDefinition, registry, context) => {
-  const libLogger2 = logger_default.get("processing", "ReferenceBuilder");
+  const libLogger3 = logger_default.get("processing", "ReferenceBuilder");
   const isCompositeItem = referenceDefinition.kta.length > 1;
   const primaryKeyType = referenceDefinition.kta[0];
   if (isCompositeItem) {
-    libLogger2.debug(
+    libLogger3.debug(
       "Detected composite item reference - will use ComKey with empty loc array",
       {
         kta: referenceDefinition.kta,
@@ -624,7 +624,7 @@ var buildSequelizeReference = async (item, referenceDefinition, registry, contex
       const columnName = referenceDefinition.locationColumns[i];
       const locValue = item[columnName];
       if (locValue == null) {
-        libLogger2.warning(
+        libLogger3.warning(
           `Location column '${columnName}' is null/undefined for reference '${referenceDefinition.property}'. Falling back to empty loc array search.`
         );
         hasNullLocation = true;
@@ -647,7 +647,7 @@ var buildSequelizeReference = async (item, referenceDefinition, registry, contex
         pk: columnValue,
         loc
       };
-      libLogger2.debug("Built full ComKey with location context", {
+      libLogger3.debug("Built full ComKey with location context", {
         itemKey,
         locationColumns: referenceDefinition.locationColumns,
         property: referenceDefinition.property
@@ -659,12 +659,12 @@ var buildSequelizeReference = async (item, referenceDefinition, registry, contex
       pk: columnValue,
       loc: []
     };
-    libLogger2.debug("Using empty loc array for composite item reference", {
+    libLogger3.debug("Using empty loc array for composite item reference", {
       kta: referenceDefinition.kta,
       property: referenceDefinition.property
     });
   }
-  libLogger2.debug("Created reference key", {
+  libLogger3.debug("Created reference key", {
     itemKey,
     isCompositeItem,
     hasLocationColumns: !!referenceDefinition.locationColumns,
@@ -673,10 +673,10 @@ var buildSequelizeReference = async (item, referenceDefinition, registry, contex
   let referencedItem;
   if (context) {
     if (context.isCached(itemKey)) {
-      libLogger2.debug("Using cached reference", { itemKey, property: referenceDefinition.property });
+      libLogger3.debug("Using cached reference", { itemKey, property: referenceDefinition.property });
       referencedItem = context.getCached(itemKey);
     } else if (context.isInProgress(itemKey)) {
-      libLogger2.debug("Circular dependency detected, creating reference placeholder", {
+      libLogger3.debug("Circular dependency detected, creating reference placeholder", {
         itemKey,
         property: referenceDefinition.property
       });
@@ -755,10 +755,17 @@ function addRefsToSequelizeItem(item, referenceDefinitions) {
     if (foreignKeyValue != null) {
       const key = buildKeyFromForeignKey(refDef, foreignKeyValue, item);
       const populatedItem = item[refDef.property];
-      refs[refName] = {
-        key,
-        item: populatedItem
-      };
+      if (populatedItem) {
+        const { key: _itemKey, ...itemProperties } = populatedItem;
+        refs[refName] = {
+          key,
+          ...itemProperties
+        };
+      } else {
+        refs[refName] = {
+          key
+        };
+      }
     } else {
       refs[refName] = {
         key: {
@@ -782,17 +789,25 @@ function updateForeignKeysFromRefs(item, refs, referenceDefinitions) {
       if (isPriKey2(ref.key)) {
         item[refDef.column] = ref.key.pk;
       } else if (isComKey2(ref.key)) {
-        item[refDef.column] = ref.key.pk;
-        if (refDef.locationColumns && ref.key.loc) {
-          ref.key.loc.forEach((locItem, index) => {
+        const comKey = ref.key;
+        item[refDef.column] = comKey.pk;
+        if (refDef.locationColumns && comKey.loc) {
+          comKey.loc.forEach((locItem, index) => {
             if (refDef.locationColumns && refDef.locationColumns[index]) {
               item[refDef.locationColumns[index]] = locItem.lk;
             }
           });
         }
       }
-      if (ref.item) {
-        item[refDef.property] = ref.item;
+      const { key, ...itemProperties } = ref;
+      const hasItemProperties = Object.keys(itemProperties).length > 0;
+      if (hasItemProperties) {
+        item[refDef.property] = {
+          key,
+          ...itemProperties
+        };
+      } else {
+        delete item[refDef.property];
       }
     } else if (ref == null) {
       if (refName in refs) {
@@ -811,6 +826,57 @@ function removeRefsFromSequelizeItem(item, referenceDefinitions) {
   return result;
 }
 
+// src/processing/AggsAdapter.ts
+var libLogger2 = logger_default.get("sequelize", "processing", "AggsAdapter");
+function addAggsToItem(item, aggregationDefinitions) {
+  if (!aggregationDefinitions || aggregationDefinitions.length === 0) {
+    return item;
+  }
+  const aggs = {};
+  const result = { ...item };
+  for (const aggDef of aggregationDefinitions) {
+    const aggregationValue = item[aggDef.property];
+    if (typeof aggregationValue !== "undefined") {
+      aggs[aggDef.property] = aggregationValue;
+      delete result[aggDef.property];
+      libLogger2.debug(`Moved aggregation '${aggDef.property}' to aggs structure`, {
+        property: aggDef.property,
+        hasValue: typeof aggregationValue !== "undefined",
+        valueType: Array.isArray(aggregationValue) ? "array" : typeof aggregationValue
+      });
+    } else {
+      libLogger2.debug(`Aggregation '${aggDef.property}' is undefined, skipping`, {
+        property: aggDef.property
+      });
+    }
+  }
+  if (Object.keys(aggs).length > 0) {
+    return {
+      ...result,
+      aggs
+    };
+  }
+  return item;
+}
+function removeAggsFromItem(item, aggregationDefinitions) {
+  if (!aggregationDefinitions || aggregationDefinitions.length === 0) {
+    return item;
+  }
+  const result = { ...item };
+  if (result.aggs && typeof result.aggs === "object") {
+    for (const aggDef of aggregationDefinitions) {
+      if (typeof result.aggs[aggDef.property] !== "undefined") {
+        result[aggDef.property] = result.aggs[aggDef.property];
+        libLogger2.debug(`Moved aggregation '${aggDef.property}' from aggs to direct property`, {
+          property: aggDef.property
+        });
+      }
+    }
+    delete result.aggs;
+  }
+  return result;
+}
+
 // src/RowProcessor.ts
 var logger6 = logger_default.get("sequelize", "RowProcessor");
 var processRow = async (row, keyTypes, referenceDefinitions, aggregationDefinitions, registry, context) => {
@@ -833,7 +899,7 @@ var processRow = async (row, keyTypes, referenceDefinitions, aggregationDefiniti
         await Promise.all(referencePromises);
         const referenceDuration = (typeof performance !== "undefined" ? performance.now() : Date.now()) - referenceStartTime;
         if (referenceDuration > 100) {
-          logger6.info(`\u23F1\uFE0F REFERENCE_BUILDER_PERF: Loaded ${referenceDefinitions.length} references in parallel for ${item.key.kt} - ${referenceDuration.toFixed(2)}ms`);
+          logger6.debug(`\u23F1\uFE0F REFERENCE_BUILDER_PERF: Loaded ${referenceDefinitions.length} references in parallel for ${item.key.kt} - ${referenceDuration.toFixed(2)}ms`);
         }
       }
       if (aggregationDefinitions && aggregationDefinitions.length > 0) {
@@ -850,6 +916,10 @@ var processRow = async (row, keyTypes, referenceDefinitions, aggregationDefiniti
       item = addRefsToSequelizeItem(item, referenceDefinitions);
       logger6.debug("Added refs structure to item (transparent wrapper)", { key: item.key });
     }
+    if (aggregationDefinitions && aggregationDefinitions.length > 0) {
+      item = addAggsToItem(item, aggregationDefinitions);
+      logger6.debug("Added aggs structure to item (transparent wrapper)", { key: item.key });
+    }
     logger6.default("Processed Row: %j", stringifyJSON(item));
     return item;
   });
@@ -1151,7 +1221,8 @@ var getAllOperation = (models, definition, registry) => {
         if (options.include) {
           countOptions.include = options.include;
         }
-        const total = await model.count(countOptions);
+        const countResult = await model.count(countOptions);
+        const total = Array.isArray(countResult) ? countResult.length : countResult;
         logger7.debug(`[ALL] Total count for ${model.name}: ${total}`);
         delete options.limit;
         delete options.offset;
@@ -1243,6 +1314,9 @@ var getCreateOperation = (models, definition, registry) => {
       if (references && references.length > 0) {
         itemData = removeRefsFromSequelizeItem(itemData, references);
       }
+      if (aggregations && aggregations.length > 0) {
+        itemData = removeAggsFromItem(itemData, aggregations);
+      }
       const invalidAttributes = [];
       for (const key of Object.keys(itemData)) {
         if (!modelAttributes[key]) {
@@ -1706,6 +1780,9 @@ var getUpdateOperation = (models, definition, registry) => {
         if (references && references.length > 0) {
           updateProps = removeRefsFromSequelizeItem(updateProps, references);
         }
+        if (aggregations && aggregations.length > 0) {
+          updateProps = removeAggsFromItem(updateProps, aggregations);
+        }
         logger13.default(`Update found ${model.name} record to modify`);
         logger13.default(`Update properties configured: ${Object.keys(updateProps).join(", ")}`);
         logger13.trace(`[UPDATE] Executing ${model.name}.update() with properties: ${stringifyJSON(updateProps)}`);
@@ -1780,7 +1857,7 @@ var createOperations = (models, coordinate, registry, options) => {
   };
   implOps.findOne = async (finder, params, locations) => {
     const results = await implOps.find(finder, params || {}, locations);
-    return results.length > 0 ? results[0] : null;
+    return results.items.length > 0 ? results.items[0] : null;
   };
   return Library2.wrapImplementationOperations(implOps, options);
 };