A little exceptions and codestyle (120 chars per line) improvements

Author: Kirill Nesmeyanov

src/Type/Builder/CallableTypeBuilder.php

@@ -4,19 +4,30 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
+use TypeLang\Mapper\Exception\Definition\InternalTypeException;
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
 use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
 use TypeLang\Mapper\Type\TypeInterface;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
 /**
+ * Creates a new type from a callback.
+ *
+ * ```
+ * // ExamplePlatform.php
+ * yield new CallableTypeBuilder(
+ *     names: 'custom-string',
+ *     factory: static fn(): TypeInterface => new CustomString(),
+ * );
+ * ```
+ *
  * @template-extends NamedTypeBuilder<TypeInterface>
  */
 class CallableTypeBuilder extends NamedTypeBuilder
 {
     /**
      * @param non-empty-array<non-empty-string>|non-empty-string $names
-     * @param \Closure(): TypeInterface                          $factory
+     * @param \Closure(): TypeInterface $factory
      */
     public function __construct(
         array|string $names,
@@ -25,11 +36,22 @@ public function __construct(
         parent::__construct($names);
     }
 
-    public function build(TypeStatement $statement, TypeRepositoryInterface $types, TypeParserInterface $parser): TypeInterface
-    {
+    public function build(
+        TypeStatement $statement,
+        TypeRepositoryInterface $types,
+        TypeParserInterface $parser,
+    ): TypeInterface {
         $this->expectNoShapeFields($statement);
         $this->expectNoTemplateArguments($statement);
 
-        return ($this->factory)();
+        try {
+            return ($this->factory)();
+        } catch (\Throwable $e) {
+            throw InternalTypeException::becauseInternalTypeErrorOccurs(
+                type: $statement,
+                message: 'An error occurred while trying to fetch {{type}} type from callback',
+                previous: $e,
+            );
+        }
     }
 }

src/Type/Builder/PsrContainerTypeBuilder.php

@@ -5,19 +5,33 @@
 namespace TypeLang\Mapper\Type\Builder;
 
 use Psr\Container\ContainerInterface;
+use TypeLang\Mapper\Exception\Definition\InternalTypeException;
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
 use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
 use TypeLang\Mapper\Type\TypeInterface;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
 /**
+ * Creates a new type from a PSR-compatible container using service-location.
+ *
+ * ```
+ * // ExamplePlatform.php
+ * yield new CallableTypeBuilder(
+ *     names: 'custom-string',
+ *     serviceId: CustomString::class,
+ *     container: $psrCompatibleContainer,
+ * );
+ * ```
+ *
+ * Tip: When using Symfony, make sure the service is not private.
+ *
  * @template-extends NamedTypeBuilder<TypeInterface>
  */
 class PsrContainerTypeBuilder extends NamedTypeBuilder
 {
     /**
      * @param non-empty-array<non-empty-string>|non-empty-string $names
-     * @param class-string<TypeInterface>                        $serviceId
+     * @param class-string<TypeInterface> $serviceId
      */
     public function __construct(
         array|string $names,
@@ -27,15 +41,33 @@ public function __construct(
         parent::__construct($names);
     }
 
-    public function build(TypeStatement $statement, TypeRepositoryInterface $types, TypeParserInterface $parser): TypeInterface
-    {
+    public function build(
+        TypeStatement $statement,
+        TypeRepositoryInterface $types,
+        TypeParserInterface $parser,
+    ): TypeInterface {
         $this->expectNoShapeFields($statement);
         $this->expectNoTemplateArguments($statement);
 
-        $service = $this->container->get($this->serviceId);
+        try {
+            $service = $this->container->get($this->serviceId);
+        } catch (\Throwable $e) {
+            throw InternalTypeException::becauseInternalTypeErrorOccurs(
+                type: $statement,
+                message: 'An error occurred while trying to fetch {{type}} type from service container',
+                previous: $e,
+            );
+        }
 
         if (!$service instanceof TypeInterface) {
-            throw new \RuntimeException("Type service '{$this->serviceId}' does not implement TypeLang\Mapper\Type\TypeInterface");
+            throw InternalTypeException::becauseInternalTypeErrorOccurs(
+                type: $statement,
+                message: \sprintf(
+                    'Received service from service container defined as {{type}} must be instanceof %s, but %s given',
+                    TypeInterface::class,
+                    \get_debug_type($service),
+                ),
+            );
         }
 
         return $service;