Refactor JSON schema handling for Laravel 12+ compatibility

Author: binaryk

src/Commands/GraphqlGenerateCommand.php

@@ -344,23 +344,21 @@ protected function mapFieldToGraphQLType($field, bool $isInput = false): string
         $fieldClass = get_class($field);
         $fieldClassName = class_basename($fieldClass);
 
-        // Use the field's built-in type guessing if available
-        if (method_exists($field, 'guessFieldType')) {
+        // Use the field's built-in type guessing if available (Laravel 12+ only)
+        if (method_exists($field, 'guessFieldType') && method_exists($field, 'hasJsonSchemaSupport') && $field::hasJsonSchemaSupport()) {
             $fieldType = $field->guessFieldType(app(RepositoryStoreRequest::class));
 
-            switch ($fieldType) {
-                case 'boolean':
-                    return 'Boolean';
-                case 'number':
-                case 'integer':
-                    return 'Int';
-                case 'array':
-                    return $isInput ? '[String!]' : '[String!]';
-                case 'object':
-                    return $isInput ? 'JSON' : 'JSON';
-                case 'string':
-                default:
-                    return 'String';
+            if ($fieldType !== null) {
+                // Check the Type object class to determine GraphQL type
+                $typeClass = class_basename(get_class($fieldType));
+
+                return match ($typeClass) {
+                    'BooleanType' => 'Boolean',
+                    'NumberType', 'IntegerType' => 'Int',
+                    'ArrayType' => $isInput ? '[String!]' : '[String!]',
+                    'ObjectType' => $isInput ? 'JSON' : 'JSON',
+                    default => 'String',
+                };
             }
         }
 

src/MCP/Concerns/FieldMcpSchemaDetection.php

@@ -6,24 +6,32 @@
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\MCP\Actions\JsonSchemaFromRulesAction;
 use Binaryk\LaravelRestify\Repositories\Repository;
-use Illuminate\JsonSchema\JsonSchema;
-use Illuminate\JsonSchema\JsonSchemaTypeFactory;
-use Illuminate\JsonSchema\Types\ArrayType;
-use Illuminate\JsonSchema\Types\BooleanType;
-use Illuminate\JsonSchema\Types\NumberType;
-use Illuminate\JsonSchema\Types\Type;
 
 /**
  * @mixin \Binaryk\LaravelRestify\Fields\Field
  */
 trait FieldMcpSchemaDetection
 {
+    /**
+     * Check if Laravel 12+ JsonSchema classes are available.
+     */
+    public static function hasJsonSchemaSupport(): bool
+    {
+        return class_exists(\Illuminate\JsonSchema\JsonSchemaTypeFactory::class);
+    }
+
     /**
      * Guess the field type based on validation rules, field class, and attribute patterns.
+     *
+     * @return \Illuminate\JsonSchema\Types\Type|null Returns Type on Laravel 12+, null on Laravel 11
      */
-    public function guessFieldType(RestifyRequest $request): Type
+    public function guessFieldType(RestifyRequest $request): mixed
     {
-        $schema = new JsonSchemaTypeFactory;
+        if (! static::hasJsonSchemaSupport()) {
+            return null;
+        }
+
+        $schema = new \Illuminate\JsonSchema\JsonSchemaTypeFactory;
 
         $rules = $this->getRulesForRequest($request);
 
@@ -84,8 +92,8 @@ public function getDescription(RestifyRequest $request, Repository $repository):
             }
         }
 
-        // Add examples based on field type and name
-        if ($this->jsonSchema instanceof Type) {
+        // Add examples based on field type and name (Laravel 12+ only)
+        if (static::hasJsonSchemaSupport() && $this->jsonSchema instanceof \Illuminate\JsonSchema\Types\Type) {
             $examples = $this->generateFieldExamples($this->jsonSchema);
 
             if (! empty($examples)) {
@@ -140,20 +148,22 @@ protected function formatValidationRules(array $rules): array
 
     /**
      * Generate examples for the field.
+     *
+     * @param  \Illuminate\JsonSchema\JsonSchema  $fieldType
      */
-    protected function generateFieldExamples(JsonSchema $fieldType): array
+    protected function generateFieldExamples(mixed $fieldType): array
     {
         $attribute = strtolower($this->attribute);
 
-        if ($fieldType instanceof BooleanType) {
+        if ($fieldType instanceof \Illuminate\JsonSchema\Types\BooleanType) {
             return ['true', 'false'];
         }
 
-        if ($fieldType instanceof NumberType) {
+        if ($fieldType instanceof \Illuminate\JsonSchema\Types\NumberType) {
             return $this->getNumberExamples($attribute);
         }
 
-        if ($fieldType instanceof ArrayType) {
+        if ($fieldType instanceof \Illuminate\JsonSchema\Types\ArrayType) {
             return ['["item1", "item2"]', '{"key": "value"}'];
         }
 
@@ -278,8 +288,11 @@ protected function hasAnyRule(array $ruleStrings, array $rulesToCheck): bool
 
     /**
      * Guess type from attribute name patterns.
+     *
+     * @param  \Illuminate\JsonSchema\JsonSchema  $schema
+     * @return \Illuminate\JsonSchema\Types\Type|null
      */
-    protected function guessTypeFromAttributeName(JsonSchema $schema): ?Type
+    protected function guessTypeFromAttributeName(mixed $schema): mixed
     {
         $attribute = $this->attribute;