From f266ea8a346ee8814f83a4a7fd32c13058ccba61 Mon Sep 17 00:00:00 2001
From: Ilya Mochalov <chrootsu@gmail.com>
Date: Fri, 6 Nov 2015 03:15:49 +0500
Subject: [PATCH] lodash: signatures of the method _.methodOf have been changed

---
 lodash/lodash-tests.ts | 46 +++++++++++++++++++++++++++++++++---------
 lodash/lodash.d.ts     | 27 +++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 876547fd6..146270d4f 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -5673,16 +5673,44 @@ module TestMethod {
 }
 
 // _.methodOf
-class TestMethodOf {
-    a = [
-        (a1: number, a2: number) => a1 + a2
-    ];
+module TestMethodOf {
+    type SampleObject = {a: {b: () => TResult}[]};
+    type ResultFn = (path: _.StringRepresentable|_.StringRepresentable[]) => TResult;
+
+    let object: SampleObject;
+
+    {
+        let result: ResultFn;
+
+        result = _.methodOf<SampleObject, TResult>(object);
+        result = _.methodOf<SampleObject, TResult>(object, any);
+        result = _.methodOf<SampleObject, TResult>(object, any, any);
+        result = _.methodOf<SampleObject, TResult>(object, any, any, any);
+
+        result = _.methodOf<TResult>(object);
+        result = _.methodOf<TResult>(object, any);
+        result = _.methodOf<TResult>(object, any, any);
+        result = _.methodOf<TResult>(object, any, any, any);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<ResultFn>;
+
+        result = _(object).methodOf<TResult>();
+        result = _(object).methodOf<TResult>(any);
+        result = _(object).methodOf<TResult>(any, any);
+        result = _(object).methodOf<TResult>(any, any, any);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<ResultFn>;
+
+        result = _(object).chain().methodOf<TResult>();
+        result = _(object).chain().methodOf<TResult>(any);
+        result = _(object).chain().methodOf<TResult>(any, any);
+        result = _(object).chain().methodOf<TResult>(any, any, any);
+    }
 }
-var TestMethodOfObject = new TestMethodOf();
-result = <number>(_.methodOf<number>(TestMethodOfObject, 1, 2))('a[0]');
-result = <number>(_.methodOf<number>(TestMethodOfObject, 1, 2))(['a', '0']);
-result = <number>(_(TestMethodOfObject).methodOf<number>(1, 2).value())('a[0]');
-result = <number>(_(TestMethodOfObject).methodOf<number>(1, 2).value())(['a', '0']);
 
 // _.mixin
 module TestMixin {
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index 359cc0fb9..c3e99d4d2 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -11276,18 +11276,41 @@ declare module _ {
         /**
          * The opposite of _.method; this method creates a function that invokes the method at a given path on object.
          * Any additional arguments are provided to the invoked method.
+         *
          * @param object The object to query.
          * @param args The arguments to invoke the method with.
          * @return Returns the new function.
          */
-        methodOf<TResult>(object: Object, ...args: any[]): (path: string | any[]) => TResult;
+        methodOf<TObject extends {}, TResult>(
+            object: TObject,
+            ...args: any[]
+        ): (path: StringRepresentable|StringRepresentable[]) => TResult;
+
+        /**
+         * @see _.methodOf
+         */
+        methodOf<TResult>(
+            object: {},
+            ...args: any[]
+        ): (path: StringRepresentable|StringRepresentable[]) => TResult;
     }
 
     interface LoDashImplicitObjectWrapper<T> {
         /**
          * @see _.methodOf
          */
-        methodOf<TResult>(...args: any[]): LoDashImplicitObjectWrapper<(path: string | any[]) => TResult>;
+        methodOf<TResult>(
+            ...args: any[]
+        ): LoDashImplicitObjectWrapper<(path: StringRepresentable|StringRepresentable[]) => TResult>;
+    }
+
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+         * @see _.methodOf
+         */
+        methodOf<TResult>(
+            ...args: any[]
+        ): LoDashExplicitObjectWrapper<(path: StringRepresentable|StringRepresentable[]) => TResult>;
     }
 
     //_.mixin