Add Map expression

Signed-off-by: davidarendsen <davidarendsen@hey.com>

tests/Expression/KeyFilterTest.php

@@ -5,30 +5,30 @@ declare(strict_types=1);
 namespace Tests\Expression;
 
 use Exception;
-use Arendsen\FluxQueryBuilder\Expression\KeyValue;
+use Arendsen\FluxQueryBuilder\Expression\KeyFilter;
 use PHPUnit\Framework\TestCase;
 
-final class KeyValueExpressionTest extends TestCase
+final class KeyFilterExpressionTest extends TestCase
 {
     public function testSimpleKeyvalue()
     {
-        $keyvalue = KeyValue::setEqualTo('_measurement', 'test_measurement')
+        $keyFilter = KeyFilter::setEqualTo('_measurement', 'test_measurement')
             ->andEqualTo('_field', 'user')
             ->or('count', '>=', '1')
-            ->and('user', KeyValue::EQUAL_TO, 'my_username')
+            ->and('user', KeyFilter::EQUAL_TO, 'my_username')
             ->orNotEqualTo('test', 'world');
 
         $query = 'r._measurement == "test_measurement" and r._field == "user" or ' .
             'r.count >= "1" and r.user == "my_username" or r.test != "world"';
 
-        $this->assertEquals($keyvalue->__toString(), $query);
+        $this->assertEquals($keyFilter->__toString(), $query);
     }
 
     public function testInvalidOperator()
     {
         $this->expectException(Exception::class);
 
-        KeyValue::set('_measurement', '9dkda9e', 'test_measurement')
+        KeyFilter::set('_measurement', '9dkda9e', 'test_measurement')
             ->andEqualTo('_field', 'user')
             ->or('_field', '==', 'field2')
             ->andEqualTo('user', 'my_username');

tests/Functions/MapFunctionTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace Tests\Functions;
 
 use Arendsen\FluxQueryBuilder\Functions\Map;
+use Arendsen\FluxQueryBuilder\Expression\Map as MapExpression;
+use Arendsen\FluxQueryBuilder\Expression\Selection as SelectionExpression;
 use PHPUnit\Framework\TestCase;
 
 final class MapFunctionTest extends TestCase
@@ -17,4 +19,29 @@ final class MapFunctionTest extends TestCase
 
         $this->assertEquals($query, $expression->__toString());
     }
+
+    public function testWithMapObject()
+    {
+        $expression = new Map(MapExpression::with('name', 'r.user'));
+
+        $query = '|> map(fn: (r) => ({ r with name: r.user })) ';
+
+        $this->assertEquals($query, $expression->__toString());
+    }
+
+    public function testRecordMapObject()
+    {
+        $expression = new Map(MapExpression::columns([
+            'time' => 'r._time',
+            'source' => 'r.tag',
+            'alert' => SelectionExpression::if('r._value > 10')->then(true)->else(false),
+            'test' => SelectionExpression::if('r._value > 10')->then('yes')->else('no')
+        ]));
+
+        $query = '|> map(fn: (r) => ({ {time: r._time, source: r.tag, ' .
+            'alert: if r._value > 10 then true else false, ' .
+            'test: if r._value > 10 then "yes" else "no"} })) ';
+
+        $this->assertEquals($query, $expression->__toString());
+    }
 }