From 7dcef61b33a7c7a4043e4510df65955dfe1057c4 Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Thu, 25 Feb 2021 17:04:45 +0100 Subject: [PATCH 1/4] Fix types --- types/index.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/index.d.ts b/types/index.d.ts index 6c53546f9c..0f140a2f5f 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -125,8 +125,8 @@ declare namespace cheerio { eq(index: number): Cheerio; - get(): any[]; - get(index: number): any; + get(): Node[]; + get(index: number): Node | undefined; index(): number; index(selector: string): number; @@ -221,7 +221,7 @@ declare namespace cheerio { // Not Documented - toArray(): Element[]; + toArray(): Node[]; } interface CheerioParserOptions extends ParserOptions, DomHandlerOptions { From 19a4eb08682b86e9e6502b1ae7618da6b723dd2e Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Thu, 25 Feb 2021 17:09:18 +0100 Subject: [PATCH 2/4] Fix types --- types/index.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/index.d.ts b/types/index.d.ts index 0f140a2f5f..b299643f73 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -125,8 +125,8 @@ declare namespace cheerio { eq(index: number): Cheerio; - get(): Node[]; - get(index: number): Node | undefined; + get(): Element[]; + get(index: number): Element | undefined; index(): number; index(selector: string): number; @@ -221,7 +221,7 @@ declare namespace cheerio { // Not Documented - toArray(): Node[]; + toArray(): Element[]; } interface CheerioParserOptions extends ParserOptions, DomHandlerOptions { From 1c2c0c0a86f60da50c03bbcd192b8e671178a3b6 Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Thu, 25 Feb 2021 18:01:01 +0100 Subject: [PATCH 3/4] Fix test --- types/index.test-d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types/index.test-d.ts b/types/index.test-d.ts index d2df7cbd7e..05b2d2584d 100644 --- a/types/index.test-d.ts +++ b/types/index.test-d.ts @@ -19,7 +19,7 @@ cheerio(html); cheerio('ul', html); cheerio('li', 'ul', html); -const $fromElement = cheerio.load($('ul').get(0)); +const $fromElement = cheerio.load($('ul').toString()); if ($fromElement('ul > li').length !== 3) { throw new Error( @@ -248,7 +248,7 @@ $el.eq(0).text(); $el.eq(-1).text(); // .get( [i] ) -$el.get(0).tagName; +$el.get(0)?.tagName; $el.get().length; // .index() From 8b3866d320cad92e71d80588c676979d1f6e5d1c Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Fri, 26 Feb 2021 08:10:04 +0100 Subject: [PATCH 4/4] Add cast --- types/index.test-d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/index.test-d.ts b/types/index.test-d.ts index 05b2d2584d..c11366e37b 100644 --- a/types/index.test-d.ts +++ b/types/index.test-d.ts @@ -1,4 +1,5 @@ import { expectType } from 'tsd'; +import { Element } from 'domhandler'; import cheerio from '..'; /* @@ -19,7 +20,7 @@ cheerio(html); cheerio('ul', html); cheerio('li', 'ul', html); -const $fromElement = cheerio.load($('ul').toString()); +const $fromElement = cheerio.load($('ul').get(0) as Element); if ($fromElement('ul > li').length !== 3) { throw new Error(