@builder.io/sdk-svelte 5.0.1 → 5.1.1

package/lib/browser/components/block/components/block-wrapper.svelte

@@ -24,5 +24,11 @@ export let context;
     localState: $context.localState,
     context: $context.context,
     stripPrefix: true,
+    trackingContext: {
+      apiKey: $context.apiKey,
+      canTrack: $context.canTrack ?? true,
+      contentId: $context.content?.id,
+      variationId: $context.content?.testVariationId,
+    },
   })}><slot /></DynamicRenderer
 >

package/lib/browser/components/block/components/interactive-element.svelte

@@ -24,6 +24,12 @@ $: attributes = () => {
                 rootSetState: $context.rootSetState,
                 localState: $context.localState,
                 context: $context.context,
+                trackingContext: {
+                    apiKey: $context.apiKey,
+                    canTrack: $context.canTrack ?? true,
+                    contentId: $context.content?.id,
+                    variationId: $context.content?.testVariationId,
+                },
             }),
         }
         : {};

package/lib/browser/constants/sdk-version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "5.0.1";
+export declare const SDK_VERSION = "5.1.1";

package/lib/browser/constants/sdk-version.js

@@ -1 +1 @@
-export const SDK_VERSION = "5.0.1";
+export const SDK_VERSION = "5.1.1";

package/lib/browser/functions/evaluate/evaluate.d.ts

@@ -1,5 +1,5 @@
 import type { EvaluatorArgs } from './helpers';
 type EvalValue = unknown;
 export declare const getSimpleExpressionGetPath: (code: string) => string | undefined;
-export declare function evaluate({ code, context, localState, rootState, rootSetState, event, isExpression }: EvaluatorArgs): EvalValue;
+export declare function evaluate({ code, context, localState, rootState, rootSetState, event, isExpression, trackingContext }: EvaluatorArgs): EvalValue;
 export {};

package/lib/browser/functions/evaluate/evaluate.js

@@ -16,7 +16,7 @@ const VIRTUAL_INDEX_REGEX = /(\s)*var(\s)+_virtual_index(\s)*=(\s)*state(?<getPa
 export const getSimpleExpressionGetPath = (code) => {
     return STATE_GETTER_REGEX.exec(code.trim())?.groups?.getPath?.slice(1) || VIRTUAL_INDEX_REGEX.exec(code.trim())?.groups?.getPath?.slice(1);
 };
-export function evaluate({ code, context, localState, rootState, rootSetState, event, isExpression = true }) {
+export function evaluate({ code, context, localState, rootState, rootSetState, event, isExpression = true, trackingContext }) {
     if (code.trim() === '') {
         return undefined;
     }
@@ -37,7 +37,7 @@ export function evaluate({ code, context, localState, rootState, rootSetState, e
         code: parseCode(code, {
             isExpression
         }),
-        builder: getBuilderGlobals(),
+        builder: getBuilderGlobals(trackingContext),
         context,
         event,
         rootSetState,

package/lib/browser/functions/evaluate/helpers.d.ts

@@ -1,14 +1,22 @@
 import type { BuilderContextInterface, BuilderRenderState } from '../../context/types';
 import { getUserAttributes } from '../track/helpers';
+export type TrackingContext = {
+    apiKey: string | null;
+    canTrack?: boolean;
+    contentId?: string;
+    variationId?: string;
+};
 export type EvaluatorArgs = Omit<ExecutorArgs, 'builder' | 'event'> & {
     event?: Event;
     isExpression?: boolean;
+    trackingContext?: TrackingContext;
 };
 export type BuilderGlobals = {
     isEditing: boolean | undefined;
     isBrowser: boolean | undefined;
     isServer: boolean | undefined;
     getUserAttributes: typeof getUserAttributes;
+    trackConversion: (amount?: number, customProperties?: Record<string, any>) => void;
 };
 export type ExecutorArgs = Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'> & {
     code: string;
@@ -20,7 +28,7 @@ export type FunctionArguments = ReturnType<typeof getFunctionArguments>;
 export declare const getFunctionArguments: ({ builder, context, event, state }: Pick<ExecutorArgs, "context" | "builder" | "event"> & {
     state: BuilderRenderState;
 }) => [string, Event | BuilderRenderState | import("../../context/types").BuilderRenderContext | BuilderGlobals | undefined][];
-export declare const getBuilderGlobals: () => BuilderGlobals;
+export declare const getBuilderGlobals: (trackingContext?: TrackingContext) => BuilderGlobals;
 export declare const parseCode: (code: string, { isExpression }: Pick<EvaluatorArgs, 'isExpression'>) => string;
 export declare function flattenState({ rootState, localState, rootSetState }: {
     rootState: Record<string | symbol, any>;

package/lib/browser/functions/evaluate/helpers.js

@@ -1,6 +1,7 @@
 import { isBrowser } from '../is-browser';
 import { isEditing } from '../is-editing';
 import { getUserAttributes } from '../track/helpers';
+import { _track } from '../track/index';
 export const getFunctionArguments = ({ builder, context, event, state }) => {
     return Object.entries({
         state,
@@ -11,11 +12,29 @@ export const getFunctionArguments = ({ builder, context, event, state }) => {
         event
     });
 };
-export const getBuilderGlobals = () => ({
+export const getBuilderGlobals = (trackingContext) => ({
     isEditing: isEditing(),
     isBrowser: isBrowser(),
     isServer: !isBrowser(),
-    getUserAttributes: () => getUserAttributes()
+    getUserAttributes: () => getUserAttributes(),
+    trackConversion: (amount, customProperties) => {
+        if (!trackingContext?.apiKey || trackingContext?.canTrack === false) {
+            return;
+        }
+        _track({
+            type: 'conversion',
+            apiKey: trackingContext.apiKey,
+            canTrack: trackingContext.canTrack ?? true,
+            contentId: trackingContext.contentId,
+            variationId: trackingContext.variationId !== trackingContext.contentId ? trackingContext.variationId : undefined,
+            metadata: {
+                ...(customProperties || {}),
+                ...(amount !== undefined ? {
+                    amount
+                } : {})
+            }
+        });
+    }
 });
 export const parseCode = (code, { isExpression = true }) => {
     // Be able to handle simple expressions like "state.foo" or "1 + 1"

package/lib/browser/functions/evaluate/node-runtime/node-runtime.js

@@ -56,17 +56,23 @@ if (typeof output === 'object' && output !== null) {
 `;
 };
 let IVM_INSTANCE = null;
-let IVM_CONTEXT = null;
+// Create fresh isolates per request to prevent memory leaks
+let IVM_OPTIONS = {
+    memoryLimit: 128
+};
 /**
  * Set the `isolated-vm` instance to be used by the node runtime.
  * This is useful for environments that are not able to rely on our
  * `safeDynamicRequire` trick to import the `isolated-vm` package.
  */
-export const setIvm = (ivm, options = {}) => {
+export const setIvm = (ivm, options) => {
     if (IVM_INSTANCE)
         return;
     IVM_INSTANCE = ivm;
-    setIsolateContext(options);
+    // Store options to be used per-request in runInNode
+    if (options) {
+        IVM_OPTIONS = options;
+    }
 };
 // only mention the script for SDKs that have it.
 const SHOULD_MENTION_INITIALIZE_SCRIPT = SDK_NAME === '@builder.io/sdk-react-nextjs' || SDK_NAME === '@builder.io/sdk-react' || SDK_NAME === '@builder.io/sdk-qwik' || SDK_NAME === '@builder.io/sdk-vue';
@@ -91,73 +97,72 @@ const getIvm = () => {
     For more information, visit https://builder.io/c/docs/integration-tips#enabling-data-bindings-in-node-environments`;
     throw new Error(ERROR_MESSAGE);
 };
-function setIsolateContext(options = {
-    memoryLimit: 128
-}) {
-    if (IVM_CONTEXT)
-        return IVM_CONTEXT;
-    const ivm = getIvm();
-    const isolate = new ivm.Isolate(options);
-    const context = isolate.createContextSync();
-    const jail = context.global;
-    // This makes the global object available in the context as `global`. We use `derefInto()` here
-    // because otherwise `global` would actually be a Reference{} object in the new isolate.
-    jail.setSync('global', jail.derefInto());
-    // We will create a basic `log` function for the new isolate to use.
-    jail.setSync('log', function (...logArgs) {
-        console.log(...logArgs);
-    });
-    jail.setSync(INJECTED_IVM_GLOBAL, ivm);
-    IVM_CONTEXT = context;
-    return context;
-}
-const getIsolateContext = () => {
-    return setIsolateContext();
-};
 export const runInNode = ({ code, builder, context, event, localState, rootSetState, rootState }) => {
     const ivm = getIvm();
-    const state = fastClone({
-        ...rootState,
-        ...localState
-    });
-    const args = getFunctionArguments({
-        builder,
-        context,
-        event,
-        state
-    });
-    const isolateContext = getIsolateContext();
-    const jail = isolateContext.global;
-    /**
-     * Propagate state changes back to the reactive root state.
-     */
-    jail.setSync(BUILDER_SET_STATE_NAME, function (key, value) {
-        // mutate the `rootState` object itself. Important for cases where we do not have `rootSetState`
-        // like Qwik.
-        set(rootState, key, value);
-        // call the `rootSetState` function if it exists
-        rootSetState?.(rootState);
-    });
-    args.forEach(([key, arg]) => {
-        const val = typeof arg === 'object' ? new ivm.Reference(
-        // workaround: methods with default values for arguments is not being cloned over
-        key === 'builder' ? {
-            ...arg,
-            getUserAttributes: () => arg.getUserAttributes()
-        } : arg) : null;
-        jail.setSync(getSyncValName(key), val);
-    });
-    const evalStr = processCode({
-        code,
-        args
-    });
-    const resultStr = isolateContext.evalClosureSync(evalStr);
+    // Use stored options from setIvm, or default to { memoryLimit: 128 }
+    let isolate;
     try {
-        // returning objects throw errors in isolated vm, so we stringify it and parse it back
-        const res = JSON.parse(resultStr);
-        return res;
+        isolate = new ivm.Isolate(IVM_OPTIONS);
+        const isolateContext = isolate.createContextSync();
+        const jail = isolateContext.global;
+        // Setup the isolate
+        jail.setSync('global', jail.derefInto());
+        jail.setSync('log', function (...logArgs) {
+            console.log(...logArgs);
+        });
+        jail.setSync(INJECTED_IVM_GLOBAL, ivm);
+        const state = fastClone({
+            ...rootState,
+            ...localState
+        });
+        const args = getFunctionArguments({
+            builder,
+            context,
+            event,
+            state
+        });
+        /**
+         * Propagate state changes back to the reactive root state.
+         */
+        jail.setSync(BUILDER_SET_STATE_NAME, function (key, value) {
+            // mutate the `rootState` object itself. Important for cases where we do not have `rootSetState`
+            // like Qwik.
+            set(rootState, key, value);
+            // call the `rootSetState` function if it exists
+            rootSetState?.(rootState);
+        });
+        args.forEach(([key, arg]) => {
+            const val = typeof arg === 'object' ? new ivm.Reference(
+            // workaround: methods with default values for arguments is not being cloned over
+            key === 'builder' ? {
+                ...arg,
+                getUserAttributes: () => arg.getUserAttributes()
+            } : arg) : null;
+            jail.setSync(getSyncValName(key), val);
+        });
+        const evalStr = processCode({
+            code,
+            args
+        });
+        const resultStr = isolateContext.evalClosureSync(evalStr);
+        try {
+            // returning objects throw errors in isolated vm, so we stringify it and parse it back
+            const res = JSON.parse(resultStr);
+            return res;
+        }
+        catch (_error) {
+            return resultStr;
+        }
     }
-    catch (_error) {
-        return resultStr;
+    finally {
+        // Destroy the entire VM, this frees ALL memory at the C++ level.
+        if (isolate) {
+            try {
+                isolate.dispose();
+            }
+            catch (e) {
+                // Ignore disposal errors
+            }
+        }
     }
 };

package/lib/browser/functions/get-block-actions-handler.d.ts

@@ -1,7 +1,9 @@
 import type { BuilderContextInterface } from '../context/types';
 import type { BuilderBlock } from '../types/builder-block';
+import type { TrackingContext } from './evaluate/helpers';
 type Options = {
     block: BuilderBlock;
+    trackingContext?: TrackingContext;
 } & Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'>;
 type EventHandler = (event: Event) => any;
 export declare const createEventHandler: (value: string, options: Options) => EventHandler;

package/lib/browser/functions/get-block-actions-handler.js

@@ -6,5 +6,6 @@ export const createEventHandler = (value, options) => event => evaluate({
     rootState: options.rootState,
     rootSetState: options.rootSetState,
     event,
-    isExpression: false
+    isExpression: false,
+    trackingContext: options.trackingContext
 });

package/lib/browser/functions/get-block-actions.d.ts

@@ -1,10 +1,12 @@
 import type { BuilderContextInterface } from '../context/types';
 import type { BuilderBlock } from '../types/builder-block';
+import type { TrackingContext } from './evaluate/helpers';
 type Actions = {
     [index: string]: (event: Event) => any;
 };
 export declare function getBlockActions(options: {
     block: BuilderBlock;
     stripPrefix?: boolean;
+    trackingContext?: TrackingContext;
 } & Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'>): Actions;
 export {};

package/lib/edge/components/block/components/block-wrapper.svelte

@@ -24,5 +24,11 @@ export let context;
     localState: $context.localState,
     context: $context.context,
     stripPrefix: true,
+    trackingContext: {
+      apiKey: $context.apiKey,
+      canTrack: $context.canTrack ?? true,
+      contentId: $context.content?.id,
+      variationId: $context.content?.testVariationId,
+    },
   })}><slot /></DynamicRenderer
 >

package/lib/edge/components/block/components/interactive-element.svelte

@@ -24,6 +24,12 @@ $: attributes = () => {
                 rootSetState: $context.rootSetState,
                 localState: $context.localState,
                 context: $context.context,
+                trackingContext: {
+                    apiKey: $context.apiKey,
+                    canTrack: $context.canTrack ?? true,
+                    contentId: $context.content?.id,
+                    variationId: $context.content?.testVariationId,
+                },
             }),
         }
         : {};

package/lib/edge/constants/sdk-version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "5.0.1";
+export declare const SDK_VERSION = "5.1.1";

package/lib/edge/constants/sdk-version.js

@@ -1 +1 @@
-export const SDK_VERSION = "5.0.1";
+export const SDK_VERSION = "5.1.1";

package/lib/edge/functions/evaluate/evaluate.d.ts

@@ -1,5 +1,5 @@
 import type { EvaluatorArgs } from './helpers';
 type EvalValue = unknown;
 export declare const getSimpleExpressionGetPath: (code: string) => string | undefined;
-export declare function evaluate({ code, context, localState, rootState, rootSetState, event, isExpression }: EvaluatorArgs): EvalValue;
+export declare function evaluate({ code, context, localState, rootState, rootSetState, event, isExpression, trackingContext }: EvaluatorArgs): EvalValue;
 export {};

package/lib/edge/functions/evaluate/evaluate.js

@@ -16,7 +16,7 @@ const VIRTUAL_INDEX_REGEX = /(\s)*var(\s)+_virtual_index(\s)*=(\s)*state(?<getPa
 export const getSimpleExpressionGetPath = (code) => {
     return STATE_GETTER_REGEX.exec(code.trim())?.groups?.getPath?.slice(1) || VIRTUAL_INDEX_REGEX.exec(code.trim())?.groups?.getPath?.slice(1);
 };
-export function evaluate({ code, context, localState, rootState, rootSetState, event, isExpression = true }) {
+export function evaluate({ code, context, localState, rootState, rootSetState, event, isExpression = true, trackingContext }) {
     if (code.trim() === '') {
         return undefined;
     }
@@ -37,7 +37,7 @@ export function evaluate({ code, context, localState, rootState, rootSetState, e
         code: parseCode(code, {
             isExpression
         }),
-        builder: getBuilderGlobals(),
+        builder: getBuilderGlobals(trackingContext),
         context,
         event,
         rootSetState,

package/lib/edge/functions/evaluate/helpers.d.ts

@@ -1,14 +1,22 @@
 import type { BuilderContextInterface, BuilderRenderState } from '../../context/types';
 import { getUserAttributes } from '../track/helpers';
+export type TrackingContext = {
+    apiKey: string | null;
+    canTrack?: boolean;
+    contentId?: string;
+    variationId?: string;
+};
 export type EvaluatorArgs = Omit<ExecutorArgs, 'builder' | 'event'> & {
     event?: Event;
     isExpression?: boolean;
+    trackingContext?: TrackingContext;
 };
 export type BuilderGlobals = {
     isEditing: boolean | undefined;
     isBrowser: boolean | undefined;
     isServer: boolean | undefined;
     getUserAttributes: typeof getUserAttributes;
+    trackConversion: (amount?: number, customProperties?: Record<string, any>) => void;
 };
 export type ExecutorArgs = Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'> & {
     code: string;
@@ -20,7 +28,7 @@ export type FunctionArguments = ReturnType<typeof getFunctionArguments>;
 export declare const getFunctionArguments: ({ builder, context, event, state }: Pick<ExecutorArgs, "context" | "builder" | "event"> & {
     state: BuilderRenderState;
 }) => [string, Event | BuilderRenderState | import("../../context/types").BuilderRenderContext | BuilderGlobals | undefined][];
-export declare const getBuilderGlobals: () => BuilderGlobals;
+export declare const getBuilderGlobals: (trackingContext?: TrackingContext) => BuilderGlobals;
 export declare const parseCode: (code: string, { isExpression }: Pick<EvaluatorArgs, 'isExpression'>) => string;
 export declare function flattenState({ rootState, localState, rootSetState }: {
     rootState: Record<string | symbol, any>;

package/lib/edge/functions/evaluate/helpers.js

@@ -1,6 +1,7 @@
 import { isBrowser } from '../is-browser';
 import { isEditing } from '../is-editing';
 import { getUserAttributes } from '../track/helpers';
+import { _track } from '../track/index';
 export const getFunctionArguments = ({ builder, context, event, state }) => {
     return Object.entries({
         state,
@@ -11,11 +12,29 @@ export const getFunctionArguments = ({ builder, context, event, state }) => {
         event
     });
 };
-export const getBuilderGlobals = () => ({
+export const getBuilderGlobals = (trackingContext) => ({
     isEditing: isEditing(),
     isBrowser: isBrowser(),
     isServer: !isBrowser(),
-    getUserAttributes: () => getUserAttributes()
+    getUserAttributes: () => getUserAttributes(),
+    trackConversion: (amount, customProperties) => {
+        if (!trackingContext?.apiKey || trackingContext?.canTrack === false) {
+            return;
+        }
+        _track({
+            type: 'conversion',
+            apiKey: trackingContext.apiKey,
+            canTrack: trackingContext.canTrack ?? true,
+            contentId: trackingContext.contentId,
+            variationId: trackingContext.variationId !== trackingContext.contentId ? trackingContext.variationId : undefined,
+            metadata: {
+                ...(customProperties || {}),
+                ...(amount !== undefined ? {
+                    amount
+                } : {})
+            }
+        });
+    }
 });
 export const parseCode = (code, { isExpression = true }) => {
     // Be able to handle simple expressions like "state.foo" or "1 + 1"

package/lib/edge/functions/evaluate/node-runtime/node-runtime.js

@@ -56,17 +56,23 @@ if (typeof output === 'object' && output !== null) {
 `;
 };
 let IVM_INSTANCE = null;
-let IVM_CONTEXT = null;
+// Create fresh isolates per request to prevent memory leaks
+let IVM_OPTIONS = {
+    memoryLimit: 128
+};
 /**
  * Set the `isolated-vm` instance to be used by the node runtime.
  * This is useful for environments that are not able to rely on our
  * `safeDynamicRequire` trick to import the `isolated-vm` package.
  */
-export const setIvm = (ivm, options = {}) => {
+export const setIvm = (ivm, options) => {
     if (IVM_INSTANCE)
         return;
     IVM_INSTANCE = ivm;
-    setIsolateContext(options);
+    // Store options to be used per-request in runInNode
+    if (options) {
+        IVM_OPTIONS = options;
+    }
 };
 // only mention the script for SDKs that have it.
 const SHOULD_MENTION_INITIALIZE_SCRIPT = SDK_NAME === '@builder.io/sdk-react-nextjs' || SDK_NAME === '@builder.io/sdk-react' || SDK_NAME === '@builder.io/sdk-qwik' || SDK_NAME === '@builder.io/sdk-vue';
@@ -91,73 +97,72 @@ const getIvm = () => {
     For more information, visit https://builder.io/c/docs/integration-tips#enabling-data-bindings-in-node-environments`;
     throw new Error(ERROR_MESSAGE);
 };
-function setIsolateContext(options = {
-    memoryLimit: 128
-}) {
-    if (IVM_CONTEXT)
-        return IVM_CONTEXT;
-    const ivm = getIvm();
-    const isolate = new ivm.Isolate(options);
-    const context = isolate.createContextSync();
-    const jail = context.global;
-    // This makes the global object available in the context as `global`. We use `derefInto()` here
-    // because otherwise `global` would actually be a Reference{} object in the new isolate.
-    jail.setSync('global', jail.derefInto());
-    // We will create a basic `log` function for the new isolate to use.
-    jail.setSync('log', function (...logArgs) {
-        console.log(...logArgs);
-    });
-    jail.setSync(INJECTED_IVM_GLOBAL, ivm);
-    IVM_CONTEXT = context;
-    return context;
-}
-const getIsolateContext = () => {
-    return setIsolateContext();
-};
 export const runInNode = ({ code, builder, context, event, localState, rootSetState, rootState }) => {
     const ivm = getIvm();
-    const state = fastClone({
-        ...rootState,
-        ...localState
-    });
-    const args = getFunctionArguments({
-        builder,
-        context,
-        event,
-        state
-    });
-    const isolateContext = getIsolateContext();
-    const jail = isolateContext.global;
-    /**
-     * Propagate state changes back to the reactive root state.
-     */
-    jail.setSync(BUILDER_SET_STATE_NAME, function (key, value) {
-        // mutate the `rootState` object itself. Important for cases where we do not have `rootSetState`
-        // like Qwik.
-        set(rootState, key, value);
-        // call the `rootSetState` function if it exists
-        rootSetState?.(rootState);
-    });
-    args.forEach(([key, arg]) => {
-        const val = typeof arg === 'object' ? new ivm.Reference(
-        // workaround: methods with default values for arguments is not being cloned over
-        key === 'builder' ? {
-            ...arg,
-            getUserAttributes: () => arg.getUserAttributes()
-        } : arg) : null;
-        jail.setSync(getSyncValName(key), val);
-    });
-    const evalStr = processCode({
-        code,
-        args
-    });
-    const resultStr = isolateContext.evalClosureSync(evalStr);
+    // Use stored options from setIvm, or default to { memoryLimit: 128 }
+    let isolate;
     try {
-        // returning objects throw errors in isolated vm, so we stringify it and parse it back
-        const res = JSON.parse(resultStr);
-        return res;
+        isolate = new ivm.Isolate(IVM_OPTIONS);
+        const isolateContext = isolate.createContextSync();
+        const jail = isolateContext.global;
+        // Setup the isolate
+        jail.setSync('global', jail.derefInto());
+        jail.setSync('log', function (...logArgs) {
+            console.log(...logArgs);
+        });
+        jail.setSync(INJECTED_IVM_GLOBAL, ivm);
+        const state = fastClone({
+            ...rootState,
+            ...localState
+        });
+        const args = getFunctionArguments({
+            builder,
+            context,
+            event,
+            state
+        });
+        /**
+         * Propagate state changes back to the reactive root state.
+         */
+        jail.setSync(BUILDER_SET_STATE_NAME, function (key, value) {
+            // mutate the `rootState` object itself. Important for cases where we do not have `rootSetState`
+            // like Qwik.
+            set(rootState, key, value);
+            // call the `rootSetState` function if it exists
+            rootSetState?.(rootState);
+        });
+        args.forEach(([key, arg]) => {
+            const val = typeof arg === 'object' ? new ivm.Reference(
+            // workaround: methods with default values for arguments is not being cloned over
+            key === 'builder' ? {
+                ...arg,
+                getUserAttributes: () => arg.getUserAttributes()
+            } : arg) : null;
+            jail.setSync(getSyncValName(key), val);
+        });
+        const evalStr = processCode({
+            code,
+            args
+        });
+        const resultStr = isolateContext.evalClosureSync(evalStr);
+        try {
+            // returning objects throw errors in isolated vm, so we stringify it and parse it back
+            const res = JSON.parse(resultStr);
+            return res;
+        }
+        catch (_error) {
+            return resultStr;
+        }
     }
-    catch (_error) {
-        return resultStr;
+    finally {
+        // Destroy the entire VM, this frees ALL memory at the C++ level.
+        if (isolate) {
+            try {
+                isolate.dispose();
+            }
+            catch (e) {
+                // Ignore disposal errors
+            }
+        }
     }
 };

package/lib/edge/functions/get-block-actions-handler.d.ts

@@ -1,7 +1,9 @@
 import type { BuilderContextInterface } from '../context/types';
 import type { BuilderBlock } from '../types/builder-block';
+import type { TrackingContext } from './evaluate/helpers';
 type Options = {
     block: BuilderBlock;
+    trackingContext?: TrackingContext;
 } & Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'>;
 type EventHandler = (event: Event) => any;
 export declare const createEventHandler: (value: string, options: Options) => EventHandler;

package/lib/edge/functions/get-block-actions-handler.js

@@ -6,5 +6,6 @@ export const createEventHandler = (value, options) => event => evaluate({
     rootState: options.rootState,
     rootSetState: options.rootSetState,
     event,
-    isExpression: false
+    isExpression: false,
+    trackingContext: options.trackingContext
 });

package/lib/edge/functions/get-block-actions.d.ts

@@ -1,10 +1,12 @@
 import type { BuilderContextInterface } from '../context/types';
 import type { BuilderBlock } from '../types/builder-block';
+import type { TrackingContext } from './evaluate/helpers';
 type Actions = {
     [index: string]: (event: Event) => any;
 };
 export declare function getBlockActions(options: {
     block: BuilderBlock;
     stripPrefix?: boolean;
+    trackingContext?: TrackingContext;
 } & Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'>): Actions;
 export {};