routesync 1.0.35 → 1.0.36

package/README.md

@@ -200,6 +200,137 @@ const result = await produkGetIdAction({ params: { id: '42' } })
 
 ---
 
+## Response Type Inference
+
+RouteSync automatically infers the TypeScript response type for each endpoint. The scanner works through **7 stages in order**, stopping at the first successful match.
+
+### How inference works
+
+```
+Controller method
+      │
+      ▼
+Stage 1: PHP 8 #[RouteSyncResponse] attribute on method  ← most explicit
+      │
+      ▼
+Stage 2: return new UserResource($user) in method body
+      │  ├─ Stage 2a: #[RouteSyncResponse] on Resource class
+      │  ├─ Stage 2b: @mixin \App\Models\User docblock
+      │  ├─ Stage 2c: __construct(User $user) type hint      ← NEW
+      │  ├─ Stage 2d: @var User $resource docblock           ← NEW
+      │  ├─ Stage 2e: Strip "Resource" suffix → App\Models\* ← NEW
+      │  └─ Stage 2f: toArray() keys vs DB column matching   ← NEW
+      │
+      ▼
+Stage 3: response()->json([...]) inline array
+         keys matched against DB columns (min score 2)       ← NEW
+      │
+      ▼
+  response: unknown  ← annotate manually if all stages fail
+```
+
+### Zero-config inference (no annotation needed)
+
+For the common convention `UserResource` → `User`, RouteSync infers automatically:
+
+```php
+// ✅ Auto-detected — no annotation needed
+public function show(User $user): JsonResponse
+{
+    return new UserResource($user);
+}
+
+// ✅ Auto-detected — UserResource::collection → User[]
+public function index(): JsonResponse
+{
+    return UserResource::collection(User::all());
+}
+```
+
+### Explicit annotation with PHP 8 Attribute
+
+Use `#[RouteSyncResponse]` when auto-inference fails — for example, when the Resource name doesn't match the model, or the response is a DTO/custom shape.
+
+**Step 1 — Create the attribute class** (`app/Attributes/RouteSyncResponse.php`):
+
+```php
+<?php
+
+namespace App\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_CLASS)]
+class RouteSyncResponse
+{
+    public function __construct(
+        public readonly string $model,
+        public readonly bool $collection = false,
+    ) {}
+}
+```
+
+**Step 2 — Annotate your controller method:**
+
+```php
+use App\Attributes\RouteSyncResponse;
+use App\Models\User;
+
+class AuthController extends Controller
+{
+    // Single object response
+    #[RouteSyncResponse(model: User::class)]
+    public function register(RegisterRequest $request): JsonResponse
+    {
+        $user = User::create($request->validated());
+        $token = $user->createToken('auth')->plainTextToken;
+
+        return response()->json(['token' => $token, 'user' => new UserResource($user)]);
+    }
+
+    // Collection response
+    #[RouteSyncResponse(model: User::class, collection: true)]
+    public function index(): JsonResponse
+    {
+        return response()->json(User::all());
+    }
+}
+```
+
+**Or annotate the Resource class directly** (applies to all endpoints that return this Resource):
+
+```php
+use App\Attributes\RouteSyncResponse;
+use App\Models\User;
+
+#[RouteSyncResponse(model: User::class)]
+class UserResource extends JsonResource
+{
+    public function toArray($request): array
+    {
+        return [
+            'id'    => $this->id,
+            'name'  => $this->name,
+            'email' => $this->email,
+        ];
+    }
+}
+```
+
+> **Priority:** annotation on controller method > annotation on Resource class > auto-inference.
+
+### When to annotate manually
+
+| Situation | Solution |
+|---|---|
+| Resource name doesn't match model (`PublicProfileResource` → `User`) | `#[RouteSyncResponse(model: User::class)]` |
+| Response is a DTO, not an Eloquent model | Add model manually after generate |
+| Controller returns `response()->json([...])` without a Resource | `#[RouteSyncResponse(model: User::class)]` |
+| Multiple models in one response | Add model manually after generate |
+| Response is still `unknown` after scan | Add `#[RouteSyncResponse]` attribute |
+
+---
+
 ## Data Transformation
 
 RouteSync handles all data mapping automatically:

package/dist/cli.js

@@ -8361,25 +8361,189 @@ var import_path = __toESM(require("path"));
 var LaravelRouteParser = class {
   async parse(filePath, options = {}) {
     const projectRoot = import_path.default.resolve(import_path.default.dirname(filePath), "..");
+    const extractModels = options.extractModels ? "true" : "false";
     const phpScript = `<?php
 require __DIR__.'/vendor/autoload.php';
 $app = require_once __DIR__.'/bootstrap/app.php';
-$kernel = $app->make(Illuminate\\Contracts\\Console\\Kernel::class);
+$kernel = $app->make(IlluminateContractsConsoleKernel::class);
 $kernel->bootstrap();
 
-$result = [
-    'routes' => [],
-    'models' => []
-];
+$result = ['routes' => [], 'models' => []];
+
+// \u2500\u2500\u2500 Helpers \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+function rsync_get_source(ReflectionFunctionAbstract $ref): ?string {
+    $file = $ref->getFileName();
+    $start = $ref->getStartLine();
+    $end = $ref->getEndLine();
+    if (!$file || $start === false || $end === false) return null;
+    return implode('', array_slice(file($file), $start - 1, $end - $start + 1));
+}
+
+/**
+ * Try to resolve responseMetadata from a Resource class.
+ * Checks (in order):
+ *   1. PHP 8 #[RouteSyncResponse] attribute on class
+ *   2. @mixin docblock
+ *   3. Constructor parameter type hint  \u2190 NEW
+ *   4. $this->resource @var docblock    \u2190 NEW
+ *   5. Strip Resource suffix \u2192 match AppModels*
+ *   6. toArray() field vs DB column intersection
+ */
+function rsync_infer_from_resource(string $resourceClass, bool $collection): ?array {
+    if (!class_exists($resourceClass)) return null;
+    $resRef = new ReflectionClass($resourceClass);
+
+    // 1. PHP 8 attribute
+    foreach ($resRef->getAttributes() as $attr) {
+        $short = class_basename($attr->getName());
+        if (in_array($short, ['Response', 'RouteSyncResponse'])) {
+            $args = $attr->getArguments();
+            $type = $args[0] ?? $args['type'] ?? $args['model'] ?? $args['response'] ?? null;
+            if ($type) return ['type' => class_basename($type), 'collection' => $collection];
+        }
+    }
+
+    // 2. @mixin docblock
+    $doc = $resRef->getDocComment();
+    if ($doc && preg_match('/@mixins+([\\\\w]+)/', $doc, $m)) {
+        return ['type' => class_basename($m[1]), 'collection' => $collection];
+    }
+
+    // 3. Constructor parameter type hint: __construct(User $user)
+    if ($resRef->hasMethod('__construct')) {
+        $ctor = $resRef->getMethod('__construct');
+        foreach ($ctor->getParameters() as $param) {
+            $ptype = $param->getType();
+            if ($ptype && !$ptype->isBuiltin()) {
+                $cn = $ptype->getName();
+                if (is_subclass_of($cn, 'IlluminateDatabaseEloquentModel')) {
+                    return ['type' => class_basename($cn), 'collection' => $collection];
+                }
+            }
+        }
+    }
+
+    // 4. $this->resource @var docblock in class body or toArray()
+    $classDoc = $resRef->getDocComment() ?: '';
+    foreach (['toArray', 'toResponse'] as $mname) {
+        if ($resRef->hasMethod($mname)) {
+            $src = rsync_get_source($resRef->getMethod($mname)) ?? '';
+            $classDoc .= $src;
+        }
+    }
+    if (preg_match('/@vars+([\\\\w]+)s+$(?:resource|model)/', $classDoc, $m)) {
+        $cn = ltrim($m[1], '\\');
+        $fqcn = str_contains($cn, '\\') ? $cn : 'App\\Models\\' . $cn;
+        if (class_exists($fqcn)) {
+            return ['type' => class_basename($fqcn), 'collection' => $collection];
+        }
+    }
+
+    // 5. Strip Resource suffix \u2192 AppModels<Name>
+    $inferredName = preg_replace('/Resource$/', '', class_basename($resourceClass));
+    if ($inferredName) {
+        $mc = 'App\\Models\\' . $inferredName;
+        if (class_exists($mc)) {
+            return ['type' => $inferredName, 'collection' => $collection];
+        }
+    }
+
+    // 6. toArray() field vs DB column intersection
+    if ($resRef->hasMethod('toArray')) {
+        $src = rsync_get_source($resRef->getMethod('toArray')) ?? '';
+        preg_match_all('/['"]([a-zA-Z0-9_]+)['"]s*=>/', $src, $km);
+        $resFields = array_unique($km[1] ?? []);
+        if (!empty($resFields)) {
+            $bestModel = null; $bestScore = 0;
+            $modelsPath = app_path('Models');
+            if (is_dir($modelsPath)) {
+                foreach (IlluminateSupportFacadesFile::allFiles($modelsPath) as $mf) {
+                    $mn = preg_replace('/.php$/', '', $mf->getFilename());
+                    $mc = 'App\\Models\\' . $mn;
+                    if (!class_exists($mc)) continue;
+                    try {
+                        $mi = new $mc();
+                        $cols = array_column(IlluminateSupportFacadesSchema::getColumns($mi->getTable()), 'name');
+                        $score = count(array_intersect($resFields, $cols));
+                        if ($score > $bestScore) { $bestScore = $score; $bestModel = $mn; }
+                    } catch (Exception $e) {}
+                }
+            }
+            if ($bestModel && $bestScore > 0) {
+                return ['type' => $bestModel, 'collection' => $collection];
+            }
+        }
+    }
+
+    return null;
+}
+
+/**
+ * Try to resolve responseMetadata directly from controller method source.
+ * Handles cases where no Resource class is used at all.
+ */
+function rsync_infer_from_source(?string $source): ?array {
+    if (!$source) return null;
+
+    // return new SomeResource($x)
+    if (preg_match('/returns+news+([a-zA-Z0-9_]+Resource)s*(/', $source, $m)) {
+        $rc = 'App\\Http\\Resources\\' . $m[1];
+        $result = rsync_infer_from_resource($rc, false);
+        if ($result) return $result;
+    }
+
+    // SomeResource::collection(...)
+    if (preg_match('/([a-zA-Z0-9_]+Resource)::collections*(/', $source, $m)) {
+        $rc = 'App\\Http\\Resources\\' . $m[1];
+        $result = rsync_infer_from_resource($rc, true);
+        if ($result) return $result;
+    }
+
+    // ->paginate() or ->simplePaginate() with Resource
+    if (preg_match('/([a-zA-Z0-9_]+Resource)::collection.*paginate/s', $source, $m)) {
+        $rc = 'App\\Http\\Resources\\' . $m[1];
+        $result = rsync_infer_from_resource($rc, true);
+        if ($result) { $result['paginated'] = true; return $result; }
+    }
+
+    // response()->json(['token' => ..., 'user' => ...]) \u2014 inline array
+    // Extract top-level keys and try to match a model
+    if (preg_match('/response()s*->s*jsons*(s*[([^]]{0,800})]/', $source, $jsonMatch)) {
+        preg_match_all('/['"]([a-zA-Z0-9_]+)['"]s*=>/', $jsonMatch[1], $km);
+        $keys = array_unique($km[1] ?? []);
+        if (!empty($keys)) {
+            $bestModel = null; $bestScore = 0;
+            foreach (IlluminateSupportFacadesFile::allFiles(app_path('Models')) as $mf) {
+                $mn = preg_replace('/.php$/', '', $mf->getFilename());
+                $mc = 'App\\Models\\' . $mn;
+                if (!class_exists($mc)) continue;
+                try {
+                    $mi = new $mc();
+                    $cols = array_column(IlluminateSupportFacadesSchema::getColumns($mi->getTable()), 'name');
+                    $camelCols = array_map(fn($c) => lcfirst(str_replace('_', '', ucwords($c, '_'))), $cols);
+                    $score = count(array_intersect($keys, array_merge($cols, $camelCols)));
+                    if ($score > $bestScore) { $bestScore = $score; $bestModel = $mn; }
+                } catch (Exception $e) {}
+            }
+            if ($bestModel && $bestScore >= 2) {
+                return ['type' => $bestModel, 'collection' => false];
+            }
+        }
+    }
+
+    return null;
+}
+
+// \u2500\u2500\u2500 Main Route Loop \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 
-// Extract Routes
 $routes = app('router')->getRoutes();
 foreach ($routes as $route) {
     if (!str_starts_with($route->uri(), 'api/')) continue;
-    
+
     $methods = array_diff($route->methods(), ['HEAD']);
     $middlewares = $route->gatherMiddleware();
-    
+
     $auth = false;
     foreach ($middlewares as $mw) {
         if (is_string($mw) && (str_contains($mw, 'auth') || str_contains($mw, 'sanctum'))) {
@@ -8388,17 +8552,21 @@ foreach ($routes as $route) {
     }
 
     $schema = [];
+    $responseMetadata = null;
     $action = $route->getAction();
+
     if (isset($action['uses']) && is_string($action['uses']) && str_contains($action['uses'], '@')) {
         list($controller, $method) = explode('@', $action['uses']);
         if (class_exists($controller)) {
             try {
                 $reflector = new ReflectionMethod($controller, $method);
+
+                // \u2500\u2500 Request schema from FormRequest \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
                 foreach ($reflector->getParameters() as $param) {
                     $type = $param->getType();
                     if ($type && !$type->isBuiltin()) {
                         $className = $type->getName();
-                        if (is_subclass_of($className, 'Illuminate\\Foundation\\Http\\FormRequest')) {
+                        if (is_subclass_of($className, 'IlluminateFoundationHttpFormRequest')) {
                             $request = new $className();
                             if (method_exists($request, 'rules')) {
                                 $schema = $request->rules();
@@ -8406,174 +8574,97 @@ foreach ($routes as $route) {
                         }
                     }
                 }
-                
-                // Parse PHP 8 Attributes for Response Metadata
-                $responseMetadata = null;
-                $attributes = $reflector->getAttributes();
-                foreach ($attributes as $attr) {
-                    $attrName = $attr->getName();
-                    $shortName = class_basename($attrName);
-                    
-                    if (in_array($shortName, ['Response', 'RouteSyncResponse'])) {
+
+                // \u2500\u2500 Stage 1: PHP 8 Attribute on controller method \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+                foreach ($reflector->getAttributes() as $attr) {
+                    $short = class_basename($attr->getName());
+                    if (in_array($short, ['Response', 'RouteSyncResponse'])) {
                         $args = $attr->getArguments();
-                        
-                        $type = null;
-                        if (isset($args[0])) {
-                            $type = $args[0];
-                        } elseif (isset($args['type'])) {
-                            $type = $args['type'];
-                        } elseif (isset($args['model'])) {
-                            $type = $args['model'];
-                        } elseif (isset($args['response'])) {
-                            $type = $args['response'];
-                        }
-                        
-                        $collection = false;
-                        if (isset($args[1])) {
-                            $collection = (bool) $args[1];
-                        } elseif (isset($args['collection'])) {
-                            $collection = (bool) $args['collection'];
-                        }
-                        
+                        $type = $args[0] ?? $args['type'] ?? $args['model'] ?? $args['response'] ?? null;
                         if ($type) {
-                            $responseMetadata = [
-                                'type' => class_basename($type),
-                                'collection' => $collection
-                            ];
+                            $collection = (bool)($args[1] ?? $args['collection'] ?? false);
+                            $responseMetadata = ['type' => class_basename($type), 'collection' => $collection];
                             break;
                         }
                     }
                 }
-                
-                
-                $fileName = $reflector->getFileName();
-                $startLine = $reflector->getStartLine();
-                $endLine = $reflector->getEndLine();
-                $methodSource = null;
-
-                if ($fileName && $startLine !== false && $endLine !== false) {
-                    $lines = file($fileName);
-                    $methodSource = implode("", array_slice($lines, $startLine - 1, $endLine - $startLine + 1));
-                }
 
-                // Resource Discovery
-                if (!$responseMetadata && $methodSource) {
-                    $resourceName = null;
-                    $collection = false;
-                    
-                    if (preg_match('/return\\s+new\\s+([a-zA-Z0-9_]+Resource)/', $methodSource, $matches)) {
-                        $resourceName = $matches[1];
-                    } elseif (preg_match('/return\\s+([a-zA-Z0-9_]+Resource)::collection/', $methodSource, $matches)) {
-                        $resourceName = $matches[1];
-                        $collection = true;
-                    }
-                    
-                    if ($resourceName) {
-                        $resourceClass = 'App\\\\Http\\\\Resources\\\\' . $resourceName;
-                        if (class_exists($resourceClass)) {
-                            $resReflector = new ReflectionClass($resourceClass);
-                            $resAttrs = $resReflector->getAttributes();
-                            foreach ($resAttrs as $attr) {
-                                $shortName = class_basename($attr->getName());
-                                if (in_array($shortName, ['Response', 'RouteSyncResponse'])) {
-                                    $args = $attr->getArguments();
-                                    $type = $args[0] ?? $args['type'] ?? $args['model'] ?? $args['response'] ?? null;
-                                    if ($type) {
-                                        $responseMetadata = [
-                                            'type' => class_basename($type),
-                                            'collection' => $collection
-                                        ];
-                                    }
-                                }
-                            }
-                            
-                            if (!$responseMetadata) {
-                                $docComment = $resReflector->getDocComment();
-                                if ($docComment && preg_match('/@mixin\\s+([\\\\\\\\a-zA-Z0-9_]+)/', $docComment, $mixinMatches)) {
-                                    $responseMetadata = [
-                                        'type' => class_basename($mixinMatches[1]),
-                                        'collection' => $collection
-                                    ];
-                                }
-                            }
-                        }
-                    }
+                $methodSource = rsync_get_source($reflector);
+
+                // \u2500\u2500 Stage 2: Source-based inference \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+                if (!$responseMetadata) {
+                    $responseMetadata = rsync_infer_from_source($methodSource);
                 }
-                
-                // Fallback: Try to parse $request->validate([...]) from source code
+
+                // \u2500\u2500 Stage 3: Fallback $request->validate([...]) for schema \u2500\u2500
                 if (empty($schema) && $methodSource) {
-                    // Look for $request->validate([ ... ])
-                    if (preg_match('/\\\\$request->validate\\\\s*\\\\(\\\\s*\\\\[(.*?)\\\\]\\\\s*\\\\)/s', $methodSource, $matches)) {
-                        $rulesString = $matches[1];
-                        // Match 'field' => 'rules'
-                        preg_match_all('~[\\'"]([a-zA-Z0-9_.*]+)[\\'"]\\\\s*=>\\\\s*[\\'"](.*?)[\\'"]~', $rulesString, $ruleMatches);
-                        if (!empty($ruleMatches[1])) {
-                            foreach ($ruleMatches[1] as $index => $field) {
-                                $schema[$field] = $ruleMatches[2][$index];
-                            }
+                    if (preg_match('/$request->validates*(s*[(.*?)]s*)/s', $methodSource, $vm)) {
+                        preg_match_all('/['"]([a-zA-Z0-9_.*]+)['"]s*=>s*['"]([^'"]*)['"]/', $vm[1], $rm);
+                        foreach ($rm[1] as $i => $field) {
+                            $schema[$field] = $rm[2][$i];
                         }
                     }
                 }
-            } catch (\\Exception $e) {}
+
+            } catch (Exception $e) {}
         }
     }
 
     foreach ($methods as $method) {
-        $nameParts = explode('/', preg_replace('/^api\\//', '', $route->uri()));
-        $resource = preg_replace('/\\{.*\\}/', '', $nameParts[0]);
+        $nameParts = explode('/', preg_replace('/^api//', '', $route->uri()));
+        $resource = preg_replace('/{.*}/', '', $nameParts[0]);
         if (empty($resource)) $resource = 'api';
-        
-        $name = $resource . '.' . strtolower($method);
-        
+
         $result['routes'][] = [
-            'name' => $route->getName() ?: $name,
-            'method' => $method,
-            'path' => '/' . preg_replace('/^api\\//', '', $route->uri()),
-            'auth' => $auth,
+            'name'       => $route->getName() ?: ($resource . '.' . strtolower($method)),
+            'method'     => $method,
+            'path'       => '/' . preg_replace('/^api//', '', $route->uri()),
+            'auth'       => $auth,
             'middleware' => $middlewares,
-            'schema' => empty($schema) ? null : ['rules' => $schema],
-            'response' => $responseMetadata
+            'schema'     => empty($schema) ? null : ['rules' => $schema],
+            'response'   => $responseMetadata,
         ];
     }
 }
 
-// Extract Models if requested
-$extractModels = ${options.extractModels ? "true" : "false"};
+// \u2500\u2500\u2500 Extract Models \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+
+$extractModels = ${extractModels};
 if ($extractModels) {
     $modelsPath = app_path('Models');
     if (is_dir($modelsPath)) {
-        $files = \\Illuminate\\Support\\Facades\\File::allFiles($modelsPath);
+        $files = IlluminateSupportFacadesFile::allFiles($modelsPath);
         foreach ($files as $file) {
-            $class = 'App\\\\Models\\\\' . str_replace('/', '\\\\', $file->getRelativePathname());
-            $class = preg_replace('/\\.php$/', '', $class);
-            
-            if (class_exists($class) && is_subclass_of($class, 'Illuminate\\\\Database\\\\Eloquent\\\\Model')) {
+            $class = 'App\\Models\\' . str_replace('/', '\\', $file->getRelativePathname());
+            $class = preg_replace('/.php$/', '', $class);
+
+            if (class_exists($class) && is_subclass_of($class, 'Illuminate\\Database\\Eloquent\\Model')) {
                 try {
                     $reflection = new ReflectionClass($class);
                     if ($reflection->isAbstract()) continue;
-                    
-                    $model = new $class();
-                    $table = $model->getTable();
-                    $columns = \\Illuminate\\Support\\Facades\\Schema::getColumns($table);
-                    
+
+                    $model     = new $class();
+                    $table     = $model->getTable();
+                    $columns   = IlluminateSupportFacadesSchema::getColumns($table);
+
                     $parsedColumns = [];
                     foreach ($columns as $col) {
                         $parsedColumns[] = [
-                            'name' => $col['name'],
-                            'type' => $col['type'], // Use 'type' which contains the raw type like enum('a','b') instead of 'type_name'
-                            'nullable' => $col['nullable']
+                            'name'     => $col['name'],
+                            'type'     => $col['type'],
+                            'nullable' => $col['nullable'],
                         ];
                     }
-                    
+
                     $result['models'][] = [
-                        'name' => class_basename($class),
-                        'table' => $table,
+                        'name'    => class_basename($class),
+                        'table'   => $table,
                         'columns' => $parsedColumns,
-                        'hidden' => $model->getHidden(),
+                        'hidden'  => $model->getHidden(),
                         'appends' => $model->getAppends(),
-                        'casts' => $model->getCasts()
+                        'casts'   => $model->getCasts(),
                     ];
-                } catch (\\Exception $e) {}
+                } catch (Exception $e) {}
             }
         }
     }
@@ -8726,26 +8817,10 @@ var SDKGenerator = class {
     const lines = [];
     let usesZod = false;
     let usesTypes = false;
-    const zodRoutes = /* @__PURE__ */ new Set();
-    if (options.zod) {
-      for (const [group, routes] of Object.entries(grouped)) {
-        for (const route of routes) {
-          if (route.schema?.rules) {
-            usesZod = true;
-            zodRoutes.add(`${group}.${route.actionName}`);
-          }
-          if (route.response) {
-            usesTypes = true;
-          }
-        }
-      }
-    } else {
-      for (const [group, routes] of Object.entries(grouped)) {
-        for (const route of routes) {
-          if (route.response) {
-            usesTypes = true;
-          }
-        }
+    for (const routes of Object.values(grouped)) {
+      for (const route of routes) {
+        if (options.zod && route.schema?.rules) usesZod = true;
+        if (route.response) usesTypes = true;
       }
     }
     lines.push(`// Auto-generated by routesync. Do not edit manually.`);
@@ -8761,15 +8836,15 @@ var SDKGenerator = class {
       lines.push(`import * as Types from './types'`);
     }
     lines.push(``);
-    for (const [group, routes] of Object.entries(grouped)) {
+    for (const [groupName, routes] of Object.entries(grouped)) {
       for (const route of routes) {
-        const TitleCaseGroup = group.charAt(0).toUpperCase() + group.slice(1);
+        const TitleCaseGroup = groupName.charAt(0).toUpperCase() + groupName.slice(1);
         const TitleCaseAction = route.actionName.charAt(0).toUpperCase() + route.actionName.slice(1);
         const ContractName = `${TitleCaseGroup}${TitleCaseAction}Contract`;
+        const SchemaName = `${TitleCaseGroup}${TitleCaseAction}Schema`;
         const pathParams = Array.from(route.runtimePath.matchAll(/:([a-zA-Z0-9_]+)/g)).map((m) => m[1]);
         const paramsType = pathParams.length > 0 ? `{ ${pathParams.map((p) => `${p}: string`).join(", ")} }` : `unknown`;
-        const methodActionName = TitleCaseGroup + TitleCaseAction;
-        const bodyType = route.schema?.rules && usesZod ? `z.infer<typeof Schemas.${methodActionName}Schema>` : `unknown`;
+        const bodyType = route.schema?.rules && usesZod ? `z.infer<typeof Schemas.${SchemaName}>` : `unknown`;
         const responseType = route.response ? `Types.${route.response.type}${route.response.collection ? "[]" : ""}` : `unknown`;
         lines.push(`export type ${ContractName} = {`);
         lines.push(`  request: {`);
@@ -8783,23 +8858,23 @@ var SDKGenerator = class {
     }
     lines.push(``);
     lines.push(`export const api = defineApi({`);
-    for (const [group, routes] of Object.entries(grouped)) {
-      lines.push(`  ${group}: {`);
+    for (const [groupName, routes] of Object.entries(grouped)) {
+      lines.push(`  ${groupName}: {`);
       for (const route of routes) {
-        const TitleCaseGroup = group.charAt(0).toUpperCase() + group.slice(1);
+        const TitleCaseGroup = groupName.charAt(0).toUpperCase() + groupName.slice(1);
         const TitleCaseAction = route.actionName.charAt(0).toUpperCase() + route.actionName.slice(1);
         const ContractName = `${TitleCaseGroup}${TitleCaseAction}Contract`;
+        const SchemaName = `${TitleCaseGroup}${TitleCaseAction}Schema`;
         lines.push(`    ${route.actionName}: endpoint<${ContractName}['response'], ${ContractName}['request']['params'], ${ContractName}['request']['body']>({`);
         lines.push(`      method: '${route.method}',`);
         lines.push(`      path: '${route.runtimePath}',`);
         if (route.auth) lines.push(`      auth: true,`);
         if (options.zod && route.schema?.rules) {
-          lines.push(`      schema: {`);
-          lines.push(`        body: Schemas.${ContractName.replace("Contract", "Schema")}`);
-          lines.push(`      },`);
+          lines.push(`      schema: { body: Schemas.${SchemaName} },`);
         }
-        if (options.zod && route.response && options.models) {
-          lines.push(`      responseSchema: Schemas.${route.response.type}Schema${route.response.collection ? ".array()" : ""},`);
+        if (options.zod && options.models && route.response) {
+          const responseSchema = `Schemas.${route.response.type}Schema${route.response.collection ? ".array()" : ""}`;
+          lines.push(`      responseSchema: ${responseSchema},`);
         }
         lines.push(`    }),`);
       }
@@ -8857,7 +8932,6 @@ var import_fs_extra4 = __toESM(require_lib());
 var TypeGenerator = class {
   static async generate(manifest, outputDir) {
     const lines = [];
-    const hasSchemas = manifest.routes.some((r) => r.schema && Object.keys(r.schema).length > 0);
     lines.push(`// Auto-generated by routesync. Do not edit manually.`);
     lines.push(``);
     lines.push(`export interface ApiResponse<T = unknown> {`);
@@ -8885,15 +8959,17 @@ var TypeGenerator = class {
       for (const model of manifest.models) {
         lines.push(`export interface ${model.name} {`);
         for (const col of model.columns) {
-          if (model.hidden && model.hidden.includes(col.name)) continue;
+          if (model.hidden?.includes(col.name)) continue;
           const tsType = this.mapSqlTypeToTs(col.type);
           const finalTsType = col.nullable ? `${tsType} | null` : tsType;
-          const safeName = camelCase(col.name).match(/^[a-zA-Z_$][a-zA-Z0-9_$]*$/) ? camelCase(col.name) : `"${camelCase(col.name)}"`;
+          const key = camelCase(col.name);
+          const safeName = key.match(/^[a-zA-Z_$][a-zA-Z0-9_$]*$/) ? key : `"${key}"`;
           lines.push(`  ${safeName}: ${finalTsType}`);
         }
         if (model.appends && model.appends.length > 0) {
           for (const append of model.appends) {
-            const safeAppend = camelCase(append).match(/^[a-zA-Z_$][a-zA-Z0-9_$]*$/) ? camelCase(append) : `"${camelCase(append)}"`;
+            const key = camelCase(append);
+            const safeAppend = key.match(/^[a-zA-Z_$][a-zA-Z0-9_$]*$/) ? key : `"${key}"`;
             lines.push(`  ${safeAppend}?: unknown`);
           }
         }
@@ -8908,7 +8984,7 @@ var TypeGenerator = class {
         const typeName = toTypeName(resource ?? "");
         lines.push(`export interface ${typeName} {`);
         lines.push(`  id: number`);
-        lines.push(`  // TODO: Add ${resource} fields`);
+        lines.push(`  // TODO: Add ${resource} fields \u2014 run scan with --models for real types`);
         lines.push(`  createdAt?: string`);
         lines.push(`  updatedAt?: string`);
         lines.push(`}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "routesync",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "Laravel routes to typed frontend SDKs.",
   "main": "./dist/sdk.js",
   "module": "./dist/sdk.mjs",