Merge pull request #16 from kennyhorna/feature/bard-support-for-multi…

…ple-fields-in-sets

Adds support for sets with multiple variables in Bard (Fixes #15)

README.md

@@ -30,6 +30,16 @@ The package will automatically register itself.
 @endbard
 ```
 
+If a set has multiple fields, they will be included in `$set['content']` as an array.
+
+```blade
+@bard($entry['content'])
+    @if($entry['type'] === 'image')
+        <img src="{{ $set['content']['src'] }}" alt="{{ $set['content']['alt'] }}">
+    @endif
+@endbard
+```
+
 ### Collection
 
 ```blade

src/Directives/Bard.php

@@ -18,12 +18,21 @@ private function convertFromValueToArray(array $set)
     {
         return [
             'type' => Arr::get($set, 'type'),
-            'content' => $this->getFirstValueAsRaw($set),
+            'content' => $this->getValuesAsRaw($set),
         ];
     }
 
-    private function getFirstValueAsRaw($set)
+    private function getValuesAsRaw($set)
     {
-        return Arr::first($set, fn ($value) => $value instanceof Value)->raw();
+        $values = collect($set)->filter(fn ($value) => $value instanceof Value);
+        if ($values->count() === 1) {
+            return $values
+                ->first()
+                ->raw();
+        }
+
+        return $values
+            ->mapWithKeys(fn ($value, $key) => [$key => $value->raw()])
+            ->toArray();
     }
 }

tests/Unit/DirectivesTest.php

@@ -23,4 +23,13 @@ public function does_display_bard_correctly()
 
         $this->assertSame($expected, $this->blade->compileString($blade));
     }
+
+    /** @test */
+    public function does_display_bard_with_many_fields_in_set_correctly()
+    {
+        $blade = "@bard([['type' => 'image', 'content' => ['src' => 'an-image-url', 'alt' => 'An alternative text']]])";
+        $expected = "<?php foreach(Facades\Edalzell\Blade\Directives\Bard::handle([['type' => 'image', 'content' => ['src' => 'an-image-url', 'alt' => 'An alternative text']]]) as \$set) { ?>";
+
+        $this->assertSame($expected, $this->blade->compileString($blade));
+    }
 }