From 6eeb73acc15302a04be5ad2e506aa73e1d8bf329 Mon Sep 17 00:00:00 2001 From: John Yeo Date: Thu, 21 Aug 2025 13:24:05 -0700 Subject: [PATCH] fix: imports in shared --- .../productUtils/priceToInvoiceAmount.ts | 19 ++++++------ shared/utils/productUtils/priceUtils.ts | 31 ++++++++++--------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/shared/utils/productUtils/priceToInvoiceAmount.ts b/shared/utils/productUtils/priceToInvoiceAmount.ts index f5e9b021d..e209b1772 100644 --- a/shared/utils/productUtils/priceToInvoiceAmount.ts +++ b/shared/utils/productUtils/priceToInvoiceAmount.ts @@ -1,16 +1,17 @@ +import { FixedPriceConfig } from "../../models/productModels/priceModels/priceConfig/fixedPriceConfig.js"; +import { UsagePriceConfig } from "../../models/productModels/priceModels/priceConfig/usagePriceConfig.js"; +import { BillingType } from "../../models/productModels/priceModels/priceEnums.js"; +import { Price } from "../../models/productModels/priceModels/priceModels.js"; +import { Infinite } from "../../models/productModels/productEnums.js"; import { - BillingType, - calculateProrationAmount, - Feature, - FixedPriceConfig, - Infinite, - Price, ProductItem, - Proration, UsageModel, - UsagePriceConfig, -} from "@autumn/shared"; +} from "../../models/productV2Models/productItemModels/productItemModels.js"; import { isPriceItem } from "../productDisplayUtils/getItemType.js"; +import { + calculateProrationAmount, + Proration, +} from "../productDisplayUtils/getProductItemRes.js"; import { nullish } from "../utils.js"; import { getBillingType, isFixedPrice } from "./priceUtils.js"; import { Decimal } from "decimal.js"; diff --git a/shared/utils/productUtils/priceUtils.ts b/shared/utils/productUtils/priceUtils.ts index 0429de02f..de8942859 100644 --- a/shared/utils/productUtils/priceUtils.ts +++ b/shared/utils/productUtils/priceUtils.ts @@ -1,20 +1,23 @@ -import { - APIVersion, - BillingInterval, - BillingType, - BillWhen, - FixedPriceConfig, - FullCusProduct, - OnDecrease, - OnIncrease, - Price, - PriceType, - UsagePriceConfig, -} from "@autumn/shared"; - import Stripe from "stripe"; import { Decimal } from "decimal.js"; import { notNullish } from "../utils.js"; +import { FixedPriceConfig } from "../../models/productModels/priceModels/priceConfig/fixedPriceConfig.js"; +import { + BillWhen, + UsagePriceConfig, +} from "../../models/productModels/priceModels/priceConfig/usagePriceConfig.js"; +import { + BillingInterval, + BillingType, + PriceType, +} from "../../models/productModels/priceModels/priceEnums.js"; +import { Price } from "../../models/productModels/priceModels/priceModels.js"; +import { FullCusProduct } from "../../models/cusProductModels/cusProductModels.js"; +import { + OnDecrease, + OnIncrease, +} from "../../models/productV2Models/productItemModels/productItemEnums.js"; +import { APIVersion } from "../../enums/APIVersion.js"; export const getBillingType = (config: FixedPriceConfig | UsagePriceConfig) => { // 1. Fixed cycle / one off