Demo

Co-authored-by: Jake Archibald <jaffathecake@gmail.com>

cli/README.md

@@ -42,7 +42,7 @@ Options:
   -h, --help                                             display help for command
 ```
 
-The default values for each `config` option can be found in the [`codecs.ts`][codecs.ts] file under `defaultEncoderOptions`. Every unspecified value will use the default value specified here. _Better documentation is needed here._
+The default values for each `config` option can be found in the [`codecs.js`][codecs.js] file under `defaultEncoderOptions`. Every unspecified value will use the default value specified here. _Better documentation is needed here._
 
 ## Auto optimizer
 
@@ -55,5 +55,5 @@ $ npx @squoosh/cli --wp2 auto test.png
 ```
 
 [squoosh]: https://squoosh.app
-[codecs.ts]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/libsquoosh/src/codecs.ts
+[codecs.js]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/libsquoosh/src/codecs.js
 [butteraugli]: https://github.com/google/butteraugli

cli/package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "@squoosh/cli",
-  "version": "0.7.1",
+  "version": "0.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@squoosh/cli",
-      "version": "0.7.1",
+      "version": "0.7.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@squoosh/lib": "^0.3.1",
+        "@squoosh/lib": "^0.2.0",
         "commander": "^7.2.0",
         "json5": "^2.2.0",
         "kleur": "^4.1.4",
@@ -18,15 +18,12 @@
       "bin": {
         "cli": "src/index.js",
         "squoosh-cli": "src/index.js"
-      },
-      "engines": {
-        "node": " ^12.20.2 || ^14.13.1 || ^16.0.0 "
       }
     },
     "node_modules/@squoosh/lib": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@squoosh/lib/-/lib-0.3.1.tgz",
-      "integrity": "sha512-ni8gyTGgW9lH/yqaqgkxerGT7daSWNU9mtvWqj+/1qqzIT9YGfFvnTtDQRMIRjRCKQ5pkK/COufvWKuzHI6Dxw==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@squoosh/lib/-/lib-0.2.0.tgz",
+      "integrity": "sha512-zKId9h/LzEnCdoOGnIgjzvqbk5g2aHgfEqgKQ+S+r5K3TasgD/DAsT6r7v6gXft1ao0f/00CTcwIp1KviWTQbw==",
       "dependencies": {
         "web-streams-polyfill": "^3.0.3"
       }
@@ -345,9 +342,9 @@
   },
   "dependencies": {
     "@squoosh/lib": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@squoosh/lib/-/lib-0.3.1.tgz",
-      "integrity": "sha512-ni8gyTGgW9lH/yqaqgkxerGT7daSWNU9mtvWqj+/1qqzIT9YGfFvnTtDQRMIRjRCKQ5pkK/COufvWKuzHI6Dxw==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@squoosh/lib/-/lib-0.2.0.tgz",
+      "integrity": "sha512-zKId9h/LzEnCdoOGnIgjzvqbk5g2aHgfEqgKQ+S+r5K3TasgD/DAsT6r7v6gXft1ao0f/00CTcwIp1KviWTQbw==",
       "requires": {
         "web-streams-polyfill": "^3.0.3"
       }

cli/package.json

@@ -1,14 +1,9 @@
 {
   "name": "@squoosh/cli",
-  "version": "0.7.1",
+  "version": "0.7.0",
   "description": "A CLI for Squoosh",
   "public": true,
   "type": "module",
-  "homepage": "https://github.com/GoogleChromeLabs/squoosh",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/GoogleChromeLabs/squoosh.git"
-  },
   "bin": {
     "squoosh-cli": "src/index.js",
     "@squoosh/cli": "src/index.js"
@@ -19,11 +14,8 @@
   "keywords": [],
   "author": "Google Chrome Developers <chromium-dev@google.com>",
   "license": "Apache-2.0",
-  "engines": {
-    "node": " ^12.20.2 || ^14.13.1 || ^16.0.0 "
-  },
   "dependencies": {
-    "@squoosh/lib": "^0.3.1",
+    "@squoosh/lib": "^0.2.0",
     "commander": "^7.2.0",
     "json5": "^2.2.0",
     "kleur": "^4.1.4",

cli/src/index.js

@@ -177,8 +177,8 @@ async function processFiles(files) {
       jobsFinished++;
       const outputPath = path.join(
         program.opts().outputDir,
-        path.basename(originalFile, path.extname(originalFile)) +
-        program.opts().suffix
+        program.opts().suffix +
+          path.basename(originalFile, path.extname(originalFile)),
       );
       for (const output of Object.values(image.encodedWith)) {
         const outputFile = `${outputPath}.${(await output).extension}`;

codecs/avif/Makefile

@@ -10,9 +10,6 @@ export CODEC_DIR = node_modules/libavif
 export BUILD_DIR = node_modules/build
 export LIBAOM_DIR = node_modules/libaom
 
-override CFLAGS += "-Wno-unused-macros"
-export
-
 OUT_ENC_JS = enc/avif_enc.js
 OUT_NODE_ENC_JS = enc/avif_node_enc.js
 OUT_ENC_MT_JS = enc/avif_enc_mt.js

codecs/avif/enc/avif_enc_mt.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./avif_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./avif_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

codecs/cpp.Dockerfile

@@ -1,13 +1,13 @@
-FROM emscripten/emsdk:2.0.23
+FROM emscripten/emsdk:2.0.21
 RUN apt-get update && apt-get install -qqy autoconf libtool pkg-config
 ENV CFLAGS "-O3 -flto"
 ENV CXXFLAGS "${CFLAGS} -std=c++17"
 ENV LDFLAGS "${CFLAGS} \
+--closure 1 \
 -s FILESYSTEM=0 \
 -s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency \
 -s ALLOW_MEMORY_GROWTH=1 \
 -s TEXTDECODER=2 \
--s NODEJS_CATCH_EXIT=0 -s NODEJS_CATCH_REJECTION=0 \
 "
 # Build and cache standard libraries with these flags + Embind.
 RUN emcc ${CXXFLAGS} ${LDFLAGS} --bind -xc++ /dev/null -o /dev/null

codecs/jxl/enc/jxl_enc_mt.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

codecs/jxl/enc/jxl_enc_mt_simd.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt_simd.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt_simd.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

codecs/resize/pkg/squoosh_resize.d.ts

@@ -9,9 +9,9 @@
 * @param {number} typ_idx
 * @param {boolean} premultiply
 * @param {boolean} color_space_conversion
-* @returns {Uint8ClampedArray}
+* @returns {Uint8Array}
 */
-export function resize(input_image: Uint8Array, input_width: number, input_height: number, output_width: number, output_height: number, typ_idx: number, premultiply: boolean, color_space_conversion: boolean): Uint8ClampedArray;
+export function resize(input_image: Uint8Array, input_width: number, input_height: number, output_width: number, output_height: number, typ_idx: number, premultiply: boolean, color_space_conversion: boolean): Uint8Array;
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 

codecs/resize/pkg/squoosh_resize.js

@@ -26,16 +26,8 @@ function getInt32Memory0() {
     return cachegetInt32Memory0;
 }
 
-let cachegetUint8ClampedMemory0 = null;
-function getUint8ClampedMemory0() {
-    if (cachegetUint8ClampedMemory0 === null || cachegetUint8ClampedMemory0.buffer !== wasm.memory.buffer) {
-        cachegetUint8ClampedMemory0 = new Uint8ClampedArray(wasm.memory.buffer);
-    }
-    return cachegetUint8ClampedMemory0;
-}
-
-function getClampedArrayU8FromWasm0(ptr, len) {
-    return getUint8ClampedMemory0().subarray(ptr / 1, ptr / 1 + len);
+function getArrayU8FromWasm0(ptr, len) {
+    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
 }
 /**
 * @param {Uint8Array} input_image
@@ -46,7 +38,7 @@ function getClampedArrayU8FromWasm0(ptr, len) {
 * @param {number} typ_idx
 * @param {boolean} premultiply
 * @param {boolean} color_space_conversion
-* @returns {Uint8ClampedArray}
+* @returns {Uint8Array}
 */
 export function resize(input_image, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion) {
     try {
@@ -56,7 +48,7 @@ export function resize(input_image, input_width, input_height, output_width, out
         wasm.resize(retptr, ptr0, len0, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
-        var v1 = getClampedArrayU8FromWasm0(r0, r1).slice();
+        var v1 = getArrayU8FromWasm0(r0, r1).slice();
         wasm.__wbindgen_free(r0, r1 * 1);
         return v1;
     } finally {

codecs/resize/pkg/squoosh_resize_bg.wasm.d.ts

@@ -1,7 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export const memory: WebAssembly.Memory;
-export function resize(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number): void;
-export function __wbindgen_add_to_stack_pointer(a: number): number;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_free(a: number, b: number): void;

codecs/resize/src/lib.rs

@@ -8,7 +8,6 @@ use cfg_if::cfg_if;
 use resize::Pixel;
 use resize::Type;
 use wasm_bindgen::prelude::*;
-use wasm_bindgen::Clamped;
 
 mod srgb;
 use srgb::{linear_to_srgb, Clamp};
@@ -67,7 +66,7 @@ pub fn resize(
     typ_idx: usize,
     premultiply: bool,
     color_space_conversion: bool,
-) -> Clamped<Vec<u8>> {
+) -> Vec<u8> {
     let typ = match typ_idx {
         0 => Type::Triangle,
         1 => Type::Catrom,
@@ -92,7 +91,7 @@ pub fn resize(
             typ,
         );
         resizer.resize(input_image.as_slice(), output_image.as_mut_slice());
-        return Clamped(output_image);
+        return output_image;
     }
 
     // Otherwise, we convert to f32 images to keep the
@@ -139,5 +138,5 @@ pub fn resize(
             .clamp(0.0, 255.0) as u8;
     }
 
-    return Clamped(output_image);
+    return output_image;
 }

codecs/visdif/package.json

@@ -1,6 +1,5 @@
 {
   "name": "avif",
-  "type": "module",
   "scripts": {
     "build": "../build-cpp.sh"
   }

codecs/wp2/enc/wp2_enc_mt.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./wp2_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./wp2_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

codecs/wp2/enc/wp2_enc_mt_simd.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./wp2_enc_mt_simd.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./wp2_enc_mt_simd.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

libsquoosh/README.md

@@ -39,26 +39,18 @@ The returned `image` object is a representation of the original image, that you
 When an image has been ingested, you can start preprocessing it and encoding it to other formats. This example will resize the image and then encode it to a `.jpg` and `.jxl` image:
 
 ```js
-await image.decoded; //Wait until the image is decoded before running preprocessors. 
+await image.decoded; //Wait until the image is decoded before running preprocessors
 
-const preprocessOptions = {
-  //When both width and height are specified, the image resized to specified size.
+const preprocessOptions: {
   resize: {
     enabled: true,
     width: 100,
     height: 50,
   }
-  /*
-  //When either width or height is specified, the image resized to specified size keeping aspect ratio.
-  resize: {
-    enabled: true,
-    width: 100,
-  }
-  */
 }
 await image.preprocess(preprocessOptions);
 
-const encodeOptions = {
+const encodeOptions: {
   mozjpeg: {}, //an empty object means 'use default settings'
   jxl: {
     quality: 90,
@@ -68,7 +60,7 @@ await image.encode(encodeOptions);
 
 ```
 
-The default values for each option can be found in the [`codecs.ts`][codecs.ts] file under `defaultEncoderOptions`. Every unspecified value will use the default value specified there. _Better documentation is needed here._
+The default values for each option can be found in the [`codecs.js`][codecs.js] file under `defaultEncoderOptions`. Every unspecified value will use the default value specified there. _Better documentation is needed here._
 
 You can run your own code inbetween the different steps, if, for example, you want to change how much the image should be resized based on its original height. (See [Extracting image information](#extracting-image-information) to learn how to get the image dimensions).
 
@@ -89,7 +81,7 @@ When you have encoded an image, you normally want to write it to a file.
 This example takes an image that has been encoded as a `jpg` and writes it to a file:
 
 ```js
-const rawEncodedImage = (await image.encodedWith.mozjpeg).binary;
+const rawEncodedImage = (await image.encodedWidth.mozjpeg).binary;
 
 fs.writeFile('/path/to/new/image.jpg', rawEncodedImage);
 ```
@@ -166,6 +158,6 @@ const encodeOptions: {
 ```
 
 [squoosh]: https://squoosh.app
-[codecs.ts]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/libsquoosh/src/codecs.ts
+[codecs.js]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/libsquoosh/src/codecs.js
 [butteraugli]: https://github.com/google/butteraugli
 [readfile]: https://nodejs.org/api/fs.html#fs_fspromises_readfile_path_options

libsquoosh/lib/simple-ts.js

@@ -1,133 +0,0 @@
-/**
- * Copyright 2020 Google Inc. All Rights Reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { spawn } from 'child_process';
-import { relative, join } from 'path';
-import { promises as fsp } from 'fs';
-import { promisify } from 'util';
-
-import * as ts from 'typescript';
-import glob from 'glob';
-import { sync as whichSync } from 'which';
-
-const globP = promisify(glob);
-
-const tscPath = whichSync('tsc');
-
-const extRe = /\.tsx?$/;
-
-function loadConfig(mainPath) {
-  const fileName = ts.findConfigFile(mainPath, ts.sys.fileExists);
-  if (!fileName) throw Error('tsconfig not found');
-  const text = ts.sys.readFile(fileName);
-  const loadedConfig = ts.parseConfigFileTextToJson(fileName, text).config;
-  const parsedTsConfig = ts.parseJsonConfigFileContent(
-    loadedConfig,
-    ts.sys,
-    process.cwd(),
-    undefined,
-    fileName,
-  );
-  return parsedTsConfig;
-}
-
-export default function simpleTS(mainPath, { noBuild, watch } = {}) {
-  const config = loadConfig(mainPath);
-  const args = ['-b', mainPath];
-
-  let tsBuildDone;
-
-  async function watchBuiltFiles(rollupContext) {
-    const matches = await globP(config.options.outDir + '/**/*.js');
-    for (const match of matches) rollupContext.addWatchFile(match);
-  }
-
-  async function tsBuild(rollupContext) {
-    if (tsBuildDone) {
-      // Watch lists are cleared on each build, so we need to rewatch all the JS files.
-      await watchBuiltFiles(rollupContext);
-      return tsBuildDone;
-    }
-    if (noBuild) {
-      return (tsBuildDone = Promise.resolve());
-    }
-    tsBuildDone = Promise.resolve().then(async () => {
-      await new Promise((resolve) => {
-        const proc = spawn(tscPath, args, {
-          stdio: 'inherit',
-        });
-
-        proc.on('exit', (code) => {
-          if (code !== 0) {
-            throw Error('TypeScript build failed');
-          }
-          resolve();
-        });
-      });
-
-      await watchBuiltFiles(rollupContext);
-
-      if (watch) {
-        tsBuildDone.then(() => {
-          spawn(tscPath, [...args, '--watch', '--preserveWatchOutput'], {
-            stdio: 'inherit',
-          });
-        });
-      }
-    });
-
-    return tsBuildDone;
-  }
-
-  return {
-    name: 'simple-ts',
-    resolveId(id, importer) {
-      // If there isn't an importer, it's an entry point, so we don't need to resolve it relative
-      // to something.
-      if (!importer) return null;
-
-      const tsResolve = ts.resolveModuleName(
-        id,
-        importer,
-        config.options,
-        ts.sys,
-      );
-
-      if (
-        // It didn't find anything
-        !tsResolve.resolvedModule ||
-        // Or if it's linking to a definition file, it's something in node_modules,
-        // or something local like css.d.ts
-        tsResolve.resolvedModule.extension === '.d.ts'
-      ) {
-        return null;
-      }
-      return tsResolve.resolvedModule.resolvedFileName;
-    },
-    async load(id) {
-      if (!extRe.test(id)) return null;
-
-      // TypeScript building is deferred until the first TS file load.
-      // This allows prerequisites to happen first,
-      // such as css.d.ts generation in css-plugin.
-      await tsBuild(this);
-
-      // Look for the JS equivalent in the tmp folder
-      const newId = join(
-        config.options.outDir,
-        relative(config.options.rootDir, id),
-      ).replace(extRe, '.js');
-
-      return fsp.readFile(newId, { encoding: 'utf8' });
-    },
-  };
-}

libsquoosh/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@squoosh/lib",
-  "version": "0.3.1",
+  "version": "0.2.3",
   "description": "A Node library for Squoosh",
   "public": true,
-  "main": "./build/index.js",
+  "main": "/build/index.js",
   "files": [
     "/build/*"
   ],
@@ -12,15 +12,7 @@
   },
   "keywords": [],
   "author": "Google Chrome Developers <chromium-dev@google.com>",
-  "homepage": "https://github.com/GoogleChromeLabs/squoosh",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/GoogleChromeLabs/squoosh.git"
-  },
   "license": "Apache-2.0",
-  "engines": {
-    "node": " ^12.5.0 || ^14.0.0 || ^16.0.0 "
-  },
   "dependencies": {
     "web-streams-polyfill": "^3.0.3"
   },
@@ -30,10 +22,7 @@
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
-    "@types/node": "^15.6.1",
     "rollup": "^2.46.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.1.3",
-    "which": "^2.0.2"
+    "rollup-plugin-terser": "^7.0.2"
   }
 }

libsquoosh/rollup.config.js

@@ -1,6 +1,5 @@
 import resolve from '@rollup/plugin-node-resolve';
 import cjs from '@rollup/plugin-commonjs';
-import simpleTS from './lib/simple-ts';
 import asset from './lib/asset-plugin.js';
 import json from './lib/json-plugin.js';
 import autojson from './lib/autojson-plugin.js';
@@ -21,7 +20,6 @@ export default {
     asset(),
     autojson(),
     json(),
-    simpleTS('.'),
     getBabelOutputPlugin({
       babelrc: false,
       configFile: false,

libsquoosh/src/WebAssembly.d.ts

@@ -1,132 +0,0 @@
-/**
- * WebAssembly definitions are not available in `@types/node` yet,
- * so these are copied from `lib.dom.d.ts`
- */
-declare namespace WebAssembly {
-  interface CompileError {}
-
-  var CompileError: {
-    prototype: CompileError;
-    new (): CompileError;
-  };
-
-  interface Global {
-    value: any;
-    valueOf(): any;
-  }
-
-  var Global: {
-    prototype: Global;
-    new (descriptor: GlobalDescriptor, v?: any): Global;
-  };
-
-  interface Instance {
-    readonly exports: Exports;
-  }
-
-  var Instance: {
-    prototype: Instance;
-    new (module: Module, importObject?: Imports): Instance;
-  };
-
-  interface LinkError {}
-
-  var LinkError: {
-    prototype: LinkError;
-    new (): LinkError;
-  };
-
-  interface Memory {
-    readonly buffer: ArrayBuffer;
-    grow(delta: number): number;
-  }
-
-  var Memory: {
-    prototype: Memory;
-    new (descriptor: MemoryDescriptor): Memory;
-  };
-
-  interface Module {}
-
-  var Module: {
-    prototype: Module;
-    new (bytes: BufferSource): Module;
-    customSections(moduleObject: Module, sectionName: string): ArrayBuffer[];
-    exports(moduleObject: Module): ModuleExportDescriptor[];
-    imports(moduleObject: Module): ModuleImportDescriptor[];
-  };
-
-  interface RuntimeError {}
-
-  var RuntimeError: {
-    prototype: RuntimeError;
-    new (): RuntimeError;
-  };
-
-  interface Table {
-    readonly length: number;
-    get(index: number): Function | null;
-    grow(delta: number): number;
-    set(index: number, value: Function | null): void;
-  }
-
-  var Table: {
-    prototype: Table;
-    new (descriptor: TableDescriptor): Table;
-  };
-
-  interface GlobalDescriptor {
-    mutable?: boolean;
-    value: ValueType;
-  }
-
-  interface MemoryDescriptor {
-    initial: number;
-    maximum?: number;
-  }
-
-  interface ModuleExportDescriptor {
-    kind: ImportExportKind;
-    name: string;
-  }
-
-  interface ModuleImportDescriptor {
-    kind: ImportExportKind;
-    module: string;
-    name: string;
-  }
-
-  interface TableDescriptor {
-    element: TableKind;
-    initial: number;
-    maximum?: number;
-  }
-
-  interface WebAssemblyInstantiatedSource {
-    instance: Instance;
-    module: Module;
-  }
-
-  type ImportExportKind = 'function' | 'global' | 'memory' | 'table';
-  type TableKind = 'anyfunc';
-  type ValueType = 'f32' | 'f64' | 'i32' | 'i64';
-  type ExportValue = Function | Global | Memory | Table;
-  type Exports = Record<string, ExportValue>;
-  type ImportValue = ExportValue | number;
-  type ModuleImports = Record<string, ImportValue>;
-  type Imports = Record<string, ModuleImports>;
-  function compile(bytes: BufferSource): Promise<Module>;
-  // `compileStreaming` does not exist in NodeJS
-  // function compileStreaming(source: Response | Promise<Response>): Promise<Module>;
-  function instantiate(
-    bytes: BufferSource,
-    importObject?: Imports,
-  ): Promise<WebAssemblyInstantiatedSource>;
-  function instantiate(
-    moduleObject: Module,
-    importObject?: Imports,
-  ): Promise<Instance>;
-  // `instantiateStreaming` does not exist in NodeJS
-  // function instantiateStreaming(response: Response | PromiseLike<Response>, importObject?: Imports): Promise<WebAssemblyInstantiatedSource>;
-  function validate(bytes: BufferSource): boolean;
-}

libsquoosh/src/auto-optimizer.js

@@ -2,39 +2,6 @@ import { instantiateEmscriptenWasm } from './emscripten-utils.js';
 
 import visdif from '../../codecs/visdif/visdif.js';
 import visdifWasm from 'asset-url:../../codecs/visdif/visdif.wasm';
-import type ImageData from './image_data';
-
-interface VisDiff {
-  distance: (data: Uint8ClampedArray) => number;
-  delete: () => void;
-}
-
-interface VisdiffConstructor {
-  new (data: Uint8ClampedArray, width: number, height: number): VisDiff;
-}
-
-interface VisDiffModule extends EmscriptenWasm.Module {
-  VisDiff: VisdiffConstructor;
-}
-
-type VisDiffModuleFactory = EmscriptenWasm.ModuleFactory<VisDiffModule>;
-
-interface BinarySearchParams {
-  min?: number;
-  max?: number;
-  epsilon?: number;
-  maxRounds?: number;
-}
-
-interface AutoOptimizeParams extends BinarySearchParams {
-  butteraugliDistanceGoal?: number;
-}
-
-interface AutoOptimizeResult {
-  bitmap: ImageData;
-  binary: Uint8Array;
-  quality: number;
-}
 
 // `measure` is a (async) function that takes exactly one numeric parameter and
 // returns a value. The function is assumed to be monotonic (an increase in `parameter`
@@ -42,9 +9,9 @@ interface AutoOptimizeResult {
 // to find `parameter` such that `measure` returns `measureGoal`, within an error
 // of `epsilon`. It will use at most `maxRounds` attempts.
 export async function binarySearch(
-  measureGoal: number,
-  measure: (val: number) => Promise<number>,
-  { min = 0, max = 100, epsilon = 0.1, maxRounds = 6 }: BinarySearchParams = {},
+  measureGoal,
+  measure,
+  { min = 0, max = 100, epsilon = 0.1, maxRounds = 8 } = {},
 ) {
   let parameter = (max - min) / 2 + min;
   let delta = (max - min) / 4;
@@ -66,21 +33,12 @@ export async function binarySearch(
 }
 
 export async function autoOptimize(
-  bitmapIn: ImageData,
-  encode: (
-    bitmap: ImageData,
-    quality: number,
-  ) => Promise<Uint8Array> | Uint8Array,
-  decode: (binary: Uint8Array) => Promise<ImageData> | ImageData,
-  {
-    butteraugliDistanceGoal = 1.4,
-    ...binarySearchParams
-  }: AutoOptimizeParams = {},
-): Promise<AutoOptimizeResult> {
-  const { VisDiff } = await instantiateEmscriptenWasm(
-    visdif as VisDiffModuleFactory,
-    visdifWasm,
-  );
+  bitmapIn,
+  encode,
+  decode,
+  { butteraugliDistanceGoal = 1.4, ...otherOpts } = {},
+) {
+  const { VisDiff } = await instantiateEmscriptenWasm(visdif, visdifWasm);
 
   const comparator = new VisDiff(
     bitmapIn.data,
@@ -88,11 +46,8 @@ export async function autoOptimize(
     bitmapIn.height,
   );
 
-  // We're able to do non null assertion because
-  // we know that binarySearch will set these values
-  let bitmapOut!: ImageData;
-  let binaryOut!: Uint8Array;
-
+  let bitmapOut;
+  let binaryOut;
   // Increasing quality means _decrease_ in Butteraugli distance.
   // `binarySearch` assumes that increasing `parameter` will
   // increase the metric value. So multipliy Butteraugli values by -1.
@@ -103,7 +58,7 @@ export async function autoOptimize(
       bitmapOut = await decode(binaryOut);
       return -1 * comparator.distance(bitmapOut.data);
     },
-    binarySearchParams,
+    otherOpts,
   );
   comparator.delete();
 

libsquoosh/src/codecs.js

@@ -1,37 +1,6 @@
 import { promises as fsp } from 'fs';
 import { instantiateEmscriptenWasm, pathify } from './emscripten-utils.js';
 
-interface RotateModuleInstance {
-  exports: {
-    memory: WebAssembly.Memory;
-    rotate(width: number, height: number, rotate: number): void;
-  };
-}
-
-interface ResizeWithAspectParams {
-  input_width: number;
-  input_height: number;
-  target_width: number;
-  target_height: number;
-}
-
-interface ResizeInstantiateOptions {
-  width: number;
-  height: number;
-  method: string;
-  premultiply: boolean;
-  linearRGB: boolean;
-}
-
-declare global {
-  // Needed for being able to use ImageData as type in codec types
-  type ImageData = typeof import('./image_data.js');
-  // Needed for being able to assign to `globalThis.ImageData`
-  var ImageData: ImageData['constructor'];
-}
-
-import type { QuantizerModule } from '../../codecs/imagequant/imagequant.js';
-
 // MozJPEG
 import mozEnc from '../../codecs/mozjpeg/enc/mozjpeg_node_enc.js';
 import mozEncWasm from 'asset-url:../../codecs/mozjpeg/enc/mozjpeg_node_enc.wasm';
@@ -82,22 +51,16 @@ const resizePromise = resize.default(fsp.readFile(pathify(resizeWasm)));
 // rotate
 import rotateWasm from 'asset-url:../../codecs/rotate/rotate.wasm';
 
-// TODO(ergunsh): Type definitions of some modules do not exist
-// Figure out creating type definitions for them and remove `allowJs` rule
-// We shouldn't need to use Promise<QuantizerModule> below after getting type definitions for imageQuant
 // ImageQuant
 import imageQuant from '../../codecs/imagequant/imagequant_node.js';
 import imageQuantWasm from 'asset-url:../../codecs/imagequant/imagequant_node.wasm';
-const imageQuantPromise: Promise<QuantizerModule> = instantiateEmscriptenWasm(
-  imageQuant,
-  imageQuantWasm,
-);
+const imageQuantPromise = instantiateEmscriptenWasm(imageQuant, imageQuantWasm);
 
 // Our decoders currently rely on a `ImageData` global.
 import ImageData from './image_data.js';
 globalThis.ImageData = ImageData;
 
-function resizeNameToIndex(name: string) {
+function resizeNameToIndex(name) {
   switch (name) {
     case 'triangle':
       return 0;
@@ -117,26 +80,25 @@ function resizeWithAspect({
   input_height,
   target_width,
   target_height,
-}: ResizeWithAspectParams): { width: number; height: number } {
+}) {
   if (!target_width && !target_height) {
     throw Error('Need to specify at least width or height when resizing');
   }
-
   if (target_width && target_height) {
     return { width: target_width, height: target_height };
   }
-
   if (!target_width) {
     return {
       width: Math.round((input_width / input_height) * target_height),
       height: target_height,
     };
   }
-
-  return {
-    width: target_width,
-    height: Math.round((input_height / input_width) * target_width),
-  };
+  if (!target_height) {
+    return {
+      width: target_width,
+      height: Math.round((input_height / input_width) * target_width),
+    };
+  }
 }
 
 export const preprocessors = {
@@ -146,16 +108,10 @@ export const preprocessors = {
     instantiate: async () => {
       await resizePromise;
       return (
-        buffer: Uint8Array,
-        input_width: number,
-        input_height: number,
-        {
-          width,
-          height,
-          method,
-          premultiply,
-          linearRGB,
-        }: ResizeInstantiateOptions,
+        buffer,
+        input_width,
+        input_height,
+        { width, height, method, premultiply, linearRGB },
       ) => {
         ({ width, height } = resizeWithAspect({
           input_width,
@@ -192,12 +148,7 @@ export const preprocessors = {
     description: 'Reduce the number of colors used (aka. paletting)',
     instantiate: async () => {
       const imageQuant = await imageQuantPromise;
-      return (
-        buffer: Uint8Array,
-        width: number,
-        height: number,
-        { numColors, dither }: { numColors: number; dither: number },
-      ) =>
+      return (buffer, width, height, { numColors, dither }) =>
         new ImageData(
           imageQuant.quantize(buffer, width, height, numColors, dither),
           width,
@@ -213,18 +164,13 @@ export const preprocessors = {
     name: 'Rotate',
     description: 'Rotate image',
     instantiate: async () => {
-      return async (
-        buffer: Uint8Array,
-        width: number,
-        height: number,
-        { numRotations }: { numRotations: number },
-      ) => {
+      return async (buffer, width, height, { numRotations }) => {
         const degrees = (numRotations * 90) % 360;
         const sameDimensions = degrees == 0 || degrees == 180;
         const size = width * height * 4;
-        const instance = (
-          await WebAssembly.instantiate(await fsp.readFile(pathify(rotateWasm)))
-        ).instance as RotateModuleInstance;
+        const { instance } = await WebAssembly.instantiate(
+          await fsp.readFile(pathify(rotateWasm)),
+        );
         const { memory } = instance.exports;
         const additionalPagesNeeded = Math.ceil(
           (size * 2 - memory.buffer.byteLength + 8) / (64 * 1024),
@@ -282,7 +228,7 @@ export const codecs = {
   webp: {
     name: 'WebP',
     extension: 'webp',
-    detectors: [/^RIFF....WEBPVP8[LX ]/s],
+    detectors: [/^RIFF....WEBPVP8[LX ]/],
     dec: () => instantiateEmscriptenWasm(webpDec, webpDecWasm),
     enc: () => instantiateEmscriptenWasm(webpEnc, webpEncWasm),
     defaultEncoderOptions: {
@@ -340,8 +286,8 @@ export const codecs = {
     },
     autoOptimize: {
       option: 'cqLevel',
-      min: 62,
-      max: 0,
+      min: 0,
+      max: 62,
     },
   },
   jxl: {
@@ -400,18 +346,13 @@ export const codecs = {
       await pngEncDecPromise;
       await oxipngPromise;
       return {
-        encode: (
-          buffer: Uint8Array,
-          width: number,
-          height: number,
-          opts: { level: number },
-        ) => {
+        encode: (buffer, width, height, opts) => {
           const simplePng = pngEncDec.encode(
             new Uint8Array(buffer),
             width,
             height,
           );
-          return oxipng.optimise(simplePng, opts.level, false);
+          return oxipng.optimise(simplePng, opts.level);
         },
       };
     },

libsquoosh/src/emscripten-utils.js

@@ -1,16 +1,13 @@
 import { fileURLToPath } from 'url';
 
-export function pathify(path: string): string {
+export function pathify(path) {
   if (path.startsWith('file://')) {
     path = fileURLToPath(path);
   }
   return path;
 }
 
-export function instantiateEmscriptenWasm<T extends EmscriptenWasm.Module>(
-  factory: EmscriptenWasm.ModuleFactory<T>,
-  path: string,
-): Promise<T> {
+export function instantiateEmscriptenWasm(factory, path) {
   return factory({
     locateFile() {
       return pathify(path);

libsquoosh/src/image_data.js

@@ -0,0 +1,7 @@
+export default class ImageData {
+  constructor(data, width, height) {
+    this.data = data;
+    this.width = width;
+    this.height = height;
+  }
+}

libsquoosh/src/image_data.ts

@@ -1,11 +0,0 @@
-export default class ImageData {
-  readonly data: Uint8ClampedArray;
-  readonly width: number;
-  readonly height: number;
-
-  constructor(data: Uint8ClampedArray, width: number, height: number) {
-    this.data = data;
-    this.width = width;
-    this.height = height;
-  }
-}

libsquoosh/src/index.js

@@ -180,9 +180,9 @@ class Image {
         encName,
         encConfig,
         optimizerButteraugliTarget: Number(
-          encodeOptions.optimizerButteraugliTarget ?? 1.4,
+          encodeOptions.optimizerButteraugliTarget,
         ),
-        maxOptimizerRounds: Number(encodeOptions.maxOptimizerRounds ?? 6),
+        maxOptimizerRounds: Number(encodeOptions.maxOptimizerRounds),
       });
     }
     await Promise.all(Object.values(this.encodedWith));

libsquoosh/src/missing-types.d.ts

@@ -1,38 +0,0 @@
-/// <reference path="../../missing-types.d.ts" />
-
-declare module 'asset-url:*' {
-  const value: string;
-  export default value;
-}
-
-// Somehow TS picks up definitions from the module itself
-// instead of using `asset-url:*`. It is probably related to
-// specifity of the module declaration and these declarations below fix it
-declare module 'asset-url:../../codecs/png/pkg/squoosh_png_bg.wasm' {
-  const value: string;
-  export default value;
-}
-
-declare module 'asset-url:../../codecs/oxipng/pkg/squoosh_oxipng_bg.wasm' {
-  const value: string;
-  export default value;
-}
-
-declare module 'asset-url:../../codecs/resize/pkg/squoosh_resize_bg.wasm' {
-  const value: string;
-  export default value;
-}
-
-// These don't exist in NodeJS types so we're not able to use them but they are referenced in some emscripten and codec types
-// Thus, we need to explicitly assign them to be `never`
-// We're also not able to use the APIs that use these types
-// So, if we want to use those APIs we need to supply its dependencies ourselves
-// However, probably those APIs are more suited to be used in web (i.e. there can be other
-// dependencies to web APIs that might not work in Node)
-type RequestInfo = never;
-type Response = never;
-type WebGLRenderingContext = never;
-type MessageEvent = never;
-
-type BufferSource = ArrayBufferView | ArrayBuffer;
-type URL = import('url').URL;

libsquoosh/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../generic-tsconfig.json",
-  "compilerOptions": {
-    "lib": ["esnext"],
-    "types": ["node"],
-    "allowJs": true
-  },
-  "include": ["src/**/*", "../codecs/**/*"]
-}

rollup.config.js

@@ -33,23 +33,11 @@ import initialCssPlugin from './lib/initial-css-plugin';
 import serviceWorkerPlugin from './lib/sw-plugin';
 import dataURLPlugin from './lib/data-url-plugin';
 import entryDataPlugin, { fileNameToURL } from './lib/entry-data-plugin';
-import dedent from 'dedent';
 
 function resolveFileUrl({ fileName }) {
   return JSON.stringify(fileNameToURL(fileName));
 }
 
-function resolveImportMetaUrlInStaticBuild(property, { moduleId }) {
-  if (property !== 'url') return;
-  throw new Error(dedent`
-    Attempted to use a \`new URL(..., import.meta.url)\` pattern in ${path.relative(
-      process.cwd(),
-      moduleId,
-    )} for URL that needs to end up in static HTML.
-    This is currently unsupported.
-  `);
-}
-
 const dir = '.tmp/build';
 const staticPath = 'static/c/[name]-[hash][extname]';
 const jsPath = staticPath.replace('[extname]', '.js');
@@ -112,7 +100,7 @@ export default async function ({ watch }) {
     },
     preserveModules: true,
     plugins: [
-      { resolveFileUrl, resolveImportMeta: resolveImportMetaUrlInStaticBuild },
+      { resolveFileUrl },
       clientBundlePlugin(
         {
           external: ['worker_threads'],

src/client/lazy-app/Compress/Options/Range/index.tsx

@@ -6,13 +6,10 @@ import './custom-els/RangeInput';
 import { linkRef } from 'shared/prerendered-app/util';
 
 interface Props extends preact.JSX.HTMLAttributes {}
-interface State {
-  textFocused: boolean;
-}
+interface State {}
 
 export default class Range extends Component<Props, State> {
   rangeWc?: RangeInputElement;
-  inputEl?: HTMLInputElement;
 
   private onTextInput = (event: Event) => {
     const input = event.target as HTMLInputElement;
@@ -26,19 +23,10 @@ export default class Range extends Component<Props, State> {
     );
   };
 
-  private onTextFocus = () => {
-    this.setState({ textFocused: true });
-  };
-
-  private onTextBlur = () => {
-    this.setState({ textFocused: false });
-  };
-
-  render(props: Props, state: State) {
+  render(props: Props) {
     const { children, ...otherProps } = props;
 
     const { value, min, max, step } = props;
-    const textValue = state.textFocused ? this.inputEl!.value : value;
 
     return (
       <label class={style.range}>
@@ -53,16 +41,13 @@ export default class Range extends Component<Props, State> {
           />
         </div>
         <input
-          ref={linkRef(this, 'inputEl')}
           type="number"
           class={style.textInput}
-          value={textValue}
+          value={value}
           min={min}
           max={max}
           step={step}
           onInput={this.onTextInput}
-          onFocus={this.onTextFocus}
-          onBlur={this.onTextBlur}
         />
       </label>
     );

src/client/lazy-app/Compress/Output/custom-els/TwoUp/index.ts

@@ -34,8 +34,6 @@ export default class TwoUp extends HTMLElement {
    */
   private _everConnected = false;
 
-  private _resizeObserver?: ResizeObserver;
-
   constructor() {
     super();
     this._handle.className = styles.twoUpHandle;
@@ -47,6 +45,13 @@ export default class TwoUp extends HTMLElement {
       childList: true,
     });
 
+    // Watch for element size changes.
+    if ('ResizeObserver' in window) {
+      new ResizeObserver(() => this._resetPosition()).observe(this);
+    } else {
+      window.addEventListener('resize', () => this._resetPosition());
+    }
+
     // Watch for pointers on the handle.
     const pointerTracker: PointerTracker = new PointerTracker(this._handle, {
       start: (_, event) => {
@@ -63,6 +68,8 @@ export default class TwoUp extends HTMLElement {
         );
       },
     });
+
+    window.addEventListener('keydown', (event) => this._onKeyDown(event));
   }
 
   connectedCallback() {
@@ -77,23 +84,12 @@ export default class TwoUp extends HTMLElement {
         }</svg>
       `}</div>`;
 
-    // Watch for element size changes.
-    this._resizeObserver = new ResizeObserver(() => this._resetPosition());
-    this._resizeObserver.observe(this);
-
-    window.addEventListener('keydown', this._onKeyDown);
-
     if (!this._everConnected) {
       this._resetPosition();
       this._everConnected = true;
     }
   }
 
-  disconnectedCallback() {
-    window.removeEventListener('keydown', this._onKeyDown);
-    if (this._resizeObserver) this._resizeObserver.disconnect();
-  }
-
   attributeChangedCallback(name: string) {
     if (name === orientationAttr) {
       this._resetPosition();
@@ -101,7 +97,7 @@ export default class TwoUp extends HTMLElement {
   }
 
   // KeyDown event handler
-  private _onKeyDown = (event: KeyboardEvent) => {
+  private _onKeyDown(event: KeyboardEvent) {
     const target = event.target;
     if (target instanceof HTMLElement && target.closest('input')) return;
 
@@ -126,7 +122,7 @@ export default class TwoUp extends HTMLElement {
       this._relativePosition = this._position / bounds[dimensionAxis];
       this._setPosition();
     }
-  };
+  }
 
   private _resetPosition() {
     // Set the initial position of the handle.

src/client/lazy-app/Compress/Output/index.tsx

@@ -5,7 +5,7 @@ import './custom-els/PinchZoom';
 import './custom-els/TwoUp';
 import * as style from './style.css';
 import 'add-css:./style.css';
-import { shallowEqual } from '../../util';
+import { shallowEqual, drawDataToCanvas } from '../../util';
 import {
   ToggleBackgroundIcon,
   AddIcon,
@@ -18,7 +18,6 @@ import type { PreprocessorState } from '../../feature-meta';
 import { cleanSet } from '../../util/clean-modify';
 import type { SourceImage } from '../../Compress';
 import { linkRef } from 'shared/prerendered-app/util';
-import { drawDataToCanvas } from 'client/lazy-app/util/canvas';
 
 interface Props {
   source?: SourceImage;

src/client/lazy-app/Compress/Results/index.tsx

@@ -110,7 +110,7 @@ export default class Results extends Component<Props, State> {
               <div class={style.percentOutput}>
                 {diff && diff !== 1 && (
                   <span class={style.sizeDirection}>
-                    {diff < 1 ? '↓' : '+'}
+                    {diff < 1 ? '↓' : '↑'}
                   </span>
                 )}
                 <span class={style.sizeValue}>{percent || 0}</span>

src/client/lazy-app/Compress/Results/style.css

@@ -172,8 +172,6 @@
   display: grid;
   grid-template-columns: auto auto auto;
   line-height: 1;
-  font-size: 2.6rem;
-  gap: 0.2rem;
 
   @media (min-width: 600px) {
     background: var(--main-theme-color);
@@ -187,15 +185,19 @@
 }
 
 .size-direction {
+  font-weight: 700;
   align-self: center;
-  font-family: ui-monospace, monospace;
+  font-family: sans-serif;
   opacity: 0.76;
   text-shadow: 0 2px rgba(0, 0, 0, 0.3);
-  font-size: 0.75em;
+  font-size: 1.5rem;
+  position: relative;
+  top: 3px;
 }
 
 .size-value {
   font-family: 'Roboto Mono Numbers';
+  font-size: 2.6rem;
   text-shadow: 0 2px rgba(0, 0, 0, 0.3);
 }
 
@@ -204,7 +206,7 @@
   position: relative;
   top: 4px;
   opacity: 0.76;
-  font-size: 0.5em;
+  margin-left: 0.2rem;
 }
 
 .download {

src/client/lazy-app/Compress/index.tsx

@@ -4,6 +4,7 @@ import * as style from './style.css';
 import 'add-css:./style.css';
 import {
   blobToImg,
+  drawableToImageData,
   blobToText,
   builtinDecode,
   sniffMimeType,
@@ -32,7 +33,6 @@ import WorkerBridge from '../worker-bridge';
 import { resize } from 'features/processors/resize/client';
 import type SnackBarElement from 'shared/custom-els/snack-bar';
 import { generateCliInvocation } from '../util/cli';
-import { drawableToImageData } from '../util/canvas';
 
 export type OutputType = EncoderType | 'identity';
 
@@ -377,7 +377,6 @@ export default class Compress extends Component<Props, State> {
 
   componentWillUnmount(): void {
     updateDocumentTitle({ loading: false });
-    this.widthQuery.removeListener(this.onMobileWidthChange);
     this.mainAbortController.abort();
     for (const controller of this.sideAbortControllers) {
       controller.abort();

src/client/lazy-app/util/canvas.ts

@@ -1,154 +0,0 @@
-/** Replace the contents of a canvas with the given data */
-export function drawDataToCanvas(canvas: HTMLCanvasElement, data: ImageData) {
-  const ctx = canvas.getContext('2d');
-  if (!ctx) throw Error('Canvas not initialized');
-  ctx.clearRect(0, 0, canvas.width, canvas.height);
-  ctx.putImageData(data, 0, 0);
-}
-
-/**
- * Encode some image data in a given format using the browser's encoders
- *
- * @param {ImageData} data
- * @param {string} type A mime type, eg image/jpeg.
- * @param {number} [quality] Between 0-1.
- */
-export async function canvasEncode(
-  data: ImageData,
-  type: string,
-  quality?: number,
-): Promise<Blob> {
-  const canvas = document.createElement('canvas');
-  canvas.width = data.width;
-  canvas.height = data.height;
-  const ctx = canvas.getContext('2d');
-  if (!ctx) throw Error('Canvas not initialized');
-  ctx.putImageData(data, 0, 0);
-
-  let blob: Blob | null;
-
-  if ('toBlob' in canvas) {
-    blob = await new Promise<Blob | null>((r) =>
-      canvas.toBlob(r, type, quality),
-    );
-  } else {
-    // Welcome to Edge.
-    // TypeScript thinks `canvas` is 'never', so it needs casting.
-    const dataUrl = (canvas as HTMLCanvasElement).toDataURL(type, quality);
-    const result = /data:([^;]+);base64,(.*)$/.exec(dataUrl);
-
-    if (!result) throw Error('Data URL reading failed');
-
-    const outputType = result[1];
-    const binaryStr = atob(result[2]);
-    const data = new Uint8Array(binaryStr.length);
-
-    for (let i = 0; i < data.length; i += 1) {
-      data[i] = binaryStr.charCodeAt(i);
-    }
-
-    blob = new Blob([data], { type: outputType });
-  }
-
-  if (!blob) throw Error('Encoding failed');
-  return blob;
-}
-
-interface DrawableToImageDataOptions {
-  width?: number;
-  height?: number;
-  sx?: number;
-  sy?: number;
-  sw?: number;
-  sh?: number;
-}
-
-function getWidth(
-  drawable: ImageBitmap | HTMLImageElement | VideoFrame,
-): number {
-  if ('displayWidth' in drawable) {
-    return drawable.displayWidth;
-  }
-  return drawable.width;
-}
-
-function getHeight(
-  drawable: ImageBitmap | HTMLImageElement | VideoFrame,
-): number {
-  if ('displayHeight' in drawable) {
-    return drawable.displayHeight;
-  }
-  return drawable.height;
-}
-
-export function drawableToImageData(
-  drawable: ImageBitmap | HTMLImageElement | VideoFrame,
-  opts: DrawableToImageDataOptions = {},
-): ImageData {
-  const {
-    width = getWidth(drawable),
-    height = getHeight(drawable),
-    sx = 0,
-    sy = 0,
-    sw = getWidth(drawable),
-    sh = getHeight(drawable),
-  } = opts;
-
-  // Make canvas same size as image
-  const canvas = document.createElement('canvas');
-  canvas.width = width;
-  canvas.height = height;
-  // Draw image onto canvas
-  const ctx = canvas.getContext('2d');
-  if (!ctx) throw new Error('Could not create canvas context');
-  ctx.drawImage(drawable, sx, sy, sw, sh, 0, 0, width, height);
-  return ctx.getImageData(0, 0, width, height);
-}
-
-export type BuiltinResizeMethod = 'pixelated' | 'low' | 'medium' | 'high';
-
-export function builtinResize(
-  data: ImageData,
-  sx: number,
-  sy: number,
-  sw: number,
-  sh: number,
-  dw: number,
-  dh: number,
-  method: BuiltinResizeMethod,
-): ImageData {
-  const canvasSource = document.createElement('canvas');
-  canvasSource.width = data.width;
-  canvasSource.height = data.height;
-  drawDataToCanvas(canvasSource, data);
-
-  const canvasDest = document.createElement('canvas');
-  canvasDest.width = dw;
-  canvasDest.height = dh;
-  const ctx = canvasDest.getContext('2d');
-  if (!ctx) throw new Error('Could not create canvas context');
-
-  if (method === 'pixelated') {
-    ctx.imageSmoothingEnabled = false;
-  } else {
-    ctx.imageSmoothingQuality = method;
-  }
-
-  ctx.drawImage(canvasSource, sx, sy, sw, sh, 0, 0, dw, dh);
-  return ctx.getImageData(0, 0, dw, dh);
-}
-
-/**
- * Test whether <canvas> can encode to a particular type.
- */
-export async function canvasEncodeTest(mimeType: string): Promise<boolean> {
-  try {
-    const blob = await canvasEncode(new ImageData(1, 1), mimeType);
-    // According to the spec, the blob should be null if the format isn't supported…
-    if (!blob) return false;
-    // …but Safari & Firefox fall back to PNG, so we need to check the mime type.
-    return blob.type === mimeType;
-  } catch (err) {
-    return false;
-  }
-}

src/client/lazy-app/util/index.ts

@@ -12,7 +12,6 @@
  */
 
 import * as WebCodecs from '../util/web-codecs';
-import { drawableToImageData } from './canvas';
 
 /**
  * Compare two objects, returning a boolean indicating if
@@ -24,6 +23,62 @@ export function shallowEqual(one: any, two: any) {
   return true;
 }
 
+/** Replace the contents of a canvas with the given data */
+export function drawDataToCanvas(canvas: HTMLCanvasElement, data: ImageData) {
+  const ctx = canvas.getContext('2d');
+  if (!ctx) throw Error('Canvas not initialized');
+  ctx.clearRect(0, 0, canvas.width, canvas.height);
+  ctx.putImageData(data, 0, 0);
+}
+
+/**
+ * Encode some image data in a given format using the browser's encoders
+ *
+ * @param {ImageData} data
+ * @param {string} type A mime type, eg image/jpeg.
+ * @param {number} [quality] Between 0-1.
+ */
+export async function canvasEncode(
+  data: ImageData,
+  type: string,
+  quality?: number,
+): Promise<Blob> {
+  const canvas = document.createElement('canvas');
+  canvas.width = data.width;
+  canvas.height = data.height;
+  const ctx = canvas.getContext('2d');
+  if (!ctx) throw Error('Canvas not initialized');
+  ctx.putImageData(data, 0, 0);
+
+  let blob: Blob | null;
+
+  if ('toBlob' in canvas) {
+    blob = await new Promise<Blob | null>((r) =>
+      canvas.toBlob(r, type, quality),
+    );
+  } else {
+    // Welcome to Edge.
+    // TypeScript thinks `canvas` is 'never', so it needs casting.
+    const dataUrl = (canvas as HTMLCanvasElement).toDataURL(type, quality);
+    const result = /data:([^;]+);base64,(.*)$/.exec(dataUrl);
+
+    if (!result) throw Error('Data URL reading failed');
+
+    const outputType = result[1];
+    const binaryStr = atob(result[2]);
+    const data = new Uint8Array(binaryStr.length);
+
+    for (let i = 0; i < data.length; i += 1) {
+      data[i] = binaryStr.charCodeAt(i);
+    }
+
+    blob = new Blob([data], { type: outputType });
+  }
+
+  if (!blob) throw Error('Encoding failed');
+  return blob;
+}
+
 async function decodeImage(url: string): Promise<HTMLImageElement> {
   const img = new Image();
   img.decoding = 'async';
@@ -95,7 +150,7 @@ const magicNumberMapInput = [
   [/^I I/, 'image/tiff'],
   [/^II*/, 'image/tiff'],
   [/^MM\x00*/, 'image/tiff'],
-  [/^RIFF....WEBPVP8[LX ]/s, 'image/webp'],
+  [/^RIFF....WEBPVP8[LX ]/, 'image/webp'],
   [/^\xF4\xFF\x6F/, 'image/webp2'],
   [/^\x00\x00\x00 ftypavif\x00\x00\x00\x00/, 'image/avif'],
   [/^\xff\x0a/, 'image/jxl'],
@@ -131,6 +186,57 @@ export async function blobToImg(blob: Blob): Promise<HTMLImageElement> {
   }
 }
 
+interface DrawableToImageDataOptions {
+  width?: number;
+  height?: number;
+  sx?: number;
+  sy?: number;
+  sw?: number;
+  sh?: number;
+}
+
+function getWidth(
+  drawable: ImageBitmap | HTMLImageElement | VideoFrame,
+): number {
+  if ('displayWidth' in drawable) {
+    return drawable.displayWidth;
+  }
+  return drawable.width;
+}
+
+function getHeight(
+  drawable: ImageBitmap | HTMLImageElement | VideoFrame,
+): number {
+  if ('displayHeight' in drawable) {
+    return drawable.displayHeight;
+  }
+  return drawable.height;
+}
+
+export function drawableToImageData(
+  drawable: ImageBitmap | HTMLImageElement | VideoFrame,
+  opts: DrawableToImageDataOptions = {},
+): ImageData {
+  const {
+    width = getWidth(drawable),
+    height = getHeight(drawable),
+    sx = 0,
+    sy = 0,
+    sw = getWidth(drawable),
+    sh = getHeight(drawable),
+  } = opts;
+
+  // Make canvas same size as image
+  const canvas = document.createElement('canvas');
+  canvas.width = width;
+  canvas.height = height;
+  // Draw image onto canvas
+  const ctx = canvas.getContext('2d');
+  if (!ctx) throw new Error('Could not create canvas context');
+  ctx.drawImage(drawable, sx, sy, sw, sh, 0, 0, width, height);
+  return ctx.getImageData(0, 0, width, height);
+}
+
 export async function builtinDecode(
   signal: AbortSignal,
   blob: Blob,
@@ -153,6 +259,39 @@ export async function builtinDecode(
   return drawableToImageData(drawable);
 }
 
+export type BuiltinResizeMethod = 'pixelated' | 'low' | 'medium' | 'high';
+
+export function builtinResize(
+  data: ImageData,
+  sx: number,
+  sy: number,
+  sw: number,
+  sh: number,
+  dw: number,
+  dh: number,
+  method: BuiltinResizeMethod,
+): ImageData {
+  const canvasSource = document.createElement('canvas');
+  canvasSource.width = data.width;
+  canvasSource.height = data.height;
+  drawDataToCanvas(canvasSource, data);
+
+  const canvasDest = document.createElement('canvas');
+  canvasDest.width = dw;
+  canvasDest.height = dh;
+  const ctx = canvasDest.getContext('2d');
+  if (!ctx) throw new Error('Could not create canvas context');
+
+  if (method === 'pixelated') {
+    ctx.imageSmoothingEnabled = false;
+  } else {
+    ctx.imageSmoothingQuality = method;
+  }
+
+  ctx.drawImage(canvasSource, sx, sy, sw, sh, 0, 0, dw, dh);
+  return ctx.getImageData(0, 0, dw, dh);
+}
+
 /**
  * @param field An HTMLInputElement, but the casting is done here to tidy up onChange.
  * @param defaultVal Value to return if 'field' doesn't exist.
@@ -295,3 +434,18 @@ export async function abortable<T>(
     }),
   ]);
 }
+
+/**
+ * Test whether <canvas> can encode to a particular type.
+ */
+export async function canvasEncodeTest(mimeType: string): Promise<boolean> {
+  try {
+    const blob = await canvasEncode(new ImageData(1, 1), mimeType);
+    // According to the spec, the blob should be null if the format isn't supported…
+    if (!blob) return false;
+    // …but Safari & Firefox fall back to PNG, so we need to check the mime type.
+    return blob.type === mimeType;
+  } catch (err) {
+    return false;
+  }
+}

src/client/lazy-app/util/web-codecs/index.ts

@@ -1,19 +1,12 @@
-import { drawableToImageData } from '../canvas';
+import { drawableToImageData } from 'client/lazy-app/util';
 
 const hasImageDecoder = typeof ImageDecoder !== 'undefined';
-
 export async function isTypeSupported(mimeType: string): Promise<boolean> {
-  if (!hasImageDecoder) return false;
-  // Some old versions of this API threw here.
-  // It only impacted folks with experimental web platform flags enabled in Chrome 90.
-  // The API was updated in Chrome 91.
-  try {
-    return await ImageDecoder.isTypeSupported(mimeType);
-  } catch (err) {
+  if (!hasImageDecoder) {
     return false;
   }
+  return ImageDecoder.isTypeSupported(mimeType);
 }
-
 export async function decode(
   blob: Blob | File,
   mimeType: string,

src/features/encoders/browserGIF/client/index.ts

@@ -1,4 +1,4 @@
-import { canvasEncodeTest, canvasEncode } from 'client/lazy-app/util/canvas';
+import { canvasEncodeTest, canvasEncode } from 'client/lazy-app/util';
 import WorkerBridge from 'client/lazy-app/worker-bridge';
 import { EncodeOptions, mimeType } from '../shared/meta';
 

src/features/encoders/browserJPEG/client/index.ts

@@ -1,4 +1,4 @@
-import { canvasEncode } from 'client/lazy-app/util/canvas';
+import { canvasEncode } from 'client/lazy-app/util';
 import WorkerBridge from 'client/lazy-app/worker-bridge';
 import { qualityOption } from 'features/client-utils';
 import { mimeType, EncodeOptions } from '../shared/meta';