Fix issue with imported fields and fieldsets

Author: aerni

src/Factories/DefinitionGenerator.php

@@ -2,70 +2,56 @@
 
 namespace Aerni\Factory\Factories;
 
+use Statamic\Fields\Field;
+use Statamic\Fields\Fields;
+use Statamic\Fields\Blueprint;
 use Aerni\Factory\Support\Utils;
+use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
-use Statamic\Fields\Blueprint;
 
 class DefinitionGenerator implements Arrayable
 {
-    public function __construct(protected Blueprint $blueprint) {}
+    public function __construct(protected Blueprint $blueprint)
+    {
+    }
 
     public function toArray(): array
     {
-        return $this->processBlueprint();
+        return $this->processFields($this->blueprint->fields()->all());
     }
 
     public function __toString(): string
     {
         return Utils::arrayToString($this->toArray());
     }
 
-    protected function processBlueprint(): array
-    {
-        return $this->blueprint->fields()->all()
-            ->reject(fn ($field) => $field->visibility() === 'computed')
-            ->map(fn ($field) => ['handle' => $field->handle(), 'field' => $field->config()])
-            ->flatMap($this->processFields(...))
-            ->all();
-    }
-
-    protected function processNestedFields(array $fields): array
-    {
-        return collect($fields)
-            ->flatMap($this->processFields(...))
-            ->all();
-    }
-
-    protected function processFields(array $config): array
+    protected function processFields(Collection $fields): array
     {
-        return match (true) {
-            $config['field']['type'] === 'bard' => $this->processBardAndReplicator($config),
-            $config['field']['type'] === 'replicator' => $this->processBardAndReplicator($config),
-            $config['field']['type'] === 'grid' => $this->processGrid($config),
-            default => [$config['handle'] => null]
-        };
+        return $fields->map(fn (Field $field) => match ($field->type()) {
+            'bard' => $this->processBardAndReplicator($field),
+            'replicator' => $this->processBardAndReplicator($field),
+            'grid' => $this->processGrid($field),
+            default => null,
+        })->all();
     }
 
-    protected function processBardAndReplicator(array $config): array
+    protected function processBardAndReplicator(Field $field): array
     {
-        $fields = collect($config['field']['sets'])->flatMap(function ($group) {
-            return collect($group['sets'])->map(function ($set, $key) {
-                return array_merge($this->processNestedFields($set['fields']), [
-                    'type' => $key,
-                    'enabled' => true,
-                ]);
-            });
-        })->values()->all();
-
-        return [$config['handle'] => $fields];
+        return collect($field->toArray()['sets'])
+            ->flatMap(function ($setGroup) {
+                return collect($setGroup['sets'])->map(function ($set, $type) {
+                    return array_merge(
+                        $this->processFields((new Fields($set['fields']))->all()),
+                        ['type' => $type, 'enabled' => true]
+                    );
+                });
+            })->values()->toArray();
     }
 
-    protected function processGrid(array $config): array
+    protected function processGrid(Field $field): array
     {
-        $fields = collect($config['field']['fields'])
-            ->flatMap(fn ($config) => $this->processNestedFields([$config]))
-            ->toArray();
-
-        return [$config['handle'] => $fields];
+        return (new Fields($field->toArray()['fields']))
+            ->all()
+            ->pipe($this->processFields(...));
     }
 }