Handle nested fieldsets in FieldUpdater (#108)

* wip

* Fix styling

* don't need the facade

* wip

* Fix styling

---------

Co-authored-by: duncanmcclean <duncanmcclean@users.noreply.github.com>

Author: duncanmcclean

src/Support/FieldUpdater.php

@@ -3,9 +3,9 @@
 namespace Statamic\Importer\Support;
 
 use Statamic\Facades\Blink;
-use Statamic\Facades\Fieldset;
 use Statamic\Fields\Blueprint;
 use Statamic\Fields\Field;
+use Statamic\Fields\Fieldset;
 use Statamic\Support\Str;
 
 class FieldUpdater
@@ -27,6 +27,13 @@ public function blueprint(Blueprint $blueprint): self
         return $this;
     }
 
+    public function fieldset(Fieldset $fieldset): self
+    {
+        $this->blueprint = $fieldset;
+
+        return $this;
+    }
+
     public function updateFieldConfig(array $config): void
     {
         if ($linkedField = $this->getLinkedField()) {
@@ -96,12 +103,9 @@ private function updateLinkedField(array $importedField, array $config): void
      */
     private function isImportedField(): bool
     {
-        $topLevelFieldHandles = $this->blueprint->tabs()
-            ->flatMap(fn ($tab) => $tab->sections()->flatMap(fn ($section) => $section->fields()->items()))
-            ->pluck('handle')
-            ->filter();
+        $topLevelFieldHandles = $this->blueprint->fields()->items()->pluck('handle')->filter();
 
-        return $this->blueprint->hasField($this->field->handle()) && ! $topLevelFieldHandles->contains($this->field->handle());
+        return $this->blueprint->field($this->field->handle()) && ! $topLevelFieldHandles->contains($this->field->handle());
     }
 
     /**
@@ -116,14 +120,36 @@ private function updateImportedField(array $config, ?string $prefix = null): voi
         /** @var \Statamic\Fields\Fieldset $fieldset */
         $fieldset = $this->blueprint->fields()->items()
             ->filter(fn (array $field) => isset($field['import']))
-            ->map(fn (array $field) => Fieldset::find($field['import']))
-            ->filter(function ($fieldset) use ($prefix) {
+            ->mapWithKeys(fn (array $field) => [
+                $field['prefix'] ?? '' => Fieldset::find($field['import']),
+            ])
+            ->filter(function (Fieldset $fieldset, string $prefix) use ($config) {
+                // When the field exists in the fieldset, but it's not a top-level field,
+                // pass the Fieldset to the FieldUpdater (this class) to update the field config.
+                $fieldHandleWithoutBlueprintPrefix = Str::after($this->field->handle(), $prefix);
+
+                if (
+                    ($field = $fieldset->field($fieldHandleWithoutBlueprintPrefix))
+                    && ! $fieldset->fields()->items()->pluck('handle')->filter()->contains($fieldHandleWithoutBlueprintPrefix)
+                ) {
+                    (new self)
+                        ->field($field)
+                        ->fieldset($fieldset)
+                        ->updateFieldConfig($config);
+
+                    return false;
+                }
+
                 return collect($fieldset->fields()->items())
-                    ->where('handle', Str::after($this->field->handle(), $prefix ?? ''))
+                    ->where('handle', Str::after($this->field->handle(), $prefix))
                     ->isNotEmpty();
             })
             ->first();
 
+        if (! $fieldset) {
+            return;
+        }
+
         $fieldset->setContents([
             ...$fieldset->contents(),
             'fields' => collect($fieldset->contents()['fields'])

tests/Transformers/BardTransformerTest.php

@@ -496,4 +496,46 @@ public function it_enables_buttons_on_imported_bard_field_with_prefix()
             'italic',
         ], $fieldset->field('bard_field')->get('buttons'));
     }
+
+    #[Test]
+    public function it_enables_buttons_on_imported_bard_field_in_nested_fieldsets()
+    {
+        Fieldset::make('actual_content_stuff')->setContents(['fields' => [
+            ['handle' => 'bard_field', 'field' => ['type' => 'bard']],
+        ]])->save();
+
+        Fieldset::make('content_stuff')->setContents(['fields' => [
+            ['import' => 'actual_content_stuff', 'prefix' => 'actual_'],
+        ]])->save();
+
+        $blueprint = $this->collection->entryBlueprint();
+
+        $this->blueprint->setContents([
+            'sections' => [
+                'main' => [
+                    'fields' => [
+                        ['import' => 'content_stuff', 'prefix' => 'resources_'],
+                    ],
+                ],
+            ],
+        ])->save();
+
+        $transformer = new BardTransformer(
+            import: $this->import,
+            blueprint: $blueprint,
+            field: $blueprint->field('resources_actual_bard_field'),
+            config: []
+        );
+
+        $transformer->transform('<h2 style="text-align: center;"><strong>Hello</strong> <em>world</em>!</h2>');
+
+        $fieldset = Fieldset::find('actual_content_stuff');
+
+        $this->assertEquals([
+            'h2',
+            'aligncenter',
+            'bold',
+            'italic',
+        ], $fieldset->field('bard_field')->get('buttons'));
+    }
 }