From af684984947e2d59b8a2f170f44d76f85b90c8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krzeslak?= Date: Thu, 24 Jul 2025 19:33:55 +0200 Subject: [PATCH] test: change order of parameters in ExecFileFn type --- src/converters/assimp.ts | 2 +- src/converters/calibre.ts | 2 +- src/converters/dvisvgm.ts | 29 +++++++++++--------------- src/converters/ffmpeg.ts | 1 - src/converters/graphicsmagick.ts | 2 +- src/converters/imagemagick.ts | 1 - src/converters/inkscape.ts | 2 +- src/converters/libheif.ts | 2 +- src/converters/libjxl.ts | 2 +- src/converters/libreoffice.ts | 2 +- src/converters/msgconvert.ts | 2 +- src/converters/pandoc.ts | 2 +- src/converters/potrace.ts | 29 +++++++++++--------------- src/converters/resvg.ts | 2 +- src/converters/types.ts | 2 +- src/converters/vips.ts | 2 +- src/converters/xelatex.ts | 1 - tests/converters/dvisvgm.test.ts | 3 --- tests/converters/ffmpeg.test.ts | 1 - tests/converters/helpers/converters.ts | 4 ---- tests/converters/imagemagick.test.ts | 4 ---- tests/converters/libjxl.test.ts | 2 -- tests/converters/msgconvert.test.ts | 3 --- tests/converters/vips.test.ts | 2 -- 24 files changed, 36 insertions(+), 68 deletions(-) diff --git a/src/converters/assimp.ts b/src/converters/assimp.ts index 08223ea..869f28e 100644 --- a/src/converters/assimp.ts +++ b/src/converters/assimp.ts @@ -121,7 +121,7 @@ export async function convert( execFile: ExecFileFn = execFileOriginal, // to make it mockable ): Promise { return new Promise((resolve, reject) => { - execFile("assimp", ["export", filePath, targetPath], options, (error, stdout, stderr) => { + execFile("assimp", ["export", filePath, targetPath], (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/calibre.ts b/src/converters/calibre.ts index bf63a27..153de16 100644 --- a/src/converters/calibre.ts +++ b/src/converters/calibre.ts @@ -67,7 +67,7 @@ export async function convert( execFile: ExecFileFn = execFileOriginal, // to make it mockable ): Promise { return new Promise((resolve, reject) => { - execFile("ebook-convert", [filePath, targetPath], options, (error, stdout, stderr) => { + execFile("ebook-convert", [filePath, targetPath], (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/dvisvgm.ts b/src/converters/dvisvgm.ts index e7e422f..76ef5c1 100644 --- a/src/converters/dvisvgm.ts +++ b/src/converters/dvisvgm.ts @@ -30,25 +30,20 @@ export function convert( } return new Promise((resolve, reject) => { - execFile( - "dvisvgm", - [...inputArgs, filePath, "-o", targetPath], - options, - (error, stdout, stderr) => { - if (error) { - reject(`error: ${error}`); - } + execFile("dvisvgm", [...inputArgs, filePath, "-o", targetPath], (error, stdout, stderr) => { + if (error) { + reject(`error: ${error}`); + } - if (stdout) { - console.log(`stdout: ${stdout}`); - } + if (stdout) { + console.log(`stdout: ${stdout}`); + } - if (stderr) { - console.error(`stderr: ${stderr}`); - } + if (stderr) { + console.error(`stderr: ${stderr}`); + } - resolve("Done"); - }, - ); + resolve("Done"); + }); }); } diff --git a/src/converters/ffmpeg.ts b/src/converters/ffmpeg.ts index 3e0cab7..8207c61 100644 --- a/src/converters/ffmpeg.ts +++ b/src/converters/ffmpeg.ts @@ -735,7 +735,6 @@ export async function convert( execFile( "ffmpeg", [...ffmpegArgs, "-i", filePath, ...extraArgs, targetPath], - options, (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); diff --git a/src/converters/graphicsmagick.ts b/src/converters/graphicsmagick.ts index 7d234e7..5551341 100644 --- a/src/converters/graphicsmagick.ts +++ b/src/converters/graphicsmagick.ts @@ -318,7 +318,7 @@ export function convert( execFile: ExecFileFn = execFileOriginal, // to make it mockable ): Promise { return new Promise((resolve, reject) => { - execFile("gm", ["convert", filePath, targetPath], options, (error, stdout, stderr) => { + execFile("gm", ["convert", filePath, targetPath], (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/imagemagick.ts b/src/converters/imagemagick.ts index 28b1ef5..eb2eaa7 100644 --- a/src/converters/imagemagick.ts +++ b/src/converters/imagemagick.ts @@ -472,7 +472,6 @@ export function convert( execFile( "magick", [...inputArgs, filePath, ...outputArgs, targetPath], - options, (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); diff --git a/src/converters/inkscape.ts b/src/converters/inkscape.ts index 4d277bd..4497e2f 100644 --- a/src/converters/inkscape.ts +++ b/src/converters/inkscape.ts @@ -37,7 +37,7 @@ export function convert( execFile: ExecFileFn = execFileOriginal, // to make it mockable ): Promise { return new Promise((resolve, reject) => { - execFile("inkscape", [filePath, "-o", targetPath], options, (error, stdout, stderr) => { + execFile("inkscape", [filePath, "-o", targetPath], (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/libheif.ts b/src/converters/libheif.ts index 6326662..b88e177 100644 --- a/src/converters/libheif.ts +++ b/src/converters/libheif.ts @@ -19,7 +19,7 @@ export function convert( execFile: ExecFileFn = execFileOriginal, // to make it mockable ): Promise { return new Promise((resolve, reject) => { - execFile("heif-convert", [filePath, targetPath], options, (error, stdout, stderr) => { + execFile("heif-convert", [filePath, targetPath], (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/libjxl.ts b/src/converters/libjxl.ts index cd7f315..6ff825f 100644 --- a/src/converters/libjxl.ts +++ b/src/converters/libjxl.ts @@ -31,7 +31,7 @@ export function convert( } return new Promise((resolve, reject) => { - execFile(tool, [filePath, targetPath], options, (error, stdout, stderr) => { + execFile(tool, [filePath, targetPath], (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/libreoffice.ts b/src/converters/libreoffice.ts index 7489a91..73249dc 100644 --- a/src/converters/libreoffice.ts +++ b/src/converters/libreoffice.ts @@ -158,7 +158,7 @@ export function convert( } return new Promise((resolve, reject) => { - execFile("soffice", args, options, (error, stdout, stderr) => { + execFile("soffice", args, (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/msgconvert.ts b/src/converters/msgconvert.ts index cfd0d62..0c0b663 100644 --- a/src/converters/msgconvert.ts +++ b/src/converters/msgconvert.ts @@ -25,7 +25,7 @@ export function convert( // We need to use --outfile to specify the target path const args = ["--outfile", targetPath, filePath]; - execFile("msgconvert", args, options, (error, stdout, stderr) => { + execFile("msgconvert", args, (error, stdout, stderr) => { if (error) { reject(new Error(`msgconvert failed: ${error.message}`)); return; diff --git a/src/converters/pandoc.ts b/src/converters/pandoc.ts index 3873454..e5b1db1 100644 --- a/src/converters/pandoc.ts +++ b/src/converters/pandoc.ts @@ -144,7 +144,7 @@ export function convert( args.push("-o", targetPath); return new Promise((resolve, reject) => { - execFile("pandoc", args, options, (error, stdout, stderr) => { + execFile("pandoc", args, (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/potrace.ts b/src/converters/potrace.ts index 767fee0..6027491 100644 --- a/src/converters/potrace.ts +++ b/src/converters/potrace.ts @@ -31,25 +31,20 @@ export function convert( execFile: ExecFileFn = execFileOriginal, // to make it mockable ): Promise { return new Promise((resolve, reject) => { - execFile( - "potrace", - [filePath, "-o", targetPath, "-b", convertTo], - options, - (error, stdout, stderr) => { - if (error) { - reject(`error: ${error}`); - } + execFile("potrace", [filePath, "-o", targetPath, "-b", convertTo], (error, stdout, stderr) => { + if (error) { + reject(`error: ${error}`); + } - if (stdout) { - console.log(`stdout: ${stdout}`); - } + if (stdout) { + console.log(`stdout: ${stdout}`); + } - if (stderr) { - console.error(`stderr: ${stderr}`); - } + if (stderr) { + console.error(`stderr: ${stderr}`); + } - resolve("Done"); - }, - ); + resolve("Done"); + }); }); } diff --git a/src/converters/resvg.ts b/src/converters/resvg.ts index 97062cc..3155483 100644 --- a/src/converters/resvg.ts +++ b/src/converters/resvg.ts @@ -19,7 +19,7 @@ export function convert( execFile: ExecFileFn = execFileOriginal, // to make it mockable ): Promise { return new Promise((resolve, reject) => { - execFile("resvg", [filePath, targetPath], options, (error, stdout, stderr) => { + execFile("resvg", [filePath, targetPath], (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/types.ts b/src/converters/types.ts index 0f265b6..2c1b649 100644 --- a/src/converters/types.ts +++ b/src/converters/types.ts @@ -1,8 +1,8 @@ export type ExecFileFn = ( cmd: string, args: string[], - options: import("child_process").ExecFileOptions | unknown | undefined | null, callback: (err: Error | null, stdout: string, stderr: string) => void, + options?: import("child_process").ExecFileOptions, ) => void; export type ConvertFnWithExecFile = ( diff --git a/src/converters/vips.ts b/src/converters/vips.ts index ddab269..b89db12 100644 --- a/src/converters/vips.ts +++ b/src/converters/vips.ts @@ -120,7 +120,7 @@ export function convert( } return new Promise((resolve, reject) => { - execFile("vips", [action, filePath, targetPath], options, (error, stdout, stderr) => { + execFile("vips", [action, filePath, targetPath], (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); } diff --git a/src/converters/xelatex.ts b/src/converters/xelatex.ts index a940fdf..784acdc 100644 --- a/src/converters/xelatex.ts +++ b/src/converters/xelatex.ts @@ -25,7 +25,6 @@ export function convert( execFile( "latexmk", ["-xelatex", "-interaction=nonstopmode", `-output-directory=${outputPath}`, filePath], - options, (error, stdout, stderr) => { if (error) { reject(`error: ${error}`); diff --git a/tests/converters/dvisvgm.test.ts b/tests/converters/dvisvgm.test.ts index b7211e4..c24d545 100644 --- a/tests/converters/dvisvgm.test.ts +++ b/tests/converters/dvisvgm.test.ts @@ -42,7 +42,6 @@ test("convert respects eps filetype", async () => { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { calls.push(_args); @@ -69,7 +68,6 @@ test("convert respects pdf filetype", async () => { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { calls.push(_args); @@ -96,7 +94,6 @@ test("convert respects svgz conversion target type", async () => { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { calls.push(_args); diff --git a/tests/converters/ffmpeg.test.ts b/tests/converters/ffmpeg.test.ts index 4cea0ea..2bb375a 100644 --- a/tests/converters/ffmpeg.test.ts +++ b/tests/converters/ffmpeg.test.ts @@ -6,7 +6,6 @@ let calls: string[][] = []; function mockExecFile( _cmd: string, args: string[], - options: unknown, callback: (err: Error | null, stdout: string, stderr: string) => void, ) { calls.push(args); diff --git a/tests/converters/helpers/converters.ts b/tests/converters/helpers/converters.ts index 02aa084..49a40ac 100644 --- a/tests/converters/helpers/converters.ts +++ b/tests/converters/helpers/converters.ts @@ -13,7 +13,6 @@ export async function runConvertSuccessTest(convertFn: ConvertFnWithExecFile) { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { callback(null, "Fake stdout", ""); @@ -31,7 +30,6 @@ export async function runConvertFailTest(convertFn: ConvertFnWithExecFile) { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { callback(new Error("Test error"), "", ""); @@ -53,7 +51,6 @@ export async function runConvertLogsStderror(convertFn: ConvertFnWithExecFile) { const mockExecFile = ( _cmd: string, _args: string[], - options: unknown, callback: (err: Error | null, stdout: string, stderr: string) => void, ) => { callback(null, "", "Fake stderr"); @@ -82,7 +79,6 @@ export async function runConvertLogsStderrorAndStdout(convertFn: ConvertFnWithEx const mockExecFile = ( _cmd: string, _args: string[], - options: unknown, callback: (err: Error | null, stdout: string, stderr: string) => void, ) => { callback(null, "Fake stdout", "Fake stderr"); diff --git a/tests/converters/imagemagick.test.ts b/tests/converters/imagemagick.test.ts index de2467c..482d87c 100644 --- a/tests/converters/imagemagick.test.ts +++ b/tests/converters/imagemagick.test.ts @@ -42,7 +42,6 @@ test("convert respects ico conversion target type", async () => { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { calls.push(_args); @@ -78,7 +77,6 @@ test("convert respects ico conversion target type with svg as input filetype", a const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { calls.push(_args); @@ -116,7 +114,6 @@ test("convert respects ico conversion target type with emf as input filetype", a const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { calls.push(_args); @@ -158,7 +155,6 @@ test("convert respects emf as input filetype", async () => { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { calls.push(_args); diff --git a/tests/converters/libjxl.test.ts b/tests/converters/libjxl.test.ts index e96c5f8..7caf0bb 100644 --- a/tests/converters/libjxl.test.ts +++ b/tests/converters/libjxl.test.ts @@ -42,7 +42,6 @@ test("convert uses djxl with input filetype being jxl", async () => { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { command = _cmd; @@ -69,7 +68,6 @@ test("convert uses cjxl with output filetype being jxl", async () => { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { command = _cmd; diff --git a/tests/converters/msgconvert.test.ts b/tests/converters/msgconvert.test.ts index ab054f7..ffdf840 100644 --- a/tests/converters/msgconvert.test.ts +++ b/tests/converters/msgconvert.test.ts @@ -7,7 +7,6 @@ test("convert rejects conversion if input filetype is not msg and output type is const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { callback(null, "Fake stdout", ""); @@ -26,7 +25,6 @@ test("convert rejects conversion on error", async () => { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { callback(new Error("Test error"), "", ""); @@ -50,7 +48,6 @@ test("convert logs stderr as warning", async () => { const mockExecFile = ( _cmd: string, _args: string[], - options: unknown, callback: (err: Error | null, stdout: string, stderr: string) => void, ) => { callback(null, "", "Fake stderr"); diff --git a/tests/converters/vips.test.ts b/tests/converters/vips.test.ts index 2aa2181..010a7a0 100644 --- a/tests/converters/vips.test.ts +++ b/tests/converters/vips.test.ts @@ -42,7 +42,6 @@ test("convert uses action pdfload with filetype being pdf", async () => { const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { calls.push(_args); @@ -69,7 +68,6 @@ test("convert uses action copy with filetype being anything but pdf", async () = const mockExecFile: ExecFileFn = ( _cmd: string, _args: string[], - options: unknown, callback: (err: ExecFileException | null, stdout: string, stderr: string) => void, ) => { calls.push(_args);