From 798ce5ea6904f00eee62aaf16acff73b125d3f4f Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Wed, 21 Jun 2017 19:14:53 -0400
Subject: [PATCH] [jquery] Clean up manipulation-, queue-, and
 traversing-related methods on JQuery. Add tests for manipulation-, queue-,
 and traversing-related methods on JQuery.

---
 types/jquery/index.d.ts            |  30 +-
 types/jquery/jquery-tests.ts       | 985 +++++++++++++++++++++++++++++
 types/jquery/test/example-tests.ts |   2 +-
 3 files changed, 1001 insertions(+), 16 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index d9d5a5bdc6..0e007b689e 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -62,7 +62,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/add/}
      * @since 1.4
      */
-    add(selector: JQuery.Selector, context: Element): JQuery<TElement>;
+    add(selector: JQuery.Selector, context: Element): this;
     /**
      * Create a new jQuery object with elements added to the set of matched elements.
      *
@@ -74,7 +74,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.3.2
      */
-    add(selector: JQuery.Selector | JQuery.TypeOrArray<Element> | JQuery.htmlString | JQuery): JQuery<TElement>;
+    add(selector: JQuery.Selector | JQuery.TypeOrArray<Element> | JQuery.htmlString | JQuery): this;
     /**
      * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
      *
@@ -426,14 +426,14 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.3
      * @since 1.6
      */
-    closest(selector: JQuery.Selector | JQuery | Element): this;
+    closest(selector: JQuery.Selector | Element | JQuery): this;
     /**
      * Get the children of each element in the set of matched elements, including text and comment nodes.
      *
      * @see {@link https://api.jquery.com/contents/}
      * @since 1.2
      */
-    contents(): this;
+    contents(): JQuery<TElement | Text | Comment>;
     /**
      * Bind an event handler to the "contextmenu" JavaScript event, or trigger that event on an element.
      *
@@ -653,7 +653,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.fn.extend/}
      * @since 1.0
      */
-    extend(obj: object): JQuery<TElement>;
+    extend(obj: object): this;
     /**
      * Display the matched elements by fading them to opaque.
      *
@@ -796,7 +796,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.6
      */
-    find(selector: JQuery.Selector | Element | JQuery): JQuery<TElement>;
+    find(selector: JQuery.Selector | Element | JQuery): this;
     /**
      * Stop the currently-running animation, remove all queued animations, and complete all animations for
      * the matched elements.
@@ -1058,7 +1058,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.6
      */
-    is(selector: JQuery.Selector | ((this: TElement, index: number, element: TElement) => boolean) | JQuery | Element | Element[]): boolean;
+    is(selector: JQuery.Selector | JQuery.TypeOrArray<Element> | JQuery | ((this: TElement, index: number, element: TElement) => boolean)): boolean;
     /**
      * Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.
      *
@@ -1148,7 +1148,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/map/}
      * @since 1.2
      */
-    map(callback: (this: TElement, index: number, domElement: TElement) => any | any[] | null | undefined): JQuery<TElement>;
+    map(callback: (this: TElement, index: number, domElement: TElement) => any | any[] | null | undefined): this;
     /**
      * Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.
      *
@@ -1309,7 +1309,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.0
      * @since 1.4
      */
-    not(selector: JQuery.Selector | JQuery.TypeOrArray<Element> | ((this: TElement, index: number, element: TElement) => boolean) | JQuery): this;
+    not(selector: JQuery.Selector | JQuery.TypeOrArray<Element> | JQuery | ((this: TElement, index: number, element: TElement) => boolean)): this;
     /**
      * Remove an event handler.
      *
@@ -1688,7 +1688,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/promise/}
      * @since 1.6
      */
-    promise<T>(type: string, target: T): T & JQuery.Promise<Element>;
+    promise<T extends object>(type: string, target: T): T & JQuery.Promise<this>;
     /**
      * Return a Promise object to observe when all actions of a certain type bound to the collection,
      * queued or not, have finished.
@@ -1697,7 +1697,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/promise/}
      * @since 1.6
      */
-    promise<T>(target: T): T & JQuery.Promise<Element>;
+    promise<T extends object>(target: T): T & JQuery.Promise<this>;
     /**
      * Return a Promise object to observe when all actions of a certain type bound to the collection,
      * queued or not, have finished.
@@ -1751,7 +1751,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/pushStack/}
      * @since 1.3
      */
-    pushStack(elements: ArrayLike<Element>, name: string, args: any[]): JQuery<TElement>;
+    pushStack(elements: ArrayLike<Element>, name: string, args: any[]): this;
     /**
      * Add a collection of DOM elements onto the jQuery stack.
      *
@@ -1759,7 +1759,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/pushStack/}
      * @since 1.0
      */
-    pushStack(elements: ArrayLike<Element>): JQuery<TElement>;
+    pushStack(elements: ArrayLike<Element>): this;
     /**
      * Manipulate the queue of functions to be executed, once for each matched element.
      *
@@ -1858,7 +1858,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.2
      * @since 1.4
      */
-    replaceWith(newContent: JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery | ((this: TElement) => any)): JQuery<TElement>;
+    replaceWith(newContent: JQuery.htmlString | JQuery | JQuery.TypeOrArray<Element> | ((this: TElement) => any)): this;
     /**
      * Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.
      *
@@ -2388,7 +2388,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.2
      * @since 1.4
      */
-    wrapInner(wrappingElement: JQuery.Selector | JQuery.htmlString | Element | JQuery | ((this: TElement, index: number) => string | Element | JQuery)): this;
+    wrapInner(wrappingElement: JQuery.Selector | JQuery.htmlString | Element | JQuery | ((this: TElement, index: number) => string | JQuery | Element)): this;
 }
 
 interface JQuery<TElement extends Node = HTMLElement> extends ArrayLike<TElement>, Iterable<TElement> { }
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index c31352cb02..a5b668a9ba 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -1277,7 +1277,9 @@ function JQuery() {
             // $ExpectType JQuery<HTMLElement>
             $('p').show();
         }
+    }
 
+    function queue() {
         function clearQueue() {
             // $ExpectType JQuery<HTMLElement>
             $('p').clearQueue('myQueue');
@@ -1379,6 +1381,17 @@ function JQuery() {
             // $ExpectType JQuery<HTMLElement>
             $('p').stop(true);
         }
+
+        function promise() {
+            // $ExpectType { description: string; } & Promise<JQuery<HTMLElement>, any, any>
+            $('p').promise('myQueue', { description: 'desc' });
+
+            // $ExpectType { description: string; } & Promise<JQuery<HTMLElement>, any, any>
+            $('p').promise({ description: 'desc' });
+
+            // $ExpectType Promise<JQuery<HTMLElement>, any, any>
+            $('p').promise();
+        }
     }
 
     function events() {
@@ -2403,6 +2416,978 @@ function JQuery() {
             });
         }
     }
+
+    function manipulation() {
+        function after() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').after('<p></p>', new Element(), new Text(), $('p'), [new Element(), new Text()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').after(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return '<p></p>';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').after(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return new Element();
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').after(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return new Text();
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').after(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return [new Element(), new Text()];
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').after(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return $('p');
+            });
+        }
+
+        function append() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').append('<p></p>', new Element(), new Text(), $('p'), [new Element(), new Text()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').append(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return '<p></p>';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').append(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return new Element();
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').append(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return new Text();
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').append(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return [new Element(), new Text()];
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').append(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return $('p');
+            });
+        }
+
+        function before() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').before('<p></p>', new Element(), new Text(), $('p'), [new Element(), new Text()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').before(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return '<p></p>';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').before(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return new Element();
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').before(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return new Text();
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').before(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return [new Element(), new Text()];
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').before(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return $('p');
+            });
+        }
+
+        function prepend() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prepend('<p></p>', new Element(), new Text(), $('p'), [new Element(), new Text()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prepend(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return '<p></p>';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prepend(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return new Element();
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prepend(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return new Text();
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prepend(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return [new Element(), new Text()];
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prepend(function(index, html) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                html;
+
+                return $('p');
+            });
+        }
+
+        function appendTo() {
+            // $ExpectType JQuery<HTMLElement>
+            $('span').appendTo('p');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').appendTo('<p></p>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').appendTo(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').appendTo([new HTMLElement()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').appendTo($('p'));
+        }
+
+        function insertAfter() {
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertAfter('p');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertAfter('<p></p>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertAfter(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertAfter([new HTMLElement()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertAfter($('p'));
+        }
+
+        function insertBefore() {
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertBefore('p');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertBefore('<p></p>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertBefore(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertBefore([new HTMLElement()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertBefore($('p'));
+        }
+
+        function prependTo() {
+            // $ExpectType JQuery<HTMLElement>
+            $('span').prependTo('p');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').prependTo('<p></p>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').prependTo(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').prependTo([new HTMLElement()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').prependTo($('p'));
+        }
+
+        function clone() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').clone(true, true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').clone(true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').clone();
+        }
+
+        function detach() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').detach('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').detach();
+        }
+
+        function empty() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').empty();
+        }
+
+        function remove() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').remove('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').remove();
+        }
+
+        function replaceAll() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').replaceAll('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').replaceAll($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').replaceAll(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').replaceAll([new HTMLElement()]);
+        }
+
+        function replaceWith() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').replaceWith('<span></span>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').replaceWith($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').replaceWith(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').replaceWith([new HTMLElement()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').replaceWith(function() {
+                // $ExpectType HTMLElement
+                this;
+
+                return this;
+            });
+        }
+
+        function unwrap() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').unwrap('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').unwrap();
+        }
+
+        function wrap() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrap('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrap('<span></span>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrap(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrap($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrap(function(index) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+
+                return '<span></span>';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrap(function(index) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+
+                return $('span');
+            });
+        }
+
+        function wrapAll() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapAll('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapAll('<span></span>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapAll(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapAll($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapAll(function() {
+                // $ExpectType HTMLElement
+                this;
+
+                return '<span></span>';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapAll(function() {
+                // $ExpectType HTMLElement
+                this;
+
+                return $('span');
+            });
+        }
+
+        function wrapInner() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapInner('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapInner('<span></span>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapInner(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapInner($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapInner(function(index) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+
+                return '<span></span>';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapInner(function(index) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+
+                return $('span');
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').wrapInner(function(index) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+
+                return new HTMLElement();
+            });
+        }
+
+        function html() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').html('<span></span>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').html(function(index, oldhtml) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                oldhtml;
+
+                return oldhtml;
+            });
+
+            // $ExpectType string
+            $('p').html();
+        }
+
+        function text() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').text('myText');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').text(4);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').text(true);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').text(function(index, text) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                text;
+
+                return 'myText';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').text(function(index, text) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                text;
+
+                return 3;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').text(function(index, text) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                text;
+
+                return false;
+            });
+
+            // $ExpectType string
+            $('p').text();
+        }
+
+        function val() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').val('myVal');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').val(5);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').val(['myVal']);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').val(function(index, value) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType string
+                value;
+
+                return 'myVal';
+            });
+
+            // $ExpectType string | number | string[] | undefined
+            $('p').val();
+        }
+    }
+
+    function traversing() {
+        function add() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').add('span', new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').add('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').add(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').add([new HTMLElement()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').add('<span></span>');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').add($('span'));
+        }
+
+        function closest() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').closest('span', new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').closest('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').closest(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').closest($('span'));
+        }
+
+        function find() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').find('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').find(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').find($('span'));
+        }
+
+        function addBack() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').addBack('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').addBack();
+        }
+
+        function children() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').children('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').children();
+        }
+
+        function siblings() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').siblings('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').siblings();
+        }
+
+        function contents() {
+            // $ExpectType JQuery<HTMLElement | Text | Comment>
+            $('p').contents();
+        }
+
+        function end() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').end();
+        }
+
+        function first() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').first();
+        }
+
+        function last() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').last();
+        }
+
+        function offsetParent() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').offsetParent();
+        }
+
+        function filter() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').filter('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').filter(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').filter([new HTMLElement()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').filter($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').filter(function(index, element) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType HTMLElement
+                element;
+
+                return false;
+            });
+        }
+
+        function not() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').not('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').not(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').not([new HTMLElement()]);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').not($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').not(function(index, element) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType HTMLElement
+                element;
+
+                return false;
+            });
+        }
+
+        function is() {
+            // $ExpectType boolean
+            $('p').is('span');
+
+            // $ExpectType boolean
+            $('p').is(new HTMLElement());
+
+            // $ExpectType boolean
+            $('p').is([new HTMLElement()]);
+
+            // $ExpectType boolean
+            $('p').is($('span'));
+
+            // $ExpectType boolean
+            $('p').is(function(index, element) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType HTMLElement
+                element;
+
+                return false;
+            });
+        }
+
+        function next() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').next('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').next();
+        }
+
+        function nextAll() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').nextAll('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').nextAll();
+        }
+
+        function nextUntil() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').nextUntil('span', 'span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').nextUntil(new HTMLElement(), 'span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').nextUntil($('span'), 'span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').nextUntil('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').nextUntil(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').nextUntil($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').nextUntil();
+        }
+
+        function prev() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prev('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prev();
+        }
+
+        function prevAll() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prevAll('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prevAll();
+        }
+
+        function prevUntil() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prevUntil('span', 'span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prevUntil(new HTMLElement(), 'span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prevUntil($('span'), 'span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prevUntil('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prevUntil(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prevUntil($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').prevUntil();
+        }
+
+        function parent() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parent('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parent();
+        }
+
+        function parents() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parents('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parents();
+        }
+
+        function parentsUntil() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parentsUntil('span', 'span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parentsUntil(new HTMLElement(), 'span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parentsUntil($('span'), 'span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parentsUntil('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parentsUntil(new HTMLElement());
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parentsUntil($('span'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').parentsUntil();
+        }
+
+        function eq() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').eq(0);
+        }
+
+        function has() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').has('span');
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').has(new HTMLElement());
+        }
+
+        function map() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').map(function(index, domElement) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType HTMLElement
+                domElement;
+
+                return 'myVal';
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').map(function(index, domElement) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType HTMLElement
+                domElement;
+
+                return ['myVal1', 'myVal2'];
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').map(function(index, domElement) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType HTMLElement
+                domElement;
+
+                return null;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').map(function(index, domElement) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType HTMLElement
+                domElement;
+
+                return undefined;
+            });
+        }
+
+        function slice() {
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slice(0, 10);
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').slice(0);
+        }
+    }
 }
 
 function JQueryStatic() {
diff --git a/types/jquery/test/example-tests.ts b/types/jquery/test/example-tests.ts
index 961e239192..bbb5d15d6c 100644
--- a/types/jquery/test/example-tests.ts
+++ b/types/jquery/test/example-tests.ts
@@ -4056,7 +4056,7 @@ function examples() {
     function promise_0() {
         var div = $('<div>');
 
-        div.promise().done(function(this: JQuery, arg1: JQuery) {
+        div.promise().done(function(this: typeof div, arg1) {
             // Will fire right away and alert "true"
             alert(this === div && arg1 === div);
         });