routesync 1.0.42 → 1.0.44

package/dist/cli.js

@@ -8358,10 +8358,13 @@ function ora(options) {
 var import_fs_extra = __toESM(require_lib());
 var import_child_process = require("child_process");
 var import_path = __toESM(require("path"));
+var import_os = __toESM(require("os"));
 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
+error_reporting(0);
 require __DIR__.'/vendor/autoload.php';
 $app = require_once __DIR__.'/bootstrap/app.php';
 $kernel = $app->make(Illuminate\\Contracts\\Console\\Kernel::class);
@@ -8376,10 +8379,10 @@ $result = [
 $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'))) {
@@ -8398,7 +8401,7 @@ foreach ($routes as $route) {
                     $type = $param->getType();
                     if ($type && !$type->isBuiltin()) {
                         $className = $type->getName();
-                        if (is_subclass_of($className, 'Illuminate\\Foundation\\Http\\FormRequest')) {
+                        if (is_subclass_of($className, 'Illuminate\\\\Foundation\\\\Http\\\\FormRequest')) {
                             $request = new $className();
                             if (method_exists($request, 'rules')) {
                                 $schema = $request->rules();
@@ -8406,17 +8409,17 @@ 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'])) {
                         $args = $attr->getArguments();
-                        
+
                         $type = null;
                         if (isset($args[0])) {
                             $type = $args[0];
@@ -8427,14 +8430,14 @@ foreach ($routes as $route) {
                         } 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) {
                             $responseMetadata = [
                                 'type' => class_basename($type),
@@ -8444,8 +8447,7 @@ foreach ($routes as $route) {
                         }
                     }
                 }
-                
-                
+
                 $fileName = $reflector->getFileName();
                 $startLine = $reflector->getStartLine();
                 $endLine = $reflector->getEndLine();
@@ -8460,14 +8462,14 @@ foreach ($routes as $route) {
                 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)) {
@@ -8486,10 +8488,10 @@ foreach ($routes as $route) {
                                     }
                                 }
                             }
-                            
+
                             if (!$responseMetadata) {
                                 $docComment = $resReflector->getDocComment();
-                                if ($docComment && preg_match('/@mixin\\s+([\\\\\\\\a-zA-Z0-9_]+)/', $docComment, $mixinMatches)) {
+                                if ($docComment && preg_match('/@mixin\\s+([\\\\a-zA-Z0-9_]+)/', $docComment, $mixinMatches)) {
                                     $responseMetadata = [
                                         'type' => class_basename($mixinMatches[1]),
                                         'collection' => $collection
@@ -8499,14 +8501,12 @@ foreach ($routes as $route) {
                         }
                     }
                 }
-                
+
                 // Fallback: Try to parse $request->validate([...]) from source code
                 if (empty($schema) && $methodSource) {
-                    // Look for $request->validate([ ... ])
-                    if (preg_match('/\\\\$request->validate\\\\s*\\\\(\\\\s*\\\\[(.*?)\\\\]\\\\s*\\\\)/s', $methodSource, $matches)) {
+                    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);
+                        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];
@@ -8522,9 +8522,9 @@ foreach ($routes as $route) {
         $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,
@@ -8538,7 +8538,7 @@ foreach ($routes as $route) {
 }
 
 // Extract Models if requested
-$extractModels = ${options.extractModels ? "true" : "false"};
+$extractModels = ${extractModels};
 if ($extractModels) {
     $modelsPath = app_path('Models');
     if (is_dir($modelsPath)) {
@@ -8546,25 +8546,25 @@ if ($extractModels) {
         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')) {
                 try {
                     $reflection = new ReflectionClass($class);
                     if ($reflection->isAbstract()) continue;
-                    
+
                     $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'], // Use 'type' which contains the raw type like enum('a','b') instead of 'type_name'
+                            'type' => $col['type'],
                             'nullable' => $col['nullable']
                         ];
                     }
-                    
+
                     $result['models'][] = [
                         'name' => class_basename($class),
                         'table' => $table,
@@ -8584,13 +8584,18 @@ echo json_encode($result);
     const scriptPath = import_path.default.join(projectRoot, "routesync-extractor-temp.php");
     try {
       await import_fs_extra.default.writeFile(scriptPath, phpScript);
-      const stdout = (0, import_child_process.execSync)(`php routesync-extractor-temp.php`, {
+      const isWindows = import_os.default.platform() === "win32";
+      const phpCmd = isWindows ? `php routesync-extractor-temp.php 2>NUL` : `php routesync-extractor-temp.php 2>/dev/null`;
+      const stdout = (0, import_child_process.execSync)(phpCmd, {
         cwd: projectRoot,
         encoding: "utf-8",
         maxBuffer: 1024 * 1024 * 10
       });
       await import_fs_extra.default.remove(scriptPath);
-      const parsed = JSON.parse(stdout);
+      const trimmed = stdout.trim();
+      const jsonStart = trimmed.indexOf("{");
+      if (jsonStart === -1) throw new Error("No JSON output from PHP script");
+      const parsed = JSON.parse(trimmed.slice(jsonStart));
       return {
         routes: parsed.routes || [],
         models: parsed.models || []

package/package.json

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