@funnelsgrove/payments 0.7.5 → 0.7.8

package/dist/providers/solidgate/components/SolidgateCheckoutDialog.js

@@ -105,29 +105,21 @@ export function SolidgateCheckoutDialog({ open, request, checkoutAnalytics, cont
         onStateChangeRef.current = onStateChange;
         onSuccessRef.current = onSuccess;
     }, [checkoutAnalytics, copy, onError, onStateChange, onSuccess]);
-    const { discountKeyOrProviderId, failUrl, funnelEndUserId, funnelId, idempotencyKey, offerSetId, projectBillingPlanId, returnUrl, runtimeConfig, successUrl, } = request;
+    const { discountKeyOrProviderId, failUrl, funnelPlanKey, funnelEndUserId, funnelId, idempotencyKey, offerSetId, projectBillingPlanId, returnUrl, runtimeConfig, successUrl, } = request;
     const { apiBaseUrl, funnelId: runtimeFunnelId, funnelSdkPublishableKey, funnelVersionId, } = runtimeConfig || {};
     const hasRuntimeConfig = runtimeConfig !== undefined;
-    const normalizedRequest = useMemo(() => ({
-        funnelId: (funnelId === null || funnelId === void 0 ? void 0 : funnelId.trim()) || null,
-        funnelEndUserId: funnelEndUserId.trim(),
-        offerSetId: offerSetId.trim(),
-        projectBillingPlanId: projectBillingPlanId.trim(),
-        idempotencyKey: idempotencyKey.trim(),
-        discountKeyOrProviderId: (discountKeyOrProviderId === null || discountKeyOrProviderId === void 0 ? void 0 : discountKeyOrProviderId.trim()) || null,
-        returnUrl: returnUrl.trim(),
-        successUrl: successUrl.trim(),
-        failUrl: failUrl.trim(),
-        runtimeConfig: hasRuntimeConfig ? {
+    const normalizedRequest = useMemo(() => (Object.assign(Object.assign({ funnelId: (funnelId === null || funnelId === void 0 ? void 0 : funnelId.trim()) || null, funnelEndUserId: funnelEndUserId.trim(), offerSetId: offerSetId.trim() }, (funnelPlanKey
+        ? { funnelPlanKey: funnelPlanKey.trim() }
+        : { projectBillingPlanId: (projectBillingPlanId === null || projectBillingPlanId === void 0 ? void 0 : projectBillingPlanId.trim()) || '' })), { idempotencyKey: idempotencyKey.trim(), discountKeyOrProviderId: (discountKeyOrProviderId === null || discountKeyOrProviderId === void 0 ? void 0 : discountKeyOrProviderId.trim()) || null, returnUrl: returnUrl.trim(), successUrl: successUrl.trim(), failUrl: failUrl.trim(), runtimeConfig: hasRuntimeConfig ? {
             apiBaseUrl: (apiBaseUrl === null || apiBaseUrl === void 0 ? void 0 : apiBaseUrl.trim()) || null,
             funnelId: (runtimeFunnelId === null || runtimeFunnelId === void 0 ? void 0 : runtimeFunnelId.trim()) || null,
             funnelVersionId: (funnelVersionId === null || funnelVersionId === void 0 ? void 0 : funnelVersionId.trim()) || null,
             funnelSdkPublishableKey: (funnelSdkPublishableKey === null || funnelSdkPublishableKey === void 0 ? void 0 : funnelSdkPublishableKey.trim()) || null,
-        } : undefined,
-    }), [
+        } : undefined })), [
         apiBaseUrl,
         discountKeyOrProviderId,
         failUrl,
+        funnelPlanKey,
         funnelEndUserId,
         funnelId,
         funnelSdkPublishableKey,

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

@@ -25,7 +25,9 @@ export type PrepareSolidgateCheckoutInput = {
     funnelId?: string | null;
     funnelEndUserId: string;
     offerSetId: string;
-    projectBillingPlanId: string;
+    funnelPlanKey?: string | null;
+    /** @deprecated Published funnels may send this during the offer-set migration window. */
+    projectBillingPlanId?: string | null;
     idempotencyKey: string;
     discountKeyOrProviderId?: string | null;
     returnUrl: string;

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

@@ -99,17 +99,9 @@ const parseStatus = (value) => {
 };
 export const prepareSolidgateCheckout = async (input) => {
     var _a;
-    return parsePreparation(await postJson('/sdk/public/payments/solidgate/checkout', {
-        funnelId: resolveFunnelId(input.funnelId, input.runtimeConfig),
-        funnelEndUserId: requiredString(input.funnelEndUserId, 'funnelEndUserId'),
-        offerSetId: requiredString(input.offerSetId, 'offerSetId'),
-        projectBillingPlanId: requiredString(input.projectBillingPlanId, 'projectBillingPlanId'),
-        idempotencyKey: requiredString(input.idempotencyKey, 'idempotencyKey'),
-        discountKeyOrProviderId: ((_a = input.discountKeyOrProviderId) === null || _a === void 0 ? void 0 : _a.trim()) || null,
-        returnUrl: requiredString(input.returnUrl, 'returnUrl'),
-        successUrl: requiredString(input.successUrl, 'successUrl'),
-        failUrl: requiredString(input.failUrl, 'failUrl'),
-    }, input.runtimeConfig, input.signal));
+    return parsePreparation(await postJson('/sdk/public/payments/solidgate/checkout', Object.assign(Object.assign({ funnelId: resolveFunnelId(input.funnelId, input.runtimeConfig), funnelEndUserId: requiredString(input.funnelEndUserId, 'funnelEndUserId'), offerSetId: requiredString(input.offerSetId, 'offerSetId') }, (input.funnelPlanKey
+        ? { funnelPlanKey: requiredString(input.funnelPlanKey, 'funnelPlanKey') }
+        : { projectBillingPlanId: requiredString(input.projectBillingPlanId, 'projectBillingPlanId') })), { idempotencyKey: requiredString(input.idempotencyKey, 'idempotencyKey'), discountKeyOrProviderId: ((_a = input.discountKeyOrProviderId) === null || _a === void 0 ? void 0 : _a.trim()) || null, returnUrl: requiredString(input.returnUrl, 'returnUrl'), successUrl: requiredString(input.successUrl, 'successUrl'), failUrl: requiredString(input.failUrl, 'failUrl') }), input.runtimeConfig, input.signal));
 };
 export const retrieveSolidgateCheckoutStatus = async (input) => {
     const attemptId = requiredString(input.attemptId, 'attemptId');

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

@@ -5,6 +5,7 @@ import type { RuntimeMode } from '@funnelsgrove/runtime';
 import { type RemoteProjectBillingPlan } from '../../../services/planCatalog.service.js';
 export type PaywallPlan = {
     id: string;
+    funnelPlanKey?: string;
     projectPlanId?: string;
     offerSetId?: string;
     offerSetKey?: string;

package/dist/services/publishedBillingRuntime.service.js

@@ -9,7 +9,7 @@ export const resolvePublishedBillingRuntime = ({ config, featureFlags, mode, sea
         pricingExperiments: resolvedExperiments.pricingExperiments,
         featureFlags,
         search,
-        defaultOfferSetId,
+        defaultOfferSetId: defaultOfferSetId || (config === null || config === void 0 ? void 0 : config.defaultOfferSetId) || undefined,
     });
     const runtime = resolveGeneratedOfferSetRuntime({
         offerSets,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/payments",
-  "version": "0.7.5",
+  "version": "0.7.8",
   "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.61",
-    "@funnelsgrove/runtime": "^0.7.12",
+    "@funnelsgrove/analytics": "^0.1.67",
+    "@funnelsgrove/runtime": "^0.7.18",
     "@solidgate/react-sdk": "1.34.0",
     "@stripe/react-stripe-js": "^5.6.0",
     "@stripe/stripe-js": "^8.7.0",