moneyfunx 3.0.10 → 3.0.11

package/build/lib/debt/payments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payments.d.ts","sourceRoot":"","sources":["../../../src/lib/debt/payments.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AAEjC;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,KAAK,EAAE,EACd,OAAO,EAAE,MAAM,GACd,MAAM,CAYR;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,GACrB,MAAM,CAOR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,WAAW,GAAE,MAAU,EACvB,SAAS,GAAE,MAAU,GACpB,aAAa,EAAE,CA2BjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,IAAI,EAAE,EACb,OAAO,EAAE,MAAM,EACf,aAAa,GAAE,OAAe,GAC7B,oBAAoB,CA0ItB"}
+{"version":3,"file":"payments.d.ts","sourceRoot":"","sources":["../../../src/lib/debt/payments.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AAEjC;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,KAAK,EAAE,EACd,OAAO,EAAE,MAAM,GACd,MAAM,CAYR;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,GACrB,MAAM,CAOR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,WAAW,GAAE,MAAU,EACvB,SAAS,GAAE,MAAU,GACpB,aAAa,EAAE,CA2BjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,IAAI,EAAE,EACb,OAAO,EAAE,MAAM,EACf,aAAa,GAAE,OAAe,GAC7B,oBAAoB,CA6ItB"}

package/build/lib/debt/payments.js

@@ -102,58 +102,76 @@ export function payLoans(loans, payment, reduceMinimum = false) {
     let totalLifetimePrincipal = 0;
     let totalAmortizationSchedule = [];
     while (paidLoans < loans.length) {
-        const firstLoan = loans.slice(paidLoans)[0];
+        const activeLoans = loans.slice(paidLoans);
+        const firstLoan = activeLoans[0];
+        // 1. Determine the "Driver" parameters (the loan being paid off in this chunk)
         const firstLoanPayment = (firstLoan.minPayment +
-            determineExtraPayment(loans.slice(paidLoans), monthlyPayment));
+            determineExtraPayment(activeLoans, monthlyPayment));
         const firstLoanPrincipalRemaining = loanPrincipalsRemaining[firstLoan.id];
+        // How long does this chunk last?
         const periodsToPay = firstLoan.numPaymentsToZero(firstLoanPayment, firstLoanPrincipalRemaining);
-        const firstLoanAmortizedPayments = amortizePayments(firstLoan, firstLoanPrincipalRemaining, firstLoanPayment, periodsToPay, periodsElapsed);
-        // Calculate final payment logic
+        // 2. Calculate the Final Payment specifics for the driver loan
+        //    (Needed for carryover calculation)
         const finalPrincipal = firstLoan.principalRemaining(periodsToPay - 1, firstLoanPayment, firstLoanPrincipalRemaining);
         const firstLoanFinalPayment = finalPrincipal + firstLoan.accrueInterest(finalPrincipal);
-        paymentSchedule[firstLoan.id].amortizationSchedule = [
-            ...paymentSchedule[firstLoan.id].amortizationSchedule,
-            ...firstLoanAmortizedPayments
-        ];
-        // Merge into totals
-        totalAmortizationSchedule = [
-            ...totalAmortizationSchedule,
-            ...firstLoanAmortizedPayments
-        ];
-        paidLoans += 1;
-        if (reduceMinimum) {
-            monthlyPayment -= firstLoan.minPayment;
-        }
-        ;
-        // handle calculating information for the rest of the loans
-        loans.slice(paidLoans).forEach((loan, index) => {
+        // 3. Process ALL active loans for this chunk of time
+        activeLoans.forEach((loan, index) => {
+            const isDriverLoan = index === 0;
             const loanPrincipalRemaining = loanPrincipalsRemaining[loan.id];
-            const loanAmortizedPayments = amortizePayments(loan, loanPrincipalRemaining, loan.minPayment, Math.min(periodsToPay, loan.numPaymentsToZero(loan.minPayment, loanPrincipalRemaining)), periodsElapsed, (index === 0 ? determineCarryover(firstLoan, firstLoanPayment, firstLoanFinalPayment, reduceMinimum) : 0));
+            // Determine payment amount: Driver gets extra, others get minimum
+            const paymentAmount = isDriverLoan ? firstLoanPayment : loan.minPayment;
+            // Determine duration: Others are capped by the Driver's time-to-zero
+            const duration = isDriverLoan
+                ? periodsToPay
+                : Math.min(periodsToPay, loan.numPaymentsToZero(loan.minPayment, loanPrincipalRemaining));
+            // Determine carryover: Only applies to the SECOND loan (index 1), derived from Driver
+            const carryoverAmount = (index === 1)
+                ? determineCarryover(firstLoan, firstLoanPayment, firstLoanFinalPayment, reduceMinimum)
+                : 0;
+            const loanAmortizedPayments = amortizePayments(loan, loanPrincipalRemaining, paymentAmount, duration, periodsElapsed, carryoverAmount);
+            // A. Append to individual loan schedule
             paymentSchedule[loan.id].amortizationSchedule = [
                 ...paymentSchedule[loan.id].amortizationSchedule,
                 ...loanAmortizedPayments,
             ];
-            // Safe map for totals
-            totalAmortizationSchedule = totalAmortizationSchedule.map((element) => {
-                const matchedInnerElement = loanAmortizedPayments.find((innerElement) => innerElement.period === element.period);
-                return (matchedInnerElement != null)
-                    ? {
-                        period: element.period,
-                        principal: element.principal + matchedInnerElement.principal,
-                        interest: element.interest + matchedInnerElement.interest,
-                        principalRemaining: element.principalRemaining +
-                            matchedInnerElement.principalRemaining
-                    }
-                    : element;
-            });
-            // Update remaining principals for next iteration
-            const currentLoanSchedule = paymentSchedule[loan.id].amortizationSchedule;
-            if (currentLoanSchedule.length > 0) {
-                loanPrincipalsRemaining[loan.id] = currentLoanSchedule[currentLoanSchedule.length - 1].principalRemaining;
+            // B. Merge into Total Schedule
+            if (isDriverLoan) {
+                // The Driver extends the timeline. We append its records to initialize the new period slots in Totals.
+                totalAmortizationSchedule = [
+                    ...totalAmortizationSchedule,
+                    ...loanAmortizedPayments
+                ];
+            }
+            else {
+                // Followers merge into the existing slots created by the Driver.
+                // We only map over the NEW segment of the total schedule to avoid re-scanning history (optional optimization),
+                // but for safety/simplicity we map the whole structure and match by period.
+                totalAmortizationSchedule = totalAmortizationSchedule.map((element) => {
+                    const matchedInnerElement = loanAmortizedPayments.find((innerElement) => innerElement.period === element.period);
+                    return (matchedInnerElement != null)
+                        ? {
+                            period: element.period,
+                            principal: element.principal + matchedInnerElement.principal,
+                            interest: element.interest + matchedInnerElement.interest,
+                            principalRemaining: element.principalRemaining + matchedInnerElement.principalRemaining
+                        }
+                        : element;
+                });
+            }
+            // Update tracking state for next iteration
+            if (paymentSchedule[loan.id].amortizationSchedule.length > 0) {
+                const fullSchedule = paymentSchedule[loan.id].amortizationSchedule;
+                loanPrincipalsRemaining[loan.id] = fullSchedule[fullSchedule.length - 1].principalRemaining;
             }
         });
+        paidLoans += 1;
         periodsElapsed += periodsToPay;
+        if (reduceMinimum) {
+            monthlyPayment -= firstLoan.minPayment;
+        }
+        ;
     }
+    // Final Totals Calculation
     for (const loan of loans) {
         const loanLifetimeInterest = (paymentSchedule[loan.id].amortizationSchedule.reduce((lifetimeInterest, record) => lifetimeInterest + record.interest, 0));
         paymentSchedule[loan.id].lifetimeInterest = loanLifetimeInterest;

package/build/lib/investment/contributions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contributions.d.ts","sourceRoot":"","sources":["../../../src/lib/investment/contributions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EACV,kBAAkB,EAClB,+BAA+B,EAGhC,MAAM,oCAAoC,CAAC;AAE5C;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,UAAU,EAAE,EACzB,YAAY,EAAE,MAAM,GACnB,MAAM,CAMR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,WAAW,GAAE,MAAU,EACvB,wBAAwB,GAAE,OAAc,GACvC,kBAAkB,CAkBpB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,WAAW,GAAE,MAAU,EACvB,wBAAwB,GAAE,OAAc,GACvC,kBAAkB,EAAE,CAoBtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,UAAU,EAAE,EACzB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,wBAAwB,GAAE,OAAc,GACvC,+BAA+B,CA+FjC"}
+{"version":3,"file":"contributions.d.ts","sourceRoot":"","sources":["../../../src/lib/investment/contributions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EACV,kBAAkB,EAClB,+BAA+B,EAGhC,MAAM,oCAAoC,CAAC;AAE5C;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,UAAU,EAAE,EACzB,YAAY,EAAE,MAAM,GACnB,MAAM,CAMR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,WAAW,GAAE,MAAU,EACvB,wBAAwB,GAAE,OAAc,GACvC,kBAAkB,CAkBpB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,WAAW,GAAE,MAAU,EACvB,wBAAwB,GAAE,OAAc,GACvC,kBAAkB,EAAE,CAmBtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,UAAU,EAAE,EACzB,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,EACxB,wBAAwB,GAAE,OAAc,GACvC,+BAA+B,CAyGjC"}

package/build/lib/investment/contributions.js

@@ -68,8 +68,7 @@ export function amortizeContributions(instrument, initialBalance, contribution,
         const periodicContribution = instrument.validateContribution(contribution, ytd);
         const record = amortizeContribution(instrument, currentBalance, periodicContribution, period + startPeriod, accrueBeforeContribution);
         currentBalance = record.currentBalance;
-        // Reset YTD every 12 periods, assuming monthly periodicity matching periodsPerYear
-        // NOTE: This logic assumes period 0 is the start of a year. 
+        // Reset YTD every 12 periods
         period % 12 === 0 ? ytd = 0 : ytd += periodicContribution;
         contributionSchedule.push(record);
     }
@@ -130,21 +129,35 @@ export function contributeInstruments(instruments, contribution, numContribution
         contributionSchedules[instrument.id].lifetimeGrowth = instrumentLifetimeGrowth;
         totalLifetimeContribution += instrumentLifetimeContribution;
         totalLifetimeGrowth += instrumentLifetimeGrowth;
-        // Merge totals safely
-        totalAmortizationSchedule = totalAmortizationSchedule.length
-            ? (totalAmortizationSchedule.map((element) => {
-                const matchedInnerElement = instrumentSchedule.find((innerElement) => innerElement.period === element.period);
-                return (matchedInnerElement != null)
-                    ? {
-                        period: element.period,
-                        contribution: element.contribution + matchedInnerElement.contribution,
-                        growth: element.growth + matchedInnerElement.growth,
-                        currentBalance: element.currentBalance +
-                            matchedInnerElement.currentBalance
-                    }
-                    : element;
-            }))
-            : instrumentSchedule;
+        // Merge totals safely handling varying lengths
+        if (totalAmortizationSchedule.length === 0) {
+            // Initialize with the first instrument's schedule
+            totalAmortizationSchedule = [...instrumentSchedule];
+        }
+        else {
+            // We need to merge. If schedules are different lengths, we map over the longer one.
+            const maxLen = Math.max(totalAmortizationSchedule.length, instrumentSchedule.length);
+            const newTotal = [];
+            for (let i = 0; i < maxLen; i++) {
+                const totalRecord = totalAmortizationSchedule[i];
+                const instrumentRecord = instrumentSchedule[i];
+                if (totalRecord && instrumentRecord) {
+                    newTotal.push({
+                        period: totalRecord.period,
+                        contribution: totalRecord.contribution + instrumentRecord.contribution,
+                        growth: totalRecord.growth + instrumentRecord.growth,
+                        currentBalance: totalRecord.currentBalance + instrumentRecord.currentBalance
+                    });
+                }
+                else if (totalRecord) {
+                    newTotal.push(totalRecord);
+                }
+                else if (instrumentRecord) {
+                    newTotal.push(instrumentRecord);
+                }
+            }
+            totalAmortizationSchedule = newTotal;
+        }
     }
     contributionSchedules[TOTALS] = {
         lifetimeContribution: totalLifetimeContribution,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moneyfunx",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "type": "module",
   "exports": {
     ".": {