Skip to content

feat: Adds support for providing default URL parameters via the frontend #75

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions resources/js/wayfinder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ export type QueryParams = Record<

type Method = "get" | "post" | "put" | "delete" | "patch" | "head";

declare global {
interface Window {
Wayfinder: {
defaultParameters: Record<string, unknown>;
};
}
}
window.Wayfinder = {
defaultParameters: {},
}

export type RouteDefinition<TMethod extends Method | Method[]> = {
url: string;
} & (TMethod extends Method[] ? { methods: TMethod } : { method: TMethod });
Expand Down Expand Up @@ -87,6 +98,26 @@ export const queryParams = (options?: RouteQueryOptions) => {
return str.length > 0 ? `?${str}` : "";
};

export const setDefaultParameters = (params: Record<string, unknown>) => {
window.Wayfinder.defaultParameters = params;
};

export const addDefaultParameter = (key: string, value: string | number | boolean) => {
window.Wayfinder.defaultParameters[key] = value;
};

export const applyDefaultParameters = (existing: Record<string, unknown>) => {
const existingParams = { ...existing }

for (const key in window.Wayfinder.defaultParameters) {
if (existingParams[key] === undefined && window.Wayfinder.defaultParameters[key] !== undefined) {
existingParams[key] = window.Wayfinder.defaultParameters[key];
}
}

return existingParams;
};

export const validateParameters = (
args: Record<string, unknown> | undefined,
optional: string[],
Expand Down
1 change: 1 addition & 0 deletions resources/method.blade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
@endforeach
}
}
args = applyDefaultParameters(args)
@endif

@if ($parameters->where('optional')->isNotEmpty())
Expand Down
4 changes: 4 additions & 0 deletions src/GenerateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ private function appendCommonImports(Collection $routes, string $path, string $n
$imports[] = 'type RouteFormDefinition';
}

if ($routes->contains(fn (Route $route) => $route->parameters()->isNotEmpty())) {
$imports[] = 'applyDefaultParameters';
}

if ($routes->contains(fn (Route $route) => $route->parameters()->contains(fn (Parameter $parameter) => $parameter->optional))) {
$imports[] = 'validateParameters';
}
Expand Down
27 changes: 27 additions & 0 deletions tests/DefaultParameters.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { expect, test } from "vitest";
import { defaultParametersDomain, dynamicDomain, fixedDomain } from "../workbench/resources/js/actions/App/Http/Controllers/DomainController";
import { setDefaultParameters } from "../resources/js/wayfinder";

test('it can generate urls without default parameters set', () => {
expect(fixedDomain.url({ param: 'foo' })).toBe('//example.test/fixed-domain/foo')
})

test('it can generate urls with default parameters set on frontend', () => {
setDefaultParameters({
domain: 'tim.macdonald',
})

expect(dynamicDomain.url({
param: 'foo',
})).toBe('//tim.macdonald.au/dynamic-domain/foo')
})

test('it can generate urls with default URL parameters set on backend and frontend', () => {
setDefaultParameters({
defaultDomain: 'tim.macdonald',
})

expect(defaultParametersDomain.url({
param: 'foo',
})).toBe('//tim.macdonald.au/default-parameters-domain/foo')
})
5 changes: 5 additions & 0 deletions workbench/app/Http/Controllers/DomainController.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ public function dynamicDomain()
{
//
}

public function defaultParametersDomain()
{
//
}
}
5 changes: 5 additions & 0 deletions workbench/app/Providers/WorkbenchServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Providers;

use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\URL;
use Illuminate\Support\ServiceProvider;

class WorkbenchServiceProvider extends ServiceProvider
Expand All @@ -20,6 +21,10 @@ public function register(): void
'throw' => false,
],
]);

URL::defaults([
'defaultDomain' => 'tim.macdonald',
]);
}

/**
Expand Down
1 change: 1 addition & 0 deletions workbench/routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@

Route::domain('example.test')->get('/fixed-domain/{param}', [DomainController::class, 'fixedDomain']);
Route::domain('{domain}.au')->get('/dynamic-domain/{param}', [DomainController::class, 'dynamicDomain']);
Route::domain('{defaultDomain}.au')->get('/default-parameters-domain/{param}', [DomainController::class, 'defaultParametersDomain']);

Route::get('/nested/controller', [NestedController::class, 'nested']);

Expand Down