@zuplo/zudoku-plugin-monetization 0.0.38 → 0.0.40

package/dist/{PricingTable-Dsbd3E2Q.mjs → PricingTable-DNop2iX9.mjs}

@@ -15,6 +15,12 @@ const formatDuration = (iso) => {
 		if (d.weeks && d.weeks > 1) return `${d.weeks} weeks`;
 		if (d.days === 1) return "day";
 		if (d.days && d.days > 1) return `${d.days} days`;
+		if (d.hours === 1) return "hour";
+		if (d.hours && d.hours > 1) return `${d.hours} hours`;
+		if (d.minutes === 1) return "minute";
+		if (d.minutes && d.minutes > 1) return `${d.minutes} minutes`;
+		if (d.seconds === 1) return "second";
+		if (d.seconds && d.seconds > 1) return `${d.seconds} seconds`;
 		return iso;
 	} catch {
 		return iso;
@@ -31,6 +37,12 @@ const formatDurationInterval = (iso) => {
 		if (d.weeks && d.weeks > 1) return `every ${d.weeks} weeks`;
 		if (d.days === 1) return "daily";
 		if (d.days && d.days > 1) return `every ${d.days} days`;
+		if (d.hours === 1) return "hourly";
+		if (d.hours && d.hours > 1) return `every ${d.hours} hours`;
+		if (d.minutes === 1) return "every minute";
+		if (d.minutes && d.minutes > 1) return `every ${d.minutes} minutes`;
+		if (d.seconds === 1) return "every second";
+		if (d.seconds && d.seconds > 1) return `every ${d.seconds} seconds`;
 		return iso;
 	} catch {
 		return iso;
@@ -40,7 +52,8 @@ const formatDurationInterval = (iso) => {
 * Returns an adjective form suitable for possessive context
 * e.g. "your monthly quota", "your weekly limit".
 * Falls back to "billing period" for multi-unit cadences
-* where "every 3 months" would be grammatically awkward.
+* or sub-hour units where the adjective form is grammatically awkward
+* (e.g. "every 3 months", "every 5 minutes").
 */
 const formatDurationAdjective = (iso) => {
 	try {
@@ -49,6 +62,7 @@ const formatDurationAdjective = (iso) => {
 		if (d.months === 1) return "monthly";
 		if (d.weeks === 1) return "weekly";
 		if (d.days === 1) return "daily";
+		if (d.hours === 1) return "hourly";
 		return "billing period";
 	} catch {
 		return "billing period";
@@ -104,7 +118,7 @@ const parseAmount = (value) => {
 	return Number.isFinite(parsed) ? parsed : void 0;
 };
 const formatTieredPriceBreakdown = (opts) => {
-	const { tiers, currency, unitLabel, includedLabel, omitIncludedUpToAmount } = opts;
+	const { tiers, currency, unitLabel, includedLabel } = opts;
 	if (!tiers || tiers.length <= 1) return;
 	const lines = [];
 	let lastUpTo;
@@ -113,10 +127,10 @@ const formatTieredPriceBreakdown = (opts) => {
 		const unit = parseAmount(tier.unitPriceAmount) ?? 0;
 		const flat = parseAmount(tier.flatPriceAmount) ?? 0;
 		const prefix = upTo != null ? `Up to ${upTo.toLocaleString("en-US")}` : lastUpTo != null ? `Over ${lastUpTo.toLocaleString("en-US")}` : `Per ${unitLabel}`;
-		const unitPart = unit > 0 ? `${formatPrice(unit, currency)}/${unitLabel}` : includedLabel;
-		const flatPart = flat > 0 ? ` + ${formatPrice(flat, currency)} base` : "";
-		const line = `${prefix}: ${unitPart}${flatPart}`;
-		if (omitIncludedUpToAmount != null && upTo != null && upTo === omitIncludedUpToAmount && unitPart === includedLabel && flatPart === "") {} else lines.push(line);
+		const flatPart = flat > 0 ? formatPrice(flat, currency) : "";
+		const unitPart = unit > 0 ? `${formatPrice(unit, currency)}/${unitLabel}` : "";
+		const pricePart = flatPart && unitPart ? `${flatPart} + ${unitPart}` : flatPart || unitPart || includedLabel;
+		lines.push(`${prefix}: ${pricePart}`);
 		if (upTo != null) lastUpTo = upTo;
 	}
 	return lines.length > 0 ? lines : void 0;
@@ -130,32 +144,99 @@ const categorizeRateCards = (rateCards, options) => {
 	for (const rc of rateCards) {
 		const et = rc.entitlementTemplate;
 		if (!et) continue;
-		if (et.type === "metered" && et.issueAfterReset != null) {
-			let overagePrice;
+		const unitLabelFor = (rcArg) => units?.[rcArg.key] ?? units?.[rcArg.featureKey ?? ""] ?? "unit";
+		const periodFor = (rcArg) => {
+			if (et.type === "metered" && et.usagePeriod) return formatDuration(et.usagePeriod);
+			if (rcArg.billingCadence) return formatDuration(rcArg.billingCadence);
+			if (planBillingCadence) return formatDuration(planBillingCadence);
+			return "month";
+		};
+		const firstTier = rc.price?.type === "tiered" && rc.price.tiers.length > 0 ? rc.price.tiers[0] : void 0;
+		const firstTierIsPriced = !!firstTier && (parseFloat(firstTier.flatPrice?.amount ?? "0") > 0 || parseFloat(firstTier.unitPrice?.amount ?? "0") > 0);
+		if (et.type === "metered" && et.issueAfterReset != null && !firstTierIsPriced) {
 			let tierPrices;
-			if (rc.price?.type === "tiered" && rc.price.tiers) {
-				const unitLabel = units?.[rc.key] ?? units?.[rc.featureKey ?? ""] ?? "unit";
-				tierPrices = formatTieredPriceBreakdown({
-					tiers: rc.price.tiers.map((t) => ({
+			if (rc.price?.type === "tiered" && rc.price.tiers) tierPrices = formatTieredPriceBreakdown({
+				tiers: rc.price.tiers.map((t) => ({
+					upToAmount: t.upToAmount,
+					unitPriceAmount: t.unitPrice?.amount,
+					flatPriceAmount: t.flatPrice?.amount
+				})),
+				currency,
+				unitLabel: unitLabelFor(rc),
+				includedLabel: "Included"
+			});
+			quotas.push({
+				key: rc.featureKey ?? rc.key,
+				name: rc.name,
+				limit: et.issueAfterReset,
+				period: periodFor(rc),
+				tierPrices
+			});
+		} else if (et.type === "metered" && rc.type === "usage_based" && rc.price) {
+			const unitLabel = unitLabelFor(rc);
+			if (rc.price.type === "tiered" && rc.price.tiers.length > 0) {
+				const tiers = rc.price.tiers;
+				if (!tiers.some((t) => parseFloat(t.flatPrice?.amount ?? "0") > 0 || parseFloat(t.unitPrice?.amount ?? "0") > 0)) {
+					features.push({
+						key: rc.featureKey ?? rc.key,
+						name: rc.name
+					});
+					continue;
+				}
+				if (tiers.length === 1) {
+					const unit = parseFloat(tiers[0].unitPrice?.amount ?? "0");
+					const flat = parseFloat(tiers[0].flatPrice?.amount ?? "0");
+					const flatPart = flat > 0 ? formatPrice(flat, currency) : "";
+					const unitPart = unit > 0 ? `${formatPrice(unit, currency)}/${unitLabel}` : "";
+					const pricePart = flatPart && unitPart ? `${flatPart} + ${unitPart}` : flatPart || unitPart;
+					if (pricePart) {
+						quotas.push({
+							key: rc.featureKey ?? rc.key,
+							name: rc.name,
+							limit: 0,
+							period: periodFor(rc),
+							unitPrice: pricePart,
+							isPayg: true
+						});
+						continue;
+					}
+					features.push({
+						key: rc.featureKey ?? rc.key,
+						name: rc.name
+					});
+					continue;
+				}
+				const tierPrices = formatTieredPriceBreakdown({
+					tiers: tiers.map((t) => ({
 						upToAmount: t.upToAmount,
 						unitPriceAmount: t.unitPrice?.amount,
 						flatPriceAmount: t.flatPrice?.amount
 					})),
 					currency,
 					unitLabel,
-					includedLabel: "Included",
-					omitIncludedUpToAmount: et.issueAfterReset
+					includedLabel: "Included"
 				});
-				const overageTier = rc.price.tiers.find((t) => t.unitPrice?.amount && parseFloat(t.unitPrice.amount) > 0);
-				if (et.isSoftLimit !== false && overageTier?.unitPrice) overagePrice = `${formatPrice(parseFloat(overageTier.unitPrice.amount), currency)}/${unitLabel}`;
-			}
-			quotas.push({
+				quotas.push({
+					key: rc.featureKey ?? rc.key,
+					name: rc.name,
+					limit: 0,
+					period: periodFor(rc),
+					tierPrices,
+					isPayg: true
+				});
+			} else if (rc.price.type === "unit" && parseFloat(rc.price.amount) > 0) {
+				const amount = parseFloat(rc.price.amount);
+				quotas.push({
+					key: rc.featureKey ?? rc.key,
+					name: rc.name,
+					limit: 0,
+					period: periodFor(rc),
+					unitPrice: `${formatPrice(amount, currency)}/${unitLabel}`,
+					isPayg: true
+				});
+			} else features.push({
 				key: rc.featureKey ?? rc.key,
-				name: rc.name,
-				limit: et.issueAfterReset,
-				period: rc.billingCadence ? formatDuration(rc.billingCadence) : planBillingCadence ? formatDuration(planBillingCadence) : "month",
-				overagePrice,
-				tierPrices
+				name: rc.name
 			});
 		} else if (et.type === "boolean") features.push({
 			key: rc.featureKey ?? rc.key,
@@ -217,30 +298,33 @@ const FeatureItem = ({ feature, className }) => {
 //#endregion
 //#region src/pricing-ui/QuotaItem.tsx
 const QuotaItem = ({ quota, className }) => {
+	const hasTierBreakdown = !!quota.tierPrices && quota.tierPrices.length > 0;
+	const showQuotaLine = !quota.isPayg && !hasTierBreakdown;
 	return /* @__PURE__ */ jsxs("div", {
 		className: cn("flex items-start gap-2", className),
 		children: [/* @__PURE__ */ jsx(CheckIcon, { className: "w-4 h-4 text-primary shrink-0 mt-0.5" }), /* @__PURE__ */ jsxs("div", {
 			className: "text-sm",
 			children: [
-				/* @__PURE__ */ jsxs("span", {
+				showQuotaLine ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
+					/* @__PURE__ */ jsxs("span", {
+						className: "font-medium",
+						children: [quota.name, ":"]
+					}),
+					" ",
+					quota.limit.toLocaleString(),
+					" / ",
+					quota.period
+				] }) : /* @__PURE__ */ jsx("span", {
 					className: "font-medium",
-					children: [quota.name, ":"]
+					children: quota.name
 				}),
-				" ",
-				quota.limit.toLocaleString(),
-				" / ",
-				quota.period,
-				quota.tierPrices && quota.tierPrices.length > 0 && /* @__PURE__ */ jsx("ul", {
-					className: "text-xs text-muted-foreground mt-1 space-y-0.5",
-					children: quota.tierPrices.map((line) => /* @__PURE__ */ jsx("li", { children: line }, line))
+				quota.unitPrice && /* @__PURE__ */ jsxs("span", {
+					className: "text-muted-foreground",
+					children: [" — ", quota.unitPrice]
 				}),
-				quota.overagePrice && /* @__PURE__ */ jsxs("div", {
-					className: "text-xs text-muted-foreground mt-0.5",
-					children: [
-						"+",
-						quota.overagePrice,
-						" after quota"
-					]
+				hasTierBreakdown && /* @__PURE__ */ jsx("ul", {
+					className: "text-xs text-muted-foreground mt-1 space-y-0.5",
+					children: quota.tierPrices?.map((line) => /* @__PURE__ */ jsx("li", { children: line }, line))
 				})
 			]
 		})]
@@ -410,11 +494,40 @@ const subscriptionTaxLegendSentence = (behavior) => {
 	}
 };
 //#endregion
+//#region src/utils/formatPlanPrice.ts
+const isPricedUsageRateCard = (rc) => {
+	if (rc.type !== "usage_based" || !rc.price) return false;
+	const p = rc.price;
+	if (p.type === "unit") return parseFloat(p.amount) > 0;
+	if (p.type === "tiered") return p.tiers.some((t) => parseFloat(t.flatPrice?.amount ?? "0") > 0 || parseFloat(t.unitPrice?.amount ?? "0") > 0);
+	return true;
+};
+const hasPricedUsageRateCard = (plan) => plan.phases.some((phase) => phase.rateCards.some(isPricedUsageRateCard));
+/**
+* Headline pricing for plan cards. Centralizes the "Pay as you go" detection:
+* plans whose flat-fee total is zero but that bill on usage shouldn't render
+* as "Free" - they're charged per-unit.
+*/
+const formatPlanPrice = (plan) => {
+	if (plan.phases.length === 0) return { type: "free" };
+	const { monthly, yearly } = getPriceFromPlan(plan);
+	if (monthly > 0) return {
+		type: "priced",
+		monthly,
+		yearly
+	};
+	if (hasPricedUsageRateCard(plan)) return {
+		type: "payg",
+		main: "Pay as you go",
+		sub: "Usage-based pricing"
+	};
+	return { type: "free" };
+};
+//#endregion
 //#region src/pricing-ui/PricingCard.tsx
 const PricingCard = ({ plan, isPopular = false, showYearlyPrice = true, units, action, className }) => {
 	if (plan.phases.length === 0) return null;
-	const price = getPriceFromPlan(plan);
-	const isFree = price.monthly === 0;
+	const priceLabel = formatPlanPrice(plan);
 	const isCustom = plan.metadata?.isCustom === true;
 	const billingInterval = formatDuration(plan.billingCadence);
 	return /* @__PURE__ */ jsxs("div", {
@@ -442,16 +555,29 @@ const PricingCard = ({ plan, isPopular = false, showYearlyPrice = true, units, a
 						}), /* @__PURE__ */ jsx("div", {
 							className: "text-sm text-muted-foreground mt-1",
 							children: "Contact Sales"
-						})] }) : /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx("span", {
+						})] }) : priceLabel.type === "payg" ? /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx("div", {
+							className: "text-2xl font-bold text-card-foreground text-balance",
+							children: priceLabel.main
+						}), /* @__PURE__ */ jsx("div", {
+							className: "text-sm text-muted-foreground mt-1",
+							children: priceLabel.sub
+						})] }) : priceLabel.type === "free" ? /* @__PURE__ */ jsx("span", {
 							className: "text-3xl font-bold text-card-foreground",
-							children: isFree ? "Free" : formatPrice(price.monthly, plan.currency)
-						}), !isFree && /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("span", {
-							className: "text-muted-foreground text-sm",
-							children: ["/", billingInterval]
-						}), showYearlyPrice && price.yearly > 0 && /* @__PURE__ */ jsxs("div", {
-							className: "w-full text-sm text-muted-foreground mt-1",
-							children: [formatPrice(price.yearly, plan.currency), "/year"]
-						})] })] })
+							children: "Free"
+						}) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
+							/* @__PURE__ */ jsx("span", {
+								className: "text-3xl font-bold text-card-foreground",
+								children: formatPrice(priceLabel.monthly, plan.currency)
+							}),
+							/* @__PURE__ */ jsxs("span", {
+								className: "text-muted-foreground text-sm",
+								children: ["/", billingInterval]
+							}),
+							showYearlyPrice && priceLabel.yearly > 0 && /* @__PURE__ */ jsxs("div", {
+								className: "w-full text-sm text-muted-foreground mt-1",
+								children: [formatPrice(priceLabel.yearly, plan.currency), "/year"]
+							})
+						] })
 					}),
 					plan.paymentRequired === false && /* @__PURE__ */ jsx("div", {
 						className: "text-sm text-muted-foreground mt-1",

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { _ as formatDuration, a as subscriptionTaxLegendSentence, c as getPriceFromPlan, f as categorizeRateCards, g as formatPrice, h as formatMinorCurrencyAmount, i as planHasDefaultTaxBehavior, l as PlanEntitlements, m as formatStaticEntitlementConfig, p as formatTieredPriceBreakdown, t as PricingTable, v as formatDurationAdjective, y as formatDurationInterval } from "./PricingTable-Dsbd3E2Q.mjs";
+import { _ as formatDuration, a as subscriptionTaxLegendSentence, c as getPriceFromPlan, f as categorizeRateCards, g as formatPrice, h as formatMinorCurrencyAmount, i as planHasDefaultTaxBehavior, l as PlanEntitlements, m as formatStaticEntitlementConfig, p as formatTieredPriceBreakdown, t as PricingTable, v as formatDurationAdjective, y as formatDurationInterval } from "./PricingTable-DNop2iX9.mjs";
 import { cn, createPlugin, joinUrl, throwIfProblemJson } from "zudoku";
 import { AlertTriangleIcon, ArrowDownIcon, ArrowLeftRightIcon, ArrowUpIcon, CalendarIcon, CheckCheckIcon, CheckIcon, CircleSlashIcon, ClockIcon, CreditCardIcon, Grid2x2XIcon, InfoIcon, Loader2Icon, LockIcon, MoreVerticalIcon, RefreshCcw, RefreshCwIcon, Settings, ShieldIcon, StarsIcon, Trash2Icon, XIcon } from "zudoku/icons";
 import { Button, ClientOnly, Head, Heading, Link, Slot } from "zudoku/components";
@@ -1324,6 +1324,7 @@ const comparePlans = (currentPlan, targetPlan, currentIndex, targetIndex, units)
 	return {
 		plan: targetPlan,
 		isUpgrade,
+		isNewerVersion: false,
 		quotaChanges,
 		featureChanges
 	};
@@ -1334,6 +1335,14 @@ const ChangeIndicator = ({ change }) => {
 	return /* @__PURE__ */ jsx(CheckIcon, { className: "w-4 h-4 text-green-600 shrink-0" });
 };
 const isPrivatePlan = (plan) => plan.metadata?.zuplo_private_plan === "true";
+const planVersion = (plan) => plan.version ?? 1;
+const isNewerPlanVersion = (subscribedPlan, target) => target.key === subscribedPlan.key && planVersion(target) > planVersion(subscribedPlan);
+/** Baseline for comparisons: catalog entry when present, else subscription plan. */
+const resolvePlanForComparison = (subscribedPlan, catalogItems) => catalogItems?.find((p) => p.id === subscribedPlan.id) ?? subscribedPlan;
+const resolveIsUpgrade = ({ target, targetIndex, subscribedPlan, currentIndex }) => {
+	if (target.key === subscribedPlan.key) return planVersion(target) > planVersion(subscribedPlan);
+	return targetIndex > currentIndex;
+};
 const modeLabelMap = {
 	upgrade: "Upgrade",
 	downgrade: "Downgrade",
@@ -1354,10 +1363,17 @@ const PlanComparisonItem = ({ comparison, subscriptionId, mode, onRequestChange,
 		children: [/* @__PURE__ */ jsxs("div", {
 			className: "flex items-center justify-between mb-3",
 			children: [/* @__PURE__ */ jsxs("div", {
-				className: "flex items-baseline gap-2",
-				children: [/* @__PURE__ */ jsx("h4", {
-					className: "font-semibold text-foreground",
-					children: comparison.plan.name
+				className: "flex items-baseline gap-2 flex-wrap",
+				children: [/* @__PURE__ */ jsxs("div", {
+					className: "flex items-center gap-2",
+					children: [/* @__PURE__ */ jsx("h4", {
+						className: "font-semibold text-foreground",
+						children: comparison.plan.name
+					}), comparison.isNewerVersion && /* @__PURE__ */ jsx(Badge, {
+						variant: "outline",
+						className: "rounded-full border-primary/30 bg-primary/10 text-primary font-medium",
+						children: "New version"
+					})]
 				}), isCustom ? /* @__PURE__ */ jsx("span", {
 					className: "text-primary font-medium",
 					children: "Custom"
@@ -1522,35 +1538,35 @@ const SwitchPlanModal = ({ subscription, children }) => {
 			window.location.href = data.url;
 		}
 	});
-	const currentPlan = plansData?.items.find((p) => p.key === subscription.plan.key);
+	const subscribedPlan = subscription.plan;
 	const { upgrades, downgrades, privatePlans } = useMemo(() => {
-		if (!plansData?.items) return {
+		const catalogItems = plansData?.items;
+		if (!catalogItems?.length) return {
 			upgrades: [],
 			downgrades: [],
 			privatePlans: []
 		};
-		if (!currentPlan) {
-			const currentIndex = -1;
-			return {
-				upgrades: plansData.items.map((plan, targetIndex) => comparePlans(void 0, plan, currentIndex, targetIndex, pricing?.units)).filter((c) => !isPrivatePlan(c.plan)),
-				downgrades: [],
-				privatePlans: []
-			};
-		}
-		if (isPrivatePlan(currentPlan)) {
-			const currentIndex = plansData.items.findIndex((p) => p.id === currentPlan.id);
-			return {
-				upgrades: plansData.items.filter((p) => p.id !== currentPlan.id).map((plan) => {
-					return comparePlans(currentPlan, plan, currentIndex, plansData.items.indexOf(plan), pricing?.units);
-				}).filter((c) => !isPrivatePlan(c.plan)),
-				downgrades: [],
-				privatePlans: []
-			};
-		}
-		const currentIndex = plansData.items.findIndex((p) => p.id === currentPlan.id);
-		const allComparisons = plansData.items.filter((p) => p.id !== currentPlan.id).map((plan) => {
-			return comparePlans(currentPlan, plan, currentIndex, plansData.items.indexOf(plan), pricing?.units);
+		const planForComparison = resolvePlanForComparison(subscribedPlan, catalogItems);
+		const currentIndex = catalogItems.some((p) => p.id === subscribedPlan.id) ? catalogItems.findIndex((p) => p.id === subscribedPlan.id) : -1;
+		const subscribedIsPrivate = isPrivatePlan(subscribedPlan);
+		const allComparisons = catalogItems.flatMap((plan, targetIndex) => {
+			if (plan.id === subscribedPlan.id) return [];
+			return [{
+				...comparePlans(planForComparison, plan, currentIndex, targetIndex, pricing?.units),
+				isUpgrade: resolveIsUpgrade({
+					target: plan,
+					targetIndex,
+					subscribedPlan,
+					currentIndex
+				}),
+				isNewerVersion: isNewerPlanVersion(subscribedPlan, plan)
+			}];
 		});
+		if (subscribedIsPrivate) return {
+			upgrades: allComparisons.filter((c) => !isPrivatePlan(c.plan)),
+			downgrades: [],
+			privatePlans: allComparisons.filter((c) => isPrivatePlan(c.plan))
+		};
 		return {
 			upgrades: allComparisons.filter((c) => c.isUpgrade && !isPrivatePlan(c.plan)),
 			downgrades: allComparisons.filter((c) => !c.isUpgrade && !isPrivatePlan(c.plan)),
@@ -1558,7 +1574,7 @@ const SwitchPlanModal = ({ subscription, children }) => {
 		};
 	}, [
 		plansData?.items,
-		currentPlan,
+		subscribedPlan,
 		pricing?.units
 	]);
 	return /* @__PURE__ */ jsxs(Dialog, {
@@ -1589,18 +1605,11 @@ const SwitchPlanModal = ({ subscription, children }) => {
 							children: switchPlanMutation.error.message
 						})
 					}),
-					currentPlan && /* @__PURE__ */ jsx(Item, {
-						variant: "outline",
-						children: /* @__PURE__ */ jsxs(ItemContent, { children: [/* @__PURE__ */ jsx(ItemTitle, { children: "Current Plan" }), /* @__PURE__ */ jsx(ItemDescription, {
-							className: "text-lg font-bold",
-							children: currentPlan.name
-						})] })
-					}),
-					!currentPlan && /* @__PURE__ */ jsx(Item, {
+					/* @__PURE__ */ jsx(Item, {
 						variant: "outline",
 						children: /* @__PURE__ */ jsxs(ItemContent, { children: [/* @__PURE__ */ jsx(ItemTitle, { children: "Current Plan" }), /* @__PURE__ */ jsx(ItemDescription, {
 							className: "text-lg font-bold",
-							children: subscription.plan.name
+							children: subscribedPlan.name
 						})] })
 					}),
 					upgrades.length > 0 && /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsxs("div", {
@@ -1780,21 +1789,6 @@ const formatDate$1 = (dateString) => {
 };
 const formatDateRange = (from, to) => `${formatDate$1(from)} – ${formatDate$1(to)}`;
 const formatNumber = (value) => value.toLocaleString("en-US");
-const getOveragePriceFromItem = (item, currency, units) => {
-	const tiers = item.price?.tiers;
-	if (!tiers || tiers.length === 0) return void 0;
-	const amount = tiers.find((t) => {
-		const amount = t.unitPrice?.amount;
-		if (!amount) return false;
-		const parsed = parseFloat(amount);
-		return Number.isFinite(parsed) && parsed > 0;
-	})?.unitPrice?.amount;
-	if (!amount) return void 0;
-	const parsed = parseFloat(amount);
-	if (!Number.isFinite(parsed) || parsed <= 0) return void 0;
-	const unitLabel = units?.[item.key] ?? units?.[item.featureKey] ?? "unit";
-	return `${formatPrice(parsed, currency)}/${unitLabel}`;
-};
 const getTierPricesFromItem = (item, currency, units) => {
 	if (item.price?.type !== "tiered") return;
 	const tiers = item.price.tiers;
@@ -1808,25 +1802,32 @@ const getTierPricesFromItem = (item, currency, units) => {
 		})),
 		currency,
 		unitLabel,
-		includedLabel: "Included",
-		omitIncludedUpToAmount: item.included?.entitlement?.issueAfterReset
+		includedLabel: "Included"
 	});
 };
+const hasPricedFirstTier = (item) => {
+	const firstTier = item.price?.tiers?.[0];
+	if (!firstTier) return false;
+	const flat = parseFloat(firstTier.flatPrice?.amount ?? "0");
+	const unit = parseFloat(firstTier.unitPrice?.amount ?? "0");
+	return flat > 0 || unit > 0;
+};
 const getEntitlementsFromItems = (items, currency, units, fallbackBillingCadence) => {
 	const features = [];
 	for (const item of items) {
 		const entitlement = item.included?.entitlement;
 		if (!entitlement) continue;
 		if (entitlement.type === "metered" && entitlement.issueAfterReset != null) {
-			const cadence = item.billingCadence ?? fallbackBillingCadence;
+			const cadence = entitlement.usagePeriod?.intervalISO ?? item.billingCadence ?? fallbackBillingCadence;
+			const tierPrices = getTierPricesFromItem(item, currency, units);
+			const suppressLimit = hasPricedFirstTier(item) && !!tierPrices && tierPrices.length > 0;
 			features.push({
 				entitlementType: "metered",
 				key: item.featureKey ?? item.key,
 				name: item.name ?? item.featureKey ?? item.key,
-				limit: entitlement.issueAfterReset,
-				period: cadence ? formatDuration(cadence) : "month",
-				overagePrice: entitlement.isSoftLimit !== false ? getOveragePriceFromItem(item, currency, units) : void 0,
-				tierPrices: getTierPricesFromItem(item, currency, units)
+				limit: suppressLimit ? void 0 : entitlement.issueAfterReset,
+				period: suppressLimit ? void 0 : cadence ? formatDuration(cadence) : "month",
+				tierPrices
 			});
 			continue;
 		}
@@ -1872,7 +1873,6 @@ const getPhaseRows = (opts) => {
 			entitlementType: f.entitlementType,
 			limit: f.entitlementType === "metered" ? f.limit : void 0,
 			period: f.entitlementType === "metered" ? f.period : void 0,
-			overagePrice: f.entitlementType === "metered" ? f.overagePrice : void 0,
 			tierPrices: f.entitlementType === "metered" ? f.tierPrices : void 0,
 			value: f.entitlementType === "static" ? f.value : void 0,
 			phaseId: phase.id,
@@ -1992,18 +1992,10 @@ const SubscriptionPlanDetails = ({ subscription }) => {
 											children: [row.name, row.entitlementType === "static" && row.value !== void 0 ? `: ${row.value}` : ""]
 										}), /* @__PURE__ */ jsx("div", {
 											className: "text-muted-foreground",
-											children: row.entitlementType === "metered" && row.limit != null ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
-												formatNumber(row.limit),
-												row.period ? ` / ${row.period}` : "",
-												row.tierPrices && row.tierPrices.length > 0 ? /* @__PURE__ */ jsx("ul", {
-													className: "text-xs mt-1 space-y-0.5",
-													children: row.tierPrices.map((line) => /* @__PURE__ */ jsx("li", { children: line }, line))
-												}) : null,
-												row.overagePrice ? /* @__PURE__ */ jsxs("div", {
-													className: "text-xs mt-0.5",
-													children: ["Overage: ", row.overagePrice]
-												}) : null
-											] }) : row.entitlementType === "static" && row.value !== void 0 ? null : "Included"
+											children: row.entitlementType === "metered" && (row.limit != null || row.tierPrices && row.tierPrices.length > 0) ? /* @__PURE__ */ jsxs(Fragment$1, { children: [row.limit != null && (!row.tierPrices || row.tierPrices.length === 0) ? /* @__PURE__ */ jsxs(Fragment$1, { children: [formatNumber(row.limit), row.period ? ` / ${row.period}` : ""] }) : null, row.tierPrices && row.tierPrices.length > 0 ? /* @__PURE__ */ jsx("ul", {
+												className: "text-xs space-y-0.5",
+												children: row.tierPrices.map((line) => /* @__PURE__ */ jsx("li", { children: line }, line))
+											}) : null] }) : row.entitlementType === "static" && row.value !== void 0 ? null : "Included"
 										})]
 									})
 								}, `${row.key}:${row.phaseId}`))

package/dist/pricing-ui.d.mts

@@ -84,8 +84,9 @@ interface Quota {
   name: string;
   limit: number;
   period: string;
-  overagePrice?: string;
   tierPrices?: string[];
+  isPayg?: boolean;
+  unitPrice?: string;
 }
 interface Feature {
   key: string;
@@ -253,7 +254,8 @@ declare const formatDurationInterval: (iso: string) => string;
  * Returns an adjective form suitable for possessive context
  * e.g. "your monthly quota", "your weekly limit".
  * Falls back to "billing period" for multi-unit cadences
- * where "every 3 months" would be grammatically awkward.
+ * or sub-hour units where the adjective form is grammatically awkward
+ * (e.g. "every 3 months", "every 5 minutes").
  */
 declare const formatDurationAdjective: (iso: string) => string;
 //#endregion
@@ -276,7 +278,6 @@ declare const formatTieredPriceBreakdown: (opts: {
   currency?: string;
   unitLabel: string;
   includedLabel: string;
-  omitIncludedUpToAmount?: number;
 }) => string[] | undefined;
 //#endregion
 //#region src/utils/getPriceFromPlan.d.ts

package/dist/pricing-ui.mjs

@@ -1,2 +1,2 @@
-import { _ as formatDuration, a as subscriptionTaxLegendSentence, c as getPriceFromPlan, d as FeatureItem, f as categorizeRateCards, g as formatPrice, h as formatMinorCurrencyAmount, i as planHasDefaultTaxBehavior, l as PlanEntitlements, m as formatStaticEntitlementConfig, n as PricingCard, o as taxBehaviorLegendSentence, p as formatTieredPriceBreakdown, r as collectDefaultTaxBehaviors, s as derivePriceFromPlan, t as PricingTable, u as QuotaItem, v as formatDurationAdjective, y as formatDurationInterval } from "./PricingTable-Dsbd3E2Q.mjs";
+import { _ as formatDuration, a as subscriptionTaxLegendSentence, c as getPriceFromPlan, d as FeatureItem, f as categorizeRateCards, g as formatPrice, h as formatMinorCurrencyAmount, i as planHasDefaultTaxBehavior, l as PlanEntitlements, m as formatStaticEntitlementConfig, n as PricingCard, o as taxBehaviorLegendSentence, p as formatTieredPriceBreakdown, r as collectDefaultTaxBehaviors, s as derivePriceFromPlan, t as PricingTable, u as QuotaItem, v as formatDurationAdjective, y as formatDurationInterval } from "./PricingTable-DNop2iX9.mjs";
 export { FeatureItem, PlanEntitlements, PricingCard, PricingTable, QuotaItem, categorizeRateCards, collectDefaultTaxBehaviors, derivePriceFromPlan, formatDuration, formatDurationAdjective, formatDurationInterval, formatMinorCurrencyAmount, formatPrice, formatStaticEntitlementConfig, formatTieredPriceBreakdown, getPriceFromPlan, planHasDefaultTaxBehavior, subscriptionTaxLegendSentence, taxBehaviorLegendSentence };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/zudoku-plugin-monetization",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "repository": {
     "type": "git",
     "url": "https://github.com/zuplo/zudoku",
@@ -37,7 +37,7 @@
     "react": "19.2.5",
     "react-dom": "19.2.5",
     "tsdown": "0.22.0",
-    "zudoku": "0.77.0"
+    "zudoku": "0.79.0"
   },
   "peerDependencies": {
     "react": ">=19.2.0",