@flowerforce/flowerbase 1.7.6-beta.7 → 1.7.6-beta.9

package/dist/auth/providers/local-userpass/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/local-userpass/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAuCzC;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,eAAe,iBAsZjE"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/local-userpass/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AA4CzC;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,eAAe,iBAmajE"}

package/dist/auth/providers/local-userpass/controller.js

@@ -49,14 +49,22 @@ function localUserPassController(app) {
         const resetMaxAttempts = constants_1.DEFAULT_CONFIG.AUTH_RESET_MAX_ATTEMPTS;
         const refreshTokenTtlMs = constants_1.DEFAULT_CONFIG.REFRESH_TOKEN_TTL_DAYS * 24 * 60 * 60 * 1000;
         const resolveLocalUserpassProvider = () => { var _a; return (_a = constants_1.AUTH_CONFIG.authProviders) === null || _a === void 0 ? void 0 : _a['local-userpass']; };
+        const invalidPasswordError = {
+            error: 'unauthorized',
+            error_code: 'InvalidPassword'
+        };
         try {
-            yield authDb.collection(resetPasswordCollection).createIndex({ createdAt: 1 }, { expireAfterSeconds: resetPasswordTtlSeconds });
+            yield authDb
+                .collection(resetPasswordCollection)
+                .createIndex({ createdAt: 1 }, { expireAfterSeconds: resetPasswordTtlSeconds });
         }
         catch (error) {
             console.error('Failed to ensure reset password TTL index', error);
         }
         try {
-            yield authDb.collection(refreshTokensCollection).createIndex({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+            yield authDb
+                .collection(refreshTokensCollection)
+                .createIndex({ expiresAt: 1 }, { expireAfterSeconds: 0 });
         }
         catch (error) {
             console.error('Failed to ensure refresh token TTL index', error);
@@ -80,8 +88,10 @@ function localUserPassController(app) {
                 const services = state_1.StateManager.select('services');
                 const currentFunction = functionsList[resetPasswordConfig.resetFunctionName];
                 const baseArgs = { token, tokenId, email, password, username: email };
-                const args = Array.isArray(extraArguments) ? [baseArgs, ...extraArguments] : [baseArgs];
-                const response = yield (0, context_1.GenerateContext)({
+                const args = Array.isArray(extraArguments)
+                    ? [baseArgs, ...extraArguments]
+                    : [baseArgs];
+                const response = (yield (0, context_1.GenerateContext)({
                     args,
                     app,
                     rules: {},
@@ -91,7 +101,7 @@ function localUserPassController(app) {
                     functionsList,
                     services,
                     runAsSystem: true
-                });
+                }));
                 const resetStatus = response === null || response === void 0 ? void 0 : response.status;
                 if (resetStatus === 'success') {
                     if (!password) {
@@ -138,13 +148,17 @@ function localUserPassController(app) {
             }
             let result;
             try {
-                result = yield (0, handleUserRegistration_1.default)(app, { run_as_system: true, provider: handleUserRegistration_model_1.PROVIDER.LOCAL_USERPASS })({
+                result = yield (0, handleUserRegistration_1.default)(app, {
+                    run_as_system: true,
+                    provider: handleUserRegistration_model_1.PROVIDER.LOCAL_USERPASS
+                })({
                     email: req.body.email.toLowerCase(),
                     password: req.body.password
                 });
             }
             catch (error) {
-                if (error instanceof Error && error.message === 'This email address is already used') {
+                if (error instanceof Error &&
+                    error.message === 'This email address is already used') {
                     res.status(409).send({
                         error: 'name already in use',
                         error_code: 'AccountNameInUse'
@@ -179,10 +193,10 @@ function localUserPassController(app) {
                 res.status(429).send({ message: 'Too many requests' });
                 return;
             }
-            const existing = yield authDb.collection(authCollection).findOne({
+            const existing = (yield authDb.collection(authCollection).findOne({
                 confirmationToken: req.body.token,
                 confirmationTokenId: req.body.tokenId
-            });
+            }));
             if (!existing) {
                 res.status(500);
                 throw new Error(utils_1.AUTH_ERRORS.INVALID_TOKEN);
@@ -220,11 +234,13 @@ function localUserPassController(app) {
                     email: req.body.username
                 });
                 if (!authUser) {
-                    throw new Error(utils_1.AUTH_ERRORS.INVALID_CREDENTIALS);
+                    res.status(401);
+                    return invalidPasswordError;
                 }
                 const passwordMatches = yield (0, crypto_1.comparePassword)(req.body.password, authUser.password);
                 if (!passwordMatches) {
-                    throw new Error(utils_1.AUTH_ERRORS.INVALID_CREDENTIALS);
+                    res.status(401);
+                    return invalidPasswordError;
                 }
                 const user = user_id_field && userCollection
                     ? yield customUserDb
@@ -246,7 +262,9 @@ function localUserPassController(app) {
                     expiresAt: new Date(Date.now() + refreshTokenTtlMs),
                     revokedAt: null
                 });
-                yield authDb.collection(authCollection).updateOne({ _id: authUser._id }, { $set: { lastLoginAt: now } });
+                yield authDb
+                    .collection(authCollection)
+                    .updateOne({ _id: authUser._id }, { $set: { lastLoginAt: now } });
                 return {
                     access_token: this.createAccessToken(userWithCustomData),
                     refresh_token: refreshToken,

package/dist/auth/providers/local-userpass/dtos.d.ts

@@ -15,12 +15,16 @@ export type LoginSuccessDto = {
 export type ErrorResponseDto = {
     message: string;
 };
+export type InvalidPasswordResponseDto = {
+    error: 'unauthorized';
+    error_code: 'InvalidPassword';
+};
 export interface RegistrationDto {
     Body: RegisterUserDto;
 }
 export interface LoginDto {
     Body: LoginUserDto;
-    Reply: LoginSuccessDto | ErrorResponseDto;
+    Reply: LoginSuccessDto | ErrorResponseDto | InvalidPasswordResponseDto;
 }
 export interface ResetPasswordSendDto {
     Body: {

package/dist/auth/providers/local-userpass/dtos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dtos.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/local-userpass/dtos.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,eAAe,CAAA;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,YAAY,CAAA;IAClB,KAAK,EAAE,eAAe,GAAG,gBAAgB,CAAA;CAC1C;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;CACF;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,CAAC,EAAE,OAAO,EAAE,CAAA;KACtB,CAAA;CACF;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;CACF;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,MAAM,CAAA;KAChB,CAAA;CACF"}
+{"version":3,"file":"dtos.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/local-userpass/dtos.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,KAAK,EAAE,cAAc,CAAA;IACrB,UAAU,EAAE,iBAAiB,CAAA;CAC9B,CAAA;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,eAAe,CAAA;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,YAAY,CAAA;IAClB,KAAK,EAAE,eAAe,GAAG,gBAAgB,GAAG,0BAA0B,CAAA;CACvE;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;CACF;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,CAAC,EAAE,OAAO,EAAE,CAAA;KACtB,CAAA;CACF;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;CACF;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,MAAM,CAAA;KAChB,CAAA;CACF"}

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

@@ -1,4 +1,5 @@
 import { Document } from 'mongodb';
+export type PermissionExpression = boolean | Record<string, unknown>;
 export interface Filter {
     name: string;
     query: Record<string, unknown>;
@@ -9,11 +10,11 @@ export type Projection = Record<string, 0 | 1>;
 export interface Role {
     name: string;
     apply_when: Record<string, unknown>;
-    insert: boolean;
-    delete: boolean;
-    search: boolean;
-    read: boolean;
-    write: boolean;
+    insert: PermissionExpression;
+    delete: PermissionExpression;
+    search: PermissionExpression;
+    read: PermissionExpression;
+    write: PermissionExpression;
 }
 export interface RulesConfig {
     database: string;

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

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/features/rules/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AACD,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;AAC9C,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,KAAK,EAAE,IAAI,EAAE,CAAA;CAEd;AAED,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;AAE/C,MAAM,MAAM,wBAAwB,GAChC;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACnC;IAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACrC;IAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAClC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAClB;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GACjB;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACnC;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,GACxB;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;CAAE,GACtD;IAAE,UAAU,EAAE,cAAc,CAAA;CAAE,CAAA;AAElC,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,wBAAwB,EAAE,CAAC;CACvC;AAED,MAAM,MAAM,mBAAmB,GAAG,QAAQ,EAAE,CAAA;AAE5C,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,oBAAoB,CAAA;AAC1D,KAAK,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,wBAAwB,EAAE,CAAA;CAAE,CAAA;AAElF,oBAAY,gBAAgB;IAC1B,MAAM,YAAY;IAClB,UAAU,eAAe;IACzB,KAAK,WAAW;CACjB"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/features/rules/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAEpE,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AACD,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;AAC9C,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,MAAM,EAAE,oBAAoB,CAAA;IAC5B,MAAM,EAAE,oBAAoB,CAAA;IAC5B,MAAM,EAAE,oBAAoB,CAAA;IAC5B,IAAI,EAAE,oBAAoB,CAAA;IAC1B,KAAK,EAAE,oBAAoB,CAAA;CAC5B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,KAAK,EAAE,IAAI,EAAE,CAAA;CACd;AAED,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;AAE/C,MAAM,MAAM,wBAAwB,GAChC;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACnC;IAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACrC;IAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAClC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAClB;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GACjB;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACnC;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,GACxB;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;CAAE,GACtD;IAAE,UAAU,EAAE,cAAc,CAAA;CAAE,CAAA;AAElC,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,QAAQ,CAAC,EAAE,wBAAwB,EAAE,CAAA;CACtC;AAED,MAAM,MAAM,mBAAmB,GAAG,QAAQ,EAAE,CAAA;AAE5C,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,oBAAoB,CAAA;AAC1D,KAAK,oBAAoB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,wBAAwB,EAAE,CAAA;CAAE,CAAA;AAElF,oBAAY,gBAAgB;IAC1B,MAAM,YAAY;IAClB,UAAU,eAAe;IACzB,KAAK,WAAW;CACjB"}

package/dist/services/mongodb-atlas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,QAAQ,EAQT,MAAM,SAAS,CAAA;AAOhB,OAAO,EAGL,oBAAoB,EAErB,MAAM,SAAS,CAAA;AAgJhB,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,KAAG,OA0BnD,CAAA;AA4BD,eAAO,MAAM,2BAA2B,GAAI,UAAU,QAAQ,EAAE,YAK5D,CAAA;AAgtCJ,QAAA,MAAM,YAAY,EAAE,oBAwBlB,CAAA;AAEF,eAAe,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/mongodb-atlas/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,QAAQ,EAQT,MAAM,SAAS,CAAA;AAOhB,OAAO,EAGL,oBAAoB,EAErB,MAAM,SAAS,CAAA;AA6JhB,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,KAAG,OA0BnD,CAAA;AA8BD,eAAO,MAAM,2BAA2B,GAAI,UAAU,QAAQ,EAAE,YAK5D,CAAA;AAmzCJ,QAAA,MAAM,YAAY,EAAE,oBAwBlB,CAAA;AAEF,eAAe,YAAY,CAAA"}

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

@@ -115,11 +115,15 @@ const normalizeFindOneAndUpdateOptions = (options) => {
     if (!options)
         return undefined;
     const { returnNewDocument } = options, rest = __rest(options, ["returnNewDocument"]);
-    if (typeof returnNewDocument !== 'boolean' || typeof rest.returnDocument !== 'undefined') {
+    if (typeof returnNewDocument !== 'boolean' ||
+        typeof rest.returnDocument !== 'undefined') {
         return rest;
     }
     return Object.assign(Object.assign({}, rest), { returnDocument: returnNewDocument ? 'after' : 'before' });
 };
+const getValidationExpansions = (prevRoot) => ({
+    '%%prevRoot': prevRoot
+});
 const buildAndQuery = (clauses) => clauses.length ? { $and: clauses } : {};
 const watchChangeEventRootKeys = new Set([
     '_id',
@@ -140,7 +144,10 @@ const isWatchChangeEventPath = (key) => {
         key.startsWith('fullDocument.') ||
         key.startsWith('updateDescription.'));
 };
-const isWatchOpaqueChangeEventObjectKey = (key) => key === 'ns' || key === 'documentKey' || key === 'fullDocument' || key === 'updateDescription';
+const isWatchOpaqueChangeEventObjectKey = (key) => key === 'ns' ||
+    key === 'documentKey' ||
+    key === 'fullDocument' ||
+    key === 'updateDescription';
 const toWatchMatchFilter = (value) => {
     if (Array.isArray(value)) {
         return value.map((item) => (0, exports.toWatchMatchFilter)(item));
@@ -215,10 +222,7 @@ const resolveWatchArgs = (pipelineOrOptions, options) => {
     if (Array.isArray(ids)) {
         extraMatches.push({
             $match: {
-                $or: [
-                    { 'documentKey._id': { $in: ids } },
-                    { 'fullDocument._id': { $in: ids } }
-                ]
+                $or: [{ 'documentKey._id': { $in: ids } }, { 'fullDocument._id': { $in: ids } }]
             }
         });
     }
@@ -236,7 +240,7 @@ const matchesPullCondition = (item, operand) => {
         return (0, isEqual_1.default)(item, operand);
     if (hasOperatorExpressions(operand)) {
         if (Array.isArray(operand.$in)) {
-            return (operand.$in).some((candidate) => (0, isEqual_1.default)(candidate, item));
+            return operand.$in.some((candidate) => (0, isEqual_1.default)(candidate, item));
         }
         return false;
     }
@@ -274,8 +278,9 @@ const applyDocumentUpdateOperators = (baseDocument, update) => {
                 Object.entries(payload).forEach(([path, value]) => {
                     const currentValue = (0, get_1.default)(updated, path);
                     const targetArray = Array.isArray(currentValue) ? [...currentValue] : [];
-                    if (isPlainObject(value) && Array.isArray(value.$each)) {
-                        targetArray.push(...(value.$each));
+                    if (isPlainObject(value) &&
+                        Array.isArray(value.$each)) {
+                        targetArray.push(...value.$each);
                     }
                     else {
                         targetArray.push(value);
@@ -341,7 +346,8 @@ const applyDocumentUpdateOperators = (baseDocument, update) => {
                     const currentValue = (0, get_1.default)(updated, path);
                     const comparableCurrent = currentValue;
                     const comparableValue = value;
-                    if (typeof currentValue === 'undefined' || comparableCurrent > comparableValue) {
+                    if (typeof currentValue === 'undefined' ||
+                        comparableCurrent > comparableValue) {
                         (0, set_1.default)(updated, path, value);
                     }
                 });
@@ -351,7 +357,8 @@ const applyDocumentUpdateOperators = (baseDocument, update) => {
                     const currentValue = (0, get_1.default)(updated, path);
                     const comparableCurrent = currentValue;
                     const comparableValue = value;
-                    if (typeof currentValue === 'undefined' || comparableCurrent < comparableValue) {
+                    if (typeof currentValue === 'undefined' ||
+                        comparableCurrent < comparableValue) {
                         (0, set_1.default)(updated, path, value);
                     }
                 });
@@ -490,7 +497,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                             type: 'read',
                             roles,
                             cursor: result,
-                            expansions: {}
+                            expansions: getValidationExpansions(result)
                         }, user)
                         : fallbackAccess(result);
                     // Return validated document or empty object if not permitted
@@ -546,7 +553,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                             type: 'delete',
                             roles,
                             cursor: result,
-                            expansions: {}
+                            expansions: getValidationExpansions(result)
                         }, user)
                         : fallbackAccess(result);
                     if (!status) {
@@ -595,7 +602,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                             type: 'insert',
                             roles,
                             cursor: data,
-                            expansions: {}
+                            expansions: getValidationExpansions()
                         }, user)
                         : fallbackAccess(data);
                     if (!status || !(0, isEqual_1.default)(data, document)) {
@@ -672,7 +679,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                             type: 'write',
                             roles,
                             cursor: docToCheck,
-                            expansions: {}
+                            expansions: getValidationExpansions(result)
                         }, user)
                         : fallbackAccess(docToCheck);
                     // Ensure no unauthorized changes are made
@@ -735,11 +742,13 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                     }
                     else {
                         const [computedDoc] = Array.isArray(normalizedData)
-                            ? yield collection.aggregate([
+                            ? yield collection
+                                .aggregate([
                                 { $match: buildAndQuery(safeQuery) },
                                 { $limit: 1 },
                                 ...normalizedData
-                            ]).toArray()
+                            ])
+                                .toArray()
                             : [applyDocumentUpdateOperators(currentDoc, normalizedData)];
                         docToCheck = computedDoc;
                     }
@@ -749,7 +758,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                             type: validationType,
                             roles,
                             cursor: docToCheck,
-                            expansions: {}
+                            expansions: getValidationExpansions(validationType === 'insert' ? undefined : currentDoc)
                         }, user)
                         : fallbackAccess(docToCheck);
                     const areDocumentsEqual = areUpdatedFieldsAllowed(document, docToCheck, updatedPaths);
@@ -769,10 +778,12 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                             type: 'read',
                             roles,
                             cursor: updateResult,
-                            expansions: {}
+                            expansions: getValidationExpansions(updateResult)
                         }, user)
                         : fallbackAccess(updateResult);
-                    const sanitizedDoc = readResult.status ? ((_a = readResult.document) !== null && _a !== void 0 ? _a : updateResult) : {};
+                    const sanitizedDoc = readResult.status
+                        ? ((_a = readResult.document) !== null && _a !== void 0 ? _a : updateResult)
+                        : {};
                     emitMongoEvent('findOneAndUpdate');
                     return sanitizedDoc;
                 }
@@ -841,7 +852,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                                     type: 'read',
                                     roles,
                                     cursor: currentDoc,
-                                    expansions: {}
+                                    expansions: getValidationExpansions(currentDoc)
                                 }, user)
                                 : fallbackAccess(currentDoc);
                             return status ? document : undefined;
@@ -921,7 +932,9 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
          * This allows fine-grained control over what change events a user can observe, based on roles and filters.
          */
         watch: (pipelineOrOptions = [], options) => {
-            const changestreamCollection = mongo[constants_1.CHANGESTREAM].client.db(dbName).collection(collName);
+            const changestreamCollection = mongo[constants_1.CHANGESTREAM].client
+                .db(dbName)
+                .collection(collName);
             try {
                 const { pipeline, options: watchOptions, extraMatches } = resolveWatchArgs(pipelineOrOptions, options);
                 if (!run_as_system) {
@@ -965,7 +978,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                                 type: 'read',
                                 roles,
                                 cursor: fullDocument,
-                                expansions: {}
+                                expansions: getValidationExpansions(fullDocument)
                             }, user)
                             : fallbackAccess(fullDocument);
                         const { status, document } = fullDocumentValidation;
@@ -974,7 +987,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                                 type: 'read',
                                 roles,
                                 cursor: updateDescription === null || updateDescription === void 0 ? void 0 : updateDescription.updatedFields,
-                                expansions: {}
+                                expansions: getValidationExpansions(fullDocument)
                             }, user)
                             : fallbackAccess(updateDescription === null || updateDescription === void 0 ? void 0 : updateDescription.updatedFields);
                         return {
@@ -1077,7 +1090,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                                 type: 'insert',
                                 roles,
                                 cursor: currentDoc,
-                                expansions: {}
+                                expansions: getValidationExpansions()
                             }, user)
                             : fallbackAccess(currentDoc);
                         return status ? document : undefined;
@@ -1115,14 +1128,14 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                     // Check if the update data contains MongoDB update operators (e.g., $set, $inc)
                     const updatedPaths = getUpdatedPaths(normalizedData);
                     const docsToCheck = result.map((currentDoc) => applyDocumentUpdateOperators(currentDoc, normalizedData));
-                    const filteredItems = yield Promise.all(docsToCheck.map((currentDoc) => __awaiter(void 0, void 0, void 0, function* () {
+                    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 { status, document } = winningRole
                             ? yield (0, machines_1.checkValidation)(winningRole, {
                                 type: 'write',
                                 roles,
                                 cursor: currentDoc,
-                                expansions: {}
+                                expansions: getValidationExpansions(result[index])
                             }, user)
                             : fallbackAccess(currentDoc);
                         return status ? document : undefined;
@@ -1176,7 +1189,7 @@ const getOperators = (mongo, { rules, dbName, collName, user, run_as_system, mon
                                 type: 'delete',
                                 roles,
                                 cursor: currentDoc,
-                                expansions: {}
+                                expansions: getValidationExpansions(currentDoc)
                             }, user)
                             : fallbackAccess(currentDoc);
                         return status ? document : undefined;

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;AAgBrD,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,cAAc,CAAC,QAAQ,CAAC,EAChC,aAAa,oBAAoB,EACjC,OAAO,cAAc,CAAC,MAAM,CAAC,KAC5B,OAAO,CAAC,OAAO,CAiBjB,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;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"}

package/dist/utils/roles/helpers.js

@@ -30,13 +30,16 @@ const normalizeUserRole = (user) => {
     const customRole = typeof candidate.custom_data === 'object' && candidate.custom_data !== null
         ? candidate.custom_data.role
         : undefined;
-    return typeof customRole === 'string' ? Object.assign(Object.assign({}, candidate), { role: customRole }) : user;
+    return typeof customRole === 'string'
+        ? Object.assign(Object.assign({}, candidate), { role: customRole })
+        : user;
 };
 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), { '%%user': normalizedUser, '%%true': true });
+    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 conditions = (0, rules_1.expandQuery)(expression, value);
     const complexCondition = Object.entries(conditions).find(([key]) => functionsConditions.includes(key));
     return complexCondition
@@ -61,7 +64,7 @@ const evaluateComplexExpression = (condition, params, user) => __awaiter(void 0,
     const response = yield (0, context_1.GenerateContext)({
         args: expandedArguments,
         app,
-        rules: state_1.StateManager.select("rules"),
+        rules: state_1.StateManager.select('rules'),
         user: normalizedUser,
         currentFunction,
         functionName: name,

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

@@ -1 +1 @@
-{"version":3,"file":"fieldPermissions.d.ts","sourceRoot":"","sources":["../../../../src/utils/roles/machines/fieldPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,OAAO,EAGL,IAAI,EACL,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AA0C5C,eAAO,MAAM,0BAA0B,GAAI,OAAO,IAAI,YACN,CAAA;AAEhD,eAAO,MAAM,gCAAgC,GAC3C,SAAS,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,EACzD,MAAM,MAAM,GAAG,OAAO,EACtB,UAAU;IACR,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,KACA,OAAO,CAAC,QAAQ,CAkClB,CAAA"}
+{"version":3,"file":"fieldPermissions.d.ts","sourceRoot":"","sources":["../../../../src/utils/roles/machines/fieldPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC,OAAO,EAGL,IAAI,EACL,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AA0C5C,eAAO,MAAM,0BAA0B,GAAI,OAAO,IAAI,YACN,CAAA;AAEhD,eAAO,MAAM,gCAAgC,GAC3C,SAAS,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,EACzD,MAAM,MAAM,GAAG,OAAO,EACtB,UAAU;IACR,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,KACA,OAAO,CAAC,QAAQ,CAoClB,CAAA"}

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

@@ -59,6 +59,9 @@ const filterDocumentByFieldPermissions = (context, mode, options) => __awaiter(v
                 if (typeof readAllowed !== 'undefined') {
                     allowed = readAllowed;
                 }
+                else if (!allowed && typeof permission.write !== 'undefined') {
+                    allowed = yield canWriteField(context, permission);
+                }
             }
             else {
                 allowed = yield canWriteField(context, permission);

package/dist/utils/rules-matcher/interface.d.ts

@@ -311,6 +311,7 @@ export type Operators = {
      * @returns
      */
     $regex: OperatorsFunction;
+    '%exists': OperatorsFunction;
     '%stringToOid': OperatorsFunction;
     '%oidToString': OperatorsFunction;
 };
@@ -331,6 +332,7 @@ export declare enum RulesOperators {
     $all = "$all",
     $size = "$size",
     $regex = "$regex",
+    '%exists' = "%exists",
     '%stringToOid' = "%stringToOid",
     '%oidToString' = "%oidToString"
 }

package/dist/utils/rules-matcher/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/utils/rules-matcher/interface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../src/utils/rules-matcher/interface.ts"],"names":[],"mappings":"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"}

package/dist/utils/rules-matcher/interface.js

@@ -19,6 +19,7 @@ var RulesOperators;
     RulesOperators["$all"] = "$all";
     RulesOperators["$size"] = "$size";
     RulesOperators["$regex"] = "$regex";
+    RulesOperators["%exists"] = "%exists";
     RulesOperators["%stringToOid"] = "%stringToOid";
     RulesOperators["%oidToString"] = "%oidToString";
 })(RulesOperators || (exports.RulesOperators = RulesOperators = {}));

package/dist/utils/rules-matcher/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/rules-matcher/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAe,MAAM,aAAa,CAAA;AAsDvE;;GAEG;AACH,QAAA,MAAM,iBAAiB,EAAE,iBAsNxB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,SAoDvB,CAAA;AAID,eAAe,iBAAiB,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/rules-matcher/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAe,MAAM,aAAa,CAAA;AAmEvE;;GAEG;AACH,QAAA,MAAM,iBAAiB,EAAE,iBAoNxB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,SAyDvB,CAAA;AAID,eAAe,iBAAiB,CAAA"}

package/dist/utils/rules-matcher/utils.js

@@ -23,7 +23,8 @@ const toObjectIdHex = (value) => {
         return null;
     }
     const maybeObjectId = value;
-    if (maybeObjectId._bsontype === 'ObjectId' && typeof maybeObjectId.toHexString === 'function') {
+    if (maybeObjectId._bsontype === 'ObjectId' &&
+        typeof maybeObjectId.toHexString === 'function') {
         const hex = maybeObjectId.toHexString();
         return HEX_24_REGEXP.test(hex) ? hex.toLowerCase() : null;
     }
@@ -41,7 +42,16 @@ const includesWithSemanticEquality = (value, candidate) => rulesMatcherUtils
     .forceArray(candidate)
     .some((item) => rulesMatcherUtils
     .forceArray(value)
-    .some((sourceItem) => rulesMatcherUtils.forceArray(item).some((candidateItem) => areSemanticallyEqual(sourceItem, candidateItem))));
+    .some((sourceItem) => rulesMatcherUtils
+    .forceArray(item)
+    .some((candidateItem) => areSemanticallyEqual(sourceItem, candidateItem))));
+const resolveRefPath = (data, refPath, prefix) => {
+    const exactMatch = (0, get_1.default)(data, refPath, undefined);
+    if (exactMatch !== undefined) {
+        return exactMatch;
+    }
+    return (0, get_1.default)(data, rulesMatcherUtils.getPath(refPath, prefix), undefined);
+};
 /**
  * Defines a utility object named rulesMatcherUtils, which contains various helper functions used for processing rules and data in a rule-matching context.
  */
@@ -60,7 +70,7 @@ const rulesMatcherUtils = {
         const { name } = (0, get_1.default)(valueBlock, [path], {}) || {};
         const { op, value, opt } = rulesMatcherUtils.getDefaultRule(valueBlock[path]);
         const valueRef = value && String(value).indexOf('$ref:') === 0
-            ? (0, get_1.default)(data, rulesMatcherUtils.getPath(value.replace('$ref:', ''), prefix), undefined)
+            ? resolveRefPath(data, value.replace('$ref:', ''), prefix)
             : value;
         if (!exports.operators[op]) {
             throw new Error(`Error missing operator:${op}`);
@@ -82,7 +92,9 @@ const rulesMatcherUtils = {
         const res = rulesMatcherUtils.getPath(path, prefix);
         const { value } = rulesMatcherUtils.getDefaultRule(valueBlock[path]);
         if (value && String(value).indexOf('$ref:') === 0) {
-            keys[rulesMatcherUtils.getPath(value.replace('$ref:', ''), prefix)] = true;
+            const refPath = value.replace('$ref:', '');
+            keys[refPath] = true;
+            keys[rulesMatcherUtils.getPath(refPath, prefix)] = true;
         }
         return (keys[res] = true);
     },
@@ -221,6 +233,7 @@ const rulesMatcherUtils = {
  */
 exports.operators = {
     $exists: (a, b) => !rulesMatcherUtils.isEmpty(a) === b,
+    '%exists': (a, b) => !rulesMatcherUtils.isEmpty(a) === b,
     $eq: (a, b) => areSemanticallyEqual(a, b),
     $ne: (a, b) => !areSemanticallyEqual(a, b),
     $gt: (a, b) => rulesMatcherUtils.forceNumber(a) > parseFloat(b),
@@ -233,9 +246,13 @@ exports.operators = {
     $strLte: (a, b) => String(a || '').length <= parseFloat(b),
     $in: (a, b) => includesWithSemanticEquality(a, b),
     $nin: (a, b) => !includesWithSemanticEquality(a, b),
-    $all: (a, b) => rulesMatcherUtils.forceArray(b).every((candidate) => rulesMatcherUtils
+    $all: (a, b) => rulesMatcherUtils
+        .forceArray(b)
+        .every((candidate) => rulesMatcherUtils
         .forceArray(a)
-        .some((value) => rulesMatcherUtils.forceArray(candidate).some((item) => areSemanticallyEqual(value, item)))),
+        .some((value) => rulesMatcherUtils
+        .forceArray(candidate)
+        .some((item) => areSemanticallyEqual(value, item)))),
     $size: (a, b) => Array.isArray(a) && a.length === parseFloat(b),
     $regex: (a, b, opt) => rulesMatcherUtils
         .forceArray(b)

package/package.json

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