routesync 1.0.40 → 1.0.42

package/dist/cli.js

@@ -8361,189 +8361,25 @@ 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(IlluminateContractsConsoleKernel::class);
+$kernel = $app->make(Illuminate\\Contracts\\Console\\Kernel::class);
 $kernel->bootstrap();
 
-$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
+$result = [
+    'routes' => [],
+    'models' => []
+];
 
+// 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'))) {
@@ -8552,21 +8388,17 @@ 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, 'IlluminateFoundationHttpFormRequest')) {
+                        if (is_subclass_of($className, 'Illuminate\\Foundation\\Http\\FormRequest')) {
                             $request = new $className();
                             if (method_exists($request, 'rules')) {
                                 $schema = $request->rules();
@@ -8574,97 +8406,174 @@ foreach ($routes as $route) {
                         }
                     }
                 }
-
-                // \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'])) {
+                
+                // 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'])) {
                         $args = $attr->getArguments();
-                        $type = $args[0] ?? $args['type'] ?? $args['model'] ?? $args['response'] ?? null;
+                        
+                        $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'];
+                        }
+                        
                         if ($type) {
-                            $collection = (bool)($args[1] ?? $args['collection'] ?? false);
-                            $responseMetadata = ['type' => class_basename($type), 'collection' => $collection];
+                            $responseMetadata = [
+                                'type' => class_basename($type),
+                                'collection' => $collection
+                            ];
                             break;
                         }
                     }
                 }
-
-                $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);
+                
+                
+                $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));
                 }
 
-                // \u2500\u2500 Stage 3: Fallback $request->validate([...]) for schema \u2500\u2500
+                // 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
+                                    ];
+                                }
+                            }
+                        }
+                    }
+                }
+                
+                // Fallback: Try to parse $request->validate([...]) from source code
                 if (empty($schema) && $methodSource) {
-                    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];
+                    // 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];
+                            }
                         }
                     }
                 }
-
-            } 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() ?: ($resource . '.' . strtolower($method)),
-            'method'     => $method,
-            'path'       => '/' . preg_replace('/^api//', '', $route->uri()),
-            'auth'       => $auth,
+            'name' => $route->getName() ?: $name,
+            '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
         ];
     }
 }
 
-// \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};
+// Extract Models if requested
+$extractModels = ${options.extractModels ? "true" : "false"};
 if ($extractModels) {
     $modelsPath = app_path('Models');
     if (is_dir($modelsPath)) {
-        $files = IlluminateSupportFacadesFile::allFiles($modelsPath);
+        $files = \\Illuminate\\Support\\Facades\\File::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   = IlluminateSupportFacadesSchema::getColumns($table);
-
+                    
+                    $model = new $class();
+                    $table = $model->getTable();
+                    $columns = \\Illuminate\\Support\\Facades\\Schema::getColumns($table);
+                    
                     $parsedColumns = [];
                     foreach ($columns as $col) {
                         $parsedColumns[] = [
-                            'name'     => $col['name'],
-                            'type'     => $col['type'],
-                            'nullable' => $col['nullable'],
+                            'name' => $col['name'],
+                            'type' => $col['type'], // Use 'type' which contains the raw type like enum('a','b') instead of 'type_name'
+                            '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) {}
             }
         }
     }
@@ -9582,7 +9491,6 @@ var watchCommand = new Command("watch").description("Watch routes file and re-sy
 var import_child_process2 = require("child_process");
 var import_fs_extra16 = __toESM(require_lib());
 var import_path12 = __toESM(require("path"));
-var import_os = __toESM(require("os"));
 var annotateCommand = new Command("annotate").description("Auto-inject #[Response] PHP 8 attributes into controller methods based on Resource discovery").option("--input <file>", "Path to routes/api.php", "routes/api.php").option("--dry-run", "Preview changes without writing files").option("--force", "Re-annotate methods that already have #[Response]").action(async (options) => {
   const filePath = import_path12.default.resolve(options.input);
   if (!import_fs_extra16.default.existsSync(filePath)) {
@@ -9717,7 +9625,7 @@ foreach ($routes as $route) {
 
 echo json_encode($result);
 `;
-  const tmpFile = import_path12.default.join(import_os.default.tmpdir(), `routesync-annotate-${Date.now()}.php`);
+  const tmpFile = import_path12.default.join(projectRoot, `routesync-annotate-${Date.now()}.php`);
   import_fs_extra16.default.writeFileSync(tmpFile, phpScript);
   let annotations;
   try {

package/package.json

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