Improve shape fields

Author: SerafimArts

src/Type/Builder/Assert.php

@@ -4,6 +4,7 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
+use TypeLang\Mapper\Exception\Definition\Shape\ShapeFieldsNotSupportedException;
 use TypeLang\Mapper\Exception\Definition\Template\Hint\TemplateArgumentHintsNotSupportedException;
 use TypeLang\Mapper\Exception\Definition\Template\MissingTemplateArgumentsException;
 use TypeLang\Mapper\Exception\Definition\Template\MissingTemplateArgumentsInRangeException;
@@ -15,6 +16,18 @@
 
 final class Assert
 {
+    /**
+     * @throws ShapeFieldsNotSupportedException
+     */
+    public static function expectNoShapeFields(NamedTypeNode $stmt): void
+    {
+        if ($stmt->fields === null) {
+            return;
+        }
+
+        throw ShapeFieldsNotSupportedException::becauseTooManyShapeFields($stmt);
+    }
+
     /**
      * @throws TemplateArgumentsNotSupportedException
      */

src/Type/Builder/Builder.php

@@ -37,24 +37,6 @@ protected function expectNoTemplateArguments(TypeStatement $stmt): void
         Assert::expectNoTemplateArguments($stmt);
     }
 
-    /**
-     * @api
-     *
-     * @throws ShapeFieldsNotSupportedException
-     */
-    protected function expectNoShapeFields(TypeStatement $stmt): void
-    {
-        if (!$stmt instanceof NamedTypeNode) {
-            return;
-        }
-
-        if ($stmt->fields === null) {
-            return;
-        }
-
-        throw ShapeFieldsNotSupportedException::becauseTooManyShapeFields($stmt);
-    }
-
     /**
      * @api
      *
@@ -173,4 +155,18 @@ protected function expectNoAnyTemplateArgumentHint(TypeStatement $stmt): void
 
         Assert::expectNoAnyTemplateArgumentsHints($stmt);
     }
+
+    /**
+     * @api
+     *
+     * @throws ShapeFieldsNotSupportedException
+     */
+    protected function expectNoShapeFields(TypeStatement $stmt): void
+    {
+        if (!$stmt instanceof NamedTypeNode) {
+            return;
+        }
+
+        Assert::expectNoShapeFields($stmt);
+    }
 }