@funnelsgrove/runtime 0.7.10 → 0.7.12

package/dist/runtime/offer-set-runtime.d.ts

@@ -1,6 +1,7 @@
 import type { RuntimeMode } from '../services/runtime-mode.service.js';
 export type GeneratedOfferSetItemKind = 'plan' | 'upsell' | 'downsell';
 export type GeneratedOfferSetPlanModeConfig = {
+    readonly provider?: 'stripe' | 'solidgate' | null;
     readonly providerPlanId?: string | null;
     readonly paymentMode?: string | null;
     readonly priceLabel?: string | null;
@@ -19,6 +20,8 @@ export type GeneratedOfferSetPlanItem = {
     readonly funnelPlanKey: string;
     readonly runtimePlanKey?: string | null;
     readonly projectBillingPlanId?: string | null;
+    readonly testProvider?: 'stripe' | 'solidgate' | null;
+    readonly liveProvider?: 'stripe' | 'solidgate' | null;
     readonly testProviderPlanId?: string | null;
     readonly liveProviderPlanId?: string | null;
     readonly followUpTestProviderPlanId?: string | null;
@@ -57,6 +60,7 @@ export type GeneratedOfferSetDiscount = {
 export type GeneratedOfferSet = {
     readonly id?: string | null;
     readonly key: string;
+    readonly paymentProfileId?: string | null;
     readonly isActive?: boolean | null;
     readonly metadata?: Record<string, unknown> | null;
     readonly items: readonly GeneratedOfferSetPlanItem[];
@@ -109,6 +113,7 @@ export type OfferSetRuntimeInput<TPlan extends Record<string, unknown>> = {
 };
 export type OfferSetRuntimeResult<TPlan extends Record<string, unknown>> = {
     offerSet: GeneratedOfferSet | null;
+    paymentProvidersByMode: Record<RuntimeMode, 'stripe' | 'solidgate'>;
     plansByMode: Record<RuntimeMode, Record<string, TPlan & OfferSetRuntimePlanOverrides>>;
     planKeys: string[];
     upsellPlanKeys: string[];
@@ -116,6 +121,7 @@ export type OfferSetRuntimeResult<TPlan extends Record<string, unknown>> = {
     defaultPlanKey: string;
     discountListsByMode: Record<RuntimeMode, readonly OfferSetRuntimeDiscount[]>;
     getPlanCatalog: (mode: RuntimeMode) => Record<string, TPlan & OfferSetRuntimePlanOverrides>;
+    getPaymentProvider: (mode: RuntimeMode) => 'stripe' | 'solidgate';
     getDiscountList: (mode: RuntimeMode) => readonly OfferSetRuntimeDiscount[];
 };
 export declare const findGeneratedOfferSet: (offerSets: readonly GeneratedOfferSet[], offerSetKey?: string, offerSetId?: string) => GeneratedOfferSet | null;

package/dist/runtime/offer-set-runtime.js

@@ -99,6 +99,22 @@ const readProviderPlanId = (item, mode) => {
         ? readString(item.testProviderPlanId)
         : readString(item.liveProviderPlanId)));
 };
+const readPaymentProvider = (item, mode) => {
+    var _a;
+    const modeConfig = readGeneratedModeConfig(item, mode);
+    const value = (_a = readString(modeConfig.provider)) !== null && _a !== void 0 ? _a : (mode === 'test' ? readString(item.testProvider) : readString(item.liveProvider));
+    return value === 'stripe' || value === 'solidgate' ? value : null;
+};
+const resolveOfferSetPaymentProvider = (offerSet, mode) => {
+    var _a, _b;
+    const providers = new Set(((_a = offerSet === null || offerSet === void 0 ? void 0 : offerSet.items) !== null && _a !== void 0 ? _a : [])
+        .map((item) => readPaymentProvider(item, mode))
+        .filter((provider) => Boolean(provider)));
+    if (providers.size > 1) {
+        throw new Error(`Offer set "${(offerSet === null || offerSet === void 0 ? void 0 : offerSet.key) || 'unknown'}" mixes payment providers in ${mode} mode`);
+    }
+    return (_b = providers.values().next().value) !== null && _b !== void 0 ? _b : 'stripe';
+};
 const readFollowUpProviderPlanId = (item, mode) => {
     var _a, _b, _c;
     const modeConfig = readGeneratedModeConfig(item, mode);
@@ -279,12 +295,17 @@ export const resolveGeneratedOfferSetRuntime = (input) => {
         test: applyGeneratedOfferSetToPlanCatalog(baseCatalogsByMode.test, 'test', offerSet),
         live: applyGeneratedOfferSetToPlanCatalog(baseCatalogsByMode.live, 'live', offerSet),
     };
+    const paymentProvidersByMode = {
+        test: resolveOfferSetPaymentProvider(offerSet, 'test'),
+        live: resolveOfferSetPaymentProvider(offerSet, 'live'),
+    };
     const discountListsByMode = {
-        test: buildGeneratedOfferSetDiscountList(offerSet, 'test', input.fallbackDiscounts),
-        live: buildGeneratedOfferSetDiscountList(offerSet, 'live', input.fallbackDiscounts),
+        test: buildGeneratedOfferSetDiscountList(offerSet, 'test', paymentProvidersByMode.test === 'stripe' ? input.fallbackDiscounts : undefined),
+        live: buildGeneratedOfferSetDiscountList(offerSet, 'live', paymentProvidersByMode.live === 'stripe' ? input.fallbackDiscounts : undefined),
     };
     return {
         offerSet,
+        paymentProvidersByMode,
         plansByMode,
         planKeys,
         upsellPlanKeys,
@@ -292,6 +313,7 @@ export const resolveGeneratedOfferSetRuntime = (input) => {
         defaultPlanKey,
         discountListsByMode,
         getPlanCatalog: (mode) => plansByMode[mode],
+        getPaymentProvider: (mode) => paymentProvidersByMode[mode],
         getDiscountList: (mode) => discountListsByMode[mode],
     };
 };

package/dist/runtime/use-funnel-flow-controller.js

@@ -270,7 +270,7 @@ export function resolveRenderedExperimentStepId(input) {
     return variantStepId !== null && variantStepId !== void 0 ? variantStepId : safeActiveStepId;
 }
 export function useFunnelFlowController({ api = apiService, analytics, stepContractVersion, initialStepId, initialAttributes, lockToInitialStep = false, defaultStepId, stepSequence, stepById, stepComponentById, funnelExperiments, getPathForStep, getStepIdFromPath, getSequentialNextStepId, getChoiceTargetsForStep, isFunnelStepId, resolveConfiguredNextStep, resolveRuntimeInitialStepId, }) {
-    var _a, _b;
+    var _a, _b, _c;
     const [runtimeMode] = useRuntimeMode();
     const [editorModeEnabled, setEditorModeEnabled] = useState(() => isEditorEnabled());
     const [editorPanelExpanded, setEditorPanelExpanded] = useState(false);
@@ -278,7 +278,6 @@ export function useFunnelFlowController({ api = apiService, analytics, stepContr
     const [editorVariantOverrides, setEditorVariantOverrides] = useState({});
     const shouldLockToInitialStep = lockToInitialStep || isPreviewStepLockRequested();
     const isPreviewRuntime = useMemo(() => isPreviewFrameRuntime(), []);
-    const lifecycleEventsSuppressed = isPreviewRuntime || editorModeEnabled;
     const resolveRenderableStepId = useCallback((stepId) => {
         if (!stepId || !isFunnelStepId(stepId)) {
             return null;
@@ -308,10 +307,14 @@ export function useFunnelFlowController({ api = apiService, analytics, stepContr
         });
         return resolveFallbackStepId(requestedStepId);
     }, [initialStepId, resolveFallbackStepId, resolveRuntimeInitialStepId]);
+    const isSubscriptionManagementRuntime = ((_a = stepById[safeInitialStepId]) === null || _a === void 0 ? void 0 : _a.kind) === 'manage-subscription';
+    const lifecycleEventsSuppressed = isPreviewRuntime || editorModeEnabled || isSubscriptionManagementRuntime;
     const [activeStepId, setActiveStepId] = useState(safeInitialStepId);
     const [attributes, setAttributes] = useState(() => (Object.assign({}, (initialAttributes || {}))));
     const [user, setUser] = useState(() => ({
-        id: api.getOrCreateClientUserId(),
+        id: isSubscriptionManagementRuntime
+            ? resolveUrlUserAttributes().userId || ''
+            : api.getOrCreateClientUserId(),
         name: '',
         email: '',
         attributes: {},
@@ -503,8 +506,16 @@ export function useFunnelFlowController({ api = apiService, analytics, stepContr
         safeInitialStepId,
     ]);
     useEffect(() => {
-        const localUserId = api.getOrCreateClientUserId();
         const urlUserAttributes = resolveUrlUserAttributes();
+        if (isSubscriptionManagementRuntime) {
+            initialAttributionRef.current = collectCurrentFunnelAttribution();
+            setUser((prev) => (Object.assign(Object.assign({}, prev), { id: urlUserAttributes.userId || '' })));
+            setUserBootstrapped(true);
+            setAttributionReady(true);
+            setPostHogReady(true);
+            return;
+        }
+        const localUserId = api.getOrCreateClientUserId();
         const bootstrapCandidateUserId = api.getBootstrapCandidateUserId(localUserId);
         const initialAttribution = collectCurrentFunnelAttribution();
         initialAttributionRef.current = initialAttribution;
@@ -578,7 +589,7 @@ export function useFunnelFlowController({ api = apiService, analytics, stepContr
             logger.error('Failed to identify PostHog user:', error);
         });
         return cancelAttributionFailOpen;
-    }, [api, isPreviewRuntime]);
+    }, [api, isPreviewRuntime, isSubscriptionManagementRuntime]);
     const recordStepCompletion = useCallback((intent, options = {}) => {
         var _a;
         const meta = stepById[intent.visit.stepId];
@@ -1198,10 +1209,10 @@ export function useFunnelFlowController({ api = apiService, analytics, stepContr
         safeInitialStepId,
     ]);
     const choiceTargets = getChoiceTargetsForStep(renderedStepId);
-    const actionBar = (_a = renderedStepMeta === null || renderedStepMeta === void 0 ? void 0 : renderedStepMeta.actionBar) !== null && _a !== void 0 ? _a : activeStepMeta === null || activeStepMeta === void 0 ? void 0 : activeStepMeta.actionBar;
+    const actionBar = (_b = renderedStepMeta === null || renderedStepMeta === void 0 ? void 0 : renderedStepMeta.actionBar) !== null && _b !== void 0 ? _b : activeStepMeta === null || activeStepMeta === void 0 ? void 0 : activeStepMeta.actionBar;
     const isAutoAdvanceStep = typeof (actionBar === null || actionBar === void 0 ? void 0 : actionBar.autoAdvanceMs) === 'number';
     const autoAdvanceMs = actionBar === null || actionBar === void 0 ? void 0 : actionBar.autoAdvanceMs;
-    const buttonVariant = (_b = actionBar === null || actionBar === void 0 ? void 0 : actionBar.buttonVariant) !== null && _b !== void 0 ? _b : null;
+    const buttonVariant = (_c = actionBar === null || actionBar === void 0 ? void 0 : actionBar.buttonVariant) !== null && _c !== void 0 ? _c : null;
     const buttonText = (actionBar === null || actionBar === void 0 ? void 0 : actionBar.buttonText) || 'Continue';
     const hideActionBar = (actionBar === null || actionBar === void 0 ? void 0 : actionBar.hidden) === true;
     useEffect(() => {

package/dist/services/api.service.js

@@ -512,9 +512,6 @@ class ApiService {
         if (!payload.user) {
             throw new Error(SUBSCRIPTION_MANAGEMENT_LINK_ERROR);
         }
-        if (userId) {
-            persistUserId(payload.user.user_id || userId, FUNNEL_ID);
-        }
         return payload;
     }
     async updateSubscription(input) {

package/dist/services/funnel-runtime-config.js

@@ -3,6 +3,17 @@ const isRecord = (value) => (value !== null && typeof value === 'object' && !Arr
 const readString = (value) => (typeof value === 'string' && value.trim() ? value.trim() : null);
 const readNumber = (value) => (typeof value === 'number' && Number.isFinite(value) ? value : null);
 const readBoolean = (value) => (typeof value === 'boolean' ? value : null);
+const readPaymentProvider = (value) => (value === 'stripe' || value === 'solidgate' ? value : null);
+const parsePaymentProvider = (value, context) => {
+    if (value === undefined || value === null || value === '') {
+        return null;
+    }
+    const provider = readPaymentProvider(value);
+    if (!provider) {
+        throw new Error(`${context} has an unsupported payment provider`);
+    }
+    return provider;
+};
 const readRecordArray = (value) => (Array.isArray(value) ? value.filter(isRecord) : []);
 const pick = (record, ...keys) => {
     for (const key of keys) {
@@ -26,6 +37,7 @@ const deepFreeze = (value) => {
     return value;
 };
 const buildPlanModeConfig = (item, mode) => {
+    var _a;
     const metadata = isRecord(item.metadata) ? item.metadata : {};
     const directMappings = isRecord(item.providerMappingsByMode)
         ? item.providerMappingsByMode
@@ -39,6 +51,7 @@ const buildPlanModeConfig = (item, mode) => {
             ? metadataMappings[mode]
             : {};
     const prefix = mode === 'test' ? 'test' : 'live';
+    const provider = (_a = parsePaymentProvider(pick(item, `${prefix}Provider`, `${prefix}_provider`), `Published runtime ${mode} plan mapping`)) !== null && _a !== void 0 ? _a : parsePaymentProvider(pick(modeMapping, 'provider'), `Published runtime ${mode} plan mapping`);
     const providerPlanId = (pickString(item, `${prefix}ProviderPlanId`, `${prefix}_provider_plan_id`)
         || pickString(modeMapping, 'providerPlanId'));
     if (!providerPlanId) {
@@ -57,7 +70,7 @@ const buildPlanModeConfig = (item, mode) => {
             minimumFractionDigits: 2,
             maximumFractionDigits: 2,
         }).format(amountMajor) + (interval ? `/${interval}` : ''));
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ providerPlanId }, (priceLabel ? { priceLabel } : {})), (pickString(modeMapping, 'perDayAmount')
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (provider ? { provider } : {})), { providerPlanId }), (priceLabel ? { priceLabel } : {})), (pickString(modeMapping, 'perDayAmount')
         ? { perDayAmount: pickString(modeMapping, 'perDayAmount') }
         : {})), (pickString(modeMapping, 'perDayLabel')
         ? { perDayLabel: pickString(modeMapping, 'perDayLabel') }
@@ -87,15 +100,17 @@ const normalizePublishedOfferSets = (config) => {
                 throw new Error(`Published runtime offer set "${key}" has an item without a plan key`);
             }
             const projectBillingPlanId = pickString(item, 'projectBillingPlanId', 'project_billing_plan_id');
+            const testProvider = parsePaymentProvider(pick(item, 'testProvider', 'test_provider'), `Published runtime offer set "${key}"`);
+            const liveProvider = parsePaymentProvider(pick(item, 'liveProvider', 'live_provider'), `Published runtime offer set "${key}"`);
             const testMapping = buildPlanModeConfig(item, 'test');
             const liveMapping = buildPlanModeConfig(item, 'live');
             const title = pickString(item, 'title', 'displayNameOverride', 'display_name_override')
                 || pickString(metadata, 'title', 'publicPlanName', 'public_plan_name');
             const description = pickString(item, 'description')
                 || pickString(metadata, 'description');
-            return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ funnelPlanKey }, (pickString(metadata, 'runtimePlanKey', 'planKey', 'billingPlanKey')
+            return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ funnelPlanKey }, (pickString(metadata, 'runtimePlanKey', 'planKey', 'billingPlanKey')
                 ? { runtimePlanKey: pickString(metadata, 'runtimePlanKey', 'planKey', 'billingPlanKey') }
-                : {})), (projectBillingPlanId ? { projectBillingPlanId } : {})), (pickString(item, 'testProviderPlanId', 'test_provider_plan_id')
+                : {})), (projectBillingPlanId ? { projectBillingPlanId } : {})), (testProvider ? { testProvider } : {})), (liveProvider ? { liveProvider } : {})), (pickString(item, 'testProviderPlanId', 'test_provider_plan_id')
                 ? { testProviderPlanId: pickString(item, 'testProviderPlanId', 'test_provider_plan_id') }
                 : {})), (pickString(item, 'liveProviderPlanId', 'live_provider_plan_id')
                 ? { liveProviderPlanId: pickString(item, 'liveProviderPlanId', 'live_provider_plan_id') }
@@ -119,7 +134,9 @@ const normalizePublishedOfferSets = (config) => {
                 ? { oldPriceLabel: pickString(item, 'oldPriceLabel', 'old_price_label') }
                 : {})), { isDefault: (_a = pickBoolean(item, 'isDefault', 'is_default')) !== null && _a !== void 0 ? _a : false, providerMappingsByMode: Object.assign(Object.assign({}, (testMapping ? { test: testMapping } : {})), (liveMapping ? { live: liveMapping } : {})), metadata });
         });
-        return Object.assign(Object.assign({}, (pickString(offerSet, 'id') ? { id: pickString(offerSet, 'id') } : {})), { key, isActive: (_a = pickBoolean(offerSet, 'isActive', 'is_active')) !== null && _a !== void 0 ? _a : true, metadata: isRecord(offerSet.metadata) ? offerSet.metadata : {}, items });
+        return Object.assign(Object.assign(Object.assign(Object.assign({}, (pickString(offerSet, 'id') ? { id: pickString(offerSet, 'id') } : {})), { key }), (pickString(offerSet, 'paymentProfileId', 'payment_profile_id')
+            ? { paymentProfileId: pickString(offerSet, 'paymentProfileId', 'payment_profile_id') }
+            : {})), { isActive: (_a = pickBoolean(offerSet, 'isActive', 'is_active')) !== null && _a !== void 0 ? _a : true, metadata: isRecord(offerSet.metadata) ? offerSet.metadata : {}, items });
     });
 };
 const normalizePublishedExperiments = (config, publishedAt, offerSets) => readRecordArray(config.experiments).map((experiment) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/runtime",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/The-Solid-Grove/funnelsgrove.git",