b2m-utils 0.0.296 → 0.0.298

package/build/index.js

@@ -966,41 +966,6 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
     }
 };
 
-/**
- * Calcula o valor do ICMS baseado no total das outras taxas
- *
- * @param totalFromAllFees - Array com os valores das outras taxas
- * @param icmsRate - Alíquota do ICMS (ex: 0.12 para 12%)
- * @returns Objeto com o valor calculado e detalhes do cálculo
- */
-var calculateIcms = function (totalFromAllFees, icmsRate) {
-    // Filtra valores válidos e soma
-    var totalValueFromAllFees = totalFromAllFees
-        .filter(function (value) { return !isNaN(+value) && +value > 0; })
-        .reduce(function (previous, current) { return +previous + +current; }, 0);
-    // Verifica se há valor válido para cálculo
-    if (!totalValueFromAllFees || isNaN(+totalValueFromAllFees)) {
-        return {
-            total: 0,
-            totalValueFromAllFees: 0,
-            valueToDivide: 0,
-            firstTotal: 0,
-            isValid: false
-        };
-    }
-    // Cálculo do ICMS: (soma / (1 - alíquota)) * alíquota
-    var valueToDivide = (1 - icmsRate).toFixed(2);
-    var firstTotal = +totalValueFromAllFees / +valueToDivide;
-    var total = +firstTotal * icmsRate;
-    return {
-        total: total,
-        totalValueFromAllFees: totalValueFromAllFees,
-        valueToDivide: valueToDivide,
-        firstTotal: firstTotal,
-        isValid: true
-    };
-};
-
 /**
  * Calcula todas as fees do tipo TOTAL_PERCENTAGE de forma iterativa
  * para resolver a interdependência entre elas (ex: TRT e GAC)
@@ -1095,6 +1060,105 @@ var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc, preCa
     return results;
 };
 
+/**
+ * Calcula o valor do ICMS baseado no total das outras taxas
+ *
+ * @param totalFromAllFees - Array com os valores das outras taxas
+ * @param icmsRate - Alíquota do ICMS (ex: 0.12 para 12%)
+ * @returns Objeto com o valor calculado e detalhes do cálculo
+ */
+var calculateIcms = function (totalFromAllFees, icmsRate) {
+    // Filtra valores válidos e soma
+    var totalValueFromAllFees = totalFromAllFees
+        .filter(function (value) { return !isNaN(+value) && +value > 0; })
+        .reduce(function (previous, current) { return +previous + +current; }, 0);
+    // Verifica se há valor válido para cálculo
+    if (!totalValueFromAllFees || isNaN(+totalValueFromAllFees)) {
+        return {
+            total: 0,
+            totalValueFromAllFees: 0,
+            valueToDivide: 0,
+            firstTotal: 0,
+            isValid: false
+        };
+    }
+    // Cálculo do ICMS: (soma / (1 - alíquota)) * alíquota
+    var valueToDivide = (1 - icmsRate).toFixed(2);
+    var firstTotal = +totalValueFromAllFees / +valueToDivide;
+    var total = +firstTotal * icmsRate;
+    return {
+        total: total,
+        totalValueFromAllFees: totalValueFromAllFees,
+        valueToDivide: valueToDivide,
+        firstTotal: firstTotal,
+        isValid: true
+    };
+};
+
+/**
+ * Calcula o total de fees de forma consistente, usando cálculo iterativo para TOTAL_PERCENTAGE
+ * @param fees - Array de fees a calcular
+ * @param cte - CTE para cálculo
+ * @param allFeesForCalc - Todas as fees disponíveis para cálculo
+ * @returns Total calculado
+ */
+var calculateFeesTotal = function (fees, cte, allFeesForCalc) {
+    if (!fees || fees.length === 0)
+        return 0;
+    var cache = {};
+    // PASSADA 1: Calcular fees normais (não TOTAL_PERCENTAGE, não ICMS)
+    fees.forEach(function (fee, idx) {
+        var _a, _b;
+        if (((_a = fee.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE &&
+            ((_b = fee.fee) === null || _b === void 0 ? void 0 : _b.id) !== exports.FeeEnum.ICMS) {
+            cache[idx] = calculateFee(fee, cte, fees, true, allFeesForCalc);
+        }
+    });
+    // PASSADA 2: Calcular TOTAL_PERCENTAGE de forma iterativa
+    var percentageFeesCache = calculateTotalPercentageFees(fees, cte, allFeesForCalc);
+    fees.forEach(function (fee, idx) {
+        var _a, _b;
+        if (((_a = fee.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) === exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE &&
+            ((_b = fee.fee) === null || _b === void 0 ? void 0 : _b.id)) {
+            var cachedResult = percentageFeesCache.get(fee.fee.id);
+            if (cachedResult) {
+                cache[idx] = {
+                    totalToCalc: Number((cachedResult.totalToCalc || 0).toFixed(2)),
+                };
+            }
+        }
+    });
+    // PASSADA 3: Calcular ICMS
+    fees.forEach(function (fee, idx) {
+        var _a;
+        if (((_a = fee.fee) === null || _a === void 0 ? void 0 : _a.id) === exports.FeeEnum.ICMS) {
+            var icmsRate = (cte.icmsIncidence !== undefined && cte.icmsIncidence !== null && !isNaN(+cte.icmsIncidence))
+                ? +(cte.icmsIncidence) / 100
+                : fee.value || 0;
+            var valuesWithoutIcms = Object.entries(cache)
+                .filter(function (_a) {
+                var _b;
+                var key = _a[0];
+                var feeIdx = Number(key);
+                var f = fees[feeIdx];
+                return ((_b = f.fee) === null || _b === void 0 ? void 0 : _b.id) !== exports.FeeEnum.ICMS;
+            })
+                .map(function (_a) {
+                var calcFee = _a[1];
+                return (calcFee === null || calcFee === void 0 ? void 0 : calcFee.totalToCalc) || 0;
+            })
+                .filter(function (val) { return val > 0; });
+            var icmsCalculation = calculateIcms(valuesWithoutIcms, icmsRate);
+            if (icmsCalculation.isValid) {
+                cache[idx] = {
+                    totalToCalc: Number(icmsCalculation.total.toFixed(2)),
+                };
+            }
+        }
+    });
+    return Object.values(cache).reduce(function (sum, calcFee) { return sum + ((calcFee === null || calcFee === void 0 ? void 0 : calcFee.totalToCalc) || 0); }, 0);
+};
+
 var verifyConditionalFee = function (conditionalFeeToVerify, cte) {
     var _a, _b;
     if (conditionalFeeToVerify === null || conditionalFeeToVerify === void 0 ? void 0 : conditionalFeeToVerify.id) {
@@ -1446,7 +1510,17 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
     if (totalPercentageFees.length > 0) {
         console.log("\n\uD83D\uDD04 [getCtesFeesResult] Calculando ".concat(totalPercentageFees.length, " fees TOTAL_PERCENTAGE"));
         console.log("\uD83D\uDCCB Fees: ".concat(totalPercentageFees.map(function (f) { var _a; return "".concat((_a = f.fee) === null || _a === void 0 ? void 0 : _a.name, " (").concat(f.value, "%)"); }).join(', ')));
-        var percentageFeesCache = calculateTotalPercentageFees(feesToCalc, cte, allFeesForCalc);
+        // Criar Map com valores já calculados das fees normais (respeitando lógica de siblings)
+        var preCalculatedValues_1 = new Map();
+        results.forEach(function (r) {
+            var _a;
+            var fee = feesToCalc.find(function (f) { return f.feeId === r.feeId; });
+            if ((_a = fee === null || fee === void 0 ? void 0 : fee.fee) === null || _a === void 0 ? void 0 : _a.id) {
+                preCalculatedValues_1.set(fee.fee.id, r.total);
+            }
+        });
+        console.log("\uD83D\uDCCA Usando ".concat(preCalculatedValues_1.size, " valores pr\u00E9-calculados"));
+        var percentageFeesCache = calculateTotalPercentageFees(feesToCalc, cte, allFeesForCalc, preCalculatedValues_1);
         console.log("\u2705 Cache gerado com ".concat(percentageFeesCache.size, " fees"));
         for (var _g = 0, totalPercentageFees_1 = totalPercentageFees; _g < totalPercentageFees_1.length; _g++) {
             var item = totalPercentageFees_1[_g];
@@ -8132,6 +8206,7 @@ exports.addTariffMapping = addTariffMapping;
 exports.applyRedeliveryMultiplier = applyRedeliveryMultiplier;
 exports.buildDynamicMapping = buildDynamicMapping;
 exports.calculateFee = calculateFee;
+exports.calculateFeesTotal = calculateFeesTotal;
 exports.calculateIcms = calculateIcms;
 exports.calculateTotalPercentageFees = calculateTotalPercentageFees;
 exports.convertNumberToCurrency = convertNumberToCurrency;