Updates JSON schema generator dependency and refactors SchemaMapper initialization

Author: butschster

composer.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "require": {
     "php": "^8.3",
-    "spiral/json-schema-generator": "^1.0",
+    "spiral/json-schema-generator": "^2.0",
     "llm-agents/agents": "^1.0",
     "cuyz/valinor": "^1.12"
   },

src/Integration/Laravel/SchemaMapperServiceProvider.php

@@ -5,41 +5,36 @@
 namespace LLM\Agents\JsonSchema\Mapper\Integration\Laravel;
 
 use CuyZ\Valinor\Cache\FileSystemCache;
-use CuyZ\Valinor\Mapper\TreeMapper;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 use LLM\Agents\JsonSchema\Mapper\MapperBuilder;
 use LLM\Agents\JsonSchema\Mapper\SchemaMapper;
 use LLM\Agents\Tool\SchemaMapperInterface;
+use Spiral\JsonSchemaGenerator\Generator;
 
 final class SchemaMapperServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
         $this->app->singleton(
             SchemaMapperInterface::class,
-            SchemaMapper::class,
-        );
-
-        $this->app->singleton(
-            TreeMapper::class,
-            static fn(
+            static function (
                 Application $app,
-            ) => $app->make(MapperBuilder::class)->build(),
-        );
+            ) {
+                $mapper = (new MapperBuilder(
+                    cache: match (true) {
+                        $app->environment('prod') => new FileSystemCache(
+                            cacheDir: $app->storagePath('cache/valinor'),
+                        ),
+                        default => null,
+                    },
+                ))->build();
 
-        $this->app->singleton(
-            MapperBuilder::class,
-            static fn(
-                Application $app,
-            ) => new MapperBuilder(
-                cache: match (true) {
-                    $app->environment('prod') => new FileSystemCache(
-                        cacheDir: $app->storagePath('cache/valinor'),
-                    ),
-                    default => null,
-                },
-            ),
+                return new SchemaMapper(
+                    generator: $app->get(Generator::class),
+                    mapper: $mapper,
+                );
+            },
         );
     }
 }

src/Integration/Spiral/SchemaMapperBootloader.php

@@ -5,35 +5,38 @@
 namespace LLM\Agents\JsonSchema\Mapper\Integration\Spiral;
 
 use CuyZ\Valinor\Cache\FileSystemCache;
-use CuyZ\Valinor\Mapper\TreeMapper;
 use LLM\Agents\JsonSchema\Mapper\MapperBuilder;
 use LLM\Agents\JsonSchema\Mapper\SchemaMapper;
 use LLM\Agents\Tool\SchemaMapperInterface;
 use Spiral\Boot\Bootloader\Bootloader;
 use Spiral\Boot\DirectoriesInterface;
 use Spiral\Boot\Environment\AppEnvironment;
+use Spiral\JsonSchemaGenerator\Generator;
 
 final class SchemaMapperBootloader extends Bootloader
 {
     public function defineSingletons(): array
     {
         return [
-            SchemaMapperInterface::class => SchemaMapper::class,
-
-            TreeMapper::class => static fn(
-                MapperBuilder $builder,
-            ) => $builder->build(),
-            MapperBuilder::class => static fn(
+            SchemaMapperInterface::class => static function (
                 DirectoriesInterface $dirs,
                 AppEnvironment $env,
-            ) => new MapperBuilder(
-                cache: match ($env) {
-                    AppEnvironment::Production => new FileSystemCache(
-                        cacheDir: $dirs->get('runtime') . 'cache/valinor',
-                    ),
-                    default => null,
-                },
-            ),
+                Generator $generator,
+            ) {
+                $mapper = (new MapperBuilder(
+                    cache: match ($env) {
+                        AppEnvironment::Production => new FileSystemCache(
+                            cacheDir: $dirs->get('runtime') . 'cache/valinor',
+                        ),
+                        default => null,
+                    },
+                ))->build();
+
+                return new SchemaMapper(
+                    generator: $generator,
+                    mapper: $mapper,
+                );
+            },
         ];
     }
 }