Feat: Generalize attribute data field state handling in Filament

.gitignore

@@ -3,6 +3,7 @@
 /.idea
 /.nova
 /.phpunit.cache
+/.phpactor.json
 /.vscode
 /node_modules
 /vendor

packages/admin/src/Support/Forms/AttributeData.php

@@ -13,7 +13,8 @@
 use Lunar\Admin\Support\FieldTypes\TranslatedText;
 use Lunar\Admin\Support\FieldTypes\Vimeo;
 use Lunar\Admin\Support\FieldTypes\YouTube;
-use Lunar\FieldTypes\Dropdown as DrodownFieldType;
+use Lunar\Base\FieldType as FieldTypeContract;
+use Lunar\FieldTypes\Dropdown as DropdownFieldType;
 use Lunar\FieldTypes\File as FileFieldType;
 use Lunar\FieldTypes\ListField as ListFieldFieldType;
 use Lunar\FieldTypes\Number as NumberFieldType;
@@ -27,7 +28,7 @@
 class AttributeData
 {
     protected array $fieldTypes = [
-        DrodownFieldType::class => Dropdown::class,
+        DropdownFieldType::class => Dropdown::class,
         ListFieldFieldType::class => ListField::class,
         TextFieldType::class => TextField::class,
         TranslatedTextFieldType::class => TranslatedText::class,
@@ -40,26 +41,26 @@ class AttributeData
 
     public function getFilamentComponent(Attribute $attribute): Component
     {
-        $fieldType = $this->fieldTypes[
-        $attribute->type
-        ] ?? TextField::class;
+        $fieldType = $this->fieldTypes[$attribute->type] ?? TextField::class;
 
         /** @var Component $component */
         $component = $fieldType::getFilamentComponent($attribute);
 
         return $component
-            ->label(
-                $attribute->translate('name')
-            )
+            ->label($attribute->translate('name'))
             ->formatStateUsing(function ($state) use ($attribute) {
-                if (
-                    ! $state ||
-                    (get_class($state) != $attribute->type)
-                ) {
-                    return new $attribute->type;
+                if (! $state instanceof FieldTypeContract || (get_class($state) !== $attribute->type)) {
+                    $state = new $attribute->type;
                 }
 
-                return $state;
+                $value = $state->getValue();
+
+                // Only normalize nested-array states (e.g. repeater/builder), preserve scalar lists
+                if (is_array($state) && $state !== [] && is_array(reset($state))) {
+                    $state = array_values(array_filter($state, 'is_array'));
+                }
+
+                return $value;
             })
             ->mutateStateForValidationUsing(function ($state) {
                 if ($state instanceof \Lunar\Base\FieldType) {
@@ -69,18 +70,17 @@ public function getFilamentComponent(Attribute $attribute): Component
                 return $state;
             })
             ->mutateDehydratedStateUsing(function ($state) use ($attribute) {
-                if ($attribute->type == FileFieldType::class) {
-                    $instance = new $attribute->type;
-                    $instance->setValue($state);
 
-                    return $instance;
+                // Normalize arrays before wrapping into FieldType instance
+                if (is_array($state)) {
+                    $state = array_values(array_filter($state, 'is_array'));
                 }
 
-                if (
-                    ! $state ||
-                    (get_class($state) != $attribute->type)
-                ) {
-                    return new $attribute->type;
+                if (! $state instanceof FieldTypeContract || ! ($state instanceof $attribute->type)) {
+                    $field = (new $attribute->type);
+                    $field->setValue($state);
+
+                    return $field;
                 }
 
                 return $state;

packages/core/src/Facades/StorefrontSession.php

@@ -6,21 +6,22 @@
 use Lunar\Base\StorefrontSessionInterface;
 
 /**
- * @method static void forget()
- * @method static void initCustomerGroups()
- * @method static void initChannel()
- * @method static \Lunar\Models\Contracts\Customer|null initCustomer()
- * @method static string getSessionKey()
- * @method static \Lunar\Managers\StorefrontSessionManager setChannel(\Lunar\Models\Contracts\Channel|string $channel)
- * @method static \Lunar\Managers\StorefrontSessionManager setCustomer(\Lunar\Models\Contracts\Customer $customer)
- * @method static \Lunar\Models\Contracts\Customer|null getCustomer()
+ * @method static \Lunar\Models\Contracts\Channel getChannel()
+ * @method static \Lunar\Managers\StorefrontSessionManager setChannel(\Lunar\Models\Contracts\Channel $channel)
+ * @method static \Illuminate\Support\Collection getCustomerGroups()
  * @method static \Lunar\Managers\StorefrontSessionManager setCustomerGroups(\Illuminate\Support\Collection $customerGroups)
  * @method static \Lunar\Managers\StorefrontSessionManager setCustomerGroup(\Lunar\Models\Contracts\CustomerGroup $customerGroup)
  * @method static \Lunar\Managers\StorefrontSessionManager resetCustomerGroups()
- * @method static \Lunar\Models\Contracts\Channel getChannel()
- * @method static \Illuminate\Support\Collection|null getCustomerGroups()
- * @method static \Lunar\Managers\StorefrontSessionManager setCurrency(\Lunar\Models\Contracts\Currency $currency)
  * @method static \Lunar\Models\Contracts\Currency getCurrency()
+ * @method static \Lunar\Managers\StorefrontSessionManager setCurrency(\Lunar\Models\Contracts\Currency $currency)
+ * @method static \Lunar\Models\Contracts\Customer|null getCustomer()
+ * @method static \Lunar\Managers\StorefrontSessionManager setCustomer(\Lunar\Models\Contracts\Customer $customer)
+ * @method static void initChannel()
+ * @method static void initCustomerGroups()
+ * @method static void initCurrency()
+ * @method static void initCustomer()
+ * @method static void forget()
+ * @method static string getSessionKey()
  *
  * @see \Lunar\Managers\StorefrontSessionManager
  */