@flowerforce/flowerbase 1.2.0 → 1.2.1-beta.3

package/src/utils/roles/machines/read/C/index.ts

@@ -1,7 +1,8 @@
 import {
   checkFieldsPropertyExists,
-  evaluateTopLevelPermissionsFn
-} from '../../commonValidators'
+  evaluateTopLevelReadFn,
+  evaluateTopLevelWriteFn
+} from './validators'
 import { States } from '../../interface'
 import { logMachineInfo } from '../../utils'
 
@@ -13,10 +14,13 @@ export const STEP_C_STATES: States = {
       step: 1,
       stepName: 'evaluateTopLevelRead'
     })
-    const check = await evaluateTopLevelPermissionsFn(context, 'read')
-    return check
-      ? endValidation({ success: true })
-      : next('evaluateTopLevelWrite', { check })
+    const check = await evaluateTopLevelReadFn(context)
+    if (check) {
+      return checkFieldsPropertyExists(context)
+        ? next('checkFieldsProperty')
+        : endValidation({ success: true })
+    }
+    return next('evaluateTopLevelWrite', { check })
   },
   evaluateTopLevelWrite: async ({ context, next, endValidation }) => {
     logMachineInfo({
@@ -25,7 +29,7 @@ export const STEP_C_STATES: States = {
       step: 2,
       stepName: 'evaluateTopLevelWrite'
     })
-    const check = await evaluateTopLevelPermissionsFn(context, 'write')
+    const check = await evaluateTopLevelWriteFn(context)
     if (check) return endValidation({ success: true })
     return context?.prevParams?.check === false
       ? endValidation({ success: false })

package/src/utils/roles/machines/read/C/validators.ts

@@ -0,0 +1,21 @@
+import { MachineContext } from '../../interface'
+import {
+  checkFieldsPropertyExists,
+  evaluateTopLevelPermissionsFn
+} from '../../commonValidators'
+
+export const evaluateTopLevelReadFn = async (context: MachineContext) => {
+  if (context.params.type !== 'read') {
+    return false
+  }
+  return evaluateTopLevelPermissionsFn(context, 'read')
+}
+
+export const evaluateTopLevelWriteFn = async (context: MachineContext) => {
+  if (!['read', 'write'].includes(context.params.type)) {
+    return undefined
+  }
+  return evaluateTopLevelPermissionsFn(context, 'write')
+}
+
+export { checkFieldsPropertyExists } from '../../commonValidators'

package/src/utils/roles/machines/read/D/index.ts

@@ -1,7 +1,25 @@
-import { States } from '../../interface'
+import { Document } from 'mongodb'
+import { MachineContext, States } from '../../interface'
 import { logMachineInfo } from '../../utils'
 import { checkAdditionalFieldsFn, checkIsValidFieldNameFn } from './validators'
 
+const runCheckIsValidFieldName = async ({
+  context,
+  endValidation
+}: {
+  context: MachineContext
+  endValidation: ({ success, document }: { success: boolean; document?: Document }) => void
+}) => {
+  logMachineInfo({
+    enabled: context.enableLog,
+    machine: 'D',
+    step: 2,
+    stepName: 'checkIsValidFieldName'
+  })
+  const document = checkIsValidFieldNameFn(context)
+  return endValidation({ success: !!Object.keys(document).length, document })
+}
+
 export const STEP_D_STATES: States = {
   checkAdditionalFields: async ({ context, next, endValidation }) => {
     logMachineInfo({
@@ -11,16 +29,8 @@ export const STEP_D_STATES: States = {
       stepName: 'checkAdditionalFields'
     })
     const check = checkAdditionalFieldsFn(context)
-    return check ? next('checkIsValidFieldName') : endValidation({ success: false })
+    return check ? next('evaluateRead') : endValidation({ success: false })
   },
-  checkIsValidFieldName: async ({ context, endValidation }) => {
-    logMachineInfo({
-      enabled: context.enableLog,
-      machine: 'D',
-      step: 2,
-      stepName: 'checkIsValidFieldName'
-    })
-    const document = checkIsValidFieldNameFn(context)
-    return endValidation({ success: !!Object.keys(document).length, document })
-  }
+  evaluateRead: runCheckIsValidFieldName,
+  checkIsValidFieldName: runCheckIsValidFieldName
 }

package/src/utils/rules.ts

@@ -1,31 +1,40 @@
 import get from 'lodash/get'
 
-const removeExtraColons = (val: unknown) => {
-  return val?.toString().replace(/:+/g, ":")
+const resolvePlaceholder = (value: string, objs: Record<string, unknown>) => {
+  if (!value.startsWith('%%')) return value
+
+  const path = value.slice(2)
+  const [rootKey, ...rest] = path.split('.')
+  const rootToken = `%%${rootKey}`
+  const rootValue = objs[rootToken]
+
+  if (!rest.length) {
+    return rootValue === undefined ? value : rootValue
+  }
+
+  const resolved = get(rootValue as object, rest.join('.'))
+  return resolved === undefined ? value : resolved
 }
 
-// Funzione che espande dinamicamente i placeholder con supporto per percorsi annidati
+const expandValue = (input: unknown, objs: Record<string, unknown>): unknown => {
+  if (Array.isArray(input)) {
+    return input.map((item) => expandValue(item, objs))
+  }
+  if (input && typeof input === 'object') {
+    return Object.fromEntries(
+      Object.entries(input).map(([key, val]) => [key, expandValue(val, objs)])
+    )
+  }
+  if (typeof input === 'string') {
+    return resolvePlaceholder(input, objs)
+  }
+  return input
+}
+
+// Espande dinamicamente i placeholder con supporto per array e percorsi annidati
 export function expandQuery(
   template: Record<string, unknown>,
   objs: Record<string, unknown>
 ) {
-  let expandedQuery = JSON.stringify(template) // Converti l'oggetto in una stringa per sostituire i placeholder
-  const regex = /:\s*"%%([a-zA-Z0-9_.]+)"/g
-  Object.keys(objs).forEach(() => {
-    // Espandi tutti i placeholder %%values.<nested.property>
-
-    const callback = (match: string, path: string) => {
-      const value = get(objs, `%%${path}`) // Recupera il valore annidato da values
-      const finalValue = typeof value === 'string' ? `"${value}"` : value && JSON.stringify(value)
-      // TODO tolto i primi : creava questo tipo di oggetto {"userId"::"%%user.id"}
-      const val = `:${value !== undefined ? finalValue : match}`; // Sostituisci se esiste, altrimenti lascia il placeholder
-      return removeExtraColons(val)
-    }
-
-    expandedQuery = expandedQuery.replace(
-      regex,
-      callback as Parameters<typeof expandedQuery.replaceAll>[1]
-    )
-  })
-  return JSON.parse(expandedQuery) // Converti la stringa JSON di nuovo in un oggetto
+  return expandValue(template, objs) as Record<string, unknown>
 }

package/tsconfig.spec.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": ["node", "jest"]
+  },
+  "include": ["src/**/*.test.ts", "src/**/*.spec.ts"]
+}