@usethrottle/auth 0.7.0 → 0.8.0

package/dist/react/components/index.d.cts

@@ -324,6 +324,11 @@ declare const enUS: {
         cancelledOn: string;
         trialEnds: string;
         installmentProgress: string;
+        installmentTotal: string;
+        installmentNext: string;
+        /** Spec §5: a varied schedule's dated list; dates are estimates, hence "~". */
+        upcomingPayments: string;
+        upcomingPayment: string;
         cancelButton: string;
         cancelAtPeriodEnd: string;
         cancelNow: string;

package/dist/react/components/index.d.ts

@@ -324,6 +324,11 @@ declare const enUS: {
         cancelledOn: string;
         trialEnds: string;
         installmentProgress: string;
+        installmentTotal: string;
+        installmentNext: string;
+        /** Spec §5: a varied schedule's dated list; dates are estimates, hence "~". */
+        upcomingPayments: string;
+        upcomingPayment: string;
         cancelButton: string;
         cancelAtPeriodEnd: string;
         cancelNow: string;

package/dist/react/components/index.js

@@ -674,6 +674,11 @@ var enUS = {
     cancelledOn: "Cancelled on",
     trialEnds: "Trial ends",
     installmentProgress: "Payment {paid} of {total}",
+    installmentTotal: "{amount} total",
+    installmentNext: "Next {amount} on {date}",
+    /** Spec §5: a varied schedule's dated list; dates are estimates, hence "~". */
+    upcomingPayments: "Upcoming payments",
+    upcomingPayment: "{amount} \xB7 ~{date}",
     cancelButton: "Cancel",
     cancelAtPeriodEnd: "Cancel at period end",
     cancelNow: "Cancel immediately",
@@ -3737,6 +3742,18 @@ function isIntervalUnit(value) {
   return typeof value === "string" && INTERVAL_UNITS.includes(value);
 }
 
+// ../core-cadence/src/schedule.ts
+function isVariedSchedule(rows) {
+  if (!rows || rows.length === 0) return false;
+  return rows.some(
+    (r, i) => r.discount !== 0 || r.amount !== rows[0].amount || i > 1 && (r.intervalUnit !== rows[1].intervalUnit || r.intervalCount !== rows[1].intervalCount)
+  );
+}
+function upcomingSchedulePayments(rows) {
+  if (!rows || !isVariedSchedule(rows)) return [];
+  return rows.filter((r) => r.status !== "paid" && r.dueAt != null);
+}
+
 // ../core-cadence/src/labels.ts
 var NAMED_NOUN = {
   weekly: "week",
@@ -3752,6 +3769,10 @@ function cadenceNoun(cadence) {
   }
   return cadence.interval;
 }
+function scheduleDeal(sub) {
+  if (!sub.paymentSchedule || sub.scheduleTotal == null || !isVariedSchedule(sub.paymentSchedule)) return null;
+  return { total: sub.scheduleTotal, payments: sub.paymentSchedule.length };
+}
 
 // src/react/components/account/SubscriptionsPanel.tsx
 import { Fragment as Fragment8, jsx as jsx42, jsxs as jsxs32 } from "react/jsx-runtime";
@@ -3778,7 +3799,20 @@ function SubscriptionsPanel(props) {
       await run(fn);
     })();
   };
-  const priceLabel = (sub) => `${formatMoney(sub.amount, sub.currency, locale)} / ${cadenceNoun(sub)}${sub.quantity > 1 ? ` \xD7 ${sub.quantity}` : ""}`;
+  const priceLabel = (sub) => {
+    const deal = scheduleDeal(sub);
+    return deal ? t.subscriptions.installmentTotal.replace("{amount}", formatMoney(deal.total, sub.currency, locale)) : `${formatMoney(sub.amount, sub.currency, locale)} / ${cadenceNoun(sub)}${sub.quantity > 1 ? ` \xD7 ${sub.quantity}` : ""}`;
+  };
+  const nextPaymentLabel = (sub) => {
+    if (!isVariedSchedule(sub.paymentSchedule) || !sub.paymentSchedule || sub.nextPaymentAmount == null) return null;
+    const upcoming = sub.paymentSchedule.find((r) => r.status !== "paid");
+    return t.subscriptions.installmentNext.replace("{amount}", formatMoney(sub.nextPaymentAmount, sub.currency, locale)).replace("{date}", formatDate(upcoming?.dueAt ?? sub.currentPeriodEnd, locale));
+  };
+  const upcomingList = (sub) => {
+    const upcoming = upcomingSchedulePayments(sub.paymentSchedule);
+    if (upcoming.length === 0) return null;
+    return /* @__PURE__ */ jsx42("ul", { className: "throttle-muted", "aria-label": t.subscriptions.upcomingPayments, children: upcoming.map((r) => /* @__PURE__ */ jsx42("li", { children: t.subscriptions.upcomingPayment.replace("{amount}", formatMoney(r.net, sub.currency, locale)).replace("{date}", formatDate(r.dueAt, locale)) }, r.dueAt)) });
+  };
   const renewsLabel = (sub) => formatDate(
     sub.status === "completed" ? sub.completedAt ?? sub.currentPeriodEnd : sub.status === "cancelled" ? sub.cancelledAt ?? sub.currentPeriodEnd : sub.currentPeriodEnd,
     locale
@@ -3860,7 +3894,9 @@ function SubscriptionsPanel(props) {
             columns: [
               { key: "plan", label: t.subscriptions.columnPlan, render: (sub) => /* @__PURE__ */ jsxs32(Fragment8, { children: [
                 sub.planName ?? sub.planReference,
-                sub.totalPayments != null ? /* @__PURE__ */ jsx42("div", { className: "throttle-muted", children: t.subscriptions.installmentProgress.replace("{paid}", String(Math.min(sub.paymentsMade ?? 0, sub.totalPayments))).replace("{total}", String(sub.totalPayments)) }) : null
+                sub.totalPayments != null ? /* @__PURE__ */ jsx42("div", { className: "throttle-muted", children: t.subscriptions.installmentProgress.replace("{paid}", String(Math.min(sub.paymentsMade ?? 0, sub.totalPayments))).replace("{total}", String(sub.totalPayments)) }) : null,
+                nextPaymentLabel(sub) ? /* @__PURE__ */ jsx42("div", { className: "throttle-muted", children: nextPaymentLabel(sub) }) : null,
+                upcomingList(sub)
               ] }) },
               { key: "price", label: t.subscriptions.columnPrice, render: (sub) => /* @__PURE__ */ jsx42("span", { className: "throttle-table__money", children: priceLabel(sub) }) },
               { key: "renews", label: t.subscriptions.columnRenews, render: (sub) => renewsLabel(sub) },
@@ -3878,12 +3914,9 @@ function SubscriptionsPanel(props) {
               /* @__PURE__ */ jsx42(StatusBadge, { status: sub.status, labels: t.subscriptions.statusLabels })
             ] }),
             sub.totalPayments != null ? /* @__PURE__ */ jsx42("div", { className: "throttle-muted", children: t.subscriptions.installmentProgress.replace("{paid}", String(Math.min(sub.paymentsMade ?? 0, sub.totalPayments))).replace("{total}", String(sub.totalPayments)) }) : null,
-            /* @__PURE__ */ jsxs32("p", { className: "throttle-muted", children: [
-              formatMoney(sub.amount, sub.currency, locale),
-              " / ",
-              cadenceNoun(sub),
-              sub.quantity > 1 ? ` \xD7 ${sub.quantity}` : ""
-            ] }),
+            nextPaymentLabel(sub) ? /* @__PURE__ */ jsx42("div", { className: "throttle-muted", children: nextPaymentLabel(sub) }) : null,
+            upcomingList(sub),
+            /* @__PURE__ */ jsx42("p", { className: "throttle-muted", children: priceLabel(sub) }),
             sub.status === "completed" ? /* @__PURE__ */ jsxs32("p", { className: "throttle-muted", children: [
               t.subscriptions.statusLabels.completed,
               " ",