From bc8f8347417e48280bf3e073996b380e8ef78b7a Mon Sep 17 00:00:00 2001
From: Marie Vidal <97105347+marievidal360@users.noreply.github.com>
Date: Thu, 2 May 2024 16:06:16 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#69493=20fix(wktoht?=
=?UTF-8?q?ml):=20fix=20callback=20and=20return=20types=20by=20@marievidal?=
=?UTF-8?q?360?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
types/wkhtmltopdf/index.d.ts | 16 +++++++++-----
types/wkhtmltopdf/wkhtmltopdf-tests.ts | 30 +++++++++++++++++---------
2 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/types/wkhtmltopdf/index.d.ts b/types/wkhtmltopdf/index.d.ts
index a8f9064c0472f7..077774d0d7cb68 100644
--- a/types/wkhtmltopdf/index.d.ts
+++ b/types/wkhtmltopdf/index.d.ts
@@ -3,6 +3,8 @@
///
Hello world
"); // $ExpectType ReadWriteStream +// $ExpectType Readable +wkhtmltopdf("Hello world
"); // output to a file directly -wkhtmltopdf("http://apple.com/", { output: "out.pdf" }); // $ExpectType ReadWriteStream +// $ExpectType Readable +wkhtmltopdf("http://apple.com/", { output: "out.pdf" }); // Optional callback -wkhtmltopdf("http://google.com/", { pageSize: "Letter" }, (err: Error, stream: NodeJS.ReadWriteStream) => {}); // $ExpectType void +// $ExpectType Readable +wkhtmltopdf("http://google.com/", { pageSize: "Letter" }, (err: Error | null, stream?: NodeJS.ReadWriteStream) => {}); // Repeatable options -wkhtmltopdf("http://google.com/", { // $ExpectType NodeJS.ReadWriteStream +// $ExpectType Readable +wkhtmltopdf("http://google.com/", { allow: ["path1", "path2"], customHeader: [ ["name1", "value1"], @@ -22,23 +27,27 @@ wkhtmltopdf("http://google.com/", { // $ExpectType NodeJS.ReadWriteStream }); // Ignore warning strings -wkhtmltopdf("http://apple.com/", { // $ExpectType ReadWriteStream +// $ExpectType Readable +wkhtmltopdf("http://apple.com/", { output: "out.pdf", ignore: ["QFont::setPixelSize: Pixel size <= 0 (0)"], }); // RegExp also acceptable -wkhtmltopdf("http://apple.com/", { // $ExpectType ReadWriteStream +// $ExpectType Readable +wkhtmltopdf("http://apple.com/", { output: "out.pdf", ignore: [/QFont::setPixelSize/], }); // Test debug types -wkhtmltopdf("http://apple.com/", { // $ExpectType ReadWriteStream +// $ExpectType Readable +wkhtmltopdf("http://apple.com/", { debug: true, }); -wkhtmltopdf("http://apple.com/", { // $ExpectType ReadWriteStream +// $ExpectType Readable +wkhtmltopdf("http://apple.com/", { output: "test.pdf", debug: (data: Buffer) => { const dataString = data.toString(); @@ -56,7 +65,8 @@ wkhtmltopdf.shell; // $ExpectType string wkhtmltopdf.command; // $ExpectType string // Footer and header spacing type -wkhtmltopdf("http://apple.com/", { // $ExpectType ReadWriteStream +// $ExpectType Readable +wkhtmltopdf("http://apple.com/", { headerSpacing: 0, footerSpacing: 0, });