@bunnyapp/components 1.7.0-beta.43 → 1.7.0-beta.44

package/dist/cjs/index.js

@@ -1283,7 +1283,7 @@ const DEFAULT_CONFIG = {
 };
 
 // This will be replaced at build time by rollup-plugin-replace
-const PACKAGE_VERSION = '1.7.0-beta.42';
+const PACKAGE_VERSION = '1.7.0-beta.43';
 const createRequestHeaders = (token) => {
     const headers = createClientDevHeaders({ token });
     // Add the components version header
@@ -26810,11 +26810,41 @@ const GetPrice_PriceListFragment = t(`
       showPriceAsMonthly
       monthlyBasePrice
       basePrice
+      charges {
+        basePrice
+        chargeType
+        featureAddon
+        deprecated
+        ...filterDeprecatedCharges_PriceListChargeFragment
+      }
     }
-  `);
+  `, [filterDeprecatedCharges_PriceListChargeFragment]);
 function getPrice(maskedPriceList) {
+    var _a, _b;
     // Read fragments
     const priceList = readFragment(GetPrice_PriceListFragment, maskedPriceList);
+    // ============= HACK FOR THOMAS' CUSTOMER MEETING =============
+    // note: delete shortly after and implement a better pricing solution
+    // to take other charges into account.
+    // Filter charges: exclude deprecated and featureAddon charges, keep only USAGE charges
+    const usageCharges = (_b = (_a = priceList.charges) === null || _a === void 0 ? void 0 : _a.filter(charge => {
+        // Exclude deprecated charges
+        if (!filterDeprecatedCharges(undefined, charge)) {
+            return false;
+        }
+        // Exclude featureAddon charges
+        if (charge.featureAddon === true) {
+            return false;
+        }
+        // Keep only USAGE charges
+        return charge.chargeType === t.scalar('ChargeType', 'USAGE');
+    })) !== null && _b !== void 0 ? _b : [];
+    // If there are any usage charges, sum their basePrice
+    if (usageCharges.length > 0) {
+        return usageCharges.reduce((sum, charge) => sum + charge.basePrice, 0);
+    }
+    // =================================================================
+    // Otherwise, return the priceList basePrice or monthlyBasePrice
     if (priceList.showPriceAsMonthly) {
         return priceList.monthlyBasePrice;
     }
@@ -26850,10 +26880,11 @@ function priceListPriceText({ priceList: maskedPriceList, }) {
         }
         return 0;
     };
+    const basePrice = getPrice(priceList);
     const priceDecimals = calculatePriceDecimals();
     const price = !((_a = priceList.plan) === null || _a === void 0 ? void 0 : _a.pricingStyle) ||
         ((_b = priceList.plan) === null || _b === void 0 ? void 0 : _b.pricingStyle) === t.scalar('PlanPricingStyles', 'PRICED')
-        ? formatCurrency(getPrice(priceList), priceList.currencyId, priceDecimals)
+        ? formatCurrency(basePrice, priceList.currencyId, priceDecimals)
         : ((_c = priceList.plan) === null || _c === void 0 ? void 0 : _c.pricingStyle) === t.scalar('PlanPricingStyles', 'CONTACT_US')
             ? 'Custom'
             : 'Free';

package/dist/cjs/types/src/utils/priceListUtils/getPrice.d.ts

@@ -3,6 +3,15 @@ export declare const GetPrice_PriceListFragment: import("gql.tada").TadaDocument
     showPriceAsMonthly: boolean | null;
     monthlyBasePrice: number | null;
     basePrice: number | null;
+    charges: {
+        basePrice: number;
+        chargeType: "ONE_TIME" | "RECURRING" | "USAGE" | null;
+        featureAddon: boolean | null;
+        deprecated: boolean | null;
+        [$tada.fragmentRefs]: {
+            filterDeprecatedCharges_PriceListChargeFragment: "PriceListCharge";
+        };
+    }[] | null;
 }, {}, {
     fragment: "GetPrice_PriceListFragment";
     on: "PriceList";

package/dist/esm/index.js

@@ -1281,7 +1281,7 @@ const DEFAULT_CONFIG = {
 };
 
 // This will be replaced at build time by rollup-plugin-replace
-const PACKAGE_VERSION = '1.7.0-beta.42';
+const PACKAGE_VERSION = '1.7.0-beta.43';
 const createRequestHeaders = (token) => {
     const headers = createClientDevHeaders({ token });
     // Add the components version header
@@ -26808,11 +26808,41 @@ const GetPrice_PriceListFragment = t(`
       showPriceAsMonthly
       monthlyBasePrice
       basePrice
+      charges {
+        basePrice
+        chargeType
+        featureAddon
+        deprecated
+        ...filterDeprecatedCharges_PriceListChargeFragment
+      }
     }
-  `);
+  `, [filterDeprecatedCharges_PriceListChargeFragment]);
 function getPrice(maskedPriceList) {
+    var _a, _b;
     // Read fragments
     const priceList = readFragment(GetPrice_PriceListFragment, maskedPriceList);
+    // ============= HACK FOR THOMAS' CUSTOMER MEETING =============
+    // note: delete shortly after and implement a better pricing solution
+    // to take other charges into account.
+    // Filter charges: exclude deprecated and featureAddon charges, keep only USAGE charges
+    const usageCharges = (_b = (_a = priceList.charges) === null || _a === void 0 ? void 0 : _a.filter(charge => {
+        // Exclude deprecated charges
+        if (!filterDeprecatedCharges(undefined, charge)) {
+            return false;
+        }
+        // Exclude featureAddon charges
+        if (charge.featureAddon === true) {
+            return false;
+        }
+        // Keep only USAGE charges
+        return charge.chargeType === t.scalar('ChargeType', 'USAGE');
+    })) !== null && _b !== void 0 ? _b : [];
+    // If there are any usage charges, sum their basePrice
+    if (usageCharges.length > 0) {
+        return usageCharges.reduce((sum, charge) => sum + charge.basePrice, 0);
+    }
+    // =================================================================
+    // Otherwise, return the priceList basePrice or monthlyBasePrice
     if (priceList.showPriceAsMonthly) {
         return priceList.monthlyBasePrice;
     }
@@ -26848,10 +26878,11 @@ function priceListPriceText({ priceList: maskedPriceList, }) {
         }
         return 0;
     };
+    const basePrice = getPrice(priceList);
     const priceDecimals = calculatePriceDecimals();
     const price = !((_a = priceList.plan) === null || _a === void 0 ? void 0 : _a.pricingStyle) ||
         ((_b = priceList.plan) === null || _b === void 0 ? void 0 : _b.pricingStyle) === t.scalar('PlanPricingStyles', 'PRICED')
-        ? formatCurrency(getPrice(priceList), priceList.currencyId, priceDecimals)
+        ? formatCurrency(basePrice, priceList.currencyId, priceDecimals)
         : ((_c = priceList.plan) === null || _c === void 0 ? void 0 : _c.pricingStyle) === t.scalar('PlanPricingStyles', 'CONTACT_US')
             ? 'Custom'
             : 'Free';

package/dist/esm/types/src/utils/priceListUtils/getPrice.d.ts

@@ -3,6 +3,15 @@ export declare const GetPrice_PriceListFragment: import("gql.tada").TadaDocument
     showPriceAsMonthly: boolean | null;
     monthlyBasePrice: number | null;
     basePrice: number | null;
+    charges: {
+        basePrice: number;
+        chargeType: "ONE_TIME" | "RECURRING" | "USAGE" | null;
+        featureAddon: boolean | null;
+        deprecated: boolean | null;
+        [$tada.fragmentRefs]: {
+            filterDeprecatedCharges_PriceListChargeFragment: "PriceListCharge";
+        };
+    }[] | null;
 }, {}, {
     fragment: "GetPrice_PriceListFragment";
     on: "PriceList";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunnyapp/components",
-  "version": "1.7.0-beta.43",
+  "version": "1.7.0-beta.44",
   "description": "Components from the Bunny portal to embed Bunny UI functionality into your application.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",