@flowerforce/flowerbase 1.8.4-beta.2 → 1.8.4-beta.3

package/dist/features/functions/interface.d.ts

@@ -10,6 +10,7 @@ export interface FunctionConfig {
 }
 export type Function = Omit<FunctionConfig, 'name'> & {
     code: string;
+    sourcePath?: string;
 };
 export type Functions = Record<string, Function>;
 export type RegisterFunctionsParams = {

package/dist/features/functions/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/features/functions/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE1C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAEtE,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;AAEhD,MAAM,MAAM,uBAAuB,GAAG;IACpC,GAAG,EAAE,eAAe,CAAA;IACpB,aAAa,EAAE,SAAS,CAAA;IACxB,SAAS,EAAE,KAAK,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,aAAa,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC,MAAM,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAA;IACvF,KAAK,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAA;IACvC,MAAM,EAAE,QAAQ,CAAA;IAChB,MAAM,CAAC,EAAE,QAAQ,CAAA;IACjB,UAAU,CAAC,EAAE,QAAQ,CAAA;IACrB,OAAO,CAAC,EAAE,QAAQ,CAAA;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,QAAQ,EAAE,CAAA;IACrB,QAAQ,EAAE,QAAQ,EAAE,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,0BAA0B,GAAG;IAChC,aAAa,EAAE,SAAS,CAAA;IACxB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC/B,GAAG,EAAE,eAAe,EACpB,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,0BAA0B,KACjD,OAAO,CAAC,IAAI,CAAC,CAAA"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/features/functions/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE1C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG;IACpD,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;AAEhD,MAAM,MAAM,uBAAuB,GAAG;IACpC,GAAG,EAAE,eAAe,CAAA;IACpB,aAAa,EAAE,SAAS,CAAA;IACxB,SAAS,EAAE,KAAK,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,aAAa,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC,MAAM,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAA;IACvF,KAAK,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAA;IACvC,MAAM,EAAE,QAAQ,CAAA;IAChB,MAAM,CAAC,EAAE,QAAQ,CAAA;IACjB,UAAU,CAAC,EAAE,QAAQ,CAAA;IACrB,OAAO,CAAC,EAAE,QAAQ,CAAA;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,QAAQ,EAAE,CAAA;IACrB,QAAQ,EAAE,QAAQ,EAAE,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,0BAA0B,GAAG;IAChC,aAAa,EAAE,SAAS,CAAA;IACxB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC/B,GAAG,EAAE,eAAe,EACpB,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,0BAA0B,KACjD,OAAO,CAAC,IAAI,CAAC,CAAA"}

package/dist/features/functions/utils.js

@@ -46,7 +46,7 @@ const loadFunctions = (...args_1) => __awaiter(void 0, [...args_1], void 0, func
             throw new Error(`File ${name}.js or ${name}.ts not found`);
         }
         code = fs_1.default.readFileSync(fnPath, 'utf-8');
-        acc[name] = Object.assign({ code }, opts);
+        acc[name] = Object.assign({ code, sourcePath: fnPath }, opts);
         return acc;
     }, {});
     return functions;

package/dist/utils/context/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/context/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AA4JnD;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,GAAG,EACH,KAAK,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,eAAsB,EACtB,OAAO,EACP,OAAO,EACR,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CA2G1C;AAED,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,GAAG,EACH,KAAK,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,eAAsB,EACtB,OAAO,EACR,EAAE,qBAAqB,GAAG,OAAO,CA6BjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/context/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AA8RnD;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,GAAG,EACH,KAAK,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,eAAsB,EACtB,OAAO,EACP,OAAO,EACR,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CA2G1C;AAED,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,GAAG,EACH,KAAK,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,eAAsB,EACtB,OAAO,EACR,EAAE,qBAAqB,GAAG,OAAO,CA0BjC"}

package/dist/utils/context/index.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateContext = GenerateContext;
 exports.GenerateContextSync = GenerateContextSync;
+const node_fs_1 = __importDefault(require("node:fs"));
 const node_module_1 = require("node:module");
 const node_path_1 = __importDefault(require("node:path"));
 const node_url_1 = require("node:url");
@@ -89,6 +90,27 @@ const wrapEsmModule = (code) => {
     ].join('\n');
     return `${prelude}\n${code}\n${trailer}`;
 };
+const transpileSandboxModule = (code) => {
+    const exportedNames = [];
+    let transformed = code.includes('import ')
+        ? transformImportsToRequire(code)
+        : code;
+    transformed = transformed.replace(/^\s*export\s+function\s+([A-Za-z_$][\w$]*)\s*\(/gm, (_match, name) => {
+        exportedNames.push(name);
+        return `function ${name}(`;
+    });
+    transformed = transformed.replace(/^\s*export\s+(const|let|var|class)\s+([A-Za-z_$][\w$]*)/gm, (_match, kind, name) => {
+        exportedNames.push(name);
+        return `${kind} ${name}`;
+    });
+    transformed = transformed.replace(/^\s*export\s+default\s+/gm, 'module.exports = ');
+    if (exportedNames.length === 0) {
+        return transformed;
+    }
+    return `${transformed}\n${[...new Set(exportedNames)]
+        .map((name) => `exports.${name} = ${name}`)
+        .join('\n')}`;
+};
 const resolveImportTarget = (specifier, customRequire) => {
     try {
         const resolved = customRequire.resolve(specifier);
@@ -109,6 +131,53 @@ const shouldFallbackFromVmModules = (error) => {
     const code = error.code;
     return code === 'ERR_VM_MODULES_DISABLED' || code === 'ERR_VM_MODULES_NOT_SUPPORTED';
 };
+const resolveModulePath = (specifier, parentFile) => {
+    const parentDir = node_path_1.default.dirname(parentFile);
+    const basePath = node_path_1.default.resolve(parentDir, specifier);
+    const candidates = [
+        basePath,
+        `${basePath}.js`,
+        `${basePath}.ts`,
+        node_path_1.default.join(basePath, 'index.js'),
+        node_path_1.default.join(basePath, 'index.ts')
+    ];
+    return candidates.find((candidate) => {
+        try {
+            return node_fs_1.default.statSync(candidate).isFile();
+        }
+        catch (_a) {
+            return false;
+        }
+    });
+};
+const executeSandboxModule = ({ code, contextData, filePath, moduleCache }) => {
+    var _a;
+    if (moduleCache.has(filePath)) {
+        return moduleCache.get(filePath);
+    }
+    const sandboxModule = { exports: {} };
+    moduleCache.set(filePath, sandboxModule.exports);
+    const baseRequire = (0, node_module_1.createRequire)(filePath);
+    const localRequire = ((specifier) => {
+        if (specifier.startsWith('.') || specifier.startsWith('/')) {
+            const resolvedPath = resolveModulePath(specifier, filePath);
+            if (resolvedPath) {
+                return executeSandboxModule({
+                    code: node_fs_1.default.readFileSync(resolvedPath, 'utf-8'),
+                    contextData,
+                    filePath: resolvedPath,
+                    moduleCache
+                });
+            }
+        }
+        return baseRequire(specifier);
+    });
+    const vmContext = vm_1.default.createContext(Object.assign(Object.assign({}, contextData), { require: localRequire, exports: sandboxModule.exports, module: sandboxModule, __filename: filePath, __dirname: node_path_1.default.dirname(filePath), __fb_require: localRequire, __fb_filename: filePath, __fb_dirname: node_path_1.default.dirname(filePath) }));
+    vm_1.default.runInContext(transpileSandboxModule(code), vmContext, { filename: filePath });
+    sandboxModule.exports = (_a = resolveExport(vmContext)) !== null && _a !== void 0 ? _a : sandboxModule.exports;
+    moduleCache.set(filePath, sandboxModule.exports);
+    return sandboxModule.exports;
+};
 const isExportedFunction = (value) => typeof value === 'function';
 const getDefaultExport = (value) => {
     if (!value || typeof value !== 'object')
@@ -128,11 +197,25 @@ const resolveExport = (ctx) => {
         return contextExports;
     return (_e = getDefaultExport(moduleExports)) !== null && _e !== void 0 ? _e : getDefaultExport(contextExports);
 };
-const buildVmContext = (contextData) => {
-    var _a, _b;
+const buildVmContext = (contextData, currentFunction) => {
+    var _a, _b, _c;
     const sandboxModule = { exports: {} };
-    const entryFile = (_b = (_a = require.main) === null || _a === void 0 ? void 0 : _a.filename) !== null && _b !== void 0 ? _b : process.cwd();
-    const customRequire = (0, node_module_1.createRequire)(entryFile);
+    const entryFile = (_c = (_a = currentFunction === null || currentFunction === void 0 ? void 0 : currentFunction.sourcePath) !== null && _a !== void 0 ? _a : (_b = require.main) === null || _b === void 0 ? void 0 : _b.filename) !== null && _c !== void 0 ? _c : process.cwd();
+    const moduleCache = new Map();
+    const customRequire = ((specifier) => {
+        if ((specifier.startsWith('.') || specifier.startsWith('/')) && (currentFunction === null || currentFunction === void 0 ? void 0 : currentFunction.sourcePath)) {
+            const resolvedPath = resolveModulePath(specifier, currentFunction.sourcePath);
+            if (resolvedPath) {
+                return executeSandboxModule({
+                    code: node_fs_1.default.readFileSync(resolvedPath, 'utf-8'),
+                    contextData,
+                    filePath: resolvedPath,
+                    moduleCache
+                });
+            }
+        }
+        return (0, node_module_1.createRequire)(entryFile)(specifier);
+    });
     const vmContext = vm_1.default.createContext(Object.assign(Object.assign({}, contextData), { require: customRequire, exports: sandboxModule.exports, module: sandboxModule, __filename,
         __dirname, __fb_require: customRequire, __fb_filename: __filename, __fb_dirname: __dirname }));
     return { sandboxModule, entryFile, customRequire, vmContext };
@@ -169,7 +252,7 @@ function GenerateContext(_a) {
                 GenerateContextSync,
                 request
             });
-            const { sandboxModule, entryFile, customRequire, vmContext } = buildVmContext(contextData);
+            const { sandboxModule, entryFile, customRequire, vmContext } = buildVmContext(contextData, functionToRun);
             const vmModules = vm_1.default;
             const hasStaticImport = /\bimport\s+/.test(functionToRun.code);
             let usedVmModules = false;
@@ -214,10 +297,7 @@ function GenerateContext(_a) {
                 }
             }
             if (!usedVmModules) {
-                const codeToRun = functionToRun.code.includes('import ')
-                    ? transformImportsToRequire(functionToRun.code)
-                    : functionToRun.code;
-                vm_1.default.runInContext(codeToRun, vmContext);
+                vm_1.default.runInContext(transpileSandboxModule(functionToRun.code), vmContext, { filename: entryFile });
             }
             sandboxModule.exports = (_a = resolveExport(vmContext)) !== null && _a !== void 0 ? _a : sandboxModule.exports;
             if (deserializeArgs) {
@@ -247,11 +327,8 @@ function GenerateContextSync({ args, app, rules, user, currentFunction, function
         GenerateContextSync,
         request
     });
-    const { sandboxModule, vmContext } = buildVmContext(contextData);
-    const codeToRun = functionToRun.code.includes('import ')
-        ? transformImportsToRequire(functionToRun.code)
-        : functionToRun.code;
-    vm_1.default.runInContext(codeToRun, vmContext);
+    const { sandboxModule, entryFile, vmContext } = buildVmContext(contextData, functionToRun);
+    vm_1.default.runInContext(transpileSandboxModule(functionToRun.code), vmContext, { filename: entryFile });
     sandboxModule.exports = (_a = resolveExport(vmContext)) !== null && _a !== void 0 ? _a : sandboxModule.exports;
     const fn = sandboxModule.exports;
     if (deserializeArgs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.8.4-beta.2",
+  "version": "1.8.4-beta.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/features/functions/interface.ts

@@ -10,7 +10,10 @@ export interface FunctionConfig {
   disable_arg_logs?: boolean
 }
 
-export type Function = Omit<FunctionConfig, 'name'> & { code: string }
+export type Function = Omit<FunctionConfig, 'name'> & {
+  code: string
+  sourcePath?: string
+}
 
 export type Functions = Record<string, Function>
 

package/src/features/functions/utils.ts

@@ -27,7 +27,7 @@ export const loadFunctions = async (rootDir = process.cwd()): Promise<Functions>
       throw new Error(`File ${name}.js or ${name}.ts not found`)
     }
     code = fs.readFileSync(fnPath, 'utf-8')
-    acc[name] = { code, ...opts }
+    acc[name] = { code, sourcePath: fnPath, ...opts }
 
     return acc
   }, {} as Functions)
@@ -74,8 +74,8 @@ export const executeQuery = async ({
     typeof projection !== 'undefined'
       ? parsedProjection
       : parsedOptions &&
-          typeof parsedOptions === 'object' &&
-          'projection' in parsedOptions
+        typeof parsedOptions === 'object' &&
+        'projection' in parsedOptions
         ? (parsedOptions as Document).projection
         : undefined
   return {

package/src/utils/__tests__/contextExecuteCompatibility.test.ts

@@ -1,5 +1,8 @@
 import { GenerateContextSync } from '../context'
 import { Functions } from '../../features/functions/interface'
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
 
 const mockServices = {
   api: jest.fn().mockReturnValue({}),
@@ -117,4 +120,41 @@ describe('context.functions.execute compatibility', () => {
 
     expect(result).toBe(true)
   })
+
+  it('loads same-directory helper modules for sandboxed functions', () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'flowerbase-context-'))
+    const helperPath = path.join(tempDir, 'getFreightRate.ts')
+
+    fs.writeFileSync(
+      helperPath,
+      'export function getFreightRate([address, amount, freightRateValues]) { return { address, total: amount * freightRateValues.multiplier } }'
+    )
+
+    const functionsList = {
+      caller: {
+        sourcePath: path.join(tempDir, 'caller.ts'),
+        code: `
+          import { getFreightRate } from './getFreightRate'
+
+          module.exports = function() {
+            return getFreightRate(['rome', 4, { multiplier: 2.5 }])
+          }
+        `
+      }
+    } as Functions
+
+    const result = GenerateContextSync({
+      args: [],
+      app: {} as any,
+      rules: {} as any,
+      user: {} as any,
+      currentFunction: functionsList.caller,
+      functionsList,
+      services: mockServices,
+      functionName: 'caller'
+    })
+
+    expect(result).toEqual({ address: 'rome', total: 10 })
+    fs.rmSync(tempDir, { recursive: true, force: true })
+  })
 })

package/src/utils/context/index.ts

@@ -1,9 +1,11 @@
+import fs from 'node:fs'
 import { createRequire } from 'node:module'
 import path from 'node:path'
 import { pathToFileURL } from 'node:url'
 import vm from 'vm'
 import { EJSON } from 'bson'
 import { StateManager } from '../../state'
+import { Function as AppFunction } from '../../features/functions/interface'
 import { generateContextData } from './helpers'
 import { GenerateContextParams } from './interface'
 
@@ -92,6 +94,42 @@ const wrapEsmModule = (code: string): string => {
   return `${prelude}\n${code}\n${trailer}`
 }
 
+const transpileSandboxModule = (code: string): string => {
+  const exportedNames: string[] = []
+  let transformed = code.includes('import ')
+    ? transformImportsToRequire(code)
+    : code
+
+  transformed = transformed.replace(
+    /^\s*export\s+function\s+([A-Za-z_$][\w$]*)\s*\(/gm,
+    (_match, name: string) => {
+      exportedNames.push(name)
+      return `function ${name}(`
+    }
+  )
+
+  transformed = transformed.replace(
+    /^\s*export\s+(const|let|var|class)\s+([A-Za-z_$][\w$]*)/gm,
+    (_match, kind: string, name: string) => {
+      exportedNames.push(name)
+      return `${kind} ${name}`
+    }
+  )
+
+  transformed = transformed.replace(
+    /^\s*export\s+default\s+/gm,
+    'module.exports = '
+  )
+
+  if (exportedNames.length === 0) {
+    return transformed
+  }
+
+  return `${transformed}\n${[...new Set(exportedNames)]
+    .map((name) => `exports.${name} = ${name}`)
+    .join('\n')}`
+}
+
 const resolveImportTarget = (specifier: string, customRequire: NodeRequire): string => {
   try {
     const resolved = customRequire.resolve(specifier)
@@ -123,6 +161,82 @@ type SandboxContext = vm.Context & {
   __fb_dirname?: string
 }
 
+type SandboxExecutionContext = ReturnType<typeof generateContextData>
+
+const resolveModulePath = (specifier: string, parentFile: string): string | undefined => {
+  const parentDir = path.dirname(parentFile)
+  const basePath = path.resolve(parentDir, specifier)
+  const candidates = [
+    basePath,
+    `${basePath}.js`,
+    `${basePath}.ts`,
+    path.join(basePath, 'index.js'),
+    path.join(basePath, 'index.ts')
+  ]
+
+  return candidates.find((candidate) => {
+    try {
+      return fs.statSync(candidate).isFile()
+    } catch {
+      return false
+    }
+  })
+}
+
+const executeSandboxModule = ({
+  code,
+  contextData,
+  filePath,
+  moduleCache
+}: {
+  code: string
+  contextData: SandboxExecutionContext
+  filePath: string
+  moduleCache: Map<string, unknown>
+}): unknown => {
+  if (moduleCache.has(filePath)) {
+    return moduleCache.get(filePath)
+  }
+
+  const sandboxModule: SandboxModule = { exports: {} }
+  moduleCache.set(filePath, sandboxModule.exports)
+  const baseRequire = createRequire(filePath)
+
+  const localRequire = ((specifier: string) => {
+    if (specifier.startsWith('.') || specifier.startsWith('/')) {
+      const resolvedPath = resolveModulePath(specifier, filePath)
+      if (resolvedPath) {
+        return executeSandboxModule({
+          code: fs.readFileSync(resolvedPath, 'utf-8'),
+          contextData,
+          filePath: resolvedPath,
+          moduleCache
+        })
+      }
+    }
+
+    return baseRequire(specifier)
+  }) as NodeRequire
+
+  const vmContext = vm.createContext({
+    ...contextData,
+    require: localRequire,
+    exports: sandboxModule.exports,
+    module: sandboxModule,
+    __filename: filePath,
+    __dirname: path.dirname(filePath),
+    __fb_require: localRequire,
+    __fb_filename: filePath,
+    __fb_dirname: path.dirname(filePath)
+  }) as SandboxContext
+
+  vm.runInContext(transpileSandboxModule(code), vmContext, { filename: filePath })
+  sandboxModule.exports = resolveExport(vmContext) ?? sandboxModule.exports
+  moduleCache.set(filePath, sandboxModule.exports)
+
+  return sandboxModule.exports
+}
+
 const isExportedFunction = (value: unknown): value is ExportedFunction =>
   typeof value === 'function'
 
@@ -141,10 +255,28 @@ const resolveExport = (ctx: SandboxContext): ExportedFunction | undefined => {
   return getDefaultExport(moduleExports) ?? getDefaultExport(contextExports)
 }
 
-const buildVmContext = (contextData: ReturnType<typeof generateContextData>) => {
+const buildVmContext = (
+  contextData: ReturnType<typeof generateContextData>,
+  currentFunction?: AppFunction
+) => {
   const sandboxModule: SandboxModule = { exports: {} }
-  const entryFile = require.main?.filename ?? process.cwd()
-  const customRequire = createRequire(entryFile)
+  const entryFile = currentFunction?.sourcePath ?? require.main?.filename ?? process.cwd()
+  const moduleCache = new Map<string, unknown>()
+  const customRequire = ((specifier: string) => {
+    if ((specifier.startsWith('.') || specifier.startsWith('/')) && currentFunction?.sourcePath) {
+      const resolvedPath = resolveModulePath(specifier, currentFunction.sourcePath)
+      if (resolvedPath) {
+        return executeSandboxModule({
+          code: fs.readFileSync(resolvedPath, 'utf-8'),
+          contextData,
+          filePath: resolvedPath,
+          moduleCache
+        })
+      }
+    }
+
+    return createRequire(entryFile)(specifier)
+  }) as NodeRequire
 
   const vmContext: SandboxContext = vm.createContext({
     ...contextData,
@@ -206,7 +338,10 @@ export async function GenerateContext({
       GenerateContextSync,
       request
     })
-    const { sandboxModule, entryFile, customRequire, vmContext } = buildVmContext(contextData)
+    const { sandboxModule, entryFile, customRequire, vmContext } = buildVmContext(
+      contextData,
+      functionToRun
+    )
 
     const vmModules = vm as typeof vm & {
       SourceTextModule?: typeof vm.SourceTextModule
@@ -271,10 +406,7 @@ export async function GenerateContext({
     }
 
     if (!usedVmModules) {
-      const codeToRun = functionToRun.code.includes('import ')
-        ? transformImportsToRequire(functionToRun.code)
-        : functionToRun.code
-      vm.runInContext(codeToRun, vmContext)
+      vm.runInContext(transpileSandboxModule(functionToRun.code), vmContext, { filename: entryFile })
     }
 
     sandboxModule.exports = resolveExport(vmContext) ?? sandboxModule.exports
@@ -323,12 +455,9 @@ export function GenerateContextSync({
     GenerateContextSync,
     request
   })
-  const { sandboxModule, vmContext } = buildVmContext(contextData)
-  const codeToRun = functionToRun.code.includes('import ')
-    ? transformImportsToRequire(functionToRun.code)
-    : functionToRun.code
+  const { sandboxModule, entryFile, vmContext } = buildVmContext(contextData, functionToRun)
 
-  vm.runInContext(codeToRun, vmContext)
+  vm.runInContext(transpileSandboxModule(functionToRun.code), vmContext, { filename: entryFile })
   sandboxModule.exports = resolveExport(vmContext) ?? sandboxModule.exports
   const fn = sandboxModule.exports as ExportedFunction
   if (deserializeArgs) {