FIlter API enhancements

Author: wilcorrea

src/DataMapper.php

@@ -125,7 +125,7 @@ final public function read($record = null, string $alias = null, $trash = false,
             ->source($this->getCollection())
             ->relation($this->parseReadRelations($this->fields))
             ->fields($fields)
-            ->where($filters)// TODO: needs review
+            ->where($filters) // TODO: needs review
             ->recover($values);
 
         $this->reset();

src/Resource/ModelParser.php

@@ -11,6 +11,7 @@
 use Simples\Persistence\Field;
 use Simples\Persistence\Filter;
 use Simples\Persistence\Fusion;
+use function is_array;
 
 /**
  * Class ModelParser
@@ -29,20 +30,39 @@ protected function parseFilterFields(array $data = []): array
     {
         $filters = [];
         foreach ($data as $name => $value) {
-            if (is_array($value) && isset($value['filter'])) {
-                $value['filter'] = $this->parseFilterFields($value['filter']);
-                $filters[] = $value;
+            if (is_array($value) && $name === '__filter__') {
+                $filters = $this->parseFilterRules($filters, $value);
                 continue;
             }
             if (!$this->has($name)) {
                 $class = static::class;
-                throw new SimplesRunTimeError("There is no property `{$name}` in `{$class}`");
+                $json = JSON::encode($data);
+                throw new SimplesRunTimeError(
+                    "There is no property `{$name}` in `{$class}` parsing {$json}"
+                );
             }
             $filters[] = Filter::create($this->get($name), $value);
         }
         return $filters;
     }
 
+    /**
+     * @param array $filters
+     * @param array $rules
+     * @return array
+     */
+    protected function parseFilterRules(array $filters, array $rules): array
+    {
+        foreach ($rules as $rule) {
+            if (!isset($rule['filter']) && !is_array($rule['filter'])) {
+                continue;
+            }
+            $rule['filter'] = $this->parseFilterFields($rule['filter']);
+            $filters[] = $rule;
+        }
+        return $filters;
+    }
+
     /**
      * Parse the values of the fields
      *