feat(FilterBag): add forDefinition method for improved record type handling and validation

src/DataSource/Processors/Collection/Pipelines/Filters.php

@@ -35,7 +35,7 @@ public function handle(Collection $collection, Closure $next): Collection
         $results = $collection;
 
         foreach ($filters as $bagKey => $record) {
-            if (! FilterBag::isRecord($record) || ! FilterBag::isActive($record)) {
+            if (! FilterBag::isRecord($record)) {
                 continue;
             }
 
@@ -48,6 +48,12 @@ public function handle(Collection $collection, Closure $next): Collection
                 continue;
             }
 
+            $record = FilterBag::forDefinition($definition, $record);
+
+            if (! FilterBag::isActive($record)) {
+                continue;
+            }
+
             $sqlField = FilterBag::sqlField($definition, $bagKey);
             $filterType = $record['type'];
             $value = $record['value'] ?? null;

src/DataSource/Processors/Database/Handlers/FilterHandler.php

@@ -29,7 +29,7 @@ public function apply(EloquentBuilder|QueryBuilder $query): EloquentBuilder|Quer
         }
 
         foreach ($filters as $bagKey => $record) {
-            if (! FilterBag::isRecord($record) || ! FilterBag::isActive($record)) {
+            if (! FilterBag::isRecord($record)) {
                 continue;
             }
 
@@ -43,6 +43,12 @@ public function apply(EloquentBuilder|QueryBuilder $query): EloquentBuilder|Quer
                 continue;
             }
 
+            $record = FilterBag::forDefinition($filter, $record);
+
+            if (! FilterBag::isActive($record)) {
+                continue;
+            }
+
             $sqlField = FilterBag::sqlField($filter, $bagKey);
             $filterType = $record['type'];
             $value = $record['value'] ?? null;

src/DataSource/Processors/Scout/Pipelines/Filters.php

@@ -24,7 +24,7 @@ public function handle(ScoutBuilder $builder, Closure $next): ScoutBuilder
         }
 
         foreach ($filters as $bagKey => $record) {
-            if (! FilterBag::isRecord($record) || ! FilterBag::isActive($record)) {
+            if (! FilterBag::isRecord($record)) {
                 continue;
             }
 
@@ -37,6 +37,12 @@ public function handle(ScoutBuilder $builder, Closure $next): ScoutBuilder
                 continue;
             }
 
+            $record = FilterBag::forDefinition($filter, $record);
+
+            if (! FilterBag::isActive($record)) {
+                continue;
+            }
+
             $builder->where(FilterBag::sqlField($filter, $bagKey), $record['value'] ?? null);
         }
 

src/Plugins/FilterBuilder/FilterBuilderHandler.php

@@ -185,7 +185,7 @@ private function shapeFor(string $type, array $row): array|int|string|null
         return match ($type) {
             'input_text' => [
                 'selected' => $row['operator'],
-                'value' => $row['value'],
+                'value' => $this->scalarValue($row['value']),
                 'searchMorphs' => $this->component->searchMorphs(),
             ],
             'number' => match ($row['operator']) {

src/Support/FilterBag.php

@@ -89,6 +89,36 @@ public static function isActive(array $record): bool
         return filled($value);
     }
 
+    /**
+     * @param  array{type: string, value?: mixed, op?: mixed}  $record
+     * @return array{type: string, value?: mixed, op?: mixed}
+     */
+    public static function forDefinition(mixed $definition, array $record): array
+    {
+        $type = data_get($definition, 'key');
+
+        if (is_string($type) && $type !== '') {
+            $record['type'] = self::normalizeType($type);
+        }
+
+        $value = $record['value'] ?? null;
+
+        if (is_array($value) && ! self::acceptsArray($record['type'], array_is_list($value))) {
+            $record['value'] = null;
+        }
+
+        return $record;
+    }
+
+    private static function acceptsArray(string $type, bool $list): bool
+    {
+        return match ($type) {
+            'number', 'date', 'datetime', 'multi_select' => true,
+            'select', 'boolean' => $list,
+            default => false,
+        };
+    }
+
     public static function isValuelessOperator(mixed $operator): bool
     {
         return in_array($operator, self::VALUELESS_OPERATORS, true);

src/Turbine.php

@@ -302,6 +302,8 @@ private function buildState(): State
     {
         return State::fromArray(array_merge($this->requestState, [
            'primaryKey' => $this->primaryKey,
+           'primaryKeyAlias' => null,
+           'columns' => [],
            'tableName' => $this->tableName,
            'setUp' => $this->buildSetUp(),
         ]));

tests/Feature/FilterBuilderHandlerTest.php

@@ -91,3 +91,17 @@ function makeFilterBuilderContext(array $fbState = []): ArrayGridContext
 
     expect($filtered)->toHaveCount(2);
 });
+
+it('reads a text condition value as a single value', function () {
+    $ctx = makeFilterBuilderContext([
+        'match' => 'and',
+        'rows' => [
+            ['column' => 'name', 'operator' => 'is', 'value' => ['price' => 10], 'boolean' => 'and'],
+        ],
+    ]);
+
+    $query = Dish::query();
+    (new FilterBuilderHandler($ctx))->apply($query);
+
+    expect($query->toSql())->not->toContain('"name"."price"');
+});

tests/Feature/FiltersTest.php

@@ -2,7 +2,7 @@
 
 namespace PowerComponents\Turbine\Tests\Feature;
 
-use PowerComponents\Turbine\Components\Filters\{FilterBoolean, FilterMultiSelect, FilterNumber, FilterSelect};
+use PowerComponents\Turbine\Components\Filters\{FilterBoolean, FilterInputText, FilterMultiSelect, FilterNumber, FilterSelect};
 use PowerComponents\Turbine\DataSource\ProcessDataSource;
 
 /**
@@ -45,3 +45,14 @@ function pgFilter(string $type, string $field, mixed $value, array $filters): in
 
     expect($total)->toBe(5);
 });
+
+it('reads a filter record with the type its definition declares', function () {
+    expect(pgFilter('number', 'name', 'Sushi', [new FilterSelect('name')]))->toBe(1)
+        ->and(pgFilter('select', 'price', ['start' => 30], [new FilterNumber('price')]))->toBe(2);
+});
+
+it('ignores a keyed filter value the declared type does not take', function () {
+    expect(pgFilter('select', 'name', ['price' => 10], [new FilterInputText('name')]))->toBe(5)
+        ->and(pgFilter('select', 'name', ['price' => 10], [new FilterSelect('name')]))->toBe(5)
+        ->and(pgFilter('boolean', 'in_stock', ['price' => 10], [new FilterBoolean('in_stock')]))->toBe(5);
+});

tests/Feature/TurbineTest.php

@@ -106,6 +106,21 @@ function turbineGrid(array $state = []): Turbine
             ->and($response->meta->pagination->total)->toBe(2);
     });
 
+    it('keeps the row key server-side when the request names another one', function () {
+        $response = turbineGrid(['primaryKeyAlias' => 'in_stock'])->envelope();
+
+        expect($response->data[0])->not->toHaveKey('in_stock');
+    });
+
+    it('resolves columns from the grid definition, not the request', function () {
+        $response = turbineGrid(['columns' => [['field' => 'other']], 'multiSort' => true])
+            ->columns(fn () => [Column::make('Id', 'id'), Column::make('Name', 'name')])
+            ->envelope();
+
+        expect($response->data[0])->toHaveKeys(['id', 'name', 'price'])
+            ->and($response->data[0])->not->toHaveKey('in_stock');
+    });
+
     it('produces a JSON response', function () {
         $response = turbineGrid()->toResponse();