@flowerforce/flowerbase 1.8.3 → 1.8.4-beta.2

package/dist/features/triggers/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/features/triggers/utils.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAW,QAAQ,EAAE,MAAM,aAAa,CAAA;AA0E9D;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GAAU,gBAAuB,KAAG,OAAO,CAAC,QAAQ,CAkB5E,CAAA;AA2qBD,eAAO,MAAM,gBAAgB;kHAppB1B,aAAa;iHA4jBb,aAAa;uHA1cb,aAAa;CAsiBf,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/features/triggers/utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAW,QAAQ,EAAE,MAAM,aAAa,CAAA;AA6E9D;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GAAU,gBAAuB,KAAG,OAAO,CAAC,QAAQ,CAkB5E,CAAA;AAmrBD,eAAO,MAAM,gBAAgB;kHA5pB1B,aAAa;iHAmkBb,aAAa;uHAhdb,aAAa;CA6iBf,CAAA"}

package/dist/features/triggers/utils.js

@@ -27,11 +27,13 @@ exports.TRIGGER_HANDLERS = exports.loadTriggers = void 0;
 const fs_1 = __importDefault(require("fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_cron_1 = __importDefault(require("node-cron"));
+const bson_1 = require("bson");
 const constants_1 = require("../../constants");
 const utils_1 = require("../../monitoring/utils");
 const state_1 = require("../../state");
 const utils_2 = require("../../utils");
 const context_1 = require("../../utils/context");
+const normalizeTriggerPayload = (value) => bson_1.EJSON.deserialize(bson_1.EJSON.serialize(value, { relaxed: false }));
 const registerOnClose = (app, handler, label) => {
     if (app.server) {
         app.server.once('close', () => {
@@ -148,7 +150,8 @@ const handleCronTrigger = (_a) => __awaiter(void 0, [_a], void 0, function* ({ c
                 currentFunction: triggerHandler,
                 functionName,
                 functionsList,
-                services
+                services,
+                deserializeArgs: false
             });
         }
         catch (error) {
@@ -332,7 +335,7 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGOUT' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: [Object.assign({ user: userData }, op)],
+                        args: [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -340,7 +343,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -352,7 +356,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGOUT' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -389,7 +392,7 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGIN' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: [Object.assign({ user: userData }, op)],
+                        args: [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -397,7 +400,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -409,7 +413,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'LOGIN' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -441,7 +444,9 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'DELETE' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
+                        args: isAutoTrigger
+                            ? [normalizeTriggerPayload(userData)]
+                            : [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -449,7 +454,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -461,7 +467,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'DELETE' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -495,7 +500,9 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'UPDATE' })
                     });
                     yield (0, context_1.GenerateContext)({
-                        args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
+                        args: isAutoTrigger
+                            ? [normalizeTriggerPayload(userData)]
+                            : [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                         app,
                         rules: state_1.StateManager.select("rules"),
                         user: {}, // TODO from currentUser ??
@@ -503,7 +510,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         functionName,
                         functionsList,
                         services,
-                        runAsSystem: true
+                        runAsSystem: true,
+                        deserializeArgs: false
                     });
                 }
                 catch (error) {
@@ -515,7 +523,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                         meta: Object.assign(Object.assign({}, baseMeta), { event: 'UPDATE' }),
                         error
                     });
-                    console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
                 }
                 return;
             }
@@ -586,7 +593,9 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     meta: Object.assign(Object.assign({}, baseMeta), { event: 'CREATE' })
                 });
                 yield (0, context_1.GenerateContext)({
-                    args: isAutoTrigger ? [userData] : [Object.assign({ user: userData }, op)],
+                    args: isAutoTrigger
+                        ? [normalizeTriggerPayload(userData)]
+                        : [normalizeTriggerPayload(Object.assign({ user: userData }, op))],
                     app,
                     rules: state_1.StateManager.select("rules"),
                     user: {}, // TODO from currentUser ??
@@ -594,7 +603,8 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     functionName,
                     functionsList,
                     services,
-                    runAsSystem: true
+                    runAsSystem: true,
+                    deserializeArgs: false
                 });
             }
             catch (error) {
@@ -606,7 +616,6 @@ const handleAuthenticationTrigger = (_a) => __awaiter(void 0, [_a], void 0, func
                     meta: Object.assign(Object.assign({}, baseMeta), { event: 'CREATE' }),
                     error
                 });
-                console.log("🚀 ~ handleAuthenticationTrigger ~ error:", error);
             }
         });
     });
@@ -677,14 +686,15 @@ const handleDataBaseTrigger = (_a) => __awaiter(void 0, [_a], void 0, function*
             });
             try {
                 yield (0, context_1.GenerateContext)({
-                    args: [change],
+                    args: [normalizeTriggerPayload(change)],
                     app,
                     rules: state_1.StateManager.select("rules"),
                     user: {}, // TODO add from?
                     currentFunction: triggerHandler,
                     functionName,
                     functionsList,
-                    services
+                    services,
+                    deserializeArgs: false
                 });
             }
             catch (error) {

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/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.3",
+  "version": "1.8.4-beta.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/features/triggers/__tests__/utils.test.ts

@@ -0,0 +1,112 @@
+import { ObjectId } from 'bson'
+import { GenerateContext } from '../../../utils/context'
+import { StateManager } from '../../../state'
+import { TRIGGER_HANDLERS } from '../utils'
+
+jest.mock('../../../utils/context', () => ({
+    GenerateContext: jest.fn()
+}))
+
+jest.mock('../../../state', () => ({
+    StateManager: {
+        select: jest.fn()
+    }
+}))
+
+const mockedGenerateContext = jest.mocked(GenerateContext)
+const mockedStateSelect = StateManager.select as jest.Mock
+
+describe('TRIGGER_HANDLERS.DATABASE', () => {
+    beforeEach(() => {
+        mockedGenerateContext.mockReset()
+        mockedGenerateContext.mockResolvedValue(undefined)
+        mockedStateSelect.mockReset()
+        mockedStateSelect.mockReturnValue(undefined)
+    })
+
+    it('preserves BSON ObjectId values in fullDocument before invoking the trigger function', async () => {
+        const changeListeners: Record<string, (...args: any[]) => unknown> = {}
+        const close = jest.fn(async () => undefined)
+        const watch = jest.fn(() => ({
+            on: jest.fn((event: string, listener: (...args: any[]) => unknown) => {
+                changeListeners[event] = listener
+            }),
+            close
+        }))
+
+        const collection = { watch }
+        const db = jest.fn(() => ({ collection: jest.fn(() => collection) }))
+        const client = { db }
+
+        const app = {
+            mongo: {
+                changestream: { client }
+            },
+            server: {
+                once: jest.fn()
+            }
+        } as any
+
+        await TRIGGER_HANDLERS.DATABASE({
+            config: {
+                database: 'flowerbase-test',
+                collection: 'activityLogs',
+                operation_types: ['INSERT'],
+                full_document: true,
+                full_document_before_change: false,
+                match: {},
+                project: {}
+            } as any,
+            triggerHandler: { code: 'module.exports = async function () {}' } as any,
+            functionsList: {
+                logTriggerEvent: { code: 'module.exports = async function () {}' }
+            } as any,
+            services: {} as any,
+            app,
+            triggerName: 'log-trigger-event',
+            triggerType: 'DATABASE',
+            functionName: 'logTriggerEvent'
+        })
+
+        const documentId = new ObjectId('507f1f77bcf86cd799439011')
+        const ownerId = new ObjectId('507f191e810c19729de860ea')
+
+        await changeListeners.change({
+            clusterTime: new Date(),
+            operationType: 'insert',
+            ns: { db: 'flowerbase-test', coll: 'activityLogs' },
+            documentKey: { _id: documentId },
+            fullDocument: {
+                _id: documentId,
+                ownerId
+            }
+        })
+
+        expect(mockedGenerateContext).toHaveBeenCalledTimes(1)
+        expect(mockedGenerateContext).toHaveBeenCalledWith(
+            expect.objectContaining({
+                deserializeArgs: false,
+                args: [
+                    expect.objectContaining({
+                        documentKey: expect.objectContaining({
+                            _id: expect.any(ObjectId)
+                        }),
+                        fullDocument: expect.objectContaining({
+                            _id: expect.any(ObjectId),
+                            ownerId: expect.any(ObjectId)
+                        })
+                    })
+                ]
+            })
+        )
+
+        const payload = mockedGenerateContext.mock.calls[0][0].args[0] as {
+            documentKey: { _id: ObjectId }
+            fullDocument: { _id: ObjectId; ownerId: ObjectId }
+        }
+
+        expect(payload.documentKey._id.toHexString()).toBe(documentId.toHexString())
+        expect(payload.fullDocument._id.toHexString()).toBe(documentId.toHexString())
+        expect(payload.fullDocument.ownerId.toHexString()).toBe(ownerId.toHexString())
+    })
+})