@flowerforce/flowerbase 1.8.4-beta.1 → 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/monitoring/utils.d.ts

@@ -77,7 +77,7 @@ export declare const getErrorDetails: (error: unknown) => {
 };
 export declare const pickHeaders: (headers: FastifyRequest["headers"]) => unknown;
 export declare const createEventStore: (maxAgeMs: number, maxEvents: number) => EventStore;
-export declare const classifyRequest: (url: string) => "function" | "auth" | "http_endpoint" | "trigger" | "api" | "http";
+export declare const classifyRequest: (url: string) => "function" | "api" | "auth" | "http_endpoint" | "trigger" | "http";
 export declare const createEventId: () => string;
 export declare const buildRulesMeta: (meta?: MonitMeta) => {
     collection: string;

package/dist/services/mongodb-atlas/index.js

@@ -490,7 +490,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                         emitMongoEvent('findOne');
                         return null;
                     }
-                    const winningRole = (0, utils_2.getWinningRole)(result, user, roles);
+                    const winningRole = yield (0, utils_2.getWinningRoleAsync)(result, user, roles);
                     logDebug('findOne winningRole', {
                         collection: collName,
                         winningRoleName: (_a = winningRole === null || winningRole === void 0 ? void 0 : winningRole.name) !== null && _a !== void 0 ? _a : null,
@@ -546,7 +546,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                     const formattedQuery = (0, utils_3.getFormattedQuery)(filters, query, user);
                     // Retrieve the document to check permissions before deleting
                     const result = yield collection.findOne(buildAndQuery(formattedQuery));
-                    const winningRole = (0, utils_2.getWinningRole)(result, user, roles);
+                    const winningRole = yield (0, utils_2.getWinningRoleAsync)(result, user, roles);
                     logDebug('delete winningRole', {
                         collection: collName,
                         userId: getUserId(user),
@@ -600,7 +600,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
             try {
                 if (!run_as_system) {
                     (0, utils_3.checkDenyOperation)(normalizedRules, collection.collectionName, model_1.CRUD_OPERATIONS.CREATE);
-                    const winningRole = (0, utils_2.getWinningRole)(data, user, roles);
+                    const winningRole = yield (0, utils_2.getWinningRoleAsync)(data, user, roles);
                     const { status, document } = winningRole
                         ? yield (0, machines_1.checkValidation)(winningRole, {
                             type: 'insert',
@@ -673,7 +673,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                         }
                         throw new Error('Update not permitted');
                     }
-                    const winningRole = (0, utils_2.getWinningRole)(result, user, roles);
+                    const winningRole = yield (0, utils_2.getWinningRoleAsync)(result, user, roles);
                     // Check if the update data contains MongoDB update operators (e.g., $set, $inc)
                     const updatedPaths = getUpdatedPaths(normalizedData);
                     const docToCheck = applyDocumentUpdateOperators(result, normalizedData);
@@ -756,7 +756,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                             : [applyDocumentUpdateOperators(currentDoc, normalizedData)];
                         docToCheck = computedDoc;
                     }
-                    const winningRole = (0, utils_2.getWinningRole)(docToCheck, user, roles);
+                    const winningRole = yield (0, utils_2.getWinningRoleAsync)(docToCheck, user, roles);
                     const { status, document } = winningRole
                         ? yield (0, machines_1.checkValidation)(winningRole, {
                             type: validationType,
@@ -776,7 +776,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                         emitMongoEvent('findOneAndUpdate');
                         return updateResult;
                     }
-                    const readRole = (0, utils_2.getWinningRole)(updateResult, user, roles);
+                    const readRole = yield (0, utils_2.getWinningRoleAsync)(updateResult, user, roles);
                     const readResult = readRole
                         ? yield (0, machines_1.checkValidation)(readRole, {
                             type: 'read',
@@ -844,7 +844,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                         const response = yield originalToArray();
                         const filteredResponse = yield Promise.all(response.map((currentDoc) => __awaiter(void 0, void 0, void 0, function* () {
                             var _a;
-                            const winningRole = (0, utils_2.getWinningRole)(currentDoc, user, roles);
+                            const winningRole = yield (0, utils_2.getWinningRoleAsync)(currentDoc, user, roles);
                             logDebug('find winningRole', {
                                 collection: collName,
                                 userId: getUserId(user),
@@ -976,7 +976,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                     const isValidChange = (change) => __awaiter(void 0, void 0, void 0, function* () {
                         const { fullDocument, updateDescription } = change;
                         const hasFullDocument = !!fullDocument;
-                        const winningRole = (0, utils_2.getWinningRole)(fullDocument, user, roles);
+                        const winningRole = yield (0, utils_2.getWinningRoleAsync)(fullDocument, user, roles);
                         const fullDocumentValidation = winningRole
                             ? yield (0, machines_1.checkValidation)(winningRole, {
                                 type: 'read',
@@ -1088,7 +1088,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                     (0, utils_3.checkDenyOperation)(normalizedRules, collection.collectionName, model_1.CRUD_OPERATIONS.CREATE);
                     // Validate each document against user's roles
                     const filteredItems = yield Promise.all(documents.map((currentDoc) => __awaiter(void 0, void 0, void 0, function* () {
-                        const winningRole = (0, utils_2.getWinningRole)(currentDoc, user, roles);
+                        const winningRole = yield (0, utils_2.getWinningRoleAsync)(currentDoc, user, roles);
                         const { status, document } = winningRole
                             ? yield (0, machines_1.checkValidation)(winningRole, {
                                 type: 'insert',
@@ -1133,7 +1133,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                     const updatedPaths = getUpdatedPaths(normalizedData);
                     const docsToCheck = result.map((currentDoc) => applyDocumentUpdateOperators(currentDoc, normalizedData));
                     const filteredItems = yield Promise.all(docsToCheck.map((currentDoc, index) => __awaiter(void 0, void 0, void 0, function* () {
-                        const winningRole = (0, utils_2.getWinningRole)(currentDoc, user, roles);
+                        const winningRole = yield (0, utils_2.getWinningRoleAsync)(currentDoc, user, roles);
                         const { status, document } = winningRole
                             ? yield (0, machines_1.checkValidation)(winningRole, {
                                 type: 'write',
@@ -1187,7 +1187,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                     const data = yield collection.find({ $and: formattedQuery }).toArray();
                     // Filter and validate each document based on user's roles
                     const filteredItems = yield Promise.all(data.map((currentDoc) => __awaiter(void 0, void 0, void 0, function* () {
-                        const winningRole = (0, utils_2.getWinningRole)(currentDoc, user, roles);
+                        const winningRole = yield (0, utils_2.getWinningRoleAsync)(currentDoc, user, roles);
                         const { status, document } = winningRole
                             ? yield (0, machines_1.checkValidation)(winningRole, {
                                 type: 'delete',

package/dist/utils/context/helpers.d.ts

@@ -35,11 +35,11 @@ export declare const generateContextData: ({ user, services, app, rules, current
         request: {
             remoteIPAddress: string | undefined;
             id?: string | undefined;
-            host?: string | undefined;
-            method?: string | undefined;
-            url?: string | undefined;
             ips?: string[];
+            host?: string | undefined;
             hostname?: string | undefined;
+            url?: string | undefined;
+            method?: string | undefined;
             ip?: string | undefined;
         };
         user: unknown;

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/dist/utils/roles/helpers.d.ts

@@ -1,4 +1,5 @@
 import { PermissionExpression } from './interface';
 import { MachineContext } from './machines/interface';
+export declare const evaluateExpandedExpression: (expression: unknown, params: MachineContext["params"], user?: MachineContext["user"]) => Promise<boolean>;
 export declare const evaluateExpression: (params: MachineContext["params"], expression?: PermissionExpression, user?: MachineContext["user"]) => Promise<boolean>;
 //# sourceMappingURL=helpers.d.ts.map

package/dist/utils/roles/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/roles/helpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAkBrD,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,cAAc,CAAC,QAAQ,CAAC,EAChC,aAAa,oBAAoB,EACjC,OAAO,cAAc,CAAC,MAAM,CAAC,KAC5B,OAAO,CAAC,OAAO,CAoBjB,CAAA"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/roles/helpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AA+DrD,eAAO,MAAM,0BAA0B,GACrC,YAAY,OAAO,EACnB,QAAQ,cAAc,CAAC,QAAQ,CAAC,EAChC,OAAO,cAAc,CAAC,MAAM,CAAC,KAC5B,OAAO,CAAC,OAAO,CAwDjB,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,cAAc,CAAC,QAAQ,CAAC,EAChC,aAAa,oBAAoB,EACjC,OAAO,cAAc,CAAC,MAAM,CAAC,KAC5B,OAAO,CAAC,OAAO,CAMjB,CAAA"}

package/dist/utils/roles/helpers.js

@@ -12,13 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateExpression = void 0;
+exports.evaluateExpression = exports.evaluateExpandedExpression = void 0;
 const services_1 = require("../../services");
 const state_1 = require("../../state");
 const context_1 = require("../context");
 const rules_1 = require("../rules");
 const utils_1 = __importDefault(require("../rules-matcher/utils"));
 const functionsConditions = ['%%true', '%%false'];
+const andConditions = ['$and', '%and'];
+const orConditions = ['$or', '%or'];
 const normalizeUserRole = (user) => {
     if (!user)
         return user;
@@ -34,17 +36,84 @@ const normalizeUserRole = (user) => {
         ? Object.assign(Object.assign({}, candidate), { role: customRole })
         : user;
 };
+const buildEvaluationContext = (params, user) => {
+    var _a, _b, _c;
+    const normalizedUser = normalizeUserRole(user);
+    return Object.assign(Object.assign(Object.assign({}, ((_a = params.expansions) !== null && _a !== void 0 ? _a : {})), ((_b = params.cursor) !== null && _b !== void 0 ? _b : {})), { '%%root': params.cursor, '%%prevRoot': (_c = params.expansions) === null || _c === void 0 ? void 0 : _c['%%prevRoot'], '%%user': normalizedUser, '%%true': true, '%%false': false });
+};
+const getFunctionCondition = (expression) => {
+    if (!expression || typeof expression !== 'object' || Array.isArray(expression)) {
+        return null;
+    }
+    const entries = Object.entries(expression);
+    if (entries.length !== 1) {
+        return null;
+    }
+    const [key, value] = entries[0];
+    if (!functionsConditions.includes(key)) {
+        return null;
+    }
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return null;
+    }
+    return Object.prototype.hasOwnProperty.call(value, '%function')
+        ? [key, value]
+        : null;
+};
+const evaluateExpandedExpression = (expression, params, user) => __awaiter(void 0, void 0, void 0, function* () {
+    if (typeof expression === 'boolean') {
+        return expression;
+    }
+    if (!expression || typeof expression !== 'object') {
+        return Boolean(expression);
+    }
+    const block = expression;
+    const functionCondition = getFunctionCondition(block);
+    if (functionCondition) {
+        return evaluateComplexExpression(functionCondition, params, user);
+    }
+    const andKey = andConditions.find((key) => Object.prototype.hasOwnProperty.call(block, key));
+    if (andKey) {
+        const conditions = Array.isArray(block[andKey]) ? block[andKey] : [];
+        if (!conditions.length)
+            return true;
+        for (const condition of conditions) {
+            if (!(yield (0, exports.evaluateExpandedExpression)(condition, params, user))) {
+                return false;
+            }
+        }
+        return true;
+    }
+    const orKey = orConditions.find((key) => Object.prototype.hasOwnProperty.call(block, key));
+    if (orKey) {
+        const conditions = Array.isArray(block[orKey]) ? block[orKey] : [];
+        if (!conditions.length)
+            return true;
+        for (const condition of conditions) {
+            if (yield (0, exports.evaluateExpandedExpression)(condition, params, user)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    const keys = Object.keys(block);
+    if (keys.length > 1) {
+        for (const key of keys) {
+            if (!(yield (0, exports.evaluateExpandedExpression)({ [key]: block[key] }, params, user))) {
+                return false;
+            }
+        }
+        return true;
+    }
+    return utils_1.default.checkRule(block, buildEvaluationContext(params, user), {});
+});
+exports.evaluateExpandedExpression = evaluateExpandedExpression;
 const evaluateExpression = (params, expression, user) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     if (!expression || typeof expression === 'boolean')
         return !!expression;
-    const normalizedUser = normalizeUserRole(user);
-    const value = Object.assign(Object.assign(Object.assign({}, params.expansions), params.cursor), { '%%root': params.cursor, '%%prevRoot': (_a = params.expansions) === null || _a === void 0 ? void 0 : _a['%%prevRoot'], '%%user': normalizedUser, '%%true': true, '%%false': false });
+    const value = buildEvaluationContext(params, user);
     const conditions = (0, rules_1.expandQuery)(expression, value);
-    const complexCondition = Object.entries(conditions).find(([key]) => functionsConditions.includes(key));
-    return complexCondition
-        ? yield evaluateComplexExpression(complexCondition, params, normalizedUser)
-        : utils_1.default.checkRule(conditions, value, {});
+    return (0, exports.evaluateExpandedExpression)(conditions, params, user);
 });
 exports.evaluateExpression = evaluateExpression;
 const evaluateComplexExpression = (condition, params, user) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/utils/roles/machines/utils.d.ts

@@ -12,6 +12,7 @@ import { LogMachineInfoParams } from './interface';
  * @returns {Role | null} - Returns the first role that matches the `apply_when` condition, or `null` if none match.
  */
 export declare const getWinningRole: (document: OptionalId<Document> | null, user: User, roles?: Role[]) => Role | null;
+export declare const getWinningRoleAsync: (document: OptionalId<Document> | null, user: User, roles?: Role[]) => Promise<Role | null>;
 /**
  * Checks if the `apply_when` condition is valid for the given user and document.
  *
@@ -22,6 +23,7 @@ export declare const getWinningRole: (document: OptionalId<Document> | null, use
  * @returns {boolean} - Returns `true` if at least one valid rule is found, otherwise `false`.
  */
 export declare const checkApplyWhen: (apply_when: Role["apply_when"], user: User, document: OptionalId<Document> | null) => boolean;
+export declare const checkApplyWhenAsync: (apply_when: Role["apply_when"], user: User, document: OptionalId<Document> | null) => Promise<boolean>;
 /**
  * Logs machine step information if logging is enabled.
  *

package/dist/utils/roles/machines/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/roles/machines/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAA;AAGzC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAElD;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,GACzB,UAAU,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,EACrC,MAAM,IAAI,EACV,QAAO,IAAI,EAAO,KACjB,IAAI,GAAG,IAQT,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,GACzB,YAAY,IAAI,CAAC,YAAY,CAAC,EAC9B,MAAM,IAAI,EACV,UAAU,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,YAQtC,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,GAAI,sCAK5B,oBAAoB,SAEtB,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/utils/roles/machines/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAA;AAIzC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAElD;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,GACzB,UAAU,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,EACrC,MAAM,IAAI,EACV,QAAO,IAAI,EAAO,KACjB,IAAI,GAAG,IAQT,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,UAAU,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,EACrC,MAAM,IAAI,EACV,QAAO,IAAI,EAAO,KACjB,OAAO,CAAC,IAAI,GAAG,IAAI,CAQrB,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,GACzB,YAAY,IAAI,CAAC,YAAY,CAAC,EAC9B,MAAM,IAAI,EACV,UAAU,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,YAQtC,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,YAAY,IAAI,CAAC,YAAY,CAAC,EAC9B,MAAM,IAAI,EACV,UAAU,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,qBActC,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,GAAI,sCAK5B,oBAAoB,SAEtB,CAAA"}

package/dist/utils/roles/machines/utils.js

@@ -1,7 +1,17 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logMachineInfo = exports.checkApplyWhen = exports.getWinningRole = void 0;
+exports.logMachineInfo = exports.checkApplyWhenAsync = exports.checkApplyWhen = exports.getWinningRoleAsync = exports.getWinningRole = void 0;
 const utils_1 = require("../../../services/mongodb-atlas/utils");
+const helpers_1 = require("../helpers");
 /**
  * Determines the first applicable role for a given user and document.
  *
@@ -22,6 +32,17 @@ const getWinningRole = (document, user, roles = []) => {
     return null;
 };
 exports.getWinningRole = getWinningRole;
+const getWinningRoleAsync = (document_1, user_1, ...args_1) => __awaiter(void 0, [document_1, user_1, ...args_1], void 0, function* (document, user, roles = []) {
+    if (!roles.length)
+        return null;
+    for (const role of roles) {
+        if (yield (0, exports.checkApplyWhenAsync)(role.apply_when, user, document)) {
+            return role;
+        }
+    }
+    return null;
+});
+exports.getWinningRoleAsync = getWinningRoleAsync;
 /**
  * Checks if the `apply_when` condition is valid for the given user and document.
  *
@@ -40,6 +61,17 @@ const checkApplyWhen = (apply_when, user, document) => {
     return !!validRule.length;
 };
 exports.checkApplyWhen = checkApplyWhen;
+const checkApplyWhenAsync = (apply_when, user, document) => __awaiter(void 0, void 0, void 0, function* () {
+    return (0, helpers_1.evaluateExpression)({
+        type: 'read',
+        roles: [],
+        cursor: document,
+        expansions: {
+            '%%prevRoot': undefined
+        }
+    }, apply_when, user);
+});
+exports.checkApplyWhenAsync = checkApplyWhenAsync;
 /**
  * Logs machine step information if logging is enabled.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.8.4-beta.1",
+  "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 {