From da27def5624cdf4768c4595effb529f715a4ae91 Mon Sep 17 00:00:00 2001
From: Tim Perry <pimterry@gmail.com>
Date: Wed, 22 Jul 2015 15:27:43 +0100
Subject: [PATCH 1/3] Add lodash types for chainable contains/include/includes

---
 lodash/lodash-tests.ts | 15 ++++++++++++
 lodash/lodash.d.ts     | 53 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 9b4548502..f61ba1573 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -370,16 +370,31 @@ result = <boolean>_.contains([1, 2, 3], 1, 2);
 result = <boolean>_.contains({ 'moe': 30, 'larry': 40, 'curly': 67 }, 40);
 result = <boolean>_.contains('curly', 'ur');
 
+result = <boolean>_([1, 2, 3]).contains(1);
+result = <boolean>_([1, 2, 3]).contains(1, 2);
+result = <boolean>_({ 'moe': 30, 'larry': 40, 'curly': 67 }).contains(40);
+result = <boolean>_('curly').contains('ur');
+
 result = <boolean>_.include([1, 2, 3], 1);
 result = <boolean>_.include([1, 2, 3], 1, 2);
 result = <boolean>_.include({ 'moe': 30, 'larry': 40, 'curly': 67 }, 40);
 result = <boolean>_.include('curly', 'ur');
 
+result = <boolean>_([1, 2, 3]).include(1);
+result = <boolean>_([1, 2, 3]).include(1, 2);
+result = <boolean>_({ 'moe': 30, 'larry': 40, 'curly': 67 }).include(40);
+result = <boolean>_('curly').include('ur');
+
 result = <boolean>_.includes([1, 2, 3], 1);
 result = <boolean>_.includes([1, 2, 3], 1, 2);
 result = <boolean>_.includes({ 'moe': 30, 'larry': 40, 'curly': 67 }, 40);
 result = <boolean>_.includes('curly', 'ur');
 
+result = <boolean>_([1, 2, 3]).includes(1);
+result = <boolean>_([1, 2, 3]).includes(1, 2);
+result = <boolean>_({ 'moe': 30, 'larry': 40, 'curly': 67 }).includes(40);
+result = <boolean>_('curly').includes('ur');
+
 result = <_.Dictionary<number>>_.countBy([4.3, 6.1, 6.4], function (num) { return Math.floor(num); });
 result = <_.Dictionary<number>>_.countBy([4.3, 6.1, 6.4], function (num) { return this.floor(num); }, Math);
 result = <_.Dictionary<number>>_.countBy(['one', 'two', 'three'], 'length');
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index f02a4aa97..d2e83e111 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -39,7 +39,7 @@ declare module _ {
         * Explicit chaining can be enabled by using the _.chain method.
         **/
         (value: number): LoDashWrapper<number>;
-        (value: string): LoDashWrapper<string>;
+        (value: string): LoDashStringWrapper;
         (value: boolean): LoDashWrapper<boolean>;
         (value: Array<number>): LoDashNumberArrayWrapper;
         <T>(value: Array<T>): LoDashArrayWrapper<T>;
@@ -2149,6 +2149,57 @@ declare module _ {
             fromIndex?: number): boolean;
     }
 
+    interface LoDashArrayWrapper<T> {
+        /**
+         * @see _.contains
+         **/
+        contains(target: T, fromIndex?: number): boolean;
+
+        /**
+         * @see _.contains
+         **/
+        include(target: T, fromIndex?: number): boolean;
+
+        /**
+         * @see _.contains
+         **/
+        includes(target: T, fromIndex?: number): boolean;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.contains
+         **/
+        contains(target: any, fromIndex?: number): boolean;
+
+        /**
+         * @see _.contains
+         **/
+        include(target: any, fromIndex?: number): boolean;
+
+        /**
+         * @see _.contains
+         **/
+        includes(target: any, fromIndex?: number): boolean;
+    }
+
+    interface LoDashStringWrapper extends LoDashWrapper<string> {
+        /**
+         * @see _.contains
+         **/
+        contains(target: string, fromIndex?: number): boolean;
+
+        /**
+         * @see _.contains
+         **/
+        include(target: string, fromIndex?: number): boolean;
+
+        /**
+         * @see _.contains
+         **/
+        includes(target: string, fromIndex?: number): boolean;
+    }
+
     //_.countBy
     interface LoDashStatic {
         /**

From a9a55446fc4f5641b9f0c30c439ffbca9fdc0032 Mon Sep 17 00:00:00 2001
From: Tim Perry <pimterry@gmail.com>
Date: Wed, 22 Jul 2015 15:32:15 +0100
Subject: [PATCH 2/3] Make lodash object _().contains type clearer (no any)

---
 lodash/lodash.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index d2e83e111..d116a2514 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -2170,17 +2170,17 @@ declare module _ {
         /**
          * @see _.contains
          **/
-        contains(target: any, fromIndex?: number): boolean;
+        contains<TValue>(target: TValue, fromIndex?: number): boolean;
 
         /**
          * @see _.contains
          **/
-        include(target: any, fromIndex?: number): boolean;
+        include<TValue>(target: TValue, fromIndex?: number): boolean;
 
         /**
          * @see _.contains
          **/
-        includes(target: any, fromIndex?: number): boolean;
+        includes<TValue>(target: TValue, fromIndex?: number): boolean;
     }
 
     interface LoDashStringWrapper extends LoDashWrapper<string> {

From d9088b29d8093191588cc61c21bdfe5f76648033 Mon Sep 17 00:00:00 2001
From: Tim Perry <pimterry@gmail.com>
Date: Sun, 26 Jul 2015 16:07:46 +0100
Subject: [PATCH 3/3] Put LoDashStringWrapper interface declaration at the top
 with the others

---
 lodash/lodash.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index d116a2514..e73af15b1 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -190,6 +190,8 @@ declare module _ {
 
     interface LoDashWrapper<T> extends LoDashWrapperBase<T, LoDashWrapper<T>> { }
 
+    interface LoDashStringWrapper extends LoDashWrapper<string> { }
+
     interface LoDashObjectWrapper<T> extends LoDashWrapperBase<T, LoDashObjectWrapper<T>> { }
 
     interface LoDashArrayWrapper<T> extends LoDashWrapperBase<T[], LoDashArrayWrapper<T>> {
@@ -2183,7 +2185,7 @@ declare module _ {
         includes<TValue>(target: TValue, fromIndex?: number): boolean;
     }
 
-    interface LoDashStringWrapper extends LoDashWrapper<string> {
+    interface LoDashStringWrapper {
         /**
          * @see _.contains
          **/