@travishorn/financejs 1.19.0 → 1.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travishorn/financejs",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "description": "Modern JavaScript time value of money and cash-flow financial formulas with Excel-style behavior.",
   "repository": {
     "type": "git",

package/src/coupdaybs.js

@@ -1,5 +1,7 @@
 import {
-  coupdaybs as coupdaybsUtil,
+  actualDays,
+  days360Eu,
+  days360Us,
   getCouponBounds,
   toUtcDate,
 } from "./util.js";
@@ -60,5 +62,13 @@ export function coupdaybs(settlement, maturity, frequency, basis = 0) {
     monthsPerCoupon,
   );
 
-  return coupdaybsUtil(previousCouponDate, settlementDate, normalizedBasis);
+  if (normalizedBasis === 0) {
+    return days360Us(previousCouponDate, settlementDate);
+  }
+
+  if (normalizedBasis === 4) {
+    return days360Eu(previousCouponDate, settlementDate);
+  }
+
+  return actualDays(previousCouponDate, settlementDate);
 }

package/src/coupdays.js

@@ -1,8 +1,4 @@
-import {
-  coupdays as coupdaysUtil,
-  getCouponBounds,
-  toUtcDate,
-} from "./util.js";
+import { actualDays, getCouponBounds, toUtcDate } from "./util.js";
 
 /**
  * Returns the number of days in the coupon period that contains the settlement
@@ -60,10 +56,13 @@ export function coupdays(settlement, maturity, frequency, basis = 0) {
     monthsPerCoupon,
   );
 
-  return coupdaysUtil(
-    previousCouponDate,
-    nextCouponDate,
-    frequency,
-    normalizedBasis,
-  );
+  if (normalizedBasis === 0 || normalizedBasis === 2 || normalizedBasis === 4) {
+    return 360 / frequency;
+  }
+
+  if (normalizedBasis === 3) {
+    return 365 / frequency;
+  }
+
+  return actualDays(previousCouponDate, nextCouponDate);
 }

package/src/coupdaysnc.js

@@ -1,5 +1,7 @@
 import {
-  coupdaysnc as coupdaysncUtil,
+  actualDays,
+  days360Eu,
+  days360Us,
   getCouponBounds,
   toUtcDate,
 } from "./util.js";
@@ -59,5 +61,13 @@ export function coupdaysnc(settlement, maturity, frequency, basis = 0) {
     monthsPerCoupon,
   );
 
-  return coupdaysncUtil(settlementDate, nextCouponDate, normalizedBasis);
+  if (normalizedBasis === 0) {
+    return days360Us(settlementDate, nextCouponDate);
+  }
+
+  if (normalizedBasis === 4) {
+    return days360Eu(settlementDate, nextCouponDate);
+  }
+
+  return actualDays(settlementDate, nextCouponDate);
 }

package/src/price.js

@@ -1,13 +1,13 @@
 import {
   actualDays,
-  coupdaybs,
-  coupdays,
-  coupdaysnc,
   couponsRemaining,
   getCouponBounds,
   normalizeZero,
   toUtcDate,
 } from "./util.js";
+import { coupdaybs } from "./coupdaybs.js";
+import { coupdays } from "./coupdays.js";
+import { coupdaysnc } from "./coupdaysnc.js";
 
 /**
  * Calculates the price per $100 face value of a security that pays periodic
@@ -107,14 +107,14 @@ export function price(
     monthsPerCoupon,
   );
 
-  const a = coupdaybs(previousCouponDate, settlementDate, normalizedBasis);
-  let dsc = coupdaysnc(settlementDate, nextCouponDate, normalizedBasis);
-  let e = coupdays(
-    previousCouponDate,
-    nextCouponDate,
+  const a = coupdaybs(settlementDate, maturityDate, frequency, normalizedBasis);
+  let dsc = coupdaysnc(
+    settlementDate,
+    maturityDate,
     frequency,
     normalizedBasis,
   );
+  let e = coupdays(settlementDate, maturityDate, frequency, normalizedBasis);
 
   if (normalizedBasis === 2) {
     e = actualDays(previousCouponDate, nextCouponDate);

package/src/util.js

@@ -204,96 +204,6 @@ export function couponsRemaining(
   return n;
 }
 
-/**
- * Computes days from settlement to next coupon date (`DSC`) by day-count basis.
- *
- * Basis mapping:
- * - `0`: US (NASD) 30/360
- * - `1`: Actual/actual
- * - `2`: Actual/360
- * - `3`: Actual/365
- * - `4`: European 30/360
- *
- * @param {Date} settlementDate - Settlement date.
- * @param {Date} nextCouponDate - Next coupon date.
- * @param {0|1|2|3|4} basis - Day-count basis code.
- * @returns {number} Days between settlement and next coupon under `basis`.
- *
- * @example
- * coupdaysnc(new Date("2024-01-15"), new Date("2024-04-15"), 0);
- */
-export function coupdaysnc(settlementDate, nextCouponDate, basis) {
-  if (basis === 0) {
-    return days360Us(settlementDate, nextCouponDate);
-  }
-
-  if (basis === 4) {
-    return days360Eu(settlementDate, nextCouponDate);
-  }
-
-  return actualDays(settlementDate, nextCouponDate);
-}
-
-/**
- * Computes days from previous coupon date to settlement (`A`) by day-count
- * basis.
- *
- * Basis mapping:
- * - `0`: US (NASD) 30/360
- * - `1`: Actual/actual
- * - `2`: Actual/360
- * - `3`: Actual/365
- * - `4`: European 30/360
- *
- * @param {Date} previousCouponDate - Coupon date immediately before settlement.
- * @param {Date} settlementDate - Settlement date.
- * @param {0|1|2|3|4} basis - Day-count basis code.
- * @returns {number} Days between previous coupon and settlement under `basis`.
- *
- * @example
- * coupdaybs(new Date("2023-10-15"), new Date("2024-01-15"), 1);
- */
-export function coupdaybs(previousCouponDate, settlementDate, basis) {
-  if (basis === 0) {
-    return days360Us(previousCouponDate, settlementDate);
-  }
-
-  if (basis === 4) {
-    return days360Eu(previousCouponDate, settlementDate);
-  }
-
-  return actualDays(previousCouponDate, settlementDate);
-}
-
-/**
- * Computes total days in the coupon period (`E`) by basis and payment
- * frequency.
- *
- * For 30/360 bases (`0` and `4`), period length is fixed at `360/frequency`.
- * For basis `3` (Actual/365), period length is fixed at `365/frequency`.
- * Otherwise, calendar days between coupon boundaries are used.
- *
- * @param {Date} previousCouponDate - Coupon date before settlement.
- * @param {Date} nextCouponDate - Coupon date after settlement.
- * @param {number} frequency - Coupon payments per year.
- * @param {0|1|2|3|4} basis - Day-count basis code.
- * @returns {number} Coupon period length in days.
- *
- * @example
- * coupdays(new Date("2024-01-01"), new Date("2024-07-01"), 2, 3); // 182.5
- */
-export function coupdays(previousCouponDate, nextCouponDate, frequency, basis) {
-  if (basis === 0 || basis === 2 || basis === 4) {
-    return 360 / frequency;
-  }
-
-  if (basis === 3) {
-    return 365 / frequency;
-  }
-
-  return actualDays(previousCouponDate, nextCouponDate);
-}
-
 /**
  * Converts a `Date` to a UTC-midnight date-only representation.
  *

package/src/yield_.js

@@ -1,13 +1,13 @@
 import {
   actualDays,
-  coupdaybs,
-  coupdays,
-  coupdaysnc,
   couponsRemaining,
   getCouponBounds,
   normalizeZero,
   toUtcDate,
 } from "./util.js";
+import { coupdaybs } from "./coupdaybs.js";
+import { coupdays } from "./coupdays.js";
+import { coupdaysnc } from "./coupdaysnc.js";
 
 /**
  * Calculates the yield on a security that pays periodic interest. Use to
@@ -107,14 +107,14 @@ export function yield_(
     monthsPerCoupon,
   );
 
-  const a = coupdaybs(previousCouponDate, settlementDate, normalizedBasis);
-  let dsc = coupdaysnc(settlementDate, nextCouponDate, normalizedBasis);
-  let e = coupdays(
-    previousCouponDate,
-    nextCouponDate,
+  const a = coupdaybs(settlementDate, maturityDate, frequency, normalizedBasis);
+  let dsc = coupdaysnc(
+    settlementDate,
+    maturityDate,
     frequency,
     normalizedBasis,
   );
+  let e = coupdays(settlementDate, maturityDate, frequency, normalizedBasis);
 
   if (normalizedBasis === 2) {
     e = actualDays(previousCouponDate, nextCouponDate);