Merge pull request #854 from christian98/ts-repro

Support route model binding and interfaces

Author: bakerkretzmar

src/js/index.d.ts

@@ -52,12 +52,15 @@ type ParameterValue = RawParameterValue | DefaultRoutable;
 /**
  * A parseable route parameter, either plain or nested inside an object under its binding key.
  */
-type Routable<I extends ParameterInfo> = I extends { binding: string }
-    ? ({ [K in I['binding']]: RawParameterValue } & Record<keyof any, unknown>) | RawParameterValue
+type Routable<I extends ParameterInfo> = I extends { binding: infer B extends string }
+    ?
+          | { [K in B]: RawParameterValue }
+          | ({ [K in B]: RawParameterValue } & Record<keyof any, unknown>)
+          | RawParameterValue
     : ParameterValue;
 
 // Uncomment to test:
-// type A = Routable<{ name: 'foo', required: true, binding: 'bar' }>;
+// type A = Routable<{ name: 'foo'; required: true; binding: 'bar' }>;
 // = RawParameterValue | { bar: RawParameterValue }
 // type B = Routable<{ name: 'foo', required: true, }>;
 // = RawParameterValue | DefaultRoutable

tests/js/route.test-d.ts

@@ -49,6 +49,14 @@ assertType(route('posts.comments.show', { comment: { foo: 'bar' } }));
 // parameter has an explicit 'uuid' binding, so that's required :)
 assertType(route('posts.comments.show', { comment: { id: 2 } }));
 
+// Interfaces
+interface Model {
+    uuid: string;
+    foo: string;
+}
+let comment: Model = { uuid: '123', foo: 'bar' };
+assertType(route('posts.comments.show', { comment, post: '1' }));
+
 // Plain values
 assertType(route('posts.comments.show', 2));
 assertType(route('posts.comments.show', 'foo'));