fixes

Author: goshasafonov

config/contentable.php

@@ -33,6 +33,15 @@
         ],
     ],
 
+    'block' => [
+        'type' => Yuges\Contentable\Enums\BlockType::class,
+        'data' => [
+            Yuges\Contentable\Data\Blocks\ListData::class,
+            Yuges\Contentable\Data\Blocks\HeaderData::class,
+            Yuges\Contentable\Data\Blocks\ParagraphData::class,
+        ],
+    ],
+
     'actions' => [
 
     ],

src/Abstracts/BlockData.php

@@ -3,30 +3,37 @@
 namespace Yuges\Contentable\Abstracts;
 
 use Spatie\LaravelData\Data;
+use Illuminate\Validation\Rule;
+use Yuges\Contentable\Config\Config;
 use Yuges\Contentable\Enums\BlockType;
 use Yuges\Contentable\Factories\BlockDataFactory;
 use Spatie\LaravelData\Attributes\PropertyForMorph;
 use Yuges\Contentable\Interfaces\BlockDataInterface;
 use Spatie\LaravelData\Contracts\PropertyMorphableData;
+use Spatie\LaravelData\Attributes\MergeValidationRules;
+use Yuges\Contentable\Interfaces\BlockType as BlockTypeInterface;
 
+#[MergeValidationRules]
 abstract class BlockData extends Data implements BlockDataInterface, PropertyMorphableData
 {
     #[PropertyForMorph]
-    public BlockType $type;
+    public string $type;
 
     public static function morph(array $properties): ?string
     {
-        return BlockDataFactory::getClass($properties['type']);
+        $type = Config::getBlockTypeClass(BlockType::class)::tryFrom($properties['type']);
+
+        return BlockDataFactory::getClass($type);
     }
 
-    public function getType(): BlockType
+    public function getType(): BlockTypeInterface
     {
-        return $this->type;
+        return Config::getBlockTypeClass(BlockType::class)::tryFrom($this->type);
     }
 
-    public function setType(BlockType $type): static
+    public function setType(BlockTypeInterface $type): static
     {
-        $this->type = $type;
+        $this->type = $type->value;
 
         return $this;
     }
@@ -36,7 +43,7 @@ public function toArrayData(): array
         return $this->getData();
     }
 
-    public static function fromArrayData(BlockType $type, array $data): ?BlockDataInterface
+    public static function fromArrayData(BlockTypeInterface $type, array $data): ?BlockDataInterface
     {
         return BlockDataFactory::create($type, $data);
     }
@@ -46,10 +53,17 @@ public function toJsonData(): string
         return json_encode($this->getData());
     }
 
-    public static function fromJsonData(BlockType $type, string $data): ?BlockDataInterface
+    public static function fromJsonData(BlockTypeInterface $type, string $data): ?BlockDataInterface
     {
         $data = json_decode($data, true);
 
         return self::fromArrayData($type, $data);
     }
+
+    public static function rules(): array
+    {
+        return [
+            'type' => [Rule::enum(Config::getBlockTypeClass(BlockType::class))],
+        ];
+    }
 }

src/Config/Config.php

@@ -5,7 +5,9 @@
 use Yuges\Package\Enums\KeyType;
 use Illuminate\Support\Collection;
 use Yuges\Contentable\Models\Content;
+use Yuges\Contentable\Interfaces\BlockType;
 use Yuges\Contentable\Interfaces\Contentable;
+use Yuges\Contentable\Interfaces\BlockDataInterface;
 
 class Config extends \Yuges\Package\Config\Config
 {
@@ -49,6 +51,20 @@ public static function getBlockKeyType(mixed $default = null): KeyType
         return self::get('models.block.key', $default);
     }
 
+    /** @return class-string<BlockType> */
+    public static function getBlockTypeClass(mixed $default = null): string
+    {
+        return self::get('block.type', $default);
+    }
+
+    /** @return Collection<array-key, class-string<BlockDataInterface>> */
+    public static function getBlockData(mixed $default = null): Collection
+    {
+        return Collection::make(
+            self::get('block.data', $default)
+        );
+    }
+
     /** @return class-string<BlockObserver> */
     public static function getBlockObserverClass(mixed $default = null): string
     {

src/Data/Blocks/Header.php src/Data/Blocks/HeaderData.phpsrc/Data/Blocks/Header.php renamed to src/Data/Blocks/HeaderData.php

@@ -5,9 +5,9 @@
 use Yuges\Contentable\Enums\BlockType;
 use Yuges\Contentable\Enums\HeaderLevel;
 
-class Header extends \Yuges\Contentable\Abstracts\BlockData
+class HeaderData extends \Yuges\Contentable\Abstracts\BlockData
 {
-    public BlockType $type = BlockType::Header;
+    public string $type = BlockType::Header->value;
 
     public function __construct(
         public HeaderLevel $level = HeaderLevel::Level3,

src/Data/Blocks/ItemList.php src/Data/Blocks/ListData.phpsrc/Data/Blocks/ItemList.php renamed to src/Data/Blocks/ListData.php

@@ -5,9 +5,9 @@
 use Yuges\Contentable\Enums\BlockType;
 use Yuges\Contentable\Enums\ListStyle;
 
-class ItemList extends \Yuges\Contentable\Abstracts\BlockData
+class ListData extends \Yuges\Contentable\Abstracts\BlockData
 {
-    public BlockType $type = BlockType::List;
+    public string $type = BlockType::List->value;
 
     public function __construct(
         public ListStyle $style = ListStyle::Unordered,

src/Data/Blocks/Paragraph.php src/Data/Blocks/ParagraphData.phpsrc/Data/Blocks/Paragraph.php renamed to src/Data/Blocks/ParagraphData.php

@@ -4,9 +4,9 @@
 
 use Yuges\Contentable\Enums\BlockType;
 
-class Paragraph extends \Yuges\Contentable\Abstracts\BlockData
+class ParagraphData extends \Yuges\Contentable\Abstracts\BlockData
 {
-    public BlockType $type = BlockType::Paragraph;
+    public string $type = BlockType::Paragraph->value;
 
     public function __construct(
         public ?string $text = '',

src/Data/Editor/Editor.php

@@ -2,10 +2,11 @@
 
 namespace Yuges\Contentable\Data\Editor;
 
+use Spatie\LaravelData\Data;
 use Yuges\Contentable\Casts\AsEditor;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 
-class Editor implements Castable
+class Editor extends Data implements Castable
 {
     public function __construct(
         public ?string $name,

src/Enums/BlockType.php

@@ -2,7 +2,7 @@
 
 namespace Yuges\Contentable\Enums;
 
-enum BlockType: string
+enum BlockType: string implements \Yuges\Contentable\Interfaces\BlockType
 {
     case List = 'list';
     case Header = 'header';

src/Factories/BlockDataFactory.php

@@ -2,10 +2,8 @@
 
 namespace Yuges\Contentable\Factories;
 
-use Yuges\Contentable\Enums\BlockType;
-use Yuges\Contentable\Data\Blocks\Header;
-use Yuges\Contentable\Data\Blocks\ItemList;
-use Yuges\Contentable\Data\Blocks\Paragraph;
+use Yuges\Contentable\Config\Config;
+use Yuges\Contentable\Interfaces\BlockType;
 use Yuges\Contentable\Exceptions\InvalidBlockData;
 use Yuges\Contentable\Interfaces\BlockDataInterface;
 
@@ -27,14 +25,9 @@ public static function create(BlockType $type, array $data): ?BlockDataInterface
     /** @return ?class-string<BlockDataInterface> */
     public static function getClass(BlockType $type): string
     {
-        $class = match ($type) {
-            BlockType::List => ItemList::class,
-            BlockType::Header => Header::class,
-            BlockType::Paragraph => Paragraph::class,
-            default => null,
-        };
-
-        return $class;
+        return Config::getBlockData()->first(function(string $data) use ($type) {
+            return new $data()->getType() === $type;
+        });
     }
 
     protected static function validateBlockData(string $class): void

src/Interfaces/BlockDataInterface.php

@@ -2,7 +2,6 @@
 
 namespace Yuges\Contentable\Interfaces;
 
-use Yuges\Contentable\Enums\BlockType;
 
 interface BlockDataInterface
 {