@funnelsgrove/runtime 0.2.0 → 0.4.0

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

@@ -55,6 +55,7 @@ export type GeneratedOfferSetDiscount = {
     readonly metadata?: Record<string, unknown> | null;
 };
 export type GeneratedOfferSet = {
+    readonly id?: string | null;
     readonly key: string;
     readonly isActive?: boolean | null;
     readonly metadata?: Record<string, unknown> | null;
@@ -74,6 +75,7 @@ export type OfferSetRuntimeDiscount = {
     readonly previousDiscountPercent: number;
 };
 export type OfferSetRuntimePlanOverrides = {
+    offerSetId?: string;
     offerSetKey?: string;
     projectPlanId?: string;
     providerPlanId?: string;

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

@@ -159,7 +159,7 @@ const buildGeneratedPlanOverrides = (item, mode, isDefault) => {
     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(Object.assign(Object.assign(Object.assign({}, (projectPlanId ? { projectPlanId } : {})), (providerPlanId ? { providerPlanId } : {})), (paymentMode ? { paymentMode } : {})), (analyticsPurchaseValue !== null ? { analyticsPurchaseValue } : {})), (title ? { title } : {})), (description ? { description } : {})), (priceLabel ? { priceLabel } : {})), (perDayAmount ? { perDayAmount } : {})), (perDayLabel ? { perDayLabel } : {})), (amountCents !== null ? { amountCents: Math.max(0, Math.round(amountCents)) } : {})), (checkoutSummaryLabel ? { checkoutSummaryLabel } : {})), (billingInterval ? { billingInterval } : {})), (billingIntervalCount !== null ? { billingIntervalCount: Math.max(1, Math.round(billingIntervalCount)) } : {})), (followUpProviderPlanId ? { followUpProviderPlanId } : {})), (followUpPlanTitle ? { followUpPlanTitle } : {})), (followUpBillingInterval ? { followUpBillingInterval } : {})), (followUpBillingIntervalCount !== null ? { followUpBillingIntervalCount: Math.max(1, Math.round(followUpBillingIntervalCount)) } : {})), (introIterations !== null ? { introIterations: Math.max(1, Math.round(introIterations)) } : {})), (featuredTag ? { featuredTag } : {})), (oldPriceLabel ? { oldPriceLabel } : {})), (isDefault ? { isDefault: true } : {}));
 };
 export const applyGeneratedOfferSetToPlanCatalog = (baseCatalog, mode, offerSet) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!offerSet) {
         return Object.assign({}, baseCatalog);
     }
@@ -179,7 +179,7 @@ export const applyGeneratedOfferSetToPlanCatalog = (baseCatalog, mode, offerSet)
         if (!key) {
             continue;
         }
-        nextCatalog[key] = Object.assign(Object.assign(Object.assign({}, ((_c = nextCatalog[key]) !== null && _c !== void 0 ? _c : {})), { offerSetKey: offerSet.key }), buildGeneratedPlanOverrides(item, mode, getOfferSetItemKind(item) === 'plan' && key === defaultPlanKey));
+        nextCatalog[key] = Object.assign(Object.assign(Object.assign(Object.assign({}, ((_c = nextCatalog[key]) !== null && _c !== void 0 ? _c : {})), (((_d = offerSet.id) === null || _d === void 0 ? void 0 : _d.trim()) ? { offerSetId: offerSet.id.trim() } : {})), { offerSetKey: offerSet.key }), buildGeneratedPlanOverrides(item, mode, getOfferSetItemKind(item) === 'plan' && key === defaultPlanKey));
     }
     return nextCatalog;
 };

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

@@ -324,8 +324,7 @@ export function useFunnelFlowController({ api = apiService, analytics, stepContr
     const attributesRef = useRef(attributes);
     const postHogFeatureFlagsRef = useRef({});
     const prevStepIdRef = useRef(null);
-    const funnelStartedTrackedRef = useRef(false);
-    const firstStepViewedVisitRef = useRef(null);
+    const firstStepViewedTrackedRef = useRef(false);
     const firstStepClickedVisitRef = useRef(null);
     // One controller mount is one funnel run. A full reload intentionally begins a new run.
     const funnelCompletionClaimedRef = useRef(false);
@@ -968,7 +967,7 @@ export function useFunnelFlowController({ api = apiService, analytics, stepContr
         safeActiveStepId,
     ]);
     useEffect(() => {
-        var _a, _b, _c;
+        var _a, _b;
         if (safeActiveStepId !== activeStepId) {
             logger.warn(`[FunnelFlow] Unknown or non-renderable step "${activeStepId}", falling back to "${safeActiveStepId}".`);
             claimCurrentVisit({ type: 'exit', reason: 'replace' });
@@ -1021,10 +1020,10 @@ export function useFunnelFlowController({ api = apiService, analytics, stepContr
                 featureFlags: postHogFeatureFlagsRef.current,
             });
             if (safeActiveStepId === defaultStepId) {
-                const initialAttribution = takeInitialFunnelAttributionMetadata(funnelStartedTrackedRef.current, attributionReady, initialAttributionRef.current);
-                funnelStartedTrackedRef.current = initialAttribution.tracked;
+                const initialAttribution = takeInitialFunnelAttributionMetadata(firstStepViewedTrackedRef.current, attributionReady, initialAttributionRef.current);
+                firstStepViewedTrackedRef.current = initialAttribution.tracked;
                 if (initialAttribution.metadata) {
-                    (_b = analytics === null || analytics === void 0 ? void 0 : analytics.trackFunnelStarted) === null || _b === void 0 ? void 0 : _b.call(analytics, {
+                    (_b = analytics === null || analytics === void 0 ? void 0 : analytics.trackFirstStepViewed) === null || _b === void 0 ? void 0 : _b.call(analytics, {
                         userId: currentUserIdRef.current,
                         environment: analyticsRuntimeMode,
                         stepId: renderedStepId,
@@ -1036,20 +1035,6 @@ export function useFunnelFlowController({ api = apiService, analytics, stepContr
                         featureFlags: postHogFeatureFlagsRef.current,
                     });
                 }
-                if (firstStepViewedVisitRef.current !== startIntent.visit.visitId) {
-                    firstStepViewedVisitRef.current = startIntent.visit.visitId;
-                    (_c = analytics === null || analytics === void 0 ? void 0 : analytics.trackFirstStepViewed) === null || _c === void 0 ? void 0 : _c.call(analytics, {
-                        userId: currentUserIdRef.current,
-                        environment: analyticsRuntimeMode,
-                        stepId: renderedStepId,
-                        stepName,
-                        stepType,
-                        stepContractVersion,
-                        occurredAt: startedAt,
-                        metadata: attributionMetadata,
-                        featureFlags: postHogFeatureFlagsRef.current,
-                    });
-                }
             }
         }
     }, [

package/dist/services/funnel-sdk.service.d.ts

@@ -10,6 +10,8 @@ export type FunnelSdkJsonObject = Record<string, unknown>;
 export type FunnelSdkListPaymentPlansResponse = {
     funnelId?: string;
     environment?: FunnelSdkRuntimeMode;
+    offerSetId?: string;
+    offerSetKey?: string;
     plans: FunnelSdkPaymentPlan[];
 };
 export type FunnelSdkBootstrapUserInput = {
@@ -72,6 +74,7 @@ export type FunnelSdkUploadPhotoInput = {
 };
 export type FunnelSdkCreateHostedCheckoutSessionInput = {
     planId: string;
+    offerSetId?: string | null;
     offerSetKey?: string | null;
     amountCents: number;
     successUrl: string;
@@ -95,6 +98,7 @@ export type FunnelSdkCreateHostedCheckoutSessionResponse = {
 };
 export type FunnelSdkCreateSubscriptionCheckoutInput = {
     planId: string;
+    offerSetId?: string | null;
     offerSetKey?: string | null;
     amountCents: number;
     returnUrl: string;
@@ -124,6 +128,7 @@ export type FunnelSdkCreateSubscriptionCheckoutResponse = {
 };
 export type FunnelSdkCreateOneTimeCheckoutInput = {
     planId: string;
+    offerSetId?: string | null;
     offerSetKey?: string | null;
     amountCents: number;
     returnUrl: string;
@@ -146,6 +151,7 @@ export type FunnelSdkCreateOneTimeCheckoutResponse = {
 export type FunnelSdkUpdateSubscriptionCheckoutPlanInput = {
     checkoutSessionId: string;
     planId: string;
+    offerSetId?: string | null;
     offerSetKey?: string | null;
     amountCents: number;
     analyticsMetadata?: Record<string, unknown> | null;
@@ -187,6 +193,8 @@ export type FunnelSdkVerifySubscriptionCheckoutResponse = {
  */
 export type FunnelSdkCreateOneTimePaymentIntentInput = {
     planId: string;
+    offerSetId?: string | null;
+    offerSetKey?: string | null;
     amountCents: number;
     analyticsMetadata?: Record<string, unknown> | null;
     couponId?: string | null;
@@ -250,6 +258,8 @@ declare class FunnelSdkService {
     uploadPhoto<ResponsePayload = FunnelSdkJsonObject>(input: FunnelSdkUploadPhotoInput): Promise<ResponsePayload>;
     listPaymentPlans(input?: {
         environment?: FunnelSdkRuntimeMode;
+        offerSetId?: string | null;
+        offerSetKey?: string | null;
         runtimeConfig?: FunnelSdkRuntimeConfigOverrides;
     }): Promise<FunnelSdkListPaymentPlansResponse>;
     createHostedCheckoutSession(input: FunnelSdkCreateHostedCheckoutSessionInput): Promise<FunnelSdkCreateHostedCheckoutSessionResponse>;

package/dist/services/funnel-sdk.service.js

@@ -193,6 +193,8 @@ class FunnelSdkService {
             searchParams: {
                 environment: input.environment,
                 funnelId,
+                offerSetId: input.offerSetId,
+                offerSetKey: input.offerSetKey,
             },
             errorMessage: 'Unable to load payment plans',
         });
@@ -201,6 +203,7 @@ class FunnelSdkService {
         return this.postJson('/sdk/public/payments/checkout-session', {
             runtimeConfig: input.runtimeConfig,
             body: {
+                offerSetId: input.offerSetId,
                 offerSetKey: input.offerSetKey,
                 planId: input.planId,
                 providerPlanId: input.providerPlanId,
@@ -224,6 +227,7 @@ class FunnelSdkService {
         return this.postJson('/sdk/public/payments/subscriptions', {
             runtimeConfig: input.runtimeConfig,
             body: {
+                offerSetId: input.offerSetId,
                 offerSetKey: input.offerSetKey,
                 planId: input.planId,
                 providerPlanId: input.providerPlanId,
@@ -251,6 +255,7 @@ class FunnelSdkService {
         return this.postJson('/sdk/public/payments/one-time-checkout', {
             runtimeConfig: input.runtimeConfig,
             body: {
+                offerSetId: input.offerSetId,
                 offerSetKey: input.offerSetKey,
                 planId: input.planId,
                 providerPlanId: input.providerPlanId,
@@ -272,6 +277,7 @@ class FunnelSdkService {
             runtimeConfig: input.runtimeConfig,
             body: {
                 checkoutSessionId: input.checkoutSessionId,
+                offerSetId: input.offerSetId,
                 offerSetKey: input.offerSetKey,
                 planId: input.planId,
                 providerPlanId: input.providerPlanId,
@@ -306,6 +312,8 @@ class FunnelSdkService {
         return this.postJson('/sdk/public/payments/intents', {
             runtimeConfig: input.runtimeConfig,
             body: {
+                offerSetId: input.offerSetId,
+                offerSetKey: input.offerSetKey,
                 planId: input.planId,
                 amountCents: input.amountCents,
                 couponId: input.couponId,

package/package.json

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