@flowerforce/flowerbase 1.9.0 → 1.9.1-beta.0

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

@@ -24,6 +24,7 @@ export declare const generateContextData: ({ user, services, app, rules, current
         deserialize: (ejson: mongodb.BSON.Document, options?: mongodb.BSON.EJSONOptions) => any;
     };
     Buffer: BufferConstructor;
+    fetch: typeof fetch;
     utils: {
         jwt: JwtUtils;
     };

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

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/context/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAG1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAA;AAEvD,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,CACN,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACzC,MAAM,CAAA;IACX,MAAM,EAAE,CACN,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,YAAY,CAAC,EAAE,OAAO,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAAE,KAC9B,OAAO,CAAA;CACb,CAAA;AAgFD;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,GAAI,4GAUjC,yBAAyB;;;;;;;;;;;;;uBA4DP,SAAS;yBAGP,SAAS;;;;;;;;;;;0BAoBmB,MAAM,GAAG,SAAS;2BACV,MAAM,GAAG,SAAS;;;;;;;;;uBAS1D,MAAM;;;;;;+BA5DU,MAAM,OAAO,QAAQ;;;;sCA1HrC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAsGT,CAAC;iCAAa,CAAC;;;;;;;;;;;;;;;;;;;kCAtGP,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAsGT,CAAC;6BAAa,CAAC;;;;;;;;;;;;;;;;;;kCAtGP,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAsGT,CAAC;6BAAa,CAAC;;;;;;;;;;;;;;;4BAyFF,MAAM,OAAO,aAAa,WAAW,SAAS;;;CAkBrE,CAAA"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/context/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAG1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAA;AAEvD,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,CACN,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACzC,MAAM,CAAA;IACX,MAAM,EAAE,CACN,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,YAAY,CAAC,EAAE,OAAO,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAAE,KAC9B,OAAO,CAAA;CACb,CAAA;AAgFD;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,GAAI,4GAUjC,yBAAyB;;;;;;;;;;;;;;uBA6DP,SAAS;yBAGP,SAAS;;;;;;;;;;;0BAoBmB,MAAM,GAAG,SAAS;2BACV,MAAM,GAAG,SAAS;;;;;;;;;uBAS1D,MAAM;;;;;;+BA7DU,MAAM,OAAO,QAAQ;;;;sCA1HrC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAsGT,CAAC;iCAAa,CAAC;;;;;;;;;;;;;;;;;;;kCAtGP,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAsGT,CAAC;6BAAa,CAAC;;;;;;;;;;;;;;;;;;kCAtGP,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAsGT,CAAC;6BAAa,CAAC;;;;;;;;;;;;;;;4BA0FF,MAAM,OAAO,aAAa,WAAW,SAAS;;;CAkBrE,CAAA"}

package/dist/utils/context/helpers.js

@@ -150,6 +150,7 @@ const generateContextData = ({ user, services, app, rules, currentFunction, func
         BSON,
         EJSON: bson_1.EJSON,
         Buffer,
+        fetch,
         utils,
         console: {
             log: (...args) => {

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,iBAkOxB,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;AA2EvE;;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

@@ -45,6 +45,12 @@ const includesWithSemanticEquality = (value, candidate) => rulesMatcherUtils
     .some((sourceItem) => rulesMatcherUtils
     .forceArray(item)
     .some((candidateItem) => areSemanticallyEqual(sourceItem, candidateItem))));
+const hasScalarArrayMembershipMatch = (left, right) => {
+    if (Array.isArray(left) === Array.isArray(right)) {
+        return false;
+    }
+    return includesWithSemanticEquality(left, right);
+};
 const resolveRefPath = (data, refPath, prefix) => {
     const exactMatch = (0, get_1.default)(data, refPath, undefined);
     if (exactMatch !== undefined) {
@@ -241,7 +247,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),
+    $eq: (a, b) => areSemanticallyEqual(a, b) || hasScalarArrayMembershipMatch(a, b),
     $ne: (a, b) => !areSemanticallyEqual(a, b),
     $gt: (a, b) => rulesMatcherUtils.forceNumber(a) > parseFloat(b),
     $gte: (a, b) => rulesMatcherUtils.forceNumber(a) >= parseFloat(b),

package/package.json

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

package/src/services/mongodb-atlas/__tests__/utils.test.ts

@@ -1,7 +1,58 @@
-import { ensureClientPipelineStages, getHiddenFieldsFromRulesConfig, prependUnsetStage, applyAccessControlToPipeline, mergeProjections } from '../utils'
+import {
+  ensureClientPipelineStages,
+  getHiddenFieldsFromRulesConfig,
+  prependUnsetStage,
+  applyAccessControlToPipeline,
+  mergeProjections,
+  getValidRule
+} from '../utils'
 import { Role } from '../../../utils/roles/interface'
 
 describe('MongoDB Atlas aggregate helpers', () => {
+  describe('getValidRule', () => {
+    it('matches legacy scalar apply_when syntax against array-valued custom data', () => {
+      const validRules = getValidRule({
+        filters: [
+          {
+            apply_when: {
+              '%%user.custom_data.roles': 'Admin'
+            },
+            query: {}
+          }
+        ] as any,
+        user: {
+          custom_data: {
+            roles: ['Admin', 'SCM']
+          }
+        } as any,
+        record: null
+      })
+
+      expect(validRules).toHaveLength(1)
+    })
+
+    it('does not match legacy scalar apply_when syntax when the array does not contain the value', () => {
+      const validRules = getValidRule({
+        filters: [
+          {
+            apply_when: {
+              '%%user.custom_data.roles': 'Admin'
+            },
+            query: {}
+          }
+        ] as any,
+        user: {
+          custom_data: {
+            roles: ['Editor']
+          }
+        } as any,
+        record: null
+      })
+
+      expect(validRules).toHaveLength(0)
+    })
+  })
+
   describe('ensureClientPipelineStages', () => {
     it('allows safe stages', () => {
       expect(() =>

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

@@ -157,4 +157,25 @@ describe('context.functions.execute compatibility', () => {
     expect(result).toEqual({ address: 'rome', total: 10 })
     fs.rmSync(tempDir, { recursive: true, force: true })
   })
+
+  it('exposes native fetch in the sandbox global scope', () => {
+    const functionsList = {
+      caller: {
+        code: 'module.exports = function() { return fetch === globalThis.fetch && typeof fetch === "function" }'
+      }
+    } as Functions
+
+    const result = GenerateContextSync({
+      args: [],
+      app: {} as any,
+      rules: {} as any,
+      user: {} as any,
+      currentFunction: functionsList.caller,
+      functionsList,
+      services: mockServices,
+      functionName: 'caller'
+    })
+
+    expect(result).toBe(true)
+  })
 })

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

@@ -119,4 +119,27 @@ describe('evaluateExpression', () => {
       })
     )
   })
+
+  it('supports scalar equality against array-valued custom data', async () => {
+    const expression = {
+      '%%user.custom_data.roles': 'Admin'
+    }
+
+    const params = {
+      type: 'read',
+      cursor: { _id: 'doc-1' },
+      expansions: {
+        '%%prevRoot': undefined
+      },
+      roles: []
+    } as Params
+
+    const user = {
+      custom_data: {
+        roles: ['Admin', 'SCM']
+      }
+    }
+
+    await expect(evaluateExpression(params, expression, user as never)).resolves.toBe(true)
+  })
 })

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

@@ -47,7 +47,7 @@ describe('generateContextData', () => {
 
   it('should return an object with context configuration', async () => {
     const mockApp = Fastify()
-    const { context, console: contextConsole, BSON } = generateContextData({
+    const { context, console: contextConsole, BSON, fetch } = generateContextData({
       services,
       app: mockApp,
       functionsList: mockFunctions,
@@ -66,6 +66,8 @@ describe('generateContextData', () => {
 
     expect(context.user).toEqual(mockUser)
 
+    expect(fetch).toBe(global.fetch)
+
     const mockedLog = jest.spyOn(console, 'log').mockImplementation(() => { })
     contextConsole.log('Test', 'generateContextData')
     expect(mockedLog).toHaveBeenCalledWith('Test', 'generateContextData')

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

@@ -86,7 +86,7 @@ describe('rule function', () => {
     expect(result.name).toBe('user.authId___%oidToString')
   })
 
-  it('does not treat scalar equality as array membership in compact rules', () => {
+  it('treats scalar equality as array membership in compact rules', () => {
     const data = {
       doc: {
         owners: ['user-1', 'user-2']
@@ -97,7 +97,7 @@ describe('rule function', () => {
       prefix: 'doc'
     })
 
-    expect(result.valid).toBe(false)
+    expect(result.valid).toBe(true)
     expect(result.name).toBe('doc.owners___$eq')
   })
 

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

@@ -27,8 +27,8 @@ describe('rulesMatcherUtils', () => {
     // isFunction
     expect(isFunction(2)).toBe(false)
     expect(isFunction('ciao')).toBe(false)
-    expect(isFunction(() => {})).toBe(true)
-    expect(isFunction(function test() {})).toBe(true)
+    expect(isFunction(() => { })).toBe(true)
+    expect(isFunction(function test() { })).toBe(true)
     // isString
     expect(isString(2)).toBe(false)
     expect(isString('2')).toBe(true)
@@ -94,4 +94,13 @@ describe('rulesMatcherUtils', () => {
       )
     ).toBe(false)
   })
+
+  it('matches scalar equality against array-valued fields', () => {
+    const data = {
+      '%%user': { custom_data: { roles: ['Admin', 'SCM'] } }
+    }
+
+    expect(checkRule({ '%%user.custom_data.roles': 'Admin' } as any, data, {})).toBe(true)
+    expect(checkRule({ '%%user.custom_data.roles': 'Manager' } as any, data, {})).toBe(false)
+  })
 })

package/src/utils/context/helpers.ts

@@ -176,6 +176,7 @@ export const generateContextData = ({
     BSON,
     EJSON,
     Buffer,
+    fetch,
     utils,
     console: {
       log: (...args: Arguments) => {

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

@@ -58,6 +58,14 @@ const includesWithSemanticEquality = (value: unknown, candidate: unknown): boole
         )
     )
 
+const hasScalarArrayMembershipMatch = (left: unknown, right: unknown): boolean => {
+  if (Array.isArray(left) === Array.isArray(right)) {
+    return false
+  }
+
+  return includesWithSemanticEquality(left, right)
+}
+
 const resolveRefPath = (data: unknown, refPath: string, prefix?: string): unknown => {
   const exactMatch = _get(data, refPath, undefined)
 
@@ -306,7 +314,7 @@ export const operators: Operators = {
   $exists: (a, b) => !rulesMatcherUtils.isEmpty(a) === b,
   '%exists': (a, b) => !rulesMatcherUtils.isEmpty(a) === b,
 
-  $eq: (a, b) => areSemanticallyEqual(a, b),
+  $eq: (a, b) => areSemanticallyEqual(a, b) || hasScalarArrayMembershipMatch(a, b),
 
   $ne: (a, b) => !areSemanticallyEqual(a, b),