Merge branch 'main' into next

Author: bakerkretzmar

CHANGELOG.md

@@ -8,6 +8,23 @@ Breaking changes are marked with ⚠️.
 
 ## [Unreleased]
 
+## [v1.8.2] - 2024-02-20
+
+**Added**
+
+- Test on Laravel 11 by @shuvroroy in https://github.com/tighten/ziggy/pull/709
+
+**Fixed**
+
+- Fix `route().current()` with encoded characters by @bakerkretzmar in https://github.com/tighten/ziggy/pull/668
+- Fix retrieving ziggys config from an api endpoint link in readme by @RomainMazB in https://github.com/tighten/ziggy/pull/694
+- Fix `route().current()` with nested/object query params by @bakerkretzmar in https://github.com/tighten/ziggy/pull/712
+
+**Changed**
+
+- Enable provenance for npm package by @saibotk in https://github.com/tighten/ziggy/pull/684
+- Handle generated file extensions more robustly by @bakerkretzmar in https://github.com/tighten/ziggy/pull/687
+
 ## [v1.8.1] - 2023-10-12
 
 **Fixed**
@@ -316,7 +333,8 @@ Breaking changes are marked with ⚠️.
 
 For previous changes see the [Releases](https://github.com/tighten/ziggy/releases) page.
 
-[Unreleased]: https://github.com/tighten/ziggy/compare/v1.8.1...HEAD
+[Unreleased]: https://github.com/tighten/ziggy/compare/v1.8.2...HEAD
+[v1.8.2]: https://github.com/tighten/ziggy/compare/v1.8.1...v1.8.2
 [v1.8.1]: https://github.com/tighten/ziggy/compare/v1.8.0...v1.8.1
 [v1.8.0]: https://github.com/tighten/ziggy/compare/v1.7.0...v1.8.0
 [v1.7.0]: https://github.com/tighten/ziggy/compare/v1.6.2...v1.7.0

src/js/Router.js

@@ -137,9 +137,28 @@ export default class Router extends String {
         )
             return true;
 
+        const isSubset = (subset, full) => {
+            return Object.entries(subset).every(([key, value]) => {
+                if (Array.isArray(value) && Array.isArray(full[key])) {
+                    return value.every((v) => full[key].includes(v));
+                }
+
+                if (
+                    typeof value === 'object' &&
+                    typeof full[key] === 'object' &&
+                    value !== null &&
+                    full[key] !== null
+                ) {
+                    return isSubset(value, full[key]);
+                }
+
+                return full[key] == value;
+            });
+        };
+
         // Check that all passed parameters match their values in the current window URL
         // Use weak equality because all values in the current window URL will be strings
-        return Object.entries(params).every(([key, value]) => routeParams[key] == value);
+        return isSubset(params, routeParams);
     }
 
     /**

tests/Unit/CommandRouteGeneratorTest.php

@@ -271,7 +271,8 @@ public function __toString(): string
 
 class PostCommentController
 {
-    public function __invoke($post, $comment) {
+    public function __invoke($post, $comment)
+    {
         //
     }
 }

tests/js/route.test.js

@@ -1231,6 +1231,75 @@ describe('current()', () => {
         expect(route().current('events.venues.show', { id: 12, user: 'Matt' })).toBe(false);
     });
 
+    test('can check the current route with array and object query parameters', () => {
+        global.window.location.pathname = '/events/1/venues/2';
+        global.window.location.search =
+            '?filter[year]=2024&filter[month]=Jan&filter[month]=Feb&tags[0]=music&tags[1]=dance&genres[]=jazz&genres[]=folk';
+
+        expect(
+            route().current('events.venues.show', {
+                filter: {
+                    year: '2024',
+                },
+            }),
+        ).toBe(true);
+        // Weird, but technically correct since this isn't checking for an exact match, just 'overlap'
+        expect(
+            route().current('events.venues.show', {
+                filter: {},
+            }),
+        ).toBe(true);
+        // Even weirder, but probably better than getting really picky about empty arrays vs. empty objects
+        expect(
+            route().current('events.venues.show', {
+                genres: {},
+            }),
+        ).toBe(true);
+        expect(
+            route().current('events.venues.show', {
+                filter: {
+                    year: '2024',
+                    month: ['Jan'],
+                },
+                tags: ['dance', 'music'],
+                genres: ['folk'],
+            }),
+        ).toBe(true);
+
+        expect(
+            route().current('events.venues.show', {
+                filter: {
+                    year: '2025',
+                },
+            }),
+        ).toBe(false);
+        expect(
+            route().current('events.venues.show', {
+                filter: {
+                    year: null,
+                },
+            }),
+        ).toBe(false);
+        expect(
+            route().current('events.venues.show', {
+                filter: {
+                    year: '2024',
+                    month: ['Mar'],
+                },
+            }),
+        ).toBe(false);
+        expect(
+            route().current('events.venues.show', {
+                tags: [''],
+            }),
+        ).toBe(false);
+        expect(
+            route().current('events.venues.show', {
+                genres: [null],
+            }),
+        ).toBe(false);
+    });
+
     test('can check the current route with Cyrillic characters', () => {
         global.window.location.pathname = '/статистика';