sharp 0.35.0-rc.4 → 0.35.0-rc.6

package/dist/composite.cjs

@@ -125,6 +125,7 @@ const blend = {
  * @param {boolean} [images[].animated=false] - Set to `true` to read all frames/pages of an animated image.
  * @param {string} [images[].failOn='warning'] - @see {@link /api-constructor/ constructor parameters}
  * @param {number|boolean} [images[].limitInputPixels=268402689] - @see {@link /api-constructor/ constructor parameters}
+ * @param {number|boolean} [images[].limitInputChannels=5] - @see {@link /api-constructor/ constructor parameters}
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */

package/dist/composite.mjs

@@ -125,6 +125,7 @@ const blend = {
  * @param {boolean} [images[].animated=false] - Set to `true` to read all frames/pages of an animated image.
  * @param {string} [images[].failOn='warning'] - @see {@link /api-constructor/ constructor parameters}
  * @param {number|boolean} [images[].limitInputPixels=268402689] - @see {@link /api-constructor/ constructor parameters}
+ * @param {number|boolean} [images[].limitInputChannels=5] - @see {@link /api-constructor/ constructor parameters}
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */

package/dist/constructor.cjs

@@ -48,7 +48,7 @@ const queueListener = (queueLength) => {
  * // resize to 300 pixels wide,
  * // emit an 'info' event with calculated dimensions
  * // and finally write image data to writableStream
- * const { body } = fetch('https://...');
+ * const { body } = await fetch('https://...');
  * const readableStream = Readable.fromWeb(body);
  * const transformer = sharp()
  *   .resize(300)
@@ -58,6 +58,17 @@ const queueListener = (queueLength) => {
  * readableStream.pipe(transformer).pipe(writableStream);
  *
  * @example
+ * // Web Streams API, requires Node.js >= 24.15.0
+ * const { Duplex } = require('node:stream');
+ *
+ * const { body } = await fetch('https://...');
+ * const transformer = Duplex.toWeb(
+ *   sharp().resize(300),
+ *   { readableType: 'bytes' }
+ * );
+ * body.pipeThrough(transformer).pipeTo(writable);
+ *
+ * @example
  * // Create a blank 300x200 PNG image of semi-translucent red pixels
  * sharp({
  *   create: {
@@ -146,10 +157,12 @@ const queueListener = (queueLength) => {
  *  An array of inputs can be provided, and these will be joined together.
  *  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, least to most): 'none', 'truncated', 'error', 'warning'. 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. Use the default 'warning' level with untrusted input.
  * @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).
+ * @param {number|boolean} [options.limitInputChannels=5] - Do not process input images where the number of channels exceeds this limit. Assumes image metadata can be trusted.
+ *  An integral Number of channels, zero or false to remove limit, true to use default limit of 5.
  * @param {boolean} [options.unlimited=false] - Set this to `true` to remove safety features that help prevent memory exhaustion (JPEG, PNG, SVG, HEIF).
  * @param {boolean} [options.autoOrient=false] - Set this to `true` to rotate/flip the image to match EXIF `Orientation`, if any.
  * @param {boolean} [options.sequentialRead=true] - Set this to `false` to use random access rather than sequential read. Some operations will do this automatically.
@@ -380,7 +393,7 @@ const Sharp = function (input, options) {
     heifEffort: 4,
     heifChromaSubsampling: '4:4:4',
     heifBitdepth: 8,
-    heifTune: 'ssim',
+    heifTune: 'auto',
     jxlDistance: 1,
     jxlDecodingTier: 0,
     jxlEffort: 7,
@@ -422,29 +435,33 @@ Object.setPrototypeOf(Sharp, stream.Duplex);
  * This allows multiple output Streams and therefore multiple processing pipelines to share a single input Stream.
  *
  * @example
- * const pipeline = sharp().rotate();
- * pipeline.clone().resize(800, 600).pipe(firstWritableStream);
- * pipeline.clone().extract({ left: 20, top: 20, width: 100, height: 100 }).pipe(secondWritableStream);
- * readableStream.pipe(pipeline);
  * // firstWritableStream receives auto-rotated, resized readableStream
  * // secondWritableStream receives auto-rotated, extracted region of readableStream
  *
+ * const pipeline = sharp().rotate();
+ * pipeline
+ *   .clone()
+ *   .resize(800, 600)
+ *   .pipe(firstWritableStream);
+ * pipeline
+ *   .clone()
+ *   .extract({ left: 20, top: 20, width: 100, height: 100 })
+ *   .pipe(secondWritableStream);
+ * readableStream.pipe(pipeline);
+ *
  * @example
  * // Create a pipeline that will download an image, resize it and format it to different files
  * // Using Promises to know when the pipeline is complete
- * const fs = require("node:fs");
- * const got = require("got");
- * const sharpStream = sharp({ failOn: 'none' });
  *
- * const promises = [];
+ * const sharpStream = sharp();
  *
+ * const promises = [];
  * promises.push(
  *   sharpStream
  *     .clone()
  *     .jpeg({ quality: 100 })
  *     .toFile("originalFile.jpg")
  * );
- *
  * promises.push(
  *   sharpStream
  *     .clone()
@@ -452,7 +469,6 @@ Object.setPrototypeOf(Sharp, stream.Duplex);
  *     .jpeg({ quality: 80 })
  *     .toFile("optimized-500.jpg")
  * );
- *
  * promises.push(
  *   sharpStream
  *     .clone()
@@ -461,19 +477,9 @@ Object.setPrototypeOf(Sharp, stream.Duplex);
  *     .toFile("optimized-500.webp")
  * );
  *
- * // https://github.com/sindresorhus/got/blob/main/documentation/3-streams.md
- * got.stream("https://www.example.com/some-file.jpg").pipe(sharpStream);
- *
- * Promise.all(promises)
- *   .then(res => { console.log("Done!", res); })
- *   .catch(err => {
- *     console.error("Error processing files, let's clean it up", err);
- *     try {
- *       fs.unlinkSync("originalFile.jpg");
- *       fs.unlinkSync("optimized-500.jpg");
- *       fs.unlinkSync("optimized-500.webp");
- *     } catch (e) {}
- *   });
+ * const res = await fetch("https://www.example.com/some-file.jpg")
+ * Readable.fromWeb(res.body).pipe(sharpStream);
+ * await Promise.all(promises);
  *
  * @returns {Sharp}
  */

package/dist/constructor.mjs

@@ -48,7 +48,7 @@ const queueListener = (queueLength) => {
  * // resize to 300 pixels wide,
  * // emit an 'info' event with calculated dimensions
  * // and finally write image data to writableStream
- * const { body } = fetch('https://...');
+ * const { body } = await fetch('https://...');
  * const readableStream = Readable.fromWeb(body);
  * const transformer = sharp()
  *   .resize(300)
@@ -58,6 +58,17 @@ const queueListener = (queueLength) => {
  * readableStream.pipe(transformer).pipe(writableStream);
  *
  * @example
+ * // Web Streams API, requires Node.js >= 24.15.0
+ * import { Duplex } from 'node:stream';
+ *
+ * const { body } = await fetch('https://...');
+ * const transformer = Duplex.toWeb(
+ *   sharp().resize(300),
+ *   { readableType: 'bytes' }
+ * );
+ * body.pipeThrough(transformer).pipeTo(writable);
+ *
+ * @example
  * // Create a blank 300x200 PNG image of semi-translucent red pixels
  * sharp({
  *   create: {
@@ -146,10 +157,12 @@ const queueListener = (queueLength) => {
  *  An array of inputs can be provided, and these will be joined together.
  *  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, least to most): 'none', 'truncated', 'error', 'warning'. 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. Use the default 'warning' level with untrusted input.
  * @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).
+ * @param {number|boolean} [options.limitInputChannels=5] - Do not process input images where the number of channels exceeds this limit. Assumes image metadata can be trusted.
+ *  An integral Number of channels, zero or false to remove limit, true to use default limit of 5.
  * @param {boolean} [options.unlimited=false] - Set this to `true` to remove safety features that help prevent memory exhaustion (JPEG, PNG, SVG, HEIF).
  * @param {boolean} [options.autoOrient=false] - Set this to `true` to rotate/flip the image to match EXIF `Orientation`, if any.
  * @param {boolean} [options.sequentialRead=true] - Set this to `false` to use random access rather than sequential read. Some operations will do this automatically.
@@ -380,7 +393,7 @@ const Sharp = function (input, options) {
     heifEffort: 4,
     heifChromaSubsampling: '4:4:4',
     heifBitdepth: 8,
-    heifTune: 'ssim',
+    heifTune: 'auto',
     jxlDistance: 1,
     jxlDecodingTier: 0,
     jxlEffort: 7,
@@ -422,29 +435,33 @@ Object.setPrototypeOf(Sharp, stream.Duplex);
  * This allows multiple output Streams and therefore multiple processing pipelines to share a single input Stream.
  *
  * @example
- * const pipeline = sharp().rotate();
- * pipeline.clone().resize(800, 600).pipe(firstWritableStream);
- * pipeline.clone().extract({ left: 20, top: 20, width: 100, height: 100 }).pipe(secondWritableStream);
- * readableStream.pipe(pipeline);
  * // firstWritableStream receives auto-rotated, resized readableStream
  * // secondWritableStream receives auto-rotated, extracted region of readableStream
  *
+ * const pipeline = sharp().rotate();
+ * pipeline
+ *   .clone()
+ *   .resize(800, 600)
+ *   .pipe(firstWritableStream);
+ * pipeline
+ *   .clone()
+ *   .extract({ left: 20, top: 20, width: 100, height: 100 })
+ *   .pipe(secondWritableStream);
+ * readableStream.pipe(pipeline);
+ *
  * @example
  * // Create a pipeline that will download an image, resize it and format it to different files
  * // Using Promises to know when the pipeline is complete
- * import fs from "node:fs";
- * import got from "got";
- * const sharpStream = sharp({ failOn: 'none' });
  *
- * const promises = [];
+ * const sharpStream = sharp();
  *
+ * const promises = [];
  * promises.push(
  *   sharpStream
  *     .clone()
  *     .jpeg({ quality: 100 })
  *     .toFile("originalFile.jpg")
  * );
- *
  * promises.push(
  *   sharpStream
  *     .clone()
@@ -452,7 +469,6 @@ Object.setPrototypeOf(Sharp, stream.Duplex);
  *     .jpeg({ quality: 80 })
  *     .toFile("optimized-500.jpg")
  * );
- *
  * promises.push(
  *   sharpStream
  *     .clone()
@@ -461,19 +477,9 @@ Object.setPrototypeOf(Sharp, stream.Duplex);
  *     .toFile("optimized-500.webp")
  * );
  *
- * // https://github.com/sindresorhus/got/blob/main/documentation/3-streams.md
- * got.stream("https://www.example.com/some-file.jpg").pipe(sharpStream);
- *
- * Promise.all(promises)
- *   .then(res => { console.log("Done!", res); })
- *   .catch(err => {
- *     console.error("Error processing files, let's clean it up", err);
- *     try {
- *       fs.unlinkSync("originalFile.jpg");
- *       fs.unlinkSync("optimized-500.jpg");
- *       fs.unlinkSync("optimized-500.webp");
- *     } catch (e) {}
- *   });
+ * const res = await fetch("https://www.example.com/some-file.jpg")
+ * Readable.fromWeb(res.body).pipe(sharpStream);
+ * await Promise.all(promises);
  *
  * @returns {Sharp}
  */

package/dist/input.cjs

@@ -24,7 +24,7 @@ const align = {
 
 const inputStreamParameters = [
   // Limits and error handling
-  'failOn', 'limitInputPixels', 'unlimited',
+  'failOn', 'limitInputPixels', 'limitInputChannels', 'unlimited',
   // Format-generic
   'animated', 'autoOrient', 'density', 'ignoreIcc', 'page', 'pages', 'sequentialRead',
   // Format-specific
@@ -55,6 +55,7 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
     autoOrient: false,
     failOn: 'warning',
     limitInputPixels: 0x3FFF ** 2,
+    limitInputChannels: 5,
     ignoreIcc: false,
     unlimited: false,
     sequentialRead: true
@@ -150,6 +151,16 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
         throw is.invalidParameterError('limitInputPixels', 'positive integer', inputOptions.limitInputPixels);
       }
     }
+    // limitInputChannels
+    if (is.defined(inputOptions.limitInputChannels)) {
+      if (is.bool(inputOptions.limitInputChannels)) {
+        inputDescriptor.limitInputChannels = inputOptions.limitInputChannels ? 5 : 0;
+      } else if (is.integer(inputOptions.limitInputChannels) && is.inRange(inputOptions.limitInputChannels, 0, Number.MAX_SAFE_INTEGER)) {
+        inputDescriptor.limitInputChannels = inputOptions.limitInputChannels;
+      } else {
+        throw is.invalidParameterError('limitInputChannels', 'positive integer', inputOptions.limitInputChannels);
+      }
+    }
     // unlimited
     if (is.defined(inputOptions.unlimited)) {
       if (is.bool(inputOptions.unlimited)) {

package/dist/input.mjs

@@ -24,7 +24,7 @@ const align = {
 
 const inputStreamParameters = [
   // Limits and error handling
-  'failOn', 'limitInputPixels', 'unlimited',
+  'failOn', 'limitInputPixels', 'limitInputChannels', 'unlimited',
   // Format-generic
   'animated', 'autoOrient', 'density', 'ignoreIcc', 'page', 'pages', 'sequentialRead',
   // Format-specific
@@ -55,6 +55,7 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
     autoOrient: false,
     failOn: 'warning',
     limitInputPixels: 0x3FFF ** 2,
+    limitInputChannels: 5,
     ignoreIcc: false,
     unlimited: false,
     sequentialRead: true
@@ -150,6 +151,16 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
         throw is.invalidParameterError('limitInputPixels', 'positive integer', inputOptions.limitInputPixels);
       }
     }
+    // limitInputChannels
+    if (is.defined(inputOptions.limitInputChannels)) {
+      if (is.bool(inputOptions.limitInputChannels)) {
+        inputDescriptor.limitInputChannels = inputOptions.limitInputChannels ? 5 : 0;
+      } else if (is.integer(inputOptions.limitInputChannels) && is.inRange(inputOptions.limitInputChannels, 0, Number.MAX_SAFE_INTEGER)) {
+        inputDescriptor.limitInputChannels = inputOptions.limitInputChannels;
+      } else {
+        throw is.invalidParameterError('limitInputChannels', 'positive integer', inputOptions.limitInputChannels);
+      }
+    }
     // unlimited
     if (is.defined(inputOptions.unlimited)) {
       if (is.bool(inputOptions.unlimited)) {

package/dist/libvips.cjs

@@ -5,15 +5,13 @@
 
 const { spawnSync } = require('node:child_process');
 const { createHash } = require('node:crypto');
-const semverCoerce = require('semver/functions/coerce');
-const semverGreaterThanOrEqualTo = require('semver/functions/gte');
-const semverSatisfies = require('semver/functions/satisfies');
+const semver = require('semver');
 const detectLibc = require('detect-libc');
 const pkg = require('../package.json');
 
 /* node:coverage ignore next */
 const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || pkg.config.libvips;
-const minimumLibvipsVersion = semverCoerce(minimumLibvipsVersionLabelled).version;
+const minimumLibvipsVersion = semver.coerce(minimumLibvipsVersionLabelled).version;
 
 const prebuiltPlatforms = [
   'darwin-arm64', 'darwin-x64',
@@ -82,7 +80,7 @@ const buildSharpLibvipsLibDir = () => {
 
 const isUnsupportedNodeRuntime = () => {
   if (process.release?.name === 'node' && process.versions) {
-    if (!semverSatisfies(process.versions.node, pkg.engines.node)) {
+    if (!semver.satisfies(process.versions.node, pkg.engines.node)) {
       return { found: process.versions.node, expected: pkg.engines.node };
     }
   }
@@ -108,7 +106,7 @@ const sha512 = (s) => createHash('sha512').update(s).digest('hex');
 const yarnLocator = () => {
   try {
     const identHash = sha512(`imgsharp-libvips-${buildPlatformArch()}`);
-    const npmVersion = semverCoerce(pkg.optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`], {
+    const npmVersion = semver.coerce(pkg.optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`], {
       includePrerelease: true
     }).version;
     return sha512(`${identHash}npm:${npmVersion}`).slice(0, 10);
@@ -193,7 +191,7 @@ const useGlobalLibvips = (logger) => {
   }
   const globalVipsVersion = globalLibvipsVersion();
   /* node:coverage ignore next */
-  return !!globalVipsVersion && semverGreaterThanOrEqualTo(globalVipsVersion, minimumLibvipsVersion);
+  return !!globalVipsVersion && semver.gte(globalVipsVersion, minimumLibvipsVersion);
 };
 
 module.exports = {

package/dist/libvips.mjs

@@ -5,15 +5,13 @@
 
 import { spawnSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
-import semverCoerce from 'semver/functions/coerce';
-import semverGreaterThanOrEqualTo from 'semver/functions/gte';
-import semverSatisfies from 'semver/functions/satisfies';
+import semver from 'semver';
 import detectLibc from 'detect-libc';
 import pkg from '../package.json' with { type: 'json' };
 
 /* node:coverage ignore next */
 const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || pkg.config.libvips;
-const minimumLibvipsVersion = semverCoerce(minimumLibvipsVersionLabelled).version;
+const minimumLibvipsVersion = semver.coerce(minimumLibvipsVersionLabelled).version;
 
 const prebuiltPlatforms = [
   'darwin-arm64', 'darwin-x64',
@@ -82,7 +80,7 @@ const buildSharpLibvipsLibDir = () => {
 
 const isUnsupportedNodeRuntime = () => {
   if (process.release?.name === 'node' && process.versions) {
-    if (!semverSatisfies(process.versions.node, pkg.engines.node)) {
+    if (!semver.satisfies(process.versions.node, pkg.engines.node)) {
       return { found: process.versions.node, expected: pkg.engines.node };
     }
   }
@@ -108,7 +106,7 @@ const sha512 = (s) => createHash('sha512').update(s).digest('hex');
 const yarnLocator = () => {
   try {
     const identHash = sha512(`imgsharp-libvips-${buildPlatformArch()}`);
-    const npmVersion = semverCoerce(pkg.optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`], {
+    const npmVersion = semver.coerce(pkg.optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`], {
       includePrerelease: true
     }).version;
     return sha512(`${identHash}npm:${npmVersion}`).slice(0, 10);
@@ -193,7 +191,7 @@ const useGlobalLibvips = (logger) => {
   }
   const globalVipsVersion = globalLibvipsVersion();
   /* node:coverage ignore next */
-  return !!globalVipsVersion && semverGreaterThanOrEqualTo(globalVipsVersion, minimumLibvipsVersion);
+  return !!globalVipsVersion && semver.gte(globalVipsVersion, minimumLibvipsVersion);
 };
 
 export default {

package/dist/output.cjs

@@ -1228,13 +1228,12 @@ function tiff (options) {
  * @param {number} [options.effort=4] - CPU effort, between 0 (fastest) and 9 (slowest)
  * @param {string} [options.chromaSubsampling='4:4:4'] - set to '4:2:0' to use chroma subsampling
  * @param {number} [options.bitdepth=8] - set bitdepth to 8, 10 or 12 bit
- * @param {string} [options.tune='iq'] - tune output for a quality metric, one of 'iq' (default), 'ssim' (default when lossless) or 'psnr'
+ * @param {string} [options.tune='auto'] - tune output for a quality metric, one of 'auto' (default), 'iq', 'psnr' or 'ssim'
  * @returns {Sharp}
  * @throws {Error} Invalid options
  */
 function avif (options) {
-  const tune = is.object(options) && is.defined(options.tune) ? options.tune : 'iq';
-  return this.heif({ ...options, compression: 'av1', tune });
+  return this.heif({ ...options, compression: 'av1' });
 }
 
 /**
@@ -1257,7 +1256,7 @@ function avif (options) {
  * @param {number} [options.effort=4] - CPU effort, between 0 (fastest) and 9 (slowest)
  * @param {string} [options.chromaSubsampling='4:4:4'] - set to '4:2:0' to use chroma subsampling
  * @param {number} [options.bitdepth=8] - set bitdepth to 8, 10 or 12 bit
- * @param {string} [options.tune='ssim'] - tune output for a quality metric, one of 'ssim' (default), 'psnr' or 'iq'
+ * @param {string} [options.tune='auto'] - tune output for a quality metric, one of 'auto' (default), 'iq', 'psnr' or 'ssim'
  * @returns {Sharp}
  * @throws {Error} Invalid options
  */
@@ -1307,14 +1306,14 @@ function heif (options) {
       }
     }
     if (is.defined(options.tune)) {
-      if (is.string(options.tune) && is.inArray(options.tune, ['iq', 'ssim', 'psnr'])) {
+      if (is.string(options.tune) && is.inArray(options.tune, ['auto', 'iq', 'psnr', 'ssim'])) {
         if (this.options.heifLossless && options.tune === 'iq') {
           this.options.heifTune = 'ssim';
         } else {
           this.options.heifTune = options.tune;
         }
       } else {
-        throw is.invalidParameterError('tune', 'one of: psnr, ssim, iq', options.tune);
+        throw is.invalidParameterError('tune', 'one of: auto, iq, psnr, ssim', options.tune);
       }
     }
   } else {

package/dist/output.mjs

@@ -1228,13 +1228,12 @@ function tiff (options) {
  * @param {number} [options.effort=4] - CPU effort, between 0 (fastest) and 9 (slowest)
  * @param {string} [options.chromaSubsampling='4:4:4'] - set to '4:2:0' to use chroma subsampling
  * @param {number} [options.bitdepth=8] - set bitdepth to 8, 10 or 12 bit
- * @param {string} [options.tune='iq'] - tune output for a quality metric, one of 'iq' (default), 'ssim' (default when lossless) or 'psnr'
+ * @param {string} [options.tune='auto'] - tune output for a quality metric, one of 'auto' (default), 'iq', 'psnr' or 'ssim'
  * @returns {Sharp}
  * @throws {Error} Invalid options
  */
 function avif (options) {
-  const tune = is.object(options) && is.defined(options.tune) ? options.tune : 'iq';
-  return this.heif({ ...options, compression: 'av1', tune });
+  return this.heif({ ...options, compression: 'av1' });
 }
 
 /**
@@ -1257,7 +1256,7 @@ function avif (options) {
  * @param {number} [options.effort=4] - CPU effort, between 0 (fastest) and 9 (slowest)
  * @param {string} [options.chromaSubsampling='4:4:4'] - set to '4:2:0' to use chroma subsampling
  * @param {number} [options.bitdepth=8] - set bitdepth to 8, 10 or 12 bit
- * @param {string} [options.tune='ssim'] - tune output for a quality metric, one of 'ssim' (default), 'psnr' or 'iq'
+ * @param {string} [options.tune='auto'] - tune output for a quality metric, one of 'auto' (default), 'iq', 'psnr' or 'ssim'
  * @returns {Sharp}
  * @throws {Error} Invalid options
  */
@@ -1307,14 +1306,14 @@ function heif (options) {
       }
     }
     if (is.defined(options.tune)) {
-      if (is.string(options.tune) && is.inArray(options.tune, ['iq', 'ssim', 'psnr'])) {
+      if (is.string(options.tune) && is.inArray(options.tune, ['auto', 'iq', 'psnr', 'ssim'])) {
         if (this.options.heifLossless && options.tune === 'iq') {
           this.options.heifTune = 'ssim';
         } else {
           this.options.heifTune = options.tune;
         }
       } else {
-        throw is.invalidParameterError('tune', 'one of: psnr, ssim, iq', options.tune);
+        throw is.invalidParameterError('tune', 'one of: auto, iq, psnr, ssim', options.tune);
       }
     }
   } else {

package/dist/resize.cjs

@@ -506,6 +506,8 @@ function extract (options) {
  *
  * If the result of this operation would trim an image to nothing then no change is made.
  *
+ * Use the `lineArt` and `threshold` options for control over sensitivity.
+ *
  * The `info` response Object will contain `trimOffsetLeft` and `trimOffsetTop` properties.
  *
  * @example

package/dist/resize.mjs

@@ -506,6 +506,8 @@ function extract (options) {
  *
  * If the result of this operation would trim an image to nothing then no change is made.
  *
+ * Use the `lineArt` and `threshold` options for control over sensitivity.
+ *
  * The `info` response Object will contain `trimOffsetLeft` and `trimOffsetTop` properties.
  *
  * @example

package/dist/sharp.cjs

@@ -5,10 +5,16 @@
 
 // Inspects the runtime environment and exports the relevant sharp.node binary
 
+
 const { familySync, versionSync } = require("detect-libc");
 
-const { version } = require('../package.json');
-const { runtimePlatformArch, isUnsupportedNodeRuntime, prebuiltPlatforms, minimumLibvipsVersion } = require("./libvips.cjs");
+const libvips = require("./libvips.cjs");
+const pkg = require('../package.json');
+
+
+const { version } = pkg;
+
+const { runtimePlatformArch, isUnsupportedNodeRuntime, prebuiltPlatforms, minimumLibvipsVersion } = libvips;
 const runtimePlatform = runtimePlatformArch();
 
 /* node:coverage disable */
@@ -96,7 +102,7 @@ if (!sharp) {
 
   const help = [`Could not load the "sharp" module using the ${runtimePlatform} runtime`];
   errors.forEach((err) => {
-    if (err.code !== "MODULE_NOT_FOUND") {
+    if (!err.code.endsWith("MODULE_NOT_FOUND")) {
       help.push(`${err.code}: ${err.message}`);
     }
   });

package/dist/sharp.mjs

@@ -5,10 +5,16 @@
 
 // Inspects the runtime environment and exports the relevant sharp.node binary
 
+import { createRequire } from "node:module"
 import { familySync, versionSync } from "detect-libc";
 
-import { version } from '../package.json';
-import { runtimePlatformArch, isUnsupportedNodeRuntime, prebuiltPlatforms, minimumLibvipsVersion } from "./libvips.mjs";
+import libvips from "./libvips.mjs";
+import pkg from '../package.json' with { type: 'json' };
+
+const require = createRequire(import.meta.url);
+const { version } = pkg;
+
+const { runtimePlatformArch, isUnsupportedNodeRuntime, prebuiltPlatforms, minimumLibvipsVersion } = libvips;
 const runtimePlatform = runtimePlatformArch();
 
 /* node:coverage disable */
@@ -16,13 +22,13 @@ const runtimePlatform = runtimePlatformArch();
 let sharp;
 const errors = [];
 try {
-  sharp = await import(`../src/build/Release/sharp-${runtimePlatform}-${version}.node`);
+  sharp = require(`../src/build/Release/sharp-${runtimePlatform}-${version}.node`);
 } catch (err) {
   errors.push(err);
 }
 if (!sharp) {
   try {
-    sharp = await import(`../src/build/Release/sharp-wasm32-${version}.node`);
+    sharp = require(`../src/build/Release/sharp-wasm32-${version}.node`);
   } catch (err) {
     errors.push(err);
   }
@@ -31,53 +37,53 @@ if (!sharp) {
   try {
     switch (runtimePlatform) {
       case "darwin-arm64":
-        sharp = await import("@img/sharp-darwin-arm64/sharp.node");
+        sharp = require("@img/sharp-darwin-arm64/sharp.node");
         break;
       case "darwin-x64":
-        sharp = await import("@img/sharp-darwin-x64/sharp.node");
+        sharp = require("@img/sharp-darwin-x64/sharp.node");
         break;
       case "linux-arm":
-        sharp = await import("@img/sharp-linux-arm/sharp.node");
+        sharp = require("@img/sharp-linux-arm/sharp.node");
         break;
       case "linux-arm64":
-        sharp = await import("@img/sharp-linux-arm64/sharp.node");
+        sharp = require("@img/sharp-linux-arm64/sharp.node");
         break;
       case "linux-ppc64":
-        sharp = await import("@img/sharp-linux-ppc64/sharp.node");
+        sharp = require("@img/sharp-linux-ppc64/sharp.node");
         break;
       case "linux-riscv64":
-        sharp = await import("@img/sharp-linux-riscv64/sharp.node");
+        sharp = require("@img/sharp-linux-riscv64/sharp.node");
         break;
       case "linux-s390x":
-        sharp = await import("@img/sharp-linux-s390x/sharp.node");
+        sharp = require("@img/sharp-linux-s390x/sharp.node");
         break;
       case "linux-x64":
-        sharp = await import("@img/sharp-linux-x64/sharp.node");
+        sharp = require("@img/sharp-linux-x64/sharp.node");
         break;
       case "linuxmusl-arm64":
-        sharp = await import("@img/sharp-linuxmusl-arm64/sharp.node");
+        sharp = require("@img/sharp-linuxmusl-arm64/sharp.node");
         break;
       case "linuxmusl-x64":
-        sharp = await import("@img/sharp-linuxmusl-x64/sharp.node");
+        sharp = require("@img/sharp-linuxmusl-x64/sharp.node");
         break;
       case "win32-arm64":
-        sharp = await import("@img/sharp-win32-arm64/sharp.node");
+        sharp = require("@img/sharp-win32-arm64/sharp.node");
         break;
       case "win32-ia32":
-        sharp = await import("@img/sharp-win32-ia32/sharp.node");
+        sharp = require("@img/sharp-win32-ia32/sharp.node");
         break;
       case "win32-x64":
-        sharp = await import("@img/sharp-win32-x64/sharp.node");
+        sharp = require("@img/sharp-win32-x64/sharp.node");
         break;
       case "freebsd-arm64":
       case "freebsd-x64":
-        sharp = await import("@img/sharp-freebsd-wasm32/sharp.node");
+        sharp = require("@img/sharp-freebsd-wasm32/sharp.node");
         break;
       case "linux-wasm32":
-        sharp = await import("@img/sharp-webcontainers-wasm32/sharp.node");
+        sharp = require("@img/sharp-webcontainers-wasm32/sharp.node");
         break;
       default:
-        sharp = await import("@img/sharp-wasm32/sharp.node");
+        sharp = require("@img/sharp-wasm32/sharp.node");
         break;
     }
     if (["linux-x64", "linuxmusl-x64"].includes(runtimePlatform) && !sharp._isUsingX64V2()) {
@@ -96,7 +102,7 @@ if (!sharp) {
 
   const help = [`Could not load the "sharp" module using the ${runtimePlatform} runtime`];
   errors.forEach((err) => {
-    if (err.code !== "MODULE_NOT_FOUND") {
+    if (!err.code.endsWith("MODULE_NOT_FOUND")) {
       help.push(`${err.code}: ${err.message}`);
     }
   });
@@ -127,7 +133,7 @@ if (!sharp) {
   }
   if (isLinux && /(symbol not found|CXXABI_)/i.test(messages)) {
     try {
-      const { config } = await import(`@img/sharp-libvips-${runtimePlatform}/package`);
+      const { config } = require(`@img/sharp-libvips-${runtimePlatform}/package`);
       const libcFound = `${familySync()} ${versionSync()}`;
       const libcRequires = `${config.musl ? "musl" : "glibc"} ${config.musl || config.glibc}`;
       help.push("- Update your OS:", `    Found ${libcFound}`, `    Requires ${libcRequires}`);

package/dist/utility.cjs

@@ -4,14 +4,17 @@
 */
 
 const events = require('node:events');
+
+const { availableParallelism } = require("node:os");
 const detectLibc = require('detect-libc');
 
 const is = require('./is.cjs');
-const { runtimePlatformArch } = require('./libvips.cjs');
+const libvips = require('./libvips.cjs');
 const sharp = require('./sharp.cjs');
 const pkg = require("../package.json");
 
-const runtimePlatform = runtimePlatformArch();
+
+const runtimePlatform = libvips.runtimePlatformArch();
 const libvipsVersion = sharp.libvipsVersion();
 
 /**
@@ -157,7 +160,6 @@ if (detectLibc.familySync() === detectLibc.GLIBC && !sharp._isUsingJemalloc()) {
   sharp.concurrency(1);
 } else if (detectLibc.familySync() === detectLibc.MUSL && sharp.concurrency() === 1024) {
   // Reduce default concurrency when musl thread over-subscription detected
-  const { availableParallelism } = require('node:os')
   sharp.concurrency(availableParallelism());
 }
 

package/dist/utility.mjs

@@ -4,14 +4,17 @@
 */
 
 import events from 'node:events';
+import { createRequire } from "node:module";
+import { availableParallelism } from "node:os";
 import detectLibc from 'detect-libc';
 
 import is from './is.mjs';
-import { runtimePlatformArch } from './libvips.mjs';
+import libvips from './libvips.mjs';
 import sharp from './sharp.mjs';
 import pkg from "../package.json" with { type: "json" };
 
-const runtimePlatform = runtimePlatformArch();
+const require = createRequire(import.meta.url);
+const runtimePlatform = libvips.runtimePlatformArch();
 const libvipsVersion = sharp.libvipsVersion();
 
 /**
@@ -62,15 +65,15 @@ let versions = {
 if (!libvipsVersion.isGlobal) {
   if (!libvipsVersion.isWasm) {
     try {
-      versions = await import(`@img/sharp-${runtimePlatform}/versions`);
+      versions = require(`@img/sharp-${runtimePlatform}/versions`);
     } catch (_) {
       try {
-        versions = await import(`@img/sharp-libvips-${runtimePlatform}/versions`);
+        versions = require(`@img/sharp-libvips-${runtimePlatform}/versions`);
       } catch (_) {}
     }
   } else {
     try {
-      versions = await import('@img/sharp-wasm32/versions');
+      versions = require('@img/sharp-wasm32/versions');
     } catch (_) {}
   }
 }
@@ -157,7 +160,6 @@ if (detectLibc.familySync() === detectLibc.GLIBC && !sharp._isUsingJemalloc()) {
   sharp.concurrency(1);
 } else if (detectLibc.familySync() === detectLibc.MUSL && sharp.concurrency() === 1024) {
   // Reduce default concurrency when musl thread over-subscription detected
-  const { availableParallelism } = await import('node:os')
   sharp.concurrency(availableParallelism());
 }
 

package/lib/index.d.ts

@@ -989,7 +989,8 @@ declare namespace sharp {
         autoOrient?: boolean | undefined;
         /**
          *  When to abort processing of invalid pixel data, one of (in order of sensitivity):
-         *  'none' (least), 'truncated', 'error' or 'warning' (most), highers level imply lower levels, invalid metadata will always abort. (optional, default 'warning')
+         *  'none' (least), 'truncated', 'error' or 'warning' (most), highers level imply lower levels, invalid metadata will always abort.
+         *  Use the default 'warning' level with untrusted input. (optional, default 'warning')
          */
         failOn?: FailOnOptions | undefined;
         /**
@@ -998,6 +999,12 @@ declare namespace sharp {
          * An integral Number of pixels, zero or false to remove limit, true to use default limit of 268402689 (0x3FFF x 0x3FFF). (optional, default 268402689)
          */
         limitInputPixels?: number | boolean | undefined;
+        /**
+         * Do not process input images where the number of channels exceeds this limit.
+         * Assumes image metadata can be trusted.
+         * An integral Number of channels, zero or false to remove limit, true to use default limit of 5. (optional, default 5)
+         */
+        limitInputChannels?: number | boolean | undefined;
         /** Set this to true to remove safety features that help prevent memory exhaustion (SVG, PNG). (optional, default false) */
         unlimited?: boolean | undefined;
         /** Set this to false to use random access rather than sequential read. Some operations will do this automatically. */
@@ -1176,7 +1183,7 @@ declare namespace sharp {
 
     type HeifCompression = 'av1' | 'hevc';
 
-    type HeifTune = 'iq' | 'ssim' | 'psnr';
+    type HeifTune = 'auto' | 'iq' | 'psnr' | 'ssim';
 
     type Unit = 'inch' | 'cm';
 
@@ -1425,7 +1432,7 @@ declare namespace sharp {
         chromaSubsampling?: string | undefined;
         /** Set bitdepth to 8, 10 or 12 bit (optional, default 8) */
         bitdepth?: 8 | 10 | 12 | undefined;
-        /** Tune output for a quality metric, one of 'iq', 'ssim' or 'psnr' (optional, default 'iq') */
+        /** Tune output for a quality metric, one of 'auto', 'iq', 'psnr' or 'ssim' (optional, default 'auto') */
         tune?: HeifTune | undefined;
     }
 
@@ -1442,7 +1449,7 @@ declare namespace sharp {
         chromaSubsampling?: string | undefined;
         /** Set bitdepth to 8, 10 or 12 bit (optional, default 8) */
         bitdepth?: 8 | 10 | 12 | undefined;
-        /** Tune output for a quality metric, one of 'ssim', 'psnr' or 'iq' (optional, default 'ssim') */
+        /** Tune output for a quality metric, one of 'auto', 'iq', 'psnr' or 'ssim' (optional, default 'auto') */
         tune?: HeifTune | undefined;
     }
 

package/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.35.0-rc.4",
+  "version": "0.35.0-rc.6",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -152,51 +152,51 @@
   "dependencies": {
     "@img/colour": "^1.1.0",
     "detect-libc": "^2.1.2",
-    "semver": "^7.7.4"
+    "semver": "^7.8.2"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.35.0-rc.4",
-    "@img/sharp-darwin-x64": "0.35.0-rc.4",
-    "@img/sharp-freebsd-wasm32": "0.35.0-rc.4",
-    "@img/sharp-libvips-darwin-arm64": "1.3.0-rc.5",
-    "@img/sharp-libvips-darwin-x64": "1.3.0-rc.5",
-    "@img/sharp-libvips-linux-arm": "1.3.0-rc.5",
-    "@img/sharp-libvips-linux-arm64": "1.3.0-rc.5",
-    "@img/sharp-libvips-linux-ppc64": "1.3.0-rc.5",
-    "@img/sharp-libvips-linux-riscv64": "1.3.0-rc.5",
-    "@img/sharp-libvips-linux-s390x": "1.3.0-rc.5",
-    "@img/sharp-libvips-linux-x64": "1.3.0-rc.5",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.3.0-rc.5",
-    "@img/sharp-libvips-linuxmusl-x64": "1.3.0-rc.5",
-    "@img/sharp-linux-arm": "0.35.0-rc.4",
-    "@img/sharp-linux-arm64": "0.35.0-rc.4",
-    "@img/sharp-linux-ppc64": "0.35.0-rc.4",
-    "@img/sharp-linux-riscv64": "0.35.0-rc.4",
-    "@img/sharp-linux-s390x": "0.35.0-rc.4",
-    "@img/sharp-linux-x64": "0.35.0-rc.4",
-    "@img/sharp-linuxmusl-arm64": "0.35.0-rc.4",
-    "@img/sharp-linuxmusl-x64": "0.35.0-rc.4",
-    "@img/sharp-webcontainers-wasm32": "0.35.0-rc.4",
-    "@img/sharp-win32-arm64": "0.35.0-rc.4",
-    "@img/sharp-win32-ia32": "0.35.0-rc.4",
-    "@img/sharp-win32-x64": "0.35.0-rc.4"
+    "@img/sharp-darwin-arm64": "0.35.0-rc.6",
+    "@img/sharp-darwin-x64": "0.35.0-rc.6",
+    "@img/sharp-freebsd-wasm32": "0.35.0-rc.6",
+    "@img/sharp-libvips-darwin-arm64": "1.3.0-rc.8",
+    "@img/sharp-libvips-darwin-x64": "1.3.0-rc.8",
+    "@img/sharp-libvips-linux-arm": "1.3.0-rc.8",
+    "@img/sharp-libvips-linux-arm64": "1.3.0-rc.8",
+    "@img/sharp-libvips-linux-ppc64": "1.3.0-rc.8",
+    "@img/sharp-libvips-linux-riscv64": "1.3.0-rc.8",
+    "@img/sharp-libvips-linux-s390x": "1.3.0-rc.8",
+    "@img/sharp-libvips-linux-x64": "1.3.0-rc.8",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.3.0-rc.8",
+    "@img/sharp-libvips-linuxmusl-x64": "1.3.0-rc.8",
+    "@img/sharp-linux-arm": "0.35.0-rc.6",
+    "@img/sharp-linux-arm64": "0.35.0-rc.6",
+    "@img/sharp-linux-ppc64": "0.35.0-rc.6",
+    "@img/sharp-linux-riscv64": "0.35.0-rc.6",
+    "@img/sharp-linux-s390x": "0.35.0-rc.6",
+    "@img/sharp-linux-x64": "0.35.0-rc.6",
+    "@img/sharp-linuxmusl-arm64": "0.35.0-rc.6",
+    "@img/sharp-linuxmusl-x64": "0.35.0-rc.6",
+    "@img/sharp-webcontainers-wasm32": "0.35.0-rc.6",
+    "@img/sharp-win32-arm64": "0.35.0-rc.6",
+    "@img/sharp-win32-ia32": "0.35.0-rc.6",
+    "@img/sharp-win32-x64": "0.35.0-rc.6"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.12",
+    "@biomejs/biome": "^2.4.16",
     "@cpplint/cli": "^0.1.0",
     "@emnapi/runtime": "^1.10.0",
-    "@img/sharp-libvips-dev": "1.3.0-rc.5",
-    "@img/sharp-libvips-dev-wasm32": "1.3.0-rc.5",
-    "@img/sharp-libvips-win32-arm64": "1.3.0-rc.5",
-    "@img/sharp-libvips-win32-ia32": "1.3.0-rc.5",
-    "@img/sharp-libvips-win32-x64": "1.3.0-rc.5",
+    "@img/sharp-libvips-dev": "1.3.0-rc.8",
+    "@img/sharp-libvips-dev-wasm32": "1.3.0-rc.8",
+    "@img/sharp-libvips-win32-arm64": "1.3.0-rc.8",
+    "@img/sharp-libvips-win32-ia32": "1.3.0-rc.8",
+    "@img/sharp-libvips-win32-x64": "1.3.0-rc.8",
     "@types/node": "*",
     "emnapi": "^1.10.0",
     "exif-reader": "^2.0.3",
     "extract-zip": "^2.0.1",
-    "icc": "^3.0.0",
-    "node-addon-api": "^8.7.0",
-    "node-gyp": "^12.2.0",
+    "icc": "^4.0.0",
+    "node-addon-api": "^8.8.0",
+    "node-gyp": "^12.4.0",
     "tar-fs": "^3.1.2",
     "tsd": "^0.33.0"
   },
@@ -205,7 +205,7 @@
     "node": ">=20.9.0"
   },
   "config": {
-    "libvips": ">=8.18.2"
+    "libvips": ">=8.18.3"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

package/src/common.cc

@@ -196,8 +196,8 @@ namespace sharp {
     if (HasAttr(input, "joinValign")) {
       descriptor->joinValign = AttrAsEnum<VipsAlign>(input, "joinValign", VIPS_TYPE_ALIGN);
     }
-    // Limit input images to a given number of pixels, where pixels = width * height
     descriptor->limitInputPixels = static_cast<uint64_t>(AttrAsInt64(input, "limitInputPixels"));
+    descriptor->limitInputChannels = static_cast<uint64_t>(AttrAsInt64(input, "limitInputChannels"));
     if (HasAttr(input, "access")) {
       descriptor->access = AttrAsBool(input, "sequentialRead") ? VIPS_ACCESS_SEQUENTIAL : VIPS_ACCESS_RANDOM;
     }
@@ -614,6 +614,9 @@ namespace sharp {
       static_cast<uint64_t>(image.width()) * image.height() > descriptor->limitInputPixels) {
       throw std::runtime_error("Input image exceeds pixel limit");
     }
+    if (descriptor->limitInputChannels > 0 && static_cast<uint64_t>(image.bands()) > descriptor->limitInputChannels) {
+      throw std::runtime_error("Input image exceeds channel limit");
+    }
     return std::make_tuple(image, imageType);
   }
 

package/src/common.h

@@ -19,8 +19,8 @@
 
 #if (VIPS_MAJOR_VERSION < 8) || \
   (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 18) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 18 && VIPS_MICRO_VERSION < 2)
-#error "libvips version 8.18.2+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 18 && VIPS_MICRO_VERSION < 3)
+#error "libvips version 8.18.3+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)
@@ -46,6 +46,7 @@ namespace sharp {
     char *buffer;
     VipsFailOn failOn;
     uint64_t limitInputPixels;
+    uint64_t limitInputChannels;
     bool unlimited;
     VipsAccess access;
     size_t bufferLength;
@@ -98,6 +99,7 @@ namespace sharp {
       buffer(nullptr),
       failOn(VIPS_FAIL_ON_WARNING),
       limitInputPixels(0x3FFF * 0x3FFF),
+      limitInputChannels(5),
       unlimited(false),
       access(VIPS_ACCESS_SEQUENTIAL),
       bufferLength(0),

package/src/pipeline.h

@@ -380,7 +380,7 @@ struct PipelineBaton {
     heifChromaSubsampling("4:4:4"),
     heifLossless(false),
     heifBitdepth(8),
-    heifTune("ssim"),
+    heifTune("auto"),
     jxlDistance(1.0),
     jxlDecodingTier(0),
     jxlEffort(7),