b2m-utils 0.0.313 → 0.0.314

package/build/index.js

@@ -1072,59 +1072,74 @@ var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc, curre
     if (percentageFees.length === 0) {
         return results;
     }
-    // Calcular base das fees não-percentuais
-    // Se temos currentValues, usar eles; senão calcular normalmente
-    var baseNonPercentage = 0;
-    var nonPercentageDetails = [];
-    if (currentValues) {
-        // Usar valores atuais das fees não-percentuais
-        baseNonPercentage = nonPercentageFees.reduce(function (sum, fee) {
-            var _a;
-            var value = ((_a = fee.fee) === null || _a === void 0 ? void 0 : _a.id) ? currentValues.get(fee.fee.id) : undefined;
-            if (value !== undefined) {
-                nonPercentageDetails.push({
-                    feeId: fee.fee.id,
-                    feeName: fee.fee.name || 'Unknown',
-                    value: value
-                });
-                return sum + value;
-            }
-            // Se não tem valor atual, calcular
-            var calculated = calculateFee(fee, cte, allFees, false, allFeesForCalc);
-            var calcValue = (calculated === null || calculated === void 0 ? void 0 : calculated.totalToCalc) || 0;
-            if (calcValue > 0) {
-                nonPercentageDetails.push({
-                    feeId: fee.fee.id,
-                    feeName: fee.fee.name || 'Unknown',
-                    value: calcValue
-                });
-            }
-            return sum + calcValue;
-        }, 0);
-    }
-    else {
-        // Calcular normalmente
-        var nonPercentageResults = filterSiblingFees(nonPercentageFees.map(function (it) {
-            return calculateFee(it, cte, allFees, false, allFeesForCalc);
-        }));
-        baseNonPercentage = nonPercentageResults.reduce(function (sum, r) {
-            var _a;
-            var value = r.totalToCalc || 0;
-            if (value > 0 && ((_a = r.fee) === null || _a === void 0 ? void 0 : _a.id)) {
-                nonPercentageDetails.push({
-                    feeId: r.fee.id,
-                    feeName: r.fee.name || 'Unknown',
-                    value: value
-                });
-            }
-            return sum + value;
-        }, 0);
-    }
-    console.log('[calculateTotalPercentageFees] Base não-percentual calculada', {
-        baseNonPercentage: baseNonPercentage,
-        nonPercentageFeesCount: nonPercentageFees.length,
-        nonPercentageDetails: nonPercentageDetails
-    });
+    // Calcular base das fees não-percentuais para cada fee TOTAL_PERCENTAGE
+    // Cada fee TOTAL_PERCENTAGE terá sua própria baseNonPercentage (excluindo suas fees configuradas)
+    var calculateBaseNonPercentageForFee = function (excludedFeeIds) {
+        var base = 0;
+        var details = [];
+        if (currentValues) {
+            // Usar valores atuais das fees não-percentuais
+            nonPercentageFees.forEach(function (fee) {
+                var _a;
+                if (!((_a = fee.fee) === null || _a === void 0 ? void 0 : _a.id))
+                    return;
+                var isExcluded = excludedFeeIds.has(fee.fee.id);
+                var value = currentValues.get(fee.fee.id);
+                if (value !== undefined) {
+                    details.push({
+                        feeId: fee.fee.id,
+                        feeName: fee.fee.name || 'Unknown',
+                        value: value,
+                        excluded: isExcluded
+                    });
+                    if (!isExcluded) {
+                        base += value;
+                    }
+                }
+                else {
+                    // Se não tem valor atual, calcular
+                    var calculated = calculateFee(fee, cte, allFees, false, allFeesForCalc);
+                    var calcValue = (calculated === null || calculated === void 0 ? void 0 : calculated.totalToCalc) || 0;
+                    if (calcValue > 0) {
+                        details.push({
+                            feeId: fee.fee.id,
+                            feeName: fee.fee.name || 'Unknown',
+                            value: calcValue,
+                            excluded: isExcluded
+                        });
+                        if (!isExcluded) {
+                            base += calcValue;
+                        }
+                    }
+                }
+            });
+        }
+        else {
+            // Calcular normalmente
+            var nonPercentageResults = filterSiblingFees(nonPercentageFees.map(function (it) {
+                return calculateFee(it, cte, allFees, false, allFeesForCalc);
+            }));
+            nonPercentageResults.forEach(function (r) {
+                var _a;
+                if (!((_a = r.fee) === null || _a === void 0 ? void 0 : _a.id))
+                    return;
+                var isExcluded = excludedFeeIds.has(r.fee.id);
+                var value = r.totalToCalc || 0;
+                if (value > 0) {
+                    details.push({
+                        feeId: r.fee.id,
+                        feeName: r.fee.name || 'Unknown',
+                        value: value,
+                        excluded: isExcluded
+                    });
+                    if (!isExcluded) {
+                        base += value;
+                    }
+                }
+            });
+        }
+        return { base: base, details: details };
+    };
     // Calcular fees percentuais iterativamente até convergir
     var maxIterations = 10;
     var tolerance = 0.01; // Tolerância de 1 centavo
@@ -1155,6 +1170,9 @@ var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc, curre
                 excludedFeeIds: Array.from(excludedFeeIds),
                 iteration: iteration
             });
+            // Calcular base não-percentual específica para esta fee (excluindo fees configuradas)
+            var _a = calculateBaseNonPercentageForFee(excludedFeeIds), baseNonPercentage = _a.base, nonPercentageDetails = _a.details;
+            // Calcular base percentual (outras fees TOTAL_PERCENTAGE, exceto ela mesma e excluídas)
             var basePercentage = Array.from(previousValues.entries())
                 .filter(function (_a) {
                 var feeId = _a[0];
@@ -1171,6 +1189,7 @@ var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc, curre
                 feeId: pf.fee.id,
                 feeName: pf.fee.name,
                 baseNonPercentage: baseNonPercentage,
+                nonPercentageDetails: nonPercentageDetails,
                 basePercentage: basePercentage,
                 baseValue: baseValue,
                 percentValue: "".concat(pf.value, "%"),