Merge pull request #79 from kiwilan/develop

ewilan-riviere · web-flow · commit f001991db6b5 · 2024-07-25T16:51:44.000+02:00
v3.1.01
diff --git a/README.md b/README.md
@@ -57,8 +57,8 @@ This version requires [PHP](https://www.php.net/) `8.2+` and supports [Laravel](
 
 | Version                                                                           | L9                 | L10                | L11                |
 | --------------------------------------------------------------------------------- | ------------------ | ------------------ | ------------------ |
-| [v1.12.03](https://packagist.org/packages/kiwilan/typescriptable-laravel#1.12.03) | :white_check_mark: | :white_check_mark: | :x:                |
 | [v3+](https://packagist.org/packages/kiwilan/typescriptable-laravel)              | :x:                | :x:                | :white_check_mark: |
+| [v1.12.03](https://packagist.org/packages/kiwilan/typescriptable-laravel#1.12.03) | :white_check_mark: | :white_check_mark: | :x:                |
 
 You can install the package via composer:
 
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "kiwilan/typescriptable-laravel",
   "description": "PHP package for Laravel to type Eloquent models, routes, Spatie Settings with autogenerated TypeScript. If you want to use some helpers with Inertia, you can install associated NPM package.",
-  "version": "3.1.0",
+  "version": "3.1.01",
   "keywords": [
     "kiwilan",
     "laravel",
diff --git a/docs/banner.jpg b/docs/banner.jpg
diff --git a/src/Typed/Route/Printer/PrinterRouteTypes.php b/src/Typed/Route/Printer/PrinterRouteTypes.php
@@ -113,7 +113,7 @@ private function parseRouteParams(): string
                     ->map(fn (RouteTypeItemParam $param) => "'{$param->name()}': App.Route.ParamType")
                     ->join("\n      ");
 
-                return "    '$name}': {\n      {$params}\n    }";
+                return "    '{$name}': {\n      {$params}\n    }";
             } else {
                 return "    '{$name}': never";
             }
diff --git a/src/Typed/Route/RouteType.php b/src/Typed/Route/RouteType.php
@@ -68,7 +68,9 @@ public function typescriptTypes(): ?string
     private function parseRoutes(): Collection
     {
         if ($this->config->json === null) {
-            Artisan::call(RouteListCommand::class);
+            Artisan::call(RouteListCommand::class, [
+                '--json' => true,
+            ]);
             $json = Artisan::output();
             $this->config->json = json_decode($json, true);
         }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "kiwilan/typescriptable-laravel",`
`3`	`3`	`"description": "PHP package for Laravel to type Eloquent models, routes, Spatie Settings with autogenerated TypeScript. If you want to use some helpers with Inertia, you can install associated NPM package.",`
`4`		`- "version": "3.1.0",`
	`4`	`+ "version": "3.1.01",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"kiwilan",`
`7`	`7`	`"laravel",`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ private function parseRouteParams(): string`
`113`	`113`	`->map(fn (RouteTypeItemParam $param) => "'{$param->name()}': App.Route.ParamType")`
`114`	`114`	`->join("\n ");`
`115`	`115`
`116`		`- return " '$name}': {\n {$params}\n }";`
	`116`	`+ return " '{$name}': {\n {$params}\n }";`
`117`	`117`	`} else {`
`118`	`118`	`return " '{$name}': never";`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,9 @@ public function typescriptTypes(): ?string`
`68`	`68`	`private function parseRoutes(): Collection`
`69`	`69`	`{`
`70`	`70`	`if ($this->config->json === null) {`
`71`		`- Artisan::call(RouteListCommand::class);`
	`71`	`+ Artisan::call(RouteListCommand::class, [`
	`72`	`+ '--json' => true,`
	`73`	`+ ]);`
`72`	`74`	`$json = Artisan::output();`
`73`	`75`	`$this->config->json = json_decode($json, true);`
`74`	`76`	`}`