@flowerforce/flowerbase 1.8.1-beta.3 → 1.8.1-beta.4

package/dist/utils/roles/machines/write/B/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/utils/roles/machines/write/B/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAGxC,eAAO,MAAM,aAAa,EAAE,MAgE3B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/utils/roles/machines/write/B/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAGxC,eAAO,MAAM,aAAa,EAAE,MAmE3B,CAAA"}

package/dist/utils/roles/machines/write/B/index.js

@@ -44,6 +44,9 @@ exports.STEP_B_STATES = {
         });
         const check = yield (0, commonValidators_1.evaluateTopLevelPermissionsFn)(context, 'write');
         if (check) {
+            if (context.params.type === 'write') {
+                return endValidation({ success: true });
+            }
             return next('evaluateTopLevelInsert');
         }
         if (check === false) {

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;AAmEvE;;GAEG;AACH,QAAA,MAAM,iBAAiB,EAAE,iBAoNxB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,SAyDvB,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,iBAkOxB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,SAyDvB,CAAA;AAID,eAAe,iBAAiB,CAAA"}

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

@@ -212,6 +212,13 @@ const rulesMatcherUtils = {
                 return true;
             return block['$or'].some((item) => rulesMatcherUtils.checkRule(item, data, options));
         }
+        if (!Array.isArray(block) && block && typeof block === 'object') {
+            const keys = Object.keys(block);
+            const hasLogicalOperators = keys.some((key) => key === '$and' || key === '$or');
+            if (!hasLogicalOperators && keys.length > 1) {
+                return keys.every((key) => rulesMatcherUtils.checkRule({ [key]: block[key] }, data, options));
+            }
+        }
         const res = rulesMatcherUtils.rule(block, data, options);
         return res.valid;
     },

package/package.json

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

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

@@ -77,9 +77,9 @@ describe('WRITE STEP_B_STATES', () => {
     expect(endValidation).toHaveBeenCalledWith({ success: false })
   })
 
-  it('routes to insert check when write=true', async () => {
+  it('ends validation when write=true on update requests', async () => {
     ;(evaluateTopLevelPermissionsFn as jest.Mock).mockResolvedValueOnce(true)
-    const context = {} as MachineContext
+    const context = { params: { type: 'write' } } as MachineContext
     await evaluateTopLevelWrite({
       context,
       endValidation,
@@ -87,13 +87,12 @@ describe('WRITE STEP_B_STATES', () => {
       next,
       initialStep: null
     })
-    expect(next).toHaveBeenCalledWith('evaluateTopLevelInsert')
+    expect(endValidation).toHaveBeenCalledWith({ success: true })
   })
 
-  it('routes to insert check when write=true and field-level rules exist', async () => {
+  it('routes to insert check when write=true on insert requests', async () => {
     ;(evaluateTopLevelPermissionsFn as jest.Mock).mockResolvedValueOnce(true)
-    ;(checkFieldsPropertyExists as jest.Mock).mockReturnValue(true)
-    const context = {} as MachineContext
+    const context = { params: { type: 'insert' } } as MachineContext
     await evaluateTopLevelWrite({
       context,
       endValidation,

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

@@ -9,7 +9,8 @@ const {
   getPath,
   forceNumber,
   getDefaultStringValue,
-  getTypeOf
+  getTypeOf,
+  checkRule
 } = rulesMatcherUtils
 
 describe('rulesMatcherUtils', () => {
@@ -64,4 +65,33 @@ describe('rulesMatcherUtils', () => {
     expect(getPath('^data.name')).toBe('data.name')
     expect(getPath('$data.name')).toBe('$data.name')
   })
+
+  it('evaluates plain objects with multiple keys as AND conditions', () => {
+    const data = {
+      '%%root': { accountId: 'acc-1' },
+      '%%user': { custom_data: { accountId: 'acc-1', role: 'admin' } }
+    }
+
+    expect(
+      checkRule(
+        {
+          '%%root.accountId': '$ref:%%user.custom_data.accountId',
+          '%%user.custom_data.role': 'admin'
+        } as any,
+        data,
+        {}
+      )
+    ).toBe(true)
+
+    expect(
+      checkRule(
+        {
+          '%%root.accountId': '$ref:%%user.custom_data.accountId',
+          '%%user.custom_data.role': 'staff'
+        } as any,
+        data,
+        {}
+      )
+    ).toBe(false)
+  })
 })

package/src/utils/roles/machines/write/B/index.ts

@@ -37,6 +37,9 @@ export const STEP_B_STATES: States = {
     })
     const check = await evaluateTopLevelPermissionsFn(context, 'write')
     if (check) {
+      if (context.params.type === 'write') {
+        return endValidation({ success: true })
+      }
       return next('evaluateTopLevelInsert')
     }
     if (check === false) {

package/src/utils/rules-matcher/utils.ts

@@ -267,6 +267,20 @@ const rulesMatcherUtils: RulesMatcherUtils = {
       )
     }
 
+    if (!Array.isArray(block) && block && typeof block === 'object') {
+      const keys = Object.keys(block)
+      const hasLogicalOperators = keys.some((key) => key === '$and' || key === '$or')
+      if (!hasLogicalOperators && keys.length > 1) {
+        return keys.every((key) =>
+          rulesMatcherUtils.checkRule(
+            { [key]: (block as Record<string, unknown>)[key] } as any,
+            data,
+            options
+          )
+        )
+      }
+    }
+
     const res = rulesMatcherUtils.rule(block, data, options)
     return res.valid
   },