From ce48f3801bdd17eba4be62166cd0ee07bd0de66c Mon Sep 17 00:00:00 2001
From: Andrea Zucca <andrea.zucca@spindox.it>
Date: Tue, 22 Oct 2024 14:55:53 +0200
Subject: [PATCH] feat: add $self object replace

---
 packages/flower-core/src/FlowerCoreStateSelectors.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/flower-core/src/FlowerCoreStateSelectors.ts b/packages/flower-core/src/FlowerCoreStateSelectors.ts
index dae4823..1cf939d 100644
--- a/packages/flower-core/src/FlowerCoreStateSelectors.ts
+++ b/packages/flower-core/src/FlowerCoreStateSelectors.ts
@@ -56,9 +56,13 @@ export const FlowerCoreStateSelectors: ISelectors = {
       if (!rule) return true
       if (!rule.rules) return true
 
-      const transformSelf = CoreUtils.mapKeysDeepLodash(rule.rules, (v, key) =>
-        key === '$self' ? id : key
+      const transformSelf = CoreUtils.mapKeysDeepLodash(
+        rule.rules,
+        (v, key) => {
+          return key.indexOf('$self') > -1 ? key.replace('$self', id) : key
+        }
       )
+
       const [hasError] = MatchRules.rulesMatcher(transformSelf, data, false, {
         prefix: name
       })