Merge pull request #875 from pataar/fix/bindings-mutation

Fix shared route bindings mutation in _substituteBindings

Author: bakerkretzmar

src/js/Router.js

@@ -321,18 +321,19 @@ export default class Router extends String {
                 return { ...result, [key]: value };
             }
 
-            if (!value.hasOwnProperty(bindings[key])) {
-                if (value.hasOwnProperty('id')) {
-                    // As a fallback, we still accept an 'id' key not explicitly registered as a binding
-                    bindings[key] = 'id';
-                } else {
-                    throw new Error(
-                        `Ziggy error: object passed as '${key}' parameter is missing route model binding key '${bindings[key]}'.`,
-                    );
-                }
+            const binding = value.hasOwnProperty(bindings[key])
+                ? bindings[key]
+                : value.hasOwnProperty('id')
+                  ? 'id'
+                  : undefined;
+
+            if (binding === undefined) {
+                throw new Error(
+                    `Ziggy error: object passed as '${key}' parameter is missing route model binding key '${bindings[key]}'.`,
+                );
             }
 
-            return { ...result, [key]: value[bindings[key]] };
+            return { ...result, [key]: value[binding] };
         }, {});
     }
 

tests/js/route.test.js

@@ -437,6 +437,16 @@ describe('route()', () => {
         );
     });
 
+    test("falling back to 'id' key does not mutate registered route model bindings", () => {
+        expect(route('postComments.show', [1, { id: 1 }])).toBe(
+            'https://ziggy.dev/posts/1/comments/1',
+        );
+
+        expect(route('postComments.show', [1, { id: 1, uuid: '1-2-3' }])).toBe(
+            'https://ziggy.dev/posts/1/comments/1-2-3',
+        );
+    });
+
     test('can generate a URL for an app installed in a subfolder', () => {
         global.Ziggy.url = 'https://ziggy.dev/subfolder';