Merge branch '2.x' into pr/blade-inline-as-json

Author: bakerkretzmar

package-lock.json

@@ -61,7 +61,7 @@
         "microbundle": "^0.15.1",
         "prettier": "^3.3.3",
         "typescript": "^5.6.3",
-        "vitest": "^2.1.4"
+        "vitest": "^2.1.9"
     },
     "prettier": {
         "printWidth": 100,

package.json

@@ -10,7 +10,7 @@ class BladeRouteGenerator
 {
     public static $generated;
 
-    public function generate($group = null, ?string $nonce = null, ?bool $json = false): string
+    public function generate(array|string|null $group = null, ?string $nonce = null, ?bool $json = false): string
     {
         $ziggy = new Ziggy($group);
 

src/BladeRouteGenerator.php

@@ -24,7 +24,7 @@ class Ziggy implements JsonSerializable
     protected Collection $routes;
 
     public function __construct(
-        protected $group = null,
+        protected array|string|null $group = null,
         protected ?string $url = null,
     ) {
         $this->url = rtrim($url ?? url('/'), '/');

src/Ziggy.php

@@ -171,7 +171,7 @@ interface ParsedQs {
  */
 interface Router {
     current(): ValidRouteName | undefined;
-    current<T extends ValidRouteName>(name: T, params?: ParameterValue | RouteParams<T>): boolean;
+    current<T extends RouteName>(name: T, params?: ParameterValue | RouteParams<T>): boolean;
     get params(): Record<string, string>;
     get routeParams(): Record<string, string>;
     get queryParams(): ParsedQs;

src/js/index.d.ts

@@ -89,7 +89,7 @@
 ]);
 
 test('render csp nonce', function () {
-    expect((new BladeRouteGenerator)->generate(false, 'test-nonce'))
+    expect((new BladeRouteGenerator)->generate(nonce: 'test-nonce'))
         ->toContain('<script type="text/javascript" nonce="test-nonce">');
 });
 

tests/Unit/BladeRouteGeneratorTest.php

@@ -89,6 +89,8 @@ assertType(route().has(''));
 // Test router getter autocompletion
 assertType(route().params);
 
+// These should NOT error in strict mode
+assertType(route().current('posts.*'));
 assertType(route().current('missing', { foo: 1 }));
 
 // @ts-expect-error missing required 'post' parameter