Prerelease v0.33.0-rc.2

Add withX and keepX functions to take advantage of
libvips 8.15.0 new 'keep' metadata feature.

.github/workflows/ci.yml

@@ -121,31 +121,79 @@ jobs:
   github-runner-qemu:
     permissions:
       contents: write
-    name: linux-arm - Node.js 18 - prebuild
+    name: ${{ matrix.platform }} - Node.js ${{ matrix.nodejs_version_major }} - prebuild
     runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: linux-arm
+            run_on_arch: armv6
+            nodejs_arch: armv6l
+            nodejs_hostname: unofficial-builds.nodejs.org
+            nodejs_version: "18.17.0"
+            nodejs_version_major: 18
+          - platform: linux-s390x
+            run_on_arch: s390x
+            nodejs_arch: s390x
+            nodejs_hostname: nodejs.org
+            nodejs_version: "18.17.0"
+            nodejs_version_major: 18
     steps:
       - uses: actions/checkout@v4
       - uses: uraimo/run-on-arch-action@v2
         with:
-          arch: armv6
+          arch: ${{ matrix.run_on_arch }}
           distro: buster
           env: |
-            nodejs_version: "18.17.0"
             prebuild_upload: "${{ startsWith(github.ref, 'refs/tags/') && secrets.GITHUB_TOKEN || '' }}"
           run: |
             apt-get update
-            apt-get install -y fontconfig fonts-noto-core g++ git libatomic1 make python3 xz-utils
+            apt-get install -y curl g++ git libatomic1 make python3 xz-utils
             mkdir /opt/nodejs
-            curl --silent https://unofficial-builds.nodejs.org/download/release/v${nodejs_version}/node-v${nodejs_version}-linux-armv6l.tar.xz | tar xJC /opt/nodejs --strip-components=1
+            curl --silent https://${{ matrix.nodejs_hostname }}/download/release/v${{ matrix.nodejs_version}}/node-v${{ matrix.nodejs_version}}-linux-${{ matrix.nodejs_arch }}.tar.xz | tar xJC /opt/nodejs --strip-components=1
             export PATH=$PATH:/opt/nodejs/bin
             npm install --build-from-source
-            npx mocha --no-config --spec=test/unit/io.js
+            npx mocha --no-config --spec=test/unit/io.js --timeout=30000
             npm run package-from-local-build
-            npm pkg set "optionalDependencies.@img/sharp-linux-arm=file:./npm/linux-arm"
+            npm pkg set "optionalDependencies.@img/sharp-${{ matrix.platform }}=file:./npm/${{ matrix.platform }}"
             npm run clean
             npm install --ignore-scripts
             npx mocha --no-config --spec=test/unit/io.js --timeout=30000
             [[ -n $prebuild_upload ]] && cd src && ln -s ../package.json && npx prebuild || true
+  github-runner-emscripten:
+    permissions:
+      contents: write
+    name: wasm32 - prebuild
+    runs-on: ubuntu-22.04
+    container: "emscripten/emsdk:3.1.48"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Dependencies
+        run: apt-get update && apt-get install -y pkg-config
+      - name: Dependencies (Node.js)
+        uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+      - name: Install
+        run: emmake npm install --build-from-source
+      - name: Test
+        run: emmake npm test
+      - name: Test packaging
+        run: |
+          emmake npm run package-from-local-build
+          npm pkg set "optionalDependencies.@img/sharp-wasm32=file:./npm/wasm32"
+          npm run clean
+          rm -rf node_modules/@img/sharp-linux-x64
+          npm install --cpu=wasm32
+          npm test
+      - name: Prebuild
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          npm_config_nodedir: emscripten
+          prebuild_upload: ${{ secrets.GITHUB_TOKEN }}
+        run: cd src && ln -s ../package.json && emmake npx prebuild --platform=emscripten --arch=wasm32 --strip=0
   macstadium-runner:
     permissions:
       contents: write

.github/workflows/npm.yml

@@ -112,10 +112,8 @@ jobs:
         with:
           path: release.mjs
           contents: |
-            import { createRequire } from 'node:module';
             import { deepStrictEqual } from 'node:assert';
-            const require = createRequire(import.meta.url);
-            const sharp = require('sharp');
+            import sharp from 'sharp';
             deepStrictEqual(['.jpg', '.jpeg', '.jpe'], sharp.format.jpeg.input.fileSuffix);
 
       - name: Run with Node.js + npm

.prebuildrc

@@ -1,6 +1,6 @@
 {
   "runtime": "napi",
-  "include-regex": "(sharp-.+\\.node|libvips-.+\\.dll|libglib-.+\\.dll|libgobject-.+\\.dll)",
+  "include-regex": "(sharp-.+\\.node|libvips-.+\\.dll)",
   "prerelease": true,
   "strip": true
 }

README.md

@@ -2,10 +2,14 @@
 
 <img src="https://cdn.jsdelivr.net/gh/lovell/sharp@main/docs/image/sharp-logo.svg" width="160" height="160" alt="sharp logo" align="right">
 
-The typical use case for this high speed Node.js module
+The typical use case for this high speed Node-API module
 is to convert large images in common formats to
 smaller, web-friendly JPEG, PNG, WebP, GIF and AVIF images of varying dimensions.
 
+It can be used with all JavaScript runtimes
+that provide support for Node-API v9, including
+Node.js >= 18.17.0, Deno and Bun.
+
 Resizing an image is typically 4x-5x faster than using the
 quickest ImageMagick and GraphicsMagick settings
 due to its use of [libvips](https://github.com/libvips/libvips).
@@ -16,7 +20,7 @@ Lanczos resampling ensures quality is not sacrificed for speed.
 As well as image resizing, operations such as
 rotation, extraction, compositing and gamma correction are available.
 
-Most modern macOS, Windows and Linux systems running Node.js >= 18.17.0
+Most modern macOS, Windows and Linux systems
 do not require any additional install or runtime dependencies.
 
 ## Documentation

docs/README.md

@@ -2,10 +2,14 @@
 
 <img src="https://cdn.jsdelivr.net/gh/lovell/sharp@main/docs/image/sharp-logo.svg" width="160" height="160" alt="sharp logo" align="right">
 
-The typical use case for this high speed Node.js module
+The typical use case for this high speed Node-API module
 is to convert large images in common formats to
 smaller, web-friendly JPEG, PNG, WebP, GIF and AVIF images of varying dimensions.
 
+It can be used with all JavaScript runtimes
+that provide support for Node-API v9, including
+Node.js >= 18.17.0, Deno and Bun.
+
 Resizing an image is typically 4x-5x faster than using the
 quickest ImageMagick and GraphicsMagick settings
 due to its use of [libvips](https://github.com/libvips/libvips).
@@ -16,7 +20,7 @@ Lanczos resampling ensures quality is not sacrificed for speed.
 As well as image resizing, operations such as
 rotation, extraction, compositing and gamma correction are available.
 
-Most modern macOS, Windows and Linux systems running Node.js >= 14.15.0
+Most modern macOS, Windows and Linux systems
 do not require any additional install or runtime dependencies.
 
 ### Formats

docs/api-colour.md

@@ -1,7 +1,7 @@
 ## tint
-> tint(rgb) ⇒ <code>Sharp</code>
+> tint(tint) ⇒ <code>Sharp</code>
 
-Tint the image using the provided chroma while preserving the image luminance.
+Tint the image using the provided colour.
 An alpha channel may be present and will be unchanged by the operation.
 
 
@@ -12,7 +12,7 @@ An alpha channel may be present and will be unchanged by the operation.
 
 | Param | Type | Description |
 | --- | --- | --- |
-| rgb | <code>string</code> \| <code>Object</code> | parsed by the [color](https://www.npmjs.org/package/color) module to extract chroma values. |
+| tint | <code>string</code> \| <code>Object</code> | Parsed by the [color](https://www.npmjs.org/package/color) module. |
 
 **Example**  
 ```js

docs/api-constructor.md

@@ -26,7 +26,7 @@ Implements the [stream.Duplex](http://nodejs.org/api/stream.html#stream_class_st
 | --- | --- | --- | --- |
 | [input] | <code>Buffer</code> \| <code>ArrayBuffer</code> \| <code>Uint8Array</code> \| <code>Uint8ClampedArray</code> \| <code>Int8Array</code> \| <code>Uint16Array</code> \| <code>Int16Array</code> \| <code>Uint32Array</code> \| <code>Int32Array</code> \| <code>Float32Array</code> \| <code>Float64Array</code> \| <code>string</code> |  | if present, can be  a Buffer / ArrayBuffer / Uint8Array / Uint8ClampedArray containing JPEG, PNG, WebP, AVIF, GIF, SVG or TIFF image data, or  a TypedArray containing raw pixel image data, or  a String containing the filesystem path to an JPEG, PNG, WebP, AVIF, GIF, SVG or TIFF image file.  JPEG, PNG, WebP, AVIF, GIF, SVG, TIFF or raw pixel image data can be streamed into the object when not present. |
 | [options] | <code>Object</code> |  | if present, is an Object with optional attributes. |
-| [options.failOn] | <code>string</code> | <code>&quot;&#x27;warning&#x27;&quot;</code> | when to abort processing of invalid pixel data, one of (in order of sensitivity): 'none' (least), 'truncated', 'error' or 'warning' (most), higher levels imply lower levels, invalid metadata will always abort. |
+| [options.failOn] | <code>string</code> | <code>&quot;&#x27;warning&#x27;&quot;</code> | When to abort processing of invalid pixel data, one of (in order of sensitivity, least to most): 'none', 'truncated', 'error', 'warning'. Higher levels imply lower levels. Invalid metadata will always abort. |
 | [options.limitInputPixels] | <code>number</code> \| <code>boolean</code> | <code>268402689</code> | Do not process input images where the number of pixels  (width x height) exceeds this limit. Assumes image dimensions contained in the input metadata can be trusted.  An integral Number of pixels, zero or false to remove limit, true to use default limit of 268402689 (0x3FFF x 0x3FFF). |
 | [options.unlimited] | <code>boolean</code> | <code>false</code> | Set this to `true` to remove safety features that help prevent memory exhaustion (JPEG, PNG, SVG, HEIF). |
 | [options.sequentialRead] | <code>boolean</code> | <code>true</code> | Set this to `false` to use random access rather than sequential read. Some operations will do this automatically. |

docs/api-output.md

@@ -111,17 +111,157 @@ await sharp(pixelArray, { raw: { width, height, channels } })
 ```
 
 
+## keepExif
+> keepExif() ⇒ <code>Sharp</code>
+
+Keep all EXIF metadata from the input image in the output image.
+
+EXIF metadata is unsupported for TIFF output.
+
+
+**Since**: 0.33.0  
+**Example**  
+```js
+const outputWithExif = await sharp(inputWithExif)
+  .keepExif()
+  .toBuffer();
+```
+
+
+## withExif
+> withExif(exif) ⇒ <code>Sharp</code>
+
+Set EXIF metadata in the output image, ignoring any EXIF in the input image.
+
+
+**Throws**:
+
+- <code>Error</code> Invalid parameters
+
+**Since**: 0.33.0  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| exif | <code>Object.&lt;string, Object.&lt;string, string&gt;&gt;</code> | Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data. |
+
+**Example**  
+```js
+const dataWithExif = await sharp(input)
+  .withExif({
+    IFD0: {
+      Copyright: 'The National Gallery'
+    },
+    IFD3: {
+      GPSLatitudeRef: 'N',
+      GPSLatitude: '51/1 30/1 3230/100',
+      GPSLongitudeRef: 'W',
+      GPSLongitude: '0/1 7/1 4366/100'
+    }
+  })
+  .toBuffer();
+```
+
+
+## withExifMerge
+> withExifMerge(exif) ⇒ <code>Sharp</code>
+
+Update EXIF metadata from the input image in the output image.
+
+
+**Throws**:
+
+- <code>Error</code> Invalid parameters
+
+**Since**: 0.33.0  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| exif | <code>Object.&lt;string, Object.&lt;string, string&gt;&gt;</code> | Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data. |
+
+**Example**  
+```js
+const dataWithMergedExif = await sharp(inputWithExif)
+  .withExifMerge({
+    IFD0: {
+      Copyright: 'The National Gallery'
+    }
+  })
+  .toBuffer();
+```
+
+
+## keepIccProfile
+> keepIccProfile() ⇒ <code>Sharp</code>
+
+Keep ICC profile from the input image in the output image.
+
+Where necessary, will attempt to convert the output colour space to match the profile.
+
+
+**Since**: 0.33.0  
+**Example**  
+```js
+const outputWithIccProfile = await sharp(inputWithIccProfile)
+  .keepIccProfile()
+  .toBuffer();
+```
+
+
+## withIccProfile
+> withIccProfile(icc, [options]) ⇒ <code>Sharp</code>
+
+Transform using an ICC profile and attach to the output image.
+
+This can either be an absolute filesystem path or
+built-in profile name (`srgb`, `p3`, `cmyk`).
+
+
+**Throws**:
+
+- <code>Error</code> Invalid parameters
+
+**Since**: 0.33.0  
+
+| Param | Type | Default | Description |
+| --- | --- | --- | --- |
+| icc | <code>string</code> |  | Absolute filesystem path to output ICC profile or built-in profile name (srgb, p3, cmyk). |
+| [options] | <code>Object</code> |  |  |
+| [options.attach] | <code>number</code> | <code>true</code> | Should the ICC profile be included in the output image metadata? |
+
+**Example**  
+```js
+const outputWithP3 = await sharp(input)
+  .withIccProfile('p3')
+  .toBuffer();
+```
+
+
+## keepMetadata
+> keepMetadata() ⇒ <code>Sharp</code>
+
+Keep all metadata (EXIF, ICC, XMP, IPTC) from the input image in the output image.
+
+The default behaviour, when `keepMetadata` is not used, is to convert to the device-independent
+sRGB colour space and strip all metadata, including the removal of any ICC profile.
+
+
+**Since**: 0.33.0  
+**Example**  
+```js
+const outputWithMetadata = await sharp(inputWithMetadata)
+  .keepMetadata()
+  .toBuffer();
+```
+
+
 ## withMetadata
 > withMetadata([options]) ⇒ <code>Sharp</code>
 
-Include all metadata (EXIF, XMP, IPTC) from the input image in the output image.
-This will also convert to and add a web-friendly sRGB ICC profile if appropriate,
-unless a custom output profile is provided.
+Keep most metadata (EXIF, XMP, IPTC) from the input image in the output image.
 
-The default behaviour, when `withMetadata` is not used, is to convert to the device-independent
-sRGB colour space and strip all metadata, including the removal of any ICC profile.
+This will also convert to and add a web-friendly sRGB ICC profile if appropriate.
 
-EXIF metadata is unsupported for TIFF output.
+Allows orientation and density to be set or updated.
 
 
 **Throws**:
@@ -129,38 +269,16 @@ EXIF metadata is unsupported for TIFF output.
 - <code>Error</code> Invalid parameters
 
 
-| Param | Type | Default | Description |
-| --- | --- | --- | --- |
-| [options] | <code>Object</code> |  |  |
-| [options.orientation] | <code>number</code> |  | value between 1 and 8, used to update the EXIF `Orientation` tag. |
-| [options.icc] | <code>string</code> | <code>&quot;&#x27;srgb&#x27;&quot;</code> | Filesystem path to output ICC profile, relative to `process.cwd()`, defaults to built-in sRGB. |
-| [options.exif] | <code>Object.&lt;Object&gt;</code> | <code>{}</code> | Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data. |
-| [options.density] | <code>number</code> |  | Number of pixels per inch (DPI). |
+| Param | Type | Description |
+| --- | --- | --- |
+| [options] | <code>Object</code> |  |
+| [options.orientation] | <code>number</code> | Used to update the EXIF `Orientation` tag, integer between 1 and 8. |
+| [options.density] | <code>number</code> | Number of pixels per inch (DPI). |
 
 **Example**  
 ```js
-sharp('input.jpg')
+const outputSrgbWithMetadata = await sharp(inputRgbWithMetadata)
   .withMetadata()
-  .toFile('output-with-metadata.jpg')
-  .then(info => { ... });
-```
-**Example**  
-```js
-// Set output EXIF metadata
-const data = await sharp(input)
-  .withMetadata({
-    exif: {
-      IFD0: {
-        Copyright: 'The National Gallery'
-      },
-      IFD3: {
-        GPSLatitudeRef: 'N',
-        GPSLatitude: '51/1 30/1 3230/100',
-        GPSLongitudeRef: 'W',
-        GPSLongitude: '0/1 7/1 4366/100'
-      }
-    }
-  })
   .toBuffer();
 ```
 **Example**  
@@ -466,6 +584,7 @@ instead of providing `xres` and `yres` in pixels/mm.
 | [options.yres] | <code>number</code> | <code>1.0</code> | vertical resolution in pixels/mm |
 | [options.resolutionUnit] | <code>string</code> | <code>&quot;&#x27;inch&#x27;&quot;</code> | resolution unit options: inch, cm |
 | [options.bitdepth] | <code>number</code> | <code>8</code> | reduce bitdepth to 1, 2 or 4 bit |
+| [options.miniswhite] | <code>boolean</code> | <code>false</code> | write 1-bit images as miniswhite |
 
 **Example**  
 ```js

docs/api-resize.md

@@ -251,7 +251,7 @@ sharp(input)
 
 
 ## trim
-> trim(trim) ⇒ <code>Sharp</code>
+> trim([options]) ⇒ <code>Sharp</code>
 
 Trim pixels from all edges that contain values similar to the given background colour, which defaults to that of the top-left pixel.
 
@@ -259,8 +259,7 @@ Images with an alpha channel will use the combined bounding box of alpha and non
 
 If the result of this operation would trim an image to nothing then no change is made.
 
-The `info` response Object, obtained from callback of `.toFile()` or `.toBuffer()`,
-will contain `trimOffsetLeft` and `trimOffsetTop` properties.
+The `info` response Object will contain `trimOffsetLeft` and `trimOffsetTop` properties.
 
 
 **Throws**:
@@ -270,46 +269,44 @@ will contain `trimOffsetLeft` and `trimOffsetTop` properties.
 
 | Param | Type | Default | Description |
 | --- | --- | --- | --- |
-| trim | <code>string</code> \| <code>number</code> \| <code>Object</code> |  | the specific background colour to trim, the threshold for doing so or an Object with both. |
-| [trim.background] | <code>string</code> \| <code>Object</code> | <code>&quot;&#x27;top-left pixel&#x27;&quot;</code> | background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to that of the top-left pixel. |
-| [trim.threshold] | <code>number</code> | <code>10</code> | the allowed difference from the above colour, a positive number. |
+| [options] | <code>Object</code> |  |  |
+| [options.background] | <code>string</code> \| <code>Object</code> | <code>&quot;&#x27;top-left pixel&#x27;&quot;</code> | Background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to that of the top-left pixel. |
+| [options.threshold] | <code>number</code> | <code>10</code> | Allowed difference from the above colour, a positive number. |
+| [options.lineArt] | <code>boolean</code> | <code>false</code> | Does the input more closely resemble line art (e.g. vector) rather than being photographic? |
 
 **Example**  
 ```js
 // Trim pixels with a colour similar to that of the top-left pixel.
-sharp(input)
+await sharp(input)
   .trim()
-  .toFile(output, function(err, info) {
-    ...
-  });
+  .toFile(output);
 ```
 **Example**  
 ```js
 // Trim pixels with the exact same colour as that of the top-left pixel.
-sharp(input)
-  .trim(0)
-  .toFile(output, function(err, info) {
-    ...
-  });
+await sharp(input)
+  .trim({
+    threshold: 0
+  })
+  .toFile(output);
 ```
 **Example**  
 ```js
-// Trim only pixels with a similar colour to red.
-sharp(input)
-  .trim("#FF0000")
-  .toFile(output, function(err, info) {
-    ...
-  });
+// Assume input is line art and trim only pixels with a similar colour to red.
+const output = await sharp(input)
+  .trim({
+    background: "#FF0000",
+    lineArt: true
+  })
+  .toBuffer();
 ```
 **Example**  
 ```js
 // Trim all "yellow-ish" pixels, being more lenient with the higher threshold.
-sharp(input)
+const output = await sharp(input)
   .trim({
     background: "yellow",
     threshold: 42,
   })
-  .toFile(output, function(err, info) {
-    ...
-  });
+  .toBuffer();
 ```

docs/changelog.md

@@ -2,7 +2,7 @@
 
 ## v0.33 - *gauge*
 
-Requires libvips v8.14.5
+Requires libvips v8.15.0
 
 ### v0.33.0 - TBD
 
@@ -14,6 +14,18 @@ Requires libvips v8.14.5
 
 * Remove `sharp.vendor`.
 
+* Partially deprecate `withMetadata()`, use `withExif()` and `withIccProfile()`.
+
+* Add experimental support for WebAssembly-based runtimes.
+  [@RReverser](https://github.com/RReverser)
+
+* Options for `trim` operation must be an Object, add new `lineArt` option.
+  [#2363](https://github.com/lovell/sharp/issues/2363)
+
+* Improve luminance of `tint` operation with weighting function.
+  [#3338](https://github.com/lovell/sharp/issues/3338)
+  [@jcupitt](https://github.com/jcupitt)
+
 * Ensure all `Error` objects contain a `stack` property.
   [#3653](https://github.com/lovell/sharp/issues/3653)
 
@@ -23,6 +35,20 @@ Requires libvips v8.14.5
 * Ensure correct interpretation of 16-bit raw input.
   [#3808](https://github.com/lovell/sharp/issues/3808)
 
+* Add support for `miniswhite` when using TIFF output.
+  [#3812](https://github.com/lovell/sharp/pull/3812)
+  [@dnsbty](https://github.com/dnsbty)
+
+* TypeScript: add missing definition for `withMetadata` boolean.
+  [#3823](https://github.com/lovell/sharp/pull/3823)
+  [@uhthomas](https://github.com/uhthomas)
+
+* Add more fine-grained control over output metadata.
+  [#3824](https://github.com/lovell/sharp/issues/3824)
+
+* Ensure multi-page extract remains sequential.
+  [#3837](https://github.com/lovell/sharp/issues/3837)
+
 ## v0.32 - *flow*
 
 Requires libvips v8.14.5

docs/humans.txt

@@ -275,3 +275,9 @@ GitHub: https://github.com/LachlanNewman
 
 Name: BJJ
 GitHub: https://github.com/bianjunjie1981
+
+Name: Dennis Beatty
+GitHub: https://github.com/dnsbty
+
+Name: Ingvar Stepanyan
+GitHub: https://github.com/RReverser

docs/install.md

@@ -1,5 +1,7 @@
 # Installation
 
+Works with your choice of JavaScript package manager.
+
 ```sh
 npm install sharp
 ```
@@ -9,14 +11,20 @@ pnpm add sharp
 ```
 
 ```sh
-yarn add sharp
+yarn add sharp # v3 recommended, Plug'n'Play unsupported
 ```
 
-Yarn Plug'n'Play is unsupported.
+```sh
+bun add sharp
+```
+
+```sh
+deno run --allow-ffi ...
+```
 
 ## Prerequisites
 
-* Node.js >= 18.17.0
+* Node-API v9 compatible runtime e.g. Node.js >= 18.17.0
 
 ## Prebuilt binaries
 
@@ -24,9 +32,10 @@ Ready-compiled sharp and libvips binaries are provided for use on the most commo
 
 * macOS x64 (>= 10.13)
 * macOS ARM64
-* Linux x64 (glibc >= 2.26, musl >= 1.2.2, CPU with SSE4.2)
-* Linux ARM64 (glibc >= 2.26, musl >= 1.2.2)
 * Linux ARM (glibc >= 2.28)
+* Linux ARM64 (glibc >= 2.26, musl >= 1.2.2)
+* Linux s390x (glibc >= 2.28)
+* Linux x64 (glibc >= 2.26, musl >= 1.2.2, CPU with SSE4.2)
 * Windows x64
 * Windows x86
 
@@ -69,6 +78,15 @@ For cross-compiling, the `--platform`, `--arch` and `--libc` npm flags
 (or the `npm_config_platform`, `npm_config_arch` and `npm_config_libc` environment variables)
 can be used to configure the target environment.
 
+## WebAssembly
+
+Experimental support is provided for runtime environments that provide
+multi-threaded Wasm via Workers.
+
+```sh
+npm install --cpu=wasm32 sharp
+```
+
 ## FreeBSD
 
 The `vips` package must be installed before `npm install` is run.
@@ -108,6 +126,16 @@ depending on the chosen architecture.
 When building your deployment package on a machine that differs from the target architecture,
 you will need to install either `@img/sharp-linux-x64` or `@img/sharp-linux-arm64` package.
 
+```sh
+npm install --os=linux --cpu=x64 sharp
+```
+
+```sh
+npm install --os=linux --cpu=arm64 sharp
+```
+
+When using npm 9 or earlier, this can be achieved using the following:
+
 ```sh
 npm install --force @img/sharp-linux-x64
 ```
@@ -165,7 +193,7 @@ custom:
       - sharp
     packagerOptions:
       scripts:
-        - npm install --force @img/sharp-linux-x64
+        - npm install --os=linux --cpu=x64 sharp
 ```
 
 ## TypeScript
@@ -204,19 +232,6 @@ use the `FONTCONFIG_PATH` environment variable to point to a custom location.
 
 Embedded SVG fonts are unsupported.
 
-## Worker threads
-
-On some platforms, including glibc-based Linux,
-the main thread must call `require('sharp')`
-_before_ worker threads are created.
-This is to ensure shared libraries remain loaded in memory
-until after all threads are complete.
-
-Without this, the following error may occur:
-```
-Module did not self-register
-```
-
 ## Known conflicts
 
 ### Canvas and Windows

lib/colour.js

@@ -19,7 +19,7 @@ const colourspace = {
 };
 
 /**
- * Tint the image using the provided chroma while preserving the image luminance.
+ * Tint the image using the provided colour.
  * An alpha channel may be present and will be unchanged by the operation.
  *
  * @example
@@ -27,14 +27,12 @@ const colourspace = {
  *   .tint({ r: 255, g: 240, b: 16 })
  *   .toBuffer();
  *
- * @param {string|Object} rgb - parsed by the [color](https://www.npmjs.org/package/color) module to extract chroma values.
+ * @param {string|Object} tint - Parsed by the [color](https://www.npmjs.org/package/color) module.
  * @returns {Sharp}
  * @throws {Error} Invalid parameter
  */
-function tint (rgb) {
-  const colour = color(rgb);
-  this.options.tintA = colour.a();
-  this.options.tintB = colour.b();
+function tint (tint) {
+  this._setBackgroundColourOption('tint', tint);
   return this;
 }
 

lib/constructor.js

@@ -121,7 +121,7 @@ const debuglog = util.debuglog('sharp');
  *  a String containing the filesystem path to an JPEG, PNG, WebP, AVIF, GIF, SVG or TIFF image file.
  *  JPEG, PNG, WebP, AVIF, GIF, SVG, TIFF or raw pixel image data can be streamed into the object when not present.
  * @param {Object} [options] - if present, is an Object with optional attributes.
- * @param {string} [options.failOn='warning'] - when to abort processing of invalid pixel data, one of (in order of sensitivity): 'none' (least), 'truncated', 'error' or 'warning' (most), higher levels imply lower levels, invalid metadata will always abort.
+ * @param {string} [options.failOn='warning'] - When to abort processing of invalid pixel data, one of (in order of sensitivity, least to most): 'none', 'truncated', 'error', 'warning'. Higher levels imply lower levels. Invalid metadata will always abort.
  * @param {number|boolean} [options.limitInputPixels=268402689] - Do not process input images where the number of pixels
  *  (width x height) exceeds this limit. Assumes image dimensions contained in the input metadata can be trusted.
  *  An integral Number of pixels, zero or false to remove limit, true to use default limit of 268402689 (0x3FFF x 0x3FFF).
@@ -212,8 +212,7 @@ const Sharp = function (input, options) {
     kernel: 'lanczos3',
     fastShrinkOnLoad: true,
     // operations
-    tintA: 128,
-    tintB: 128,
+    tint: [-1, 0, 0, 0],
     flatten: false,
     flattenBackground: [0, 0, 0],
     unflatten: false,
@@ -230,7 +229,8 @@ const Sharp = function (input, options) {
     threshold: 0,
     thresholdGrayscale: true,
     trimBackground: [],
-    trimThreshold: 0,
+    trimThreshold: -1,
+    trimLineArt: false,
     gamma: 0,
     gammaOut: 0,
     greyscale: false,
@@ -257,11 +257,12 @@ const Sharp = function (input, options) {
     fileOut: '',
     formatOut: 'input',
     streamOut: false,
-    withMetadata: false,
+    keepMetadata: 0,
     withMetadataOrientation: -1,
     withMetadataDensity: 0,
-    withMetadataIcc: '',
-    withMetadataStrs: {},
+    withIccProfile: '',
+    withExif: {},
+    withExifMerge: true,
     resolveWithObject: false,
     // output format
     jpegQuality: 80,
@@ -305,6 +306,7 @@ const Sharp = function (input, options) {
     tiffCompression: 'jpeg',
     tiffPredictor: 'horizontal',
     tiffPyramid: false,
+    tiffMiniswhite: false,
     tiffBitdepth: 8,
     tiffTile: false,
     tiffTileHeight: 256,

lib/index.d.ts

@@ -239,12 +239,12 @@ declare namespace sharp {
         //#region Color functions
 
         /**
-         * Tint the image using the provided chroma while preserving the image luminance.
+         * Tint the image using the provided colour.
          * An alpha channel may be present and will be unchanged by the operation.
-         * @param rgb Parsed by the color module to extract chroma values.
+         * @param tint Parsed by the color module.
          * @returns A sharp instance that can be used to chain operations
          */
-        tint(rgb: Color): Sharp;
+        tint(tint: Color): Sharp;
 
         /**
          * Convert to 8-bit greyscale; 256 shades of grey.
@@ -633,6 +633,43 @@ declare namespace sharp {
          */
         toBuffer(options: { resolveWithObject: true }): Promise<{ data: Buffer; info: OutputInfo }>;
 
+        /**
+         * Keep all EXIF metadata from the input image in the output image.
+         * EXIF metadata is unsupported for TIFF output.
+         * @returns A sharp instance that can be used to chain operations
+         */
+        keepExif(): Sharp;
+
+        /**
+         * Set EXIF metadata in the output image, ignoring any EXIF in the input image.
+         * @param {Exif} exif Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data.
+         * @returns A sharp instance that can be used to chain operations
+         * @throws {Error} Invalid parameters
+         */
+        withExif(exif: Exif): Sharp;
+
+        /**
+         * Update EXIF metadata from the input image in the output image.
+         * @param {Exif} exif Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data.
+         * @returns A sharp instance that can be used to chain operations
+         * @throws {Error} Invalid parameters
+         */
+        withExifMerge(exif: Exif): Sharp;
+
+        /**
+         * Keep ICC profile from the input image in the output image where possible.
+         * @returns A sharp instance that can be used to chain operations
+         */
+        keepIccProfile(): Sharp;
+
+        /**
+         * Transform using an ICC profile and attach to the output image.
+         * @param {string} icc - Absolute filesystem path to output ICC profile or built-in profile name (srgb, p3, cmyk).
+         * @returns A sharp instance that can be used to chain operations
+         * @throws {Error} Invalid parameters
+         */
+        withIccProfile(icc: string, options?: WithIccProfileOptions): Sharp;
+
         /**
          * Include all metadata (EXIF, XMP, IPTC) from the input image in the output image.
          * The default behaviour, when withMetadata is not used, is to strip all metadata and convert to the device-independent sRGB colour space.
@@ -640,7 +677,7 @@ declare namespace sharp {
          * @param withMetadata
          * @throws {Error} Invalid parameters.
          */
-        withMetadata(withMetadata?: boolean | WriteableMetadata): Sharp;
+        withMetadata(withMetadata?: WriteableMetadata): Sharp;
 
         /**
          * Use these JPEG options for output image.
@@ -847,11 +884,11 @@ declare namespace sharp {
          * Trim pixels from all edges that contain values similar to the given background colour, which defaults to that of the top-left pixel.
          * Images with an alpha channel will use the combined bounding box of alpha and non-alpha channels.
          * The info response Object will contain trimOffsetLeft and trimOffsetTop properties.
-         * @param trim The specific background colour to trim, the threshold for doing so or an Object with both.
+         * @param options trim options
          * @throws {Error} Invalid parameters
          * @returns A sharp instance that can be used to chain operations
          */
-        trim(trim?: string | number | TrimOptions): Sharp;
+        trim(options?: TrimOptions): Sharp;
 
         //#endregion
     }
@@ -978,15 +1015,32 @@ declare namespace sharp {
         wrap?: TextWrap;
     }
 
+    interface ExifDir {
+        [k: string]: string;
+    }
+
+    interface Exif {
+        'IFD0'?: ExifDir;
+        'IFD1'?: ExifDir;
+        'IFD2'?: ExifDir;
+        'IFD3'?: ExifDir;
+    }
+
     interface WriteableMetadata {
-        /** Value between 1 and 8, used to update the EXIF Orientation tag. */
-        orientation?: number | undefined;
-        /** Filesystem path to output ICC profile, defaults to sRGB. */
-        icc?: string | undefined;
-        /** Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data. (optional, default {}) */
-        exif?: Record<string, any> | undefined;
         /** Number of pixels per inch (DPI) */
         density?: number | undefined;
+        /** Value between 1 and 8, used to update the EXIF Orientation tag. */
+        orientation?: number | undefined;
+        /**
+         * Filesystem path to output ICC profile, defaults to sRGB.
+         * @deprecated Use `withIccProfile()` instead.
+        */
+        icc?: string | undefined;
+        /**
+         * Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data.
+         * @deprecated Use `withExif()` or `withExifMerge()` instead.
+         */
+        exif?: Exif | undefined;
     }
 
     interface Metadata {
@@ -1096,6 +1150,11 @@ declare namespace sharp {
         force?: boolean | undefined;
     }
 
+    interface WithIccProfileOptions {
+        /**  Should the ICC profile be included in the output image metadata? (optional, default true) */
+        attach?: boolean | undefined;
+    }
+
     interface JpegOptions extends OutputOptions {
         /** Quality, integer 1-100 (optional, default 80) */
         quality?: number | undefined;
@@ -1234,6 +1293,8 @@ declare namespace sharp {
         yres?: number | undefined;
         /** Reduce bitdepth to 1, 2 or 4 bit (optional, default 8) */
         bitdepth?: 1 | 2 | 4 | 8 | undefined;
+        /** Write 1-bit images as miniswhite (optional, default false) */
+        miniswhite?: boolean | undefined;
         /** Resolution unit options: inch, cm (optional, default 'inch') */
         resolutionUnit?: 'inch' | 'cm' | undefined;
     }
@@ -1340,10 +1401,12 @@ declare namespace sharp {
     }
 
     interface TrimOptions {
-        /** background colour, parsed by the color module, defaults to that of the top-left pixel. (optional) */
+        /** Background colour, parsed by the color module, defaults to that of the top-left pixel. (optional) */
         background?: Color | undefined;
-        /** the allowed difference from the above colour, a positive number. (optional, default `10`) */
+        /** Allowed difference from the above colour, a positive number. (optional, default 10) */
         threshold?: number | undefined;
+        /** Does the input more closely resemble line art (e.g. vector) rather than being photographic? (optional, default false) */
+        lineArt?: boolean | undefined;
     }
 
     interface RawOptions {

lib/libvips.js

@@ -16,7 +16,7 @@ const minimumLibvipsVersion = semverCoerce(minimumLibvipsVersionLabelled).versio
 
 const prebuiltPlatforms = [
   'darwin-arm64', 'darwin-x64',
-  'linux-arm', 'linux-arm64', 'linux-x64',
+  'linux-arm', 'linux-arm64', 'linux-s390x', 'linux-x64',
   'linuxmusl-arm64', 'linuxmusl-x64',
   'win32-ia32', 'win32-x64'
 ];
@@ -41,15 +41,23 @@ const runtimePlatformArch = () => `${process.platform}${runtimeLibc()}-${process
 
 /* istanbul ignore next */
 const buildPlatformArch = () => {
+  if (isEmscripten()) {
+    return 'wasm32';
+  }
   /* eslint camelcase: ["error", { allow: ["^npm_config_"] }] */
   const { npm_config_arch, npm_config_platform, npm_config_libc } = process.env;
-  return `${npm_config_platform || process.platform}${npm_config_libc || runtimeLibc()}-${npm_config_arch || process.arch}`;
+  const libc = typeof npm_config_libc === 'string' ? npm_config_libc : runtimeLibc();
+  return `${npm_config_platform || process.platform}${libc}-${npm_config_arch || process.arch}`;
 };
 
 const buildSharpLibvipsIncludeDir = () => {
   try {
-    return require('@img/sharp-libvips-dev/include');
-  } catch {}
+    return require(`@img/sharp-libvips-dev-${buildPlatformArch()}/include`);
+  } catch {
+    try {
+      return require('@img/sharp-libvips-dev/include');
+    } catch {}
+  }
   /* istanbul ignore next */
   return '';
 };
@@ -64,12 +72,22 @@ const buildSharpLibvipsCPlusPlusDir = () => {
 
 const buildSharpLibvipsLibDir = () => {
   try {
-    return require(`@img/sharp-libvips-${buildPlatformArch()}/lib`);
-  } catch {}
+    return require(`@img/sharp-libvips-dev-${buildPlatformArch()}/lib`);
+  } catch {
+    try {
+      return require(`@img/sharp-libvips-${buildPlatformArch()}/lib`);
+    } catch {}
+  }
   /* istanbul ignore next */
   return '';
 };
 
+/* istanbul ignore next */
+const isEmscripten = () => {
+  const { CC } = process.env;
+  return Boolean(CC && CC.endsWith('/emcc'));
+};
+
 const isRosetta = () => {
   /* istanbul ignore next */
   if (process.platform === 'darwin' && process.arch === 'x64') {
@@ -81,7 +99,7 @@ const isRosetta = () => {
 
 /* istanbul ignore next */
 const spawnRebuild = () =>
-  spawnSync('node-gyp rebuild --directory=src', {
+  spawnSync(`node-gyp rebuild --directory=src ${isEmscripten() ? '--nodedir=emscripten' : ''}`, {
     ...spawnSyncOptions,
     stdio: 'inherit'
   }).status;

lib/output.js

@@ -163,39 +163,185 @@ function toBuffer (options, callback) {
 }
 
 /**
- * Include all metadata (EXIF, XMP, IPTC) from the input image in the output image.
- * This will also convert to and add a web-friendly sRGB ICC profile if appropriate,
- * unless a custom output profile is provided.
- *
- * The default behaviour, when `withMetadata` is not used, is to convert to the device-independent
- * sRGB colour space and strip all metadata, including the removal of any ICC profile.
+ * Keep all EXIF metadata from the input image in the output image.
  *
  * EXIF metadata is unsupported for TIFF output.
  *
- * @example
- * sharp('input.jpg')
- *   .withMetadata()
- *   .toFile('output-with-metadata.jpg')
- *   .then(info => { ... });
+ * @since 0.33.0
  *
  * @example
- * // Set output EXIF metadata
- * const data = await sharp(input)
- *   .withMetadata({
- *     exif: {
- *       IFD0: {
- *         Copyright: 'The National Gallery'
- *       },
- *       IFD3: {
- *         GPSLatitudeRef: 'N',
- *         GPSLatitude: '51/1 30/1 3230/100',
- *         GPSLongitudeRef: 'W',
- *         GPSLongitude: '0/1 7/1 4366/100'
- *       }
+ * const outputWithExif = await sharp(inputWithExif)
+ *   .keepExif()
+ *   .toBuffer();
+ *
+ * @returns {Sharp}
+ */
+function keepExif () {
+  this.options.keepMetadata |= 0b00001;
+  return this;
+}
+
+/**
+ * Set EXIF metadata in the output image, ignoring any EXIF in the input image.
+ *
+ * @since 0.33.0
+ *
+ * @example
+ * const dataWithExif = await sharp(input)
+ *   .withExif({
+ *     IFD0: {
+ *       Copyright: 'The National Gallery'
+ *     },
+ *     IFD3: {
+ *       GPSLatitudeRef: 'N',
+ *       GPSLatitude: '51/1 30/1 3230/100',
+ *       GPSLongitudeRef: 'W',
+ *       GPSLongitude: '0/1 7/1 4366/100'
  *     }
  *   })
  *   .toBuffer();
  *
+ * @param {Object<string, Object<string, string>>} exif Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data.
+ * @returns {Sharp}
+ * @throws {Error} Invalid parameters
+ */
+function withExif (exif) {
+  if (is.object(exif)) {
+    for (const [ifd, entries] of Object.entries(exif)) {
+      if (is.object(entries)) {
+        for (const [k, v] of Object.entries(entries)) {
+          if (is.string(v)) {
+            this.options.withExif[`exif-${ifd.toLowerCase()}-${k}`] = v;
+          } else {
+            throw is.invalidParameterError(`${ifd}.${k}`, 'string', v);
+          }
+        }
+      } else {
+        throw is.invalidParameterError(ifd, 'object', entries);
+      }
+    }
+  } else {
+    throw is.invalidParameterError('exif', 'object', exif);
+  }
+  this.options.withExifMerge = false;
+  return this.keepExif();
+}
+
+/**
+ * Update EXIF metadata from the input image in the output image.
+ *
+ * @since 0.33.0
+ *
+ * @example
+ * const dataWithMergedExif = await sharp(inputWithExif)
+ *   .withExifMerge({
+ *     IFD0: {
+ *       Copyright: 'The National Gallery'
+ *     }
+ *   })
+ *   .toBuffer();
+ *
+ * @param {Object<string, Object<string, string>>} exif Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data.
+ * @returns {Sharp}
+ * @throws {Error} Invalid parameters
+ */
+function withExifMerge (exif) {
+  this.withExif(exif);
+  this.options.withExifMerge = true;
+  return this;
+}
+
+/**
+ * Keep ICC profile from the input image in the output image.
+ *
+ * Where necessary, will attempt to convert the output colour space to match the profile.
+ *
+ * @since 0.33.0
+ *
+ * @example
+ * const outputWithIccProfile = await sharp(inputWithIccProfile)
+ *   .keepIccProfile()
+ *   .toBuffer();
+ *
+ * @returns {Sharp}
+ */
+function keepIccProfile () {
+  this.options.keepMetadata |= 0b01000;
+  return this;
+}
+
+/**
+ * Transform using an ICC profile and attach to the output image.
+ *
+ * This can either be an absolute filesystem path or
+ * built-in profile name (`srgb`, `p3`, `cmyk`).
+ *
+ * @since 0.33.0
+ *
+ * @example
+ * const outputWithP3 = await sharp(input)
+ *   .withIccProfile('p3')
+ *   .toBuffer();
+ *
+ * @param {string} icc - Absolute filesystem path to output ICC profile or built-in profile name (srgb, p3, cmyk).
+ * @param {Object} [options]
+ * @param {number} [options.attach=true] Should the ICC profile be included in the output image metadata?
+ * @returns {Sharp}
+ * @throws {Error} Invalid parameters
+ */
+function withIccProfile (icc, options) {
+  if (is.string(icc)) {
+    this.options.withIccProfile = icc;
+  } else {
+    throw is.invalidParameterError('icc', 'string', icc);
+  }
+  this.keepIccProfile();
+  if (is.object(options)) {
+    if (is.defined(options.attach)) {
+      if (is.bool(options.attach)) {
+        if (!options.attach) {
+          this.options.keepMetadata &= ~0b01000;
+        }
+      } else {
+        throw is.invalidParameterError('attach', 'boolean', options.attach);
+      }
+    }
+  }
+  return this;
+}
+
+/**
+ * Keep all metadata (EXIF, ICC, XMP, IPTC) from the input image in the output image.
+ *
+ * The default behaviour, when `keepMetadata` is not used, is to convert to the device-independent
+ * sRGB colour space and strip all metadata, including the removal of any ICC profile.
+ *
+ * @since 0.33.0
+ *
+ * @example
+ * const outputWithMetadata = await sharp(inputWithMetadata)
+ *   .keepMetadata()
+ *   .toBuffer();
+ *
+ * @returns {Sharp}
+ */
+function keepMetadata () {
+  this.options.keepMetadata = 0b11111;
+  return this;
+}
+
+/**
+ * Keep most metadata (EXIF, XMP, IPTC) from the input image in the output image.
+ *
+ * This will also convert to and add a web-friendly sRGB ICC profile if appropriate.
+ *
+ * Allows orientation and density to be set or updated.
+ *
+ * @example
+ * const outputSrgbWithMetadata = await sharp(inputRgbWithMetadata)
+ *   .withMetadata()
+ *   .toBuffer();
+ *
  * @example
  * // Set output metadata to 96 DPI
  * const data = await sharp(input)
@@ -203,15 +349,14 @@ function toBuffer (options, callback) {
  *   .toBuffer();
  *
  * @param {Object} [options]
- * @param {number} [options.orientation] value between 1 and 8, used to update the EXIF `Orientation` tag.
- * @param {string} [options.icc='srgb'] Filesystem path to output ICC profile, relative to `process.cwd()`, defaults to built-in sRGB.
- * @param {Object<Object>} [options.exif={}] Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data.
+ * @param {number} [options.orientation] Used to update the EXIF `Orientation` tag, integer between 1 and 8.
  * @param {number} [options.density] Number of pixels per inch (DPI).
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
 function withMetadata (options) {
-  this.options.withMetadata = is.bool(options) ? options : true;
+  this.keepMetadata();
+  this.withIccProfile('srgb');
   if (is.object(options)) {
     if (is.defined(options.orientation)) {
       if (is.integer(options.orientation) && is.inRange(options.orientation, 1, 8)) {
@@ -228,30 +373,10 @@ function withMetadata (options) {
       }
     }
     if (is.defined(options.icc)) {
-      if (is.string(options.icc)) {
-        this.options.withMetadataIcc = options.icc;
-      } else {
-        throw is.invalidParameterError('icc', 'string filesystem path to ICC profile', options.icc);
-      }
+      this.withIccProfile(options.icc);
     }
     if (is.defined(options.exif)) {
-      if (is.object(options.exif)) {
-        for (const [ifd, entries] of Object.entries(options.exif)) {
-          if (is.object(entries)) {
-            for (const [k, v] of Object.entries(entries)) {
-              if (is.string(v)) {
-                this.options.withMetadataStrs[`exif-${ifd.toLowerCase()}-${k}`] = v;
-              } else {
-                throw is.invalidParameterError(`exif.${ifd}.${k}`, 'string', v);
-              }
-            }
-          } else {
-            throw is.invalidParameterError(`exif.${ifd}`, 'object', entries);
-          }
-        }
-      } else {
-        throw is.invalidParameterError('exif', 'object', options.exif);
-      }
+      this.withExifMerge(options.exif);
     }
   }
   return this;
@@ -782,6 +907,7 @@ function trySetAnimationOptions (source, target) {
  * @param {number} [options.yres=1.0] - vertical resolution in pixels/mm
  * @param {string} [options.resolutionUnit='inch'] - resolution unit options: inch, cm
  * @param {number} [options.bitdepth=8] - reduce bitdepth to 1, 2 or 4 bit
+ * @param {boolean} [options.miniswhite=false] - write 1-bit images as miniswhite
  * @returns {Sharp}
  * @throws {Error} Invalid options
  */
@@ -819,6 +945,10 @@ function tiff (options) {
         throw is.invalidParameterError('tileHeight', 'integer greater than zero', options.tileHeight);
       }
     }
+    // miniswhite
+    if (is.defined(options.miniswhite)) {
+      this._setBooleanOption('tiffMiniswhite', options.miniswhite);
+    }
     // pyramid
     if (is.defined(options.pyramid)) {
       this._setBooleanOption('tiffPyramid', options.pyramid);
@@ -1402,6 +1532,12 @@ module.exports = function (Sharp) {
     // Public
     toFile,
     toBuffer,
+    keepExif,
+    withExif,
+    withExifMerge,
+    keepIccProfile,
+    withIccProfile,
+    keepMetadata,
     withMetadata,
     toFormat,
     jpeg,

lib/resize.js

@@ -494,70 +494,67 @@ function extract (options) {
  *
  * If the result of this operation would trim an image to nothing then no change is made.
  *
- * The `info` response Object, obtained from callback of `.toFile()` or `.toBuffer()`,
- * will contain `trimOffsetLeft` and `trimOffsetTop` properties.
+ * The `info` response Object will contain `trimOffsetLeft` and `trimOffsetTop` properties.
  *
  * @example
  * // Trim pixels with a colour similar to that of the top-left pixel.
- * sharp(input)
+ * await sharp(input)
  *   .trim()
- *   .toFile(output, function(err, info) {
- *     ...
- *   });
+ *   .toFile(output);
+ *
  * @example
  * // Trim pixels with the exact same colour as that of the top-left pixel.
- * sharp(input)
- *   .trim(0)
- *   .toFile(output, function(err, info) {
- *     ...
- *   });
+ * await sharp(input)
+ *   .trim({
+ *     threshold: 0
+ *   })
+ *   .toFile(output);
+ *
  * @example
- * // Trim only pixels with a similar colour to red.
- * sharp(input)
- *   .trim("#FF0000")
- *   .toFile(output, function(err, info) {
- *     ...
- *   });
+ * // Assume input is line art and trim only pixels with a similar colour to red.
+ * const output = await sharp(input)
+ *   .trim({
+ *     background: "#FF0000",
+ *     lineArt: true
+ *   })
+ *   .toBuffer();
+ *
  * @example
  * // Trim all "yellow-ish" pixels, being more lenient with the higher threshold.
- * sharp(input)
+ * const output = await sharp(input)
  *   .trim({
  *     background: "yellow",
  *     threshold: 42,
  *   })
- *   .toFile(output, function(err, info) {
- *     ...
- *   });
+ *   .toBuffer();
  *
- * @param {string|number|Object} trim - the specific background colour to trim, the threshold for doing so or an Object with both.
- * @param {string|Object} [trim.background='top-left pixel'] - background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to that of the top-left pixel.
- * @param {number} [trim.threshold=10] - the allowed difference from the above colour, a positive number.
+ * @param {Object} [options]
+ * @param {string|Object} [options.background='top-left pixel'] - Background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to that of the top-left pixel.
+ * @param {number} [options.threshold=10] - Allowed difference from the above colour, a positive number.
+ * @param {boolean} [options.lineArt=false] - Does the input more closely resemble line art (e.g. vector) rather than being photographic?
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
-function trim (trim) {
-  if (!is.defined(trim)) {
-    this.options.trimThreshold = 10;
-  } else if (is.string(trim)) {
-    this._setBackgroundColourOption('trimBackground', trim);
-    this.options.trimThreshold = 10;
-  } else if (is.number(trim)) {
-    if (trim >= 0) {
-      this.options.trimThreshold = trim;
+function trim (options) {
+  this.options.trimThreshold = 10;
+  if (is.defined(options)) {
+    if (is.object(options)) {
+      if (is.defined(options.background)) {
+        this._setBackgroundColourOption('trimBackground', options.background);
+      }
+      if (is.defined(options.threshold)) {
+        if (is.number(options.threshold) && options.threshold >= 0) {
+          this.options.trimThreshold = options.threshold;
+        } else {
+          throw is.invalidParameterError('threshold', 'positive number', options.threshold);
+        }
+      }
+      if (is.defined(options.lineArt)) {
+        this._setBooleanOption('trimLineArt', options.lineArt);
+      }
     } else {
-      throw is.invalidParameterError('threshold', 'positive number', trim);
+      throw is.invalidParameterError('trim', 'object', options);
     }
-  } else if (is.object(trim)) {
-    this._setBackgroundColourOption('trimBackground', trim.background);
-    if (!is.defined(trim.threshold)) {
-      this.options.trimThreshold = 10;
-    } else if (is.number(trim.threshold) && trim.threshold >= 0) {
-      this.options.trimThreshold = trim.threshold;
-    } else {
-      throw is.invalidParameterError('threshold', 'positive number', trim);
-    }
-  } else {
-    throw is.invalidParameterError('trim', 'string, number or object', trim);
   }
   if (isRotationExpected(this.options)) {
     this.options.rotateBeforePreExtract = true;

lib/sharp.js

@@ -9,61 +9,78 @@ const { familySync, versionSync } = require('detect-libc');
 
 const { runtimePlatformArch, prebuiltPlatforms, minimumLibvipsVersion } = require('./libvips');
 const runtimePlatform = runtimePlatformArch();
-const [isLinux, isMacOs, isWindows] = ['linux', 'darwin', 'win32'].map(os => runtimePlatform.startsWith(os));
 
-/* istanbul ignore next */
-try {
-  // Check for local build
-  module.exports = require(`../src/build/Release/sharp-${runtimePlatform}.node`);
-} catch (errLocal) {
+const paths = [
+  `../src/build/Release/sharp-${runtimePlatform}.node`,
+  '../src/build/Release/sharp-wasm32.node',
+  `@img/sharp-${runtimePlatform}/sharp.node`,
+  '@img/sharp-wasm32/sharp.node'
+];
+
+let sharp;
+const errors = [];
+for (const path of paths) {
   try {
-    // Check for runtime package
-    module.exports = require(`@img/sharp-${runtimePlatform}/sharp.node`);
-  } catch (errPackage) {
-    const help = ['Could not load the "sharp" module at runtime'];
-    if (errLocal.code !== 'MODULE_NOT_FOUND') {
-      help.push(`${errLocal.code}: ${errLocal.message}`);
-    }
-    if (errPackage.code !== 'MODULE_NOT_FOUND') {
-      help.push(`${errPackage.code}: ${errPackage.message}`);
-    }
-    help.push('Possible solutions:');
-    // Common error messages
-    if (prebuiltPlatforms.includes(runtimePlatform)) {
-      help.push('- Add an explicit dependency for the runtime platform:');
-      help.push(`    npm install --force @img/sharp-${runtimePlatform}`);
-    } else {
-      help.push(`- The ${runtimePlatform} platform requires manual installation of libvips >= ${minimumLibvipsVersion}`);
-    }
-    if (isLinux && /symbol not found/i.test(errPackage)) {
-      try {
-        const { engines } = require(`@img/sharp-libvips-${runtimePlatform}/package`);
-        const libcFound = `${familySync()} ${versionSync()}`;
-        const libcRequires = `${engines.musl ? 'musl' : 'glibc'} ${engines.musl || engines.glibc}`;
-        help.push('- Update your OS:');
-        help.push(`    Found ${libcFound}`);
-        help.push(`    Requires ${libcRequires}`);
-      } catch (errEngines) {}
-    }
-    if (isMacOs && /Incompatible library version/.test(errLocal.message)) {
-      help.push('- Update Homebrew:');
-      help.push('    brew update && brew upgrade vips');
-    }
-    if (errPackage.code === 'ERR_DLOPEN_DISABLED') {
-      help.push('- Run Node.js without using the --no-addons flag');
-    }
-    if (process.versions.pnp) {
-      help.push('- Use a supported yarn linker, either pnpm or node-modules:');
-      help.push('    yarn config set nodeLinker node-modules');
-    }
-    // Link to installation docs
-    if (isLinux && /Module did not self-register/.test(errLocal.message + errPackage.message)) {
-      help.push('- Using worker threads on Linux? See https://sharp.pixelplumbing.com/install#worker-threads');
-    } else if (isWindows && /The specified procedure could not be found/.test(errPackage.message)) {
-      help.push('- Using the canvas package on Windows? See https://sharp.pixelplumbing.com/install#canvas-and-windows');
-    } else {
-      help.push('- Consult the installation documentation: https://sharp.pixelplumbing.com/install');
-    }
-    throw new Error(help.join('\n'));
+    sharp = require(path);
+    break;
+  } catch (err) {
+    /* istanbul ignore next */
+    errors.push(err);
   }
 }
+
+/* istanbul ignore next */
+if (sharp) {
+  module.exports = sharp;
+} else {
+  const [isLinux, isMacOs, isWindows] = ['linux', 'darwin', 'win32'].map(os => runtimePlatform.startsWith(os));
+
+  const help = [`Could not load the "sharp" module using the ${runtimePlatform} runtime`];
+  errors.forEach(err => {
+    if (err.code !== 'MODULE_NOT_FOUND') {
+      help.push(`${err.code}: ${err.message}`);
+    }
+  });
+  const messages = errors.map(err => err.message).join(' ');
+  help.push('Possible solutions:');
+  // Common error messages
+  if (prebuiltPlatforms.includes(runtimePlatform)) {
+    const [os, cpu] = runtimePlatform.split('-');
+    help.push('- Add platform-specific dependencies:');
+    help.push(`    npm install --os=${os} --cpu=${cpu} sharp`);
+    help.push('  or');
+    help.push(`    npm install --force @img/sharp-${runtimePlatform}`);
+  } else {
+    help.push(`- Manually install libvips >= ${minimumLibvipsVersion}`);
+    help.push('- Add experimental WebAssembly-based dependencies:');
+    help.push('    npm install --cpu=wasm32 sharp');
+  }
+  if (isLinux && /symbol not found/i.test(messages)) {
+    try {
+      const { engines } = require(`@img/sharp-libvips-${runtimePlatform}/package`);
+      const libcFound = `${familySync()} ${versionSync()}`;
+      const libcRequires = `${engines.musl ? 'musl' : 'glibc'} ${engines.musl || engines.glibc}`;
+      help.push('- Update your OS:');
+      help.push(`    Found ${libcFound}`);
+      help.push(`    Requires ${libcRequires}`);
+    } catch (errEngines) {}
+  }
+  if (isMacOs && /Incompatible library version/.test(messages)) {
+    help.push('- Update Homebrew:');
+    help.push('    brew update && brew upgrade vips');
+  }
+  if (errors.some(err => err.code === 'ERR_DLOPEN_DISABLED')) {
+    help.push('- Run Node.js without using the --no-addons flag');
+  }
+  if (process.versions.pnp) {
+    help.push('- Use a supported yarn linker, either pnpm or node-modules:');
+    help.push('    yarn config set nodeLinker node-modules');
+  }
+  // Link to installation docs
+  if (isWindows && /The specified procedure could not be found/.test(messages)) {
+    help.push('- Using the canvas package on Windows? See https://sharp.pixelplumbing.com/install#canvas-and-windows');
+  } else {
+    help.push('- Consult the installation documentation: https://sharp.pixelplumbing.com/install');
+  }
+  throw new Error(help.join('\n'));
+}

lib/utility.js

@@ -59,11 +59,17 @@ let versions = {
 };
 /* istanbul ignore next */
 if (!libvipsVersion.isGlobal) {
-  try {
-    versions = require(`@img/sharp-${runtimePlatform}/versions`);
-  } catch (_) {
+  if (!libvipsVersion.isWasm) {
     try {
-      versions = require(`@img/sharp-libvips-${runtimePlatform}/versions`);
+      versions = require(`@img/sharp-${runtimePlatform}/versions`);
+    } catch (_) {
+      try {
+        versions = require(`@img/sharp-libvips-${runtimePlatform}/versions`);
+      } catch (_) {}
+    }
+  } else {
+    try {
+      versions = require('@img/sharp-wasm32/versions');
     } catch (_) {}
   }
 }

npm/darwin-arm64/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@img/sharp-darwin-arm64",
-  "version": "0.33.0-alpha.9",
-  "description": "Prebuilt sharp for use with macOS ARM64",
+  "version": "0.33.0-rc.2",
+  "description": "Prebuilt sharp for use with macOS 64-bit ARM",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-darwin-arm64": "0.0.1"
+    "@img/sharp-libvips-darwin-arm64": "1.0.0"
   },
   "files": [
     "lib"

npm/darwin-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-darwin-x64",
-  "version": "0.33.0-alpha.9",
+  "version": "0.33.0-rc.2",
   "description": "Prebuilt sharp for use with macOS x64",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-darwin-x64": "0.0.1"
+    "@img/sharp-libvips-darwin-x64": "1.0.0"
   },
   "files": [
     "lib"

npm/from-github-release.js

@@ -38,7 +38,8 @@ limitations under the License.
 `;
 
 workspaces.map(async platform => {
-  const url = `https://github.com/lovell/sharp/releases/download/v${version}/sharp-v${version}-napi-v9-${platform}.tar.gz`;
+  const prebuildPlatform = platform === 'wasm32' ? 'emscripten-wasm32' : platform;
+  const url = `https://github.com/lovell/sharp/releases/download/v${version}/sharp-v${version}-napi-v9-${prebuildPlatform}.tar.gz`;
   const dir = path.join(__dirname, platform);
   const response = await fetch(url);
   if (!response.ok) {
@@ -47,7 +48,7 @@ workspaces.map(async platform => {
   }
   // Extract prebuild tarball
   const lib = path.join(dir, 'lib');
-  await rm(lib, { recursive: true });
+  await rm(lib, { force: true, recursive: true });
   await pipeline(
     Readable.fromWeb(response.body),
     createGunzip(),
@@ -58,9 +59,10 @@ workspaces.map(async platform => {
   await writeFile(path.join(dir, 'README.md'), `# \`${name}\`\n\n${description}.\n${licensing}`);
   // Copy Apache-2.0 LICENSE
   await copyFile(path.join(__dirname, '..', 'LICENSE'), path.join(dir, 'LICENSE'));
-  // Copy Windows-specific files
-  if (platform.startsWith('win32-')) {
-    const sharpLibvipsDir = path.join(require(`@img/sharp-libvips-${platform}/lib`), '..');
+  // Copy files for packages without an explicit sharp-libvips dependency (Windows, wasm)
+  if (platform.startsWith('win') || platform.startsWith('wasm')) {
+    const libvipsPlatform = platform === 'wasm32' ? 'dev-wasm32' : platform;
+    const sharpLibvipsDir = path.join(require(`@img/sharp-libvips-${libvipsPlatform}/lib`), '..');
     // Copy versions.json
     await copyFile(path.join(sharpLibvipsDir, 'versions.json'), path.join(dir, 'versions.json'));
     // Append third party licensing to README

npm/linux-arm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-linux-arm",
-  "version": "0.33.0-alpha.9",
+  "version": "0.33.0-rc.2",
   "description": "Prebuilt sharp for use with Linux (glibc) ARM (32-bit)",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linux-arm": "0.0.1"
+    "@img/sharp-libvips-linux-arm": "1.0.0"
   },
   "files": [
     "lib"

npm/linux-arm64/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@img/sharp-linux-arm64",
-  "version": "0.33.0-alpha.9",
-  "description": "Prebuilt sharp for use with Linux (glibc) ARM64",
+  "version": "0.33.0-rc.2",
+  "description": "Prebuilt sharp for use with Linux (glibc) 64-bit ARM",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linux-arm64": "0.0.1"
+    "@img/sharp-libvips-linux-arm64": "1.0.0"
   },
   "files": [
     "lib"

npm/linux-s390x/package.json

@@ -0,0 +1,47 @@
+{
+  "name": "@img/sharp-linux-s390x",
+  "version": "0.33.0-rc.2",
+  "description": "Prebuilt sharp for use with Linux (glibc) s390x",
+  "author": "Lovell Fuller <npm@lovell.info>",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/linux-s390x"
+  },
+  "license": "Apache-2.0",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "optionalDependencies": {
+    "@img/sharp-libvips-linux-s390x": "1.0.0"
+  },
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-linux-s390x.node",
+    "./package": "./package.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0",
+    "glibc": ">=2.28"
+  },
+  "os": [
+    "linux"
+  ],
+  "libc": [
+    "glibc"
+  ],
+  "cpu": [
+    "s390x"
+  ]
+}

npm/linux-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-linux-x64",
-  "version": "0.33.0-alpha.9",
+  "version": "0.33.0-rc.2",
   "description": "Prebuilt sharp for use with Linux (glibc) x64",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linux-x64": "0.0.1"
+    "@img/sharp-libvips-linux-x64": "1.0.0"
   },
   "files": [
     "lib"

npm/linuxmusl-arm64/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@img/sharp-linuxmusl-arm64",
-  "version": "0.33.0-alpha.9",
-  "description": "Prebuilt sharp for use with Linux (musl) ARM64",
+  "version": "0.33.0-rc.2",
+  "description": "Prebuilt sharp for use with Linux (musl) 64-bit ARM",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linuxmusl-arm64": "0.0.1"
+    "@img/sharp-libvips-linuxmusl-arm64": "1.0.0"
   },
   "files": [
     "lib"

npm/linuxmusl-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-linuxmusl-x64",
-  "version": "0.33.0-alpha.9",
+  "version": "0.33.0-rc.2",
   "description": "Prebuilt sharp for use with Linux (musl) x64",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linuxmusl-x64": "0.0.1"
+    "@img/sharp-libvips-linuxmusl-x64": "1.0.0"
   },
   "files": [
     "lib"

npm/package.json

@@ -1,15 +1,17 @@
 {
   "name": "@img/sharp",
-  "version": "0.33.0-alpha.9",
+  "version": "0.33.0-rc.2",
   "private": "true",
   "workspaces": [
-    "darwin-x64",
     "darwin-arm64",
+    "darwin-x64",
     "linux-arm",
     "linux-arm64",
+    "linux-s390x",
+    "linux-x64",
     "linuxmusl-arm64",
     "linuxmusl-x64",
-    "linux-x64",
+    "wasm32",
     "win32-ia32",
     "win32-x64"
   ]

npm/wasm32/package.json

@@ -0,0 +1,42 @@
+{
+  "name": "@img/sharp-wasm32",
+  "version": "0.33.0-rc.2",
+  "description": "Prebuilt sharp for use with wasm32",
+  "author": "Lovell Fuller <npm@lovell.info>",
+  "homepage": "https://sharp.pixelplumbing.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lovell/sharp.git",
+    "directory": "npm/wasm32"
+  },
+  "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
+  "funding": {
+    "url": "https://opencollective.com/libvips"
+  },
+  "preferUnplugged": true,
+  "files": [
+    "lib",
+    "versions.json"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "commonjs",
+  "exports": {
+    "./sharp.node": "./lib/sharp-wasm32.node.js",
+    "./package": "./package.json",
+    "./versions": "./versions.json"
+  },
+  "engines": {
+    "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+    "npm": ">=9.6.5",
+    "yarn": ">=3.2.0",
+    "pnpm": ">=7.1.0"
+  },
+  "dependencies": {
+    "@emnapi/runtime": "^0.44.0"
+  },
+  "cpu": [
+    "wasm32"
+  ]
+}

npm/win32-ia32/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-win32-ia32",
-  "version": "0.33.0-alpha.9",
+  "version": "0.33.0-rc.2",
   "description": "Prebuilt sharp for use with Windows x86 (32-bit)",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

npm/win32-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@img/sharp-win32-x64",
-  "version": "0.33.0-alpha.9",
+  "version": "0.33.0-rc.2",
   "description": "Prebuilt sharp for use with Windows x64",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sharp",
   "description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images",
-  "version": "0.33.0-alpha.9",
+  "version": "0.33.0-rc.2",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://github.com/lovell/sharp",
   "contributors": [
@@ -86,7 +86,9 @@
     "Ankur Parihar <ankur.github@gmail.com>",
     "Brahim Ait elhaj <brahima@gmail.com>",
     "Mart Jansink <m.jansink@gmail.com>",
-    "Lachlan Newman <lachnewman007@gmail.com>"
+    "Lachlan Newman <lachnewman007@gmail.com>",
+    "Dennis Beatty <dennis@dcbeatty.com>",
+    "Ingvar Stepanyan <me@rreverser.com>"
   ],
   "scripts": {
     "install": "node install/check",
@@ -139,30 +141,36 @@
     "semver": "^7.5.4"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.33.0-alpha.9",
-    "@img/sharp-darwin-x64": "0.33.0-alpha.9",
-    "@img/sharp-libvips-darwin-arm64": "0.0.1",
-    "@img/sharp-libvips-darwin-x64": "0.0.1",
-    "@img/sharp-libvips-linux-arm": "0.0.1",
-    "@img/sharp-libvips-linux-arm64": "0.0.1",
-    "@img/sharp-libvips-linux-x64": "0.0.1",
-    "@img/sharp-libvips-linuxmusl-arm64": "0.0.1",
-    "@img/sharp-libvips-linuxmusl-x64": "0.0.1",
-    "@img/sharp-linux-arm": "0.33.0-alpha.9",
-    "@img/sharp-linux-arm64": "0.33.0-alpha.9",
-    "@img/sharp-linux-x64": "0.33.0-alpha.9",
-    "@img/sharp-linuxmusl-arm64": "0.33.0-alpha.9",
-    "@img/sharp-linuxmusl-x64": "0.33.0-alpha.9",
-    "@img/sharp-win32-ia32": "0.33.0-alpha.9",
-    "@img/sharp-win32-x64": "0.33.0-alpha.9"
+    "@img/sharp-darwin-arm64": "0.33.0-rc.2",
+    "@img/sharp-darwin-x64": "0.33.0-rc.2",
+    "@img/sharp-libvips-darwin-arm64": "1.0.0",
+    "@img/sharp-libvips-darwin-x64": "1.0.0",
+    "@img/sharp-libvips-linux-arm": "1.0.0",
+    "@img/sharp-libvips-linux-arm64": "1.0.0",
+    "@img/sharp-libvips-linux-s390x": "1.0.0",
+    "@img/sharp-libvips-linux-x64": "1.0.0",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.0.0",
+    "@img/sharp-libvips-linuxmusl-x64": "1.0.0",
+    "@img/sharp-linux-arm": "0.33.0-rc.2",
+    "@img/sharp-linux-arm64": "0.33.0-rc.2",
+    "@img/sharp-linux-s390x": "0.33.0-rc.2",
+    "@img/sharp-linux-x64": "0.33.0-rc.2",
+    "@img/sharp-linuxmusl-arm64": "0.33.0-rc.2",
+    "@img/sharp-linuxmusl-x64": "0.33.0-rc.2",
+    "@img/sharp-wasm32": "0.33.0-rc.2",
+    "@img/sharp-win32-ia32": "0.33.0-rc.2",
+    "@img/sharp-win32-x64": "0.33.0-rc.2"
   },
   "devDependencies": {
-    "@img/sharp-libvips-dev": "0.0.1",
-    "@img/sharp-libvips-win32-ia32": "0.0.1",
-    "@img/sharp-libvips-win32-x64": "0.0.1",
+    "@emnapi/runtime": "^0.44.0",
+    "@img/sharp-libvips-dev": "1.0.0",
+    "@img/sharp-libvips-dev-wasm32": "1.0.0",
+    "@img/sharp-libvips-win32-ia32": "1.0.0",
+    "@img/sharp-libvips-win32-x64": "1.0.0",
     "@types/node": "*",
-    "async": "^3.2.4",
+    "async": "^3.2.5",
     "cc": "^3.0.1",
+    "emnapi": "^0.44.0",
     "exif-reader": "^2.0.0",
     "extract-zip": "^2.0.1",
     "icc": "^3.0.0",
@@ -179,7 +187,7 @@
   "license": "Apache-2.0",
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-    "libvips": ">=8.14.5"
+    "libvips": ">=8.15.0"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"
@@ -200,6 +208,11 @@
       "build/include"
     ]
   },
+  "nyc": {
+    "include": [
+      "lib"
+    ]
+  },
   "tsd": {
     "directory": "test/types/"
   }

src/binding.gyp

@@ -5,6 +5,7 @@
   'variables': {
     'vips_version': '<!(node -p "require(\'../lib/libvips\').minimumLibvipsVersion")',
     'platform_and_arch': '<!(node -p "require(\'../lib/libvips\').buildPlatformArch()")',
+    'sharp_libvips_version': '<!(node -p "require(\'../package.json\').optionalDependencies[\'@img/sharp-libvips-<(platform_and_arch)\']")',
     'sharp_libvips_include_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsIncludeDir()")',
     'sharp_libvips_cplusplus_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsCPlusPlusDir()")',
     'sharp_libvips_lib_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsLibDir()")'
@@ -32,11 +33,11 @@
           '<(sharp_libvips_lib_dir)/glib-2.0/include'
         ],
         'link_settings': {
-          'library_dirs': ['<(sharp_libvips_lib_dir)'],
+          'library_dirs': [
+            '<(sharp_libvips_lib_dir)'
+          ],
           'libraries': [
-            'libvips.lib',
-            'libglib-2.0.lib',
-            'libgobject-2.0.lib'
+            'libvips.lib'
           ],
         },
         'configurations': {
@@ -129,6 +130,9 @@
           '<(sharp_libvips_include_dir)/glib-2.0',
           '<(sharp_libvips_lib_dir)/glib-2.0/include'
         ],
+        'library_dirs': [
+          '<(sharp_libvips_lib_dir)'
+        ],
         'conditions': [
           ['OS == "win"', {
             'defines': [
@@ -136,19 +140,13 @@
               '_FILE_OFFSET_BITS=64'
             ],
             'link_settings': {
-              'library_dirs': ['<(sharp_libvips_lib_dir)'],
               'libraries': [
-                'libvips.lib',
-                'libglib-2.0.lib',
-                'libgobject-2.0.lib'
+                'libvips.lib'
               ]
             }
           }],
           ['OS == "mac"', {
             'link_settings': {
-              'library_dirs': [
-                '<(sharp_libvips_lib_dir)'
-              ],
               'libraries': [
                 'libvips-cpp.42.dylib'
               ]
@@ -157,6 +155,7 @@
               'OTHER_LDFLAGS': [
                 # Ensure runtime linking is relative to sharp.node
                 '-Wl,-rpath,\'@loader_path/../../sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath,\'@loader_path/../../../sharp-libvips-<(platform_and_arch)/<(sharp_libvips_version)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
               ]
@@ -167,21 +166,39 @@
               '_GLIBCXX_USE_CXX11_ABI=1'
             ],
             'link_settings': {
-              'library_dirs': [
-                '<(sharp_libvips_lib_dir)'
-              ],
               'libraries': [
                 '-l:libvips-cpp.so.42'
               ],
               'ldflags': [
-                # Ensure runtime linking is relative to sharp.node
                 '-Wl,-s',
                 '-Wl,--disable-new-dtags',
+                '-Wl,-z,nodelete',
                 '-Wl,-rpath=\'$$ORIGIN/../../sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath=\'$$ORIGIN/../../../sharp-libvips-<(platform_and_arch)/<(sharp_libvips_version)/lib\'',
                 '-Wl,-rpath=\'$$ORIGIN/../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath=\'$$ORIGIN/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
               ]
             }
+          }],
+          ['OS == "emscripten"', {
+            'product_extension': 'node.js',
+            'link_settings': {
+              'ldflags': [
+                '-fexceptions',
+                '--pre-js=<!(node -p "require.resolve(\'./emscripten/pre.js\')")',
+                '-Oz',
+                '-sALLOW_MEMORY_GROWTH',
+                '-sENVIRONMENT=node',
+                '-sEXPORTED_FUNCTIONS=["_vips_shutdown", "_uv_library_shutdown"]',
+                '-sNODERAWFS',
+                '-sTEXTDECODER=0',
+                '-sWASM_ASYNC_COMPILATION=0',
+                '-sWASM_BIGINT'
+              ],
+              'libraries': [
+                '<!@(PKG_CONFIG_PATH="<!(node -p "require(\'@img/sharp-libvips-dev-wasm32/lib\')")/pkgconfig" pkg-config --static --libs vips-cpp)'
+              ],
+            }
           }]
         ]
       }]
@@ -206,11 +223,6 @@
     'configurations': {
       'Release': {
         'conditions': [
-          ['OS == "linux"', {
-            'cflags_cc': [
-              '-Wno-cast-function-type'
-            ]
-          }],
           ['target_arch == "arm"', {
             'cflags_cc': [
               '-Wno-psabi'
@@ -256,9 +268,7 @@
         'copies': [{
           'destination': 'build/Release',
           'files': [
-            '<(sharp_libvips_lib_dir)/libvips-42.dll',
-            '<(sharp_libvips_lib_dir)/libglib-2.0-0.dll',
-            '<(sharp_libvips_lib_dir)/libgobject-2.0-0.dll'
+            '<(sharp_libvips_lib_dir)/libvips-42.dll'
           ]
         }]
       }]

src/common.cc

@@ -531,7 +531,33 @@ namespace sharp {
     Does this image have an embedded profile?
   */
   bool HasProfile(VImage image) {
-    return (image.get_typeof(VIPS_META_ICC_NAME) != 0) ? TRUE : FALSE;
+    return image.get_typeof(VIPS_META_ICC_NAME) == VIPS_TYPE_BLOB;
+  }
+
+  /*
+    Get copy of embedded profile.
+  */
+  std::pair<char*, size_t> GetProfile(VImage image) {
+    std::pair<char*, size_t> icc(nullptr, 0);
+    if (HasProfile(image)) {
+      size_t length;
+      const void *data = image.get_blob(VIPS_META_ICC_NAME, &length);
+      icc.first = static_cast<char*>(g_malloc(length));
+      icc.second = length;
+      memcpy(icc.first, data, length);
+    }
+    return icc;
+  }
+
+  /*
+    Set embedded profile.
+  */
+  VImage SetProfile(VImage image, std::pair<char*, size_t> icc) {
+    if (icc.first != nullptr) {
+      image = image.copy();
+      image.set(VIPS_META_ICC_NAME, reinterpret_cast<VipsCallbackFn>(vips_area_free_cb), icc.first, icc.second);
+    }
+    return image;
   }
 
   /*
@@ -542,6 +568,27 @@ namespace sharp {
     return image.has_alpha();
   }
 
+  static void* RemoveExifCallback(VipsImage *image, char const *field, GValue *value, void *data) {
+    std::vector<std::string> *fieldNames = static_cast<std::vector<std::string> *>(data);
+    std::string fieldName(field);
+    if (fieldName.substr(0, 8) == ("exif-ifd")) {
+      fieldNames->push_back(fieldName);
+    }
+    return nullptr;
+  }
+
+  /*
+    Remove all EXIF-related image fields.
+  */
+  VImage RemoveExif(VImage image) {
+    std::vector<std::string> fieldNames;
+    vips_image_map(image.get_image(), static_cast<VipsImageMapFn>(RemoveExifCallback), &fieldNames);
+    for (const auto& f : fieldNames) {
+      image.remove(f.data());
+    }
+    return image;
+  }
+
   /*
     Get EXIF Orientation of image, if any.
   */

src/common.h

@@ -15,9 +15,9 @@
 // Verify platform and compiler compatibility
 
 #if (VIPS_MAJOR_VERSION < 8) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 14) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 14 && VIPS_MICRO_VERSION < 5)
-#error "libvips version 8.14.5+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 15) || \
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 0)
+#error "libvips version 8.15.0+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))
@@ -222,12 +222,27 @@ namespace sharp {
   */
   bool HasProfile(VImage image);
 
+  /*
+    Get copy of embedded profile.
+  */
+  std::pair<char*, size_t> GetProfile(VImage image);
+
+  /*
+    Set embedded profile.
+  */
+  VImage SetProfile(VImage image, std::pair<char*, size_t> icc);
+
   /*
     Does this image have an alpha channel?
     Uses colour space interpretation with number of channels to guess this.
   */
   bool HasAlpha(VImage image);
 
+  /*
+    Remove all EXIF-related image fields.
+  */
+  VImage RemoveExif(VImage image);
+
   /*
     Get EXIF Orientation of image, if any.
   */

src/emscripten/common.gypi

@@ -0,0 +1,40 @@
+# Copyright 2013 Lovell Fuller and others.
+# SPDX-License-Identifier: Apache-2.0
+
+{
+  'variables': {
+    'OS': 'emscripten'
+  },
+  'target_defaults': {
+    'default_configuration': 'Release',
+    'type': 'executable',
+    'cflags': [
+      '-pthread',
+      '-sDEFAULT_TO_CXX=0'
+    ],
+    'cflags_cc': [
+      '-pthread'
+    ],
+    'ldflags': [
+      '--js-library=<!(node -p "require(\'emnapi\').js_library")',
+      '-sAUTO_JS_LIBRARIES=0',
+      '-sAUTO_NATIVE_LIBRARIES=0',
+      '-sNODEJS_CATCH_EXIT=0',
+      '-sNODEJS_CATCH_REJECTION=0'
+    ],
+    'defines': [
+      '__STDC_FORMAT_MACROS',
+      'BUILDING_NODE_EXTENSION',
+      'EMNAPI_WORKER_POOL_SIZE=1'
+    ],
+    'include_dirs': [
+      '<!(node -p "require(\'emnapi\').include")'
+    ],
+    'sources': [
+      '<!@(node -p "require(\'emnapi\').sources.map(x => JSON.stringify(path.relative(process.cwd(), x))).join(\' \')")'
+    ],
+    'configurations': {
+      'Release': {}
+    }
+  }
+}

src/emscripten/pre.js

@@ -0,0 +1,19 @@
+// Copyright 2013 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
+/* global Module, ENV, _vips_shutdown, _uv_library_shutdown */
+
+Module.preRun = () => {
+  ENV.VIPS_CONCURRENCY = Number(process.env.VIPS_CONCURRENCY) || 1;
+};
+
+Module.onRuntimeInitialized = () => {
+  module.exports = Module.emnapiInit({
+    context: require('@emnapi/runtime').getDefaultContext()
+  });
+
+  process.once('exit', () => {
+    _vips_shutdown();
+    _uv_library_shutdown();
+  });
+};

src/metadata.cc

@@ -145,7 +145,7 @@ class MetadataWorker : public Napi::AsyncWorker {
     // Handle warnings
     std::string warning = sharp::VipsWarningPop();
     while (!warning.empty()) {
-      debuglog.MakeCallback(Receiver().Value(), { Napi::String::New(env, warning) });
+      debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
       warning = sharp::VipsWarningPop();
     }
 
@@ -246,9 +246,9 @@ class MetadataWorker : public Napi::AsyncWorker {
           Napi::Buffer<char>::NewOrCopy(env, baton->tifftagPhotoshop,
             baton->tifftagPhotoshopLength, sharp::FreeCallback));
       }
-      Callback().MakeCallback(Receiver().Value(), { env.Null(), info });
+      Callback().Call(Receiver().Value(), { env.Null(), info });
     } else {
-      Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
+      Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
     }
 
     delete baton->input;

src/operations.cc

@@ -16,30 +16,44 @@ using vips::VError;
 
 namespace sharp {
   /*
-   * Tint an image using the specified chroma, preserving the original image luminance
+   * Tint an image using the provided RGB.
    */
-  VImage Tint(VImage image, double const a, double const b) {
-    // Get original colourspace
+  VImage Tint(VImage image, std::vector<double> const tint) {
+    std::vector<double> const tintLab = (VImage::black(1, 1) + tint)
+      .colourspace(VIPS_INTERPRETATION_LAB, VImage::option()->set("source_space", VIPS_INTERPRETATION_sRGB))
+      .getpoint(0, 0);
+    // LAB identity function
+    VImage identityLab = VImage::identity(VImage::option()->set("bands", 3))
+      .colourspace(VIPS_INTERPRETATION_LAB, VImage::option()->set("source_space", VIPS_INTERPRETATION_sRGB));
+    // Scale luminance range, 0.0 to 1.0
+    VImage l = identityLab[0] / 100;
+    // Weighting functions
+    VImage weightL = 1.0 - 4.0 * ((l - 0.5) * (l - 0.5));
+    VImage weightAB = (weightL * tintLab).extract_band(1, VImage::option()->set("n", 2));
+    identityLab = identityLab[0].bandjoin(weightAB);
+    // Convert lookup table to sRGB
+    VImage lut = identityLab.colourspace(VIPS_INTERPRETATION_sRGB,
+      VImage::option()->set("source_space", VIPS_INTERPRETATION_LAB));
+    // Original colourspace
     VipsInterpretation typeBeforeTint = image.interpretation();
     if (typeBeforeTint == VIPS_INTERPRETATION_RGB) {
       typeBeforeTint = VIPS_INTERPRETATION_sRGB;
     }
-    // Extract luminance
-    VImage luminance = image.colourspace(VIPS_INTERPRETATION_LAB)[0];
-    // Create the tinted version by combining the L from the original and the chroma from the tint
-    std::vector<double> chroma {a, b};
-    VImage tinted = luminance
-      .bandjoin(chroma)
-      .copy(VImage::option()->set("interpretation", VIPS_INTERPRETATION_LAB))
-      .colourspace(typeBeforeTint);
-    // Attach original alpha channel, if any
+    // Apply lookup table
     if (HasAlpha(image)) {
-      // Extract original alpha channel
       VImage alpha = image[image.bands() - 1];
-      // Join alpha channel to normalised image
-      tinted = tinted.bandjoin(alpha);
+      image = RemoveAlpha(image)
+        .colourspace(VIPS_INTERPRETATION_B_W)
+        .maplut(lut)
+        .colourspace(typeBeforeTint)
+        .bandjoin(alpha);
+    } else {
+      image = image
+        .colourspace(VIPS_INTERPRETATION_B_W)
+        .maplut(lut)
+        .colourspace(typeBeforeTint);
     }
-    return tinted;
+    return image;
   }
 
   /*
@@ -141,7 +155,7 @@ namespace sharp {
       return image.conv(blur);
     } else {
       // Slower, accurate Gaussian blur
-      return image.gaussblur(sigma);
+      return StaySequential(image, VIPS_ACCESS_SEQUENTIAL).gaussblur(sigma);
     }
   }
 
@@ -265,7 +279,7 @@ namespace sharp {
   /*
     Trim an image
   */
-  VImage Trim(VImage image, std::vector<double> background, double threshold) {
+  VImage Trim(VImage image, std::vector<double> background, double threshold, bool const lineArt) {
     if (image.width() < 3 && image.height() < 3) {
       throw VError("Image to trim must be at least 3x3 pixels");
     }
@@ -287,6 +301,7 @@ namespace sharp {
     int left, top, width, height;
     left = image.find_trim(&top, &width, &height, VImage::option()
       ->set("background", background)
+      ->set("line_art", lineArt)
       ->set("threshold", threshold));
     if (HasAlpha(image)) {
       // Search alpha channel (A)
@@ -294,6 +309,7 @@ namespace sharp {
       VImage alpha = image[image.bands() - 1];
       leftA = alpha.find_trim(&topA, &widthA, &heightA, VImage::option()
         ->set("background", backgroundAlpha)
+        ->set("line_art", lineArt)
         ->set("threshold", threshold));
       if (widthA > 0 && heightA > 0) {
         if (width > 0 && height > 0) {
@@ -370,6 +386,7 @@ namespace sharp {
       pages.reserve(nPages);
 
       // Split the image into cropped frames
+      image = StaySequential(image, VIPS_ACCESS_SEQUENTIAL);
       for (int i = 0; i < nPages; i++) {
         pages.push_back(
           image.extract_area(left, *pageHeight * i + top, width, height));

src/operations.h

@@ -15,9 +15,9 @@ using vips::VImage;
 namespace sharp {
 
   /*
-   * Tint an image using the specified chroma, preserving the original image luminance
+   * Tint an image using the provided RGB.
    */
-  VImage Tint(VImage image, double const a, double const b);
+  VImage Tint(VImage image, std::vector<double> const tint);
 
   /*
    * Stretch luminance to cover full dynamic range.
@@ -79,7 +79,7 @@ namespace sharp {
   /*
     Trim an image
   */
-  VImage Trim(VImage image, std::vector<double> background, double const threshold);
+  VImage Trim(VImage image, std::vector<double> background, double threshold, bool const lineArt);
 
   /*
    * Linear adjustment (a * in + b)

src/pipeline.cc

@@ -126,10 +126,10 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       // Trim
-      if (baton->trimThreshold > 0.0) {
+      if (baton->trimThreshold >= 0.0) {
         MultiPageUnsupported(nPages, "Trim");
         image = sharp::StaySequential(image, access);
-        image = sharp::Trim(image, baton->trimBackground, baton->trimThreshold);
+        image = sharp::Trim(image, baton->trimBackground, baton->trimThreshold, baton->trimLineArt);
         baton->trimOffsetLeft = image.xoffset();
         baton->trimOffsetTop = image.yoffset();
       }
@@ -182,7 +182,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       //  - trimming or pre-resize extract isn't required;
       //  - input colourspace is not specified;
       bool const shouldPreShrink = (targetResizeWidth > 0 || targetResizeHeight > 0) &&
-        baton->gamma == 0 && baton->topOffsetPre == -1 && baton->trimThreshold == 0.0 &&
+        baton->gamma == 0 && baton->topOffsetPre == -1 && baton->trimThreshold < 0.0 &&
         baton->colourspaceInput == VIPS_INTERPRETATION_LAST && !shouldRotateBefore;
 
       if (shouldPreShrink) {
@@ -315,6 +315,11 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       // Ensure we're using a device-independent colour space
+      std::pair<char*, size_t> inputProfile(nullptr, 0);
+      if ((baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) && baton->withIccProfile.empty()) {
+        // Cache input profile for use with output
+        inputProfile = sharp::GetProfile(image);
+      }
       char const *processingProfile = image.interpretation() == VIPS_INTERPRETATION_RGB16 ? "p3" : "srgb";
       if (
         sharp::HasProfile(image) &&
@@ -485,9 +490,7 @@ class PipelineWorker : public Napi::AsyncWorker {
             image = sharp::StaySequential(image, access);
             image = image.smartcrop(baton->width, baton->height, VImage::option()
               ->set("interesting", baton->position == 16 ? VIPS_INTERESTING_ENTROPY : VIPS_INTERESTING_ATTENTION)
-#if (VIPS_MAJOR_VERSION >= 8 && VIPS_MINOR_VERSION >= 15)
               ->set("premultiplied", shouldPremultiplyAlpha)
-#endif
               ->set("attention_x", &attention_x)
               ->set("attention_y", &attention_y));
             baton->hasCropOffset = true;
@@ -738,8 +741,8 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       // Tint the image
-      if (baton->tintA < 128.0 || baton->tintB < 128.0) {
-        image = sharp::Tint(image, baton->tintA, baton->tintB);
+      if (baton->tint[0] >= 0.0) {
+        image = sharp::Tint(image, baton->tint);
       }
 
       // Remove alpha channel, if any
@@ -760,7 +763,8 @@ class PipelineWorker : public Napi::AsyncWorker {
         // Convert colourspace, pass the current known interpretation so libvips doesn't have to guess
         image = image.colourspace(baton->colourspace, VImage::option()->set("source_space", image.interpretation()));
         // Transform colours from embedded profile to output profile
-        if (baton->withMetadata && sharp::HasProfile(image) && baton->withMetadataIcc.empty()) {
+        if ((baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) &&
+          baton->withIccProfile.empty() && sharp::HasProfile(image)) {
           image = image.icc_transform("srgb", VImage::option()
             ->set("embedded", TRUE)
             ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
@@ -789,27 +793,30 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       // Apply output ICC profile
-      if (baton->withMetadata) {
-        image = image.icc_transform(
-          baton->withMetadataIcc.empty() ? "srgb" : const_cast<char*>(baton->withMetadataIcc.data()),
-          VImage::option()
-            ->set("input_profile", processingProfile)
-            ->set("embedded", TRUE)
-            ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
-            ->set("intent", VIPS_INTENT_PERCEPTUAL));
+      if (!baton->withIccProfile.empty()) {
+        image = image.icc_transform(const_cast<char*>(baton->withIccProfile.data()), VImage::option()
+          ->set("input_profile", processingProfile)
+          ->set("embedded", TRUE)
+          ->set("depth", sharp::Is16Bit(image.interpretation()) ? 16 : 8)
+          ->set("intent", VIPS_INTENT_PERCEPTUAL));
+      } else if (baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) {
+        image = sharp::SetProfile(image, inputProfile);
       }
       // Override EXIF Orientation tag
-      if (baton->withMetadata && baton->withMetadataOrientation != -1) {
+      if (baton->withMetadataOrientation != -1) {
         image = sharp::SetExifOrientation(image, baton->withMetadataOrientation);
       }
       // Override pixel density
       if (baton->withMetadataDensity > 0) {
         image = sharp::SetDensity(image, baton->withMetadataDensity);
       }
-      // Metadata key/value pairs, e.g. EXIF
-      if (!baton->withMetadataStrs.empty()) {
+      // EXIF key/value pairs
+      if (baton->keepMetadata & VIPS_FOREIGN_KEEP_EXIF) {
         image = image.copy();
-        for (const auto& s : baton->withMetadataStrs) {
+        if (!baton->withExifMerge) {
+          image = sharp::RemoveExif(image);
+        }
+        for (const auto& s : baton->withExif) {
           image.set(s.first.data(), s.second.data());
         }
       }
@@ -830,7 +837,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write JPEG to buffer
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::JPEG);
           VipsArea *area = reinterpret_cast<VipsArea*>(image.jpegsave_buffer(VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("Q", baton->jpegQuality)
             ->set("interlace", baton->jpegProgressive)
             ->set("subsample_mode", baton->jpegChromaSubsampling == "4:4:4"
@@ -872,7 +879,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write PNG to buffer
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::PNG);
           VipsArea *area = reinterpret_cast<VipsArea*>(image.pngsave_buffer(VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("interlace", baton->pngProgressive)
             ->set("compression", baton->pngCompressionLevel)
             ->set("filter", baton->pngAdaptiveFiltering ? VIPS_FOREIGN_PNG_FILTER_ALL : VIPS_FOREIGN_PNG_FILTER_NONE)
@@ -891,7 +898,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write WEBP to buffer
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::WEBP);
           VipsArea *area = reinterpret_cast<VipsArea*>(image.webpsave_buffer(VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("Q", baton->webpQuality)
             ->set("lossless", baton->webpLossless)
             ->set("near_lossless", baton->webpNearLossless)
@@ -911,7 +918,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write GIF to buffer
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::GIF);
           VipsArea *area = reinterpret_cast<VipsArea*>(image.gifsave_buffer(VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("bitdepth", baton->gifBitdepth)
             ->set("effort", baton->gifEffort)
             ->set("reuse", baton->gifReuse)
@@ -936,10 +943,11 @@ class PipelineWorker : public Napi::AsyncWorker {
             image = image.cast(VIPS_FORMAT_FLOAT);
           }
           VipsArea *area = reinterpret_cast<VipsArea*>(image.tiffsave_buffer(VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("Q", baton->tiffQuality)
             ->set("bitdepth", baton->tiffBitdepth)
             ->set("compression", baton->tiffCompression)
+            ->set("miniswhite", baton->tiffMiniswhite)
             ->set("predictor", baton->tiffPredictor)
             ->set("pyramid", baton->tiffPyramid)
             ->set("tile", baton->tiffTile)
@@ -959,7 +967,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::HEIF);
           image = sharp::RemoveAnimationProperties(image).cast(VIPS_FORMAT_UCHAR);
           VipsArea *area = reinterpret_cast<VipsArea*>(image.heifsave_buffer(VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("Q", baton->heifQuality)
             ->set("compression", baton->heifCompression)
             ->set("effort", baton->heifEffort)
@@ -991,7 +999,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write JXL to buffer
           image = sharp::RemoveAnimationProperties(image);
           VipsArea *area = reinterpret_cast<VipsArea*>(image.jxlsave_buffer(VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("distance", baton->jxlDistance)
             ->set("tier", baton->jxlDecodingTier)
             ->set("effort", baton->jxlEffort)
@@ -1052,7 +1060,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write JPEG to file
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::JPEG);
           image.jpegsave(const_cast<char*>(baton->fileOut.data()), VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("Q", baton->jpegQuality)
             ->set("interlace", baton->jpegProgressive)
             ->set("subsample_mode", baton->jpegChromaSubsampling == "4:4:4"
@@ -1082,7 +1090,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write PNG to file
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::PNG);
           image.pngsave(const_cast<char*>(baton->fileOut.data()), VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("interlace", baton->pngProgressive)
             ->set("compression", baton->pngCompressionLevel)
             ->set("filter", baton->pngAdaptiveFiltering ? VIPS_FOREIGN_PNG_FILTER_ALL : VIPS_FOREIGN_PNG_FILTER_NONE)
@@ -1097,7 +1105,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write WEBP to file
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::WEBP);
           image.webpsave(const_cast<char*>(baton->fileOut.data()), VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("Q", baton->webpQuality)
             ->set("lossless", baton->webpLossless)
             ->set("near_lossless", baton->webpNearLossless)
@@ -1113,7 +1121,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write GIF to file
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::GIF);
           image.gifsave(const_cast<char*>(baton->fileOut.data()), VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("bitdepth", baton->gifBitdepth)
             ->set("effort", baton->gifEffort)
             ->set("reuse", baton->gifReuse)
@@ -1132,10 +1140,11 @@ class PipelineWorker : public Napi::AsyncWorker {
             image = image.cast(VIPS_FORMAT_FLOAT);
           }
           image.tiffsave(const_cast<char*>(baton->fileOut.data()), VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("Q", baton->tiffQuality)
             ->set("bitdepth", baton->tiffBitdepth)
             ->set("compression", baton->tiffCompression)
+            ->set("miniswhite", baton->tiffMiniswhite)
             ->set("predictor", baton->tiffPredictor)
             ->set("pyramid", baton->tiffPyramid)
             ->set("tile", baton->tiffTile)
@@ -1151,7 +1160,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           sharp::AssertImageTypeDimensions(image, sharp::ImageType::HEIF);
           image = sharp::RemoveAnimationProperties(image).cast(VIPS_FORMAT_UCHAR);
           image.heifsave(const_cast<char*>(baton->fileOut.data()), VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("Q", baton->heifQuality)
             ->set("compression", baton->heifCompression)
             ->set("effort", baton->heifEffort)
@@ -1165,7 +1174,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           // Write JXL to file
           image = sharp::RemoveAnimationProperties(image);
           image.jxlsave(const_cast<char*>(baton->fileOut.data()), VImage::option()
-            ->set("strip", !baton->withMetadata)
+            ->set("keep", baton->keepMetadata)
             ->set("distance", baton->jxlDistance)
             ->set("tier", baton->jxlDecodingTier)
             ->set("effort", baton->jxlEffort)
@@ -1187,7 +1196,7 @@ class PipelineWorker : public Napi::AsyncWorker {
           (willMatchInput && inputImageType == sharp::ImageType::VIPS)) {
           // Write V to file
           image.vipssave(const_cast<char*>(baton->fileOut.data()), VImage::option()
-            ->set("strip", !baton->withMetadata));
+            ->set("keep", baton->keepMetadata));
           baton->formatOut = "v";
         } else {
           // Unsupported output format
@@ -1215,7 +1224,7 @@ class PipelineWorker : public Napi::AsyncWorker {
     // Handle warnings
     std::string warning = sharp::VipsWarningPop();
     while (!warning.empty()) {
-      debuglog.MakeCallback(Receiver().Value(), { Napi::String::New(env, warning) });
+      debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
       warning = sharp::VipsWarningPop();
     }
 
@@ -1248,11 +1257,10 @@ class PipelineWorker : public Napi::AsyncWorker {
         info.Set("attentionX", static_cast<int32_t>(baton->attentionX));
         info.Set("attentionY", static_cast<int32_t>(baton->attentionY));
       }
-      if (baton->trimThreshold > 0.0) {
+      if (baton->trimThreshold >= 0.0) {
         info.Set("trimOffsetLeft", static_cast<int32_t>(baton->trimOffsetLeft));
         info.Set("trimOffsetTop", static_cast<int32_t>(baton->trimOffsetTop));
       }
-
       if (baton->input->textAutofitDpi) {
         info.Set("textAutofitDpi", static_cast<uint32_t>(baton->input->textAutofitDpi));
       }
@@ -1263,17 +1271,17 @@ class PipelineWorker : public Napi::AsyncWorker {
         // Pass ownership of output data to Buffer instance
         Napi::Buffer<char> data = Napi::Buffer<char>::NewOrCopy(env, static_cast<char*>(baton->bufferOut),
           baton->bufferOutLength, sharp::FreeCallback);
-        Callback().MakeCallback(Receiver().Value(), { env.Null(), data, info });
+        Callback().Call(Receiver().Value(), { env.Null(), data, info });
       } else {
         // Add file size to info
         struct STAT64_STRUCT st;
         if (STAT64_FUNCTION(baton->fileOut.data(), &st) == 0) {
           info.Set("size", static_cast<uint32_t>(st.st_size));
         }
-        Callback().MakeCallback(Receiver().Value(), { env.Null(), info });
+        Callback().Call(Receiver().Value(), { env.Null(), info });
       }
     } else {
-      Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
+      Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
     }
 
     // Delete baton
@@ -1291,7 +1299,7 @@ class PipelineWorker : public Napi::AsyncWorker {
     // Decrement processing task counter
     sharp::counterProcess--;
     Napi::Number queueLength = Napi::Number::New(env, static_cast<int>(sharp::counterQueue));
-    queueListener.MakeCallback(Receiver().Value(), { queueLength });
+    queueListener.Call(Receiver().Value(), { queueLength });
   }
 
  private:
@@ -1402,7 +1410,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       suffix = AssembleSuffixString(extname, options);
     }
     vips::VOption *options = VImage::option()
-      ->set("strip", !baton->withMetadata)
+      ->set("keep", baton->keepMetadata)
       ->set("tile_size", baton->tileSize)
       ->set("overlap", baton->tileOverlap)
       ->set("container", baton->tileContainer)
@@ -1519,6 +1527,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   baton->thresholdGrayscale = sharp::AttrAsBool(options, "thresholdGrayscale");
   baton->trimBackground = sharp::AttrAsVectorOfDouble(options, "trimBackground");
   baton->trimThreshold = sharp::AttrAsDouble(options, "trimThreshold");
+  baton->trimLineArt = sharp::AttrAsBool(options, "trimLineArt");
   baton->gamma = sharp::AttrAsDouble(options, "gamma");
   baton->gammaOut = sharp::AttrAsDouble(options, "gammaOut");
   baton->linearA = sharp::AttrAsVectorOfDouble(options, "linearA");
@@ -1527,8 +1536,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   baton->normalise = sharp::AttrAsBool(options, "normalise");
   baton->normaliseLower = sharp::AttrAsUint32(options, "normaliseLower");
   baton->normaliseUpper = sharp::AttrAsUint32(options, "normaliseUpper");
-  baton->tintA = sharp::AttrAsDouble(options, "tintA");
-  baton->tintB = sharp::AttrAsDouble(options, "tintB");
+  baton->tint = sharp::AttrAsVectorOfDouble(options, "tint");
   baton->claheWidth = sharp::AttrAsUint32(options, "claheWidth");
   baton->claheHeight = sharp::AttrAsUint32(options, "claheHeight");
   baton->claheMaxSlope = sharp::AttrAsUint32(options, "claheMaxSlope");
@@ -1594,18 +1602,19 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   // Output
   baton->formatOut = sharp::AttrAsStr(options, "formatOut");
   baton->fileOut = sharp::AttrAsStr(options, "fileOut");
-  baton->withMetadata = sharp::AttrAsBool(options, "withMetadata");
+  baton->keepMetadata = sharp::AttrAsUint32(options, "keepMetadata");
   baton->withMetadataOrientation = sharp::AttrAsUint32(options, "withMetadataOrientation");
   baton->withMetadataDensity = sharp::AttrAsDouble(options, "withMetadataDensity");
-  baton->withMetadataIcc = sharp::AttrAsStr(options, "withMetadataIcc");
-  Napi::Object mdStrs = options.Get("withMetadataStrs").As<Napi::Object>();
-  Napi::Array mdStrKeys = mdStrs.GetPropertyNames();
-  for (unsigned int i = 0; i < mdStrKeys.Length(); i++) {
-    std::string k = sharp::AttrAsStr(mdStrKeys, i);
-    if (mdStrs.HasOwnProperty(k)) {
-      baton->withMetadataStrs.insert(std::make_pair(k, sharp::AttrAsStr(mdStrs, k)));
+  baton->withIccProfile = sharp::AttrAsStr(options, "withIccProfile");
+  Napi::Object withExif = options.Get("withExif").As<Napi::Object>();
+  Napi::Array withExifKeys = withExif.GetPropertyNames();
+  for (unsigned int i = 0; i < withExifKeys.Length(); i++) {
+    std::string k = sharp::AttrAsStr(withExifKeys, i);
+    if (withExif.HasOwnProperty(k)) {
+      baton->withExif.insert(std::make_pair(k, sharp::AttrAsStr(withExif, k)));
     }
   }
+  baton->withExifMerge = sharp::AttrAsBool(options, "withExifMerge");
   baton->timeoutSeconds = sharp::AttrAsUint32(options, "timeoutSeconds");
   // Format-specific
   baton->jpegQuality = sharp::AttrAsUint32(options, "jpegQuality");
@@ -1647,6 +1656,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   baton->gifProgressive = sharp::AttrAsBool(options, "gifProgressive");
   baton->tiffQuality = sharp::AttrAsUint32(options, "tiffQuality");
   baton->tiffPyramid = sharp::AttrAsBool(options, "tiffPyramid");
+  baton->tiffMiniswhite = sharp::AttrAsBool(options, "tiffMiniswhite");
   baton->tiffBitdepth = sharp::AttrAsUint32(options, "tiffBitdepth");
   baton->tiffTile = sharp::AttrAsBool(options, "tiffTile");
   baton->tiffTileWidth = sharp::AttrAsUint32(options, "tiffTileWidth");
@@ -1708,7 +1718,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
 
   // Increment queued task counter
   Napi::Number queueLength = Napi::Number::New(info.Env(), static_cast<int>(++sharp::counterQueue));
-  queueListener.MakeCallback(info.This(), { queueLength });
+  queueListener.Call(info.This(), { queueLength });
 
   return info.Env().Undefined();
 }

src/pipeline.h

@@ -69,8 +69,7 @@ struct PipelineBaton {
   bool premultiplied;
   bool tileCentre;
   bool fastShrinkOnLoad;
-  double tintA;
-  double tintB;
+  std::vector<double> tint;
   bool flatten;
   std::vector<double> flattenBackground;
   bool unflatten;
@@ -92,6 +91,7 @@ struct PipelineBaton {
   bool thresholdGrayscale;
   std::vector<double> trimBackground;
   double trimThreshold;
+  bool trimLineArt;
   int trimOffsetLeft;
   int trimOffsetTop;
   std::vector<double> linearA;
@@ -169,6 +169,7 @@ struct PipelineBaton {
   VipsForeignTiffPredictor tiffPredictor;
   bool tiffPyramid;
   int tiffBitdepth;
+  bool tiffMiniswhite;
   bool tiffTile;
   int tiffTileHeight;
   int tiffTileWidth;
@@ -186,11 +187,12 @@ struct PipelineBaton {
   bool jxlLossless;
   VipsBandFormat rawDepth;
   std::string err;
-  bool withMetadata;
+  int keepMetadata;
   int withMetadataOrientation;
   double withMetadataDensity;
-  std::string withMetadataIcc;
-  std::unordered_map<std::string, std::string> withMetadataStrs;
+  std::string withIccProfile;
+  std::unordered_map<std::string, std::string> withExif;
+  bool withExifMerge;
   int timeoutSeconds;
   std::unique_ptr<double[]> convKernel;
   int convKernelWidth;
@@ -237,8 +239,7 @@ struct PipelineBaton {
     attentionX(0),
     attentionY(0),
     premultiplied(false),
-    tintA(128.0),
-    tintB(128.0),
+    tint{ -1.0, 0.0, 0.0, 0.0 },
     flatten(false),
     flattenBackground{ 0.0, 0.0, 0.0 },
     unflatten(false),
@@ -259,7 +260,8 @@ struct PipelineBaton {
     threshold(0),
     thresholdGrayscale(true),
     trimBackground{},
-    trimThreshold(0.0),
+    trimThreshold(-1.0),
+    trimLineArt(false),
     trimOffsetLeft(0),
     trimOffsetTop(0),
     linearA{},
@@ -335,6 +337,7 @@ struct PipelineBaton {
     tiffPredictor(VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL),
     tiffPyramid(false),
     tiffBitdepth(8),
+    tiffMiniswhite(false),
     tiffTile(false),
     tiffTileHeight(256),
     tiffTileWidth(256),
@@ -351,9 +354,10 @@ struct PipelineBaton {
     jxlEffort(7),
     jxlLossless(false),
     rawDepth(VIPS_FORMAT_UCHAR),
-    withMetadata(false),
+    keepMetadata(0),
     withMetadataOrientation(-1),
     withMetadataDensity(0.0),
+    withExifMerge(true),
     timeoutSeconds(0),
     convKernelWidth(0),
     convKernelHeight(0),

src/stats.cc

@@ -106,7 +106,7 @@ class StatsWorker : public Napi::AsyncWorker {
     // Handle warnings
     std::string warning = sharp::VipsWarningPop();
     while (!warning.empty()) {
-      debuglog.MakeCallback(Receiver().Value(), { Napi::String::New(env, warning) });
+      debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
       warning = sharp::VipsWarningPop();
     }
 
@@ -141,9 +141,9 @@ class StatsWorker : public Napi::AsyncWorker {
       dominant.Set("g", baton->dominantGreen);
       dominant.Set("b", baton->dominantBlue);
       info.Set("dominant", dominant);
-      Callback().MakeCallback(Receiver().Value(), { env.Null(), info });
+      Callback().Call(Receiver().Value(), { env.Null(), info });
     } else {
-      Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
+      Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
     }
 
     delete baton->input;

src/utilities.cc

@@ -102,6 +102,11 @@ Napi::Value libvipsVersion(const Napi::CallbackInfo& info) {
   version.Set("isGlobal", Napi::Boolean::New(env, true));
 #else
   version.Set("isGlobal", Napi::Boolean::New(env, false));
+#endif
+#ifdef __EMSCRIPTEN__
+  version.Set("isWasm", Napi::Boolean::New(env, true));
+#else
+  version.Set("isWasm", Napi::Boolean::New(env, false));
 #endif
   return version;
 }

test/types/sharp.test-d.ts

@@ -572,8 +572,8 @@ const nohalo: string = sharp.interpolators.nohalo;
 const vertexSplitQuadraticBasisSpline: string = sharp.interpolators.vertexSplitQuadraticBasisSpline;
 
 // Triming
-sharp(input).trim('#000').toBuffer();
-sharp(input).trim(10).toBuffer();
+sharp(input).trim({ background: '#000' }).toBuffer();
+sharp(input).trim({ threshold: 10, lineArt: true }).toBuffer();
 sharp(input).trim({ background: '#bf1942', threshold: 30 }).toBuffer();
 
 // Text input
@@ -659,6 +659,18 @@ sharp('input.tiff').webp({ preset: 'drawing' }).toFile('out.webp');
 sharp('input.tiff').webp({ preset: 'text' }).toFile('out.webp');
 sharp('input.tiff').webp({ preset: 'default' }).toFile('out.webp');
 
-// Allow a boolean or an object for metadata options.
-// https://github.com/lovell/sharp/issues/3822
-sharp(input).withMetadata().withMetadata({}).withMetadata(false);
+sharp(input)
+  .keepExif()
+  .withExif({
+    IFD0: {
+      k1: 'v1'
+    }
+  })
+  .withExifMerge({
+    IFD1: {
+      k2: 'v2'
+    }
+  })
+  .keepIccProfile()
+  .withIccProfile('filename')
+  .withIccProfile('filename', { attach: false });

test/unit/composite.js

@@ -246,7 +246,7 @@ describe('composite', () => {
     sharp(fixtures.inputJpg)
       .resize(300, 300)
       .composite([{
-        input: Buffer.from('<svg width="200" height="200"><rect x="0" y="0" width="200" height="200" rx="50" ry="50"/></svg>'),
+        input: Buffer.from('<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><rect x="0" y="0" width="200" height="200" rx="50" ry="50"/></svg>'),
         density: 96,
         blend: 'dest-in',
         cutout: true

test/unit/libvips.js

@@ -69,17 +69,25 @@ describe('libvips binaries', function () {
   });
 
   describe('Build time platform detection', () => {
-    it('Can override platform with npm_config_platform and npm_config_libc', () => {
+    it('Can override platform with npm_config_platform and npm_config_libc', function () {
       process.env.npm_config_platform = 'testplatform';
       process.env.npm_config_libc = 'testlibc';
-      const [platform] = libvips.buildPlatformArch().split('-');
+      const platformArch = libvips.buildPlatformArch();
+      if (platformArch === 'wasm32') {
+        return this.skip();
+      }
+      const [platform] = platformArch.split('-');
       assert.strictEqual(platform, 'testplatformtestlibc');
       delete process.env.npm_config_platform;
       delete process.env.npm_config_libc;
     });
-    it('Can override arch with npm_config_arch', () => {
+    it('Can override arch with npm_config_arch', function () {
       process.env.npm_config_arch = 'test';
-      const [, arch] = libvips.buildPlatformArch().split('-');
+      const platformArch = libvips.buildPlatformArch();
+      if (platformArch === 'wasm32') {
+        return this.skip();
+      }
+      const [, arch] = platformArch.split('-');
       assert.strictEqual(arch, 'test');
       delete process.env.npm_config_arch;
     });

test/unit/median.js

@@ -6,43 +6,44 @@
 const assert = require('assert');
 
 const sharp = require('../../');
-const fixtures = require('../fixtures');
 
-describe('Median filter', () => {
-  it('1x1 window', async () => {
-    const [r, g, b] = await sharp(fixtures.inputSvgSmallViewBox)
-      .median(1)
+const row = [0, 3, 15, 63, 127, 255];
+const input = Buffer.from(Array.from(row, () => row).flat());
+const raw = {
+  width: 6,
+  height: 6,
+  channels: 1
+};
+
+describe('Median filter', function () {
+  it('default window (3x3)', async () => {
+    const data = await sharp(input, { raw })
+      .median()
+      .toColourspace('b-w')
       .raw()
       .toBuffer();
 
-    assert.deepStrictEqual({ r: 0, g: 0, b: 0 }, { r, g, b });
+    assert.deepStrictEqual(data.subarray(0, 6), Buffer.from(row));
   });
 
   it('3x3 window', async () => {
-    const [r, g, b] = await sharp(fixtures.inputSvgSmallViewBox)
+    const data = await sharp(input, { raw })
       .median(3)
+      .toColourspace('b-w')
       .raw()
       .toBuffer();
 
-    assert.deepStrictEqual({ r: 255, g: 0, b: 127 }, { r, g, b });
+    assert.deepStrictEqual(data.subarray(0, 6), Buffer.from(row));
   });
 
-  it('7x7 window', async () => {
-    const [r, g, b] = await sharp(fixtures.inputSvgSmallViewBox)
-      .median(7)
+  it('5x5 window', async () => {
+    const data = await sharp(input, { raw })
+      .median(5)
+      .toColourspace('b-w')
       .raw()
       .toBuffer();
 
-    assert.deepStrictEqual({ r: 255, g: 19, b: 146 }, { r, g, b });
-  });
-
-  it('default window (3x3)', async () => {
-    const [r, g, b] = await sharp(fixtures.inputSvgSmallViewBox)
-      .median()
-      .raw()
-      .toBuffer();
-
-    assert.deepStrictEqual({ r: 255, g: 0, b: 127 }, { r, g, b });
+    assert.deepStrictEqual(data.subarray(0, 6), Buffer.from([0, 3, 15, 15, 63, 127]));
   });
 
   it('invalid radius', () => {

test/unit/metadata.js

@@ -11,6 +11,8 @@ const icc = require('icc');
 const sharp = require('../../');
 const fixtures = require('../fixtures');
 
+const create = { width: 1, height: 1, channels: 3, background: 'red' };
+
 describe('Image metadata', function () {
   it('JPEG', function (done) {
     sharp(fixtures.inputJpg).metadata(function (err, metadata) {
@@ -552,11 +554,55 @@ describe('Image metadata', function () {
       });
   });
 
+  it('keep existing ICC profile', async () => {
+    const data = await sharp(fixtures.inputJpgWithExif)
+      .keepIccProfile()
+      .toBuffer();
+
+    const metadata = await sharp(data).metadata();
+    const { description } = icc.parse(metadata.icc);
+    assert.strictEqual(description, 'Generic RGB Profile');
+  });
+
+  it('keep existing ICC profile, ignore colourspace conversion', async () => {
+    const data = await sharp(fixtures.inputJpgWithExif)
+      .keepIccProfile()
+      .toColourspace('cmyk')
+      .toBuffer();
+
+    const metadata = await sharp(data).metadata();
+    assert.strictEqual(metadata.channels, 3);
+    const { description } = icc.parse(metadata.icc);
+    assert.strictEqual(description, 'Generic RGB Profile');
+  });
+
+  it('transform to ICC profile and attach', async () => {
+    const data = await sharp({ create })
+      .png()
+      .withIccProfile('p3', { attach: true })
+      .toBuffer();
+
+    const metadata = await sharp(data).metadata();
+    const { description } = icc.parse(metadata.icc);
+    assert.strictEqual(description, 'sP3C');
+  });
+
+  it('transform to ICC profile but do not attach', async () => {
+    const data = await sharp({ create })
+      .png()
+      .withIccProfile('p3', { attach: false })
+      .toBuffer();
+
+    const metadata = await sharp(data).metadata();
+    assert.strictEqual(3, metadata.channels);
+    assert.strictEqual(undefined, metadata.icc);
+  });
+
   it('Apply CMYK output ICC profile', function (done) {
     const output = fixtures.path('output.icc-cmyk.jpg');
     sharp(fixtures.inputJpg)
       .resize(64)
-      .withMetadata({ icc: 'cmyk' })
+      .withIccProfile('cmyk')
       .toFile(output, function (err) {
         if (err) throw err;
         sharp(output).metadata(function (err, metadata) {
@@ -581,7 +627,7 @@ describe('Image metadata', function () {
     const output = fixtures.path('output.hilutite.jpg');
     sharp(fixtures.inputJpg)
       .resize(64)
-      .withMetadata({ icc: fixtures.path('hilutite.icm') })
+      .withIccProfile(fixtures.path('hilutite.icm'))
       .toFile(output, function (err, info) {
         if (err) throw err;
         fixtures.assertMaxColourDistance(output, fixtures.expected('hilutite.jpg'), 9);
@@ -620,7 +666,6 @@ describe('Image metadata', function () {
   it('Remove EXIF metadata after a resize', function (done) {
     sharp(fixtures.inputJpgWithExif)
       .resize(320, 240)
-      .withMetadata(false)
       .toBuffer(function (err, buffer) {
         if (err) throw err;
         sharp(buffer).metadata(function (err, metadata) {
@@ -651,14 +696,7 @@ describe('Image metadata', function () {
   });
 
   it('Add EXIF metadata to JPEG', async () => {
-    const data = await sharp({
-      create: {
-        width: 8,
-        height: 8,
-        channels: 3,
-        background: 'red'
-      }
-    })
+    const data = await sharp({ create })
       .jpeg()
       .withMetadata({
         exif: {
@@ -675,14 +713,7 @@ describe('Image metadata', function () {
   });
 
   it('Set density of JPEG', async () => {
-    const data = await sharp({
-      create: {
-        width: 8,
-        height: 8,
-        channels: 3,
-        background: 'red'
-      }
-    })
+    const data = await sharp({ create })
       .withMetadata({
         density: 300
       })
@@ -694,14 +725,7 @@ describe('Image metadata', function () {
   });
 
   it('Set density of PNG', async () => {
-    const data = await sharp({
-      create: {
-        width: 8,
-        height: 8,
-        channels: 3,
-        background: 'red'
-      }
-    })
+    const data = await sharp({ create })
       .withMetadata({
         density: 96
       })
@@ -809,11 +833,7 @@ describe('Image metadata', function () {
   });
 
   it('withMetadata adds default sRGB profile to RGB16', async () => {
-    const data = await sharp({
-      create: {
-        width: 8, height: 8, channels: 4, background: 'orange'
-      }
-    })
+    const data = await sharp({ create })
       .toColorspace('rgb16')
       .png()
       .withMetadata()
@@ -827,11 +847,7 @@ describe('Image metadata', function () {
   });
 
   it('withMetadata adds P3 profile to 16-bit PNG', async () => {
-    const data = await sharp({
-      create: {
-        width: 8, height: 8, channels: 4, background: 'orange'
-      }
-    })
+    const data = await sharp({ create })
       .toColorspace('rgb16')
       .png()
       .withMetadata({ icc: 'p3' })
@@ -871,7 +887,89 @@ describe('Image metadata', function () {
       });
   });
 
-  describe('Invalid withMetadata parameters', function () {
+  it('keepExif maintains all EXIF metadata', async () => {
+    const data1 = await sharp({ create })
+      .withExif({
+        IFD0: {
+          Copyright: 'Test 1',
+          Software: 'sharp'
+        }
+      })
+      .jpeg()
+      .toBuffer();
+
+    const data2 = await sharp(data1)
+      .keepExif()
+      .toBuffer();
+
+    const md2 = await sharp(data2).metadata();
+    const exif2 = exifReader(md2.exif);
+    assert.strictEqual(exif2.Image.Copyright, 'Test 1');
+    assert.strictEqual(exif2.Image.Software, 'sharp');
+  });
+
+  it('withExif replaces all EXIF metadata', async () => {
+    const data1 = await sharp({ create })
+      .withExif({
+        IFD0: {
+          Copyright: 'Test 1',
+          Software: 'sharp'
+        }
+      })
+      .jpeg()
+      .toBuffer();
+
+    const md1 = await sharp(data1).metadata();
+    const exif1 = exifReader(md1.exif);
+    assert.strictEqual(exif1.Image.Copyright, 'Test 1');
+    assert.strictEqual(exif1.Image.Software, 'sharp');
+
+    const data2 = await sharp(data1)
+      .withExif({
+        IFD0: {
+          Copyright: 'Test 2'
+        }
+      })
+      .toBuffer();
+
+    const md2 = await sharp(data2).metadata();
+    const exif2 = exifReader(md2.exif);
+    assert.strictEqual(exif2.Image.Copyright, 'Test 2');
+    assert.strictEqual(exif2.Image.Software, undefined);
+  });
+
+  it('withExifMerge merges all EXIF metadata', async () => {
+    const data1 = await sharp({ create })
+      .withExif({
+        IFD0: {
+          Copyright: 'Test 1'
+        }
+      })
+      .jpeg()
+      .toBuffer();
+
+    const md1 = await sharp(data1).metadata();
+    const exif1 = exifReader(md1.exif);
+    assert.strictEqual(exif1.Image.Copyright, 'Test 1');
+    assert.strictEqual(exif1.Image.Software, undefined);
+
+    const data2 = await sharp(data1)
+      .withExifMerge({
+        IFD0: {
+          Copyright: 'Test 2',
+          Software: 'sharp'
+
+        }
+      })
+      .toBuffer();
+
+    const md2 = await sharp(data2).metadata();
+    const exif2 = exifReader(md2.exif);
+    assert.strictEqual(exif2.Image.Copyright, 'Test 2');
+    assert.strictEqual(exif2.Image.Software, 'sharp');
+  });
+
+  describe('Invalid parameters', function () {
     it('String orientation', function () {
       assert.throws(function () {
         sharp().withMetadata({ orientation: 'zoinks' });
@@ -922,5 +1020,22 @@ describe('Image metadata', function () {
         sharp().withMetadata({ exif: { ifd0: { fail: false } } });
       });
     });
+    it('withIccProfile invalid profile', () => {
+      assert.throws(
+        () => sharp().withIccProfile(false),
+        /Expected string for icc but received false of type boolean/
+      );
+    });
+    it('withIccProfile missing attach', () => {
+      assert.doesNotThrow(
+        () => sharp().withIccProfile('test', {})
+      );
+    });
+    it('withIccProfile invalid attach', () => {
+      assert.throws(
+        () => sharp().withIccProfile('test', { attach: 1 }),
+        /Expected boolean for attach but received 1 of type number/
+      );
+    });
   });
 });

test/unit/svg.js

@@ -141,21 +141,21 @@ describe('SVG input', function () {
 
   it('Fails to render SVG larger than 32767x32767', () =>
     assert.rejects(
-      () => sharp(Buffer.from('<svg width="32768" height="1" />')).toBuffer(),
+      () => sharp(Buffer.from('<svg xmlns="http://www.w3.org/2000/svg" width="32768" height="1" />')).toBuffer(),
       /Input SVG image exceeds 32767x32767 pixel limit/
     )
   );
 
   it('Fails to render scaled SVG larger than 32767x32767', () =>
     assert.rejects(
-      () => sharp(Buffer.from('<svg width="32767" height="1" />')).resize(32768).toBuffer(),
+      () => sharp(Buffer.from('<svg xmlns="http://www.w3.org/2000/svg" width="32767" height="1" />')).resize(32768).toBuffer(),
       /Input SVG image will exceed 32767x32767 pixel limit when scaled/
     )
   );
 
   it('Detects SVG passed as a string', () =>
     assert.rejects(
-      () => sharp('<svg></svg>').toBuffer(),
+      () => sharp('<svg xmlns="http://www.w3.org/2000/svg"></svg>').toBuffer(),
       /Input file is missing, did you mean/
     )
   );

test/unit/text.js

@@ -7,17 +7,21 @@ const assert = require('assert');
 
 const sharp = require('../../');
 const fixtures = require('../fixtures');
+const { inRange } = require('../../lib/is');
 
 describe('Text to image', function () {
   this.retries(3);
 
-  it('text with default values', async () => {
+  it('text with default values', async function () {
     const output = fixtures.path('output.text-default.png');
     const text = sharp({
       text: {
         text: 'Hello, world !'
       }
     });
+    if (!sharp.versions.pango) {
+      return this.skip();
+    }
     const info = await text.png().toFile(output);
     assert.strictEqual('png', info.format);
     assert.strictEqual(3, info.channels);
@@ -40,22 +44,23 @@ describe('Text to image', function () {
 
   it('text with width and height', function (done) {
     const output = fixtures.path('output.text-width-height.png');
-    const maxWidth = 500;
-    const maxHeight = 500;
     const text = sharp({
       text: {
         text: 'Hello, world!',
-        width: maxWidth,
-        height: maxHeight
+        width: 500,
+        height: 400
       }
     });
+    if (!sharp.versions.pango) {
+      return this.skip();
+    }
     text.toFile(output, function (err, info) {
       if (err) throw err;
       assert.strictEqual('png', info.format);
       assert.strictEqual(3, info.channels);
-      assert.ok(info.width <= maxWidth);
-      assert.ok(info.height <= maxHeight);
-      assert.ok(info.textAutofitDpi > 0);
+      assert.ok(inRange(info.width, 400, 600), `Actual width ${info.width}`);
+      assert.ok(inRange(info.height, 300, 500), `Actual height ${info.height}`);
+      assert.ok(inRange(info.textAutofitDpi, 900, 1300), `Actual textAutofitDpi ${info.textAutofitDpi}`);
       done();
     });
   });
@@ -69,6 +74,9 @@ describe('Text to image', function () {
         dpi
       }
     });
+    if (!sharp.versions.pango) {
+      return this.skip();
+    }
     text.toFile(output, function (err, info) {
       if (err) throw err;
       assert.strictEqual('png', info.format);
@@ -90,6 +98,9 @@ describe('Text to image', function () {
         dpi
       }
     });
+    if (!sharp.versions.pango) {
+      return this.skip();
+    }
     text.toFile(output, function (err, info) {
       if (err) throw err;
       assert.strictEqual('png', info.format);
@@ -112,6 +123,9 @@ describe('Text to image', function () {
         font: 'sans 100'
       }
     });
+    if (!sharp.versions.pango) {
+      return this.skip();
+    }
     text.toFile(output, function (err, info) {
       if (err) throw err;
       assert.strictEqual('png', info.format);
@@ -122,7 +136,7 @@ describe('Text to image', function () {
     });
   });
 
-  it('text with justify and composite', done => {
+  it('text with justify and composite', function (done) {
     const output = fixtures.path('output.text-composite.png');
     const width = 500;
     const dpi = 300;
@@ -153,6 +167,9 @@ describe('Text to image', function () {
         left: 30,
         top: 250
       }]);
+    if (!sharp.versions.pango) {
+      return this.skip();
+    }
     text.toFile(output, function (err, info) {
       if (err) throw err;
       assert.strictEqual('png', info.format);

test/unit/tiff.js

@@ -462,6 +462,18 @@ describe('TIFF', function () {
     });
   });
 
+  it('TIFF miniswhite true value does not throw error', function () {
+    assert.doesNotThrow(function () {
+      sharp().tiff({ miniswhite: true });
+    });
+  });
+
+  it('Invalid TIFF miniswhite value throws error', function () {
+    assert.throws(function () {
+      sharp().tiff({ miniswhite: 'true' });
+    });
+  });
+
   it('Invalid TIFF tile value throws error', function () {
     assert.throws(function () {
       sharp().tiff({ tile: 'true' });

test/unit/tile.js

@@ -741,28 +741,6 @@ describe('Tile', function () {
       });
     });
 
-    it('Google layout with depth onepixel', function (done) {
-      const directory = fixtures.path('output.google_depth_onepixel.dzi');
-      fs.rm(directory, { recursive: true }, function () {
-        sharp(fixtures.inputJpg)
-          .tile({
-            layout: 'google',
-            depth: 'onepixel',
-            size: 256
-          })
-          .toFile(directory, function (err, info) {
-            if (err) throw err;
-            assert.strictEqual('dz', info.format);
-            assert.strictEqual(2725, info.width);
-            assert.strictEqual(2225, info.height);
-            assert.strictEqual(3, info.channels);
-            assert.strictEqual('number', typeof info.size);
-
-            assertGoogleTiles(directory, 256, 13, done);
-          });
-      });
-    });
-
     it('Google layout with depth onetile', function (done) {
       const directory = fixtures.path('output.google_depth_onetile.dzi');
       fs.rm(directory, { recursive: true }, function () {

test/unit/timeout.js

@@ -11,7 +11,7 @@ const fixtures = require('../fixtures');
 describe('Timeout', function () {
   it('Will timeout after 1s when performing slow blur operation', () => assert.rejects(
     () => sharp(fixtures.inputJpg)
-      .blur(100)
+      .blur(200)
       .timeout({ seconds: 1 })
       .toBuffer(),
     /timeout: [0-9]+% complete/

test/unit/tint.js

@@ -8,16 +8,19 @@ const assert = require('assert');
 const sharp = require('../../');
 const fixtures = require('../fixtures');
 
+// Allow for small rounding differences between platforms
+const maxDistance = 6;
+
 describe('Tint', function () {
   it('tints rgb image red', function (done) {
     const output = fixtures.path('output.tint-red.jpg');
     sharp(fixtures.inputJpg)
-      .resize(320, 240, { fastShrinkOnLoad: false })
+      .resize(320, 240)
       .tint('#FF0000')
       .toFile(output, function (err, info) {
         if (err) throw err;
         assert.strictEqual(true, info.size > 0);
-        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-red.jpg'), 18);
+        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-red.jpg'), maxDistance);
         done();
       });
   });
@@ -25,12 +28,12 @@ describe('Tint', function () {
   it('tints rgb image green', function (done) {
     const output = fixtures.path('output.tint-green.jpg');
     sharp(fixtures.inputJpg)
-      .resize(320, 240, { fastShrinkOnLoad: false })
+      .resize(320, 240)
       .tint('#00FF00')
       .toFile(output, function (err, info) {
         if (err) throw err;
         assert.strictEqual(true, info.size > 0);
-        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-green.jpg'), 27);
+        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-green.jpg'), maxDistance);
         done();
       });
   });
@@ -38,40 +41,40 @@ describe('Tint', function () {
   it('tints rgb image blue', function (done) {
     const output = fixtures.path('output.tint-blue.jpg');
     sharp(fixtures.inputJpg)
-      .resize(320, 240, { fastShrinkOnLoad: false })
+      .resize(320, 240)
       .tint('#0000FF')
       .toFile(output, function (err, info) {
         if (err) throw err;
         assert.strictEqual(true, info.size > 0);
-        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-blue.jpg'), 14);
+        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-blue.jpg'), maxDistance);
         done();
       });
   });
 
   it('tints rgb image with sepia tone', function (done) {
-    const output = fixtures.path('output.tint-sepia.jpg');
+    const output = fixtures.path('output.tint-sepia-hex.jpg');
     sharp(fixtures.inputJpg)
-      .resize(320, 240, { fastShrinkOnLoad: false })
+      .resize(320, 240)
       .tint('#704214')
       .toFile(output, function (err, info) {
         if (err) throw err;
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
-        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-sepia.jpg'), 10);
+        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-sepia.jpg'), maxDistance);
         done();
       });
   });
 
   it('tints rgb image with sepia tone with rgb colour', function (done) {
-    const output = fixtures.path('output.tint-sepia.jpg');
+    const output = fixtures.path('output.tint-sepia-rgb.jpg');
     sharp(fixtures.inputJpg)
-      .resize(320, 240, { fastShrinkOnLoad: false })
+      .resize(320, 240)
       .tint([112, 66, 20])
       .toFile(output, function (err, info) {
         if (err) throw err;
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
-        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-sepia.jpg'), 10);
+        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-sepia.jpg'), maxDistance);
         done();
       });
   });
@@ -79,13 +82,13 @@ describe('Tint', function () {
   it('tints rgb image with alpha channel', function (done) {
     const output = fixtures.path('output.tint-alpha.png');
     sharp(fixtures.inputPngRGBWithAlpha)
-      .resize(320, 240, { fastShrinkOnLoad: false })
+      .resize(320, 240)
       .tint('#704214')
       .toFile(output, function (err, info) {
         if (err) throw err;
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
-        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-alpha.png'), 10);
+        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-alpha.png'), maxDistance);
         done();
       });
   });
@@ -93,12 +96,12 @@ describe('Tint', function () {
   it('tints cmyk image red', function (done) {
     const output = fixtures.path('output.tint-cmyk.jpg');
     sharp(fixtures.inputJpgWithCmykProfile)
-      .resize(320, 240, { fastShrinkOnLoad: false })
+      .resize(320, 240)
       .tint('#FF0000')
       .toFile(output, function (err, info) {
         if (err) throw err;
         assert.strictEqual(true, info.size > 0);
-        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-cmyk.jpg'), 15);
+        fixtures.assertMaxColourDistance(output, fixtures.expected('tint-cmyk.jpg'), maxDistance);
         done();
       });
   });

test/unit/trim.js

@@ -46,7 +46,9 @@ describe('Trim borders', function () {
   it('16-bit PNG with alpha channel', function (done) {
     sharp(fixtures.inputPngWithTransparency16bit)
       .resize(32, 32)
-      .trim(20)
+      .trim({
+        threshold: 20
+      })
       .toBuffer(function (err, data, info) {
         if (err) throw err;
         assert.strictEqual(true, data.length > 0);
@@ -96,7 +98,9 @@ describe('Trim borders', function () {
       .then(rotated30 =>
         sharp(rotated30)
           .rotate(-30)
-          .trim(128)
+          .trim({
+            threshold: 128
+          })
           .toBuffer({ resolveWithObject: true })
           .then(({ info }) => {
             assert.strictEqual(20, info.width);
@@ -198,49 +202,26 @@ describe('Trim borders', function () {
     assert.strictEqual(trimOffsetLeft, 0);
   });
 
-  describe('Valid parameters', function () {
-    const expected = fixtures.expected('alpha-layer-1-fill-trim-resize.png');
-    Object.entries({
-      'Background and threshold default': undefined,
-      'Background string': '#00000000',
-      'Background option': {
-        background: '#00000000'
-      },
-      'Threshold number': 10,
-      'Threshold option': {
-        threshold: 10
-      }
-    }).forEach(function ([description, parameter]) {
-      it(description, function (done) {
-        sharp(fixtures.inputPngOverlayLayer1)
-          .resize(450, 322)
-          .trim(parameter)
-          .toBuffer(function (err, data, info) {
-            if (err) throw err;
-            assert.strictEqual('png', info.format);
-            assert.strictEqual(450, info.width);
-            assert.strictEqual(322, info.height);
-            assert.strictEqual(-204, info.trimOffsetLeft);
-            assert.strictEqual(0, info.trimOffsetTop);
-            fixtures.assertSimilar(expected, data, done);
-          });
-      });
-    });
+  it('Works with line-art', async () => {
+    const { info } = await sharp(fixtures.inputJpgOverlayLayer2)
+      .trim({ lineArt: true })
+      .toBuffer({ resolveWithObject: true });
+
+    assert.strictEqual(info.trimOffsetTop, -552);
   });
 
   describe('Invalid parameters', function () {
     Object.entries({
-      'Invalid background string': 'fail',
+      'Invalid string': 'fail',
       'Invalid background option': {
         background: 'fail'
       },
-
-      'Negative threshold number': -1,
       'Negative threshold option': {
         threshold: -1
       },
-
-      Boolean: false
+      'Invalid lineArt': {
+        lineArt: 'fail'
+      }
     }).forEach(function ([description, parameter]) {
       it(description, function () {
         assert.throws(function () {
@@ -253,7 +234,9 @@ describe('Trim borders', function () {
   describe('Specific background colour', function () {
     it('Doesn\'t trim at all', async () => {
       const { info } = await sharp(fixtures.inputPngTrimSpecificColour)
-        .trim('yellow')
+        .trim({
+          background: 'yellow'
+        })
         .toBuffer({ resolveWithObject: true });
 
       const { width, height, trimOffsetTop, trimOffsetLeft } = info;
@@ -265,7 +248,9 @@ describe('Trim borders', function () {
 
     it('Only trims the bottom', async () => {
       const { info } = await sharp(fixtures.inputPngTrimSpecificColour)
-        .trim('#21468B')
+        .trim({
+          background: '#21468B'
+        })
         .toBuffer({ resolveWithObject: true });
 
       const { width, height, trimOffsetTop, trimOffsetLeft } = info;
@@ -277,7 +262,9 @@ describe('Trim borders', function () {
 
     it('Only trims the bottom, in 16-bit', async () => {
       const { info } = await sharp(fixtures.inputPngTrimSpecificColour16bit)
-        .trim('#21468B')
+        .trim({
+          background: '#21468B'
+        })
         .toBuffer({ resolveWithObject: true });
 
       const { width, height, trimOffsetTop, trimOffsetLeft } = info;
@@ -289,7 +276,9 @@ describe('Trim borders', function () {
 
     it('Only trims the bottom, including alpha', async () => {
       const { info } = await sharp(fixtures.inputPngTrimSpecificColourIncludeAlpha)
-        .trim('#21468B80')
+        .trim({
+          background: '#21468B80'
+        })
         .toBuffer({ resolveWithObject: true });
 
       const { width, height, trimOffsetTop, trimOffsetLeft } = info;