@zuplo/zudoku-plugin-monetization 0.0.38 → 0.0.39

package/dist/index.mjs

@@ -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", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/zudoku-plugin-monetization",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "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.78.1"
   },
   "peerDependencies": {
     "react": ">=19.2.0",