From a72ca4653162a8662869dd59b8764029760b7c5c Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 6 Aug 2021 12:49:17 -0400 Subject: [PATCH] Move `as` to input param instead of return type --- libsquoosh/src/codecs.ts | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/libsquoosh/src/codecs.ts b/libsquoosh/src/codecs.ts index edbf5694..98052cd6 100644 --- a/libsquoosh/src/codecs.ts +++ b/libsquoosh/src/codecs.ts @@ -278,9 +278,10 @@ export const codecs = { dec: () => instantiateEmscriptenWasm(mozDec as DecodeModuleFactory, mozDecWasm), enc: () => - instantiateEmscriptenWasm(mozEnc, mozEncWasm) as Promise< - MozJPEGEncodeModule - >, + instantiateEmscriptenWasm( + mozEnc as EmscriptenWasm.ModuleFactory, + mozEncWasm, + ), defaultEncoderOptions: { quality: 75, baseline: false, @@ -312,9 +313,10 @@ export const codecs = { dec: () => instantiateEmscriptenWasm(webpDec as DecodeModuleFactory, webpDecWasm), enc: () => - instantiateEmscriptenWasm(webpEnc, webpEncWasm) as Promise< - WebPEncodeModule - >, + instantiateEmscriptenWasm( + webpEnc as EmscriptenWasm.ModuleFactory, + webpEncWasm, + ), defaultEncoderOptions: { quality: 75, target_size: 0, @@ -359,14 +361,15 @@ export const codecs = { enc: async () => { if (await threads()) { return instantiateEmscriptenWasm( - avifEncMt, + avifEncMt as EmscriptenWasm.ModuleFactory, avifEncMtWasm, avifEncMtWorker, - ) as Promise; + ); } - return instantiateEmscriptenWasm(avifEnc, avifEncWasm) as Promise< - AVIFEncodeModule - >; + return instantiateEmscriptenWasm( + avifEnc as EmscriptenWasm.ModuleFactory, + avifEncWasm, + ); }, defaultEncoderOptions: { cqLevel: 33, @@ -393,7 +396,10 @@ export const codecs = { dec: () => instantiateEmscriptenWasm(jxlDec as DecodeModuleFactory, jxlDecWasm), enc: () => - instantiateEmscriptenWasm(jxlEnc, jxlEncWasm) as Promise, + instantiateEmscriptenWasm( + jxlEnc as EmscriptenWasm.ModuleFactory, + jxlEncWasm, + ), defaultEncoderOptions: { speed: 4, quality: 75, @@ -416,7 +422,10 @@ export const codecs = { dec: () => instantiateEmscriptenWasm(wp2Dec as DecodeModuleFactory, wp2DecWasm), enc: () => - instantiateEmscriptenWasm(wp2Enc, wp2EncWasm) as Promise, + instantiateEmscriptenWasm( + wp2Enc as EmscriptenWasm.ModuleFactory, + wp2EncWasm, + ), defaultEncoderOptions: { quality: 75, alpha_quality: 75,