av6-core 1.0.20 → 1.0.22

package/dist/index.js

@@ -1131,6 +1131,9 @@ var maybeStep = (v, stepwise, fmt, p) => stepwise ? applyRound(v, fmt, p) : v;
 function clamp(n, min, max) {
   return Math.max(min, Math.min(max, n));
 }
+var percentage = (amount, percentage2) => {
+  return amount * percentage2 / 100;
+};
 function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   const stepwise = options.calculationMethod === "STEP_WISE";
   const lineFmt = options.lineRound ?? RoundFormat.TO_FIXED;
@@ -1139,55 +1142,64 @@ function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   const children = inputs.map((it) => {
     let baseRate = it.rate;
     if (it.addonPercentage) {
-      baseRate = baseRate + baseRate * (it.addonPercentage / 100);
+      baseRate = baseRate + percentage(baseRate, it.addonPercentage);
+      baseRate = maybeStep(baseRate, stepwise, lineFmt, precision);
     }
-    const subtotal = it.qty * baseRate;
-    const other = it.otherCharge ?? 0;
-    const basePreTax = subtotal + other;
+    const subtotal = applyRound(it.qty * baseRate, lineFmt, precision);
+    const other = applyRound(it.otherCharge ?? 0, lineFmt, precision);
+    const basePreTax = applyRound(subtotal + other, lineFmt, precision);
     let copayAmount2 = 0;
     if (masterExtra.coPayMode === "PERCENTAGE-AMOUNT") {
       const copayType = it.coPaymentType ?? "AMOUNT";
       const copayValue = it.coPayValue ?? 0;
-      copayAmount2 = copayType === "PERCENTAGE" ? basePreTax * (copayValue / 100) : Math.min(copayValue, basePreTax);
+      copayAmount2 = copayType === "PERCENTAGE" ? percentage(basePreTax, copayValue) : Math.min(copayValue, basePreTax);
     }
     const dMode = it.discountMode ?? "AMOUNT";
     const dVal = it.discountValue ?? 0;
-    const itemDisc = dMode === "PERCENTAGE" ? basePreTax * (dVal / 100) : Math.min(dVal, basePreTax);
-    const baseAfterDisc = Math.max(0, basePreTax - itemDisc);
     const tMethod = it.taxMethod ?? "NONE";
     const tVal = Math.max(0, it.taxValue ?? 0);
-    const baseForTax = maybeStep(baseAfterDisc, stepwise, lineFmt, precision);
-    let taxAmount2 = 0;
-    if (tMethod === "EXCLUSIVE" && tVal > 0) {
-      taxAmount2 = baseForTax * tVal / 100;
-    } else if (tMethod === "INCLUSIVE" && tVal > 0) {
-      taxAmount2 = baseForTax * tVal / (100 + tVal);
+    let baseAfterTaxDisc = basePreTax;
+    let discountValue = 0;
+    if (tMethod === "INCLUSIVE") {
+      const inclusiveTaxMultiplier = (100 + tVal) / 100;
+      baseAfterTaxDisc = basePreTax / inclusiveTaxMultiplier;
+    }
+    baseAfterTaxDisc = maybeStep(baseAfterTaxDisc, stepwise, lineFmt, precision);
+    if (dMode === "AMOUNT") {
+      discountValue = dVal;
+    } else if (dMode === "PERCENTAGE") {
+      discountValue = percentage(baseAfterTaxDisc, dVal);
     }
-    taxAmount2 = maybeStep(taxAmount2, stepwise, lineFmt, precision);
-    const grossRaw = tMethod === "EXCLUSIVE" ? baseForTax + taxAmount2 : baseForTax;
-    const grossAmount2 = maybeStep(grossRaw, stepwise, lineFmt, precision);
+    discountValue = maybeStep(discountValue, stepwise, lineFmt, precision);
+    let afterDisc = Math.max(0, baseAfterTaxDisc - discountValue);
+    afterDisc = maybeStep(afterDisc, stepwise, lineFmt, precision);
+    let calculatedTax = percentage(afterDisc, tVal);
+    calculatedTax = maybeStep(calculatedTax, stepwise, lineFmt, precision);
+    let grossAmount2 = afterDisc + calculatedTax;
+    grossAmount2 = maybeStep(grossAmount2, stepwise, lineFmt, precision);
     if (masterExtra.coPayMode === "EXCLUSIVE-INCLUSIVE" && it.coPayMethod === "INCLUSIVE") {
       copayAmount2 = grossAmount2;
     }
+    copayAmount2 = applyRound(copayAmount2, lineFmt, precision);
     const copay = clamp(Math.max(0, copayAmount2), 0, grossAmount2);
     const patientRaw = grossAmount2 - copay;
     const patientRounded = applyRound(patientRaw, lineFmt, precision);
     const lineRoundOff = patientRounded - patientRaw;
     return {
-      baseRate,
+      baseRate: applyRound(baseRate, lineFmt, precision),
       subtotalAmount: subtotal,
       otherChargeAmount: other,
       discountMode: dMode,
       discountValue: dVal,
-      discountAmount: itemDisc,
+      discountAmount: applyRound(discountValue, lineFmt, precision),
       // item-only discount
       taxMethod: tMethod,
       taxValue: tVal,
-      taxAmount: taxAmount2,
-      grossAmount: grossAmount2,
+      taxAmount: applyRound(calculatedTax, lineFmt, precision),
+      grossAmount: applyRound(grossAmount2, lineFmt, precision),
       netAmount: patientRounded,
       // patient payable at line
-      roundOffAmount: lineRoundOff,
+      roundOffAmount: applyRound(lineRoundOff, "TO_FIXED", 2),
       // rounded - raw
       copayAmount: copay
       // insurer covered at line
@@ -1202,28 +1214,29 @@ function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   const patientRawTotal = grossAmount - copayAmount;
   let masterExtraApplied = 0;
   if (masterExtra.mode === "PERCENTAGE") {
-    masterExtraApplied = patientRawTotal * (masterExtra.value / 100);
+    masterExtraApplied = percentage(patientRawTotal, masterExtra.value);
   } else if (masterExtra.mode === "AMOUNT") {
     masterExtraApplied = Math.min(masterExtra.value, patientRawTotal);
   }
-  const discountTotalAmount = itemDiscountSum + masterExtraApplied;
+  masterExtraApplied = maybeStep(masterExtraApplied, stepwise, headFmt, precision);
+  const discountTotalAmount = maybeStep(itemDiscountSum + masterExtraApplied, stepwise, headFmt, precision);
   const patientAfterExtra = Math.max(0, patientRawTotal - masterExtraApplied);
   const netAmount = applyRound(patientAfterExtra, headFmt, precision);
   const roundOffAmount = netAmount - patientAfterExtra;
   const master = {
     additionalDiscountMode: masterExtra.mode,
     additionalDiscountValue: masterExtra.value,
-    subtotalAmount,
-    otherChargeAmount,
-    discountTotalAmount,
+    subtotalAmount: applyRound(subtotalAmount, headFmt, precision),
+    otherChargeAmount: applyRound(otherChargeAmount, headFmt, precision),
+    discountTotalAmount: applyRound(discountTotalAmount, headFmt, precision),
     // includes master extra
-    taxAmount,
-    grossAmount,
+    taxAmount: applyRound(taxAmount, headFmt, precision),
+    grossAmount: applyRound(grossAmount, headFmt, precision),
     netAmount,
     // patient payable after master extra + rounding
-    roundOffAmount,
+    roundOffAmount: applyRound(roundOffAmount, "TO_FIXED", 2),
     // rounded - raw
-    copayAmount
+    copayAmount: applyRound(copayAmount, headFmt, precision)
     // Σ line copay (insurer covered)
   };
   return { master, children };

package/dist/index.mjs

@@ -1083,6 +1083,9 @@ var maybeStep = (v, stepwise, fmt, p) => stepwise ? applyRound(v, fmt, p) : v;
 function clamp(n, min, max) {
   return Math.max(min, Math.min(max, n));
 }
+var percentage = (amount, percentage2) => {
+  return amount * percentage2 / 100;
+};
 function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   const stepwise = options.calculationMethod === "STEP_WISE";
   const lineFmt = options.lineRound ?? RoundFormat.TO_FIXED;
@@ -1091,55 +1094,64 @@ function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   const children = inputs.map((it) => {
     let baseRate = it.rate;
     if (it.addonPercentage) {
-      baseRate = baseRate + baseRate * (it.addonPercentage / 100);
+      baseRate = baseRate + percentage(baseRate, it.addonPercentage);
+      baseRate = maybeStep(baseRate, stepwise, lineFmt, precision);
     }
-    const subtotal = it.qty * baseRate;
-    const other = it.otherCharge ?? 0;
-    const basePreTax = subtotal + other;
+    const subtotal = applyRound(it.qty * baseRate, lineFmt, precision);
+    const other = applyRound(it.otherCharge ?? 0, lineFmt, precision);
+    const basePreTax = applyRound(subtotal + other, lineFmt, precision);
     let copayAmount2 = 0;
     if (masterExtra.coPayMode === "PERCENTAGE-AMOUNT") {
       const copayType = it.coPaymentType ?? "AMOUNT";
       const copayValue = it.coPayValue ?? 0;
-      copayAmount2 = copayType === "PERCENTAGE" ? basePreTax * (copayValue / 100) : Math.min(copayValue, basePreTax);
+      copayAmount2 = copayType === "PERCENTAGE" ? percentage(basePreTax, copayValue) : Math.min(copayValue, basePreTax);
     }
     const dMode = it.discountMode ?? "AMOUNT";
     const dVal = it.discountValue ?? 0;
-    const itemDisc = dMode === "PERCENTAGE" ? basePreTax * (dVal / 100) : Math.min(dVal, basePreTax);
-    const baseAfterDisc = Math.max(0, basePreTax - itemDisc);
     const tMethod = it.taxMethod ?? "NONE";
     const tVal = Math.max(0, it.taxValue ?? 0);
-    const baseForTax = maybeStep(baseAfterDisc, stepwise, lineFmt, precision);
-    let taxAmount2 = 0;
-    if (tMethod === "EXCLUSIVE" && tVal > 0) {
-      taxAmount2 = baseForTax * tVal / 100;
-    } else if (tMethod === "INCLUSIVE" && tVal > 0) {
-      taxAmount2 = baseForTax * tVal / (100 + tVal);
+    let baseAfterTaxDisc = basePreTax;
+    let discountValue = 0;
+    if (tMethod === "INCLUSIVE") {
+      const inclusiveTaxMultiplier = (100 + tVal) / 100;
+      baseAfterTaxDisc = basePreTax / inclusiveTaxMultiplier;
+    }
+    baseAfterTaxDisc = maybeStep(baseAfterTaxDisc, stepwise, lineFmt, precision);
+    if (dMode === "AMOUNT") {
+      discountValue = dVal;
+    } else if (dMode === "PERCENTAGE") {
+      discountValue = percentage(baseAfterTaxDisc, dVal);
     }
-    taxAmount2 = maybeStep(taxAmount2, stepwise, lineFmt, precision);
-    const grossRaw = tMethod === "EXCLUSIVE" ? baseForTax + taxAmount2 : baseForTax;
-    const grossAmount2 = maybeStep(grossRaw, stepwise, lineFmt, precision);
+    discountValue = maybeStep(discountValue, stepwise, lineFmt, precision);
+    let afterDisc = Math.max(0, baseAfterTaxDisc - discountValue);
+    afterDisc = maybeStep(afterDisc, stepwise, lineFmt, precision);
+    let calculatedTax = percentage(afterDisc, tVal);
+    calculatedTax = maybeStep(calculatedTax, stepwise, lineFmt, precision);
+    let grossAmount2 = afterDisc + calculatedTax;
+    grossAmount2 = maybeStep(grossAmount2, stepwise, lineFmt, precision);
     if (masterExtra.coPayMode === "EXCLUSIVE-INCLUSIVE" && it.coPayMethod === "INCLUSIVE") {
       copayAmount2 = grossAmount2;
     }
+    copayAmount2 = applyRound(copayAmount2, lineFmt, precision);
     const copay = clamp(Math.max(0, copayAmount2), 0, grossAmount2);
     const patientRaw = grossAmount2 - copay;
     const patientRounded = applyRound(patientRaw, lineFmt, precision);
     const lineRoundOff = patientRounded - patientRaw;
     return {
-      baseRate,
+      baseRate: applyRound(baseRate, lineFmt, precision),
       subtotalAmount: subtotal,
       otherChargeAmount: other,
       discountMode: dMode,
       discountValue: dVal,
-      discountAmount: itemDisc,
+      discountAmount: applyRound(discountValue, lineFmt, precision),
       // item-only discount
       taxMethod: tMethod,
       taxValue: tVal,
-      taxAmount: taxAmount2,
-      grossAmount: grossAmount2,
+      taxAmount: applyRound(calculatedTax, lineFmt, precision),
+      grossAmount: applyRound(grossAmount2, lineFmt, precision),
       netAmount: patientRounded,
       // patient payable at line
-      roundOffAmount: lineRoundOff,
+      roundOffAmount: applyRound(lineRoundOff, "TO_FIXED", 2),
       // rounded - raw
       copayAmount: copay
       // insurer covered at line
@@ -1154,28 +1166,29 @@ function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   const patientRawTotal = grossAmount - copayAmount;
   let masterExtraApplied = 0;
   if (masterExtra.mode === "PERCENTAGE") {
-    masterExtraApplied = patientRawTotal * (masterExtra.value / 100);
+    masterExtraApplied = percentage(patientRawTotal, masterExtra.value);
   } else if (masterExtra.mode === "AMOUNT") {
     masterExtraApplied = Math.min(masterExtra.value, patientRawTotal);
   }
-  const discountTotalAmount = itemDiscountSum + masterExtraApplied;
+  masterExtraApplied = maybeStep(masterExtraApplied, stepwise, headFmt, precision);
+  const discountTotalAmount = maybeStep(itemDiscountSum + masterExtraApplied, stepwise, headFmt, precision);
   const patientAfterExtra = Math.max(0, patientRawTotal - masterExtraApplied);
   const netAmount = applyRound(patientAfterExtra, headFmt, precision);
   const roundOffAmount = netAmount - patientAfterExtra;
   const master = {
     additionalDiscountMode: masterExtra.mode,
     additionalDiscountValue: masterExtra.value,
-    subtotalAmount,
-    otherChargeAmount,
-    discountTotalAmount,
+    subtotalAmount: applyRound(subtotalAmount, headFmt, precision),
+    otherChargeAmount: applyRound(otherChargeAmount, headFmt, precision),
+    discountTotalAmount: applyRound(discountTotalAmount, headFmt, precision),
     // includes master extra
-    taxAmount,
-    grossAmount,
+    taxAmount: applyRound(taxAmount, headFmt, precision),
+    grossAmount: applyRound(grossAmount, headFmt, precision),
     netAmount,
     // patient payable after master extra + rounding
-    roundOffAmount,
+    roundOffAmount: applyRound(roundOffAmount, "TO_FIXED", 2),
     // rounded - raw
-    copayAmount
+    copayAmount: applyRound(copayAmount, headFmt, precision)
     // Σ line copay (insurer covered)
   };
   return { master, children };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",