b2m-utils 0.0.290 → 0.0.292

package/build/index.esm.js

@@ -578,7 +578,15 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
             switch (fee_1.feeCalculationTypeId) {
                 case FeeCalculationTypeEnum.TOTAL_PERCENTAGE:
                     if (allFees && Array.isArray(allFees) && (allFees === null || allFees === void 0 ? void 0 : allFees.length) > 0) {
-                        var filteredFees = allFees.filter(function (i) { var _a, _b, _c; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.id) !== fee_1.id && ((_b = i.fee) === null || _b === void 0 ? void 0 : _b.id) !== FeeEnum.ICMS && ((_c = i.fee) === null || _c === void 0 ? void 0 : _c.parentId) !== fee_1.parentId; });
+                        // Filtrar fees excluindo a própria fee, ICMS e fees irmãs
+                        // IMPORTANTE: Também excluir outras fees TOTAL_PERCENTAGE para evitar recursão infinita
+                        var filteredFees = allFees.filter(function (i) {
+                            var _a, _b, _c, _d;
+                            return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.id) !== fee_1.id &&
+                                ((_b = i.fee) === null || _b === void 0 ? void 0 : _b.id) !== FeeEnum.ICMS &&
+                                ((_c = i.fee) === null || _c === void 0 ? void 0 : _c.parentId) !== fee_1.parentId &&
+                                ((_d = i.fee) === null || _d === void 0 ? void 0 : _d.feeCalculationTypeId) !== FeeCalculationTypeEnum.TOTAL_PERCENTAGE;
+                        });
                         var filteredFeesResults = filterSiblingFees(filteredFees.map(function (it) {
                             return calculateFee(it, cte, allFees, debug, allFeesForCalc);
                         }));
@@ -996,8 +1004,17 @@ var calculateIcms = function (totalFromAllFees, icmsRate) {
 var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc) {
     var results = new Map();
     // Separar fees em dois grupos
-    var nonPercentageFees = allFees.filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) !== FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
-    var percentageFees = allFees.filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) === FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
+    // IMPORTANTE: ICMS não deve ser calculado aqui, ele tem tratamento especial no calculateFee
+    var nonPercentageFees = allFees.filter(function (i) {
+        var _a, _b;
+        return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) !== FeeCalculationTypeEnum.TOTAL_PERCENTAGE &&
+            ((_b = i.fee) === null || _b === void 0 ? void 0 : _b.id) !== FeeEnum.ICMS;
+    });
+    var percentageFees = allFees.filter(function (i) {
+        var _a, _b;
+        return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) === FeeCalculationTypeEnum.TOTAL_PERCENTAGE &&
+            ((_b = i.fee) === null || _b === void 0 ? void 0 : _b.id) !== FeeEnum.ICMS;
+    });
     // Se não houver fees percentuais, retornar vazio
     if (percentageFees.length === 0) {
         return results;