@funnelsgrove/runtime 0.1.49 → 0.1.51

package/dist/config/env.config.d.ts

@@ -37,6 +37,8 @@ export declare const RUNTIME_ENV_KEYS: {
     readonly googleAnalyticsId: "NEXT_PUBLIC_GOOGLE_ANALYTICS_ID";
     readonly googleTagManagerId: "NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID";
     readonly googleTagEventTarget: "NEXT_PUBLIC_GOOGLE_TAG_EVENT_TARGET";
+    readonly googleTagLeadSendTo: "NEXT_PUBLIC_GOOGLE_TAG_LEAD_SEND_TO";
+    readonly googleTagPurchaseSendTo: "NEXT_PUBLIC_GOOGLE_TAG_PURCHASE_SEND_TO";
     readonly funnelCustomDomain: "FUNNEL_CUSTOM_DOMAIN";
     readonly claimbeeWeeklyPriceId: "NEXT_PUBLIC_CLAIMBEE_WEEKLY_PRICE_ID";
     readonly claimbeeMonthlyPriceId: "NEXT_PUBLIC_CLAIMBEE_MONTHLY_PRICE_ID";

package/dist/config/env.config.js

@@ -48,6 +48,8 @@ export const RUNTIME_ENV_KEYS = {
     googleAnalyticsId: 'NEXT_PUBLIC_GOOGLE_ANALYTICS_ID',
     googleTagManagerId: 'NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID',
     googleTagEventTarget: 'NEXT_PUBLIC_GOOGLE_TAG_EVENT_TARGET',
+    googleTagLeadSendTo: 'NEXT_PUBLIC_GOOGLE_TAG_LEAD_SEND_TO',
+    googleTagPurchaseSendTo: 'NEXT_PUBLIC_GOOGLE_TAG_PURCHASE_SEND_TO',
     funnelCustomDomain: 'FUNNEL_CUSTOM_DOMAIN',
     claimbeeWeeklyPriceId: 'NEXT_PUBLIC_CLAIMBEE_WEEKLY_PRICE_ID',
     claimbeeMonthlyPriceId: 'NEXT_PUBLIC_CLAIMBEE_MONTHLY_PRICE_ID',
@@ -105,6 +107,8 @@ const RUNTIME_ENV_VALUES = {
     NEXT_PUBLIC_GOOGLE_ANALYTICS_ID: readRuntimeEnv(() => process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID),
     NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID: readRuntimeEnv(() => process.env.NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID),
     NEXT_PUBLIC_GOOGLE_TAG_EVENT_TARGET: readRuntimeEnv(() => process.env.NEXT_PUBLIC_GOOGLE_TAG_EVENT_TARGET),
+    NEXT_PUBLIC_GOOGLE_TAG_LEAD_SEND_TO: readRuntimeEnv(() => process.env.NEXT_PUBLIC_GOOGLE_TAG_LEAD_SEND_TO),
+    NEXT_PUBLIC_GOOGLE_TAG_PURCHASE_SEND_TO: readRuntimeEnv(() => process.env.NEXT_PUBLIC_GOOGLE_TAG_PURCHASE_SEND_TO),
     NEXT_PUBLIC_CLAIMBEE_WEEKLY_PRICE_ID: readRuntimeEnv(() => process.env.NEXT_PUBLIC_CLAIMBEE_WEEKLY_PRICE_ID),
     NEXT_PUBLIC_CLAIMBEE_MONTHLY_PRICE_ID: readRuntimeEnv(() => process.env.NEXT_PUBLIC_CLAIMBEE_MONTHLY_PRICE_ID),
     NEXT_PUBLIC_CLAIMBEE_YEARLY_PRICE_ID: readRuntimeEnv(() => process.env.NEXT_PUBLIC_CLAIMBEE_YEARLY_PRICE_ID),

package/dist/runtime/funnel-runtime.d.ts

@@ -7,6 +7,7 @@ export type FunnelStepOrderGraph = {
     entryPointStepIds?: readonly string[];
     edgesByStepId?: Partial<Record<string, readonly {
         toStepId: string;
+        conditionId?: string | null;
     }[]>>;
 };
 export declare const getFunnelStepSequence: (manifest: FunnelManifest) => FunnelStepId[];

package/dist/runtime/funnel-runtime.js

@@ -17,7 +17,10 @@ export const getFunnelStepIdsByEdgeOrder = (graph) => {
         }
         visitedStepIds.add(stepId);
         orderedStepIds.push(stepId);
-        for (const edge of ((_a = graph.edgesByStepId) === null || _a === void 0 ? void 0 : _a[stepId]) || []) {
+        const edges = [...(((_a = graph.edgesByStepId) === null || _a === void 0 ? void 0 : _a[stepId]) || [])].sort((left, right) => {
+            return Number(Boolean(left.conditionId)) - Number(Boolean(right.conditionId));
+        });
+        for (const edge of edges) {
             visit(edge.toStepId);
         }
     };

package/dist/runtime/use-funnel-flow-controller.d.ts

@@ -31,18 +31,6 @@ type FunnelFlowAnalyticsAdapter = {
         selected?: Record<string, unknown>;
         featureFlags?: Record<string, string>;
     }) => string | null;
-    trackStepEngaged?: (input: {
-        userId?: string;
-        environment?: 'test' | 'live';
-        stepId: string;
-        stepName: string;
-        stepType?: string;
-        startedAt: string;
-        engagedAt: string;
-        durationMs: number;
-        engagementThresholdMs: number;
-        featureFlags?: Record<string, string>;
-    }) => string | null;
     trackFunnelStarted?: (input: {
         userId?: string;
         environment?: 'test' | 'live';

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

@@ -13,7 +13,6 @@ import { resolveUrlUserAttributes } from './url-user-attributes.js';
 import { bootstrapPostHog, identifyPostHog, isPostHogReady, resolveExperimentVariant, } from './posthog-flags.js';
 import { getRuntimeMode, isEditorEnabled, useRuntimeMode } from '../services/runtime-mode.service.js';
 import { isPreviewFrameRuntime } from '../services/preview-frame.service.js';
-const FIRST_STEP_ENGAGEMENT_THRESHOLD_MS = 1000;
 export function computeRenderSuspended(input) {
     var _a;
     if (input.isPreviewRuntime || input.postHogReady) {
@@ -121,8 +120,6 @@ export function useFunnelFlowController({ analytics, initialStepId, initialAttri
     const prevStepIdRef = useRef(null);
     const firstStepViewedTrackedRef = useRef(false);
     const stepStartedAtByIdRef = useRef({});
-    const engagedStepIdsRef = useRef(new Set());
-    const firstStepEngagementTimerRef = useRef(null);
     const currentUserIdRef = useRef(user.id);
     const safeActiveStepId = useMemo(() => { var _a; return (_a = resolveRenderableStepId(activeStepId)) !== null && _a !== void 0 ? _a : safeInitialStepId; }, [activeStepId, resolveRenderableStepId, safeInitialStepId]);
     const activeStepMeta = stepById[safeActiveStepId];
@@ -453,37 +450,6 @@ export function useFunnelFlowController({ analytics, initialStepId, initialAttri
                     occurredAt: startedAt,
                     featureFlags: postHogFeatureFlagsRef.current,
                 });
-                if (!engagedStepIdsRef.current.has(renderedStepId)) {
-                    if (firstStepEngagementTimerRef.current !== null) {
-                        window.clearTimeout(firstStepEngagementTimerRef.current);
-                    }
-                    const engagedStepId = renderedStepId;
-                    const engagedStartedAt = startedAt;
-                    const engagedStepName = stepName;
-                    const engagedStepType = stepType;
-                    firstStepEngagementTimerRef.current = window.setTimeout(() => {
-                        var _a;
-                        firstStepEngagementTimerRef.current = null;
-                        if (prevStepIdRef.current !== engagedStepId ||
-                            engagedStepIdsRef.current.has(engagedStepId)) {
-                            return;
-                        }
-                        engagedStepIdsRef.current.add(engagedStepId);
-                        const engagedAt = new Date().toISOString();
-                        (_a = analytics === null || analytics === void 0 ? void 0 : analytics.trackStepEngaged) === null || _a === void 0 ? void 0 : _a.call(analytics, {
-                            userId: currentUserIdRef.current,
-                            environment: analyticsRuntimeMode,
-                            stepId: engagedStepId,
-                            stepName: engagedStepName,
-                            stepType: engagedStepType,
-                            startedAt: engagedStartedAt,
-                            engagedAt,
-                            durationMs: FIRST_STEP_ENGAGEMENT_THRESHOLD_MS,
-                            engagementThresholdMs: FIRST_STEP_ENGAGEMENT_THRESHOLD_MS,
-                            featureFlags: postHogFeatureFlagsRef.current,
-                        });
-                    }, FIRST_STEP_ENGAGEMENT_THRESHOLD_MS);
-                }
             }
         }
         attributesAtStepStart.current = Object.assign({}, attributesRef.current);
@@ -501,12 +467,6 @@ export function useFunnelFlowController({ analytics, initialStepId, initialAttri
         renderedStepMeta === null || renderedStepMeta === void 0 ? void 0 : renderedStepMeta.type,
         safeActiveStepId,
     ]);
-    useEffect(() => () => {
-        if (firstStepEngagementTimerRef.current !== null) {
-            window.clearTimeout(firstStepEngagementTimerRef.current);
-            firstStepEngagementTimerRef.current = null;
-        }
-    }, []);
     useEffect(() => {
         setActiveStepId(safeInitialStepId);
     }, [safeInitialStepId]);

package/dist/services/project-env.d.ts

@@ -37,6 +37,8 @@ export declare const PROJECT_ENV_STANDARD_KEYS: {
     readonly googleAnalyticsId: "NEXT_PUBLIC_GOOGLE_ANALYTICS_ID";
     readonly googleTagManagerId: "NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID";
     readonly googleTagEventTarget: "NEXT_PUBLIC_GOOGLE_TAG_EVENT_TARGET";
+    readonly googleTagLeadSendTo: "NEXT_PUBLIC_GOOGLE_TAG_LEAD_SEND_TO";
+    readonly googleTagPurchaseSendTo: "NEXT_PUBLIC_GOOGLE_TAG_PURCHASE_SEND_TO";
 };
 export type ProjectEnvStandardKey = keyof typeof PROJECT_ENV_STANDARD_KEYS;
 export type ProjectEnvStandardValues = Record<ProjectEnvStandardKey, string>;

package/dist/services/project-env.js

@@ -37,6 +37,8 @@ export const PROJECT_ENV_STANDARD_KEYS = {
     googleAnalyticsId: 'NEXT_PUBLIC_GOOGLE_ANALYTICS_ID',
     googleTagManagerId: 'NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID',
     googleTagEventTarget: 'NEXT_PUBLIC_GOOGLE_TAG_EVENT_TARGET',
+    googleTagLeadSendTo: 'NEXT_PUBLIC_GOOGLE_TAG_LEAD_SEND_TO',
+    googleTagPurchaseSendTo: 'NEXT_PUBLIC_GOOGLE_TAG_PURCHASE_SEND_TO',
 };
 export const normalizeProjectEnvValue = (value) => {
     return (value === null || value === void 0 ? void 0 : value.trim()) || '';
@@ -108,6 +110,8 @@ const buildProjectStandardValues = (envMap) => {
         googleAnalyticsId: getProjectEnvValue(envMap, PROJECT_ENV_STANDARD_KEYS.googleAnalyticsId),
         googleTagManagerId: getProjectEnvValue(envMap, PROJECT_ENV_STANDARD_KEYS.googleTagManagerId),
         googleTagEventTarget: getProjectEnvValue(envMap, PROJECT_ENV_STANDARD_KEYS.googleTagEventTarget),
+        googleTagLeadSendTo: getProjectEnvValue(envMap, PROJECT_ENV_STANDARD_KEYS.googleTagLeadSendTo),
+        googleTagPurchaseSendTo: getProjectEnvValue(envMap, PROJECT_ENV_STANDARD_KEYS.googleTagPurchaseSendTo),
     };
 };
 export const parseProjectEnvVariables = (variables) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/runtime",
-  "version": "0.1.49",
+  "version": "0.1.51",
   "type": "module",
   "private": false,
   "main": "./dist/index.js",