b2m-utils 0.0.295 → 0.0.297

package/build/index.esm.js

@@ -1374,7 +1374,7 @@ var getLaneFromRatecard = function (cte) {
 };
 
 var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     var results = [];
     // Separar fees por tipo: normais, TOTAL_PERCENTAGE e ICMS
     var icmsFee = feesToCalc.find(function (f) { var _a; return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.id) === FeeEnum.ICMS || f.feeId === FeeEnum.ICMS; });
@@ -1385,6 +1385,8 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
             f.feeId !== FeeEnum.ICMS &&
             ((_b = f.fee) === null || _b === void 0 ? void 0 : _b.feeCalculationTypeId) !== FeeCalculationTypeEnum.TOTAL_PERCENTAGE;
     });
+    // PASSADA 1: Calcular fees normais (não TOTAL_PERCENTAGE, não ICMS)
+    console.log("\n\uD83D\uDCE6 [getCtesFeesResult] Calculando ".concat(normalFees.length, " fees normais"));
     var _loop_1 = function (item) {
         var feeTotal = calculateFee(item, cte, feesToCalc, false, allFeesForCalc);
         if (feeTotal === null || feeTotal === void 0 ? void 0 : feeTotal.totalFee) {
@@ -1401,8 +1403,8 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
                 });
                 if (siblingFees && (siblingFees === null || siblingFees === void 0 ? void 0 : siblingFees.length) > 0) {
                     var siblingFeesResults = [];
-                    for (var _f = 0, siblingFees_1 = siblingFees; _f < siblingFees_1.length; _f++) {
-                        var item_1 = siblingFees_1[_f];
+                    for (var _h = 0, siblingFees_1 = siblingFees; _h < siblingFees_1.length; _h++) {
+                        var item_1 = siblingFees_1[_h];
                         var result = calculateFee(item_1, cte, feesToCalc, false, allFeesForCalc);
                         siblingFeesResults.push(result);
                     }
@@ -1414,12 +1416,14 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
                     });
                     if ((siblingFeesResults === null || siblingFeesResults === void 0 ? void 0 : siblingFeesResults.length) > 0) {
                         if (((_b = siblingFeesResults[0]) === null || _b === void 0 ? void 0 : _b.totalFee) && ((_c = siblingFeesResults[0]) === null || _c === void 0 ? void 0 : _c.totalFee) > totalFee) {
+                            console.log("  \u26A0\uFE0F  ".concat((_d = item.fee) === null || _d === void 0 ? void 0 : _d.name, ": R$ ").concat(totalFee.toFixed(2), " \u2192 R$ 0.00 (sibling maior)"));
                             totalToPush = 0;
                         }
                     }
                 }
             }
-            if (!isNaN(+totalToPush)) {
+            if (!isNaN(+totalToPush) && totalToPush > 0) {
+                console.log("  \u2705 ".concat((_e = item.fee) === null || _e === void 0 ? void 0 : _e.name, ": R$ ").concat(totalToPush.toFixed(2)));
                 results.push({
                     total: +(totalToPush).toFixed(2),
                     resultFee: resultFee,
@@ -1429,20 +1433,30 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
             }
         }
     };
-    // PASSADA 1: Calcular fees normais (não TOTAL_PERCENTAGE, não ICMS)
     for (var _i = 0, normalFees_1 = normalFees; _i < normalFees_1.length; _i++) {
         var item = normalFees_1[_i];
         _loop_1(item);
     }
+    console.log("\uD83D\uDCCA Total parcial (fees normais): R$ ".concat(results.reduce(function (sum, r) { return sum + r.total; }, 0).toFixed(2)));
     // PASSADA 2: Calcular fees TOTAL_PERCENTAGE de forma iterativa
     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 _e = 0, totalPercentageFees_1 = totalPercentageFees; _e < totalPercentageFees_1.length; _e++) {
-            var item = totalPercentageFees_1[_e];
-            if ((_d = item.fee) === null || _d === void 0 ? void 0 : _d.id) {
+        for (var _g = 0, totalPercentageFees_1 = totalPercentageFees; _g < totalPercentageFees_1.length; _g++) {
+            var item = totalPercentageFees_1[_g];
+            if ((_f = item.fee) === null || _f === void 0 ? void 0 : _f.id) {
                 var cachedResult = percentageFeesCache.get(item.fee.id);
                 if (cachedResult && cachedResult.totalFee && cachedResult.totalFee > 0) {
                     console.log("  ".concat(item.fee.name, ": R$ ").concat(cachedResult.totalFee.toFixed(2)));
@@ -1458,15 +1472,20 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
     }
     // PASSADA 3: Calcular ICMS com base em todas as fees anteriores (normais + TOTAL_PERCENTAGE)
     if (icmsFee) {
+        console.log("\n\uD83D\uDCB0 [getCtesFeesResult] Calculando ICMS");
         // Coletar apenas os valores das fees que realmente contam (total > 0)
         var valuesForIcms = results
             .filter(function (r) { return r.total > 0; })
             .map(function (r) { return r.total; });
+        console.log("\uD83D\uDCCA Valores para ICMS: ".concat(valuesForIcms.map(function (v) { return "R$ ".concat(v.toFixed(2)); }).join(' + '), " = R$ ").concat(valuesForIcms.reduce(function (a, b) { return a + b; }, 0).toFixed(2)));
         var icmsRate = (cte.icmsIncidence !== undefined && cte.icmsIncidence !== null && !isNaN(+cte.icmsIncidence))
             ? +(cte.icmsIncidence) / 100
             : icmsFee.value || 0;
+        console.log("\uD83D\uDCC8 Al\u00EDquota ICMS: ".concat((icmsRate * 100).toFixed(2), "%"));
         // Usar calculateIcms diretamente
         var icmsCalculation = calculateIcms(valuesForIcms, icmsRate);
+        console.log("\u2705 ICMS calculado: R$ ".concat(icmsCalculation.total.toFixed(2)));
+        console.log("\uD83D\uDCCB Total de fees no results antes do ICMS: ".concat(results.length));
         if (icmsCalculation.isValid && !isNaN(+icmsCalculation.total)) {
             results.push({
                 total: +(icmsCalculation.total).toFixed(2),
@@ -1474,8 +1493,11 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
                 feeValue: icmsRate,
                 feeId: icmsFee.feeId,
             });
+            console.log("\uD83D\uDCCB Total de fees no results depois do ICMS: ".concat(results.length));
         }
     }
+    console.log("\n\uD83C\uDFAF [getCtesFeesResult] Total final: R$ ".concat(results.reduce(function (sum, r) { return sum + r.total; }, 0).toFixed(2)));
+    console.log("\uD83D\uDCCB Breakdown: ".concat(results.map(function (r) { return "R$ ".concat(r.total.toFixed(2)); }).join(' + '), "\n"));
     return results;
 };