b2m-utils 0.0.293 → 0.0.295

package/build/functions/calculateTotalPercentageFees/index.d.ts

@@ -3,5 +3,6 @@ import { RatecardLaneFeeWithFeeResult } from "../filterSiblingFees";
 /**
  * Calcula todas as fees do tipo TOTAL_PERCENTAGE de forma iterativa
  * para resolver a interdependência entre elas (ex: TRT e GAC)
+ * @param preCalculatedValues - Opcional: Map de feeId -> valor já calculado (para valores alterados manualmente)
  */
-export declare const calculateTotalPercentageFees: (allFees: RatecardLaneFee[], cte: Cte, allFeesForCalc?: RatecardLaneFee[]) => Map<number, RatecardLaneFeeWithFeeResult>;
+export declare const calculateTotalPercentageFees: (allFees: RatecardLaneFee[], cte: Cte, allFeesForCalc?: RatecardLaneFee[], preCalculatedValues?: Map<number, number>) => Map<number, RatecardLaneFeeWithFeeResult>;

package/build/functions/getCtesFeesResult/index.d.ts

@@ -1,7 +1,7 @@
 import { Cte, RatecardLaneFee } from "../../types";
 export declare const getCtesFeesResult: (feesToCalc: RatecardLaneFee[], cte: Cte, allFeesForCalc?: RatecardLaneFee[]) => {
     total: number;
-    resultFee: string;
+    resultFee: any;
     feeValue: number;
     feeId: number;
 }[];

package/build/index.esm.js

@@ -1000,8 +1000,9 @@ 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)
+ * @param preCalculatedValues - Opcional: Map de feeId -> valor já calculado (para valores alterados manualmente)
  */
-var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc) {
+var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc, preCalculatedValues) {
     var results = new Map();
     // Separar fees em dois grupos
     // IMPORTANTE: ICMS não deve ser calculado aqui, ele tem tratamento especial no calculateFee
@@ -1019,16 +1020,22 @@ var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc) {
     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)
-    console.log("\uD83D\uDCCB Fees n\u00E3o-percentuais: ".concat(nonPercentageFees.map(function (f) { var _a; return "".concat((_a = f.fee) === null || _a === void 0 ? void 0 : _a.name); }).join(', ')));
-    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)));
-    console.log("\uD83D\uDCCA Detalhamento: ".concat(nonPercentageResults.map(function (r) { var _a, _b; return "".concat((_a = r.fee) === null || _a === void 0 ? void 0 : _a.name, "=").concat((_b = r.totalToCalc) === null || _b === void 0 ? void 0 : _b.toFixed(2)); }).join(', ')));
+    var baseNonPercentage = 0;
+    // Se temos valores pré-calculados, usar eles ao invés de recalcular
+    if (preCalculatedValues) {
+        baseNonPercentage = nonPercentageFees.reduce(function (sum, fee) {
+            var _a;
+            var value = ((_a = fee.fee) === null || _a === void 0 ? void 0 : _a.id) ? preCalculatedValues.get(fee.fee.id) : undefined;
+            return sum + (value !== undefined ? value : 0);
+        }, 0);
+    }
+    else {
+        // Calcular normalmente
+        var nonPercentageResults = filterSiblingFees(nonPercentageFees.map(function (it) {
+            return calculateFee(it, cte, allFees, false, allFeesForCalc);
+        }));
+        baseNonPercentage = nonPercentageResults.reduce(function (sum, r) { return sum + (r.totalToCalc || 0); }, 0);
+    }
     // Calcular fees percentuais iterativamente até convergir
     var maxIterations = 10;
     var tolerance = 0.01; // Tolerância de 1 centavo
@@ -1036,10 +1043,8 @@ var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc) {
     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) {
@@ -1053,7 +1058,6 @@ var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc) {
             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')) }));
@@ -1076,7 +1080,6 @@ var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc) {
             hasConverged = false;
         }
         if (hasConverged) {
-            console.log("\u2705 Convergiu na itera\u00E7\u00E3o ".concat(iteration + 1, "!"));
             return "break";
         }
     };
@@ -1085,11 +1088,6 @@ var calculateTotalPercentageFees = function (allFees, cte, allFeesForCalc) {
         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;
 };
 
@@ -1376,7 +1374,7 @@ var getLaneFromRatecard = function (cte) {
 };
 
 var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     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; });
@@ -1403,8 +1401,8 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
                 });
                 if (siblingFees && (siblingFees === null || siblingFees === void 0 ? void 0 : siblingFees.length) > 0) {
                     var siblingFeesResults = [];
-                    for (var _e = 0, siblingFees_1 = siblingFees; _e < siblingFees_1.length; _e++) {
-                        var item_1 = siblingFees_1[_e];
+                    for (var _f = 0, siblingFees_1 = siblingFees; _f < siblingFees_1.length; _f++) {
+                        var item_1 = siblingFees_1[_f];
                         var result = calculateFee(item_1, cte, feesToCalc, false, allFeesForCalc);
                         siblingFeesResults.push(result);
                     }
@@ -1436,22 +1434,26 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
         var item = normalFees_1[_i];
         _loop_1(item);
     }
-    // PASSADA 2: Calcular fees TOTAL_PERCENTAGE usando a soma das fees normais já calculadas
-    for (var _d = 0, totalPercentageFees_1 = totalPercentageFees; _d < totalPercentageFees_1.length; _d++) {
-        var item = totalPercentageFees_1[_d];
-        // Calcular soma das fees normais (excluindo TOTAL_PERCENTAGE e ICMS)
-        var totalWithoutPercentageFees = results
-            .filter(function (r) { return r.total > 0; })
-            .reduce(function (sum, r) { return sum + r.total; }, 0);
-        var percentage = item.value || 0;
-        var calculatedValue = (totalWithoutPercentageFees * percentage) / 100;
-        if (!isNaN(+calculatedValue) && calculatedValue > 0) {
-            results.push({
-                total: +(calculatedValue).toFixed(2),
-                resultFee: "".concat(convertNumberToCurrency(totalWithoutPercentageFees, 'pt-br'), " x ").concat(percentage, "% = ").concat(convertNumberToCurrency(calculatedValue, 'pt-br')),
-                feeValue: percentage,
-                feeId: item.feeId,
-            });
+    // 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);
+        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) {
+                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)));
+                    results.push({
+                        total: Number(cachedResult.totalFee.toFixed(2)),
+                        resultFee: cachedResult.resultFee || '',
+                        feeValue: item.value || 0,
+                        feeId: item.feeId,
+                    });
+                }
+            }
         }
     }
     // PASSADA 3: Calcular ICMS com base em todas as fees anteriores (normais + TOTAL_PERCENTAGE)