Skip to content

Extract route aggregation logic on types generator #807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rrmesquita wants to merge 1 commit into from
Closed

Extract route aggregation logic on types generator #807

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/Output/Types.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Tighten\Ziggy\Output;

use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
use Illuminate\Support\Str;
use Stringable;
use Tighten\Ziggy\Ziggy;
Expand All @@ -15,13 +16,7 @@ public function __construct(

public function __toString(): string
{
$routes = collect($this->ziggy->toArray()['routes'])->map(function ($route) {
return collect($route['parameters'] ?? [])->map(function ($param) use ($route) {
return Arr::has($route, "bindings.{$param}")
? ['name' => $param, 'required' => ! Str::contains($route['uri'], "{$param}?"), 'binding' => $route['bindings'][$param]]
: ['name' => $param, 'required' => ! Str::contains($route['uri'], "{$param}?")];
});
});
$routes = $this->collectRoutes();

return <<<JAVASCRIPT
/* This file is generated by Ziggy. */
Expand All @@ -32,4 +27,15 @@ interface RouteList {$routes->toJson(JSON_PRETTY_PRINT)}

JAVASCRIPT;
}

protected function collectRoutes(): Collection
{
return collect($this->ziggy->toArray()['routes'])->map(function ($route) {
return collect($route['parameters'] ?? [])->map(function ($param) use ($route) {
return Arr::has($route, "bindings.{$param}")
? ['name' => $param, 'required' => ! Str::contains($route['uri'], "{$param}?"), 'binding' => $route['bindings'][$param]]
: ['name' => $param, 'required' => ! Str::contains($route['uri'], "{$param}?")];
});
});
}
}
Loading