@funnelsgrove/payments 0.7.22 → 0.9.0

package/dist/providers/stripe/hooks/index.d.ts

@@ -1,3 +1,2 @@
-export * from './useResolvedPaywallPlans.js';
 export * from './useStripeOneTimeCheckoutSession.js';
 export * from './useStripeSubscriptionCheckoutSession.js';

package/dist/providers/stripe/hooks/index.js

@@ -1,3 +1,2 @@
-export * from './useResolvedPaywallPlans.js';
 export * from './useStripeOneTimeCheckoutSession.js';
 export * from './useStripeSubscriptionCheckoutSession.js';

package/dist/providers/stripe/hooks/useStripeSubscriptionCheckoutSession.d.ts

@@ -14,6 +14,9 @@ export type StripeSubscriptionCheckoutSessionInput = {
     plan?: PaywallPlan | null;
     returnUrl: string;
     runtimeConfig?: StripeRuntimeConfigOverrides;
+    runtimeConfigRevisionId?: string | null;
+    paymentProfileId?: string | null;
+    provider?: 'stripe' | null;
     stripePublishableKey?: string | null;
     userId?: string | null;
 };
@@ -43,10 +46,10 @@ export type StripeSubscriptionCheckoutSession = {
     updateCheckoutSessionPlan: () => Promise<boolean>;
 };
 export declare const buildStripeSubscriptionCheckoutPreparationAnalyticsMetadata: (analyticsMetadata: Record<string, unknown> | null | undefined, options?: StripeSubscriptionCheckoutPreparationOptions) => Record<string, unknown> | null | undefined;
-export type StripeSubscriptionCheckoutIntentKeyInput = Pick<StripeSubscriptionCheckoutSessionInput, 'checkoutMode' | 'couponId' | 'customerEmail' | 'returnUrl' | 'runtimeConfig' | 'stripePublishableKey' | 'userId'> & {
+export type StripeSubscriptionCheckoutIntentKeyInput = Pick<StripeSubscriptionCheckoutSessionInput, 'checkoutMode' | 'couponId' | 'customerEmail' | 'paymentProfileId' | 'provider' | 'returnUrl' | 'runtimeConfig' | 'runtimeConfigRevisionId' | 'stripePublishableKey' | 'userId'> & {
     analyticsMetadata?: Record<string, unknown> | null;
 };
-export declare function buildStripeSubscriptionCheckoutIntentKey({ checkoutMode, couponId, customerEmail, returnUrl, runtimeConfig, stripePublishableKey, userId, }: StripeSubscriptionCheckoutIntentKeyInput): string;
+export declare function buildStripeSubscriptionCheckoutIntentKey({ checkoutMode, couponId, customerEmail, returnUrl, runtimeConfig, runtimeConfigRevisionId, paymentProfileId, provider, stripePublishableKey, userId, }: StripeSubscriptionCheckoutIntentKeyInput): string;
 export declare function shouldResetStripeSubscriptionCheckoutSessionForIntentKey(previousIntentKey: string | null, nextIntentKey: string): boolean;
 export declare function isInactiveCheckoutSessionError(message?: string | null): boolean;
-export declare function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMetadata, couponId, customerEmail, displayPlan, enabled, onError, plan, returnUrl, runtimeConfig, stripePublishableKey, userId, }: StripeSubscriptionCheckoutSessionInput): StripeSubscriptionCheckoutSession;
+export declare function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMetadata, couponId, customerEmail, displayPlan, enabled, onError, plan, returnUrl, runtimeConfig, runtimeConfigRevisionId, paymentProfileId, provider, stripePublishableKey, userId, }: StripeSubscriptionCheckoutSessionInput): StripeSubscriptionCheckoutSession;

package/dist/providers/stripe/hooks/useStripeSubscriptionCheckoutSession.js

@@ -35,12 +35,17 @@ export const buildStripeSubscriptionCheckoutPreparationAnalyticsMetadata = (anal
     const _b = analyticsMetadata !== null && analyticsMetadata !== void 0 ? analyticsMetadata : {}, { payment_method: _paymentMethod, paymentMethod: _camelCasePaymentMethod } = _b, metadata = __rest(_b, ["payment_method", "paymentMethod"]);
     return Object.assign(Object.assign(Object.assign({}, metadata), (checkoutStartSource ? { checkoutStartSource } : {})), (paymentMethod ? { payment_method: paymentMethod } : {}));
 };
-export function buildStripeSubscriptionCheckoutIntentKey({ checkoutMode, couponId, customerEmail, returnUrl, runtimeConfig, stripePublishableKey, userId, }) {
+export function buildStripeSubscriptionCheckoutIntentKey({ checkoutMode, couponId, customerEmail, returnUrl, runtimeConfig, runtimeConfigRevisionId, paymentProfileId, provider, stripePublishableKey, userId, }) {
+    var _a;
     const runtimeConfigSignature = [
         normalizeRuntimeConfigValue(runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.apiBaseUrl),
         normalizeRuntimeConfigValue(runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.funnelId),
         normalizeRuntimeConfigValue(runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.funnelVersionId),
         normalizeRuntimeConfigValue(runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.funnelSdkPublishableKey),
+        (_a = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.paymentsApiVersion) !== null && _a !== void 0 ? _a : 'v1',
+        normalizeRuntimeConfigValue(runtimeConfigRevisionId),
+        normalizeRuntimeConfigValue(paymentProfileId),
+        provider !== null && provider !== void 0 ? provider : '',
         normalizeRuntimeConfigValue(stripePublishableKey),
     ].join('|');
     const customerEmailSignature = normalizeRuntimeConfigValue(customerEmail);
@@ -62,7 +67,7 @@ export function isInactiveCheckoutSessionError(message) {
     var _a;
     return /\bcheckout session\b.*\bno longer active\b/i.test((_a = message === null || message === void 0 ? void 0 : message.trim()) !== null && _a !== void 0 ? _a : '');
 }
-export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMetadata, couponId, customerEmail, displayPlan, enabled = true, onError, plan, returnUrl, runtimeConfig, stripePublishableKey, userId, }) {
+export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMetadata, couponId, customerEmail, displayPlan, enabled = true, onError, plan, returnUrl, runtimeConfig, runtimeConfigRevisionId, paymentProfileId, provider, stripePublishableKey, userId, }) {
     var _a, _b, _c, _d, _e;
     const [clientSecret, setClientSecret] = useState(null);
     const [clientSecretIntentKey, setClientSecretIntentKey] = useState(null);
@@ -73,6 +78,7 @@ export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMe
     const [runtimeStripePublishableKey, setRuntimeStripePublishableKey] = useState(null);
     const creatingIntentRef = useRef(null);
     const requestIdRef = useRef(0);
+    const anonymousUserIdRef = useRef(null);
     const configured = enabled &&
         (isStripeConfigured(checkoutMode) ||
             Boolean(normalizeRuntimeConfigValue(runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.funnelSdkPublishableKey)) ||
@@ -83,6 +89,9 @@ export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMe
         customerEmail,
         returnUrl,
         runtimeConfig,
+        runtimeConfigRevisionId,
+        paymentProfileId,
+        provider,
         stripePublishableKey,
         userId,
     });
@@ -158,7 +167,7 @@ export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMe
         const requestId = requestIdRef.current + 1;
         requestIdRef.current = requestId;
         const subscriptionRequest = (async () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             try {
                 const response = await createStripeSubscriptionCheckout({
                     plan,
@@ -169,6 +178,10 @@ export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMe
                     user_id: userId,
                     environment: checkoutMode,
                     runtimeConfig,
+                    runtimeConfigRevisionId,
+                    paymentProfileId,
+                    provider,
+                    anonymousUserId: anonymousUserIdRef.current,
                 });
                 if (((_a = creatingIntentRef.current) === null || _a === void 0 ? void 0 : _a.key) !== requestKey ||
                     ((_b = creatingIntentRef.current) === null || _b === void 0 ? void 0 : _b.id) !== requestId) {
@@ -178,22 +191,24 @@ export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMe
                 if (publishableKey) {
                     setRuntimeStripePublishableKey(publishableKey);
                 }
+                anonymousUserIdRef.current = ((_d = response.anonymousUserId) === null || _d === void 0 ? void 0 : _d.trim())
+                    || anonymousUserIdRef.current;
                 setClientSecret(response.clientSecret);
                 setClientSecretIntentKey(requestKey);
-                setCheckoutSessionId(((_d = response.checkoutSessionId) === null || _d === void 0 ? void 0 : _d.trim()) || null);
+                setCheckoutSessionId(((_e = response.checkoutSessionId) === null || _e === void 0 ? void 0 : _e.trim()) || null);
                 setClientSecretPlanKey(requestPlanKey);
                 return response.clientSecret;
             }
             catch (subscriptionError) {
-                if (((_e = creatingIntentRef.current) === null || _e === void 0 ? void 0 : _e.key) === requestKey &&
-                    ((_f = creatingIntentRef.current) === null || _f === void 0 ? void 0 : _f.id) === requestId) {
+                if (((_f = creatingIntentRef.current) === null || _f === void 0 ? void 0 : _f.key) === requestKey &&
+                    ((_g = creatingIntentRef.current) === null || _g === void 0 ? void 0 : _g.id) === requestId) {
                     setError(getFriendlyStripeCheckoutError(subscriptionError));
                 }
                 return null;
             }
             finally {
-                if (((_g = creatingIntentRef.current) === null || _g === void 0 ? void 0 : _g.key) === requestKey &&
-                    ((_h = creatingIntentRef.current) === null || _h === void 0 ? void 0 : _h.id) === requestId) {
+                if (((_h = creatingIntentRef.current) === null || _h === void 0 ? void 0 : _h.key) === requestKey &&
+                    ((_j = creatingIntentRef.current) === null || _j === void 0 ? void 0 : _j.id) === requestId) {
                     creatingIntentRef.current = null;
                 }
             }
@@ -217,6 +232,9 @@ export function useStripeSubscriptionCheckoutSession({ checkoutMode, analyticsMe
         planKey,
         returnUrl,
         runtimeConfig,
+        runtimeConfigRevisionId,
+        paymentProfileId,
+        provider,
         setError,
         userId,
     ]);

package/dist/providers/stripe/services/stripe.service.d.ts

@@ -2,7 +2,6 @@ import { type Stripe } from '@stripe/stripe-js';
 import { type BillingFallbackPlanConfig, type BillingPlanCatalog, type BillingPlanInterval, type BillingPlanInputCatalog } from '../../../config/billing.config.js';
 import { type FunnelSdkRuntimeConfigOverrides, type ResolvedCountryPricing } from '@funnelsgrove/runtime';
 import type { RuntimeMode } from '@funnelsgrove/runtime';
-import { type RemoteProjectBillingPlan } from '../../../services/planCatalog.service.js';
 export type PaywallPlan = {
     id: string;
     funnelPlanKey?: string;
@@ -36,7 +35,6 @@ export type PaywallPlanResolutionOptions = {
     locale?: string | null;
     pricing?: ResolvedCountryPricing<string> | null;
 };
-export declare const buildPaywallPlanResolutionSignature: (options?: PaywallPlanResolutionOptions) => string;
 export declare function buildConfigPaywallPlans(planCatalog?: BillingPlanCatalog | readonly BillingFallbackPlanConfig[], orderedPlanIds?: readonly string[]): readonly PaywallPlan[];
 export declare function getFallbackPlans(planCatalog?: BillingPlanInputCatalog | readonly BillingFallbackPlanConfig[], options?: PaywallPlanResolutionOptions): readonly PaywallPlan[];
 export declare function getOrderedPaywallPlans(plans: readonly PaywallPlan[], orderedPlanIds: readonly string[]): readonly PaywallPlan[];
@@ -44,12 +42,9 @@ export declare function getDefaultPlanId(plans: readonly PaywallPlan[], pricing?
 export declare function getPaywallPlanSelectionValue(plan: Pick<PaywallPlan, 'id' | 'providerPlanId'>): string;
 export declare function findPaywallPlan(plans: readonly PaywallPlan[], selectionValue: string | null | undefined): PaywallPlan | null;
 export declare function getDefaultPlanSelectionValue(plans: readonly PaywallPlan[], pricing?: ResolvedCountryPricing<string> | null): string | null;
-export declare function getStripeSyncedPlans(mode: RuntimeMode, planCatalog?: BillingPlanInputCatalog | readonly BillingFallbackPlanConfig[], options?: PaywallPlanResolutionOptions): Promise<readonly PaywallPlan[]>;
-export declare function resolvePaywallPlansFromProjectPlans(projectPlans: readonly RemoteProjectBillingPlan[], planCatalog?: BillingPlanInputCatalog | readonly BillingFallbackPlanConfig[], options?: PaywallPlanResolutionOptions): readonly PaywallPlan[];
-export declare function getPaywallPlans(mode: RuntimeMode, planCatalog?: BillingPlanInputCatalog | readonly BillingFallbackPlanConfig[], options?: PaywallPlanResolutionOptions): Promise<readonly PaywallPlan[]>;
 export declare function isStripeConfigured(mode: RuntimeMode): boolean;
 export declare function getStripePromise(_mode: RuntimeMode, runtimePublishableKey?: string | null): Promise<Stripe | null> | null;
-type CheckoutSessionPlanInput = Pick<PaywallPlan, 'amountCents' | 'analyticsPurchaseValue' | 'billingInterval' | 'billingIntervalCount' | 'description' | 'id' | 'providerPlanId' | 'title' | 'followUpProviderPlanId' | 'followUpPlanTitle' | 'followUpBillingInterval' | 'followUpBillingIntervalCount' | 'introIterations' | 'offerSetId' | 'offerSetKey'>;
+type CheckoutSessionPlanInput = Pick<PaywallPlan, 'amountCents' | 'analyticsPurchaseValue' | 'billingInterval' | 'billingIntervalCount' | 'description' | 'funnelPlanKey' | 'id' | 'providerPlanId' | 'title' | 'followUpProviderPlanId' | 'followUpPlanTitle' | 'followUpBillingInterval' | 'followUpBillingIntervalCount' | 'introIterations' | 'offerSetId' | 'offerSetKey'>;
 type CheckoutPlanRecurringConfig = {
     interval: BillingPlanInterval;
     intervalCount: number;
@@ -134,6 +129,10 @@ export declare const requiresStripeOneClickConfirmation: (status: string) => boo
 export declare function completeStripeOneClickPayment(input: CompleteStripeOneClickPaymentInput): Promise<CompleteStripeOneClickPaymentResponse>;
 type CreateSubscriptionCheckoutInput = {
     plan: CheckoutSessionPlanInput;
+    runtimeConfigRevisionId?: string | null;
+    paymentProfileId?: string | null;
+    provider?: 'stripe' | null;
+    anonymousUserId?: string | null;
     couponId?: string | null;
     analyticsMetadata?: Record<string, unknown> | null;
     customerEmail?: string | null;

package/dist/providers/stripe/services/stripe.service.js

@@ -1,18 +1,8 @@
 import { loadStripe } from '@stripe/stripe-js';
 import { billingPlanList, } from '../../../config/billing.config.js';
-import { FUNNEL_ID, FUNNEL_SDK_PUBLISHABLE_KEY, funnelSdkService, } from '@funnelsgrove/runtime';
-import { isBillingPlanMappingCatalog, resolveMappedProjectPlans, } from '../../../services/planCatalog.service.js';
+import { FUNNEL_SDK_PUBLISHABLE_KEY, funnelSdkService, } from '@funnelsgrove/runtime';
+import { isBillingPlanMappingCatalog } from '../../../services/planCatalog.service.js';
 const stripePromiseByKey = new Map();
-const syncedPlansPromiseByMode = new Map();
-export const buildPaywallPlanResolutionSignature = (options) => {
-    var _a, _b, _c, _d;
-    const locale = ((_a = options === null || options === void 0 ? void 0 : options.locale) === null || _a === void 0 ? void 0 : _a.trim()) || '';
-    const pricing = options === null || options === void 0 ? void 0 : options.pricing;
-    const countryCode = ((_b = pricing === null || pricing === void 0 ? void 0 : pricing.countryCode) === null || _b === void 0 ? void 0 : _b.trim()) || '';
-    const defaultOfferKey = ((_c = pricing === null || pricing === void 0 ? void 0 : pricing.defaultOfferKey) === null || _c === void 0 ? void 0 : _c.trim()) || '';
-    const offerOrder = ((_d = pricing === null || pricing === void 0 ? void 0 : pricing.offerOrder) === null || _d === void 0 ? void 0 : _d.map((offerKey) => offerKey.trim()).join('|')) || '';
-    return [locale, countryCode, defaultOfferKey, offerOrder].join('::');
-};
 const isRecord = (value) => {
     return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 };
@@ -97,74 +87,6 @@ const toConfigPaywallPlan = (key, plan) => {
     return Object.assign(Object.assign({}, plan), { id: ((_a = plan.id) === null || _a === void 0 ? void 0 : _a.trim()) || key.trim() || ((_b = plan.providerPlanId) === null || _b === void 0 ? void 0 : _b.trim()) || plan.projectPlanId.trim(), perDayLabel: ((_c = plan.perDayLabel) === null || _c === void 0 ? void 0 : _c.trim()) || 'per day', billingInterval: interval.interval, billingIntervalCount: interval.intervalCount, source: 'config' });
 };
 const fallbackPaywallPlans = buildConfigPaywallPlans(billingPlanList);
-const toMinorAmount = (value) => {
-    const numeric = asFiniteNumberOrNull(value);
-    if (numeric === null || numeric <= 0) {
-        return null;
-    }
-    return Math.round(numeric);
-};
-const toPlainObject = (value) => {
-    return isRecord(value) ? value : {};
-};
-const toCurrencyCode = (value) => {
-    const raw = asTrimmedStringOrNull(value);
-    if (!raw) {
-        return 'USD';
-    }
-    return raw.toUpperCase();
-};
-const resolveFormattingLocale = (locale) => {
-    const trimmedLocale = typeof locale === 'string' ? locale.trim() : '';
-    return trimmedLocale || 'en-US';
-};
-const formatMoneyFromMinor = (amountMinor, currencyCode, locale) => {
-    return new Intl.NumberFormat(resolveFormattingLocale(locale), {
-        style: 'currency',
-        currency: currencyCode,
-        minimumFractionDigits: 2,
-        maximumFractionDigits: 2,
-    }).format(amountMinor / 100);
-};
-const formatMoneyFromMajor = (amountMajor, currencyCode, locale) => {
-    return new Intl.NumberFormat(resolveFormattingLocale(locale), {
-        style: 'currency',
-        currency: currencyCode,
-        minimumFractionDigits: 2,
-        maximumFractionDigits: 2,
-    }).format(amountMajor);
-};
-const getIntervalLabel = (interval, intervalCount) => {
-    if (!interval) {
-        return '';
-    }
-    const normalized = interval.toLowerCase();
-    const count = intervalCount && intervalCount > 0 ? intervalCount : 1;
-    if (count === 1) {
-        return normalized;
-    }
-    return `${count} ${normalized}s`;
-};
-const getIntervalDays = (interval, intervalCount) => {
-    if (!interval) {
-        return null;
-    }
-    const normalized = interval.toLowerCase();
-    const count = intervalCount && intervalCount > 0 ? intervalCount : 1;
-    if (normalized === 'day') {
-        return count;
-    }
-    if (normalized === 'week') {
-        return count * 7;
-    }
-    if (normalized === 'month') {
-        return count * 30;
-    }
-    if (normalized === 'year') {
-        return count * 365;
-    }
-    return null;
-};
 const reorderPlans = (plans, pricing) => {
     if (!pricing || pricing.offerOrder.length === 0) {
         return plans;
@@ -185,108 +107,6 @@ const reorderPlans = (plans, pricing) => {
         return leftIndex - rightIndex;
     });
 };
-const toRemoteProjectBillingPlan = (rawPlan) => {
-    var _a, _b;
-    const providerPlanId = asTrimmedStringOrNull(rawPlan.providerPlanId);
-    if (!providerPlanId) {
-        return null;
-    }
-    return {
-        id: asTrimmedStringOrNull(rawPlan.id) || providerPlanId,
-        key: asTrimmedStringOrNull(rawPlan.key) || providerPlanId,
-        offerSetId: asTrimmedStringOrNull(rawPlan.offerSetId) || undefined,
-        offerSetKey: asTrimmedStringOrNull(rawPlan.offerSetKey) || undefined,
-        projectPlanId: asTrimmedStringOrNull(rawPlan.projectPlanId),
-        providerPlanId,
-        displayName: asTrimmedStringOrNull(rawPlan.displayName),
-        description: asTrimmedStringOrNull(rawPlan.description),
-        interval: (_b = (_a = asTrimmedStringOrNull(rawPlan.interval)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : null,
-        intervalCount: asPositiveIntOrNull(rawPlan.intervalCount),
-        trialPeriodDays: asPositiveIntOrNull(rawPlan.trialPeriodDays),
-        currency: asTrimmedStringOrNull(rawPlan.currency),
-        amountMinor: toMinorAmount(rawPlan.amountMinor),
-        amountDecimal: asTrimmedStringOrNull(rawPlan.amountDecimal),
-        metadata: toPlainObject(rawPlan.metadata),
-        isActive: rawPlan.isActive !== false,
-    };
-};
-const toPlanFromRemoteProjectPlan = (rawPlan, options, planIdOverride) => {
-    var _a;
-    const planId = (planIdOverride === null || planIdOverride === void 0 ? void 0 : planIdOverride.trim()) || rawPlan.id || rawPlan.key || rawPlan.providerPlanId;
-    if (!planId) {
-        return null;
-    }
-    if (!rawPlan.isActive) {
-        return null;
-    }
-    const amountMinor = rawPlan.amountMinor;
-    if (!amountMinor) {
-        return null;
-    }
-    const metadata = rawPlan.metadata;
-    const currencyCode = toCurrencyCode(rawPlan.currency);
-    const interval = rawPlan.interval;
-    const intervalCount = rawPlan.intervalCount;
-    const intervalLabel = getIntervalLabel(interval, intervalCount);
-    const intervalDays = getIntervalDays(interval, intervalCount);
-    const locale = options === null || options === void 0 ? void 0 : options.locale;
-    const title = rawPlan.displayName || planId;
-    const priceLabel = intervalLabel
-        ? `${formatMoneyFromMinor(amountMinor, currencyCode, locale)}/${intervalLabel}`
-        : formatMoneyFromMinor(amountMinor, currencyCode, locale);
-    const perDayAmount = intervalDays
-        ? formatMoneyFromMajor(amountMinor / 100 / intervalDays, currencyCode, locale)
-        : formatMoneyFromMinor(amountMinor, currencyCode, locale);
-    return {
-        id: planId,
-        offerSetId: rawPlan.offerSetId,
-        offerSetKey: rawPlan.offerSetKey,
-        title,
-        description: rawPlan.description || asTrimmedStringOrNull(metadata.description) || undefined,
-        providerPlanId: rawPlan.providerPlanId,
-        priceLabel,
-        oldPriceLabel: asTrimmedStringOrNull(metadata.oldPriceLabel) || undefined,
-        featuredTag: asTrimmedStringOrNull(metadata.featuredTag) || undefined,
-        perDayAmount,
-        perDayLabel: 'per day',
-        amountCents: amountMinor,
-        analyticsPurchaseValue: (_a = asNonNegativeNumberOrNull(metadata.analyticsPurchaseValue)) !== null && _a !== void 0 ? _a : undefined,
-        comparison: intervalDays
-            ? {
-                perDay: `${perDayAmount}/day`,
-                perWeek: `${formatMoneyFromMajor(amountMinor / 100 / intervalDays * 7, currencyCode, locale)}/week`,
-                perMonth: interval === 'month' || interval === 'year'
-                    ? `${formatMoneyFromMajor(interval === 'year'
-                        ? amountMinor / 100 / ((intervalCount || 1) * 12)
-                        : amountMinor / 100 / (intervalCount || 1), currencyCode, locale)}/month`
-                    : `${formatMoneyFromMajor(amountMinor / 100 / intervalDays * 30, currencyCode, locale)}/month`,
-                perYear: interval === 'year'
-                    ? `${formatMoneyFromMinor(amountMinor / (intervalCount || 1), currencyCode, locale)}/year`
-                    : `${formatMoneyFromMajor(amountMinor / 100 / intervalDays * 365, currencyCode, locale)}/year`,
-            }
-            : undefined,
-        checkoutOriginalAmountCents: asPositiveIntOrNull(metadata.checkoutOriginalAmountCents) || undefined,
-        checkoutSummaryLabel: asTrimmedStringOrNull(metadata.checkoutSummaryLabel) || undefined,
-        billingInterval: asBillingPlanIntervalOrNull(interval) || undefined,
-        billingIntervalCount: intervalCount || undefined,
-        followUpProviderPlanId: asTrimmedStringOrNull(metadata.followUpProviderPlanId) || undefined,
-        followUpPlanTitle: asTrimmedStringOrNull(metadata.followUpPlanTitle) || undefined,
-        followUpBillingInterval: asBillingPlanIntervalOrNull(metadata.followUpBillingInterval) || undefined,
-        followUpBillingIntervalCount: asPositiveIntOrNull(metadata.followUpBillingIntervalCount) || undefined,
-        introIterations: asPositiveIntOrNull(metadata.introIterations) || undefined,
-        source: 'stripe',
-    };
-};
-const addFeaturedTagFallback = (plans) => {
-    if (plans.length === 0) {
-        return plans;
-    }
-    if (plans.some((plan) => Boolean(plan.featuredTag))) {
-        return plans;
-    }
-    return plans.map((plan, index) => index === 0
-        ? Object.assign(Object.assign({}, plan), { featuredTag: '🔥 Most Popular Choice' }) : plan);
-};
 export function buildConfigPaywallPlans(planCatalog, orderedPlanIds = []) {
     const plans = Array.isArray(planCatalog)
         ? planCatalog.map((plan, index) => toConfigPaywallPlan(String(index), plan))
@@ -334,12 +154,6 @@ export function getOrderedPaywallPlans(plans, orderedPlanIds) {
     }
     return selectedPlans;
 }
-const shouldLoadStripePlans = (planCatalog) => {
-    if (!planCatalog) {
-        return true;
-    }
-    return !Array.isArray(planCatalog) && isBillingPlanMappingCatalog(planCatalog);
-};
 export function getDefaultPlanId(plans, pricing) {
     var _a, _b;
     if (plans.length === 0) {
@@ -376,74 +190,6 @@ export function getDefaultPlanSelectionValue(plans, pricing) {
     }
     return getPaywallPlanSelectionValue(plans.find((plan) => plan.id === defaultPlanId) || plans[0]);
 }
-const getStripeSyncedPlanRecords = async (mode, offerSet) => {
-    const cacheKey = `${mode}:${FUNNEL_ID || 'no-funnel'}:${FUNNEL_SDK_PUBLISHABLE_KEY}:${offerSet.offerSetId || ''}:${offerSet.offerSetKey || ''}`;
-    const cachedPromise = syncedPlansPromiseByMode.get(cacheKey);
-    if (cachedPromise) {
-        return cachedPromise;
-    }
-    const nextPromise = (async () => {
-        const payload = await funnelSdkService.listPaymentPlans({
-            environment: mode,
-            offerSetId: offerSet.offerSetId,
-            offerSetKey: offerSet.offerSetKey,
-        });
-        const rawPlans = Array.isArray(payload.plans) ? payload.plans : [];
-        return rawPlans
-            .filter((rawPlan) => isRecord(rawPlan))
-            .map((rawPlan) => toRemoteProjectBillingPlan(rawPlan))
-            .filter((rawPlan) => Boolean(rawPlan));
-    })();
-    syncedPlansPromiseByMode.set(cacheKey, nextPromise);
-    return nextPromise;
-};
-const resolvePlanCatalogOfferSet = (planCatalog) => {
-    const configuredPlans = planCatalog
-        ? (Array.isArray(planCatalog) ? planCatalog : Object.values(planCatalog))
-        : [];
-    const offerSetIds = [...new Set(configuredPlans
-            .map((plan) => { var _a; return (_a = plan.offerSetId) === null || _a === void 0 ? void 0 : _a.trim(); })
-            .filter((value) => Boolean(value)))];
-    const offerSetKeys = [...new Set(configuredPlans
-            .map((plan) => { var _a; return (_a = plan.offerSetKey) === null || _a === void 0 ? void 0 : _a.trim(); })
-            .filter((value) => Boolean(value)))];
-    return {
-        offerSetId: offerSetIds.length === 1 ? offerSetIds[0] : undefined,
-        offerSetKey: offerSetKeys.length === 1 ? offerSetKeys[0] : undefined,
-    };
-};
-export async function getStripeSyncedPlans(mode, planCatalog, options) {
-    const rawPlans = await getStripeSyncedPlanRecords(mode, resolvePlanCatalogOfferSet(planCatalog));
-    const mappedPlans = (planCatalog && !Array.isArray(planCatalog) && isBillingPlanMappingCatalog(planCatalog)
-        ? resolveMappedProjectPlans(planCatalog, rawPlans).map((rawPlan) => toPlanFromRemoteProjectPlan(rawPlan, options, rawPlan.funnelKey))
-        : rawPlans.map((rawPlan) => toPlanFromRemoteProjectPlan(rawPlan, options)))
-        .filter((plan) => Boolean(plan))
-        .sort((left, right) => left.amountCents - right.amountCents);
-    return reorderPlans(addFeaturedTagFallback(mappedPlans), options === null || options === void 0 ? void 0 : options.pricing);
-}
-export function resolvePaywallPlansFromProjectPlans(projectPlans, planCatalog, options) {
-    const mappedPlans = (planCatalog && !Array.isArray(planCatalog) && isBillingPlanMappingCatalog(planCatalog)
-        ? resolveMappedProjectPlans(planCatalog, projectPlans).map((rawPlan) => toPlanFromRemoteProjectPlan(rawPlan, options, rawPlan.funnelKey))
-        : projectPlans.map((rawPlan) => toPlanFromRemoteProjectPlan(rawPlan, options)))
-        .filter((plan) => Boolean(plan))
-        .sort((left, right) => left.amountCents - right.amountCents);
-    return reorderPlans(addFeaturedTagFallback(mappedPlans), options === null || options === void 0 ? void 0 : options.pricing);
-}
-export async function getPaywallPlans(mode, planCatalog, options) {
-    if (!shouldLoadStripePlans(planCatalog)) {
-        return getFallbackPlans(planCatalog, options);
-    }
-    try {
-        const syncedPlans = resolvePaywallPlansFromProjectPlans(await getStripeSyncedPlanRecords(mode, resolvePlanCatalogOfferSet(planCatalog)), planCatalog, options);
-        if (syncedPlans.length > 0) {
-            return syncedPlans;
-        }
-    }
-    catch (_a) {
-        // fall through to config fallback plans
-    }
-    return getFallbackPlans(planCatalog, options);
-}
 export function isStripeConfigured(mode) {
     void mode;
     return FUNNEL_SDK_PUBLISHABLE_KEY.length > 0;
@@ -636,7 +382,7 @@ export async function completeStripeOneClickPayment(input) {
     return Object.assign(Object.assign({}, payment), { status: (_f = (_e = confirmation.paymentIntent) === null || _e === void 0 ? void 0 : _e.status) !== null && _f !== void 0 ? _f : payment.status, confirmationAttempted: true });
 }
 export async function createStripeSubscriptionCheckout(input) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const recurring = resolveCheckoutPlanRecurringConfig(input.plan);
     if (!recurring) {
         throw new Error('Unable to resolve the recurring interval for the selected plan');
@@ -645,22 +391,27 @@ export async function createStripeSubscriptionCheckout(input) {
         offerSetId: ((_a = input.plan.offerSetId) === null || _a === void 0 ? void 0 : _a.trim()) || undefined,
         offerSetKey: ((_b = input.plan.offerSetKey) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
         planId: getPaywallPlanRequestId(input.plan),
-        providerPlanId: ((_c = input.plan.providerPlanId) === null || _c === void 0 ? void 0 : _c.trim()) || undefined,
+        planKey: ((_c = input.plan.funnelPlanKey) === null || _c === void 0 ? void 0 : _c.trim()) || input.plan.id,
+        providerPlanId: ((_d = input.plan.providerPlanId) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
+        provider: input.provider,
+        paymentProfileId: ((_e = input.paymentProfileId) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
+        runtimeConfigRevisionId: ((_f = input.runtimeConfigRevisionId) === null || _f === void 0 ? void 0 : _f.trim()) || undefined,
+        anonymousUserId: ((_g = input.anonymousUserId) === null || _g === void 0 ? void 0 : _g.trim()) || undefined,
         title: input.plan.title,
-        description: ((_d = input.plan.description) === null || _d === void 0 ? void 0 : _d.trim()) || undefined,
+        description: ((_h = input.plan.description) === null || _h === void 0 ? void 0 : _h.trim()) || undefined,
         amountCents: input.plan.amountCents,
         billingInterval: recurring.interval,
         billingIntervalCount: recurring.intervalCount,
-        followUpProviderPlanId: ((_e = input.plan.followUpProviderPlanId) === null || _e === void 0 ? void 0 : _e.trim()) || undefined,
-        followUpPlanTitle: ((_f = input.plan.followUpPlanTitle) === null || _f === void 0 ? void 0 : _f.trim()) || undefined,
+        followUpProviderPlanId: ((_j = input.plan.followUpProviderPlanId) === null || _j === void 0 ? void 0 : _j.trim()) || undefined,
+        followUpPlanTitle: ((_k = input.plan.followUpPlanTitle) === null || _k === void 0 ? void 0 : _k.trim()) || undefined,
         followUpBillingInterval: input.plan.followUpBillingInterval,
         followUpBillingIntervalCount: input.plan.followUpBillingIntervalCount,
         introIterations: input.plan.introIterations,
-        couponId: ((_g = input.couponId) === null || _g === void 0 ? void 0 : _g.trim()) || undefined,
+        couponId: ((_l = input.couponId) === null || _l === void 0 ? void 0 : _l.trim()) || undefined,
         analyticsMetadata: normalizeCheckoutAnalyticsMetadata(input.analyticsMetadata, input.plan),
-        customerEmail: ((_h = input.customerEmail) === null || _h === void 0 ? void 0 : _h.trim()) || undefined,
+        customerEmail: ((_m = input.customerEmail) === null || _m === void 0 ? void 0 : _m.trim()) || undefined,
         returnUrl: input.returnUrl,
-        userId: ((_j = input.user_id) === null || _j === void 0 ? void 0 : _j.trim()) || undefined,
+        userId: ((_o = input.user_id) === null || _o === void 0 ? void 0 : _o.trim()) || undefined,
         environment: input.environment,
         runtimeConfig: input.runtimeConfig,
     });

package/dist/services/planCatalog.service.d.ts

@@ -1,25 +1,4 @@
 import type { BillingFallbackPlanConfig, BillingPlanCatalog, BillingPlanMappingCatalog } from '../config/billing.config.js';
-export type RemoteProjectBillingPlan = {
-    id: string;
-    key: string;
-    offerSetId?: string;
-    offerSetKey?: string;
-    projectPlanId: string | null;
-    providerPlanId: string;
-    displayName: string | null;
-    description: string | null;
-    interval: string | null;
-    intervalCount: number | null;
-    trialPeriodDays: number | null;
-    currency: string | null;
-    amountMinor: number | null;
-    amountDecimal: string | null;
-    metadata: Record<string, unknown>;
-    isActive: boolean;
-};
-export type ResolvedMappedProjectBillingPlan = RemoteProjectBillingPlan & {
-    funnelKey: string;
-};
 export type BillingPlanListItem = BillingFallbackPlanConfig & {
     key: string;
 };
@@ -27,4 +6,3 @@ export declare const isBillingPlanMappingCatalog: (value: unknown) => value is B
 export declare const buildBillingPlanMappingCatalog: (planCatalog: BillingPlanCatalog) => BillingPlanMappingCatalog;
 export declare const buildBillingPlanList: (planCatalog: BillingPlanCatalog) => BillingPlanListItem[];
 export declare const getFallbackBillingPlans: (planCatalog?: BillingPlanCatalog | readonly BillingFallbackPlanConfig[]) => BillingFallbackPlanConfig[];
-export declare const resolveMappedProjectPlans: (mappingCatalog: BillingPlanMappingCatalog, projectPlans: readonly RemoteProjectBillingPlan[]) => ResolvedMappedProjectBillingPlan[];

package/dist/services/planCatalog.service.js

@@ -46,18 +46,3 @@ export const getFallbackBillingPlans = (planCatalog) => {
     }
     return Object.values(planCatalog);
 };
-export const resolveMappedProjectPlans = (mappingCatalog, projectPlans) => {
-    const projectPlanById = new Map(projectPlans.flatMap((plan) => {
-        const keys = [plan.projectPlanId, plan.id].filter((key) => typeof key === 'string' && key.length > 0);
-        return keys.map((key) => [key, plan]);
-    }));
-    return Object.entries(mappingCatalog).flatMap(([funnelKey, mapping]) => {
-        const projectPlan = projectPlanById.get(mapping.projectPlanId) || null;
-        if (!projectPlan) {
-            return [];
-        }
-        return [
-            Object.assign(Object.assign({}, projectPlan), { funnelKey }),
-        ];
-    });
-};

package/dist/services/publishedBillingRuntime.service.d.ts

@@ -4,6 +4,7 @@ import { type PaywallPlan } from '../providers/stripe/services/stripe.service.js
 export type PublishedBillingPlan = BillingFallbackPlanConfig & OfferSetRuntimePlanOverrides;
 export type ResolvedPublishedBillingRuntime = {
     revisionId: string | null;
+    paymentsApiVersion: 'v1' | 'v2';
     mode: RuntimeMode;
     offerSetId: string;
     paymentProfileId: string | null;

package/dist/services/publishedBillingRuntime.service.js

@@ -2,7 +2,7 @@ import { resolveGeneratedOfferSetRuntime, resolvePublishedOfferSetSelection, res
 import { buildBillingDiscountCatalog } from './paywallOffer.service.js';
 import { buildConfigPaywallPlans, } from '../providers/stripe/services/stripe.service.js';
 export const resolvePublishedBillingRuntime = ({ config, featureFlags, mode, search = '', defaultOfferSetId, baseCatalogsByMode, fallbackDiscounts, resolvedExperiments = resolvePublishedRuntimeExperiments(config), }) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const offerSets = (_a = config === null || config === void 0 ? void 0 : config.offerSets) !== null && _a !== void 0 ? _a : [];
     const selection = resolvePublishedOfferSetSelection({
         offerSets,
@@ -26,12 +26,13 @@ export const resolvePublishedBillingRuntime = ({ config, featureFlags, mode, sea
     const paymentProviderConfig = (_c = (_b = runtime.offerSet) === null || _b === void 0 ? void 0 : _b.paymentProviderConfigByMode) === null || _c === void 0 ? void 0 : _c[mode];
     return {
         revisionId: (_d = config === null || config === void 0 ? void 0 : config.revisionId) !== null && _d !== void 0 ? _d : null,
+        paymentsApiVersion: (_e = config === null || config === void 0 ? void 0 : config.paymentsApiVersion) !== null && _e !== void 0 ? _e : 'v1',
         mode,
         offerSetId: selection.offerSetId,
-        paymentProfileId: ((_f = (_e = runtime.offerSet) === null || _e === void 0 ? void 0 : _e.paymentProfileId) === null || _f === void 0 ? void 0 : _f.trim()) || null,
+        paymentProfileId: ((_g = (_f = runtime.offerSet) === null || _f === void 0 ? void 0 : _f.paymentProfileId) === null || _g === void 0 ? void 0 : _g.trim()) || null,
         provider,
         stripePublishableKey: provider === 'stripe' && (paymentProviderConfig === null || paymentProviderConfig === void 0 ? void 0 : paymentProviderConfig.provider) === 'stripe'
-            ? ((_g = paymentProviderConfig === null || paymentProviderConfig === void 0 ? void 0 : paymentProviderConfig.stripePublishableKey) === null || _g === void 0 ? void 0 : _g.trim()) || null
+            ? ((_h = paymentProviderConfig === null || paymentProviderConfig === void 0 ? void 0 : paymentProviderConfig.stripePublishableKey) === null || _h === void 0 ? void 0 : _h.trim()) || null
             : null,
         experimentId: selection.experimentId,
         variantKey: selection.variantKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/payments",
-  "version": "0.7.22",
+  "version": "0.9.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/The-Solid-Grove/funnelsgrove.git",
@@ -32,8 +32,8 @@
     "test:run": "vitest run --passWithNoTests"
   },
   "dependencies": {
-    "@funnelsgrove/analytics": "^0.1.79",
-    "@funnelsgrove/runtime": "^0.7.30",
+    "@funnelsgrove/analytics": "^0.1.82",
+    "@funnelsgrove/runtime": "^0.9.0",
     "@solidgate/react-sdk": "1.34.0",
     "@stripe/react-stripe-js": "^5.6.0",
     "@stripe/stripe-js": "^8.7.0",

package/dist/providers/stripe/hooks/useResolvedPaywallPlans.d.ts

@@ -1,15 +0,0 @@
-import { type RuntimeMode } from '@funnelsgrove/runtime';
-import type { BillingFallbackPlanConfig, BillingPlanInputCatalog } from '../../../config/billing.config.js';
-import { type PaywallPlan, type PaywallPlanResolutionOptions } from '../services/stripe.service.js';
-type UseResolvedPaywallPlansInput = {
-    runtimeMode: RuntimeMode;
-    planCatalog?: BillingPlanInputCatalog | readonly BillingFallbackPlanConfig[];
-    resolutionOptions?: PaywallPlanResolutionOptions;
-    previewPlans?: readonly PaywallPlan[] | null;
-};
-export declare const useResolvedPaywallPlans: ({ runtimeMode, planCatalog, resolutionOptions, previewPlans, }: UseResolvedPaywallPlansInput) => {
-    plans: readonly PaywallPlan[];
-    loading: boolean;
-    error: string | null;
-};
-export {};

package/dist/providers/stripe/hooks/useResolvedPaywallPlans.js

@@ -1,68 +0,0 @@
-'use client';
-import { useEffect, useMemo, useState } from 'react';
-import { isPreviewFrameRuntime } from '@funnelsgrove/runtime';
-import { getFallbackPlans, getPaywallPlans, } from '../services/stripe.service.js';
-import { isBillingPlanMappingCatalog } from '../../../services/planCatalog.service.js';
-export const useResolvedPaywallPlans = ({ runtimeMode, planCatalog, resolutionOptions, previewPlans, }) => {
-    const fallbackPlans = useMemo(() => getFallbackPlans(planCatalog, resolutionOptions), [planCatalog, resolutionOptions]);
-    const isMappingCatalog = Boolean(planCatalog) && !Array.isArray(planCatalog) && isBillingPlanMappingCatalog(planCatalog);
-    const shouldLoadRemotePlans = !planCatalog || isMappingCatalog;
-    const [plans, setPlans] = useState(() => (previewPlans === null || previewPlans === void 0 ? void 0 : previewPlans.length) ? previewPlans : fallbackPlans);
-    const [loading, setLoading] = useState(shouldLoadRemotePlans);
-    const [error, setError] = useState(null);
-    useEffect(() => {
-        if (previewPlans === null || previewPlans === void 0 ? void 0 : previewPlans.length) {
-            setPlans(previewPlans);
-            setLoading(false);
-            setError(null);
-            return;
-        }
-        if (!shouldLoadRemotePlans || (isPreviewFrameRuntime() && !isMappingCatalog)) {
-            setPlans(fallbackPlans);
-            setLoading(false);
-            setError(null);
-            return;
-        }
-        let isActive = true;
-        const load = async () => {
-            setLoading(true);
-            setError(null);
-            try {
-                const nextPlans = await getPaywallPlans(runtimeMode, planCatalog, resolutionOptions);
-                if (!isActive) {
-                    return;
-                }
-                setPlans(nextPlans);
-            }
-            catch (nextError) {
-                if (!isActive) {
-                    return;
-                }
-                setPlans(fallbackPlans);
-                setError(nextError instanceof Error ? nextError.message : 'Unable to load plans');
-            }
-            finally {
-                if (isActive) {
-                    setLoading(false);
-                }
-            }
-        };
-        void load();
-        return () => {
-            isActive = false;
-        };
-    }, [
-        fallbackPlans,
-        isMappingCatalog,
-        planCatalog,
-        previewPlans,
-        resolutionOptions,
-        runtimeMode,
-        shouldLoadRemotePlans,
-    ]);
-    return {
-        plans,
-        loading,
-        error,
-    };
-};