feat: Add BigNumber implementation

packages/cart/integration-tests/__tests__/services/cart-module/index.spec.ts

@@ -48,6 +48,55 @@ describe("Cart Module Service", () => {
       )
     })
 
+    it.only("should create a line item with prices in different shapes", async () => {
+      // TODO: Will be removed. This is here for demoing purposes
+      const [createdCart] = await service.create([
+        {
+          currency_code: "eur",
+          items: [
+            {
+              title: "one",
+              quantity: 1,
+              // proof of backward compatibility
+              unit_price: 100,
+            },
+            // {
+            //   title: "two",
+            //   quantity: 1,
+            //   // raw price creation
+            //   unit_price: { value: "1234.1234" },
+            // },
+            {
+              title: "three",
+              quantity: 1,
+              // string price creation
+              unit_price: "200",
+            },
+          ],
+        },
+      ])
+
+      const cart = await service.retrieve(createdCart.id, {
+        relations: ["items", "items.adjustments"],
+      })
+
+      const itemOne = cart.items?.find((el) => el.title === "one")
+      const itemThree = cart.items?.find((el) => el.title === "three")
+
+      expect(JSON.parse(JSON.stringify(itemOne))).toEqual(
+        expect.objectContaining({
+          unit_price: 100,
+          title: "one",
+        })
+      )
+      expect(JSON.parse(JSON.stringify(itemThree))).toEqual(
+        expect.objectContaining({
+          unit_price: 200,
+          title: "three",
+        })
+      )
+    })
+
     it("should create a cart successfully", async () => {
       const [createdCart] = await service.create([
         {
@@ -481,14 +530,14 @@ describe("Cart Module Service", () => {
       const error = await service
         .addLineItems(createdCart.id, [
           {
-            quantity: 1,
+            unit_price: 10,
             title: "test",
           },
         ] as any)
         .catch((e) => e)
 
       expect(error.message).toContain(
-        "Value for LineItem.unit_price is required, 'undefined' found"
+        "Value for LineItem.quantity is required, 'undefined' found"
       )
     })
 
@@ -503,14 +552,14 @@ describe("Cart Module Service", () => {
         .addLineItems([
           {
             cart_id: createdCart.id,
-            quantity: 1,
+            unit_price: 10,
             title: "test",
           },
         ] as any)
         .catch((e) => e)
 
       expect(error.message).toContain(
-        "Value for LineItem.unit_price is required, 'undefined' found"
+        "Value for LineItem.quantity is required, 'undefined' found"
       )
     })
   })

packages/cart/src/models/line-item.ts

@@ -1,9 +1,9 @@
-import { DAL } from "@medusajs/types"
-import { generateEntityId } from "@medusajs/utils"
+import { BigNumberRawValue, DAL } from "@medusajs/types"
+import { BigNumber, generateEntityId } from "@medusajs/utils"
 import {
   BeforeCreate,
+  BeforeUpdate,
   Cascade,
-  Check,
   Collection,
   Entity,
   ManyToOne,
@@ -109,12 +109,16 @@ export default class LineItem {
   is_tax_inclusive = false
 
   @Property({ columnType: "numeric", nullable: true })
-  compare_at_unit_price: number | null = null
+  compare_at_unit_price?: BigNumber | number | null = null
 
-  // TODO: Rework when BigNumber has been introduced
-  @Property({ columnType: "numeric", serializer: Number })
-  @Check({ expression: "unit_price >= 0" }) // TODO: Validate that numeric types work with the expression
-  unit_price: number
+  @Property({ columnType: "jsonb", nullable: true })
+  raw_compare_at_unit_price: BigNumberRawValue | null = null
+
+  @Property({ columnType: "numeric" })
+  unit_price: BigNumber | number
+
+  @Property({ columnType: "jsonb" })
+  raw_unit_price: BigNumberRawValue
 
   @OneToMany(() => LineItemTaxLine, (taxLine) => taxLine.item, {
     cascade: [Cascade.REMOVE],
@@ -144,10 +148,28 @@ export default class LineItem {
   @BeforeCreate()
   onCreate() {
     this.id = generateEntityId(this.id, "cali")
+
+    const val = new BigNumber(this.raw_unit_price ?? this.unit_price)
+
+    this.unit_price = val.numeric
+    this.raw_unit_price = val.raw!
+  }
+
+  @BeforeUpdate()
+  onUpdate() {
+    const val = new BigNumber(this.raw_unit_price ?? this.unit_price)
+
+    this.unit_price = val.numeric
+    this.raw_unit_price = val.raw as BigNumberRawValue
   }
 
   @OnInit()
   onInit() {
     this.id = generateEntityId(this.id, "cali")
+
+    const val = new BigNumber(this.raw_unit_price ?? this.unit_price)
+
+    this.unit_price = val.numeric
+    this.raw_unit_price = val.raw!
   }
 }

packages/cart/src/models/shipping-method.ts

@@ -1,4 +1,5 @@
-import { generateEntityId } from "@medusajs/utils"
+import { BigNumberRawValue } from "@medusajs/types"
+import { BigNumber, generateEntityId } from "@medusajs/utils"
 import {
   BeforeCreate,
   Cascade,
@@ -11,6 +12,7 @@ import {
   PrimaryKey,
   Property,
 } from "@mikro-orm/core"
+import { BeforeUpdate } from "typeorm"
 import Cart from "./cart"
 import ShippingMethodAdjustment from "./shipping-method-adjustment"
 import ShippingMethodTaxLine from "./shipping-method-tax-line"
@@ -37,8 +39,11 @@ export default class ShippingMethod {
   @Property({ columnType: "jsonb", nullable: true })
   description: string | null = null
 
-  @Property({ columnType: "numeric", serializer: Number })
-  amount: number
+  @Property({ columnType: "numeric" })
+  amount: BigNumber | number
+
+  @Property({ columnType: "jsonb" })
+  raw_amount: BigNumberRawValue
 
   @Property({ columnType: "boolean" })
   is_tax_inclusive = false
@@ -92,10 +97,28 @@ export default class ShippingMethod {
   @BeforeCreate()
   onCreate() {
     this.id = generateEntityId(this.id, "casm")
+
+    const val = new BigNumber(this.raw_amount ?? this.amount)
+
+    this.amount = val.numeric
+    this.raw_amount = val.raw!
+  }
+
+  @BeforeUpdate()
+  onUpdate() {
+    const val = new BigNumber(this.raw_amount ?? this.amount)
+
+    this.amount = val.numeric
+    this.raw_amount = val.raw as BigNumberRawValue
   }
 
   @OnInit()
   onInit() {
     this.id = generateEntityId(this.id, "casm")
+
+    const val = new BigNumber(this.raw_amount ?? this.amount)
+
+    this.amount = val.numeric
+    this.raw_amount = val.raw!
   }
 }

packages/cart/src/services/cart-module.ts

@@ -13,6 +13,7 @@ import {
   InjectTransactionManager,
   MedusaContext,
   MedusaError,
+  decorateCartTotals,
   isObject,
   isString,
 } from "@medusajs/utils"
@@ -86,12 +87,26 @@ export default class CartModuleService implements ICartModuleService {
     id: string,
     config: FindConfig<CartTypes.CartDTO> = {},
     @MedusaContext() sharedContext: Context = {}
+  ): Promise<CartTypes.CartDTO> {
+    // TODO: Will be reworked. This is here for demoing purposes
+    return this.retrieveWithTotals(id, config, sharedContext)
+  }
+
+  // TODO: Will be reworked. This is here for demoing purposes
+  @InjectManager("baseRepository_")
+  async retrieveWithTotals(
+    id: string,
+    config: FindConfig<CartTypes.CartDTO> = {},
+    @MedusaContext() sharedContext: Context = {}
   ): Promise<CartTypes.CartDTO> {
     const cart = await this.cartService_.retrieve(id, config, sharedContext)
 
-    return await this.baseRepository_.serialize<CartTypes.CartDTO>(cart, {
-      populate: true,
-    })
+    const serialized = await this.baseRepository_.serialize<CartTypes.CartDTO>(
+      cart,
+      { populate: true }
+    )
+
+    return decorateCartTotals(serialized)
   }
 
   @InjectManager("baseRepository_")

packages/cart/src/services/line-item.ts

@@ -1,5 +1,7 @@
 import { DAL } from "@medusajs/types"
-import { ModulesSdkUtils } from "@medusajs/utils"
+import {
+  ModulesSdkUtils
+} from "@medusajs/utils"
 import { LineItem } from "@models"
 import { CreateLineItemDTO, UpdateLineItemDTO } from "@types"
 

packages/cart/src/types/line-item.ts

@@ -26,7 +26,7 @@ interface PartialUpsertLineItemDTO {
 export interface CreateLineItemDTO extends PartialUpsertLineItemDTO {
   title: string
   quantity: number
-  unit_price: number
+  unit_price: number | string
   cart_id: string
 }
 

packages/medusa/src/services/new-totals.ts

@@ -79,8 +79,8 @@ export default class NewTotalsService extends TransactionBaseService {
 
   /**
    * Calculate and return the items totals for either the legacy calculation or the new calculation
-   * @param items 
-   * @param param1 
+   * @param items
+   * @param param1
    */
   async getLineItemTotals(
     items: LineItem | LineItem[],
@@ -136,9 +136,9 @@ export default class NewTotalsService extends TransactionBaseService {
 
   /**
    * Calculate and return the totals for an item
-   * @param item 
-   * @param param1 
-   * @returns 
+   * @param item
+   * @param param1
+   * @returns
    */
   protected async getLineItemTotals_(
     item: LineItem,

packages/payment/src/models/capture.ts

@@ -1,3 +1,4 @@
+import { generateEntityId } from "@medusajs/utils"
 import {
   BeforeCreate,
   Entity,
@@ -7,8 +8,6 @@ import {
   PrimaryKey,
   Property,
 } from "@mikro-orm/core"
-
-import { generateEntityId } from "@medusajs/utils"
 import Payment from "./payment"
 
 type OptionalCaptureProps = "created_at"

packages/types/src/cart/common.ts

@@ -261,7 +261,23 @@ export interface CartShippingMethodDTO {
   discount_tax_total: number
 }
 
-export interface CartLineItemDTO {
+export interface CartLineItemTotalsDTO {
+  original_total: number
+  original_subtotal: number
+  original_tax_total: number
+
+  item_total: number
+  item_subtotal: number
+  item_tax_total: number
+
+  total: number
+  subtotal: number
+  tax_total: number
+  discount_total: number
+  discount_tax_total: number
+}
+
+export interface CartLineItemDTO extends CartLineItemTotalsDTO {
   /**
    * The ID of the line item.
    */
@@ -384,20 +400,6 @@ export interface CartLineItemDTO {
    * When the line item was updated.
    */
   updated_at?: Date
-
-  original_total: number
-  original_subtotal: number
-  original_tax_total: number
-
-  item_total: number
-  item_subtotal: number
-  item_tax_total: number
-
-  total: number
-  subtotal: number
-  tax_total: number
-  discount_total: number
-  discount_tax_total: number
 }
 
 export interface CartDTO {
@@ -478,8 +480,12 @@ export interface CartDTO {
   subtotal: number
   tax_total: number
   discount_total: number
+  raw_discount_total: any
   discount_tax_total: number
 
+  gift_card_total: number
+  gift_card_tax_total: number
+
   shipping_total: number
   shipping_subtotal: number
   shipping_tax_total: number

packages/types/src/cart/mutations.ts

@@ -156,7 +156,7 @@ export interface CreateLineItemDTO {
   is_tax_inclusive?: boolean
 
   compare_at_unit_price?: number
-  unit_price: number
+  unit_price: number | string
 
   tax_lines?: CreateTaxLineDTO[]
   adjustments?: CreateAdjustmentDTO[]

packages/types/src/index.ts

@@ -24,5 +24,7 @@ export * from "./sales-channel"
 export * from "./search"
 export * from "./shared-context"
 export * from "./stock-location"
+export * from "./totals"
 export * from "./transaction-base"
 export * from "./workflow"
+

packages/types/src/totals/big-number.ts

@@ -0,0 +1,4 @@
+export type BigNumberRawValue = {
+  value: string | number
+  [key: string]: unknown
+}

packages/types/src/totals/index.ts

@@ -0,0 +1,2 @@
+export * from "./big-number";
+

packages/utils/package.json

@@ -35,6 +35,7 @@
     "@mikro-orm/migrations": "5.9.7",
     "@mikro-orm/postgresql": "5.9.7",
     "awilix": "^8.0.1",
+    "bignumber.js": "^9.1.2",
     "knex": "2.4.2",
     "ulid": "^2.3.0"
   },