sharp 0.35.2 → 0.35.3-rc.2

package/dist/output.mjs

@@ -113,24 +113,20 @@ function toFile (fileOut, callback) {
  * Animated output will also contain `pageHeight` and `pages`.
  * May also contain `textAutofitDpi` (dpi the font was rendered at) if image was created from text.
  *
- * A `Promise` is returned when `callback` is not provided.
+ * The underlying `ArrayBuffer` may be marked as non-transferable by some JavaScript runtimes.
+ * Use {@link #touint8array toUint8Array} for a guaranteed transferable `ArrayBuffer`.
  *
- * @example
- * sharp(input)
- *   .toBuffer((err, data, info) => { ... });
+ * A `Promise` is returned when `callback` is not provided.
  *
  * @example
- * sharp(input)
- *   .toBuffer()
- *   .then(data => { ... })
- *   .catch(err => { ... });
+ * const data = await sharp(input)
+ *   .png()
+ *   .toBuffer();
  *
  * @example
- * sharp(input)
+ * const { data, info } = await sharp(input)
  *   .png()
- *   .toBuffer({ resolveWithObject: true })
- *   .then(({ data, info }) => { ... })
- *   .catch(err => { ... });
+ *   .toBuffer({ resolveWithObject: true });
  *
  * @example
  * const { data, info } = await sharp('my-image.jpg')
@@ -1103,10 +1099,10 @@ function trySetAnimationOptions (source, target) {
  * @param {string} [options.predictor='horizontal'] - compression predictor options: none, horizontal, float
  * @param {boolean} [options.pyramid=false] - write an image pyramid
  * @param {boolean} [options.tile=false] - write a tiled tiff
- * @param {number} [options.tileWidth=256] - horizontal tile size
- * @param {number} [options.tileHeight=256] - vertical tile size
- * @param {number} [options.xres=1.0] - horizontal resolution in pixels/mm
- * @param {number} [options.yres=1.0] - vertical resolution in pixels/mm
+ * @param {number} [options.tileWidth=256] - horizontal tile size, valid values are integers in the range 1-32768
+ * @param {number} [options.tileHeight=256] - vertical tile size, valid values are integers in the range 1-32768
+ * @param {number} [options.xres=1.0] - horizontal resolution in pixels/mm, valid values are numbers in the range 0.001-1000000
+ * @param {number} [options.yres=1.0] - vertical resolution in pixels/mm, valid values are numbers in the range 0.001-1000000
  * @param {string} [options.resolutionUnit='inch'] - resolution unit options: inch, cm
  * @param {number} [options.bitdepth=0] - reduce bitdepth to 1, 2 or 4 bit
  * @param {boolean} [options.miniswhite=false] - write 1-bit images as miniswhite
@@ -1134,17 +1130,17 @@ function tiff (options) {
       this._setBooleanOption('tiffTile', options.tile);
     }
     if (is.defined(options.tileWidth)) {
-      if (is.integer(options.tileWidth) && options.tileWidth > 0) {
+      if (is.integer(options.tileWidth) && is.inRange(options.tileWidth, 1, 32768)) {
         this.options.tiffTileWidth = options.tileWidth;
       } else {
-        throw is.invalidParameterError('tileWidth', 'integer greater than zero', options.tileWidth);
+        throw is.invalidParameterError('tileWidth', 'integer between 1 and 32768', options.tileWidth);
       }
     }
     if (is.defined(options.tileHeight)) {
-      if (is.integer(options.tileHeight) && options.tileHeight > 0) {
+      if (is.integer(options.tileHeight) && is.inRange(options.tileHeight, 1, 32768)) {
         this.options.tiffTileHeight = options.tileHeight;
       } else {
-        throw is.invalidParameterError('tileHeight', 'integer greater than zero', options.tileHeight);
+        throw is.invalidParameterError('tileHeight', 'integer between 1 and 32768', options.tileHeight);
       }
     }
     // miniswhite
@@ -1157,17 +1153,17 @@ function tiff (options) {
     }
     // resolution
     if (is.defined(options.xres)) {
-      if (is.number(options.xres) && options.xres > 0) {
+      if (is.number(options.xres) && is.inRange(options.xres, 0.001, 1000000)) {
         this.options.tiffXres = options.xres;
       } else {
-        throw is.invalidParameterError('xres', 'number greater than zero', options.xres);
+        throw is.invalidParameterError('xres', 'number between 0.001 and 1000000', options.xres);
       }
     }
     if (is.defined(options.yres)) {
-      if (is.number(options.yres) && options.yres > 0) {
+      if (is.number(options.yres) && is.inRange(options.yres, 0.001, 1000000)) {
         this.options.tiffYres = options.yres;
       } else {
-        throw is.invalidParameterError('yres', 'number greater than zero', options.yres);
+        throw is.invalidParameterError('yres', 'number between 0.001 and 1000000', options.yres);
       }
     }
     // compression

package/dist/resize.cjs

@@ -386,48 +386,52 @@ function resize (widthOrOptions, height, options) {
  *   ...
  *
  * @param {(number|Object)} extend - single pixel count to add to all edges or an Object with per-edge counts
- * @param {number} [extend.top=0]
- * @param {number} [extend.left=0]
- * @param {number} [extend.bottom=0]
- * @param {number} [extend.right=0]
+ * @param {number} [extend.top=0] - number of pixels to add to the top edge, valid values are integers in the range 0-10000
+ * @param {number} [extend.left=0] - number of pixels to add to the left edge, valid values are integers in the range 0-10000
+ * @param {number} [extend.bottom=0] - number of pixels to add to the bottom edge, valid values are integers in the range 0-10000
+ * @param {number} [extend.right=0] - number of pixels to add to the right edge, valid values are integers in the range 0-10000
  * @param {String} [extend.extendWith='background'] - populate new pixels using this method, one of: background, copy, repeat, mirror.
  * @param {String|Object} [extend.background={r: 0, g: 0, b: 0, alpha: 1}] - background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to black without transparency.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
 */
 function extend (extend) {
-  if (is.integer(extend) && extend > 0) {
-    this.options.extendTop = extend;
-    this.options.extendBottom = extend;
-    this.options.extendLeft = extend;
-    this.options.extendRight = extend;
+  if (is.integer(extend)) {
+    if (is.inRange(extend, 1, 10000)) {
+      this.options.extendTop = extend;
+      this.options.extendBottom = extend;
+      this.options.extendLeft = extend;
+      this.options.extendRight = extend;
+    } else {
+      throw is.invalidParameterError('extend', 'integer between 1 and 10000', extend);
+    }
   } else if (is.object(extend)) {
     if (is.defined(extend.top)) {
-      if (is.integer(extend.top) && extend.top >= 0) {
+      if (is.integer(extend.top) && is.inRange(extend.top, 0, 10000)) {
         this.options.extendTop = extend.top;
       } else {
-        throw is.invalidParameterError('top', 'positive integer', extend.top);
+        throw is.invalidParameterError('top', 'integer between 0 and 10000', extend.top);
       }
     }
     if (is.defined(extend.bottom)) {
-      if (is.integer(extend.bottom) && extend.bottom >= 0) {
+      if (is.integer(extend.bottom) && is.inRange(extend.bottom, 0, 10000)) {
         this.options.extendBottom = extend.bottom;
       } else {
-        throw is.invalidParameterError('bottom', 'positive integer', extend.bottom);
+        throw is.invalidParameterError('bottom', 'integer between 0 and 10000', extend.bottom);
       }
     }
     if (is.defined(extend.left)) {
-      if (is.integer(extend.left) && extend.left >= 0) {
+      if (is.integer(extend.left) && is.inRange(extend.left, 0, 10000)) {
         this.options.extendLeft = extend.left;
       } else {
-        throw is.invalidParameterError('left', 'positive integer', extend.left);
+        throw is.invalidParameterError('left', 'integer between 0 and 10000', extend.left);
       }
     }
     if (is.defined(extend.right)) {
-      if (is.integer(extend.right) && extend.right >= 0) {
+      if (is.integer(extend.right) && is.inRange(extend.right, 0, 10000)) {
         this.options.extendRight = extend.right;
       } else {
-        throw is.invalidParameterError('right', 'positive integer', extend.right);
+        throw is.invalidParameterError('right', 'integer between 0 and 10000', extend.right);
       }
     }
     this._setBackgroundColourOption('extendBackground', extend.background);
@@ -467,10 +471,10 @@ function extend (extend) {
  *   });
  *
  * @param {Object} options - describes the region to extract using integral pixel values
- * @param {number} options.left - zero-indexed offset from left edge
- * @param {number} options.top - zero-indexed offset from top edge
- * @param {number} options.width - width of region to extract
- * @param {number} options.height - height of region to extract
+ * @param {number} options.left - zero-indexed offset from left edge, an integer between 0 and 100000000
+ * @param {number} options.top - zero-indexed offset from top edge, an integer between 0 and 100000000
+ * @param {number} options.width - width of region to extract, an integer between 0 and 100000000
+ * @param {number} options.height - height of region to extract, an integer between 0 and 100000000
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
@@ -481,10 +485,10 @@ function extract (options) {
   }
   ['left', 'top', 'width', 'height'].forEach(function (name) {
     const value = options[name];
-    if (is.integer(value) && value >= 0) {
+    if (is.integer(value) && is.inRange(value, 0, 100000000)) {
       this.options[name + (name === 'left' || name === 'top' ? 'Offset' : '') + suffix] = value;
     } else {
-      throw is.invalidParameterError(name, 'integer', value);
+      throw is.invalidParameterError(name, 'integer between 0 and 100000000', value);
     }
   }, this);
   // Ensure existing rotation occurs before pre-resize extraction
@@ -554,7 +558,7 @@ function extract (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?
- * @param {number} [options.margin=0] - Leave a margin around trimmed content, value is in pixels.
+ * @param {number} [options.margin=0] - Leave a margin around trimmed content, integral number of pixels between 0 and 10000000.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
@@ -576,10 +580,10 @@ function trim (options) {
         this._setBooleanOption('trimLineArt', options.lineArt);
       }
       if (is.defined(options.margin)) {
-        if (is.integer(options.margin) && options.margin >= 0) {
+        if (is.integer(options.margin) && is.inRange(options.margin, 0, 10000000)) {
           this.options.trimMargin = options.margin;
         } else {
-          throw is.invalidParameterError('margin', 'positive integer', options.margin);
+          throw is.invalidParameterError('margin', 'integer between 0 and 10000000', options.margin);
         }
       }
     } else {

package/dist/resize.mjs

@@ -386,48 +386,52 @@ function resize (widthOrOptions, height, options) {
  *   ...
  *
  * @param {(number|Object)} extend - single pixel count to add to all edges or an Object with per-edge counts
- * @param {number} [extend.top=0]
- * @param {number} [extend.left=0]
- * @param {number} [extend.bottom=0]
- * @param {number} [extend.right=0]
+ * @param {number} [extend.top=0] - number of pixels to add to the top edge, valid values are integers in the range 0-10000
+ * @param {number} [extend.left=0] - number of pixels to add to the left edge, valid values are integers in the range 0-10000
+ * @param {number} [extend.bottom=0] - number of pixels to add to the bottom edge, valid values are integers in the range 0-10000
+ * @param {number} [extend.right=0] - number of pixels to add to the right edge, valid values are integers in the range 0-10000
  * @param {String} [extend.extendWith='background'] - populate new pixels using this method, one of: background, copy, repeat, mirror.
  * @param {String|Object} [extend.background={r: 0, g: 0, b: 0, alpha: 1}] - background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to black without transparency.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
 */
 function extend (extend) {
-  if (is.integer(extend) && extend > 0) {
-    this.options.extendTop = extend;
-    this.options.extendBottom = extend;
-    this.options.extendLeft = extend;
-    this.options.extendRight = extend;
+  if (is.integer(extend)) {
+    if (is.inRange(extend, 1, 10000)) {
+      this.options.extendTop = extend;
+      this.options.extendBottom = extend;
+      this.options.extendLeft = extend;
+      this.options.extendRight = extend;
+    } else {
+      throw is.invalidParameterError('extend', 'integer between 1 and 10000', extend);
+    }
   } else if (is.object(extend)) {
     if (is.defined(extend.top)) {
-      if (is.integer(extend.top) && extend.top >= 0) {
+      if (is.integer(extend.top) && is.inRange(extend.top, 0, 10000)) {
         this.options.extendTop = extend.top;
       } else {
-        throw is.invalidParameterError('top', 'positive integer', extend.top);
+        throw is.invalidParameterError('top', 'integer between 0 and 10000', extend.top);
       }
     }
     if (is.defined(extend.bottom)) {
-      if (is.integer(extend.bottom) && extend.bottom >= 0) {
+      if (is.integer(extend.bottom) && is.inRange(extend.bottom, 0, 10000)) {
         this.options.extendBottom = extend.bottom;
       } else {
-        throw is.invalidParameterError('bottom', 'positive integer', extend.bottom);
+        throw is.invalidParameterError('bottom', 'integer between 0 and 10000', extend.bottom);
       }
     }
     if (is.defined(extend.left)) {
-      if (is.integer(extend.left) && extend.left >= 0) {
+      if (is.integer(extend.left) && is.inRange(extend.left, 0, 10000)) {
         this.options.extendLeft = extend.left;
       } else {
-        throw is.invalidParameterError('left', 'positive integer', extend.left);
+        throw is.invalidParameterError('left', 'integer between 0 and 10000', extend.left);
       }
     }
     if (is.defined(extend.right)) {
-      if (is.integer(extend.right) && extend.right >= 0) {
+      if (is.integer(extend.right) && is.inRange(extend.right, 0, 10000)) {
         this.options.extendRight = extend.right;
       } else {
-        throw is.invalidParameterError('right', 'positive integer', extend.right);
+        throw is.invalidParameterError('right', 'integer between 0 and 10000', extend.right);
       }
     }
     this._setBackgroundColourOption('extendBackground', extend.background);
@@ -467,10 +471,10 @@ function extend (extend) {
  *   });
  *
  * @param {Object} options - describes the region to extract using integral pixel values
- * @param {number} options.left - zero-indexed offset from left edge
- * @param {number} options.top - zero-indexed offset from top edge
- * @param {number} options.width - width of region to extract
- * @param {number} options.height - height of region to extract
+ * @param {number} options.left - zero-indexed offset from left edge, an integer between 0 and 100000000
+ * @param {number} options.top - zero-indexed offset from top edge, an integer between 0 and 100000000
+ * @param {number} options.width - width of region to extract, an integer between 0 and 100000000
+ * @param {number} options.height - height of region to extract, an integer between 0 and 100000000
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
@@ -481,10 +485,10 @@ function extract (options) {
   }
   ['left', 'top', 'width', 'height'].forEach(function (name) {
     const value = options[name];
-    if (is.integer(value) && value >= 0) {
+    if (is.integer(value) && is.inRange(value, 0, 100000000)) {
       this.options[name + (name === 'left' || name === 'top' ? 'Offset' : '') + suffix] = value;
     } else {
-      throw is.invalidParameterError(name, 'integer', value);
+      throw is.invalidParameterError(name, 'integer between 0 and 100000000', value);
     }
   }, this);
   // Ensure existing rotation occurs before pre-resize extraction
@@ -554,7 +558,7 @@ function extract (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?
- * @param {number} [options.margin=0] - Leave a margin around trimmed content, value is in pixels.
+ * @param {number} [options.margin=0] - Leave a margin around trimmed content, integral number of pixels between 0 and 10000000.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
@@ -576,10 +580,10 @@ function trim (options) {
         this._setBooleanOption('trimLineArt', options.lineArt);
       }
       if (is.defined(options.margin)) {
-        if (is.integer(options.margin) && options.margin >= 0) {
+        if (is.integer(options.margin) && is.inRange(options.margin, 0, 10000000)) {
           this.options.trimMargin = options.margin;
         } else {
-          throw is.invalidParameterError('margin', 'positive integer', options.margin);
+          throw is.invalidParameterError('margin', 'integer between 0 and 10000000', options.margin);
         }
       }
     } else {

package/dist/sharp.cjs

@@ -89,6 +89,12 @@ if (!sharp) {
       errors.push(err);
       sharp = null;
     }
+    if (sharp && process.versions.electron && runtimePlatform.startsWith("linux")) {
+      process.emitWarning(
+        "Binaries provided by Electron for use on Linux may be incompatible with sharp - see https://sharp.pixelplumbing.com/install#electron-and-linux",
+        { code: "SharpElectronLinux" }
+      );
+    }
   } catch (err) {
     errors.push(err);
   }

package/dist/sharp.mjs

@@ -89,6 +89,12 @@ if (!sharp) {
       errors.push(err);
       sharp = null;
     }
+    if (sharp && process.versions.electron && runtimePlatform.startsWith("linux")) {
+      process.emitWarning(
+        "Binaries provided by Electron for use on Linux may be incompatible with sharp - see https://sharp.pixelplumbing.com/install#electron-and-linux",
+        { code: "SharpElectronLinux" }
+      );
+    }
   } catch (err) {
     errors.push(err);
   }

package/dist/utility.cjs

@@ -114,6 +114,12 @@ function cache (options) {
       return sharp.cache(0, 0, 0);
     }
   } else if (is.object(options)) {
+    for (const property of ['memory', 'files', 'items']) {
+      const value = options[property];
+      if (is.defined(value) && !(is.integer(value) && value >= 0)) {
+        throw is.invalidParameterError(property, 'a positive integer', value);
+      }
+    }
     return sharp.cache(options.memory, options.files, options.items);
   } else {
     return sharp.cache();
@@ -155,7 +161,7 @@ function concurrency (concurrency) {
   return sharp.concurrency(is.integer(concurrency) ? concurrency : null);
 }
 /* node:coverage ignore next 7 */
-if (detectLibc.familySync() === detectLibc.GLIBC && !sharp._isUsingJemalloc()) {
+if (!process.env.MALLOC_ARENA_MAX && detectLibc.familySync() === detectLibc.GLIBC && !sharp._isUsingJemalloc()) {
   // Reduce default concurrency to 1 when using glibc memory allocator
   sharp.concurrency(1);
 } else if (detectLibc.familySync() === detectLibc.MUSL && sharp.concurrency() === 1024) {

package/dist/utility.mjs

@@ -114,6 +114,12 @@ function cache (options) {
       return sharp.cache(0, 0, 0);
     }
   } else if (is.object(options)) {
+    for (const property of ['memory', 'files', 'items']) {
+      const value = options[property];
+      if (is.defined(value) && !(is.integer(value) && value >= 0)) {
+        throw is.invalidParameterError(property, 'a positive integer', value);
+      }
+    }
     return sharp.cache(options.memory, options.files, options.items);
   } else {
     return sharp.cache();
@@ -155,7 +161,7 @@ function concurrency (concurrency) {
   return sharp.concurrency(is.integer(concurrency) ? concurrency : null);
 }
 /* node:coverage ignore next 7 */
-if (detectLibc.familySync() === detectLibc.GLIBC && !sharp._isUsingJemalloc()) {
+if (!process.env.MALLOC_ARENA_MAX && detectLibc.familySync() === detectLibc.GLIBC && !sharp._isUsingJemalloc()) {
   // Reduce default concurrency to 1 when using glibc memory allocator
   sharp.concurrency(1);
 } else if (detectLibc.familySync() === detectLibc.MUSL && sharp.concurrency() === 1024) {

package/lib/index.d.ts

@@ -658,25 +658,27 @@ declare namespace sharp {
          * @param callback Callback function called on completion with three arguments (err, buffer, info).
          * @returns A sharp instance that can be used to chain operations
          */
-        toBuffer(callback: (err: Error, buffer: Buffer, info: OutputInfo) => void): Sharp;
+        toBuffer(callback: (err: Error, buffer: Buffer<ArrayBuffer>, info: OutputInfo) => void): Sharp;
 
         /**
          * Write output to a Buffer. JPEG, PNG, WebP, AVIF, TIFF, GIF and RAW output are supported.
          * By default, the format will match the input image, except SVG input which becomes PNG output.
+         * The underlying `ArrayBuffer` may be marked as non-transferable by some JavaScript runtimes.
          * @param options resolve options
          * @param options.resolveWithObject Resolve the Promise with an Object containing data and info properties instead of resolving only with data.
          * @returns A promise that resolves with the Buffer data.
          */
-        toBuffer(options?: { resolveWithObject: false }): Promise<Buffer>;
+        toBuffer(options?: { resolveWithObject: false }): Promise<Buffer<ArrayBuffer>>;
 
         /**
          * Write output to a Buffer. JPEG, PNG, WebP, AVIF, TIFF, GIF and RAW output are supported.
          * By default, the format will match the input image, except SVG input which becomes PNG output.
+         * The underlying `ArrayBuffer` may be marked as non-transferable by some JavaScript runtimes.
          * @param options resolve options
          * @param options.resolveWithObject Resolve the Promise with an Object containing data and info properties instead of resolving only with data.
          * @returns A promise that resolves with an object containing the Buffer data and an info object containing the output image format, size (bytes), width, height and channels
          */
-        toBuffer(options: { resolveWithObject: true }): Promise<{ data: Buffer; info: OutputInfo }>;
+        toBuffer(options: { resolveWithObject: true }): Promise<{ data: Buffer<ArrayBuffer>; info: OutputInfo }>;
 
         /**
          * Write output to a Uint8Array backed by a transferable ArrayBuffer. JPEG, PNG, WebP, AVIF, TIFF, GIF and RAW output are supported.
@@ -1508,11 +1510,11 @@ declare namespace sharp {
         tile?: boolean | undefined;
         /** Horizontal tile size (optional, default 256) */
         tileWidth?: number | undefined;
-        /** Vertical tile size (optional, default 256) */
+        /** Vertical tile size, valid values are integers in the range 1-32768 (optional, default 256) */
         tileHeight?: number | undefined;
-        /** Horizontal resolution in pixels/mm (optional, default 1.0) */
+        /** Horizontal resolution in pixels/mm, valid values are numbers in the range 0.001-1000000 (optional, default 1.0) */
         xres?: number | undefined;
-        /** Vertical resolution in pixels/mm (optional, default 1.0) */
+        /** Vertical resolution in pixels/mm, valid values are numbers in the range 0.001-1000000 (optional, default 1.0) */
         yres?: number | undefined;
         /** Reduce bitdepth to 1, 2 or 4 bit (optional) */
         bitdepth?: 1 | 2 | 4 | undefined;
@@ -1598,13 +1600,13 @@ declare namespace sharp {
     }
 
     interface Region {
-        /** zero-indexed offset from left edge */
+        /** zero-indexed offset from left edge, an integer between 0 and 100000000 */
         left: number;
-        /** zero-indexed offset from top edge */
+        /** zero-indexed offset from top edge, an integer between 0 and 100000000 */
         top: number;
-        /** dimension of extracted image */
+        /** dimension of extracted image, an integer between 0 and 100000000 */
         width: number;
-        /** dimension of extracted image */
+        /** dimension of extracted image, an integer between 0 and 100000000 */
         height: number;
     }
 
@@ -1620,13 +1622,13 @@ declare namespace sharp {
     type ExtendWith = 'background' | 'copy' | 'repeat' | 'mirror';
 
     interface ExtendOptions {
-        /** single pixel count to top edge (optional, default 0) */
+        /** single pixel count to top edge, valid values are integers in the range 0-10000 (optional, default 0) */
         top?: number | undefined;
-        /** single pixel count to left edge (optional, default 0) */
+        /** single pixel count to left edge, valid values are integers in the range 0-10000 (optional, default 0) */
         left?: number | undefined;
-        /** single pixel count to bottom edge (optional, default 0) */
+        /** single pixel count to bottom edge, valid values are integers in the range 0-10000 (optional, default 0) */
         bottom?: number | undefined;
-        /** single pixel count to right edge (optional, default 0) */
+        /** single pixel count to right edge, valid values are integers in the range 0-10000 (optional, default 0) */
         right?: number | undefined;
         /** background colour, parsed by the color module, defaults to black without transparency. (optional, default {r:0,g:0,b:0,alpha:1}) */
         background?: ColorLike | undefined;
@@ -1641,7 +1643,7 @@ declare namespace sharp {
         threshold?: number | undefined;
         /** Does the input more closely resemble line art (e.g. vector) rather than being photographic? (optional, default false) */
         lineArt?: boolean | undefined;
-        /** Leave a margin around trimmed content, value is in pixels. (optional, default 0) */
+        /** Leave a margin around trimmed content, integral number of pixels between 0 and 10000000. (optional, default 0) */
         margin?: number | undefined;
     }
 
@@ -1669,11 +1671,11 @@ declare namespace sharp {
     }
 
     interface ClaheOptions {
-        /** width of the region */
+        /** width of the region. Valid values are integers in the range 1-65536. */
         width: number;
-        /** height of the region */
+        /** height of the region. Valid values are integers in the range 1-65536. */
         height: number;
-        /** max slope of the cumulative contrast. A value of 0 disables contrast limiting. Valid values are integers in the range 0-100 (inclusive) (optional, default 3) */
+        /** max slope of the cumulative contrast. A value of 0 disables contrast limiting. Valid values are integers in the range 0-100. (optional, default 3) */
         maxSlope?: number | undefined;
     }
 
@@ -1783,6 +1785,8 @@ declare namespace sharp {
         channels: Channels;
         /** indicating if premultiplication was used */
         premultiplied: boolean;
+        /** Indicates if the output image has an alpha channel */
+        hasAlpha: boolean;
         /** Only defined when using a crop strategy */
         cropOffsetLeft?: number | undefined;
         /** Only defined when using a crop strategy */

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.2",
+  "version": "0.35.3-rc.2",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -160,53 +160,58 @@
   "dependencies": {
     "@img/colour": "^1.1.0",
     "detect-libc": "^2.1.2",
-    "semver": "^7.8.4"
+    "semver": "^7.8.5"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.35.2",
-    "@img/sharp-darwin-x64": "0.35.2",
-    "@img/sharp-freebsd-wasm32": "0.35.2",
-    "@img/sharp-libvips-darwin-arm64": "1.3.1",
-    "@img/sharp-libvips-darwin-x64": "1.3.1",
-    "@img/sharp-libvips-linux-arm": "1.3.1",
-    "@img/sharp-libvips-linux-arm64": "1.3.1",
-    "@img/sharp-libvips-linux-ppc64": "1.3.1",
-    "@img/sharp-libvips-linux-riscv64": "1.3.1",
-    "@img/sharp-libvips-linux-s390x": "1.3.1",
-    "@img/sharp-libvips-linux-x64": "1.3.1",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.3.1",
-    "@img/sharp-libvips-linuxmusl-x64": "1.3.1",
-    "@img/sharp-linux-arm": "0.35.2",
-    "@img/sharp-linux-arm64": "0.35.2",
-    "@img/sharp-linux-ppc64": "0.35.2",
-    "@img/sharp-linux-riscv64": "0.35.2",
-    "@img/sharp-linux-s390x": "0.35.2",
-    "@img/sharp-linux-x64": "0.35.2",
-    "@img/sharp-linuxmusl-arm64": "0.35.2",
-    "@img/sharp-linuxmusl-x64": "0.35.2",
-    "@img/sharp-webcontainers-wasm32": "0.35.2",
-    "@img/sharp-win32-arm64": "0.35.2",
-    "@img/sharp-win32-ia32": "0.35.2",
-    "@img/sharp-win32-x64": "0.35.2"
+    "@img/sharp-darwin-arm64": "0.35.3-rc.2",
+    "@img/sharp-darwin-x64": "0.35.3-rc.2",
+    "@img/sharp-freebsd-wasm32": "0.35.3-rc.2",
+    "@img/sharp-libvips-darwin-arm64": "1.3.2",
+    "@img/sharp-libvips-darwin-x64": "1.3.2",
+    "@img/sharp-libvips-linux-arm": "1.3.2",
+    "@img/sharp-libvips-linux-arm64": "1.3.2",
+    "@img/sharp-libvips-linux-ppc64": "1.3.2",
+    "@img/sharp-libvips-linux-riscv64": "1.3.2",
+    "@img/sharp-libvips-linux-s390x": "1.3.2",
+    "@img/sharp-libvips-linux-x64": "1.3.2",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.3.2",
+    "@img/sharp-libvips-linuxmusl-x64": "1.3.2",
+    "@img/sharp-linux-arm": "0.35.3-rc.2",
+    "@img/sharp-linux-arm64": "0.35.3-rc.2",
+    "@img/sharp-linux-ppc64": "0.35.3-rc.2",
+    "@img/sharp-linux-riscv64": "0.35.3-rc.2",
+    "@img/sharp-linux-s390x": "0.35.3-rc.2",
+    "@img/sharp-linux-x64": "0.35.3-rc.2",
+    "@img/sharp-linuxmusl-arm64": "0.35.3-rc.2",
+    "@img/sharp-linuxmusl-x64": "0.35.3-rc.2",
+    "@img/sharp-webcontainers-wasm32": "0.35.3-rc.2",
+    "@img/sharp-win32-arm64": "0.35.3-rc.2",
+    "@img/sharp-win32-ia32": "0.35.3-rc.2",
+    "@img/sharp-win32-x64": "0.35.3-rc.2"
+  },
+  "peerDependenciesMeta": {
+    "@types/node": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.5.0",
+    "@biomejs/biome": "^2.5.1",
     "@cpplint/cli": "^0.1.0",
     "@emnapi/runtime": "^1.11.1",
-    "@img/sharp-libvips-dev": "1.3.1",
-    "@img/sharp-libvips-dev-wasm32": "1.3.1",
-    "@img/sharp-libvips-win32-arm64": "1.3.1",
-    "@img/sharp-libvips-win32-ia32": "1.3.1",
-    "@img/sharp-libvips-win32-x64": "1.3.1",
+    "@img/sharp-libvips-dev": "1.3.2",
+    "@img/sharp-libvips-dev-wasm32": "1.3.2",
+    "@img/sharp-libvips-win32-arm64": "1.3.2",
+    "@img/sharp-libvips-win32-ia32": "1.3.2",
+    "@img/sharp-libvips-win32-x64": "1.3.2",
     "@types/node": "*",
     "emnapi": "^1.11.1",
     "exif-reader": "^2.0.3",
     "extract-zip": "^2.0.1",
     "icc": "^4.0.0",
-    "node-addon-api": "^8.8.0",
+    "node-addon-api": "^8.9.0",
     "node-gyp": "^12.4.0",
     "publint": "^0.3.21",
-    "tar-fs": "^3.1.2",
+    "tar-fs": "^3.1.3",
     "tsd": "^0.33.0"
   },
   "license": "Apache-2.0",