@shushed/helpers 0.0.290 → 0.0.291

package/dist/cjs/src-public/bcOrder.js

@@ -7,6 +7,7 @@ exports.BCOrderHelper = void 0;
 exports.buildLineGrouping = buildLineGrouping;
 exports.transformMasterOrder = transformMasterOrder;
 exports.validateOrder = validateOrder;
+const currency_js_1 = __importDefault(require("currency.js"));
 const order_schema_json_1 = __importDefault(require("../contracts/order.schema.json"));
 const runtime_1 = __importDefault(require("./runtime"));
 const validate_1 = __importDefault(require("./validate"));
@@ -14,10 +15,7 @@ const GBP = "GBP";
 function toMinorUnits(amount) {
     if (typeof amount !== "number" || !isFinite(amount))
         return 0;
-    if (Math.abs(amount) > Number.MAX_SAFE_INTEGER / 100) {
-        return Math.round(Number((amount * 100).toPrecision(15)));
-    }
-    return Math.round(amount * 100);
+    return (0, currency_js_1.default)(amount).intValue;
 }
 function money(value) {
     const v = toMinorUnits(value);
@@ -300,30 +298,30 @@ function transformMasterOrder(payload) {
             vatRate = vatPercent / 100;
         }
         else if (netTotal > 0 && grossTotal > 0) {
-            vatRate = Math.max(0, (grossTotal - netTotal) / netTotal);
+            vatRate = Math.max(0, (0, currency_js_1.default)(grossTotal).subtract(netTotal).divide(netTotal).value);
         }
         let unitNet = 0;
         let unitGross = 0;
         if (unitPriceRaw > 0) {
             if (headerPricesInclVat) {
                 unitGross = unitPriceRaw;
-                unitNet = vatRate > 0 ? (unitGross / (1 + vatRate)) : unitGross;
+                unitNet = vatRate > 0 ? (0, currency_js_1.default)(unitGross).divide(1 + vatRate).value : unitGross;
             }
             else {
                 unitNet = unitPriceRaw;
-                unitGross = vatRate > 0 ? (unitNet * (1 + vatRate)) : unitNet;
+                unitGross = vatRate > 0 ? (0, currency_js_1.default)(unitNet).multiply(1 + vatRate).value : unitNet;
             }
         }
         else {
             unitNet = quantity > 0
                 ? (netTotal > 0
-                    ? netTotal / quantity
-                    : (grossTotal > 0 && vatRate > 0 ? (grossTotal / (1 + vatRate)) / quantity : 0))
+                    ? (0, currency_js_1.default)(netTotal).divide(quantity).value
+                    : (grossTotal > 0 && vatRate > 0 ? (0, currency_js_1.default)(grossTotal).divide(1 + vatRate).divide(quantity).value : 0))
                 : 0;
             unitGross = quantity > 0
                 ? (grossTotal > 0
-                    ? grossTotal / quantity
-                    : (netTotal > 0 && vatRate > 0 ? (netTotal * (1 + vatRate)) / quantity : 0))
+                    ? (0, currency_js_1.default)(grossTotal).divide(quantity).value
+                    : (netTotal > 0 && vatRate > 0 ? (0, currency_js_1.default)(netTotal).multiply(1 + vatRate).divide(quantity).value : 0))
                 : 0;
         }
         const discountCode = (line.salesforce_promotion_id && line.salesforce_promotion_id.trim().length > 0)
@@ -344,22 +342,22 @@ function transformMasterOrder(payload) {
         if (discountAmountRaw > 0) {
             if (headerPricesInclVat) {
                 discountGross = discountAmountRaw;
-                discountNet = vatRate > 0 ? (discountGross / (1 + vatRate)) : discountGross;
+                discountNet = vatRate > 0 ? (0, currency_js_1.default)(discountGross).divide(1 + vatRate).value : discountGross;
             }
             else {
                 discountNet = discountAmountRaw;
-                discountGross = vatRate > 0 ? (discountNet * (1 + vatRate)) : discountNet;
+                discountGross = vatRate > 0 ? (0, currency_js_1.default)(discountNet).multiply(1 + vatRate).value : discountNet;
             }
         }
         else if (discountPercent > 0) {
             if (netTotal > 0)
-                discountNet = (netTotal * discountPercent) / 100;
+                discountNet = (0, currency_js_1.default)(netTotal).multiply(discountPercent).divide(100).value;
             if (grossTotal > 0)
-                discountGross = (grossTotal * discountPercent) / 100;
+                discountGross = (0, currency_js_1.default)(grossTotal).multiply(discountPercent).divide(100).value;
             if (grossTotal === 0 && discountNet > 0 && vatRate > 0)
-                discountGross = discountNet * (1 + vatRate);
+                discountGross = (0, currency_js_1.default)(discountNet).multiply(1 + vatRate).value;
             if (netTotal === 0 && discountGross > 0 && vatRate > 0)
-                discountNet = discountGross / (1 + vatRate);
+                discountNet = (0, currency_js_1.default)(discountGross).divide(1 + vatRate).value;
         }
         const take = Math.min(shippedRemainingBySku[sku] || 0, quantity);
         const remaining = quantity - take;
@@ -383,10 +381,10 @@ function transformMasterOrder(payload) {
                 ...baseFields,
                 quantity: qty,
                 returned_quantity: Math.max(0, Number(returnedQtyForLine || 0)),
-                amount_net: money(unitNet * qty),
-                amount_gross: money(unitGross * qty),
-                discount_amount_net: money(discountNet * (qty / Math.max(1, quantity))),
-                discount_amount_gross: money(discountGross * (qty / Math.max(1, quantity))),
+                amount_net: money((0, currency_js_1.default)(unitNet).multiply(qty).value),
+                amount_gross: money((0, currency_js_1.default)(unitGross).multiply(qty).value),
+                discount_amount_net: money((0, currency_js_1.default)(discountNet).multiply(qty).divide(Math.max(1, quantity)).value),
+                discount_amount_gross: money((0, currency_js_1.default)(discountGross).multiply(qty).divide(Math.max(1, quantity)).value),
                 discount_amount_percent: line.line_discount_percent || 0,
             });
         };
@@ -422,7 +420,7 @@ function transformMasterOrder(payload) {
         });
     });
     if (invoicesGrossMinor === 0 && (payload.invoices || []).length > 0) {
-        invoicesGrossMinor = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_incl_vat || 0), 0));
+        invoicesGrossMinor = toMinorUnits((payload.invoices || []).reduce((acc, inv) => (0, currency_js_1.default)(acc).add(inv.amount_incl_vat || 0).value, 0));
     }
     if (invoicesGrossMinor === 0 && invoicedLineNos.size > 0 && allSaleLines.length > 0) {
         const invoicedSaleLineItems = allSaleLines.filter((l) => {
@@ -433,7 +431,7 @@ function transformMasterOrder(payload) {
             const lineNo = Number(l?.line_no || -1);
             return invoicedLineNos.has(lineNo);
         });
-        invoicesGrossMinor = toMinorUnits(invoicedSaleLineItems.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        invoicesGrossMinor = toMinorUnits(invoicedSaleLineItems.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
     }
     let nonInvSalesGrossMinor = 0;
     if (allSaleLines.length > 0) {
@@ -444,7 +442,7 @@ function transformMasterOrder(payload) {
                 return false;
             return true;
         });
-        const totalSaleGrossMinor = toMinorUnits(saleLinesNoDelivery.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        const totalSaleGrossMinor = toMinorUnits(saleLinesNoDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
         if (invoicesGrossMinor > 0) {
             nonInvSalesGrossMinor = Math.max(0, totalSaleGrossMinor - invoicesGrossMinor);
         }
@@ -453,7 +451,7 @@ function transformMasterOrder(payload) {
         }
     }
     else if (sale0 && (sale0.amount_excl_vat || sale0.amount_incl_vat)) {
-        const saleGrossMinor = toMinorUnits(allSales.reduce((acc, s) => acc + (s.amount_incl_vat || 0), 0));
+        const saleGrossMinor = toMinorUnits(allSales.reduce((acc, s) => (0, currency_js_1.default)(acc).add(s.amount_incl_vat || 0).value, 0));
         if (invoicesGrossMinor > 0) {
             nonInvSalesGrossMinor = Math.max(0, saleGrossMinor - invoicesGrossMinor);
         }
@@ -470,11 +468,11 @@ function transformMasterOrder(payload) {
             const lineNo = Number(l?.line_no || -1);
             return !invoicedLineNos.has(lineNo);
         });
-        nonInvSalesGrossMinor = toMinorUnits(nonInvoicedSaleItems.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        nonInvSalesGrossMinor = toMinorUnits(nonInvoicedSaleItems.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
     }
     const totalGrossMinor = invoicesGrossMinor + nonInvSalesGrossMinor;
-    const invoicesNetMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_excl_vat || 0), 0));
-    const invoicesGrossMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_incl_vat || 0), 0));
+    const invoicesNetMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => (0, currency_js_1.default)(acc).add(inv.amount_excl_vat || 0).value, 0));
+    const invoicesGrossMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => (0, currency_js_1.default)(acc).add(inv.amount_incl_vat || 0).value, 0));
     let nonInvSalesNetMinorWithDelivery = 0;
     let nonInvSalesGrossMinorWithDelivery = 0;
     if (allSaleLines.length > 0) {
@@ -483,8 +481,8 @@ function transformMasterOrder(payload) {
                 return false;
             return true;
         });
-        const totalSaleNetMinorWithDelivery = toMinorUnits(saleLinesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount || 0)), 0));
-        const totalSaleGrossMinorWithDelivery = toMinorUnits(saleLinesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        const totalSaleNetMinorWithDelivery = toMinorUnits(saleLinesWithDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount || 0)).value, 0));
+        const totalSaleGrossMinorWithDelivery = toMinorUnits(saleLinesWithDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
         if (invoicesGrossMinorWithDelivery > 0) {
             nonInvSalesNetMinorWithDelivery = Math.max(0, totalSaleNetMinorWithDelivery - invoicesNetMinorWithDelivery);
             nonInvSalesGrossMinorWithDelivery = Math.max(0, totalSaleGrossMinorWithDelivery - invoicesGrossMinorWithDelivery);
@@ -495,8 +493,8 @@ function transformMasterOrder(payload) {
         }
     }
     else if (sale0 && (sale0.amount_excl_vat || sale0.amount_incl_vat)) {
-        const saleNetMinor = toMinorUnits(allSales.reduce((acc, s) => acc + (s.amount_excl_vat || 0), 0));
-        const saleGrossMinor = toMinorUnits(allSales.reduce((acc, s) => acc + (s.amount_incl_vat || 0), 0));
+        const saleNetMinor = toMinorUnits(allSales.reduce((acc, s) => (0, currency_js_1.default)(acc).add(s.amount_excl_vat || 0).value, 0));
+        const saleGrossMinor = toMinorUnits(allSales.reduce((acc, s) => (0, currency_js_1.default)(acc).add(s.amount_incl_vat || 0).value, 0));
         if (invoicesGrossMinorWithDelivery > 0) {
             nonInvSalesNetMinorWithDelivery = Math.max(0, saleNetMinor - invoicesNetMinorWithDelivery);
             nonInvSalesGrossMinorWithDelivery = Math.max(0, saleGrossMinor - invoicesGrossMinorWithDelivery);
@@ -513,8 +511,8 @@ function transformMasterOrder(payload) {
             const lineNo = Number(l?.line_no || -1);
             return !invoicedLineNos.has(lineNo);
         });
-        nonInvSalesNetMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount || 0)), 0));
-        nonInvSalesGrossMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        nonInvSalesNetMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount || 0)).value, 0));
+        nonInvSalesGrossMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
     }
     const totalNetMinorWithDelivery = invoicesNetMinorWithDelivery + nonInvSalesNetMinorWithDelivery;
     const totalGrossMinorWithDelivery = invoicesGrossMinorWithDelivery + nonInvSalesGrossMinorWithDelivery;
@@ -564,7 +562,7 @@ function transformMasterOrder(payload) {
         deliveryNetMinor += net;
         const lineDiscGross = toMinorUnits(Number(line?.line_discount_amount || 0));
         const lineDiscNet = headerPricesInclVat
-            ? Math.round(lineDiscGross / (1 + 0.2))
+            ? (0, currency_js_1.default)(lineDiscGross, { fromCents: true }).divide(1.2).intValue
             : lineDiscGross;
         deliveryDiscountGrossMinor += lineDiscGross;
         deliveryDiscountNetMinor += lineDiscNet;
@@ -692,7 +690,7 @@ function transformMasterOrder(payload) {
             const isRefund = itemNo.toUpperCase() === 'REFUND';
             if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
                 hasQualifying = true;
-                return s + (l?.amount_including_vat || 0);
+                return (0, currency_js_1.default)(s).add(l?.amount_including_vat || 0).value;
             }
             return s;
         }, 0);
@@ -704,16 +702,16 @@ function transformMasterOrder(payload) {
             const isItemish = typeStr.includes('item') || looksProduct;
             const isRefund = itemNo.toUpperCase() === 'REFUND';
             if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
-                return s + (l?.amount || l?.amount_excl_vat || 0);
+                return (0, currency_js_1.default)(s).add(l?.amount || l?.amount_excl_vat || 0).value;
             }
             return s;
         }, 0);
         if (!hasQualifying)
             return acc;
         if (cm?.amount_incl_vat != null && cm.amount_incl_vat > 0) {
-            return { gross: acc.gross + cm.amount_incl_vat, net: acc.net + (cm.amount_excl_vat || 0) };
+            return { gross: (0, currency_js_1.default)(acc.gross).add(cm.amount_incl_vat).value, net: (0, currency_js_1.default)(acc.net).add(cm.amount_excl_vat || 0).value };
         }
-        return { gross: acc.gross + sumGross, net: acc.net + sumNet };
+        return { gross: (0, currency_js_1.default)(acc.gross).add(sumGross).value, net: (0, currency_js_1.default)(acc.net).add(sumNet).value };
     }, { gross: 0, net: 0 });
     const merchReturnGrossFromReturnSales = (payload.sales || []).reduce((acc, sale) => {
         const docTypeRaw = String(sale?.document_type || sale?.documentType || "");
@@ -721,7 +719,7 @@ function transformMasterOrder(payload) {
         if (!isReturnOrder)
             return acc;
         if (sale?.amount_incl_vat != null && sale.amount_incl_vat > 0) {
-            return { gross: acc.gross + sale.amount_incl_vat, net: acc.net + (sale.amount_excl_vat || sale.amount || 0) };
+            return { gross: (0, currency_js_1.default)(acc.gross).add(sale.amount_incl_vat).value, net: (0, currency_js_1.default)(acc.net).add(sale.amount_excl_vat || sale.amount || 0).value };
         }
         const lines = sale?.sale_lines || [];
         let hasQualifying = false;
@@ -734,7 +732,7 @@ function transformMasterOrder(payload) {
             const isRefund = itemNo.toUpperCase() === 'REFUND';
             if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
                 hasQualifying = true;
-                return s + (l?.amount_including_vat || 0);
+                return (0, currency_js_1.default)(s).add(l?.amount_including_vat || 0).value;
             }
             return s;
         }, 0);
@@ -746,22 +744,22 @@ function transformMasterOrder(payload) {
             const isItemish = typeStr.includes('item') || looksProduct;
             const isRefund = itemNo.toUpperCase() === 'REFUND';
             if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
-                return s + (l?.amount || l?.amount_excl_vat || 0);
+                return (0, currency_js_1.default)(s).add(l?.amount || l?.amount_excl_vat || 0).value;
             }
             return s;
         }, 0);
         if (sumGross > 0) {
-            return { gross: acc.gross + sumGross, net: acc.net + sumNet };
+            return { gross: (0, currency_js_1.default)(acc.gross).add(sumGross).value, net: (0, currency_js_1.default)(acc.net).add(sumNet).value };
         }
         if (hasQualifying) {
-            return { gross: acc.gross + (sale?.amount_incl_vat || sale?.amount_including_vat || 0), net: acc.net + (sale?.amount_excl_vat || sale?.amount || 0) };
+            return { gross: (0, currency_js_1.default)(acc.gross).add(sale?.amount_incl_vat || sale?.amount_including_vat || 0).value, net: (0, currency_js_1.default)(acc.net).add(sale?.amount_excl_vat || sale?.amount || 0).value };
         }
         return acc;
     }, { gross: 0, net: 0 });
-    const merchReturnGross = merchReturnGrossFromCreditMemos.gross + merchReturnGrossFromReturnSales.gross;
+    const merchReturnGross = (0, currency_js_1.default)(merchReturnGrossFromCreditMemos.gross).add(merchReturnGrossFromReturnSales.gross).value;
     const hasMerchReturn = merchReturnGross > 0;
-    const returnsNetMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => acc + (cm.amount_excl_vat || 0), 0));
-    const returnsGrossMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => acc + (cm.amount_incl_vat || 0), 0));
+    const returnsNetMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => (0, currency_js_1.default)(acc).add(cm.amount_excl_vat || 0).value, 0));
+    const returnsGrossMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => (0, currency_js_1.default)(acc).add(cm.amount_incl_vat || 0).value, 0));
     const return_total = (returnsGrossMinor > 0)
         ? {
             amount_net: moneyFromMinor(returnsNetMinor),
@@ -829,7 +827,7 @@ function transformMasterOrder(payload) {
     });
     const shippedGrossDecimal = (payload.shipments || []).reduce((acc, s) => {
         if (s.amount_incl_vat != null && s.amount_incl_vat > 0) {
-            return acc + (s.amount_incl_vat || 0);
+            return (0, currency_js_1.default)(acc).add(s.amount_incl_vat || 0).value;
         }
         const lineAmounts = (s.shipment_lines || []).reduce((lineAcc, l) => {
             if (!isShippableItem(l))
@@ -847,18 +845,18 @@ function transformMasterOrder(payload) {
                 const sourceGross = Number(sourceLine.amount_including_vat || sourceLine.amount_incl_vat || 0);
                 const shippedQty = Number(l?.quantity || 0);
                 if (sourceQty > 0 && sourceGross > 0) {
-                    const unitPrice = sourceGross / sourceQty;
-                    return lineAcc + (unitPrice * shippedQty);
+                    const unitPrice = (0, currency_js_1.default)(sourceGross).divide(sourceQty).value;
+                    return (0, currency_js_1.default)(lineAcc).add((0, currency_js_1.default)(unitPrice).multiply(shippedQty)).value;
                 }
             }
-            return lineAcc + (l?.amount_including_vat || l?.amount_incl_vat || 0);
+            return (0, currency_js_1.default)(lineAcc).add(l?.amount_including_vat || l?.amount_incl_vat || 0).value;
         }, 0);
-        return acc + lineAmounts;
+        return (0, currency_js_1.default)(acc).add(lineAmounts).value;
     }, 0);
     const shippedGrossMinor = toMinorUnits(shippedGrossDecimal);
     let status = "PROCESSED";
     if (hasMerchReturn) {
-        const totalOrderGrossDecimal = totalOrderGrossMinor / 100;
+        const totalOrderGrossDecimal = (0, currency_js_1.default)(totalOrderGrossMinor, { fromCents: true }).value;
         status = totalOrderGrossDecimal > 0 && merchReturnGross >= totalOrderGrossDecimal ? "RETURNED" : "PARTIALLY-RETURNED";
     }
     else if (shippedGrossMinor > 0 && totalOrderGrossMinor > 0) {

package/dist/cjs/src-public/pubsub.js

@@ -59,7 +59,6 @@ class PubSubHelper extends runtime_1.default {
             body: messageBody,
             bodyTxt: rawBody,
             extraAttributes: (0, lodash_omit_1.default)(rawMessage.message?.attributes || {}, ['buildship_id', 'publish_time']),
-            ackId: rawMessage.ackId || undefined,
             subscriptionName: rawMessage.subscription?.split('/').pop(),
         };
         return message;

package/dist/package.json

@@ -11,6 +11,7 @@
     "ajv-formats": "^3.0.1",
     "archiver": "^7.0.1",
     "co-body": "^6.2.0",
+    "currency.js": "^2.0.4",
     "jose": "^6.0.11",
     "lodash.chunk": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",

package/dist/types/src-public/pubsub.d.ts

@@ -16,7 +16,6 @@ export type Message = {
 };
 export type ReceivedMessage = Message & {
     messageId?: string | undefined;
-    ackId?: string | undefined;
     body: any;
     bodyTxt: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.290",
+  "version": "0.0.291",
   "author": "",
   "license": "UNLICENSED",
   "description": "",
@@ -11,6 +11,7 @@
     "ajv-formats": "^3.0.1",
     "archiver": "^7.0.1",
     "co-body": "^6.2.0",
+    "currency.js": "^2.0.4",
     "jose": "^6.0.11",
     "lodash.chunk": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",