b2m-utils 0.0.287 → 0.0.288

package/build/index.esm.js

@@ -578,10 +578,56 @@ 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_1 = 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; });
-                        var filteredFeesResults = filterSiblingFees(filteredFees_1.map(function (it) {
-                            return calculateFee(it, cte, filteredFees_1, debug, allFeesForCalc);
+                        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; });
+                        // Separar fees em dois grupos
+                        var nonPercentageFees = filteredFees.filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) !== FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
+                        var percentageFees_1 = filteredFees.filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) === FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
+                        // Calcular fees não-percentuais (base fixa)
+                        var nonPercentageResults_1 = filterSiblingFees(nonPercentageFees.map(function (it) {
+                            return calculateFee(it, cte, allFees, debug, allFeesForCalc);
                         }));
+                        // Calcular fees percentuais iterativamente até convergir
+                        var percentageResults = [];
+                        var maxIterations = 10;
+                        var tolerance_1 = 0.01; // Tolerância de 1 centavo
+                        // Inicializar com valores zerados
+                        var previousValues_1 = new Map();
+                        percentageFees_1.forEach(function (pf) { return previousValues_1.set(pf.fee.id, 0); });
+                        var _loop_1 = function (iteration) {
+                            // Calcular cada fee percentual com base nos valores atuais das outras
+                            var currentResults = percentageFees_1.map(function (pf) {
+                                // Criar uma lista temporária com os valores já calculados das outras fees percentuais
+                                var tempFees = percentageFees_1
+                                    .filter(function (f) { return f.fee.id !== pf.fee.id; })
+                                    .map(function (f) { return (__assign(__assign({}, f), { totalFee: previousValues_1.get(f.fee.id) || 0, totalToCalc: previousValues_1.get(f.fee.id) || 0 })); });
+                                // Calcular base: fees não-percentuais + outras fees percentuais
+                                var baseValue = nonPercentageResults_1.reduce(function (sum, r) { return sum + (r.totalToCalc || 0); }, 0) +
+                                    tempFees.reduce(function (sum, f) { return sum + (f.totalFee || 0); }, 0);
+                                var percentValue = (+pf.value / 100);
+                                var calculatedValue = baseValue * percentValue;
+                                return __assign(__assign({}, pf), { totalFee: calculatedValue, totalToCalc: calculatedValue, fee: pf.fee, feeValue: pf.value, resultFee: "".concat(convertNumberToCurrency(baseValue, 'pt-br'), " x ").concat(+pf.value, "% = ").concat(convertNumberToCurrency(calculatedValue, 'pt-br')) });
+                            });
+                            // Verificar convergência
+                            var hasConverged = true;
+                            currentResults.forEach(function (result) {
+                                var prevValue = previousValues_1.get(result.feeId) || 0;
+                                if (Math.abs(result.totalFee - prevValue) > tolerance_1) {
+                                    hasConverged = false;
+                                }
+                                previousValues_1.set(result.feeId, result.totalFee);
+                            });
+                            percentageResults = currentResults;
+                            if (hasConverged) {
+                                return "break";
+                            }
+                        };
+                        for (var iteration = 0; iteration < maxIterations; iteration++) {
+                            var state_1 = _loop_1(iteration);
+                            if (state_1 === "break")
+                                break;
+                        }
+                        // Combinar resultados
+                        var filteredFeesResults = __spreadArray(__spreadArray([], nonPercentageResults_1, true), percentageResults, true);
                         var totalFromAllFees = filteredFeesResults.map(function (result) {
                             if (result === null || result === void 0 ? void 0 : result.totalToCalc) {
                                 return result.totalToCalc;