@funnelsgrove/payments 0.1.58 → 0.2.0

package/README.md

@@ -87,8 +87,9 @@ When a live funnel still uses one of these, migrate the funnel deliberately with
 - Keep provider-specific implementation under `src/providers/<provider>`.
 - Stripe owns real card fields and wallet controls. Local wallet buttons are placeholders until Stripe confirms availability.
 - Wallet unavailable state must fall back to card/manual checkout or disappear.
-- Do not count checkout intent until the visitor taps or confirms a visible checkout CTA.
-- Wallet slots may create render-only Checkout Sessions on mount so Apple Pay and Google Pay render before the visitor taps. These sessions must use `checkoutStartSource: 'wallet_render'`; trusted server `checkout_started` analytics ignores that source.
+- Count `checkout_started` only at shared UI boundaries: when a shared card dialog opens or when Stripe reports an Apple Pay / Google Pay button click.
+- Wallet slots may create render-only Checkout Sessions on mount so Apple Pay and Google Pay render before the visitor taps. Session creation is technical preparation and must never emit `checkout_started`.
+- Shared checkout analytics deduplicates `checkout_started` by Checkout Session id. Card submit and wallet confirmation must not emit it again.
 - Funnel paywalls should style wallet buttons through the shared slot API: `className` for the Stripe button/placeholder, `slotClassName` for the outer slot, `appearance` for Stripe Elements appearance, and `options` for Stripe Express Checkout options.
 - Keep discount math reusable here, but keep offer activation timing in funnel code.
 - Checkout metadata must avoid sensitive raw query params and use `@funnelsgrove/analytics` metadata helpers.

package/dist/components/shared/SharedStripeCheckoutDialog.js

@@ -191,9 +191,6 @@ function SharedStripeCheckoutForm({ amountCents, checkoutAnalytics, checkoutSess
                 setSubmitting(false);
                 return;
             }
-            if (checkoutAnalytics) {
-                queueStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId, paymentMethod: 'card' }));
-            }
             const result = await stripe.confirmCardPayment(clientSecret, {
                 payment_method: {
                     card: cardNumberElement,
@@ -249,6 +246,12 @@ function SharedStripeCheckoutForm({ amountCents, checkoutAnalytics, checkoutSess
 }
 export function SharedStripeCheckoutDialog(_a) {
     var { checkoutAnalytics, checkoutSessionId, clientSecret, onClose, stripePromise } = _a, props = __rest(_a, ["checkoutAnalytics", "checkoutSessionId", "clientSecret", "onClose", "stripePromise"]);
+    useEffect(() => {
+        if (!checkoutAnalytics) {
+            return;
+        }
+        queueStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId, checkoutStartSource: 'card_form_open', paymentMethod: 'card' }));
+    }, [checkoutAnalytics, checkoutSessionId]);
     useEffect(() => {
         const handleKeyDown = (event) => {
             if (event.key === 'Escape') {

package/dist/components/shared/SharedStripeCheckoutV2Dialog.js

@@ -250,9 +250,6 @@ function SharedStripeCheckoutV2CheckoutSessionForm({ amountCents, buttonColor, c
                 setSubmitting(false);
                 return;
             }
-            if (checkoutAnalytics) {
-                queueStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId, paymentMethod: 'card' }));
-            }
             await (onPaymentInfoSubmitted === null || onPaymentInfoSubmitted === void 0 ? void 0 : onPaymentInfoSubmitted());
             const result = await checkoutState.checkout.confirm({
                 redirect: 'if_required',
@@ -330,6 +327,12 @@ export function SharedStripeCheckoutV2Dialog(_a) {
     var { checkoutAnalytics, checkoutSessionId, clientSecret, onClose, stripePromise, supportedCountries } = _a, props = __rest(_a, ["checkoutAnalytics", "checkoutSessionId", "clientSecret", "onClose", "stripePromise", "supportedCountries"]);
     const normalizedSupportedCountries = useMemo(() => normalizeSupportedCheckoutCountries(supportedCountries), [supportedCountries]);
     const fixedBillingCountry = getFixedSupportedBillingCountry(normalizedSupportedCountries);
+    useEffect(() => {
+        if (!checkoutAnalytics) {
+            return;
+        }
+        queueStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId, checkoutStartSource: 'card_form_open', paymentMethod: 'card' }));
+    }, [checkoutAnalytics, checkoutSessionId]);
     useEffect(() => {
         const handleKeyDown = (event) => {
             if (event.key === 'Escape') {

package/dist/components/shared/StripeCheckoutExpressCheckoutButton.js

@@ -123,9 +123,6 @@ export function StripeCheckoutExpressCheckoutButton({ beforeConfirm, checkoutAna
             event.paymentFailed({ reason: 'fail', message });
             return;
         }
-        if (checkoutAnalytics) {
-            queueStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId, paymentMethod: event.expressPaymentType }));
-        }
         let preparedCustomerEmail = (customerEmail === null || customerEmail === void 0 ? void 0 : customerEmail.trim()) || null;
         if (beforeConfirm) {
             try {
@@ -162,13 +159,19 @@ export function StripeCheckoutExpressCheckoutButton({ beforeConfirm, checkoutAna
             window.location.assign(returnUrl);
         }
     };
+    const handleClick = (event) => {
+        if (checkoutAnalytics) {
+            queueStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId, checkoutStartSource: 'wallet_click', paymentMethod: event.expressPaymentType }));
+        }
+        event.resolve();
+    };
     return (_jsxs(_Fragment, { children: [_jsx("div", { className: [
                     'stripe-express-checkout-button',
                     className !== null && className !== void 0 ? className : '',
                     effectiveWalletAvailable === false ? 'is-hidden' : '',
                 ]
                     .filter(Boolean)
-                    .join(' '), children: _jsx(ExpressCheckoutElementWithCancel, { options: resolvedOptions, onCancel: onCancel, onConfirm: (event) => void handleConfirm(event), onLoadError: ({ error }) => {
+                    .join(' '), children: _jsx(ExpressCheckoutElementWithCancel, { options: resolvedOptions, onCancel: onCancel, onClick: handleClick, onConfirm: (event) => void handleConfirm(event), onLoadError: ({ error }) => {
                         setWalletAvailable(false);
                         onAvailabilityChange === null || onAvailabilityChange === void 0 ? void 0 : onAvailabilityChange(false);
                         onError === null || onError === void 0 ? void 0 : onError(error.message || 'Unable to load wallet checkout.');

package/dist/components/shared/StripeExpressCheckoutButton.js

@@ -78,9 +78,6 @@ export function StripeExpressCheckoutButton({ amountCents, beforeConfirm, checko
             return;
         }
         onError === null || onError === void 0 ? void 0 : onError(null);
-        if (checkoutAnalytics) {
-            queueStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId, paymentMethod: event.expressPaymentType }));
-        }
         let preparedCustomerEmail = (customerEmail === null || customerEmail === void 0 ? void 0 : customerEmail.trim()) || null;
         if (beforeConfirm) {
             try {
@@ -138,13 +135,19 @@ export function StripeExpressCheckoutButton({ amountCents, beforeConfirm, checko
             window.location.assign(returnUrl);
         }
     };
+    const handleClick = (event) => {
+        if (checkoutAnalytics) {
+            queueStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId, checkoutStartSource: 'wallet_click', paymentMethod: event.expressPaymentType }));
+        }
+        event.resolve();
+    };
     return (_jsxs(_Fragment, { children: [_jsx("div", { className: [
                     'stripe-express-checkout-button',
                     className !== null && className !== void 0 ? className : '',
                     effectiveWalletAvailable === false ? 'is-hidden' : '',
                 ]
                     .filter(Boolean)
-                    .join(' '), children: _jsx(ExpressCheckoutElement, { options: resolvedOptions, onCancel: onCancel, onConfirm: (event) => void handleConfirm(event), onLoadError: ({ error }) => {
+                    .join(' '), children: _jsx(ExpressCheckoutElement, { options: resolvedOptions, onCancel: onCancel, onClick: handleClick, onConfirm: (event) => void handleConfirm(event), onLoadError: ({ error }) => {
                         setWalletAvailable(false);
                         onAvailabilityChange === null || onAvailabilityChange === void 0 ? void 0 : onAvailabilityChange(false);
                         onError === null || onError === void 0 ? void 0 : onError(error.message || 'Unable to load wallet checkout.');

package/dist/providers/stripe/WalletSubscriptionCheckoutSlot.js

@@ -121,7 +121,7 @@ export function WalletSubscriptionCheckoutSlot({ amountCents, appearance, availa
             return;
         }
         walletCheckoutStartedAfterClickSessionIdRef.current = session.checkoutSessionId;
-        void trackStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId: session.checkoutSessionId, paymentMethod: analyticsPaymentMethod }));
+        void trackStripeSubscriptionCheckoutStarted(Object.assign(Object.assign({}, checkoutAnalytics), { checkoutSessionId: session.checkoutSessionId, checkoutStartSource: 'wallet_click', paymentMethod: analyticsPaymentMethod }));
     }, [
         analyticsPaymentMethod,
         checkoutAnalytics,

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

@@ -12,6 +12,7 @@ export type StripeSubscriptionCheckoutAnalyticsContext = {
 };
 export type TrackStripeSubscriptionCheckoutStartedInput = StripeSubscriptionCheckoutAnalyticsContext & {
     checkoutSessionId?: string | null;
+    checkoutStartSource?: 'card_form_open' | 'wallet_click';
     paymentMethod?: unknown;
 };
 export type TrackPaidStripeSubscriptionCheckoutCompletedInput = StripeSubscriptionCheckoutAnalyticsContext & {

package/dist/services/checkoutCompletionAnalytics.service.js

@@ -70,7 +70,12 @@ export async function trackStripeSubscriptionCheckoutStarted(input) {
             stepName: input.stepName,
             stepType: input.stepType,
             stepContractVersion: input.stepContractVersion,
-            metadata: Object.assign(Object.assign(Object.assign({}, metadata), { checkoutSessionId, checkout_session_id: checkoutSessionId, environment: input.environment || metadata.environment, payment_provider: 'stripe' }), (paymentMethod ? { payment_method: paymentMethod } : {})),
+            metadata: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, metadata), { checkoutSessionId, checkout_session_id: checkoutSessionId }), (input.checkoutStartSource
+                ? {
+                    checkoutStartSource: input.checkoutStartSource,
+                    checkout_start_source: input.checkoutStartSource,
+                }
+                : {})), { environment: input.environment || metadata.environment, payment_provider: 'stripe' }), (paymentMethod ? { payment_method: paymentMethod } : {})),
         };
         const eventId = publicAnalyticsSdk.trackCheckoutStarted(conversionInput);
         if (!eventId) {

package/dist/services/stripe.service.js

@@ -1,10 +1,7 @@
-var _a, _b, _c, _d;
 import { loadStripe } from '@stripe/stripe-js';
 import { billingPlanList, } from '../config/billing.config.js';
-import { FUNNEL_ID, FUNNEL_SDK_PUBLISHABLE_KEY, funnelSdkService, runtimeEnvConfig, } from '@funnelsgrove/runtime';
+import { FUNNEL_ID, FUNNEL_SDK_PUBLISHABLE_KEY, funnelSdkService, } from '@funnelsgrove/runtime';
 import { isBillingPlanMappingCatalog, resolveMappedProjectPlans, } from './planCatalog.service.js';
-const STRIPE_TEST_PUBLISHABLE_KEY = ((_b = (_a = runtimeEnvConfig.stripeTestPublishableKey) !== null && _a !== void 0 ? _a : runtimeEnvConfig.stripePublishableKey) !== null && _b !== void 0 ? _b : '').trim();
-const STRIPE_LIVE_PUBLISHABLE_KEY = ((_d = (_c = runtimeEnvConfig.stripeLivePublishableKey) !== null && _c !== void 0 ? _c : runtimeEnvConfig.stripePublishableKey) !== null && _d !== void 0 ? _d : '').trim();
 const stripePromiseByKey = new Map();
 const syncedPlansPromiseByMode = new Map();
 export const buildPaywallPlanResolutionSignature = (options) => {
@@ -292,12 +289,6 @@ export function buildConfigPaywallPlans(planCatalog, orderedPlanIds = []) {
         : Object.entries(planCatalog !== null && planCatalog !== void 0 ? planCatalog : {}).map(([key, plan]) => toConfigPaywallPlan(key, plan));
     return getOrderedPaywallPlans(plans, orderedPlanIds);
 }
-const getStripePublishableKeyFromEnv = (mode) => {
-    if (mode === 'live') {
-        return STRIPE_LIVE_PUBLISHABLE_KEY || STRIPE_TEST_PUBLISHABLE_KEY;
-    }
-    return STRIPE_TEST_PUBLISHABLE_KEY || STRIPE_LIVE_PUBLISHABLE_KEY;
-};
 const toFallbackPaywallPlans = (planCatalog, options) => {
     const sourcePlans = buildConfigPaywallPlans(planCatalog);
     return reorderPlans(sourcePlans.length > 0 ? sourcePlans : fallbackPaywallPlans, options === null || options === void 0 ? void 0 : options.pricing);
@@ -430,7 +421,8 @@ export async function getPaywallPlans(mode, planCatalog, options) {
     return getFallbackPlans(planCatalog, options);
 }
 export function isStripeConfigured(mode) {
-    return getStripePublishableKeyFromEnv(mode).length > 0 || FUNNEL_SDK_PUBLISHABLE_KEY.length > 0;
+    void mode;
+    return FUNNEL_SDK_PUBLISHABLE_KEY.length > 0;
 }
 export function getStripePromise(_mode, runtimePublishableKey) {
     const resolvedPublishableKey = (runtimePublishableKey === null || runtimePublishableKey === void 0 ? void 0 : runtimePublishableKey.trim()) || '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/payments",
-  "version": "0.1.58",
+  "version": "0.2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/The-Solid-Grove/funnelsgrove.git",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@funnelsgrove/analytics": "^0.1.28",
-    "@funnelsgrove/runtime": "^0.1.54",
+    "@funnelsgrove/runtime": "^0.2.0",
     "@stripe/react-stripe-js": "^5.6.0",
     "@stripe/stripe-js": "^8.7.0",
     "react": "19.2.3",