b2m-utils 0.0.289 → 0.0.291

package/build/index.js

@@ -582,72 +582,18 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
             switch (fee_1.feeCalculationTypeId) {
                 case exports.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) !== exports.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) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
-                        var percentageFees_1 = filteredFees.filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) === exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
-                        // Calcular fees não-percentuais (base fixa)
-                        var nonPercentageResults_1 = filterSiblingFees(nonPercentageFees.map(function (it) {
+                        // 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) !== exports.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) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE;
+                        });
+                        var filteredFeesResults = filterSiblingFees(filteredFees.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); });
-                        console.log("\n\uD83D\uDD04 Iniciando c\u00E1lculo iterativo para fee ".concat(fee_1.id, " (").concat(fee_1.name, ")"));
-                        console.log("\uD83D\uDCCA Base n\u00E3o-percentual: R$ ".concat(nonPercentageResults_1.reduce(function (sum, r) { return sum + (r.totalToCalc || 0); }, 0).toFixed(2)));
-                        console.log("\uD83D\uDCCB Fees percentuais a calcular: ".concat(percentageFees_1.map(function (f) { var _a; return "".concat((_a = f.fee) === null || _a === void 0 ? void 0 : _a.name, " (").concat(f.value, "%)"); }).join(', ')));
-                        var _loop_1 = function (iteration) {
-                            console.log("\n--- Itera\u00E7\u00E3o ".concat(iteration + 1, " ---"));
-                            // Calcular cada fee percentual com base nos valores atuais das outras
-                            var currentResults = percentageFees_1.map(function (pf) {
-                                var _a;
-                                // 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 baseNonPercentage = nonPercentageResults_1.reduce(function (sum, r) { return sum + (r.totalToCalc || 0); }, 0);
-                                var basePercentage = tempFees.reduce(function (sum, f) { return sum + (f.totalFee || 0); }, 0);
-                                var baseValue = baseNonPercentage + basePercentage;
-                                var percentValue = (+pf.value / 100);
-                                var calculatedValue = baseValue * percentValue;
-                                console.log("  ".concat((_a = pf.fee) === null || _a === void 0 ? void 0 : _a.name, ": base=").concat(baseValue.toFixed(2), " (").concat(baseNonPercentage.toFixed(2), " + ").concat(basePercentage.toFixed(2), ") \u00D7 ").concat(pf.value, "% = ").concat(calculatedValue.toFixed(2)));
-                                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 _a;
-                                var prevValue = previousValues_1.get(result.feeId) || 0;
-                                var diff = Math.abs(result.totalFee - prevValue);
-                                if (diff > tolerance_1) {
-                                    hasConverged = false;
-                                }
-                                console.log("  ".concat((_a = result.fee) === null || _a === void 0 ? void 0 : _a.name, ": anterior=").concat(prevValue.toFixed(2), ", atual=").concat(result.totalFee.toFixed(2), ", diff=").concat(diff.toFixed(4)));
-                                previousValues_1.set(result.feeId, result.totalFee);
-                            });
-                            percentageResults = currentResults;
-                            if (hasConverged) {
-                                console.log("\u2705 Convergiu na itera\u00E7\u00E3o ".concat(iteration + 1, "!"));
-                                return "break";
-                            }
-                        };
-                        for (var iteration = 0; iteration < maxIterations; iteration++) {
-                            var state_1 = _loop_1(iteration);
-                            if (state_1 === "break")
-                                break;
-                        }
-                        console.log("\n\uD83D\uDCC8 Resultado final das fees percentuais:");
-                        percentageResults.forEach(function (r) {
-                            var _a;
-                            console.log("  ".concat((_a = r.fee) === null || _a === void 0 ? void 0 : _a.name, ": R$ ").concat((r.totalFee || 0).toFixed(2)));
-                        });
-                        // 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;
@@ -1055,6 +1001,91 @@ var calculateIcms = function (totalFromAllFees, icmsRate) {
     };
 };
 
+/**
+ * Calcula todas as fees do tipo TOTAL_PERCENTAGE de forma iterativa
+ * para resolver a interdependência entre elas (ex: TRT e GAC)
+ */
+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) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
+    var percentageFees = allFees.filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) === exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
+    // Se não houver fees percentuais, retornar vazio
+    if (percentageFees.length === 0) {
+        return results;
+    }
+    console.log("\n\uD83D\uDD04 Calculando ".concat(percentageFees.length, " fees TOTAL_PERCENTAGE de forma iterativa"));
+    console.log("\uD83D\uDCCB Fees: ".concat(percentageFees.map(function (f) { var _a; return "".concat((_a = f.fee) === null || _a === void 0 ? void 0 : _a.name, " (").concat(f.value, "%)"); }).join(', ')));
+    // Calcular fees não-percentuais (base fixa)
+    var nonPercentageResults = filterSiblingFees(nonPercentageFees.map(function (it) {
+        return calculateFee(it, cte, allFees, false, allFeesForCalc);
+    }));
+    var baseNonPercentage = nonPercentageResults.reduce(function (sum, r) { return sum + (r.totalToCalc || 0); }, 0);
+    console.log("\uD83D\uDCCA Base n\u00E3o-percentual: R$ ".concat(baseNonPercentage.toFixed(2)));
+    // Calcular fees percentuais iterativamente até convergir
+    var maxIterations = 10;
+    var tolerance = 0.01; // Tolerância de 1 centavo
+    // Inicializar com valores zerados
+    var previousValues = new Map();
+    percentageFees.forEach(function (pf) { return previousValues.set(pf.fee.id, 0); });
+    var _loop_1 = function (iteration) {
+        console.log("\n--- Itera\u00E7\u00E3o ".concat(iteration + 1, " ---"));
+        // Calcular cada fee percentual com base nos valores atuais das outras
+        percentageFees.forEach(function (pf) {
+            var _a;
+            // Calcular base: fees não-percentuais + outras fees percentuais (exceto ela mesma)
+            var basePercentage = Array.from(previousValues.entries())
+                .filter(function (_a) {
+                var feeId = _a[0];
+                return feeId !== pf.fee.id;
+            })
+                .reduce(function (sum, _a) {
+                var value = _a[1];
+                return sum + value;
+            }, 0);
+            var baseValue = baseNonPercentage + basePercentage;
+            var percentValue = (+pf.value / 100);
+            var calculatedValue = baseValue * percentValue;
+            console.log("  ".concat((_a = pf.fee) === null || _a === void 0 ? void 0 : _a.name, ": base=").concat(baseValue.toFixed(2), " (").concat(baseNonPercentage.toFixed(2), " + ").concat(basePercentage.toFixed(2), ") \u00D7 ").concat(pf.value, "% = ").concat(calculatedValue.toFixed(2)));
+            previousValues.set(pf.fee.id, calculatedValue);
+            // Armazenar resultado
+            results.set(pf.fee.id, __assign(__assign({}, pf), { totalFee: calculatedValue, totalToCalc: calculatedValue, resultFee: "".concat(convertNumberToCurrency(baseValue, 'pt-br'), " x ").concat(+pf.value, "% = ").concat(convertNumberToCurrency(calculatedValue, 'pt-br')) }));
+        });
+        // Verificar convergência
+        var hasConverged = true;
+        var currentIteration = iteration;
+        if (currentIteration > 0) {
+            percentageFees.forEach(function (pf) {
+                var currentValue = previousValues.get(pf.fee.id) || 0;
+                var result = results.get(pf.fee.id);
+                var prevValue = (result === null || result === void 0 ? void 0 : result.totalFee) || 0;
+                var diff = Math.abs(currentValue - prevValue);
+                if (diff > tolerance) {
+                    hasConverged = false;
+                }
+            });
+        }
+        else {
+            hasConverged = false;
+        }
+        if (hasConverged) {
+            console.log("\u2705 Convergiu na itera\u00E7\u00E3o ".concat(iteration + 1, "!"));
+            return "break";
+        }
+    };
+    for (var iteration = 0; iteration < maxIterations; iteration++) {
+        var state_1 = _loop_1(iteration);
+        if (state_1 === "break")
+            break;
+    }
+    console.log("\n\uD83D\uDCC8 Resultado final das fees percentuais:");
+    results.forEach(function (result, feeId) {
+        var _a;
+        console.log("  ".concat((_a = result.fee) === null || _a === void 0 ? void 0 : _a.name, " (").concat(feeId, "): R$ ").concat((result.totalFee || 0).toFixed(2)));
+    });
+    return results;
+};
+
 var verifyConditionalFee = function (conditionalFeeToVerify, cte) {
     var _a, _b;
     if (conditionalFeeToVerify === null || conditionalFeeToVerify === void 0 ? void 0 : conditionalFeeToVerify.id) {
@@ -8077,6 +8108,7 @@ exports.applyRedeliveryMultiplier = applyRedeliveryMultiplier;
 exports.buildDynamicMapping = buildDynamicMapping;
 exports.calculateFee = calculateFee;
 exports.calculateIcms = calculateIcms;
+exports.calculateTotalPercentageFees = calculateTotalPercentageFees;
 exports.convertNumberToCurrency = convertNumberToCurrency;
 exports.filterSiblingFees = filterSiblingFees;
 exports.findAuditedMatch = findAuditedMatch;