Make emscripten with threads compile

.babelrc

@@ -0,0 +1,13 @@
+{
+  "plugins": [
+    "transform-class-properties",
+    "transform-react-constant-elements",
+    "transform-react-remove-prop-types",
+    [
+      "transform-react-jsx",
+      {
+        "pragma": "h"
+      }
+    ]
+  ]
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Something is not working as expected
-labels: 
-
----
-
-**Before you start**
-Please take a look at the [FAQ](https://github.com/GoogleChromeLabs/squoosh/wiki/FAQ) as well as the already opened issues! If nothing fits your problem, go ahead and fill out the following template:
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Version:**
- - OS w/ version: [e.g. iOS 12]
- - Browser w/ version [e.g. Chrome 70]
- - Node version: [e.g. 10.11.0]
- - npm version: [e.g. 6.4.1]
-
-**Is your issue related to the quality of image compression?**
-Please attach original and output images (you can drag & drop to attach). 
-- Original image 
-- Output image from Squoosh
-
-**Additional context, screenshots, screencasts**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,18 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-labels: 
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Does other service/app have this feature?**
-Add any service you know/use that has this feature (We want to know for research)
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.nvmrc

@@ -1 +0,0 @@
-10.15.3

.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
+node_js:
+- node
 cache: npm
-script: npm run build
+script: npm run build || npm run build # scss ts definitions need to be generated before an actual build
-after_success: npm run sizereport

README.md

@@ -1,31 +1,5 @@
-# [Squoosh]!
+# Squoosh!
 
-[Squoosh] is an image compression web app that allows you to dive into the advanced options provided
+Squoosh will be an image compression web app that allows you to dive into the
-by various image compressors.
+advanced options provided by various image compressors.
 
-# Privacy
-
-Google Analytics is used to record the following:
-
-* [Basic visit data](https://support.google.com/analytics/answer/6004245?ref_topic=2919631).
-* Before and after image size once an image is downloaded. These values are rounded to the nearest
-  kilobyte.
-
-Image compression is handled locally; no additional data is sent to the server.
-
-# Building locally
-
-Clone the repo, and:
-
-```sh
-npm install
-npm run build
-```
-
-You can run the development server with:
-
-```sh
-npm start
-```
-
-[Squoosh]: https://squoosh.app

_headers.ejs

@@ -1,22 +0,0 @@
-# Long-term cache by default.
-/*
-  Cache-Control: max-age=31536000
-  Access-Control-Allow-Origin: *
-
-# And here are the exceptions:
-/
-  Cache-Control: no-cache
-
-/serviceworker.js
-  Cache-Control: no-cache
-
-/sdk.mjs
-  Cache-Control: no-cache
-
-/manifest.json
-  Cache-Control: must-revalidate, max-age=3600
-
-# URLs in /assets do not include a hash and are mutable.
-# But it isn't a big deal if the user gets an old version.
-/assets/*
-  Cache-Control: must-revalidate, max-age=3600

_redirects.ejs

@@ -1,2 +0,0 @@
-/index.html / 301
-/* /index.html 301

codecs/README.md

@@ -11,6 +11,6 @@ $ npm install
 $ npm run build
 ```
 
-This will build two files: `<codec name>_<enc or dec>.js` and `<codec name>_<enc or dec>.wasm`. It will most likely be necessary to set [`Module["locateFile"]`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html#affecting-execution) to successfully load the `.wasm` file. When the `.js` file is loaded, a global `<codec name>_<enc or dec>` is created with the same API as an [Emscripten `Module`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html).
+This will build two files: `<codec name>_<enc or dec>.js` and `<codec name>_<enc or dec>.wasm`. It will most likely be necessary to set [`Module["locateFile"]`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html#affecting-execution) to sucessfully load the `.wasm` file. When the `.js` file is loaded, a global `<codec name>_<enc or dec>` is created with the same API as an [Emscripten `Module`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html).
 
 Each codec will document its API in its README.

codecs/imagequant/package.json

@@ -8,6 +8,6 @@
     "libimagequant": "ImageOptim/libimagequant#2.12.1"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/mozjpeg_enc/README.md

@@ -39,9 +39,5 @@ struct MozJpegOptions {
   bool trellis_opt_zero;
   bool trellis_opt_table;
   int trellis_loops;
-  bool auto_subsample;
-  int chroma_subsample;
-  bool separate_chroma_quality;
-  int chroma_quality;
 };
 ```

codecs/mozjpeg_enc/example.html

@@ -21,7 +21,7 @@
     console.log('Version:', module.version().toString(16));
     const image = await loadImage('../example.png');
     const result = module.encode(image.data, image.width, image.height, {
-      quality: 75,
+      quality: 40,
       baseline: false,
       arithmetic: false,
       progressive: true,
@@ -29,14 +29,10 @@
       smoothing: 0,
       color_space: 3,
       quant_table: 3,
-      trellis_multipass: false,
+      trellis_multipass: true,
-      trellis_opt_zero: false,
+      trellis_opt_zero: true,
-      trellis_opt_table: false,
+      trellis_opt_table: true,
       trellis_loops: 1,
-      auto_subsample: true,
-      chroma_subsample: 2,
-      separate_chroma_quality: false,
-      chroma_quality: 75,
     });
 
     const blob = new Blob([result], {type: 'image/jpeg'});

codecs/mozjpeg_enc/mozjpeg_enc.cpp

@@ -29,10 +29,6 @@ struct MozJpegOptions {
   bool trellis_opt_zero;
   bool trellis_opt_table;
   int trellis_loops;
-  bool auto_subsample;
-  int chroma_subsample;
-  bool separate_chroma_quality;
-  int chroma_quality;
 };
 
 int version() {
@@ -123,6 +119,9 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
    */
   jpeg_set_defaults(&cinfo);
 
+  /* Now you can set any non-default parameters you wish to.
+   * Here we just illustrate the use of quality (quantization table) scaling:
+   */
   jpeg_set_colorspace(&cinfo, (J_COLOR_SPACE) opts.color_space);
 
   if (opts.quant_table != -1) {
@@ -143,23 +142,11 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
   jpeg_c_set_bool_param(&cinfo, JBOOLEAN_TRELLIS_Q_OPT, opts.trellis_opt_table);
   jpeg_c_set_int_param(&cinfo, JINT_TRELLIS_NUM_LOOPS, opts.trellis_loops);
 
-  // A little hacky to build a string for this, but it means we can use set_quality_ratings which
-  // does some useful heuristic stuff.
   std::string quality_str = std::to_string(opts.quality);
-
-  if (opts.separate_chroma_quality && opts.color_space == JCS_YCbCr) {
-    quality_str += "," + std::to_string(opts.chroma_quality);
-  }
-
   char const *pqual = quality_str.c_str();
 
   set_quality_ratings(&cinfo, (char*) pqual, opts.baseline);
 
-  if (!opts.auto_subsample && opts.color_space == JCS_YCbCr) {
-    cinfo.comp_info[0].h_samp_factor = opts.chroma_subsample;
-    cinfo.comp_info[0].v_samp_factor = opts.chroma_subsample;
-  }
-
   if (!opts.baseline && opts.progressive) {
     jpeg_simple_progression(&cinfo);
   } else {
@@ -222,10 +209,6 @@ EMSCRIPTEN_BINDINGS(my_module) {
     .field("trellis_opt_zero", &MozJpegOptions::trellis_opt_zero)
     .field("trellis_opt_table", &MozJpegOptions::trellis_opt_table)
     .field("trellis_loops", &MozJpegOptions::trellis_loops)
-    .field("chroma_subsample", &MozJpegOptions::chroma_subsample)
-    .field("auto_subsample", &MozJpegOptions::auto_subsample)
-    .field("separate_chroma_quality", &MozJpegOptions::separate_chroma_quality)
-    .field("chroma_quality", &MozJpegOptions::chroma_quality)
     ;
 
   function("version", &version);

codecs/mozjpeg_enc/package.json

@@ -8,6 +8,6 @@
     "mozjpeg": "mozilla/mozjpeg#v3.3.1"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/optipng/README.md

@@ -1,6 +1,6 @@
 # OptiPNG
 
-- Source: <http://optipng.sourceforge.net/>
+- Source: <https://sourceforge.net/project/optipng>
 - Version: v0.7.7
 
 ## Dependencies

codecs/optipng/package.json

@@ -16,7 +16,7 @@
     "zlib": "emscripten-ports/zlib"
   },
   "dependencies": {
-    "napa": "3.0.0",
+    "napa": "^3.0.0",
     "tar-dependency": "0.0.3"
   }
 }

codecs/resize/.gitignore

@@ -1,6 +0,0 @@
-**/*.rs.bk
-target
-Cargo.lock
-bin/
-pkg/README.md
-lut.inc

codecs/resize/Cargo.toml

@@ -1,37 +0,0 @@
-[package]
-name = "squooshresize"
-version = "0.1.0"
-authors = ["Surma <surma@surma.link>"]
-
-[lib]
-#crate-type = ["cdylib", "rlib"]
-crate-type = ["cdylib"]
-
-[features]
-default = ["console_error_panic_hook", "wee_alloc"]
-
-[dependencies]
-cfg-if = "0.1.2"
-wasm-bindgen = "0.2.38"
-resize = "0.3.0"
-
-# The `console_error_panic_hook` crate provides better debugging of panics by
-# logging them with `console.error`. This is great for development, but requires
-# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
-# code size when deploying.
-console_error_panic_hook = { version = "0.1.1", optional = true }
-
-# `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
-# compared to the default allocator's ~10K. It is slower than the default
-# allocator, however.
-#
-# Unfortunately, `wee_alloc` requires nightly Rust when targeting wasm for now.
-wee_alloc = { version = "0.4.2", optional = true }
-
-[dev-dependencies]
-wasm-bindgen-test = "0.2"
-
-[profile.release]
-# Tell `rustc` to optimize for small code size.
-opt-level = "s"
-lto = true

codecs/resize/Dockerfile

@@ -1,18 +0,0 @@
-FROM ubuntu
-RUN apt-get update && \
-  apt-get install -qqy git build-essential cmake python2.7
-RUN git clone --recursive https://github.com/WebAssembly/wabt /usr/src/wabt
-RUN mkdir -p /usr/src/wabt/build
-WORKDIR /usr/src/wabt/build
-RUN cmake .. -DCMAKE_INSTALL_PREFIX=/opt/wabt && \
-  make && \
-  make install
-
-FROM rust
-RUN rustup install nightly && \
-  rustup target add --toolchain nightly wasm32-unknown-unknown && \
-  cargo install wasm-pack
-
-COPY --from=0 /opt/wabt /opt/wabt
-ENV PATH="/opt/wabt/bin:${PATH}"
-WORKDIR /src

codecs/resize/benchmark.js

@@ -1,53 +0,0 @@
-// THIS IS NOT A NODE SCRIPT
-// This is a d8 script. Please install jsvu[1] and install v8.
-// Then run `npm run --silent benchmark`.
-// [1]: https://github.com/GoogleChromeLabs/jsvu
-
-self = global = this;
-load("./pkg/resize.js");
-
-async function init() {
-  //  Adjustable constants.
-  const inputDimensions = 2000;
-  const outputDimensions = 1500;
-  const algorithm = 3; // Lanczos
-  const iterations = new Array(100);
-
-  // Constants. Don’t change.
-  const imageByteSize = inputDimensions * inputDimensions * 4;
-  const imageBuffer = new Uint8ClampedArray(imageByteSize);
-
-  const module = await WebAssembly.compile(readbuffer("./pkg/resize_bg.wasm"));
-  await wasm_bindgen(module);
-  [[false, false], [true, false], [false, true], [true, true]].forEach(
-    opts => {
-      print(`\npremultiplication: ${opts[0]}`);
-      print(`color space conversion: ${opts[1]}`);
-      print(`==============================`);
-      for (let i = 0; i < 100; i++) {
-        const start = Date.now();
-        wasm_bindgen.resize(
-          imageBuffer,
-          inputDimensions,
-          inputDimensions,
-          outputDimensions,
-          outputDimensions,
-          algorithm,
-          ...opts
-        );
-        iterations[i] = Date.now() - start;
-      }
-      const average =
-        iterations.reduce((sum, c) => sum + c) / iterations.length;
-      const stddev = Math.sqrt(
-        iterations
-          .map(i => Math.pow(i - average, 2))
-          .reduce((sum, c) => sum + c) / iterations.length
-      );
-      print(`n = ${iterations.length}`);
-      print(`Average: ${average}`);
-      print(`StdDev: ${stddev}`);
-    }
-  );
-}
-init().catch(e => console.error(e, e.stack));

codecs/resize/build.rs

@@ -1,23 +0,0 @@
-include!("./src/srgb.rs");
-
-use std::io::Write;
-
-fn main() -> std::io::Result<()> {
-    let mut srgb_to_linear_lut = String::from("static SRGB_TO_LINEAR_LUT: [f32; 256] = [");
-    let mut linear_to_srgb_lut = String::from("static LINEAR_TO_SRGB_LUT: [f32; 256] = [");
-    for i in 0..256 {
-        srgb_to_linear_lut.push_str(&format!("{0:.7}", srgb_to_linear((i as f32) / 255.0)));
-        srgb_to_linear_lut.push_str(",");
-        linear_to_srgb_lut.push_str(&format!("{0:.7}", linear_to_srgb((i as f32) / 255.0)));
-        linear_to_srgb_lut.push_str(",");
-    }
-    srgb_to_linear_lut.pop().unwrap();
-    linear_to_srgb_lut.pop().unwrap();
-    srgb_to_linear_lut.push_str("];");
-    linear_to_srgb_lut.push_str("];");
-
-    let mut file = std::fs::File::create("src/lut.inc")?;
-    file.write_all(srgb_to_linear_lut.as_bytes())?;
-    file.write_all(linear_to_srgb_lut.as_bytes())?;
-    Ok(())
-}

codecs/resize/build.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "============================================="
-echo "Compiling wasm"
-echo "============================================="
-(
-  rustup run nightly \
-    wasm-pack build --target no-modules
-  wasm-strip pkg/resize_bg.wasm
-)
-echo "============================================="
-echo "Compiling wasm  done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull ubuntu\`"
-echo "Run \`docker pull rust\`"
-echo "Run \`docker build -t squoosh-resize .\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/resize/package-lock.json

@@ -1,4 +0,0 @@
-{
-  "name": "resize",
-  "lockfileVersion": 1
-}

codecs/resize/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "resize",
-  "scripts": {
-    "build:image": "docker build -t squoosh-resize .",
-    "build": "docker run --rm -v $(pwd):/src squoosh-resize ./build.sh",
-    "benchmark": "v8 --no-liftoff --no-wasm-tier-up ./benchmark.js"
-  }
-}

codecs/resize/pkg/resize.d.ts

@@ -1,13 +0,0 @@
-/* tslint:disable */
-/**
-* @param {Uint8Array} arg0 
-* @param {number} arg1 
-* @param {number} arg2 
-* @param {number} arg3 
-* @param {number} arg4 
-* @param {number} arg5 
-* @param {boolean} arg6 
-* @param {boolean} arg7 
-* @returns {Uint8Array} 
-*/
-export function resize(arg0: Uint8Array, arg1: number, arg2: number, arg3: number, arg4: number, arg5: number, arg6: boolean, arg7: boolean): Uint8Array;

codecs/resize/pkg/resize.js

@@ -1,114 +0,0 @@
-(function() {
-    var wasm;
-    const __exports = {};
-
-
-    let cachegetUint8Memory = null;
-    function getUint8Memory() {
-        if (cachegetUint8Memory === null || cachegetUint8Memory.buffer !== wasm.memory.buffer) {
-            cachegetUint8Memory = new Uint8Array(wasm.memory.buffer);
-        }
-        return cachegetUint8Memory;
-    }
-
-    let WASM_VECTOR_LEN = 0;
-
-    function passArray8ToWasm(arg) {
-        const ptr = wasm.__wbindgen_malloc(arg.length * 1);
-        getUint8Memory().set(arg, ptr / 1);
-        WASM_VECTOR_LEN = arg.length;
-        return ptr;
-    }
-
-    function getArrayU8FromWasm(ptr, len) {
-        return getUint8Memory().subarray(ptr / 1, ptr / 1 + len);
-    }
-
-    let cachedGlobalArgumentPtr = null;
-    function globalArgumentPtr() {
-        if (cachedGlobalArgumentPtr === null) {
-            cachedGlobalArgumentPtr = wasm.__wbindgen_global_argument_ptr();
-        }
-        return cachedGlobalArgumentPtr;
-    }
-
-    let cachegetUint32Memory = null;
-    function getUint32Memory() {
-        if (cachegetUint32Memory === null || cachegetUint32Memory.buffer !== wasm.memory.buffer) {
-            cachegetUint32Memory = new Uint32Array(wasm.memory.buffer);
-        }
-        return cachegetUint32Memory;
-    }
-    /**
-    * @param {Uint8Array} arg0
-    * @param {number} arg1
-    * @param {number} arg2
-    * @param {number} arg3
-    * @param {number} arg4
-    * @param {number} arg5
-    * @param {boolean} arg6
-    * @param {boolean} arg7
-    * @returns {Uint8Array}
-    */
-    __exports.resize = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
-        const ptr0 = passArray8ToWasm(arg0);
-        const len0 = WASM_VECTOR_LEN;
-        const retptr = globalArgumentPtr();
-        wasm.resize(retptr, ptr0, len0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-        const mem = getUint32Memory();
-        const rustptr = mem[retptr / 4];
-        const rustlen = mem[retptr / 4 + 1];
-
-        const realRet = getArrayU8FromWasm(rustptr, rustlen).slice();
-        wasm.__wbindgen_free(rustptr, rustlen * 1);
-        return realRet;
-
-    };
-
-    const heap = new Array(32);
-
-    heap.fill(undefined);
-
-    heap.push(undefined, null, true, false);
-
-    let heap_next = heap.length;
-
-    function dropObject(idx) {
-        if (idx < 36) return;
-        heap[idx] = heap_next;
-        heap_next = idx;
-    }
-
-    __exports.__wbindgen_object_drop_ref = function(i) { dropObject(i); };
-
-    function init(path_or_module) {
-        let instantiation;
-        const imports = { './resize': __exports };
-        if (path_or_module instanceof WebAssembly.Module) {
-            instantiation = WebAssembly.instantiate(path_or_module, imports)
-            .then(instance => {
-            return { instance, module: path_or_module }
-        });
-    } else {
-        const data = fetch(path_or_module);
-        if (typeof WebAssembly.instantiateStreaming === 'function') {
-            instantiation = WebAssembly.instantiateStreaming(data, imports)
-            .catch(e => {
-                console.warn("`WebAssembly.instantiateStreaming` failed. Assuming this is because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
-                return data
-                .then(r => r.arrayBuffer())
-                .then(bytes => WebAssembly.instantiate(bytes, imports));
-            });
-        } else {
-            instantiation = data
-            .then(response => response.arrayBuffer())
-            .then(buffer => WebAssembly.instantiate(buffer, imports));
-        }
-    }
-    return instantiation.then(({instance}) => {
-        wasm = init.wasm = instance.exports;
-
-    });
-};
-self.wasm_bindgen = Object.assign(init, __exports);
-})();

codecs/resize/pkg/resize_bg.d.ts

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

codecs/resize/src/lib.rs

@@ -1,121 +0,0 @@
-extern crate cfg_if;
-extern crate resize;
-extern crate wasm_bindgen;
-
-mod utils;
-
-use cfg_if::cfg_if;
-use resize::Pixel::RGBA;
-use resize::Type;
-use wasm_bindgen::prelude::*;
-
-mod srgb;
-use srgb::Clamp;
-
-cfg_if! {
-    // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
-    // allocator.
-    if #[cfg(feature = "wee_alloc")] {
-        extern crate wee_alloc;
-        #[global_allocator]
-        static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-    }
-}
-
-include!("./lut.inc");
-
-// If `with_space_conversion` is true, this function returns 2 functions that
-// convert from sRGB to linear RGB and vice versa. If `with_space_conversion` is
-// false, the 2 functions returned do nothing.
-fn converter_funcs(with_space_conversion: bool) -> ((fn(u8) -> f32), (fn(f32) -> u8)) {
-    if with_space_conversion {
-        (
-            |v| SRGB_TO_LINEAR_LUT[v as usize] * 255.0,
-            |v| (LINEAR_TO_SRGB_LUT[v as usize] * 255.0) as u8,
-        )
-    } else {
-        (|v| v as f32, |v| v as u8)
-    }
-}
-
-// If `with_alpha_premultiplication` is true, this function returns a function
-// that premultiply the alpha channel with the given channel value and another
-// function that reverses that process. If `with_alpha_premultiplication` is
-// false, the functions just return the channel value.
-fn alpha_multiplier_funcs(
-    with_alpha_premultiplication: bool,
-) -> ((fn(f32, u8) -> u8), (fn(u8, u8) -> f32)) {
-    if with_alpha_premultiplication {
-        (
-            |v, a| (v * (a as f32) / 255.0) as u8,
-            |v, a| (v as f32) * 255.0 / (a as f32).clamp(0.0, 255.0),
-        )
-    } else {
-        (|v, _a| v as u8, |v, _a| v as f32)
-    }
-}
-
-#[wasm_bindgen]
-#[no_mangle]
-pub fn resize(
-    mut input_image: Vec<u8>,
-    input_width: usize,
-    input_height: usize,
-    output_width: usize,
-    output_height: usize,
-    typ_idx: usize,
-    premultiply: bool,
-    color_space_conversion: bool,
-) -> Vec<u8> {
-    let typ = match typ_idx {
-        0 => Type::Triangle,
-        1 => Type::Catrom,
-        2 => Type::Mitchell,
-        3 => Type::Lanczos3,
-        _ => panic!("Nope"),
-    };
-    let num_input_pixels = input_width * input_height;
-    let num_output_pixels = output_width * output_height;
-
-    let (to_linear, to_color_space) = converter_funcs(color_space_conversion);
-    let (premultiplier, demultiplier) = alpha_multiplier_funcs(premultiply);
-
-    // If both options are false, there is no preprocessing on the pixel valus
-    // and we can skip the loop.
-    if premultiply || color_space_conversion {
-        for i in 0..num_input_pixels {
-            for j in 0..3 {
-                input_image[4 * i + j] =
-                    premultiplier(to_linear(input_image[4 * i + j]), input_image[4 * i + 3]);
-            }
-        }
-    }
-
-    let mut resizer = resize::new(
-        input_width,
-        input_height,
-        output_width,
-        output_height,
-        RGBA,
-        typ,
-    );
-    let mut output_image = Vec::<u8>::with_capacity(num_output_pixels * 4);
-    output_image.resize(num_output_pixels * 4, 0);
-    resizer.resize(input_image.as_slice(), output_image.as_mut_slice());
-
-    if premultiply || color_space_conversion {
-        for i in 0..num_output_pixels {
-            for j in 0..3 {
-                // We don’t need to worry about division by zero, as division by zero
-                // is well-defined on floats to return ±Inf. ±Inf is converted to 0
-                // when casting to integers.
-                output_image[4 * i + j] = to_color_space(demultiplier(
-                    output_image[4 * i + j],
-                    output_image[4 * i + 3],
-                ));
-            }
-        }
-    }
-
-    return output_image;
-}

codecs/resize/src/srgb.rs

@@ -1,29 +0,0 @@
-pub trait Clamp: std::cmp::PartialOrd + Sized {
-    fn clamp(self, min: Self, max: Self) -> Self {
-        if self.lt(&min) {
-            min
-        } else if self.gt(&max) {
-            max
-        } else {
-            self
-        }
-    }
-}
-
-impl Clamp for f32 {}
-
-pub fn srgb_to_linear(v: f32) -> f32 {
-    if v < 0.04045 {
-        v / 12.92
-    } else {
-        ((v + 0.055) / 1.055).powf(2.4).clamp(0.0, 1.0)
-    }
-}
-
-pub fn linear_to_srgb(v: f32) -> f32 {
-    if v < 0.0031308 {
-        v * 12.92
-    } else {
-        (1.055 * v.powf(1.0 / 2.4) - 0.055).clamp(0.0, 1.0)
-    }
-}

codecs/resize/src/utils.rs

@@ -1,17 +0,0 @@
-use cfg_if::cfg_if;
-
-cfg_if! {
-    // When the `console_error_panic_hook` feature is enabled, we can call the
-    // `set_panic_hook` function at least once during initialization, and then
-    // we will get better error messages if our code ever panics.
-    //
-    // For more details see
-    // https://github.com/rustwasm/console_error_panic_hook#readme
-    if #[cfg(feature = "console_error_panic_hook")] {
-        extern crate console_error_panic_hook;
-        pub use self::console_error_panic_hook::set_once as set_panic_hook;
-    } else {
-        #[inline]
-        pub fn set_panic_hook() {}
-    }
-}

codecs/rotate/.gitignore

@@ -1,2 +0,0 @@
-target
-Cargo.lock

codecs/rotate/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "rotate"
-version = "0.1.0"
-authors = ["Surma <surma@google.com>"]
-edition = "2018"
-
-[lib]
-name = "rotate"
-path = "rotate.rs"
-crate-type = ["cdylib", "rlib"]
-
-[profile.release]
-lto = true
-opt-level = "s"

codecs/rotate/Dockerfile

@@ -1,17 +0,0 @@
-FROM ubuntu
-RUN apt-get update && \
-  apt-get install -qqy git build-essential cmake python2.7
-RUN git clone --recursive https://github.com/WebAssembly/wabt /usr/src/wabt
-RUN mkdir -p /usr/src/wabt/build
-WORKDIR /usr/src/wabt/build
-RUN cmake .. -DCMAKE_INSTALL_PREFIX=/opt/wabt && \
-  make && \
-  make install
-
-FROM rust
-RUN rustup install nightly && \
-  rustup target add --toolchain nightly wasm32-unknown-unknown
-
-COPY --from=0 /opt/wabt /opt/wabt
-ENV PATH="/opt/wabt/bin:${PATH}"
-WORKDIR /src

codecs/rotate/benchmark.js

@@ -1,45 +0,0 @@
-// THIS IS NOT A NODE SCRIPT
-// This is a d8 script. Please install jsvu[1] and install v8.
-// Then run `npm run --silent benchmark`.
-// [1]: https://github.com/GoogleChromeLabs/jsvu
-async function init() {
-  //  Adjustable constants.
-  const imageDimensions = 4096;
-  const iterations = new Array(100);
-
-  // Constants. Don’t change.
-  const imageByteSize = imageDimensions * imageDimensions * 4;
-  const wasmPageSize = 64 * 1024;
-
-  const buffer = readbuffer("rotate.wasm");
-  const { instance } = await WebAssembly.instantiate(buffer);
-
-  const pagesAvailable = Math.floor(
-    instance.exports.memory.buffer.byteLength / wasmPageSize
-  );
-  const pagesNeeded = Math.floor((imageByteSize * 2 + 4) / wasmPageSize) + 1;
-  const additionalPagesNeeded = pagesNeeded - pagesAvailable;
-  if (additionalPagesNeeded > 0) {
-    instance.exports.memory.grow(additionalPagesNeeded);
-  }
-
-  [0, 90, 180, 270].forEach(rotation => {
-    print(`\n${rotation} degrees`);
-    print(`==============================`);
-    for (let i = 0; i < 100; i++) {
-      const start = Date.now();
-      instance.exports.rotate(imageDimensions, imageDimensions, rotation);
-      iterations[i] = Date.now() - start;
-    }
-    const average = iterations.reduce((sum, c) => sum + c) / iterations.length;
-    const stddev = Math.sqrt(
-      iterations
-        .map(i => Math.pow(i - average, 2))
-        .reduce((sum, c) => sum + c) / iterations.length
-    );
-    print(`n = ${iterations.length}`);
-    print(`Average: ${average}`);
-    print(`StdDev: ${stddev}`);
-  });
-}
-init().catch(e => console.error(e.stack));

codecs/rotate/build.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "============================================="
-echo "Compiling wasm"
-echo "============================================="
-(
-  rustup run nightly \
-    cargo build \
-    --target wasm32-unknown-unknown \
-    --release
-  cp target/wasm32-unknown-unknown/release/rotate.wasm .
-  wasm-strip rotate.wasm
-)
-echo "============================================="
-echo "Compiling wasm  done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull ubuntu\`"
-echo "Run \`docker pull rust\`"
-echo "Run \`docker build -t squoosh-rotate .\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/rotate/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "rotate",
-  "scripts": {
-    "build:image": "docker build -t squoosh-rotate .",
-    "build": "docker run --rm -v $(pwd):/src squoosh-rotate ./build.sh",
-    "benchmark": "echo File size after gzip && npm run benchmark:filesize && echo Optimizing && npm run -s benchmark:optimizing",
-    "benchmark:baseline": "v8 --liftoff --no-wasm-tier-up --no-opt ./benchmark.js",
-    "benchmark:optimizing": "v8 --no-liftoff --no-wasm-tier-up ./benchmark.js",
-    "benchmark:filesize": "cat rotate.wasm | gzip -c9n | wc -c"
-  }
-}

codecs/rotate/rotate.rs

@@ -1,113 +0,0 @@
-use std::slice::{from_raw_parts, from_raw_parts_mut};
-
-// This function is taken from Zachary Dremann
-// https://github.com/GoogleChromeLabs/squoosh/pull/462
-trait HardUnwrap<T> {
-    fn unwrap_hard(self) -> T;
-}
-
-impl<T> HardUnwrap<T> for Option<T> {
-    #[cfg(not(debug_assertions))]
-    #[inline]
-    fn unwrap_hard(self) -> T {
-        match self {
-            Some(t) => t,
-            None => std::process::abort(),
-        }
-    }
-
-    #[cfg(debug_assertions)]
-    fn unwrap_hard(self) -> T {
-        self.unwrap()
-    }
-}
-
-const TILE_SIZE: usize = 16;
-
-fn get_buffers<'a>(width: usize, height: usize) -> (&'a [u32], &'a mut [u32]) {
-    let num_pixels = width * height;
-    let in_b: &[u32];
-    let out_b: &mut [u32];
-    unsafe {
-        in_b = from_raw_parts::<u32>(8 as *const u32, num_pixels);
-        out_b = from_raw_parts_mut::<u32>((num_pixels * 4 + 8) as *mut u32, num_pixels);
-    }
-    return (in_b, out_b);
-}
-
-#[inline(never)]
-fn rotate_0(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    for (in_p, out_p) in in_b.iter().zip(out_b.iter_mut()) {
-        *out_p = *in_p;
-    }
-}
-
-#[inline(never)]
-fn rotate_90(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    let new_width = height;
-    let _new_height = width;
-    for y_start in (0..height).step_by(TILE_SIZE) {
-        for x_start in (0..width).step_by(TILE_SIZE) {
-            for y in y_start..(y_start + TILE_SIZE).min(height) {
-                let in_offset = y * width;
-                let in_bounds = if x_start + TILE_SIZE < width {
-                    (in_offset + x_start)..(in_offset + x_start + TILE_SIZE)
-                } else {
-                    (in_offset + x_start)..(in_offset + width)
-                };
-                let in_chunk = in_b.get(in_bounds).unwrap_hard();
-                for (x, in_p) in in_chunk.iter().enumerate() {
-                    let new_x = (new_width - 1) - y;
-                    let new_y = x + x_start;
-                    *out_b.get_mut(new_y * new_width + new_x).unwrap_hard() = *in_p;
-                }
-            }
-        }
-    }
-}
-
-#[inline(never)]
-fn rotate_180(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    for (in_p, out_p) in in_b.iter().zip(out_b.iter_mut().rev()) {
-        *out_p = *in_p;
-    }
-}
-
-#[inline(never)]
-fn rotate_270(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    let new_width = height;
-    let new_height = width;
-    for y_start in (0..height).step_by(TILE_SIZE) {
-        for x_start in (0..width).step_by(TILE_SIZE) {
-            for y in y_start..(y_start + TILE_SIZE).min(height) {
-                let in_offset = y * width;
-                let in_bounds = if x_start + TILE_SIZE < width {
-                    (in_offset + x_start)..(in_offset + x_start + TILE_SIZE)
-                } else {
-                    (in_offset + x_start)..(in_offset + width)
-                };
-                let in_chunk = in_b.get(in_bounds).unwrap_hard();
-                for (x, in_p) in in_chunk.iter().enumerate() {
-                    let new_x = y;
-                    let new_y = new_height - 1 - (x_start + x);
-                    *out_b.get_mut(new_y * new_width + new_x).unwrap_hard() = *in_p;
-                }
-            }
-        }
-    }
-}
-
-#[no_mangle]
-fn rotate(width: usize, height: usize, rotate: usize) {
-    match rotate {
-        0 => rotate_0(width, height),
-        90 => rotate_90(width, height),
-        180 => rotate_180(width, height),
-        270 => rotate_270(width, height),
-        _ => std::process::abort(),
-    }
-}

codecs/webp_dec/README.md

@@ -1,7 +1,7 @@
 # WebP decoder
 
 - Source: <https://github.com/webmproject/libwebp>
-- Version: v1.0.2
+- Version: v0.6.1
 
 ## Example
 

codecs/webp_dec/build.sh

@@ -6,33 +6,7 @@ export OPTIMIZE="-Os"
 export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"
 export CPPFLAGS="${OPTIMIZE}"
-apt-get update
-apt-get install -qqy autoconf libtool libpng-dev pkg-config
 
-echo "============================================="
-echo "Compiling libwebp"
-echo "============================================="
-test -n "$SKIP_LIBWEBP" || (
-  cd node_modules/libwebp
-  autoreconf -fiv
-  rm -rf build || true
-  mkdir -p build && cd build
-  emconfigure ../configure \
-    --disable-libwebpdemux \
-    --disable-wic \
-    --disable-gif \
-    --disable-tiff \
-    --disable-jpeg \
-    --disable-png \
-    --disable-sdl \
-    --disable-gl \
-    --disable-threading \
-    --disable-neon-rtcd \
-    --disable-neon \
-    --disable-sse2 \
-    --disable-sse4.1
-  emmake make
-)
 echo "============================================="
 echo "Compiling wasm bindings"
 echo "============================================="
@@ -46,9 +20,9 @@ echo "============================================="
     --std=c++11 \
     -I node_modules/libwebp \
     -o ./webp_dec.js \
+    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
     -x c++ \
-    webp_dec.cpp \
+    webp_dec.cpp
-    node_modules/libwebp/build/src/.libs/libwebp.a
 )
 echo "============================================="
 echo "Compiling wasm bindings done"

codecs/webp_dec/package.json

@@ -5,9 +5,9 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v1.0.2"
+    "libwebp": "webmproject/libwebp#v1.0.0"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/webp_enc/README.md

@@ -1,7 +1,7 @@
 # WebP encoder
 
 - Source: <https://github.com/webmproject/libwebp>
-- Version: v1.0.2
+- Version: v0.6.1
 
 ## Dependencies
 

codecs/webp_enc/build.sh

@@ -7,33 +7,6 @@ export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"
 export CPPFLAGS="${OPTIMIZE}"
 
-apt-get update
-apt-get install -qqy autoconf libtool libpng-dev pkg-config
-
-echo "============================================="
-echo "Compiling libwebp"
-echo "============================================="
-test -n "$SKIP_LIBWEBP" || (
-  cd node_modules/libwebp
-  autoreconf -fiv
-  rm -rf build || true
-  mkdir -p build && cd build
-  emconfigure ../configure \
-    --disable-libwebpdemux \
-    --disable-wic \
-    --disable-gif \
-    --disable-tiff \
-    --disable-jpeg \
-    --disable-png \
-    --disable-sdl \
-    --disable-gl \
-    --disable-threading \
-    --disable-neon-rtcd \
-    --disable-neon \
-    --disable-sse2 \
-    --disable-sse4.1
-  emmake make
-)
 echo "============================================="
 echo "Compiling wasm bindings"
 echo "============================================="
@@ -41,15 +14,18 @@ echo "============================================="
   emcc \
     ${OPTIMIZE} \
     --bind \
-    -s ALLOW_MEMORY_GROWTH=1 \
+    -D WEBP_USE_THREAD=1 \
-    -s MODULARIZE=1 \
+    -s USE_PTHREADS=1 \
-    -s 'EXPORT_NAME="webp_enc"' \
+    -s ASSERTIONS=1 \
+    -s PTHREAD_POOL_SIZE=4 \
+    -s TOTAL_MEMORY=268435456 \
+    -s WASM_MEM_MAX=268435456 \
     --std=c++11 \
     -I node_modules/libwebp \
     -o ./webp_enc.js \
+    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
     -x c++ \
-    webp_enc.cpp \
+    webp_enc.cpp
-    node_modules/libwebp/build/src/.libs/libwebp.a
 )
 echo "============================================="
 echo "Compiling wasm bindings done"

codecs/webp_enc/example.html

@@ -1,7 +1,7 @@
 <!doctype html>
 <script src='webp_enc.js'></script>
 <script>
-  const module = webp_enc();
+  // const Module = webp_enc();
 
   async function loadImage(src) {
     // Load image
@@ -17,10 +17,11 @@
     return ctx.getImageData(0, 0, img.width, img.height);
   }
 
-  module.onRuntimeInitialized = async _ => {
+  Module.onRuntimeInitialized = async _ => {
-    console.log('Version:', module.version().toString(16));
+    console.log('Version:', Module.version().toString(16));
-    const image = await loadImage('../example.png');
+    const image = await loadImage('../really_big.jpg');
-    const result = module.encode(image.data, image.width, image.height, {
+    let start = performance.now();
+    const result = Module.encode(image.data, image.width, image.height, {
       quality: 75,
       target_size: 0,
       target_PSNR: 0,
@@ -43,16 +44,18 @@
       exact: 0,
       image_hint: 0,
       emulate_jpeg_size: 0,
-      thread_level: 0,
+      thread_level: 1,
       low_memory: 0,
       near_lossless: 100,
       use_delta_palette: 0,
       use_sharp_yuv: 0,
     });
+    let stop = performance.now();
     console.log('size', result.length);
-    const blob = new Blob([result], {type: 'image/webp'});
+    console.log('time', stop - start);
+    const blob = new Blob([new Uint8Array(result)], {type: 'image/webp'});
 
-    module.free_result();
+    Module.free_result();
 
     const blobURL = URL.createObjectURL(blob);
     const img = document.createElement('img');

codecs/webp_enc/package.json

@@ -5,9 +5,9 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v1.0.2"
+    "libwebp": "webmproject/libwebp#v1.0.0"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/webp_enc/pthread-main.js

@@ -0,0 +1,192 @@
+// Copyright 2015 The Emscripten Authors.  All rights reserved.
+// Emscripten is available under two separate licenses, the MIT license and the
+// University of Illinois/NCSA Open Source License.  Both these licenses can be
+// found in the LICENSE file.
+
+// Pthread Web Worker startup routine:
+// This is the entry point file that is loaded first by each Web Worker
+// that executes pthreads on the Emscripten application.
+
+// Thread-local:
+var threadInfoStruct = 0; // Info area for this thread in Emscripten HEAP (shared). If zero, this worker is not currently hosting an executing pthread.
+var selfThreadId = 0; // The ID of this thread. 0 if not hosting a pthread.
+var parentThreadId = 0; // The ID of the parent pthread that launched this thread.
+var tempDoublePtr = 0; // A temporary memory area for global float and double marshalling operations.
+
+// Thread-local: Each thread has its own allocated stack space.
+var STACK_BASE = 0;
+var STACKTOP = 0;
+var STACK_MAX = 0;
+
+// These are system-wide memory area parameters that are set at main runtime startup in main thread, and stay constant throughout the application.
+var buffer; // All pthreads share the same Emscripten HEAP as SharedArrayBuffer with the main execution thread.
+var DYNAMICTOP_PTR = 0;
+var TOTAL_MEMORY = 0;
+var STATICTOP = 0;
+var staticSealed = true; // When threads are being initialized, the static memory area has been already sealed a long time ago.
+var DYNAMIC_BASE = 0;
+
+var ENVIRONMENT_IS_PTHREAD = true;
+
+// performance.now() is specced to return a wallclock time in msecs since that Web Worker/main thread launched. However for pthreads this can cause
+// subtle problems in emscripten_get_now() as this essentially would measure time from pthread_create(), meaning that the clocks between each threads
+// would be wildly out of sync. Therefore sync all pthreads to the clock on the main browser thread, so that different threads see a somewhat
+// coherent clock across each of them (+/- 0.1msecs in testing)
+var __performance_now_clock_drift = 0;
+
+// Cannot use console.log or console.error in a web worker, since that would risk a browser deadlock! https://bugzilla.mozilla.org/show_bug.cgi?id=1049091
+// Therefore implement custom logging facility for threads running in a worker, which queue the messages to main thread to print.
+var Module = {};
+
+// When error objects propagate from Web Worker to main thread, they lose helpful call stack and thread ID information, so print out errors early here,
+// before that happens.
+this.addEventListener('error', function(e) {
+  if (e.message.indexOf('SimulateInfiniteLoop') != -1) return e.preventDefault();
+
+  var errorSource = ' in ' + e.filename + ':' + e.lineno + ':' + e.colno;
+  console.error('Pthread ' + selfThreadId + ' uncaught exception' + (e.filename || e.lineno || e.colno ? errorSource : '') + ': ' + e.message + '. Error object:');
+  console.error(e.error);
+});
+
+function threadPrint() {
+  var text = Array.prototype.slice.call(arguments).join(' ');
+  console.log(text);
+}
+function threadPrintErr() {
+  var text = Array.prototype.slice.call(arguments).join(' ');
+  console.error(text);
+  console.error(new Error().stack);
+}
+function threadAlert() {
+  var text = Array.prototype.slice.call(arguments).join(' ');
+  postMessage({cmd: 'alert', text: text, threadId: selfThreadId});
+}
+out = threadPrint;
+err = threadPrintErr;
+this.alert = threadAlert;
+
+// #if WASM
+Module['instantiateWasm'] = function(info, receiveInstance) {
+  // Instantiate from the module posted from the main thread.
+  // We can just use sync instantiation in the worker.
+  instance = new WebAssembly.Instance(Module['wasmModule'], info);
+  // We don't need the module anymore; new threads will be spawned from the main thread.
+  delete Module['wasmModule'];
+  receiveInstance(instance);
+  return instance.exports;
+}
+//#endif
+
+this.onmessage = function(e) {
+  try {
+    if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code.
+      // Initialize the thread-local field(s):
+      tempDoublePtr = e.data.tempDoublePtr;
+
+      // Initialize the global "process"-wide fields:
+      Module['TOTAL_MEMORY'] = TOTAL_MEMORY = e.data.TOTAL_MEMORY;
+      STATICTOP = e.data.STATICTOP;
+      DYNAMIC_BASE = e.data.DYNAMIC_BASE;
+      DYNAMICTOP_PTR = e.data.DYNAMICTOP_PTR;
+
+
+//#if WASM
+      if (e.data.wasmModule) {
+        // Module and memory were sent from main thread
+        Module['wasmModule'] = e.data.wasmModule;
+        Module['wasmMemory'] = e.data.wasmMemory;
+        buffer = Module['wasmMemory'].buffer;
+      } else {
+//#else
+        buffer = e.data.buffer;
+      }
+//#endif
+
+      PthreadWorkerInit = e.data.PthreadWorkerInit;
+      if (typeof e.data.urlOrBlob === 'string') {
+        importScripts(e.data.urlOrBlob);
+      } else {
+        var objectUrl = URL.createObjectURL(e.data.urlOrBlob);
+        importScripts(objectUrl);
+        URL.revokeObjectURL(objectUrl);
+      }
+//#if !ASMFS
+      if (typeof FS !== 'undefined' && typeof FS.createStandardStreams === 'function') FS.createStandardStreams();
+//#endif
+      postMessage({ cmd: 'loaded' });
+    } else if (e.data.cmd === 'objectTransfer') {
+      PThread.receiveObjectTransfer(e.data);
+    } else if (e.data.cmd === 'run') { // This worker was idle, and now should start executing its pthread entry point.
+      __performance_now_clock_drift = performance.now() - e.data.time; // Sync up to the clock of the main thread.
+      threadInfoStruct = e.data.threadInfoStruct;
+      __register_pthread_ptr(threadInfoStruct, /*isMainBrowserThread=*/0, /*isMainRuntimeThread=*/0); // Pass the thread address inside the asm.js scope to store it for fast access that avoids the need for a FFI out.
+      assert(threadInfoStruct);
+      selfThreadId = e.data.selfThreadId;
+      parentThreadId = e.data.parentThreadId;
+      assert(selfThreadId);
+      assert(parentThreadId);
+      // TODO: Emscripten runtime has these variables twice(!), once outside the asm.js module, and a second time inside the asm.js module.
+      //       Review why that is? Can those get out of sync?
+      STACK_BASE = STACKTOP = e.data.stackBase;
+      STACK_MAX = STACK_BASE + e.data.stackSize;
+      assert(STACK_BASE != 0);
+      assert(STACK_MAX > STACK_BASE);
+      Module['establishStackSpace'](e.data.stackBase, e.data.stackBase + e.data.stackSize);
+      var result = 0;
+//#if STACK_OVERFLOW_CHECK
+      if (typeof writeStackCookie === 'function') writeStackCookie();
+//#endif
+
+      PThread.receiveObjectTransfer(e.data);
+      PThread.setThreadStatus(_pthread_self(), 1/*EM_THREAD_STATUS_RUNNING*/);
+
+      try {
+        // pthread entry points are always of signature 'void *ThreadMain(void *arg)'
+        // Native codebases sometimes spawn threads with other thread entry point signatures,
+        // such as void ThreadMain(void *arg), void *ThreadMain(), or void ThreadMain().
+        // That is not acceptable per C/C++ specification, but x86 compiler ABI extensions
+        // enable that to work. If you find the following line to crash, either change the signature
+        // to "proper" void *ThreadMain(void *arg) form, or try linking with the Emscripten linker
+        // flag -s EMULATE_FUNCTION_POINTER_CASTS=1 to add in emulation for this x86 ABI extension.
+        result = Module['dynCall_ii'](e.data.start_routine, e.data.arg);
+
+//#if STACK_OVERFLOW_CHECK
+        if (typeof checkStackCookie === 'function') checkStackCookie();
+//#endif
+
+      } catch(e) {
+        if (e === 'Canceled!') {
+          PThread.threadCancel();
+          return;
+        } else if (e === 'SimulateInfiniteLoop') {
+          return;
+        } else {
+          Atomics.store(HEAPU32, (threadInfoStruct + 4 /*{{{ C_STRUCTS.pthread.threadExitCode }}}*/ ) >> 2, (e instanceof ExitStatus) ? e.status : -2 /*A custom entry specific to Emscripten denoting that the thread crashed.*/);
+          Atomics.store(HEAPU32, (threadInfoStruct + 0 /*{{{ C_STRUCTS.pthread.threadStatus }}}*/ ) >> 2, 1); // Mark the thread as no longer running.
+          _emscripten_futex_wake(threadInfoStruct + 0 /*{{{ C_STRUCTS.pthread.threadStatus }}}*/, 0x7FFFFFFF/*INT_MAX*/); // Wake all threads waiting on this thread to finish.
+          if (!(e instanceof ExitStatus)) throw e;
+        }
+      }
+      // The thread might have finished without calling pthread_exit(). If so, then perform the exit operation ourselves.
+      // (This is a no-op if explicit pthread_exit() had been called prior.)
+      PThread.threadExit(result);
+    } else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
+      if (threadInfoStruct && PThread.thisThreadCancelState == 0/*PTHREAD_CANCEL_ENABLE*/) {
+        PThread.threadCancel();
+      }
+    } else if (e.data.target === 'setimmediate') {
+      // no-op
+    } else if (e.data.cmd === 'processThreadQueue') {
+      if (threadInfoStruct) { // If this thread is actually running?
+        _emscripten_current_thread_process_queued_calls();
+      }
+    } else {
+      err('pthread-main.js received unknown command ' + e.data.cmd);
+      console.error(e.data);
+    }
+  } catch(e) {
+    console.error('pthread-main.js onmessage() captured an uncaught exception: ' + e);
+    console.error(e.stack);
+    throw e;
+  }
+}

codecs/webp_enc/webp_enc.cpp

@@ -26,8 +26,7 @@ val encode(std::string img, int width, int height, WebPConfig config) {
     throw std::runtime_error("Unexpected error");
   }
 
-  // Only use use_argb if we really need it, as it's slower.
+  pic.use_argb = !!config.lossless;
-  pic.use_argb = config.lossless || config.use_sharp_yuv || config.preprocessing > 0;
   pic.width = width;
   pic.height = height;
   pic.writer = WebPMemoryWrite;

config/add-css-types.js

@@ -1,74 +0,0 @@
-const DtsCreator = require('typed-css-modules');
-const chokidar = require('chokidar');
-const util = require('util');
-const sass = require('node-sass');
-
-const sassRender = util.promisify(sass.render);
-
-async function sassToCss(path) {
-  const result = await sassRender({ file: path });
-  return result.css;
-}
-
-/**
- * @typedef {Object} Opts
- * @property {boolean} watch Watch for changes
- */
-/**
- * Create typing files for CSS & SCSS.
- *
- * @param {string[]} rootPaths Paths to search within
- * @param {Opts} [opts={}] Options.
- */
-function addCssTypes(rootPaths, opts = {}) {
-  return new Promise((resolve) => {
-    const { watch = false } = opts;
-
-    const paths = [];
-    const preReadyPromises = [];
-    let ready = false;
-
-    for (const rootPath of rootPaths) {
-      // Look for scss & css in each path.
-      paths.push(rootPath + '/**/*.scss');
-      paths.push(rootPath + '/**/*.css');
-    }
-
-    // For simplicity, the watcher is used even if we're not watching.
-    // If we're not watching, we stop the watcher after the initial files are found.
-    const watcher = chokidar.watch(paths, {
-      // Avoid processing already-processed files.
-      ignored: '*.d.*',
-      // Without this, travis and netlify builds never complete. I'm not sure why, but it might be
-      // related to https://github.com/paulmillr/chokidar/pull/758
-      persistent: watch,
-    });
-
-    function change(path) {
-      const promise = (async function() {
-        const creator = new DtsCreator({ camelCase: true });
-        const result = path.endsWith('.scss') ?
-          await creator.create(path, await sassToCss(path)) :
-          await creator.create(path);
-
-        await result.writeFile();
-      })();
-
-      if (!ready) preReadyPromises.push(promise);
-    }
-
-    watcher.on('change', change);
-    watcher.on('add', change);
-
-    // 'ready' is when events have been fired for file discovery.
-    watcher.on('ready', () => {
-      ready = true;
-      // Wait for the current set of processing to finish.
-      Promise.all(preReadyPromises).then(resolve);
-      // And if we're not watching, close the watcher.
-      if (!watch) watcher.close();
-    });
-  })
-}
-
-module.exports = addCssTypes;

config/asset-template-plugin.js

@@ -1,47 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const ejs = require('ejs');
-const AssetsPlugin = require('assets-webpack-plugin');
-
-module.exports = class AssetTemplatePlugin extends AssetsPlugin {
-  constructor(options) {
-    options = options || {};
-    if (!options.template) throw Error('AssetTemplatePlugin: template option is required.');
-    super({
-      useCompilerPath: true,
-      filename: options.filename,
-      processOutput: files => this._processOutput(files)
-    });
-    this._template = path.resolve(process.cwd(), options.template);
-    const ignore = options.ignore || /(manifest\.json|\.DS_Store)$/;
-    this._ignore = typeof ignore === 'function' ? ({ test: ignore }) : ignore;
-  }
-
-  _processOutput(files) {
-    const mapping = {
-      all: [],
-      byType: {},
-      entries: {}
-    };
-    for (const entryName in files) {
-      // non-entry-point-derived assets are collected under an empty string key
-      // since that's a bit awkward, we'll call them "assets"
-      const name = entryName === '' ? 'assets' : entryName;
-      const listing = files[entryName];
-      const entry = mapping.entries[name] = {
-        all: [],
-        byType: {}
-      };
-      for (let type in listing) {
-        const list = [].concat(listing[type]).filter(file => !this._ignore.test(file));
-        if (!list.length) continue;
-        mapping.all = mapping.all.concat(list);
-        mapping.byType[type] = (mapping.byType[type] || []).concat(list);
-        entry.all = entry.all.concat(list);
-        entry.byType[type] = (entry.byType[type] || []).concat(list);
-      }
-    }
-    mapping.files = mapping.all;
-    return ejs.render(fs.readFileSync(this._template, 'utf8'), mapping);
-  }
-};

config/auto-sw-plugin.js

@@ -1,158 +0,0 @@
-const util = require('util');
-const minimatch = require('minimatch');
-const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin');
-const WebWorkerTemplatePlugin = require('webpack/lib/webworker/WebWorkerTemplatePlugin');
-const ParserHelpers = require('webpack/lib/ParserHelpers');
-
-const NAME = 'auto-sw-plugin';
-const JS_TYPES = ['auto', 'esm', 'dynamic'];
-
-/**
- * Automatically finds and bundles Service Workers by looking for navigator.serviceWorker.register(..).
- * An Array of webpack assets is injected into the Service Worker bundle as a `BUILD_ASSETS` global.
- * Hidden and `.map` files are excluded by default, and this can be customized using the include & exclude options.
- * @example
- *  // webpack config
- *  plugins: [
- *    new AutoSWPlugin({
- *      exclude: [
- *        '**\/.*',     // don't expose hidden files (default)
- *        '**\/*.map',  // don't precache sourcemaps (default)
- *        'index.html'  // don't cache the page itself
- *      ]
- *    })
- *  ]
- * @param {Object} [options={}]
- * @param {string[]} [options.exclude]  Minimatch pattern(s) of which assets to omit from BUILD_ASSETS.
- * @param {string[]} [options.include]  Minimatch pattern(s) of assets to allow in BUILD_ASSETS.
- */
-module.exports = class AutoSWPlugin {
-  constructor(options) {
-    this.options = Object.assign({
-      exclude: [
-        '**/*.map',
-        '**/.*'
-      ]
-    }, options || {});
-  }
-
-  apply(compiler) {
-    const serviceWorkers = [];
-
-    compiler.hooks.emit.tapPromise(NAME, compilation => this.emit(compiler, compilation, serviceWorkers));
-
-    compiler.hooks.normalModuleFactory.tap(NAME, (factory) => {
-      for (const type of JS_TYPES) {
-        factory.hooks.parser.for(`javascript/${type}`).tap(NAME, parser => {
-          let counter = 0;
-
-          const processRegisterCall = expr => {
-            const dep = parser.evaluateExpression(expr.arguments[0]);
-
-            if (!dep.isString()) {
-              parser.state.module.warnings.push({
-                message: 'navigator.serviceWorker.register() will only be bundled if passed a String literal.'
-              });
-              return false;
-            }
-
-            const filename = dep.string;
-            const outputFilename = this.options.filename || 'serviceworker.js'
-            const context = parser.state.current.context;
-            serviceWorkers.push({
-              outputFilename,
-              filename,
-              context
-            });
-
-            const id = `__webpack__serviceworker__${++counter}`;
-            ParserHelpers.toConstantDependency(parser, id)(expr.arguments[0]);
-            return ParserHelpers.addParsedVariableToModule(parser, id, '__webpack_public_path__ + ' + JSON.stringify(outputFilename));
-          };
-
-          parser.hooks.call.for('navigator.serviceWorker.register').tap(NAME, processRegisterCall);
-          parser.hooks.call.for('self.navigator.serviceWorker.register').tap(NAME, processRegisterCall);
-          parser.hooks.call.for('window.navigator.serviceWorker.register').tap(NAME, processRegisterCall);
-        });
-      }
-    });
-  }
-
-  createFilter(list) {
-    const filters = [].concat(list);
-    for (let i=0; i<filters.length; i++) {
-      if (typeof filters[i] === 'string') {
-        filters[i] = minimatch.filter(filters[i]);
-      }
-    }
-    return filters;
-  }
-
-  async emit(compiler, compilation, serviceWorkers) {
-    let assetMapping = Object.keys(compilation.assets);
-    if (this.options.include) {
-      const filters = this.createFilter(this.options.include);
-      assetMapping = assetMapping.filter(filename => {
-        for (const filter of filters) {
-          if (filter(filename)) return true;
-        }
-        return false;
-      });
-    }
-    if (this.options.exclude) {
-      const filters = this.createFilter(this.options.exclude);
-      assetMapping = assetMapping.filter(filename => {
-        for (const filter of filters) {
-          if (filter(filename)) return false;
-        }
-        return true;
-      });
-    }
-    await Promise.all(serviceWorkers.map(
-      (serviceWorker, index) => this.compileServiceWorker(compiler, compilation, serviceWorker, index, assetMapping)
-    ));
-  }
-
-  async compileServiceWorker(compiler, compilation, options, index, assetMapping) {
-    const entryFilename = options.filename;
-
-    const chunkFilename = compiler.options.output.chunkFilename.replace(/\.([a-z]+)$/i, '.serviceworker.$1');
-    const workerOptions = {
-      filename: options.outputFilename, // chunkFilename.replace(/\.?\[(?:chunkhash|contenthash|hash)(:\d+(?::\d+)?)?\]/g, ''),
-      chunkFilename: this.options.chunkFilename || chunkFilename,
-      globalObject: 'self'
-    };
-
-    const childCompiler = compilation.createChildCompiler(NAME, { filename: workerOptions.filename });
-    (new WebWorkerTemplatePlugin(workerOptions)).apply(childCompiler);
-
-    /* The duplication DefinePlugin ends up causing is problematic (it doesn't hoist injections), so we'll do it manually. */
-    // (new DefinePlugin({
-    //   BUILD_ASSETS: JSON.stringify(assetMapping)
-    // })).apply(childCompiler);
-    (new SingleEntryPlugin(options.context, entryFilename, workerOptions.filename)).apply(childCompiler);
-
-    const subCache = `subcache ${__dirname} ${entryFilename} ${index}`;
-    let childCompilation;
-    childCompiler.hooks.compilation.tap(NAME, c => {
-      childCompilation = c;
-      if (childCompilation.cache) {
-        if (!childCompilation.cache[subCache]) childCompilation.cache[subCache] = {};
-        childCompilation.cache = childCompilation.cache[subCache];
-      }
-    });
-
-    await (util.promisify(childCompiler.runAsChild.bind(childCompiler)))();
-
-    const versionVar = this.options.version ?
-      `var VERSION = ${JSON.stringify(this.options.version)};` : '';
-    const original = childCompilation.assets[workerOptions.filename].source();
-    const source = `${versionVar}var BUILD_ASSETS=${JSON.stringify(assetMapping)};${original}`;
-    childCompilation.assets[workerOptions.filename] = {
-      source: () => source,
-      size: () => Buffer.byteLength(source, 'utf8')
-    };
-
-    Object.assign(compilation.assets, childCompilation.assets);
-  }
-};

config/size-report.js

@@ -1,203 +0,0 @@
-const path = require('path');
-const { URL } = require('url');
-
-const gzipSize = require('gzip-size');
-const fetch = require('node-fetch');
-const prettyBytes = require('pretty-bytes');
-const escapeRE = require('escape-string-regexp');
-const readdirp = require('readdirp');
-const chalk = new require('chalk').constructor({ level: 4 });
-
-function fetchTravis(path, options = {}) {
-  const url = new URL(path, 'https://api.travis-ci.org');
-  url.search = new URLSearchParams(options);
-
-  return fetch(url, {
-    headers: { 'Travis-API-Version': '3' },
-  });
-}
-
-function fetchTravisBuildInfo(user, repo, branch) {
-  return fetchTravis(`/repo/${encodeURIComponent(`${user}/${repo}`)}/builds`, {
-    'branch.name': branch,
-    state: 'passed',
-    limit: 1,
-    event_type: 'push',
-  }).then(r => r.json());
-}
-
-function fetchTravisText(path) {
-  return fetchTravis(path).then(r => r.text());
-}
-
-/**
- * Recursively-read a directory and turn it into an array of { name, size, gzipSize }
- */
-async function dirToInfoArray(startPath) {
-  const results = await new Promise((resolve, reject) => {
-    readdirp({ root: startPath }, (err, results) => {
-      if (err) reject(err); else resolve(results);
-    });
-  });
-
-  return Promise.all(
-    results.files.map(async (entry) => ({
-      name: entry.path,
-      gzipSize: await gzipSize.file(entry.fullPath),
-      size: entry.stat.size,
-    })),
-  );
-}
-
-/**
- * Try to treat two entries with different file name hashes as the same file.
- */
-function findHashedMatch(name, buildInfo) {
-  const nameParts = /^(.+\.)[a-f0-9]+(\..+)$/.exec(name);
-  if (!nameParts) return;
-
-  const matchRe = new RegExp(`^${escapeRE(nameParts[1])}[a-f0-9]+${escapeRE(nameParts[2])}$`);
-  const matchingEntry = buildInfo.find(entry => matchRe.test(entry.name));
-  return matchingEntry;
-}
-
-const buildSizePrefix = '=== BUILD SIZES: ';
-const buildSizePrefixRe = new RegExp(`^${escapeRE(buildSizePrefix)}(.+)$`, 'm');
-
-async function getPreviousBuildInfo() {
-  const buildData = await fetchTravisBuildInfo('GoogleChromeLabs', 'squoosh', 'master');
-  const jobUrl = buildData.builds[0].jobs[0]['@href'];
-  const log = await fetchTravisText(jobUrl + '/log.txt');
-  const reResult = buildSizePrefixRe.exec(log);
-
-  if (!reResult) return;
-  return JSON.parse(reResult[1]);
-}
-
-/**
- * Generate an array that represents the difference between builds.
- * Returns an array of { beforeName, afterName, beforeSize, afterSize }.
- * Sizes are gzipped size.
- * Before/after properties are missing if resource isn't in the previous/new build.
- */
-function getChanges(previousBuildInfo, buildInfo) {
-  const buildChanges = [];
-  const alsoInPreviousBuild = new Set();
-
-  for (const oldEntry of previousBuildInfo) {
-    const newEntry = buildInfo.find(entry => entry.name === oldEntry.name) ||
-      findHashedMatch(oldEntry.name, buildInfo);
-
-    // Entry is in previous build, but not the new build.
-    if (!newEntry) {
-      buildChanges.push({
-        beforeName: oldEntry.name,
-        beforeSize: oldEntry.gzipSize,
-      });
-      continue;
-    }
-
-    // Mark this entry so we know we've dealt with it.
-    alsoInPreviousBuild.add(newEntry);
-
-    // If they're the same, just ignore.
-    // Using size rather than gzip size. I've seen different platforms produce different zipped
-    // sizes.
-    if (
-      oldEntry.size === newEntry.size &&
-      oldEntry.name === newEntry.name
-    ) continue;
-
-    // Entry is in both builds (maybe renamed).
-    buildChanges.push({
-      beforeName: oldEntry.name,
-      afterName: newEntry.name,
-      beforeSize: oldEntry.gzipSize,
-      afterSize: newEntry.gzipSize,
-    });
-  }
-
-  // Look for entries that are only in the new build.
-  for (const newEntry of buildInfo) {
-    if (alsoInPreviousBuild.has(newEntry)) continue;
-
-    buildChanges.push({
-      afterName: newEntry.name,
-      afterSize: newEntry.gzipSize,
-    });
-  }
-
-  return buildChanges;
-}
-
-async function main() {
-  // Output the current build sizes for later retrieval.
-  const buildInfo = await dirToInfoArray(__dirname + '/../build');
-  console.log(buildSizePrefix + JSON.stringify(buildInfo));
-  console.log('\nBuild change report:');
-
-  let previousBuildInfo;
-
-  try {
-    previousBuildInfo = await getPreviousBuildInfo();
-  } catch (err) {
-    console.log(`  Couldn't parse previous build info`);
-    return;
-  }
-
-  if (!previousBuildInfo) {
-    console.log(`  Couldn't find previous build info`);
-    return;
-  }
-
-  const buildChanges = getChanges(previousBuildInfo, buildInfo);
-
-  if (buildChanges.length === 0) {
-    console.log('  No changes');
-    return;
-  }
-
-  // One letter references, so it's easier to get the spacing right.
-  const y = chalk.yellow;
-  const g = chalk.green;
-  const r = chalk.red;
-
-  for (const change of buildChanges) {
-    // New file.
-    if (!change.beforeSize) {
-      console.log(`  ${g('ADDED')}   ${change.afterName} - ${prettyBytes(change.afterSize)}`);
-      continue;
-    }
-
-    // Removed file.
-    if (!change.afterSize) {
-      console.log(`  ${r('REMOVED')} ${change.beforeName} - was ${prettyBytes(change.beforeSize)}`);
-      continue;
-    }
-
-    // Changed file.
-    let size;
-
-    if (change.beforeSize === change.afterSize) {
-      // Just renamed.
-      size = `${prettyBytes(change.afterSize)} -> no change`;
-    } else {
-      const color = change.afterSize > change.beforeSize ? r : g;
-      const sizeDiff = prettyBytes(change.afterSize - change.beforeSize, { signed: true });
-      const relativeDiff = Math.round((change.afterSize / change.beforeSize) * 1000) / 1000;
-
-      size = `${prettyBytes(change.beforeSize)} -> ${prettyBytes(change.afterSize)}` +
-        ' (' +
-        color(`${sizeDiff}, ${relativeDiff}x`) +
-        ')';
-    }
-
-    console.log(`  ${y('CHANGED')} ${change.afterName} - ${size}`);
-
-    if (change.beforeName !== change.afterName) {
-      console.log(`    Renamed from: ${change.beforeName}`);
-    }
-  }
-}
-
-main();

global.d.ts

@@ -1,21 +1,16 @@
 declare const __webpack_public_path__: string;
-declare const PRERENDER: boolean;
 
 declare interface NodeModule {
   hot: any;
 }
 
 declare interface Window {
-  STATE: any;
+  STATE: any
-  ga: typeof ga;
 }
 
 declare namespace JSX {
   interface Element { }
   interface IntrinsicElements { }
-  interface HTMLAttributes {
-    decoding?: string;
-  }
 }
 
 declare module 'classnames' {

package.json

@@ -1,15 +1,13 @@
 {
   "private": true,
   "name": "squoosh",
-  "version": "1.6.0",
+  "version": "0.0.0",
   "license": "apache-2.0",
   "scripts": {
-    "build:sdk": "microbundle --compress -f es -o build/sdk.mjs -i src/sdk.ts",
+    "start": "webpack serve --host 0.0.0.0 --hot",
-    "start": "webpack-dev-server --host 0.0.0.0 --hot",
+    "build": "webpack -p",
-    "build": "webpack -p && npm run build:sdk",
+    "lint": "tslint -c tslint.json -t verbose 'src/**/*.{ts,tsx,js,jsx}'",
-    "lint": "tslint -c tslint.json -p tsconfig.json -t verbose 'src/**/*.{ts,tsx,js,jsx}'",
+    "lintfix": "tslint -c tslint.json -t verbose --fix 'src/**/*.{ts,tsx,js,jsx}'"
-    "lintfix": "tslint -c tslint.json -p tsconfig.json -t verbose --fix 'src/**/*.{ts,tsx,js,jsx}'",
-    "sizereport": "node config/size-report.js"
   },
   "husky": {
     "hooks": {
@@ -17,61 +15,56 @@
     }
   },
   "devDependencies": {
-    "@types/node": "10.14.1",
+    "@types/node": "^9.6.23",
-    "@types/pretty-bytes": "5.1.0",
+    "@types/pretty-bytes": "^5.1.0",
-    "@types/webassembly-js-api": "0.0.2",
+    "@types/webassembly-js-api": "0.0.1",
-    "@webcomponents/custom-elements": "1.2.1",
+    "@webcomponents/custom-elements": "^1.2.0",
-    "@webpack-cli/serve": "0.1.3",
+    "babel-loader": "^7.1.5",
-    "assets-webpack-plugin": "3.9.10",
+    "babel-plugin-jsx-pragmatic": "^1.0.2",
-    "chalk": "2.4.2",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "chokidar": "2.1.2",
+    "babel-plugin-transform-class-properties": "^6.24.1",
-    "classnames": "2.2.6",
+    "babel-plugin-transform-decorators-legacy": "^1.3.5",
-    "clean-webpack-plugin": "1.0.1",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "copy-webpack-plugin": "5.0.1",
+    "babel-plugin-transform-react-constant-elements": "^6.23.0",
-    "comlink": "^3.2.0",
+    "babel-plugin-transform-react-jsx": "^6.24.1",
-    "critters-webpack-plugin": "2.3.0",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.14",
-    "css-loader": "1.0.1",
+    "babel-preset-env": "^1.7.0",
-    "ejs": "2.6.1",
+    "babel-register": "^6.26.0",
-    "escape-string-regexp": "1.0.5",
+    "clean-webpack-plugin": "^0.1.19",
-    "exports-loader": "0.7.0",
+    "copy-webpack-plugin": "^4.5.2",
-    "file-drop-element": "0.2.0",
+    "css-loader": "^0.28.11",
-    "file-loader": "3.0.1",
+    "exports-loader": "^0.7.0",
-    "gzip-size": "5.0.0",
+    "file-loader": "^1.1.11",
-    "html-webpack-plugin": "3.2.0",
+    "html-webpack-plugin": "^3.2.0",
-    "husky": "1.3.1",
+    "husky": "^1.0.0-rc.13",
-    "idb-keyval": "3.1.0",
+    "if-env": "^1.0.4",
-    "linkstate": "1.1.1",
+    "loader-utils": "^1.1.0",
-    "loader-utils": "1.2.3",
+    "mini-css-extract-plugin": "^0.3.0",
-    "microbundle": "^0.10.1",
+    "node-sass": "^4.9.3",
-    "mini-css-extract-plugin": "0.5.0",
+    "optimize-css-assets-webpack-plugin": "^4.0.3",
-    "minimatch": "3.0.4",
+    "progress-bar-webpack-plugin": "^1.11.0",
-    "node-fetch": "2.3.0",
+    "raw-loader": "^0.5.1",
-    "node-sass": "4.11.0",
+    "sass-loader": "^7.1.0",
-    "optimize-css-assets-webpack-plugin": "5.0.1",
+    "script-ext-html-webpack-plugin": "^2.0.1",
-    "pointer-tracker": "2.0.3",
+    "source-map-loader": "^0.2.3",
-    "preact": "8.4.2",
+    "style-loader": "^0.22.1",
-    "prerender-loader": "1.3.0",
+    "ts-loader": "^4.4.2",
-    "pretty-bytes": "5.1.0",
+    "tslint": "^5.11.0",
-    "progress-bar-webpack-plugin": "1.12.1",
+    "tslint-config-airbnb": "^5.9.2",
-    "raw-loader": "2.0.0",
+    "tslint-config-semistandard": "^7.0.0",
-    "readdirp": "2.2.1",
+    "tslint-react": "^3.6.0",
-    "sass-loader": "7.1.0",
+    "typescript": "^2.9.2",
-    "script-ext-html-webpack-plugin": "2.1.3",
+    "typings-for-css-modules-loader": "^1.7.0",
-    "source-map-loader": "0.2.4",
+    "webpack": "^4.19.1",
-    "style-loader": "0.23.1",
+    "webpack-bundle-analyzer": "^2.13.1",
-    "terser-webpack-plugin": "1.2.3",
+    "webpack-cli": "^2.1.5",
-    "ts-loader": "5.3.3",
+    "webpack-dev-server": "^3.1.5",
-    "tslint": "5.14.0",
+    "webpack-plugin-replace": "^1.1.1",
-    "tslint-config-airbnb": "5.11.1",
+    "classnames": "^2.2.6",
-    "tslint-config-semistandard": "7.0.0",
+    "comlink": "^3.0.3",
-    "tslint-react": "3.6.0",
+    "linkstate": "^1.1.1",
-    "typed-css-modules": "0.4.2",
+    "preact": "^8.3.1",
-    "typescript": "3.3.3333",
+    "pretty-bytes": "^5.1.0",
-    "url-loader": "1.1.2",
+    "worker-plugin": "^1.1.1"
-    "webpack": "4.28.0",
-    "webpack-bundle-analyzer": "3.1.0",
-    "webpack-cli": "3.3.0",
-    "webpack-dev-server": "3.2.1",
-    "worker-plugin": "3.1.0"
   }
 }

renovate.json

@@ -1,5 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ]
-}

src/codecs/browser-jpeg/encoder-meta.ts

@@ -5,4 +5,4 @@ export const type = 'browser-jpeg';
 export const label = 'Browser JPEG';
 export const mimeType = 'image/jpeg';
 export const extension = 'jpg';
-export const defaultOptions: EncodeOptions = { quality: 0.75 };
+export const defaultOptions: EncodeOptions = { quality: 0.5 };

src/codecs/browser-jpeg/options.ts

@@ -1,3 +1,3 @@
 import qualityOption from '../generic/quality-option';
 
-export default qualityOption({ min: 0, max: 1, step: 0.01 });
+export default qualityOption({ min: 0, max: 1, step: 0 });

src/codecs/browser-webp/encoder-meta.ts

@@ -7,5 +7,5 @@ export const type = 'browser-webp';
 export const label = 'Browser WebP';
 export const mimeType = 'image/webp';
 export const extension = 'webp';
-export const defaultOptions: EncodeOptions = { quality: 0.75 };
+export const defaultOptions: EncodeOptions = { quality: 0.5 };
 export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-webp/options.ts

@@ -1,3 +1,3 @@
 import qualityOption from '../generic/quality-option';
 
-export default qualityOption({ min: 0, max: 1, step: 0.01 });
+export default qualityOption({ min: 0, max: 1, step: 0 });

src/codecs/decoders.ts

@@ -1,8 +1,9 @@
 import { nativeDecode, sniffMimeType, canDecodeImage } from '../lib/util';
 import Processor from './processor';
-import webpDataUrl from 'url-loader!./tiny.webp';
 
-const nativeWebPSupported = canDecodeImage(webpDataUrl);
+// tslint:disable-next-line:max-line-length It’s a data URL. Whatcha gonna do?
+const webpFile = 'data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA=';
+const nativeWebPSupported = canDecodeImage(webpFile);
 
 export async function decodeImage(blob: Blob, processor: Processor): Promise<ImageData> {
   const mimeType = await sniffMimeType(blob);

src/codecs/generic/quality-option.tsx

@@ -1,7 +1,6 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import * as style from '../../components/Options/style.scss';
+import '../../custom-els/RangeInput';
-import Range from '../../components/range';
 
 interface EncodeOptions {
   quality: number;
@@ -34,19 +33,18 @@ export default function qualityOption(opts: QualityOptionArg = {}) {
 
     render({ options }: Props) {
       return (
-        <div class={style.optionsSection}>
+        <div>
-          <div class={style.optionOneCell}>
+          <label>
-            <Range
+            Quality:
+            <range-input
               name="quality"
               min={min}
               max={max}
               step={step || 'any'}
-              value={options.quality}
+              value={'' + options.quality}
-              onInput={this.onChange}
+              onChange={this.onChange}
-            >
+            />
-              Quality:
+          </label>
-            </Range>
-          </div>
         </div>
       );
     }

src/codecs/imagequant/options.tsx

@@ -1,11 +1,7 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import { inputFieldValueAsNumber, konami, preventDefault } from '../../lib/util';
+import { inputFieldValueAsNumber, konami } from '../../lib/util';
 import { QuantizeOptions } from './processor-meta';
-import * as style from '../../components/Options/style.scss';
-import Expander from '../../components/expander';
-import Select from '../../components/select';
-import Range from '../../components/range';
 
 const konamiPromise = konami();
 
@@ -30,61 +26,50 @@ export default class QuantizerOptions extends Component<Props, State> {
   @bind
   onChange(event: Event) {
     const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
-    const { options } = this.props;
 
-    const newOptions: QuantizeOptions = {
+    const options: QuantizeOptions = {
-      zx: inputFieldValueAsNumber(form.zx, options.zx),
+      zx: inputFieldValueAsNumber(form.zx),
-      maxNumColors: inputFieldValueAsNumber(form.maxNumColors, options.maxNumColors),
+      maxNumColors: inputFieldValueAsNumber(form.maxNumColors),
       dither: inputFieldValueAsNumber(form.dither),
     };
-    this.props.onChange(newOptions);
+    this.props.onChange(options);
   }
 
   render({ options }: Props, { extendedSettings }: State) {
     return (
-      <form class={style.optionsSection} onSubmit={preventDefault}>
+      <form>
-        <Expander>
+        <label style={{ display: extendedSettings ? '' : 'none' }}>
-          {extendedSettings ?
+          Type:
-            <label class={style.optionTextFirst}>
+          <select
-              Type:
+            name="zx"
-              <Select
+            value={'' + options.zx}
-                name="zx"
+            onChange={this.onChange}
-                value={'' + options.zx}
+          >
-                onChange={this.onChange}
+            <option value="0">Standard</option>
-              >
+            <option value="1">ZX</option>
-                <option value="0">Standard</option>
+          </select>
-                <option value="1">ZX</option>
+        </label>
-              </Select>
+        <label style={{ display: options.zx ? 'none' : '' }}>
-            </label>
+          Palette Colors:
-          : null}
+          <range-input
-        </Expander>
+            name="maxNumColors"
-        <Expander>
+            min="2"
-          {options.zx ? null :
+            max="256"
-            <div class={style.optionOneCell}>
+            value={'' + options.maxNumColors}
-              <Range
+            onChange={this.onChange}
-                name="maxNumColors"
+          />
-                min="2"
+        </label>
-                max="256"
+        <label>
-                value={options.maxNumColors}
+          Dithering:
-                onInput={this.onChange}
+          <range-input
-              >
-                Colors:
-              </Range>
-            </div>
-          }
-        </Expander>
-        <div class={style.optionOneCell}>
-          <Range
             name="dither"
             min="0"
             max="1"
             step="0.01"
-            value={options.dither}
+            value={'' + options.dither}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Dithering:
+        </label>
-          </Range>
-        </div>
       </form>
     );
   }

src/codecs/imagequant/processor.ts

@@ -1,12 +1,12 @@
 import imagequant, { QuantizerModule } from '../../../codecs/imagequant/imagequant';
 import wasmUrl from '../../../codecs/imagequant/imagequant.wasm';
 import { QuantizeOptions } from './processor-meta';
-import { initEmscriptenModule } from '../util';
+import { initWasmModule } from '../util';
 
 let emscriptenModule: Promise<QuantizerModule>;
 
 export async function process(data: ImageData, opts: QuantizeOptions): Promise<ImageData> {
-  if (!emscriptenModule) emscriptenModule = initEmscriptenModule(imagequant, wasmUrl);
+  if (!emscriptenModule) emscriptenModule = initWasmModule(imagequant, wasmUrl);
 
   const module = await emscriptenModule;
 

src/codecs/input-processors.ts

@@ -1,9 +0,0 @@
-import { defaultOptions as rotateDefaultOptions } from './rotate/processor-meta';
-
-export interface InputProcessorState {
-  rotate: import('./rotate/processor-meta').RotateOptions;
-}
-
-export const defaultInputProcessorState: InputProcessorState = {
-  rotate: rotateDefaultOptions,
-};

src/codecs/mozjpeg/encoder-meta.ts

@@ -17,10 +17,6 @@ export interface EncodeOptions {
   trellis_opt_zero: boolean;
   trellis_opt_table: boolean;
   trellis_loops: number;
-  auto_subsample: boolean;
-  chroma_subsample: number;
-  separate_chroma_quality: boolean;
-  chroma_quality: number;
 }
 
 export interface EncoderState { type: typeof type; options: EncodeOptions; }
@@ -42,8 +38,4 @@ export const defaultOptions: EncodeOptions = {
   trellis_opt_zero: false,
   trellis_opt_table: false,
   trellis_loops: 1,
-  auto_subsample: true,
-  chroma_subsample: 2,
-  separate_chroma_quality: false,
-  chroma_quality: 75,
 };

src/codecs/mozjpeg/encoder.ts

@@ -1,12 +1,12 @@
 import mozjpeg_enc, { MozJPEGModule } from '../../../codecs/mozjpeg_enc/mozjpeg_enc';
 import wasmUrl from '../../../codecs/mozjpeg_enc/mozjpeg_enc.wasm';
 import { EncodeOptions } from './encoder-meta';
-import { initEmscriptenModule } from '../util';
+import { initWasmModule } from '../util';
 
 let emscriptenModule: Promise<MozJPEGModule>;
 
 export async function encode(data: ImageData, options: EncodeOptions): Promise<ArrayBuffer> {
-  if (!emscriptenModule) emscriptenModule = initEmscriptenModule(mozjpeg_enc, wasmUrl);
+  if (!emscriptenModule) emscriptenModule = initWasmModule(mozjpeg_enc, wasmUrl);
 
   const module = await emscriptenModule;
   const resultView = module.encode(data.data, data.width, data.height, options);

src/codecs/mozjpeg/options.tsx

@@ -1,257 +1,159 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import { inputFieldChecked, inputFieldValueAsNumber, preventDefault } from '../../lib/util';
+import { inputFieldChecked, inputFieldValueAsNumber } from '../../lib/util';
 import { EncodeOptions, MozJpegColorSpace } from './encoder-meta';
-import * as style from '../../components/Options/style.scss';
+import '../../custom-els/RangeInput';
-import Checkbox from '../../components/checkbox';
-import Expander from '../../components/expander';
-import Select from '../../components/select';
-import Range from '../../components/range';
-import linkState from 'linkstate';
 
-interface Props {
+type Props = {
-  options: EncodeOptions;
+  options: EncodeOptions,
-  onChange(newOptions: EncodeOptions): void;
+  onChange(newOptions: EncodeOptions): void,
-}
+};
-
-interface State {
-  showAdvanced: boolean;
-}
-
-export default class MozJPEGEncoderOptions extends Component<Props, State> {
-  state: State = {
-    showAdvanced: false,
-  };
 
+export default class MozJPEGEncoderOptions extends Component<Props, {}> {
   @bind
   onChange(event: Event) {
     const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
-    const { options } = this.props;
 
-    const newOptions: EncodeOptions = {
+    const options: EncodeOptions = {
       // Copy over options the form doesn't currently care about, eg arithmetic
       ...this.props.options,
       // And now stuff from the form:
       // .checked
-      baseline: inputFieldChecked(form.baseline, options.baseline),
+      baseline: inputFieldChecked(form.baseline),
-      progressive: inputFieldChecked(form.progressive, options.progressive),
+      progressive: inputFieldChecked(form.progressive),
-      optimize_coding: inputFieldChecked(form.optimize_coding, options.optimize_coding),
+      optimize_coding: inputFieldChecked(form.optimize_coding),
-      trellis_multipass: inputFieldChecked(form.trellis_multipass, options.trellis_multipass),
+      trellis_multipass: inputFieldChecked(form.trellis_multipass),
-      trellis_opt_zero: inputFieldChecked(form.trellis_opt_zero, options.trellis_opt_zero),
+      trellis_opt_zero: inputFieldChecked(form.trellis_opt_zero),
-      trellis_opt_table: inputFieldChecked(form.trellis_opt_table, options.trellis_opt_table),
+      trellis_opt_table: inputFieldChecked(form.trellis_opt_table),
-      auto_subsample: inputFieldChecked(form.auto_subsample, options.auto_subsample),
-      separate_chroma_quality:
-        inputFieldChecked(form.separate_chroma_quality, options.separate_chroma_quality),
       // .value
-      quality: inputFieldValueAsNumber(form.quality, options.quality),
+      quality: inputFieldValueAsNumber(form.quality),
-      chroma_quality: inputFieldValueAsNumber(form.chroma_quality, options.chroma_quality),
+      smoothing: inputFieldValueAsNumber(form.smoothing),
-      chroma_subsample: inputFieldValueAsNumber(form.chroma_subsample, options.chroma_subsample),
+      color_space: inputFieldValueAsNumber(form.color_space),
-      smoothing: inputFieldValueAsNumber(form.smoothing, options.smoothing),
+      quant_table: inputFieldValueAsNumber(form.quant_table),
-      color_space: inputFieldValueAsNumber(form.color_space, options.color_space),
+      trellis_loops: inputFieldValueAsNumber(form.trellis_loops),
-      quant_table: inputFieldValueAsNumber(form.quant_table, options.quant_table),
-      trellis_loops: inputFieldValueAsNumber(form.trellis_loops, options.trellis_loops),
     };
-    this.props.onChange(newOptions);
+    this.props.onChange(options);
   }
 
-  render({ options }: Props, { showAdvanced }: State) {
+  render({ options }: Props) {
     // I'm rendering both lossy and lossless forms, as it becomes much easier when
     // gathering the data.
     return (
-      <form class={style.optionsSection} onSubmit={preventDefault}>
+      <form>
-        <div class={style.optionOneCell}>
+        <label>
-          <Range
+          Quality:
+          <range-input
             name="quality"
             min="0"
             max="100"
-            value={options.quality}
+            value={'' + options.quality}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Quality:
+        </label>
-          </Range>
+        <label>
-        </div>
+          <input
-        <label class={style.optionInputFirst}>
+            name="baseline"
-          <Checkbox
+            type="checkbox"
-            checked={showAdvanced}
+            checked={options.baseline}
-            onChange={linkState(this, 'showAdvanced')}
+            onChange={this.onChange}
+          />
+          <span>Baseline (worse but legacy-compatible)</span>
+        </label>
+        <label style={{ display: options.baseline ? 'none' : '' }}>
+          <input
+            name="progressive"
+            type="checkbox"
+            checked={options.progressive}
+            onChange={this.onChange}
+          />
+          <span>Progressive multi-pass rendering</span>
+        </label>
+        <label style={{ display: options.baseline ? '' : 'none' }}>
+          <input
+            name="optimize_coding"
+            type="checkbox"
+            checked={options.optimize_coding}
+            onChange={this.onChange}
+          />
+          <span>Optimize Huffman table</span>
+        </label>
+        <label>
+          Smoothing:
+          <range-input
+            name="smoothing"
+            min="0"
+            max="100"
+            value={'' + options.smoothing}
+            onChange={this.onChange}
+          />
+        </label>
+        <label>
+          Output color space:
+          <select
+            name="color_space"
+            value={'' + options.color_space}
+            onChange={this.onChange}
+          >
+            <option value={MozJpegColorSpace.GRAYSCALE}>Grayscale</option>
+            <option value={MozJpegColorSpace.RGB}>RGB (sub-optimal)</option>
+            <option value={MozJpegColorSpace.YCbCr}>YCbCr (optimized for color)</option>
+          </select>
+        </label>
+        <label>
+          Quantization table:
+          <select
+            name="quant_table"
+            value={'' + options.quant_table}
+            onChange={this.onChange}
+          >
+            <option value="0">JPEG Annex K</option>
+            <option value="1">Flat</option>
+            <option value="2">MSSIM-tuned Kodak</option>
+            <option value="3">ImageMagick</option>
+            <option value="4">PSNR-HVS-M-tuned Kodak</option>
+            <option value="5">Klein et al</option>
+            <option value="6">Watson et al</option>
+            <option value="7">Ahumada et al</option>
+            <option value="8">Peterson et al</option>
+          </select>
+        </label>
+        <label>
+          <input
+            name="trellis_multipass"
+            type="checkbox"
+            checked={options.trellis_multipass}
+            onChange={this.onChange}
+          />
+          <span>Consider multiple scans during trellis quantization</span>
+        </label>
+        <label style={{ display: options.trellis_multipass ? '' : 'none' }}>
+          <input
+            name="trellis_opt_zero"
+            type="checkbox"
+            checked={options.trellis_opt_zero}
+            onChange={this.onChange}
+          />
+          <span>Optimize runs of zero blocks</span>
+        </label>
+        <label>
+          <input
+            name="trellis_opt_table"
+            type="checkbox"
+            checked={options.trellis_opt_table}
+            onChange={this.onChange}
+          />
+          <span>Optimize after trellis quantization</span>
+        </label>
+        <label>
+          Trellis quantization passes:
+          <range-input
+            name="trellis_loops"
+            min="1"
+            max="50"
+            value={'' + options.trellis_loops}
+            onChange={this.onChange}
           />
-          Show advanced settings
         </label>
-        <Expander>
-          {showAdvanced ?
-            <div>
-              <label class={style.optionTextFirst}>
-                Channels:
-                <Select
-                  name="color_space"
-                  value={options.color_space}
-                  onChange={this.onChange}
-                >
-                  <option value={MozJpegColorSpace.GRAYSCALE}>Grayscale</option>
-                  <option value={MozJpegColorSpace.RGB}>RGB</option>
-                  <option value={MozJpegColorSpace.YCbCr}>YCbCr</option>
-                </Select>
-              </label>
-              <Expander>
-                {options.color_space === MozJpegColorSpace.YCbCr ?
-                  <div>
-                    <label class={style.optionInputFirst}>
-                      <Checkbox
-                        name="auto_subsample"
-                        checked={options.auto_subsample}
-                        onChange={this.onChange}
-                      />
-                      Auto subsample chroma
-                    </label>
-                    <Expander>
-                      {options.auto_subsample ? null :
-                        <div class={style.optionOneCell}>
-                          <Range
-                            name="chroma_subsample"
-                            min="1"
-                            max="4"
-                            value={options.chroma_subsample}
-                            onInput={this.onChange}
-                          >
-                            Subsample chroma by:
-                          </Range>
-                        </div>
-                      }
-                    </Expander>
-                    <label class={style.optionInputFirst}>
-                      <Checkbox
-                        name="separate_chroma_quality"
-                        checked={options.separate_chroma_quality}
-                        onChange={this.onChange}
-                      />
-                      Separate chroma quality
-                    </label>
-                    <Expander>
-                      {options.separate_chroma_quality ?
-                        <div class={style.optionOneCell}>
-                          <Range
-                            name="chroma_quality"
-                            min="0"
-                            max="100"
-                            value={options.chroma_quality}
-                            onInput={this.onChange}
-                          >
-                            Chroma quality:
-                          </Range>
-                        </div>
-                        : null
-                      }
-                    </Expander>
-                  </div>
-                  : null
-                }
-              </Expander>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="baseline"
-                  checked={options.baseline}
-                  onChange={this.onChange}
-                />
-                Pointless spec compliance
-              </label>
-              <Expander>
-                {options.baseline ? null :
-                  <label class={style.optionInputFirst}>
-                    <Checkbox
-                      name="progressive"
-                      checked={options.progressive}
-                      onChange={this.onChange}
-                    />
-                    Progressive rendering
-                  </label>
-                }
-              </Expander>
-              <Expander>
-                {options.baseline ?
-                  <label class={style.optionInputFirst}>
-                    <Checkbox
-                      name="optimize_coding"
-                      checked={options.optimize_coding}
-                      onChange={this.onChange}
-                    />
-                    Optimize Huffman table
-                  </label>
-                  : null
-                }
-              </Expander>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="smoothing"
-                  min="0"
-                  max="100"
-                  value={options.smoothing}
-                  onInput={this.onChange}
-                >
-                  Smoothing:
-                </Range>
-              </div>
-              <label class={style.optionTextFirst}>
-                Quantization:
-                <Select
-                  name="quant_table"
-                  value={options.quant_table}
-                  onChange={this.onChange}
-                >
-                  <option value="0">JPEG Annex K</option>
-                  <option value="1">Flat</option>
-                  <option value="2">MSSIM-tuned Kodak</option>
-                  <option value="3">ImageMagick</option>
-                  <option value="4">PSNR-HVS-M-tuned Kodak</option>
-                  <option value="5">Klein et al</option>
-                  <option value="6">Watson et al</option>
-                  <option value="7">Ahumada et al</option>
-                  <option value="8">Peterson et al</option>
-                </Select>
-              </label>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="trellis_multipass"
-                  checked={options.trellis_multipass}
-                  onChange={this.onChange}
-                />
-                Trellis multipass
-              </label>
-              <Expander>
-                {options.trellis_multipass ?
-                  <label class={style.optionInputFirst}>
-                    <Checkbox
-                      name="trellis_opt_zero"
-                      checked={options.trellis_opt_zero}
-                      onChange={this.onChange}
-                    />
-                    Optimize zero block runs
-                  </label>
-                  : null
-                }
-              </Expander>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="trellis_opt_table"
-                  checked={options.trellis_opt_table}
-                  onChange={this.onChange}
-                />
-                Optimize after trellis quantization
-              </label>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="trellis_loops"
-                  min="1"
-                  max="50"
-                  value={options.trellis_loops}
-                  onInput={this.onChange}
-                >
-                  Trellis quantization passes:
-                </Range>
-              </div>
-            </div>
-            : null
-          }
-        </Expander>
       </form>
     );
   }

src/codecs/optipng/encoder.ts

@@ -1,12 +1,12 @@
 import optipng, { OptiPngModule } from '../../../codecs/optipng/optipng';
 import wasmUrl from '../../../codecs/optipng/optipng.wasm';
 import { EncodeOptions } from './encoder-meta';
-import { initEmscriptenModule } from '../util';
+import { initWasmModule } from '../util';
 
 let emscriptenModule: Promise<OptiPngModule>;
 
 export async function compress(data: BufferSource, options: EncodeOptions): Promise<ArrayBuffer> {
-  if (!emscriptenModule) emscriptenModule = initEmscriptenModule(optipng, wasmUrl);
+  if (!emscriptenModule) emscriptenModule = initWasmModule(optipng, wasmUrl);
 
   const module = await emscriptenModule;
   const resultView = module.compress(data, options);

src/codecs/optipng/options.tsx

@@ -1,9 +1,7 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import { inputFieldValueAsNumber, preventDefault } from '../../lib/util';
+import { inputFieldValueAsNumber } from '../../lib/util';
 import { EncodeOptions } from './encoder-meta';
-import Range from '../../components/range';
-import * as style from '../../components/Options/style.scss';
 
 type Props = {
   options: EncodeOptions;
@@ -23,19 +21,19 @@ export default class OptiPNGEncoderOptions extends Component<Props, {}> {
 
   render({ options }: Props) {
     return (
-      <form class={style.optionsSection} onSubmit={preventDefault}>
+      <form>
-        <div class={style.optionOneCell}>
+        <label>
-          <Range
+          Effort:
+          <input
             name="level"
+            type="range"
             min="0"
             max="7"
             step="1"
-            value={options.level}
+            value={'' + options.level}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Effort:
+        </label>
-          </Range>
-        </div>
       </form>
     );
   }

src/codecs/processor-worker.ts

@@ -0,0 +1,41 @@
+import { expose } from 'comlink';
+import { EncodeOptions as MozJPEGEncoderOptions } from './mozjpeg/encoder-meta';
+import { QuantizeOptions } from './imagequant/processor-meta';
+import { EncodeOptions as OptiPNGEncoderOptions } from './optipng/encoder-meta';
+import { EncodeOptions as WebPEncoderOptions } from './webp/encoder-meta';
+
+async function mozjpegEncode(
+  data: ImageData, options: MozJPEGEncoderOptions,
+): Promise<ArrayBuffer> {
+  const { encode } = await import('./mozjpeg/encoder');
+  return encode(data, options);
+}
+
+async function quantize(data: ImageData, opts: QuantizeOptions): Promise<ImageData> {
+  const { process } = await import('./imagequant/processor');
+  return process(data, opts);
+}
+
+async function optiPngEncode(
+  data: BufferSource, options: OptiPNGEncoderOptions,
+): Promise<ArrayBuffer> {
+  const { compress } = await import('./optipng/encoder');
+  return compress(data, options);
+}
+
+async function webpEncode(
+  data: ImageData, options: WebPEncoderOptions,
+): Promise<ArrayBuffer> {
+  const { encode } = await import('./webp/encoder');
+  return encode(data, options);
+}
+
+async function webpDecode(data: ArrayBuffer): Promise<ImageData> {
+  const { decode } = await import('./webp/decoder');
+  return decode(data);
+}
+
+const exports = { mozjpegEncode, quantize, optiPngEncode, webpEncode, webpDecode };
+export type ProcessorWorkerApi = typeof exports;
+
+expose(exports, self);

src/codecs/processor-worker/index.ts

@@ -1,69 +0,0 @@
-import { expose } from 'comlink';
-
-async function mozjpegEncode(
-  data: ImageData, options: import('../mozjpeg/encoder-meta').EncodeOptions,
-): Promise<ArrayBuffer> {
-  const { encode } = await import(
-    /* webpackChunkName: "process-mozjpeg-enc" */
-    '../mozjpeg/encoder');
-  return encode(data, options);
-}
-
-async function quantize(
-  data: ImageData, opts: import('../imagequant/processor-meta').QuantizeOptions,
-): Promise<ImageData> {
-  const { process } = await import(
-    /* webpackChunkName: "process-imagequant" */
-    '../imagequant/processor');
-  return process(data, opts);
-}
-
-async function rotate(
-  data: ImageData, opts: import('../rotate/processor-meta').RotateOptions,
-): Promise<ImageData> {
-  const { rotate } = await import(
-    /* webpackChunkName: "process-rotate" */
-    '../rotate/processor');
-
-  return rotate(data, opts);
-}
-
-async function resize(
-  data: ImageData, opts: import('../resize/processor-meta').WorkerResizeOptions,
-): Promise<ImageData> {
-  const { resize } = await import(
-    /* webpackChunkName: "process-resize" */
-    '../resize/processor');
-
-  return resize(data, opts);
-}
-
-async function optiPngEncode(
-  data: BufferSource, options: import('../optipng/encoder-meta').EncodeOptions,
-): Promise<ArrayBuffer> {
-  const { compress } = await import(
-    /* webpackChunkName: "process-optipng" */
-    '../optipng/encoder');
-  return compress(data, options);
-}
-
-async function webpEncode(
-  data: ImageData, options: import('../webp/encoder-meta').EncodeOptions,
-): Promise<ArrayBuffer> {
-  const { encode } = await import(
-    /* webpackChunkName: "process-webp-enc" */
-    '../webp/encoder');
-  return encode(data, options);
-}
-
-async function webpDecode(data: ArrayBuffer): Promise<ImageData> {
-  const { decode } = await import(
-    /* webpackChunkName: "process-webp-dec" */
-    '../webp/decoder');
-  return decode(data);
-}
-
-const exports = { mozjpegEncode, quantize, rotate, resize, optiPngEncode, webpEncode, webpDecode };
-export type ProcessorWorkerApi = typeof exports;
-
-expose(exports, self);

src/codecs/processor-worker/tsconfig.json

@@ -1,18 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "strict": true,
-    "target": "esnext",
-    "module": "esnext",
-    "lib": [
-      "webworker",
-      "esnext"
-    ],
-    "moduleResolution": "node",
-    "experimentalDecorators": true,
-    "noUnusedLocals": true,
-    "sourceMap": true,
-    "allowJs": false,
-    "baseUrl": "."
-  }
-}

src/codecs/processor.ts

@@ -1,13 +1,14 @@
 import { proxy } from 'comlink';
 import { QuantizeOptions } from './imagequant/processor-meta';
+import { ProcessorWorkerApi } from './processor-worker';
 import { canvasEncode, blobToArrayBuffer } from '../lib/util';
 import { EncodeOptions as MozJPEGEncoderOptions } from './mozjpeg/encoder-meta';
 import { EncodeOptions as OptiPNGEncoderOptions } from './optipng/encoder-meta';
 import { EncodeOptions as WebPEncoderOptions } from './webp/encoder-meta';
 import { EncodeOptions as BrowserJPEGOptions } from './browser-jpeg/encoder-meta';
 import { EncodeOptions as BrowserWebpEncodeOptions } from './browser-webp/encoder-meta';
-import { BrowserResizeOptions, VectorResizeOptions } from './resize/processor-meta';
+import { BitmapResizeOptions, VectorResizeOptions } from './resize/processor-meta';
-import { browserResize, vectorResize } from './resize/processor-sync';
+import { resize, vectorResize } from './resize/processor';
 import * as browserBMP from './browser-bmp/encoder';
 import * as browserPNG from './browser-png/encoder';
 import * as browserJPEG from './browser-jpeg/encoder';
@@ -17,10 +18,8 @@ import * as browserTIFF from './browser-tiff/encoder';
 import * as browserJP2 from './browser-jp2/encoder';
 import * as browserPDF from './browser-pdf/encoder';
 
-type ProcessorWorkerApi = import('./processor-worker').ProcessorWorkerApi;
-
 /** How long the worker should be idle before terminating. */
-const workerTimeout = 10000;
+const workerTimeout = 1000;
 
 interface ProcessingJobOptions {
   needsWorker?: boolean;
@@ -62,10 +61,7 @@ export default class Processor {
           // worker-loader does magic here.
           // @ts-ignore - Typescript doesn't know about the 2nd param to new Worker, and the
           // definition can't be overwritten.
-          this._worker = new Worker(
+          this._worker = new Worker('./processor-worker.ts', { type: 'module' }) as Worker;
-            './processor-worker',
-            { name: 'processor-worker', type: 'module' },
-          ) as Worker;
           // Need to do some TypeScript trickery to make the type match.
           this._workerApi = proxy(this._worker) as any as ProcessorWorkerApi;
         }
@@ -96,6 +92,7 @@ export default class Processor {
     // If the worker is unused for 10 seconds, remove it to save memory.
     this._workerTimeoutId = self.setTimeout(
       () => {
+        if (this._busy) throw Error("Worker shouldn't be busy");
         if (!this._worker) return;
         this._worker.terminate();
         this._worker = undefined;
@@ -107,36 +104,23 @@ export default class Processor {
   /** Abort the current job, if any */
   abortCurrent() {
     if (!this._busy) return;
-    if (!this._abortRejector) throw Error("There must be a rejector if it's busy");
+    if (!this._worker || !this._abortRejector) {
+      throw Error("There must be a worker/rejector if it's busy");
+    }
     this._abortRejector(new DOMException('Aborted', 'AbortError'));
-    this._abortRejector = undefined;
-    this._busy = false;
-
-    if (!this._worker) return;
     this._worker.terminate();
     this._worker = undefined;
+    this._abortRejector = undefined;
+    this._busy = false;
   }
 
   // Off main thread jobs:
+
   @Processor._processingJob({ needsWorker: true })
   imageQuant(data: ImageData, opts: QuantizeOptions): Promise<ImageData> {
     return this._workerApi!.quantize(data, opts);
   }
 
-  @Processor._processingJob({ needsWorker: true })
-  rotate(
-    data: ImageData, opts: import('./rotate/processor-meta').RotateOptions,
-  ): Promise<ImageData> {
-    return this._workerApi!.rotate(data, opts);
-  }
-
-  @Processor._processingJob({ needsWorker: true })
-  workerResize(
-    data: ImageData, opts: import('./resize/processor-meta').WorkerResizeOptions,
-  ): Promise<ImageData> {
-    return this._workerApi!.resize(data, opts);
-  }
-
   @Processor._processingJob({ needsWorker: true })
   mozjpegEncode(
     data: ImageData, opts: MozJPEGEncoderOptions,
@@ -209,9 +193,9 @@ export default class Processor {
 
   // Synchronous jobs
 
-  resize(data: ImageData, opts: BrowserResizeOptions) {
+  resize(data: ImageData, opts: BitmapResizeOptions) {
     this.abortCurrent();
-    return browserResize(data, opts);
+    return resize(data, opts);
   }
 
   vectorResize(data: HTMLImageElement, opts: VectorResizeOptions) {

src/codecs/resize/options.tsx

@@ -1,14 +1,8 @@
 import { h, Component } from 'preact';
 import linkState from 'linkstate';
-import { bind, linkRef } from '../../lib/initial-util';
+import { bind } from '../../lib/initial-util';
-import {
+import { inputFieldValueAsNumber } from '../../lib/util';
-  inputFieldValueAsNumber, inputFieldValue, preventDefault, inputFieldChecked,
+import { ResizeOptions } from './processor-meta';
-} from '../../lib/util';
-import { ResizeOptions, isWorkerOptions } from './processor-meta';
-import * as style from '../../components/Options/style.scss';
-import Checkbox from '../../components/checkbox';
-import Expander from '../../components/expander';
-import Select from '../../components/select';
 
 interface Props {
   isVector: Boolean;
@@ -28,28 +22,23 @@ export default class ResizerOptions extends Component<Props, State> {
 
   form?: HTMLFormElement;
 
-  private reportOptions() {
+  reportOptions() {
-    const form = this.form!;
+    const width = this.form!.width as HTMLInputElement;
-    const width = form.width as HTMLInputElement;
+    const height = this.form!.height as HTMLInputElement;
-    const height = form.height as HTMLInputElement;
-    const { options } = this.props;
 
     if (!width.checkValidity() || !height.checkValidity()) return;
 
-    const newOptions: ResizeOptions = {
+    const options: ResizeOptions = {
       width: inputFieldValueAsNumber(width),
       height: inputFieldValueAsNumber(height),
-      method: form.resizeMethod.value,
+      method: this.form!.resizeMethod.value,
-      premultiply: inputFieldChecked(form.premultiply, true),
+      fitMethod: this.form!.fitMethod.value,
-      linearRGB: inputFieldChecked(form.linearRGB, true),
-      // Casting, as the formfield only returns the correct values.
-      fitMethod: inputFieldValue(form.fitMethod, options.fitMethod) as ResizeOptions['fitMethod'],
     };
-    this.props.onChange(newOptions);
+    this.props.onChange(options);
   }
 
   @bind
-  private onChange() {
+  onChange(event: Event) {
     this.reportOptions();
   }
 
@@ -61,117 +50,81 @@ export default class ResizerOptions extends Component<Props, State> {
   }
 
   @bind
-  private onWidthInput() {
+  onWidthInput(event: Event) {
-    if (this.state.maintainAspect) {
+    if (!this.state.maintainAspect) return;
-      const width = inputFieldValueAsNumber(this.form!.width);
-      this.form!.height.value = Math.round(width / this.props.aspect);
-    }
 
-    this.reportOptions();
+    const width = inputFieldValueAsNumber(this.form!.width);
+    this.form!.height.value = Math.round(width / this.props.aspect);
   }
 
   @bind
-  private onHeightInput() {
+  onHeightInput(event: Event) {
-    if (this.state.maintainAspect) {
+    if (!this.state.maintainAspect) return;
-      const height = inputFieldValueAsNumber(this.form!.height);
-      this.form!.width.value = Math.round(height * this.props.aspect);
-    }
 
-    this.reportOptions();
+    const height = inputFieldValueAsNumber(this.form!.height);
+    this.form!.width.value = Math.round(height * this.props.aspect);
   }
 
-  render({ options, isVector }: Props, { maintainAspect }: State) {
+  render({ options, aspect, isVector }: Props, { maintainAspect }: State) {
     return (
-      <form ref={linkRef(this, 'form')} class={style.optionsSection} onSubmit={preventDefault}>
+      <form ref={el => this.form = el}>
-        <label class={style.optionTextFirst}>
+        <label>
           Method:
-          <Select
+          <select
             name="resizeMethod"
             value={options.method}
             onChange={this.onChange}
           >
             {isVector && <option value="vector">Vector</option>}
-            <option value="lanczos3">Lanczos3</option>
-            <option value="mitchell">Mitchell</option>
-            <option value="catrom">Catmull-Rom</option>
-            <option value="triangle">Triangle (bilinear)</option>
             <option value="browser-pixelated">Browser pixelated</option>
             <option value="browser-low">Browser low quality</option>
             <option value="browser-medium">Browser medium quality</option>
             <option value="browser-high">Browser high quality</option>
-          </Select>
+          </select>
         </label>
-        <label class={style.optionTextFirst}>
+        <label>
           Width:
           <input
             required
-            class={style.textField}
             name="width"
             type="number"
             min="1"
             value={'' + options.width}
+            onChange={this.onChange}
             onInput={this.onWidthInput}
           />
         </label>
-        <label class={style.optionTextFirst}>
+        <label>
           Height:
           <input
             required
-            class={style.textField}
             name="height"
             type="number"
             min="1"
             value={'' + options.height}
-            onInput={this.onHeightInput}
+            onChange={this.onChange}
           />
         </label>
-        <Expander>
+        <label>
-          {isWorkerOptions(options) ?
+          <input
-            <label class={style.optionInputFirst}>
-              <Checkbox
-                name="premultiply"
-                checked={options.premultiply}
-                onChange={this.onChange}
-              />
-              Premultiply alpha channel
-            </label>
-            : null
-          }
-          {isWorkerOptions(options) ?
-            <label class={style.optionInputFirst}>
-              <Checkbox
-                name="linearRGB"
-                checked={options.linearRGB}
-                onChange={this.onChange}
-              />
-              Linear RGB
-            </label>
-            : null
-          }
-        </Expander>
-        <label class={style.optionInputFirst}>
-          <Checkbox
             name="maintainAspect"
+            type="checkbox"
             checked={maintainAspect}
             onChange={linkState(this, 'maintainAspect')}
           />
           Maintain aspect ratio
         </label>
-        <Expander>
+        <label style={{ display: maintainAspect ? 'none' : '' }}>
-          {maintainAspect ? null :
+          Fit method:
-            <label class={style.optionTextFirst}>
+          <select
-              Fit method:
+            name="fitMethod"
-              <Select
+            value={options.fitMethod}
-                name="fitMethod"
+            onChange={this.onChange}
-                value={options.fitMethod}
+          >
-                onChange={this.onChange}
+            <option value="stretch">Stretch</option>
-              >
+            <option value="cover">Cover</option>
-                <option value="stretch">Stretch</option>
+          </select>
-                <option value="contain">Contain</option>
+        </label>
-              </Select>
-            </label>
-          }
-        </Expander>
       </form>
     );
   }

src/codecs/resize/processor-meta.ts

@@ -1,46 +1,26 @@
-type BrowserResizeMethods = 'browser-pixelated' | 'browser-low' | 'browser-medium' | 'browser-high';
+type BitmapResizeMethods = 'browser-pixelated' | 'browser-low' | 'browser-medium' | 'browser-high';
-type WorkerResizeMethods = 'triangle' | 'catrom' | 'mitchell' | 'lanczos3';
-const workerResizeMethods: WorkerResizeMethods[] = ['triangle', 'catrom', 'mitchell', 'lanczos3'];
 
-export type ResizeOptions = BrowserResizeOptions | WorkerResizeOptions | VectorResizeOptions;
+export interface ResizeOptions {
-
-export interface ResizeOptionsCommon {
   width: number;
   height: number;
-  fitMethod: 'stretch' | 'contain';
+  method: 'vector' | BitmapResizeMethods;
+  fitMethod: 'stretch' | 'cover';
 }
 
-export interface BrowserResizeOptions extends ResizeOptionsCommon {
+export interface BitmapResizeOptions extends ResizeOptions {
-  method: BrowserResizeMethods;
+  method: BitmapResizeMethods;
 }
 
-export interface WorkerResizeOptions extends ResizeOptionsCommon {
+export interface VectorResizeOptions extends ResizeOptions {
-  method: WorkerResizeMethods;
-  premultiply: boolean;
-  linearRGB: boolean;
-}
-
-export interface VectorResizeOptions extends ResizeOptionsCommon {
   method: 'vector';
 }
 
-/**
- * Return whether a set of options are worker resize options.
- *
- * @param opts
- */
-export function isWorkerOptions(opts: ResizeOptions): opts is WorkerResizeOptions {
-  return (workerResizeMethods as string[]).includes(opts.method);
-}
-
 export const defaultOptions: ResizeOptions = {
   // Width and height will always default to the image size.
   // This is set elsewhere.
   width: 1,
   height: 1,
   // This will be set to 'vector' if the input is SVG.
-  method: 'lanczos3',
+  method: 'browser-high',
   fitMethod: 'stretch',
-  premultiply: true,
-  linearRGB: true,
 };

src/codecs/resize/processor-sync.ts

@@ -1,35 +0,0 @@
-import { nativeResize, NativeResizeMethod, drawableToImageData } from '../../lib/util';
-import { BrowserResizeOptions, VectorResizeOptions } from './processor-meta';
-import { getContainOffsets } from './util';
-
-export function browserResize(data: ImageData, opts: BrowserResizeOptions): ImageData {
-  let sx = 0;
-  let sy = 0;
-  let sw = data.width;
-  let sh = data.height;
-
-  if (opts.fitMethod === 'contain') {
-    ({ sx, sy, sw, sh } = getContainOffsets(sw, sh, opts.width, opts.height));
-  }
-
-  return nativeResize(
-    data, sx, sy, sw, sh, opts.width, opts.height,
-    opts.method.slice('browser-'.length) as NativeResizeMethod,
-  );
-}
-
-export function vectorResize(data: HTMLImageElement, opts: VectorResizeOptions): ImageData {
-  let sx = 0;
-  let sy = 0;
-  let sw = data.width;
-  let sh = data.height;
-
-  if (opts.fitMethod === 'contain') {
-    ({ sx, sy, sw, sh } = getContainOffsets(sw, sh, opts.width, opts.height));
-  }
-
-  return drawableToImageData(data, {
-    sx, sy, sw, sh,
-    width: opts.width, height: opts.height,
-  });
-}

src/codecs/resize/processor.ts

@@ -1,52 +1,49 @@
-import wasmUrl from '../../../codecs/resize/pkg/resize_bg.wasm';
+import { nativeResize, NativeResizeMethod, drawableToImageData } from '../../lib/util';
-import '../../../codecs/resize/pkg/resize';
+import { BitmapResizeOptions, VectorResizeOptions } from './processor-meta';
-import { WorkerResizeOptions } from './processor-meta';
-import { getContainOffsets } from './util';
 
-interface WasmBindgenExports {
+function getCoverOffsets(sw: number, sh: number, dw: number, dh: number) {
-  resize: typeof import('../../../codecs/resize/pkg/resize').resize;
+  const currentAspect = sw / sh;
-}
+  const endAspect = dw / dh;
 
-type WasmBindgen = ((url: string) => Promise<void>) & WasmBindgenExports;
+  if (endAspect > currentAspect) {
-
+    const newSh = sw / endAspect;
-declare var wasm_bindgen: WasmBindgen;
+    const newSy = (sh - newSh) / 2;
-
+    return { sw, sh: newSh, sx: 0, sy: newSy };
-const ready = wasm_bindgen(wasmUrl);
-
-function crop(data: ImageData, sx: number, sy: number, sw: number, sh: number): ImageData {
-  const inputPixels = new Uint32Array(data.data.buffer);
-
-  // Copy within the same buffer for speed and memory efficiency.
-  for (let y = 0; y < sh; y += 1) {
-    const start = ((y + sy) * data.width) + sx;
-    inputPixels.copyWithin(y * sw, start, start + sw);
   }
 
-  return new ImageData(
+  const newSw = sh * endAspect;
-    new Uint8ClampedArray(inputPixels.buffer.slice(0, sw * sh * 4)),
+  const newSx = (sw - newSw) / 2;
-    sw, sh,
+  return { sh, sw: newSw, sx: newSx, sy: 0 };
+}
+
+export function resize(data: ImageData, opts: BitmapResizeOptions): ImageData {
+  let sx = 0;
+  let sy = 0;
+  let sw = data.width;
+  let sh = data.height;
+
+  if (opts.fitMethod === 'cover') {
+    ({ sx, sy, sw, sh } = getCoverOffsets(sw, sh, opts.width, opts.height));
+  }
+
+  return nativeResize(
+    data, sx, sy, sw, sh, opts.width, opts.height,
+    opts.method.slice('browser-'.length) as NativeResizeMethod,
   );
 }
 
-/** Resize methods by index */
+export function vectorResize(data: HTMLImageElement, opts: VectorResizeOptions): ImageData {
-const resizeMethods: WorkerResizeOptions['method'][] = [
+  let sx = 0;
-  'triangle', 'catrom', 'mitchell', 'lanczos3',
+  let sy = 0;
-];
+  let sw = data.width;
+  let sh = data.height;
 
-export async function resize(data: ImageData, opts: WorkerResizeOptions): Promise<ImageData> {
+  if (opts.fitMethod === 'cover') {
-  let input = data;
+    ({ sx, sy, sw, sh } = getCoverOffsets(sw, sh, opts.width, opts.height));
-
-  if (opts.fitMethod === 'contain') {
-    const { sx, sy, sw, sh } = getContainOffsets(data.width, data.height, opts.width, opts.height);
-    input = crop(input, Math.round(sx), Math.round(sy), Math.round(sw), Math.round(sh));
   }
 
-  await ready;
+  return drawableToImageData(data, {
-
+    sx, sy, sw, sh,
-  const result = wasm_bindgen.resize(
+    width: opts.width, height: opts.height,
-    new Uint8Array(input.data.buffer), input.width, input.height, opts.width, opts.height,
+  });
-    resizeMethods.indexOf(opts.method), opts.premultiply, opts.linearRGB,
-  );
-
-  return new ImageData(new Uint8ClampedArray(result.buffer), opts.width, opts.height);
 }

src/codecs/resize/util.ts

@@ -1,14 +0,0 @@
-export function getContainOffsets(sw: number, sh: number, dw: number, dh: number) {
-  const currentAspect = sw / sh;
-  const endAspect = dw / dh;
-
-  if (endAspect > currentAspect) {
-    const newSh = sw / endAspect;
-    const newSy = (sh - newSh) / 2;
-    return { sw, sh: newSh, sx: 0, sy: newSy };
-  }
-
-  const newSw = sh * endAspect;
-  const newSx = (sw - newSw) / 2;
-  return { sh, sw: newSw, sx: newSx, sy: 0 };
-}

src/codecs/rotate/processor-meta.ts

@@ -1,12 +0,0 @@
-export interface RotateOptions {
-  rotate: 0 | 90 | 180 | 270;
-}
-
-export const defaultOptions: RotateOptions = { rotate: 0 };
-
-export interface RotateModuleInstance {
-  exports: {
-    memory: WebAssembly.Memory;
-    rotate(width: number, height: number, rotate: 0 | 90 | 180 | 270): void;
-  };
-}

src/codecs/rotate/processor.ts

@@ -1,43 +0,0 @@
-import wasmUrl from '../../../codecs/rotate/rotate.wasm';
-import { RotateOptions, RotateModuleInstance } from './processor-meta';
-
-// We are loading a 500B module here. Loading the code to feature-detect
-// `instantiateStreaming` probably takes longer to load than the time we save by
-// using `instantiateStreaming` in the first place. So let’s just use
-// `ArrayBuffer`s here.
-const instancePromise = fetch(wasmUrl)
-  .then(r => r.arrayBuffer())
-  .then(buf => WebAssembly.instantiate(buf));
-
-export async function rotate(
-  data: ImageData,
-  opts: RotateOptions,
-): Promise<ImageData> {
-  const { instance } = (await instancePromise) as {
-    instance: RotateModuleInstance;
-  };
-
-  // Number of wasm memory pages (á 64KiB) needed to store the image twice.
-  const bytesPerImage = data.width * data.height * 4;
-  const numPagesNeeded = Math.ceil((bytesPerImage * 2 + 8) / (64 * 1024));
-  // Only count full pages, just to be safe.
-  const numPagesAvailable = Math.floor(
-    instance.exports.memory.buffer.byteLength / (64 * 1024),
-  );
-  const additionalPagesToAllocate = numPagesNeeded - numPagesAvailable;
-
-  if (additionalPagesToAllocate > 0) {
-    instance.exports.memory.grow(additionalPagesToAllocate);
-  }
-  const view = new Uint8ClampedArray(instance.exports.memory.buffer);
-  view.set(data.data, 8);
-
-  instance.exports.rotate(data.width, data.height, opts.rotate);
-
-  const flipDimensions = opts.rotate % 180 !== 0;
-  return new ImageData(
-    view.slice(bytesPerImage + 8, bytesPerImage * 2 + 8),
-    flipDimensions ? data.height : data.width,
-    flipDimensions ? data.width : data.height,
-  );
-}

src/codecs/util.ts

@@ -2,7 +2,7 @@ type ModuleFactory<M extends EmscriptenWasm.Module> = (
   opts: EmscriptenWasm.ModuleOpts,
 ) => M;
 
-export function initEmscriptenModule<T extends EmscriptenWasm.Module>(
+export function initWasmModule<T extends EmscriptenWasm.Module>(
   moduleFactory: ModuleFactory<T>,
   wasmUrl: string,
 ): Promise<T> {

src/codecs/webp/decoder.ts

@@ -1,11 +1,11 @@
 import webp_dec, { WebPModule } from '../../../codecs/webp_dec/webp_dec';
 import wasmUrl from '../../../codecs/webp_dec/webp_dec.wasm';
-import { initEmscriptenModule } from '../util';
+import { initWasmModule } from '../util';
 
 let emscriptenModule: Promise<WebPModule>;
 
 export async function decode(data: ArrayBuffer): Promise<ImageData> {
-  if (!emscriptenModule) emscriptenModule = initEmscriptenModule(webp_dec, wasmUrl);
+  if (!emscriptenModule) emscriptenModule = initWasmModule(webp_dec, wasmUrl);
 
   const module = await emscriptenModule;
   const rawImage = module.decode(data);

src/codecs/webp/encoder.ts

@@ -1,12 +1,12 @@
 import webp_enc, { WebPModule } from '../../../codecs/webp_enc/webp_enc';
 import wasmUrl from '../../../codecs/webp_enc/webp_enc.wasm';
 import { EncodeOptions } from './encoder-meta';
-import { initEmscriptenModule } from '../util';
+import { initWasmModule } from '../util';
 
 let emscriptenModule: Promise<WebPModule>;
 
 export async function encode(data: ImageData, options: EncodeOptions): Promise<ArrayBuffer> {
-  if (!emscriptenModule) emscriptenModule = initEmscriptenModule(webp_enc, wasmUrl);
+  if (!emscriptenModule) emscriptenModule = initWasmModule(webp_enc, wasmUrl);
 
   const module = await emscriptenModule;
   const resultView = module.encode(data.data, data.width, data.height, options);

src/codecs/webp/options.tsx

@@ -1,22 +1,14 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import { inputFieldCheckedAsNumber, inputFieldValueAsNumber, preventDefault } from '../../lib/util';
+import { inputFieldCheckedAsNumber, inputFieldValueAsNumber } from '../../lib/util';
 import { EncodeOptions, WebPImageHint } from './encoder-meta';
-import * as style from '../../components/Options/style.scss';
+import * as styles from './styles.scss';
-import Checkbox from '../../components/checkbox';
+import '../../custom-els/RangeInput';
-import Expander from '../../components/expander';
-import Select from '../../components/select';
-import Range from '../../components/range';
-import linkState from 'linkstate';
 
-interface Props {
+type Props = {
-  options: EncodeOptions;
+  options: EncodeOptions,
-  onChange(newOptions: EncodeOptions): void;
+  onChange(newOptions: EncodeOptions): void,
-}
+};
-
-interface State {
-  showAdvanced: boolean;
-}
 
 // From kLosslessPresets in config_enc.c
 // The format is [method, quality].
@@ -26,291 +18,257 @@ const losslessPresets:[number, number][] = [
 ];
 const losslessPresetDefault = 6;
 
-function determineLosslessQuality(quality: number, method: number): number {
+function determineLosslessQuality(quality: number): number {
-  const index = losslessPresets.findIndex(
+  const index = losslessPresets.findIndex(item => item[1] === quality);
-    ([presetMethod, presetQuality]) => presetMethod === method && presetQuality === quality,
-  );
   if (index !== -1) return index;
   // Quality doesn't match one of the presets.
   // This can happen when toggling 'lossless'.
   return losslessPresetDefault;
 }
 
-export default class WebPEncoderOptions extends Component<Props, State> {
+export default class WebPEncoderOptions extends Component<Props, {}> {
-  state: State = {
-    showAdvanced: false,
-  };
-
   @bind
   onChange(event: Event) {
     const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
     const lossless = inputFieldCheckedAsNumber(form.lossless);
-    const { options } = this.props;
+    const losslessPresetInput = (form.lossless_preset as HTMLInputElement);
-    const losslessPresetValue = inputFieldValueAsNumber(
-      form.lossless_preset, determineLosslessQuality(options.quality, options.method),
-    );
 
-    const newOptions: EncodeOptions = {
+    const options: EncodeOptions = {
       // Copy over options the form doesn't care about, eg emulate_jpeg_size
-      ...options,
+      ...this.props.options,
       // And now stuff from the form:
       lossless,
       // Special-cased inputs:
       // In lossless mode, the quality is derived from the preset.
       quality: lossless ?
-        losslessPresets[losslessPresetValue][1] :
+        losslessPresets[Number(losslessPresetInput.value)][1] :
-        inputFieldValueAsNumber(form.quality, options.quality),
+        inputFieldValueAsNumber(form.quality),
       // In lossless mode, the method is derived from the preset.
       method: lossless ?
-        losslessPresets[losslessPresetValue][0] :
+        losslessPresets[Number(losslessPresetInput.value)][0] :
-        inputFieldValueAsNumber(form.method_input, options.method),
+        inputFieldValueAsNumber(form.method_input),
-      image_hint: inputFieldCheckedAsNumber(form.image_hint, options.image_hint) ?
+      image_hint: (form.image_hint as HTMLInputElement).checked ?
         WebPImageHint.WEBP_HINT_GRAPH :
         WebPImageHint.WEBP_HINT_DEFAULT,
       // .checked
-      exact: inputFieldCheckedAsNumber(form.exact, options.exact),
+      exact: inputFieldCheckedAsNumber(form.exact),
-      alpha_compression: inputFieldCheckedAsNumber(
+      alpha_compression: inputFieldCheckedAsNumber(form.alpha_compression),
-        form.alpha_compression, options.alpha_compression,
+      autofilter: inputFieldCheckedAsNumber(form.autofilter),
-      ),
+      filter_type: inputFieldCheckedAsNumber(form.filter_type),
-      autofilter: inputFieldCheckedAsNumber(form.autofilter, options.autofilter),
+      use_sharp_yuv: inputFieldCheckedAsNumber(form.use_sharp_yuv),
-      filter_type: inputFieldCheckedAsNumber(form.filter_type, options.filter_type),
-      use_sharp_yuv: inputFieldCheckedAsNumber(form.use_sharp_yuv, options.use_sharp_yuv),
       // .value
-      near_lossless: 100 - inputFieldValueAsNumber(form.near_lossless, 100 - options.near_lossless),
+      near_lossless: 100 - inputFieldValueAsNumber(form.near_lossless),
-      alpha_quality: inputFieldValueAsNumber(form.alpha_quality, options.alpha_quality),
+      alpha_quality: inputFieldValueAsNumber(form.alpha_quality),
-      alpha_filtering: inputFieldValueAsNumber(form.alpha_filtering, options.alpha_filtering),
+      alpha_filtering: inputFieldValueAsNumber(form.alpha_filtering),
-      sns_strength: inputFieldValueAsNumber(form.sns_strength, options.sns_strength),
+      sns_strength: inputFieldValueAsNumber(form.sns_strength),
-      filter_strength: inputFieldValueAsNumber(form.filter_strength, options.filter_strength),
+      filter_strength: inputFieldValueAsNumber(form.filter_strength),
-      filter_sharpness:
+      filter_sharpness: 7 - inputFieldValueAsNumber(form.filter_sharpness),
-        7 - inputFieldValueAsNumber(form.filter_sharpness, 7 - options.filter_sharpness),
+      pass: inputFieldValueAsNumber(form.pass),
-      pass: inputFieldValueAsNumber(form.pass, options.pass),
+      preprocessing: inputFieldValueAsNumber(form.preprocessing),
-      preprocessing: inputFieldValueAsNumber(form.preprocessing, options.preprocessing),
+      segments: inputFieldValueAsNumber(form.segments),
-      segments: inputFieldValueAsNumber(form.segments, options.segments),
+      partitions: inputFieldValueAsNumber(form.partitions),
-      partitions: inputFieldValueAsNumber(form.partitions, options.partitions),
     };
-    this.props.onChange(newOptions);
+    this.props.onChange(options);
   }
 
   private _losslessSpecificOptions(options: EncodeOptions) {
     return (
-      <div key="lossless">
+      <div>
-        <div class={style.optionOneCell}>
+        <label>
-          <Range
+          Effort:
+          <range-input
             name="lossless_preset"
             min="0"
             max="9"
-            value={determineLosslessQuality(options.quality, options.method)}
+            value={'' + determineLosslessQuality(options.quality)}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Effort:
+        </label>
-          </Range>
+        <label>
-        </div>
+          Slight loss:
-        <div class={style.optionOneCell}>
+          <range-input
-          <Range
             name="near_lossless"
             min="0"
             max="100"
             value={'' + (100 - options.near_lossless)}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Slight loss:
+        </label>
-          </Range>
+        <label>
-        </div>
-        <label class={style.optionInputFirst}>
           {/*
             Although there are 3 different kinds of image hint, webp only
             seems to do something with the 'graph' type, and I don't really
             understand what it does.
           */}
-          <Checkbox
+          <input
             name="image_hint"
+            type="checkbox"
             checked={options.image_hint === WebPImageHint.WEBP_HINT_GRAPH}
+            value={'' + WebPImageHint.WEBP_HINT_GRAPH}
             onChange={this.onChange}
           />
-          Discrete tone image
+          <span>Discrete tone image (graph, map-tile etc)</span>
         </label>
       </div>
     );
   }
 
   private _lossySpecificOptions(options: EncodeOptions) {
-    const { showAdvanced } = this.state;
-
     return (
-      <div key="lossy">
+      <div>
-        <div class={style.optionOneCell}>
+        <label>
-          <Range
+          Effort:
+          <range-input
             name="method_input"
             min="0"
             max="6"
-            value={options.method}
+            value={'' + options.method}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Effort:
+        </label>
-          </Range>
+        <label>
-        </div>
+          Quality:
-        <div class={style.optionOneCell}>
+          <range-input
-          <Range
             name="quality"
             min="0"
             max="100"
-            step="0.1"
+            step="0.01"
-            value={options.quality}
+            value={'' + options.quality}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Quality:
+        </label>
-          </Range>
+        <hr />
-        </div>
+        <label>
-        <label class={style.optionInputFirst}>
+          <input
-          <Checkbox
+            name="alpha_compression"
-            checked={showAdvanced}
+            type="checkbox"
-            onChange={linkState(this, 'showAdvanced')}
+            checked={!!options.alpha_compression}
+            onChange={this.onChange}
+          />
+          Compress alpha
+        </label>
+        <label>
+          Alpha quality:
+          <range-input
+            name="alpha_quality"
+            min="0"
+            max="100"
+            value={'' + options.alpha_quality}
+            onChange={this.onChange}
+          />
+        </label>
+        <label>
+          Alpha filter quality:
+          <range-input
+            name="alpha_filtering"
+            min="0"
+            max="2"
+            value={'' + options.alpha_filtering}
+            onChange={this.onChange}
+          />
+        </label>
+        <hr />
+        <label>
+          <input
+            name="autofilter"
+            type="checkbox"
+            checked={!!options.autofilter}
+            onChange={this.onChange}
+          />
+          <span>Auto adjust filter strength</span>
+        </label>
+        <label>
+          Filter strength:
+          <range-input
+            name="filter_strength"
+            min="0"
+            max="100"
+            disabled={!!options.autofilter}
+            value={'' + options.filter_strength}
+            onChange={this.onChange}
+          />
+        </label>
+        <label>
+          <input
+            name="filter_type"
+            type="checkbox"
+            checked={!!options.filter_type}
+            onChange={this.onChange}
+          />
+          Strong filter
+        </label>
+        <label>
+          Filter sharpness:
+          <range-input
+            name="filter_sharpness"
+            min="0"
+            max="7"
+            value={'' + (7 - options.filter_sharpness)}
+            onChange={this.onChange}
+          />
+        </label>
+        <label>
+          <input
+            name="use_sharp_yuv"
+            type="checkbox"
+            checked={!!options.use_sharp_yuv}
+            onChange={this.onChange}
+          />
+          Sharp RGB->YUV conversion
+        </label>
+        <hr />
+        <label>
+          Passes:
+          <range-input
+            name="pass"
+            min="1"
+            max="10"
+            value={'' + options.pass}
+            onChange={this.onChange}
+          />
+        </label>
+        <label>
+          Spacial noise shaping:
+          <range-input
+            name="sns_strength"
+            min="0"
+            max="100"
+            value={'' + options.sns_strength}
+            onChange={this.onChange}
+          />
+        </label>
+        <label>
+          Preprocessing type:
+          <select
+            name="preprocessing"
+            value={'' + options.preprocessing}
+            onChange={this.onChange}
+          >
+            <option value="0">None</option>
+            <option value="1">Segment smooth</option>
+            <option value="2">Pseudo-random dithering</option>
+          </select>
+        </label>
+        <label>
+          Segments:
+          <range-input
+            name="segments"
+            min="1"
+            max="4"
+            value={'' + options.segments}
+            onChange={this.onChange}
+          />
+        </label>
+        <label>
+          Partitions:
+          <range-input
+            name="partitions"
+            min="0"
+            max="3"
+            value={'' + options.partitions}
+            onChange={this.onChange}
           />
-          Show advanced settings
         </label>
-        <Expander>
-          {showAdvanced ?
-            <div>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="alpha_compression"
-                  checked={!!options.alpha_compression}
-                  onChange={this.onChange}
-                />
-                Compress alpha
-              </label>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="alpha_quality"
-                  min="0"
-                  max="100"
-                  value={options.alpha_quality}
-                  onInput={this.onChange}
-                >
-                  Alpha quality:
-                </Range>
-              </div>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="alpha_filtering"
-                  min="0"
-                  max="2"
-                  value={options.alpha_filtering}
-                  onInput={this.onChange}
-                >
-                  Alpha filter quality:
-                </Range>
-              </div>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="autofilter"
-                  checked={!!options.autofilter}
-                  onChange={this.onChange}
-                />
-                Auto adjust filter strength
-              </label>
-              <Expander>
-                {options.autofilter ? null :
-                  <div class={style.optionOneCell}>
-                    <Range
-                      name="filter_strength"
-                      min="0"
-                      max="100"
-                      value={options.filter_strength}
-                      onInput={this.onChange}
-                    >
-                      Filter strength:
-                    </Range>
-                  </div>
-                }
-              </Expander>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="filter_type"
-                  checked={!!options.filter_type}
-                  onChange={this.onChange}
-                />
-                Strong filter
-              </label>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="filter_sharpness"
-                  min="0"
-                  max="7"
-                  value={7 - options.filter_sharpness}
-                  onInput={this.onChange}
-                >
-                  Filter sharpness:
-                </Range>
-              </div>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="use_sharp_yuv"
-                  checked={!!options.use_sharp_yuv}
-                  onChange={this.onChange}
-                />
-                Sharp RGB→YUV conversion
-              </label>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="pass"
-                  min="1"
-                  max="10"
-                  value={options.pass}
-                  onInput={this.onChange}
-                >
-                  Passes:
-                </Range>
-              </div>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="sns_strength"
-                  min="0"
-                  max="100"
-                  value={options.sns_strength}
-                  onInput={this.onChange}
-                >
-                  Spacial noise shaping:
-                </Range>
-              </div>
-              <label class={style.optionTextFirst}>
-                Preprocess:
-                <Select
-                  name="preprocessing"
-                  value={options.preprocessing}
-                  onChange={this.onChange}
-                >
-                  <option value="0">None</option>
-                  <option value="1">Segment smooth</option>
-                  <option value="2">Pseudo-random dithering</option>
-                </Select>
-              </label>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="segments"
-                  min="1"
-                  max="4"
-                  value={options.segments}
-                  onInput={this.onChange}
-                >
-                  Segments:
-                </Range>
-              </div>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="partitions"
-                  min="0"
-                  max="3"
-                  value={options.partitions}
-                  onInput={this.onChange}
-                >
-                  Partitions:
-                </Range>
-              </div>
-            </div>
-            : null
-          }
-        </Expander>
       </div>
     );
   }
@@ -319,26 +277,32 @@ export default class WebPEncoderOptions extends Component<Props, State> {
     // I'm rendering both lossy and lossless forms, as it becomes much easier when
     // gathering the data.
     return (
-      <form class={style.optionsSection} onSubmit={preventDefault}>
+      <form>
-        <label class={style.optionInputFirst}>
+        <label>
-          <Checkbox
+          <input
             name="lossless"
+            type="checkbox"
             checked={!!options.lossless}
             onChange={this.onChange}
           />
           Lossless
         </label>
-        {options.lossless
+        <div class={options.lossless ? '' : styles.hide}>
-          ? this._losslessSpecificOptions(options)
+          {this._losslessSpecificOptions(options)}
-          : this._lossySpecificOptions(options)
+        </div>
-        }
+        <div class={options.lossless ? styles.hide : ''}>
-        <label class={style.optionInputFirst}>
+          {this._lossySpecificOptions(options)}
-          <Checkbox
+        </div>
+        <label>
+          <input
             name="exact"
+            type="checkbox"
             checked={!!options.exact}
             onChange={this.onChange}
           />
-          Preserve transparent data
+          <span>
+            Preserve transparent data. Otherwise, pixels with zero alpha will have RGB also zeroed.
+          </span>
         </label>
       </form>
     );

src/codecs/webp/styles.scss

@@ -0,0 +1,3 @@
+.hide {
+  display: none;
+}

src/components/App/client-api.ts

@@ -1,106 +0,0 @@
-import App from './index';
-import { SquooshStartEventType, SquooshSideEventType } from '../compress/index';
-
-import { expose } from 'comlink';
-
-export interface ReadyMessage {
-  type: 'READY';
-  version: string;
-}
-
-export function exposeAPI(app: App) {
-  if (window === top) {
-    // Someone opened Squoosh in a window rather than an iframe.
-    // This can be deceiving and we won’t allow that.
-    return;
-  }
-  self.parent.postMessage({ type: 'READY', version: MAJOR_VERSION }, '*');
-  self.addEventListener('message', (event: MessageEvent) => {
-    if (event.data !== 'READY?') {
-      return;
-    }
-    event.stopImmediatePropagation();
-    self.parent.postMessage({ type: 'READY', version: MAJOR_VERSION } as ReadyMessage, '*');
-  });
-  expose(new API(app), self.parent);
-}
-
-function addRemovableGlobalListener<
-  K extends keyof GlobalEventHandlersEventMap
->(name: K, listener: (ev: GlobalEventHandlersEventMap[K]) => void): () => void {
-  document.addEventListener(name, listener);
-  return () => document.removeEventListener(name, listener);
-}
-
-/**
- * The API class contains the methods that are exposed via Comlink to the
- * outside world.
- */
-export class API {
-  /**
-   * Internal constructor. Do not call.
-   */
-  constructor(private _app: App) {}
-
-  /**
-   * Loads a given file into Squoosh.
-   * @param blob The `Blob` to load
-   * @param name The name of the file. The extension of this name will be used
-   * to deterime which decoder to use.
-   */
-  setFile(blob: Blob, name: string) {
-    return new Promise((resolve) => {
-      document.addEventListener(SquooshStartEventType.START, () => resolve(), {
-        once: true,
-      });
-      this._app.openFile(new File([blob], name));
-    });
-  }
-
-  /**
-   * Grabs one side from Squoosh as a `File`.
-   * @param side The side which to grab. 0 = left, 1 = right.
-   */
-  async getBlob(side: 0 | 1) {
-    if (!this._app.state.file || !this._app.compressInstance) {
-      throw new Error('No file has been loaded');
-    }
-    if (
-      !this._app.compressInstance!.state.loading &&
-      !this._app.compressInstance!.state.sides[side].loading
-    ) {
-      return this._app.compressInstance!.state.sides[side].file;
-    }
-
-    const listeners: ReturnType<typeof addRemovableGlobalListener>[] = [];
-
-    const r = new Promise((resolve, reject) => {
-      listeners.push(
-        addRemovableGlobalListener(SquooshSideEventType.DONE, (event) => {
-          if (event.side !== side) {
-            return;
-          }
-          resolve(this._app.compressInstance!.state.sides[side].file);
-        }),
-      );
-      listeners.push(
-        addRemovableGlobalListener(SquooshSideEventType.ABORT, (event) => {
-          if (event.side !== side) {
-            return;
-          }
-          reject(new DOMException('Aborted', 'AbortError'));
-        }),
-      );
-      listeners.push(
-        addRemovableGlobalListener(SquooshSideEventType.ERROR, (event) => {
-          if (event.side !== side) {
-            return;
-          }
-          reject(event.error);
-        }),
-      );
-    });
-    r.then(() => listeners.forEach(remove => remove()));
-    return r;
-  }
-}

src/components/App/custom-els/FileDrop/index.ts

@@ -0,0 +1,153 @@
+import { bind } from '../../../../lib/initial-util';
+import './styles.css';
+
+// tslint:disable-next-line:max-line-length
+function firstMatchingItem(list: DataTransferItemList, acceptVal: string): DataTransferItem | undefined {
+  // Split accepts values by ',' then by '/'. Trim everything & lowercase.
+  const accepts = acceptVal.toLowerCase().split(',').map((accept) => {
+    return accept.trim().split('/').map(part => part.trim());
+  }).filter(acceptParts => acceptParts.length === 2); // Filter invalid values
+
+  return Array.from(list).find((item) => {
+    if (item.kind !== 'file') return false;
+
+    // 'Parse' the type.
+    const [typeMain, typeSub] = item.type.toLowerCase().split('/').map(s => s.trim());
+
+    for (const [acceptMain, acceptSub] of accepts) {
+      // Look for an exact match, or a partial match if * is accepted, eg image/*.
+      if (typeMain === acceptMain && (acceptSub === '*' || typeSub === acceptSub)) {
+        return true;
+      }
+    }
+    return false;
+  });
+}
+
+function getFileData(data: DataTransfer, accept: string): File | undefined {
+  const dragDataItem = firstMatchingItem(data.items, accept);
+  if (!dragDataItem) return;
+
+  return dragDataItem.getAsFile() || undefined;
+}
+
+interface FileDropEventInit extends EventInit {
+  action: FileDropAccept;
+  file: File;
+}
+
+type FileDropAccept = 'drop' | 'paste';
+
+// Safari and Edge don't quite support extending Event, this works around it.
+function fixExtendedEvent(instance: Event, type: Function) {
+  if (!(instance instanceof type)) {
+    Object.setPrototypeOf(instance, type.prototype);
+  }
+}
+
+export class FileDropEvent extends Event {
+  private _action: FileDropAccept;
+  private _file: File;
+  constructor(typeArg: string, eventInitDict: FileDropEventInit) {
+    super(typeArg, eventInitDict);
+    fixExtendedEvent(this, FileDropEvent);
+    this._file = eventInitDict.file;
+    this._action = eventInitDict.action;
+  }
+
+  get action() {
+    return this._action;
+  }
+
+  get file() {
+    return this._file;
+  }
+}
+
+/*
+  Example Usage.
+  <file-drop
+    accept='image/*'
+    class='drop-valid|drop-invalid'
+  >
+   [everything in here is a drop target.]
+  </file-drop>
+
+  dropElement.addEventListner('dropfile', (event) => console.log(event.detail))
+*/
+export class FileDrop extends HTMLElement {
+
+  private _dragEnterCount = 0;
+
+  constructor() {
+    super();
+    this.addEventListener('dragover', event => event.preventDefault());
+    this.addEventListener('drop', this._onDrop);
+    this.addEventListener('dragenter', this._onDragEnter);
+    this.addEventListener('dragend', () => this._reset());
+    this.addEventListener('dragleave', this._onDragLeave);
+    this.addEventListener('paste', this._onPaste);
+  }
+
+  get accept() {
+    return this.getAttribute('accept') || '';
+  }
+
+  set accept(val: string) {
+    this.setAttribute('accept', val);
+  }
+
+  @bind
+  private _onDragEnter(event: DragEvent) {
+    this._dragEnterCount += 1;
+    if (this._dragEnterCount > 1) return;
+
+    // We don't have data, attempt to get it and if it matches, set the correct state.
+    const validDrop: boolean = event.dataTransfer.items.length ?
+      !!firstMatchingItem(event.dataTransfer.items, this.accept) :
+      // Safari doesn't give file information on drag enter, so the best we can do is return valid.
+      true;
+
+    if (validDrop) {
+      this.classList.add('drop-valid');
+    } else {
+      this.classList.add('drop-invalid');
+    }
+  }
+
+  @bind
+  private _onDragLeave() {
+    this._dragEnterCount -= 1;
+    if (this._dragEnterCount === 0) {
+      this._reset();
+    }
+  }
+
+  @bind
+  private _onDrop(event: DragEvent) {
+    event.preventDefault();
+    this._reset();
+    const action = 'drop';
+    const file = getFileData(event.dataTransfer, this.accept);
+    if (file === undefined) return;
+
+    this.dispatchEvent(new FileDropEvent('filedrop', { action, file }));
+  }
+
+  @bind
+  private _onPaste(event: ClipboardEvent) {
+    const action = 'paste';
+    const file = getFileData(event.clipboardData, this.accept);
+    if (file === undefined) return;
+
+    this.dispatchEvent(new FileDropEvent('filedrop', { action, file }));
+  }
+
+  private _reset() {
+    this._dragEnterCount = 0;
+    this.classList.remove('drop-valid');
+    this.classList.remove('drop-invalid');
+  }
+}
+
+customElements.define('file-drop', FileDrop);

src/components/App/custom-els/FileDrop/missing-types.d.ts

@@ -0,0 +1,19 @@
+import { FileDropEvent, FileDrop } from '.';
+
+declare global {
+
+  interface HTMLElementEventMap {
+    'filedrop': FileDropEvent;
+  }
+
+  namespace JSX {
+    interface IntrinsicElements {
+      'file-drop': FileDropAttributes;
+    }
+
+    interface FileDropAttributes extends HTMLAttributes {
+      accept?: string;
+      onfiledrop?: ((this: FileDrop, ev: FileDropEvent) => any) | null;
+    }
+  }
+}

src/components/App/custom-els/FileDrop/styles.css

@@ -0,0 +1,3 @@
+file-drop {
+  display: block;
+}

src/components/App/index.tsx

@@ -2,128 +2,83 @@ import { h, Component } from 'preact';
 
 import { bind, linkRef, Fileish } from '../../lib/initial-util';
 import * as style from './style.scss';
-import { FileDropEvent } from 'file-drop-element';
+import { FileDropEvent } from './custom-els/FileDrop';
-import 'file-drop-element';
+import './custom-els/FileDrop';
-import SnackBarElement, { SnackOptions } from '../../lib/SnackBar';
+import SnackBarElement from '../../lib/SnackBar';
 import '../../lib/SnackBar';
 import Intro from '../intro';
 import '../custom-els/LoadingSpinner';
 
-const ROUTE_EDITOR = '/editor';
+// This is imported for TypeScript only. It isn't used.
+import Compress from '../compress';
 
-const compressPromise = import(
+export interface SourceImage {
-  /* webpackChunkName: "main-app" */
+  file: File | Fileish;
-  '../compress');
+  data: ImageData;
-const offlinerPromise = import(
+  vectorImage?: HTMLImageElement;
-  /* webpackChunkName: "offliner" */
-  '../../lib/offliner');
-
-function back() {
-  window.history.back();
 }
 
 interface Props {}
 
 interface State {
   file?: File | Fileish;
-  isEditorOpen: Boolean;
+  Compress?: typeof Compress;
-  Compress?: typeof import('../compress').default;
 }
 
 export default class App extends Component<Props, State> {
   state: State = {
-    isEditorOpen: false,
     file: undefined,
     Compress: undefined,
   };
-  compressInstance?: import('../compress').default;
 
   snackbar?: SnackBarElement;
 
   constructor() {
     super();
 
-    compressPromise.then((module) => {
+    import('../compress').then((module) => {
       this.setState({ Compress: module.default });
     }).catch(() => {
-      this.showSnack('Failed to load app');
+      this.showError('Failed to load app');
     });
 
-    offlinerPromise.then(({ offliner }) => offliner(this.showSnack));
-
     // In development, persist application state across hot reloads:
     if (process.env.NODE_ENV === 'development') {
       this.setState(window.STATE);
       const oldCDU = this.componentDidUpdate;
-      this.componentDidUpdate = (props, state, prev) => {
+      this.componentDidUpdate = (props, state) => {
-        if (oldCDU) oldCDU.call(this, props, state, prev);
+        if (oldCDU) oldCDU.call(this, props, state);
         window.STATE = this.state;
       };
     }
-
-    // Since iOS 10, Apple tries to prevent disabling pinch-zoom. This is great in theory, but
-    // really breaks things on Squoosh, as you can easily end up zooming the UI when you mean to
-    // zoom the image. Once you've done this, it's really difficult to undo. Anyway, this seems to
-    // prevent it.
-    document.body.addEventListener('gesturestart', (event) => {
-      event.preventDefault();
-    });
-
-    window.addEventListener('popstate', this.onPopState);
-    import(
-      /* webpackChunkName: "client-api" */
-      './client-api').then(m => m.exposeAPI(this));
-  }
-
-  @bind openFile(file: File | Fileish) {
-    this.openEditor();
-    this.setState({ file });
   }
 
   @bind
-  private onFileDrop({ files }: FileDropEvent) {
+  private onFileDrop(event: FileDropEvent) {
-    if (!files || files.length === 0) return;
+    const { file } = event;
-    const file = files[0];
+    if (!file) return;
-    this.openEditor();
     this.setState({ file });
   }
 
   @bind
   private onIntroPickFile(file: File | Fileish) {
-    return this.openFile(file);
+    this.setState({ file });
   }
 
   @bind
-  private showSnack(message: string, options: SnackOptions = {}): Promise<string> {
+  private showError(error: string) {
     if (!this.snackbar) throw Error('Snackbar missing');
-    return this.snackbar.showSnackbar(message, options);
+    this.snackbar.showSnackbar({ message: error });
   }
 
-  @bind
+  render({}: Props, { file, Compress }: State) {
-  private onPopState() {
-    this.setState({ isEditorOpen: location.pathname === ROUTE_EDITOR });
-  }
-
-  @bind
-  private openEditor() {
-    if (this.state.isEditorOpen) return;
-    history.pushState(null, '', ROUTE_EDITOR);
-    this.setState({ isEditorOpen: true });
-  }
-
-  render({}: Props, { file, isEditorOpen, Compress }: State) {
     return (
       <div id="app" class={style.app}>
-        <file-drop accept="image/*" onfiledrop={this.onFileDrop} class={style.drop}>
+        <file-drop accept="image/*" onfiledrop={this.onFileDrop}>
-          {!isEditorOpen
+          {(!file)
-            ? <Intro onFile={this.onIntroPickFile} showSnack={this.showSnack} />
+            ? <Intro onFile={this.onIntroPickFile} onError={this.showError} />
             : (Compress)
-              ? <Compress
+              ? <Compress file={file} onError={this.showError} />
-                  ref={i => this.compressInstance = i}
-                  file={file!}
-                  showSnack={this.showSnack}
-                  onBack={back}
-              />
               : <loading-spinner class={style.appLoader}/>
           }
           <snack-bar ref={linkRef(this, 'snackbar')} />