fixe block data

Author: goshasafonov

src/Abstracts/BlockData.php

@@ -2,30 +2,26 @@
 
 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\Exceptions\InvalidBlockType;
 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
+abstract class BlockData implements BlockDataInterface
 {
-    protected const DURATION = 0.0;
+    protected const float DURATION = 0.0;
+    protected const ?BlockTypeInterface TYPE = null;
 
-    #[PropertyForMorph]
     public string $type;
 
-    public static function morph(array $properties): ?string
-    {
-        $type = Config::getBlockTypeClass(BlockType::class)::tryFrom($properties['type']);
+    public function __construct() {
+        if (! static::TYPE) {
+            throw InvalidBlockType::notDefined(static::class);
+        }
 
-        return $type ? BlockDataFactory::getClass($type) : null;
+        $this->type = static::TYPE->value;
     }
 
     public function getType(): BlockTypeInterface
@@ -62,13 +58,6 @@ public static function fromJsonData(BlockTypeInterface $type, string $data): ?Bl
         return self::fromArrayData($type, $data);
     }
 
-    public static function rules(): array
-    {
-        return [
-            'type' => [Rule::enum(Config::getBlockTypeClass(BlockType::class))],
-        ];
-    }
-
     public function duration(): float
     {
         return static::DURATION;

src/Data/Blocks/ParagraphData.php

@@ -4,14 +4,16 @@
 
 use Yuges\Contentable\Config\Config;
 use Yuges\Contentable\Enums\BlockType;
+use Yuges\Contentable\Interfaces\BlockType as BlockTypeInterface;
 
 class ParagraphData extends \Yuges\Contentable\Abstracts\BlockData
 {
-    public string $type = BlockType::Paragraph->value;
+    protected const BlockTypeInterface TYPE = BlockType::Paragraph;
 
     public function __construct(
         public ?string $text = '',
     ) {
+        parent::__construct();
     }
 
     public function getData(): array

src/Exceptions/InvalidBlockType.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Yuges\Contentable\Exceptions;
+
+use Exception;
+use TypeError;
+use Yuges\Contentable\Interfaces\BlockType;
+
+class InvalidBlockType extends Exception
+{
+    public static function notDefined(string $class): TypeError
+    {
+        return new TypeError("Block type is not defined in the `{$class}` class");
+    }
+
+    public static function doesNotImplementBlockType(string $class): TypeError
+    {
+        $BlockType = BlockType::class;
+
+        return new TypeError("Block type enum `{$class}` must implement `{$BlockType}`");
+    }
+}

src/Factories/BlockDataFactory.php

@@ -2,6 +2,8 @@
 
 namespace Yuges\Contentable\Factories;
 
+use BackedEnum;
+use ReflectionClass;
 use Yuges\Contentable\Config\Config;
 use Yuges\Contentable\Interfaces\BlockType;
 use Yuges\Contentable\Exceptions\InvalidBlockData;
@@ -19,7 +21,23 @@ public static function create(BlockType $type, array $data): ?BlockDataInterface
 
         static::validateBlockData($class);
 
-        return $class::from($data);
+        $parameters = new ReflectionClass($class)->getConstructor()->getParameters();
+
+        foreach ($data as $key => $value) {
+            $parameter = array_find($parameters, fn ($parameter) => $parameter->getName() === $key);
+
+            if (! $parameter) {
+                unset($data[$key]);
+            }
+
+            $type = $parameter->getType();
+
+            if (is_subclass_of($type->getName(), BackedEnum::class)) {
+                $data[$key] = $type->getName()::from($value);
+            }
+        }
+
+        return new $class(...$data);
     }
 
     /** @return ?class-string<BlockDataInterface> */

src/Interfaces/BlockDataInterface.php

@@ -13,9 +13,11 @@ public function getData(): array;
 
     public function toArrayData(): array;
 
+    public static function fromArrayData(BlockType $type, array $data): ?BlockDataInterface;
+
     public function toJsonData(): string;
 
-    public static function from(mixed ...$payloads): static;
+    public static function fromJsonData(BlockType $type, string $data): ?BlockDataInterface;
 
     public function duration(): float;
 }

tests/Integration/ContentTest.php

@@ -12,11 +12,14 @@
 use Yuges\Contentable\Data\Blocks\ListData;
 use Yuges\Contentable\Data\Blocks\HeaderData;
 use Yuges\Contentable\Tests\Stubs\Models\Post;
+use Yuges\Contentable\Tests\Stubs\Blocks\ParagraphData;
 
 class ContentTest extends TestCase
 {
     public function testContentPost()
     {
+        new ParagraphData('test');
+
         $post = Post::query()->create([
             'title' => 'New post',
         ]);

tests/src/Stubs/Blocks/ParagraphData.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Yuges\Contentable\Tests\Stubs\Blocks;
+
+use Yuges\Contentable\Tests\Stubs\Enums\BlockType;
+
+class ParagraphData extends \Yuges\Contentable\Data\Blocks\ParagraphData
+{
+    protected const BlockType TYPE = BlockType::Delimiter;
+
+    public function __construct(
+        public ?string $text = '',
+    ) {
+        parent::__construct($text);
+    }
+}

tests/src/Stubs/Enums/BlockType.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Yuges\Contentable\Tests\Stubs\Enums;
+
+enum BlockType: string implements \Yuges\Contentable\Interfaces\BlockType
+{
+    case List = 'list';
+    case Quote = 'quote';
+    case Header = 'header';
+    case Paragraph = 'paragraph';
+    case Delimiter = 'delimiter';
+    case Test = 'Test';
+}